Skip to content

Commit 0467926

Browse files
committed
Use derived isolatedModules flag
1 parent eb5048e commit 0467926

File tree

5 files changed

+7
-26
lines changed

5 files changed

+7
-26
lines changed

internal/compiler/emitter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func getScriptTransformers(emitContext *printer.EmitContext, host printer.EmitHo
8787

8888
var emitResolver printer.EmitResolver
8989
var referenceResolver binder.ReferenceResolver
90-
if importElisionEnabled || options.GetJSXTransformEnabled() || !options.IsolatedModules.IsTrue() { // full emit resolver is needed for import ellision and const enum inlining
90+
if importElisionEnabled || options.GetJSXTransformEnabled() || !options.GetIsolatedModules() { // full emit resolver is needed for import ellision and const enum inlining
9191
emitResolver = host.GetEmitResolver()
9292
emitResolver.MarkLinkedReferencesRecursively(sourceFile)
9393
referenceResolver = emitResolver
@@ -131,7 +131,7 @@ func getScriptTransformers(emitContext *printer.EmitContext, host printer.EmitHo
131131
tx = append(tx, getModuleTransformer(&opts))
132132

133133
// inlining (formerly done via substitutions)
134-
if !options.IsolatedModules.IsTrue() {
134+
if !options.GetIsolatedModules() {
135135
tx = append(tx, inliners.NewConstEnumInliningTransformer(&opts))
136136
}
137137
return tx

internal/transformers/inliners/constenum.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type ConstEnumInliningTransformer struct {
2222
func NewConstEnumInliningTransformer(opt *transformers.TransformOptions) *transformers.Transformer {
2323
compilerOptions := opt.CompilerOptions
2424
emitContext := opt.Context
25-
if compilerOptions.IsolatedModules.IsTrue() {
25+
if compilerOptions.GetIsolatedModules() {
2626
debug.Fail("const enums are not inlined under isolated modules")
2727
}
2828
tx := &ConstEnumInliningTransformer{compilerOptions: compilerOptions, emitResolver: opt.EmitResolver}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ function foo1() {
2929
})(E || (E = {}));
3030
}
3131
function foo2() {
32-
return 0 /* E.A */;
32+
return E.A;
3333
let E;
3434
(function (E) {
3535
E[E["A"] = 0] = "A";
3636
})(E || (E = {}));
3737
}
3838
const config = {
39-
a: 2 /* AfterObject.A */,
39+
a: AfterObject.A,
4040
};
4141
var AfterObject;
4242
(function (AfterObject) {

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

testdata/baselines/reference/tsc/projectReferences/importing-const-enum-from-referenced-project-with-preserveConstEnums-and-verbatimModuleSyntax.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ declare const console: { log(msg: any): void; };
7373
//// [/home/src/workspaces/solution/project/index.js] *new*
7474
import { E } from "../preserve";
7575
import { F } from "../no-preserve";
76-
1 /* E.A */;
77-
1 /* F.A */;
76+
E.A;
77+
F.A;
7878

7979

0 commit comments

Comments
 (0)