Further test and fix compiler options

internal/binder/binder_test.go

@@ -27,7 +27,7 @@ func BenchmarkBind(b *testing.B) {
 				sourceFiles[i] = parser.ParseSourceFile(fileName, path, sourceText, core.ScriptTargetESNext, scanner.JSDocParsingModeParseAll)
 			}
 
-			compilerOptions := &core.CompilerOptions{Target: core.ScriptTargetESNext, ModuleKind: core.ModuleKindNodeNext}
+			compilerOptions := &core.CompilerOptions{Target: core.ScriptTargetESNext, Module: core.ModuleKindNodeNext}
 			sourceAffecting := compilerOptions.SourceFileAffecting()
 
 			// The above parses do a lot of work; ensure GC is finished before we start collecting performance data.

internal/core/compileroptions.go

@@ -56,10 +56,10 @@ type CompilerOptions struct {
 	Lib                                       []string                                  `json:"lib,omitzero"`
 	Locale                                    string                                    `json:"locale,omitzero"`
 	MapRoot                                   string                                    `json:"mapRoot,omitzero"`
-	ModuleKind                                ModuleKind                                `json:"module,omitzero"`
+	Module                                    ModuleKind                                `json:"module,omitzero"`
 	ModuleResolution                          ModuleResolutionKind                      `json:"moduleResolution,omitzero"`
 	ModuleSuffixes                            []string                                  `json:"moduleSuffixes,omitzero"`
-	ModuleDetection                           ModuleDetectionKind                       `json:"moduleDetectionKind,omitzero"`
+	ModuleDetection                           ModuleDetectionKind                       `json:"moduleDetection,omitzero"`
 	NewLine                                   NewLineKind                               `json:"newLine,omitzero"`
 	NoEmit                                    Tristate                                  `json:"noEmit,omitzero"`
 	NoCheck                                   Tristate                                  `json:"noCheck,omitzero"`
@@ -153,8 +153,8 @@ func (options *CompilerOptions) GetEmitScriptTarget() ScriptTarget {
 }
 
 func (options *CompilerOptions) GetEmitModuleKind() ModuleKind {
-	if options.ModuleKind != ModuleKindNone {
-		return options.ModuleKind
+	if options.Module != ModuleKindNone {
+		return options.Module
 	}
 	if options.Target >= ScriptTargetES2015 {
 		return ModuleKindES2015

internal/transformers/commonjsmodule_test.go

@@ -1019,7 +1019,7 @@ exports.a = a;`,
 			t.Parallel()
 
 			compilerOptions := rec.options
-			compilerOptions.ModuleKind = core.ModuleKindCommonJS
+			compilerOptions.Module = core.ModuleKindCommonJS
 			sourceFileAffecting := compilerOptions.SourceFileAffecting()
 
 			file := parsetestutil.ParseTypeScript(rec.input, rec.jsx)

internal/transformers/esmodule.go

@@ -197,7 +197,7 @@ func (tx *ESModuleTransformer) visitExportDeclaration(node *ast.ExportDeclaratio
 	}
 
 	updatedModuleSpecifier := rewriteModuleSpecifier(tx.emitContext, node.ModuleSpecifier, tx.compilerOptions)
-	if tx.compilerOptions.ModuleKind > core.ModuleKindES2015 || node.ExportClause == nil || !ast.IsNamespaceExport(node.ExportClause) {
+	if tx.compilerOptions.Module > core.ModuleKindES2015 || node.ExportClause == nil || !ast.IsNamespaceExport(node.ExportClause) {
 		// Either ill-formed or don't need to be transformed.
 		return tx.factory.UpdateExportDeclaration(
 			node,

internal/transformers/esmodule_test.go

@@ -58,31 +58,31 @@ func TestESModuleTransformer(t *testing.T) {
 			output: `import { createRequire as _createRequire } from "module";
 const __require = _createRequire(import.meta.url);
 const x = __require("other");`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindNode16},
+			options: core.CompilerOptions{Module: core.ModuleKindNode16},
 		},
 		{
 			title: "ImportEqualsDeclaration#3",
 			input: `import x = require("./other.ts")`,
 			output: `import { createRequire as _createRequire } from "module";
 const __require = _createRequire(import.meta.url);
 const x = __require("./other.js");`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue},
+			options: core.CompilerOptions{Module: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue},
 		},
 		{
 			title: "ImportEqualsDeclaration#4",
 			input: `import x = require("./other.tsx")`,
 			output: `import { createRequire as _createRequire } from "module";
 const __require = _createRequire(import.meta.url);
 const x = __require("./other.js");`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue},
+			options: core.CompilerOptions{Module: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue},
 		},
 		{
 			title: "ImportEqualsDeclaration#5",
 			input: `import x = require("./other.tsx")`,
 			output: `import { createRequire as _createRequire } from "module";
 const __require = _createRequire(import.meta.url);
 const x = __require("./other.jsx");`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue, Jsx: core.JsxEmitPreserve},
+			options: core.CompilerOptions{Module: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue, Jsx: core.JsxEmitPreserve},
 		},
 		{
 			title: "ImportEqualsDeclaration#6",
@@ -91,7 +91,7 @@ const x = __require("./other.jsx");`,
 const __require = _createRequire(import.meta.url);
 const x = __require("other");
 export { x };`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindNode16},
+			options: core.CompilerOptions{Module: core.ModuleKindNode16},
 		},
 
 		// ExportAssignment
@@ -104,7 +104,7 @@ export { x };`,
 			title:   "ExportAssignment#2",
 			input:   `export = x`,
 			output:  `module.exports = x;`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindPreserve},
+			options: core.CompilerOptions{Module: core.ModuleKindPreserve},
 		},
 
 		// ExportDeclaration
@@ -123,7 +123,7 @@ export { x };`,
 			title:   "ExportDeclaration#3",
 			input:   `export * as x from "other";`,
 			output:  `export * as x from "other";`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindESNext},
+			options: core.CompilerOptions{Module: core.ModuleKindESNext},
 		},
 		{
 			title:  "ExportDeclaration#4",
@@ -201,7 +201,7 @@ import(x);`,
 			output: `import { __rewriteRelativeImportExtension } from "tslib";
 export {};
 import(__rewriteRelativeImportExtension(x));`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindESNext, RewriteRelativeImportExtensions: core.TSTrue, ImportHelpers: core.TSTrue},
+			options: core.CompilerOptions{Module: core.ModuleKindESNext, RewriteRelativeImportExtensions: core.TSTrue, ImportHelpers: core.TSTrue},
 		},
 		{
 			title: "CallExpression#7",
@@ -212,7 +212,7 @@ var __rewriteRelativeImportExtension;`,
 export {};
 import(__rewriteRelativeImportExtension_1(x));
 var __rewriteRelativeImportExtension;`,
-			options: core.CompilerOptions{ModuleKind: core.ModuleKindESNext, RewriteRelativeImportExtensions: core.TSTrue, ImportHelpers: core.TSTrue},
+			options: core.CompilerOptions{Module: core.ModuleKindESNext, RewriteRelativeImportExtensions: core.TSTrue, ImportHelpers: core.TSTrue},
 		},
 	}
 	for _, rec := range data {

internal/tsoptions/decls_test.go

@@ -0,0 +1,82 @@
+package tsoptions_test
+
+import (
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/tsoptions"
+)
+
+func TestCompilerOptionsDeclaration(t *testing.T) {
+	t.Parallel()
+
+	decls := make(map[string]*tsoptions.CommandLineOption)
+
+	for _, decl := range tsoptions.OptionsDeclarations {
+		decls[strings.ToLower(decl.Name)] = decl
+	}
+
+	internalOptions := []string{
+		"allowNonTsExtensions",
+		"build",
+		"configFilePath",
+		"noDtsResolution",
+		"noEmitForJsFiles",
+		"pathsBasePath",
+		"suppressOutputPathCheck",
+		"tscBuild",
+	}
+
+	internalOptionsMap := make(map[string]string)
+	for _, opt := range internalOptions {
+		internalOptionsMap[strings.ToLower(opt)] = opt
+	}
+
+	compilerOptionsType := reflect.TypeFor[core.CompilerOptions]()
+	for i := range compilerOptionsType.NumField() {
+		field := compilerOptionsType.Field(i)
+		lowerName := strings.ToLower(field.Name)
+
+		decl := decls[lowerName]
+		if decl == nil {
+			if name, ok := internalOptionsMap[lowerName]; ok {
+				checkCompilerOptionJsonTagName(t, field, name)
+				continue
+			}
+			t.Errorf("CompilerOptions.%s has no options declaration", field.Name)
+			continue
+		}
+		delete(decls, lowerName)
+
+		checkCompilerOptionJsonTagName(t, field, decl.Name)
+	}
+
+	skippedOptions := []string{
+		"charset",
+		"noImplicitUseStrict",
+		"noStrictGenericChecks",
+		"plugins",
+		"preserveValueImports",
+		"suppressExcessPropertyErrors",
+		"suppressImplicitAnyIndexErrors",
+	}
+
+	for _, opt := range skippedOptions {
+		delete(decls, strings.ToLower(opt))
+	}
+
+	for _, decl := range decls {
+		t.Errorf("Option declaration %s is not present in CompilerOptions", decl.Name)
+	}
+}
+
+func checkCompilerOptionJsonTagName(t *testing.T, field reflect.StructField, name string) {
+	t.Helper()
+	want := name + ",omitzero"
+	got := field.Tag.Get("json")
+	if got != want {
+		t.Errorf("Field %s has json tag %s, but the option declaration has name %s", field.Name, got, want)
+	}
+}

internal/tsoptions/parsinghelpers.go

@@ -259,7 +259,7 @@ func parseCompilerOptions(key string, value any, allOptions *core.CompilerOption
 	case "mapRoot":
 		allOptions.MapRoot = parseString(value)
 	case "module":
-		allOptions.ModuleKind = value.(core.ModuleKind)
+		allOptions.Module = value.(core.ModuleKind)
 	case "moduleDetectionKind":
 		allOptions.ModuleDetection = value.(core.ModuleDetectionKind)
 	case "moduleResolution":

internal/tsoptions/tsconfigparsing_test.go

@@ -732,7 +732,7 @@ func TestParseSrcCompiler(t *testing.T) {
 	opts := parseConfigFileContent.CompilerOptions()
 	assert.DeepEqual(t, opts, &core.CompilerOptions{
 		Lib:                        []string{"lib.es2020.d.ts"},
-		ModuleKind:                 core.ModuleKindNodeNext,
+		Module:                     core.ModuleKindNodeNext,
 		ModuleResolution:           core.ModuleResolutionKindNodeNext,
 		NewLine:                    core.NewLineKindLF,
 		OutDir:                     tspath.NormalizeSlashes(filepath.Join(repo.TypeScriptSubmodulePath, "built", "local")),

testdata/baselines/reference/config/tsconfigParsing/parses tsconfig with compilerOptions, files, include, and exclude with json api.js

@@ -39,7 +39,7 @@ CompilerOptions::
   "jsx": 3,
   "module": 99,
   "moduleResolution": 100,
-  "moduleDetectionKind": 1,
+  "moduleDetection": 1,
   "noImplicitAny": true,
   "outDir": "/apath/dist",
   "paths": {

testdata/baselines/reference/config/tsconfigParsing/parses tsconfig with compilerOptions, files, include, and exclude with jsonSourceFile api.js

@@ -39,7 +39,7 @@ CompilerOptions::
   "jsx": 3,
   "module": 99,
   "moduleResolution": 100,
-  "moduleDetectionKind": 1,
+  "moduleDetection": 1,
   "noImplicitAny": true,
   "outDir": "/apath/dist",
   "paths": {

testdata/baselines/reference/tsc/commandLine/Parse-enum-type-options.js

@@ -11,7 +11,7 @@ ParsedCommandLine::{
             "jsx": 3,
             "module": 199,
             "moduleResolution": 99,
-            "moduleDetectionKind": 1,
+            "moduleDetection": 1,
             "newLine": 1,
             "target": 99
         },