Finish implementing sourceFileMayBeEmitted, JSON emit (#1245)

Author: jakebailey

internal/compiler/emitter.go

@@ -17,6 +17,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/transformers/jsxtransforms"
 	"github.com/microsoft/typescript-go/internal/transformers/moduletransforms"
 	"github.com/microsoft/typescript-go/internal/transformers/tstransforms"
+	"github.com/microsoft/typescript-go/internal/tsoptions"
 	"github.com/microsoft/typescript-go/internal/tspath"
 )
 
@@ -368,14 +369,29 @@ func (e *emitter) getSourceMappingURL(mapOptions *core.CompilerOptions, sourceMa
 	return stringutil.EncodeURI(sourceMapFile)
 }
 
-func sourceFileMayBeEmitted(sourceFile *ast.SourceFile, host printer.EmitHost, forceDtsEmit bool) bool {
-	// !!! Js files are emitted only if option is enabled
+type SourceFileMayBeEmittedHost interface {
+	Options() *core.CompilerOptions
+	GetOutputAndProjectReference(path tspath.Path) *tsoptions.OutputDtsAndProjectReference
+	IsSourceFileFromExternalLibrary(file *ast.SourceFile) bool
+	GetCurrentDirectory() string
+	UseCaseSensitiveFileNames() bool
+}
+
+func sourceFileMayBeEmitted(sourceFile *ast.SourceFile, host SourceFileMayBeEmittedHost, forceDtsEmit bool) bool {
+	// TODO: move this to outputpaths?
+
+	options := host.Options()
+	// Js files are emitted only if option is enabled
+	if options.NoEmitForJsFiles.IsTrue() && ast.IsSourceFileJS(sourceFile) {
+		return false
+	}
 
 	// Declaration files are not emitted
 	if sourceFile.IsDeclarationFile {
 		return false
 	}
 
+	// Source file from node_modules are not emitted
 	if host.IsSourceFileFromExternalLibrary(sourceFile) {
 		return false
 	}
@@ -385,6 +401,7 @@ func sourceFileMayBeEmitted(sourceFile *ast.SourceFile, host printer.EmitHost, f
 		return true
 	}
 
+	// Check other conditions for file emit
 	// Source files from referenced projects are not emitted
 	if host.GetOutputAndProjectReference(sourceFile.Path()) != nil {
 		return false
@@ -395,8 +412,24 @@ func sourceFileMayBeEmitted(sourceFile *ast.SourceFile, host printer.EmitHost, f
 		return true
 	}
 
-	// !!! Should JSON input files be emitted
-	return false
+	// Json file is not emitted if outDir is not specified
+	if options.OutDir == "" {
+		return false
+	}
+
+	// Otherwise if rootDir or composite config file, we know common sourceDir and can check if file would be emitted in same location
+	if options.RootDir != "" || (options.Composite.IsTrue() && options.ConfigFilePath != "") {
+		commonDir := tspath.GetNormalizedAbsolutePath(outputpaths.GetCommonSourceDirectory(options, func() []string { return nil }, host.GetCurrentDirectory(), host.UseCaseSensitiveFileNames()), host.GetCurrentDirectory())
+		outputPath := outputpaths.GetSourceFilePathInNewDirWorker(sourceFile.FileName(), options.OutDir, host.GetCurrentDirectory(), commonDir, host.UseCaseSensitiveFileNames())
+		if tspath.ComparePaths(sourceFile.FileName(), outputPath, tspath.ComparePathsOptions{
+			UseCaseSensitiveFileNames: host.UseCaseSensitiveFileNames(),
+			CurrentDirectory:          host.GetCurrentDirectory(),
+		}) == 0 {
+			return false
+		}
+	}
+
+	return true
 }
 
 func getSourceFilesToEmit(host printer.EmitHost, targetSourceFile *ast.SourceFile, forceDtsEmit bool) []*ast.SourceFile {

internal/outputpaths/outputpaths.go

@@ -123,7 +123,7 @@ func GetDeclarationEmitOutputFilePath(file string, options *core.CompilerOptions
 
 	var path string
 	if outputDir != nil {
-		path = getSourceFilePathInNewDirWorker(file, *outputDir, host.GetCurrentDirectory(), host.CommonSourceDirectory(), host.UseCaseSensitiveFileNames())
+		path = GetSourceFilePathInNewDirWorker(file, *outputDir, host.GetCurrentDirectory(), host.CommonSourceDirectory(), host.UseCaseSensitiveFileNames())
 	} else {
 		path = file
 	}
@@ -154,7 +154,7 @@ func getOutputPathWithoutChangingExtension(inputFileName string, outputDirectory
 	return inputFileName
 }
 
-func getSourceFilePathInNewDirWorker(fileName string, newDirPath string, currentDirectory string, commonSourceDirectory string, useCaseSensitiveFileNames bool) string {
+func GetSourceFilePathInNewDirWorker(fileName string, newDirPath string, currentDirectory string, commonSourceDirectory string, useCaseSensitiveFileNames bool) string {
 	sourceFilePath := tspath.GetNormalizedAbsolutePath(fileName, currentDirectory)
 	commonDir := tspath.GetCanonicalFileName(commonSourceDirectory, useCaseSensitiveFileNames)
 	canonFile := tspath.GetCanonicalFileName(sourceFilePath, useCaseSensitiveFileNames)

internal/printer/printer.go

@@ -3175,7 +3175,10 @@ func (p *Printer) emitEmptyStatement(node *ast.EmptyStatement, isEmbeddedStateme
 func (p *Printer) emitExpressionStatement(node *ast.ExpressionStatement) {
 	state := p.enterNode(node.AsNode())
 
-	if isImmediatelyInvokedFunctionExpressionOrArrowFunction(node.Expression) {
+	if p.currentSourceFile != nil && p.currentSourceFile.ScriptKind == core.ScriptKindJSON {
+		// !!! In strada, this was handled by an undefined parenthesizerRule, so this is a hack.
+		p.emitExpression(node.Expression, ast.OperatorPrecedenceComma)
+	} else if isImmediatelyInvokedFunctionExpressionOrArrowFunction(node.Expression) {
 		// !!! introduce parentheses around callee
 		p.emitExpression(node.Expression, ast.OperatorPrecedenceParentheses)
 	} else {

testdata/baselines/reference/submodule/compiler/isolatedModules_resolveJsonModule_strict_outDir_commonJs.js

@@ -7,6 +7,8 @@ import * as j from "./j.json";
 {}
 
 
+//// [j.json]
+{}
 //// [a.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });

testdata/baselines/reference/submodule/compiler/isolatedModules_resolveJsonModule_strict_outDir_commonJs.js.diff

@@ -21,6 +21,15 @@ function fn(arg: Foo[]) { }
     ]
 }
 
+//// [data.json]
+{
+    "foo": [
+        {
+            "bool": true,
+            "str": "123"
+        }
+    ]
+}
 //// [index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {

testdata/baselines/reference/submodule/compiler/jsonFileImportChecksCallCorrectlyTwice.js

@@ -1,21 +1,6 @@
 --- old.jsonFileImportChecksCallCorrectlyTwice.js
 +++ new.jsonFileImportChecksCallCorrectlyTwice.js
-@@= skipped -20, +20 lines =@@
-     ]
- }
-
--//// [data.json]
--{
--    "foo": [
--        {
--            "bool": true,
--            "str": "123"
--        }
--    ]
--}
- //// [index.js]
- "use strict";
- var __importDefault = (this && this.__importDefault) || function (mod) {
+@@= skipped -35, +35 lines =@@
      return (mod && mod.__esModule) ? mod : { "default": mod };
  };
  Object.defineProperty(exports, "__esModule", { value: true });

testdata/baselines/reference/submodule/compiler/jsonFileImportChecksCallCorrectlyTwice.js.diff

@@ -13,6 +13,10 @@
 import foo from "./foo.json";
 console.log(foo.ios);
 
+//// [/bin/foo.ios.json]
+{
+    "ios": "platform ios"
+}
 //// [/bin/index.js]
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {

testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.js

@@ -1,16 +1,6 @@
 --- old.moduleResolutionWithSuffixes_one_jsonModule.js
 +++ new.moduleResolutionWithSuffixes_one_jsonModule.js
-@@= skipped -12, +12 lines =@@
- import foo from "./foo.json";
- console.log(foo.ios);
-
--//// [/bin/foo.ios.json]
--{
--    "ios": "platform ios"
--}
- //// [/bin/index.js]
- "use strict";
- var __importDefault = (this && this.__importDefault) || function (mod) {
+@@= skipped -22, +22 lines =@@
      return (mod && mod.__esModule) ? mod : { "default": mod };
  };
  Object.defineProperty(exports, "__esModule", { value: true });

testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.js.diff

@@ -15,6 +15,11 @@ if (x) {
     "b": "hello"
 }
 
+//// [out/b.json]
+{
+    "a": true,
+    "b": "hello"
+}
 //// [out/file1.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });