diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index 6f77af9e1b1..b21888514f1 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -1170,13 +1170,18 @@ namespace ts { return reduceLeft(expressions, createComma); } - export function createExpressionFromEntityName(node: EntityName | Expression): Expression { - return isQualifiedName(node) - ? createPropertyAccess( - createExpressionFromEntityName(node.left), - getSynthesizedClone(node.right) - ) - : getSynthesizedClone(node); + export function createExpressionFromEntityName(node: EntityName | Expression, emitOptions?: NodeEmitOptions): Expression { + if (isQualifiedName(node)) { + const left = createExpressionFromEntityName(node.left, emitOptions); + const right = getMutableClone(node.right, emitOptions && clone(emitOptions)); + return createPropertyAccess(left, right, /*location*/ node, emitOptions && clone(emitOptions)); + } + else if (isIdentifier(node)) { + return getMutableClone(node, emitOptions && clone(emitOptions)); + } + else { + return getMutableClone(node, emitOptions && clone(emitOptions)); + } } export function createExpressionForPropertyName(memberName: PropertyName, emitOptions?: NodeEmitOptions): Expression { diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts index 6b56c38778d..6edd24a3019 100644 --- a/src/compiler/transformers/ts.ts +++ b/src/compiler/transformers/ts.ts @@ -2256,14 +2256,15 @@ namespace ts { context, node, hoistVariableDeclaration, - getNamespaceMemberName, + getNamespaceMemberNameWithSourceMapsAndWithoutComments, visitor ); } else { return createAssignment( - getNamespaceMemberName(name), - visitNode(node.initializer, visitor, isExpression) + getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), + visitNode(node.initializer, visitor, isExpression), + /*location*/ node ); } } @@ -2726,7 +2727,7 @@ namespace ts { return undefined; } - const moduleReference = createExpressionFromEntityName(node.moduleReference); + const moduleReference = createExpressionFromEntityName(node.moduleReference, { flags: NodeEmitFlags.NoComments }); if (isNamedExternalModuleExport(node) || !isNamespaceExport(node)) { // export var ${name} = ${moduleReference}; // var ${name} = ${moduleReference}; @@ -2734,7 +2735,10 @@ namespace ts { createVariableStatement( visitNodes(node.modifiers, visitor, isModifier), createVariableDeclarationList([ - createVariableDeclaration(node.name, moduleReference) + createVariableDeclaration( + node.name, + moduleReference + ) ]), node ), @@ -2745,7 +2749,7 @@ namespace ts { // exports.${name} = ${moduleReference}; return setOriginalNode( createNamespaceExport( - getSynthesizedClone(node.name), + node.name, moduleReference, node ), @@ -2845,6 +2849,10 @@ namespace ts { return qualifiedName; } + function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name: Identifier) { + return getNamespaceMemberName(name, /*allowComments*/ false, /*allowSourceMaps*/ true); + } + /** * Gets the declaration name used inside of a namespace or enum. */ diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map index 2a1a549beff..7d1182a1873 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js.map +++ b/tests/baselines/reference/sourceMapValidationImport.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationImport.js.map] -{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACb;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,SAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC,EAAC,CAAC;IACb;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt index ca0ae80c5fc..cc4798de5a0 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -171,28 +171,31 @@ sourceFile:sourceMapValidationImport.ts --- >>>exports.b = m.c; 1-> -2 >^^^^^^^^^ -3 > ^^^ -4 > ^ -5 > ^ -6 > ^ -7 > ^ -8 > ^-> +2 >^^^^^^^^ +3 > ^ +4 > ^^^ +5 > ^ +6 > ^ +7 > ^ +8 > ^ +9 > ^-> 1-> >export import -2 >b -3 > = -4 > m -5 > . -6 > c -7 > ; +2 > +3 > b +4 > = +5 > m +6 > . +7 > c +8 > ; 1->Emitted(12, 1) Source(6, 15) + SourceIndex(0) -2 >Emitted(12, 10) Source(6, 16) + SourceIndex(0) -3 >Emitted(12, 13) Source(6, 19) + SourceIndex(0) -4 >Emitted(12, 14) Source(6, 20) + SourceIndex(0) -5 >Emitted(12, 15) Source(6, 21) + SourceIndex(0) -6 >Emitted(12, 16) Source(6, 22) + SourceIndex(0) -7 >Emitted(12, 17) Source(6, 23) + SourceIndex(0) +2 >Emitted(12, 9) Source(6, 15) + SourceIndex(0) +3 >Emitted(12, 10) Source(6, 16) + SourceIndex(0) +4 >Emitted(12, 13) Source(6, 19) + SourceIndex(0) +5 >Emitted(12, 14) Source(6, 20) + SourceIndex(0) +6 >Emitted(12, 15) Source(6, 21) + SourceIndex(0) +7 >Emitted(12, 16) Source(6, 22) + SourceIndex(0) +8 >Emitted(12, 17) Source(6, 23) + SourceIndex(0) --- >>>var x = new a(); 1-> diff --git a/tests/baselines/reference/tsxEmit3.js.map b/tests/baselines/reference/tsxEmit3.js.map index 1a19c6b6bf3..bae6c014d17 100644 --- a/tests/baselines/reference/tsxEmit3.js.map +++ b/tests/baselines/reference/tsxEmit3.js.map @@ -1,2 +1,2 @@ //// [file.jsx.map] -{"version":3,"file":"file.jsx","sourceRoot":"","sources":["file.tsx"],"names":[],"mappings":"AAMA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC,EAAC,CAAC;IACT;QAAmB;QAAgB,CAAC;QAAC,UAAC;IAAD,CAAC,AAAtC,IAAsC;IAAzB,KAAG,MAAsB,CAAA;IACtC,IAAc,CAAC,CAKd;IALD,WAAc,CAAC,EAAC,CAAC;QAChB;YAAA;YAAmB,CAAC;YAAD,UAAC;QAAD,CAAC,AAApB,IAAoB;QAAP,KAAG,MAAI,CAAA;IAIrB,CAAC,EALa,CAAC,GAAD,GAAC,KAAD,GAAC,QAKd;AACF,CAAC,EARM,CAAC,KAAD,CAAC,QAQP;AAED,IAAO,CAAC,CAYP;AAZD,WAAO,CAAC,EAAC,CAAC;IACT,aAAa;IACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;IAEb,IAAc,CAAC,CAMd;IAND,WAAc,CAAC,EAAC,CAAC;QAChB,aAAa;QACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;QAEb,aAAa;QACb,KAAG,EAAE,CAAC,KAAG,GAAG,CAAC;IACd,CAAC,EANa,CAAC,GAAD,GAAC,KAAD,GAAC,QAMd;AAEF,CAAC,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,IAAO,CAAC,CAGP;AAHD,WAAO,CAAC,EAAC,CAAC;IACT,eAAe;IACf,GAAC,CAAC,GAAG,EAAE,CAAC,GAAC,CAAC,GAAG,GAAG,CAAC;AAClB,CAAC,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,IAAO,CAAC,CAIP;AAJD,WAAO,GAAC,EAAC,CAAC;IACT,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,eAAe;IACf,OAAG,EAAE,CAAC,OAAG,GAAG,CAAC;AACd,CAAC,EAJM,CAAC,KAAD,CAAC,QAIP"} \ No newline at end of file +{"version":3,"file":"file.jsx","sourceRoot":"","sources":["file.tsx"],"names":[],"mappings":"AAMA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC,EAAC,CAAC;IACT;QAAmB;QAAgB,CAAC;QAAC,UAAC;IAAD,CAAC,AAAtC,IAAsC;IAAzB,KAAG,MAAsB,CAAA;IACtC,IAAc,CAAC,CAKd;IALD,WAAc,CAAC,EAAC,CAAC;QAChB;YAAA;YAAmB,CAAC;YAAD,UAAC;QAAD,CAAC,AAApB,IAAoB;QAAP,KAAG,MAAI,CAAA;QAEpB,WAAW;QACX,gBAAgB;IACjB,CAAC,EALa,CAAC,GAAD,GAAC,KAAD,GAAC,QAKd;AACF,CAAC,EARM,CAAC,KAAD,CAAC,QAQP;AAED,IAAO,CAAC,CAYP;AAZD,WAAO,CAAC,EAAC,CAAC;IACT,aAAa;IACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,GAAG,CAAC;IAEb,IAAc,CAAC,CAMd;IAND,WAAc,CAAC,EAAC,CAAC;QAChB,aAAa;QACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,GAAG,CAAC;QAEb,aAAa;QACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,GAAG,CAAC;IACd,CAAC,EANa,CAAC,GAAD,GAAC,KAAD,GAAC,QAMd;AAEF,CAAC,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,IAAO,CAAC,CAGP;AAHD,WAAO,CAAC,EAAC,CAAC;IACT,eAAe;IACf,EAAA,CAAC,CAAC,GAAG,EAAE,CAAC,EAAA,CAAC,CAAC,GAAG,GAAG,CAAC;AAClB,CAAC,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,IAAO,CAAC,CAIP;AAJD,WAAO,GAAC,EAAC,CAAC;IACT,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,eAAe;IACf,IAAA,GAAG,EAAE,CAAC,IAAA,GAAG,GAAG,CAAC;AACd,CAAC,EAJM,CAAC,KAAD,CAAC,QAIP"} \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit3.sourcemap.txt b/tests/baselines/reference/tsxEmit3.sourcemap.txt index b8fdbbfc4ba..a1bf07541e6 100644 --- a/tests/baselines/reference/tsxEmit3.sourcemap.txt +++ b/tests/baselines/reference/tsxEmit3.sourcemap.txt @@ -203,7 +203,6 @@ sourceFile:file.tsx 2 > ^^^^^ 3 > ^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^-> 1-> 2 > Bar 3 > { } @@ -213,6 +212,27 @@ sourceFile:file.tsx 3 >Emitted(16, 20) Source(10, 23) + SourceIndex(0) 4 >Emitted(16, 21) Source(10, 23) + SourceIndex(0) --- +>>> // Emit Foo +1 >^^^^^^^^ +2 > ^^^^^^^^^^^ +3 > ^^^^^^-> +1 > + > + > +2 > // Emit Foo +1 >Emitted(17, 9) Source(12, 3) + SourceIndex(0) +2 >Emitted(17, 20) Source(12, 14) + SourceIndex(0) +--- +>>> // Foo, ; +1->^^^^^^^^ +2 > ^^^^^^^^^^^^^^^^ +3 > ^^^^^^^-> +1-> + > +2 > // Foo, ; +1->Emitted(18, 9) Source(13, 3) + SourceIndex(0) +2 >Emitted(18, 25) Source(13, 19) + SourceIndex(0) +--- >>> })(S = M.S || (M.S = {})); 1->^^^^ 2 > ^ @@ -224,9 +244,6 @@ sourceFile:file.tsx 8 > ^^^ 9 > ^^^^^^^^ 1-> - > - > // Emit Foo - > // Foo, ; > 2 > } 3 > @@ -241,15 +258,15 @@ sourceFile:file.tsx > // Emit Foo > // Foo, ; > } -1->Emitted(17, 5) Source(14, 2) + SourceIndex(0) -2 >Emitted(17, 6) Source(14, 3) + SourceIndex(0) -3 >Emitted(17, 8) Source(9, 16) + SourceIndex(0) -4 >Emitted(17, 9) Source(9, 17) + SourceIndex(0) -5 >Emitted(17, 12) Source(9, 16) + SourceIndex(0) -6 >Emitted(17, 15) Source(9, 17) + SourceIndex(0) -7 >Emitted(17, 20) Source(9, 16) + SourceIndex(0) -8 >Emitted(17, 23) Source(9, 17) + SourceIndex(0) -9 >Emitted(17, 31) Source(14, 3) + SourceIndex(0) +1->Emitted(19, 5) Source(14, 2) + SourceIndex(0) +2 >Emitted(19, 6) Source(14, 3) + SourceIndex(0) +3 >Emitted(19, 8) Source(9, 16) + SourceIndex(0) +4 >Emitted(19, 9) Source(9, 17) + SourceIndex(0) +5 >Emitted(19, 12) Source(9, 16) + SourceIndex(0) +6 >Emitted(19, 15) Source(9, 17) + SourceIndex(0) +7 >Emitted(19, 20) Source(9, 16) + SourceIndex(0) +8 >Emitted(19, 23) Source(9, 17) + SourceIndex(0) +9 >Emitted(19, 31) Source(14, 3) + SourceIndex(0) --- >>>})(M || (M = {})); 1 > @@ -275,13 +292,13 @@ sourceFile:file.tsx > // Foo, ; > } > } -1 >Emitted(18, 1) Source(15, 1) + SourceIndex(0) -2 >Emitted(18, 2) Source(15, 2) + SourceIndex(0) -3 >Emitted(18, 4) Source(7, 8) + SourceIndex(0) -4 >Emitted(18, 5) Source(7, 9) + SourceIndex(0) -5 >Emitted(18, 10) Source(7, 8) + SourceIndex(0) -6 >Emitted(18, 11) Source(7, 9) + SourceIndex(0) -7 >Emitted(18, 19) Source(15, 2) + SourceIndex(0) +1 >Emitted(20, 1) Source(15, 1) + SourceIndex(0) +2 >Emitted(20, 2) Source(15, 2) + SourceIndex(0) +3 >Emitted(20, 4) Source(7, 8) + SourceIndex(0) +4 >Emitted(20, 5) Source(7, 9) + SourceIndex(0) +5 >Emitted(20, 10) Source(7, 8) + SourceIndex(0) +6 >Emitted(20, 11) Source(7, 9) + SourceIndex(0) +7 >Emitted(20, 19) Source(15, 2) + SourceIndex(0) --- >>>var M; 1 > @@ -307,10 +324,10 @@ sourceFile:file.tsx > } > > } -1 >Emitted(19, 1) Source(17, 1) + SourceIndex(0) -2 >Emitted(19, 5) Source(17, 8) + SourceIndex(0) -3 >Emitted(19, 6) Source(17, 9) + SourceIndex(0) -4 >Emitted(19, 7) Source(29, 2) + SourceIndex(0) +1 >Emitted(21, 1) Source(17, 1) + SourceIndex(0) +2 >Emitted(21, 5) Source(17, 8) + SourceIndex(0) +3 >Emitted(21, 6) Source(17, 9) + SourceIndex(0) +4 >Emitted(21, 7) Source(29, 2) + SourceIndex(0) --- >>>(function (M) { 1-> @@ -324,11 +341,11 @@ sourceFile:file.tsx 3 > M 4 > 5 > { -1->Emitted(20, 1) Source(17, 1) + SourceIndex(0) -2 >Emitted(20, 12) Source(17, 8) + SourceIndex(0) -3 >Emitted(20, 13) Source(17, 9) + SourceIndex(0) -4 >Emitted(20, 15) Source(17, 10) + SourceIndex(0) -5 >Emitted(20, 16) Source(17, 11) + SourceIndex(0) +1->Emitted(22, 1) Source(17, 1) + SourceIndex(0) +2 >Emitted(22, 12) Source(17, 8) + SourceIndex(0) +3 >Emitted(22, 13) Source(17, 9) + SourceIndex(0) +4 >Emitted(22, 15) Source(17, 10) + SourceIndex(0) +5 >Emitted(22, 16) Source(17, 11) + SourceIndex(0) --- >>> // Emit M.Foo 1->^^^^ @@ -337,32 +354,38 @@ sourceFile:file.tsx 1-> > 2 > // Emit M.Foo -1->Emitted(21, 5) Source(18, 2) + SourceIndex(0) -2 >Emitted(21, 18) Source(18, 15) + SourceIndex(0) +1->Emitted(23, 5) Source(18, 2) + SourceIndex(0) +2 >Emitted(23, 18) Source(18, 15) + SourceIndex(0) --- >>> M.Foo, ; 1->^^^^ -2 > ^^^^^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^^^ -7 > ^ +2 > ^^ +3 > ^^^ +4 > ^^ +5 > ^ +6 > ^^ +7 > ^^^ +8 > ^^^ +9 > ^ 1-> > -2 > Foo -3 > , -4 > < -5 > Foo -6 > /> -7 > ; -1->Emitted(22, 5) Source(19, 2) + SourceIndex(0) -2 >Emitted(22, 10) Source(19, 5) + SourceIndex(0) -3 >Emitted(22, 12) Source(19, 7) + SourceIndex(0) -4 >Emitted(22, 13) Source(19, 8) + SourceIndex(0) -5 >Emitted(22, 18) Source(19, 11) + SourceIndex(0) -6 >Emitted(22, 21) Source(19, 14) + SourceIndex(0) -7 >Emitted(22, 22) Source(19, 15) + SourceIndex(0) +2 > +3 > Foo +4 > , +5 > < +6 > +7 > Foo +8 > /> +9 > ; +1->Emitted(24, 5) Source(19, 2) + SourceIndex(0) +2 >Emitted(24, 7) Source(19, 2) + SourceIndex(0) +3 >Emitted(24, 10) Source(19, 5) + SourceIndex(0) +4 >Emitted(24, 12) Source(19, 7) + SourceIndex(0) +5 >Emitted(24, 13) Source(19, 8) + SourceIndex(0) +6 >Emitted(24, 15) Source(19, 8) + SourceIndex(0) +7 >Emitted(24, 18) Source(19, 11) + SourceIndex(0) +8 >Emitted(24, 21) Source(19, 14) + SourceIndex(0) +9 >Emitted(24, 22) Source(19, 15) + SourceIndex(0) --- >>> var S; 1 >^^^^ @@ -382,10 +405,10 @@ sourceFile:file.tsx > // Emit S.Bar > Bar, ; > } -1 >Emitted(23, 5) Source(21, 2) + SourceIndex(0) -2 >Emitted(23, 9) Source(21, 16) + SourceIndex(0) -3 >Emitted(23, 10) Source(21, 17) + SourceIndex(0) -4 >Emitted(23, 11) Source(27, 3) + SourceIndex(0) +1 >Emitted(25, 5) Source(21, 2) + SourceIndex(0) +2 >Emitted(25, 9) Source(21, 16) + SourceIndex(0) +3 >Emitted(25, 10) Source(21, 17) + SourceIndex(0) +4 >Emitted(25, 11) Source(27, 3) + SourceIndex(0) --- >>> (function (S) { 1->^^^^ @@ -399,11 +422,11 @@ sourceFile:file.tsx 3 > S 4 > 5 > { -1->Emitted(24, 5) Source(21, 2) + SourceIndex(0) -2 >Emitted(24, 16) Source(21, 16) + SourceIndex(0) -3 >Emitted(24, 17) Source(21, 17) + SourceIndex(0) -4 >Emitted(24, 19) Source(21, 18) + SourceIndex(0) -5 >Emitted(24, 20) Source(21, 19) + SourceIndex(0) +1->Emitted(26, 5) Source(21, 2) + SourceIndex(0) +2 >Emitted(26, 16) Source(21, 16) + SourceIndex(0) +3 >Emitted(26, 17) Source(21, 17) + SourceIndex(0) +4 >Emitted(26, 19) Source(21, 18) + SourceIndex(0) +5 >Emitted(26, 20) Source(21, 19) + SourceIndex(0) --- >>> // Emit M.Foo 1->^^^^^^^^ @@ -412,32 +435,38 @@ sourceFile:file.tsx 1-> > 2 > // Emit M.Foo -1->Emitted(25, 9) Source(22, 3) + SourceIndex(0) -2 >Emitted(25, 22) Source(22, 16) + SourceIndex(0) +1->Emitted(27, 9) Source(22, 3) + SourceIndex(0) +2 >Emitted(27, 22) Source(22, 16) + SourceIndex(0) --- >>> M.Foo, ; 1->^^^^^^^^ -2 > ^^^^^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^^^ -7 > ^ +2 > ^^ +3 > ^^^ +4 > ^^ +5 > ^ +6 > ^^ +7 > ^^^ +8 > ^^^ +9 > ^ 1-> > -2 > Foo -3 > , -4 > < -5 > Foo -6 > /> -7 > ; -1->Emitted(26, 9) Source(23, 3) + SourceIndex(0) -2 >Emitted(26, 14) Source(23, 6) + SourceIndex(0) -3 >Emitted(26, 16) Source(23, 8) + SourceIndex(0) -4 >Emitted(26, 17) Source(23, 9) + SourceIndex(0) -5 >Emitted(26, 22) Source(23, 12) + SourceIndex(0) -6 >Emitted(26, 25) Source(23, 15) + SourceIndex(0) -7 >Emitted(26, 26) Source(23, 16) + SourceIndex(0) +2 > +3 > Foo +4 > , +5 > < +6 > +7 > Foo +8 > /> +9 > ; +1->Emitted(28, 9) Source(23, 3) + SourceIndex(0) +2 >Emitted(28, 11) Source(23, 3) + SourceIndex(0) +3 >Emitted(28, 14) Source(23, 6) + SourceIndex(0) +4 >Emitted(28, 16) Source(23, 8) + SourceIndex(0) +5 >Emitted(28, 17) Source(23, 9) + SourceIndex(0) +6 >Emitted(28, 19) Source(23, 9) + SourceIndex(0) +7 >Emitted(28, 22) Source(23, 12) + SourceIndex(0) +8 >Emitted(28, 25) Source(23, 15) + SourceIndex(0) +9 >Emitted(28, 26) Source(23, 16) + SourceIndex(0) --- >>> // Emit S.Bar 1 >^^^^^^^^ @@ -447,33 +476,39 @@ sourceFile:file.tsx > > 2 > // Emit S.Bar -1 >Emitted(27, 9) Source(25, 3) + SourceIndex(0) -2 >Emitted(27, 22) Source(25, 16) + SourceIndex(0) +1 >Emitted(29, 9) Source(25, 3) + SourceIndex(0) +2 >Emitted(29, 22) Source(25, 16) + SourceIndex(0) --- >>> S.Bar, ; 1->^^^^^^^^ -2 > ^^^^^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^^^ -7 > ^ -8 > ^^^^^^-> +2 > ^^ +3 > ^^^ +4 > ^^ +5 > ^ +6 > ^^ +7 > ^^^ +8 > ^^^ +9 > ^ +10> ^^^^^^-> 1-> > -2 > Bar -3 > , -4 > < -5 > Bar -6 > /> -7 > ; -1->Emitted(28, 9) Source(26, 3) + SourceIndex(0) -2 >Emitted(28, 14) Source(26, 6) + SourceIndex(0) -3 >Emitted(28, 16) Source(26, 8) + SourceIndex(0) -4 >Emitted(28, 17) Source(26, 9) + SourceIndex(0) -5 >Emitted(28, 22) Source(26, 12) + SourceIndex(0) -6 >Emitted(28, 25) Source(26, 15) + SourceIndex(0) -7 >Emitted(28, 26) Source(26, 16) + SourceIndex(0) +2 > +3 > Bar +4 > , +5 > < +6 > +7 > Bar +8 > /> +9 > ; +1->Emitted(30, 9) Source(26, 3) + SourceIndex(0) +2 >Emitted(30, 11) Source(26, 3) + SourceIndex(0) +3 >Emitted(30, 14) Source(26, 6) + SourceIndex(0) +4 >Emitted(30, 16) Source(26, 8) + SourceIndex(0) +5 >Emitted(30, 17) Source(26, 9) + SourceIndex(0) +6 >Emitted(30, 19) Source(26, 9) + SourceIndex(0) +7 >Emitted(30, 22) Source(26, 12) + SourceIndex(0) +8 >Emitted(30, 25) Source(26, 15) + SourceIndex(0) +9 >Emitted(30, 26) Source(26, 16) + SourceIndex(0) --- >>> })(S = M.S || (M.S = {})); 1->^^^^ @@ -501,15 +536,15 @@ sourceFile:file.tsx > // Emit S.Bar > Bar, ; > } -1->Emitted(29, 5) Source(27, 2) + SourceIndex(0) -2 >Emitted(29, 6) Source(27, 3) + SourceIndex(0) -3 >Emitted(29, 8) Source(21, 16) + SourceIndex(0) -4 >Emitted(29, 9) Source(21, 17) + SourceIndex(0) -5 >Emitted(29, 12) Source(21, 16) + SourceIndex(0) -6 >Emitted(29, 15) Source(21, 17) + SourceIndex(0) -7 >Emitted(29, 20) Source(21, 16) + SourceIndex(0) -8 >Emitted(29, 23) Source(21, 17) + SourceIndex(0) -9 >Emitted(29, 31) Source(27, 3) + SourceIndex(0) +1->Emitted(31, 5) Source(27, 2) + SourceIndex(0) +2 >Emitted(31, 6) Source(27, 3) + SourceIndex(0) +3 >Emitted(31, 8) Source(21, 16) + SourceIndex(0) +4 >Emitted(31, 9) Source(21, 17) + SourceIndex(0) +5 >Emitted(31, 12) Source(21, 16) + SourceIndex(0) +6 >Emitted(31, 15) Source(21, 17) + SourceIndex(0) +7 >Emitted(31, 20) Source(21, 16) + SourceIndex(0) +8 >Emitted(31, 23) Source(21, 17) + SourceIndex(0) +9 >Emitted(31, 31) Source(27, 3) + SourceIndex(0) --- >>>})(M || (M = {})); 1 > @@ -540,13 +575,13 @@ sourceFile:file.tsx > } > > } -1 >Emitted(30, 1) Source(29, 1) + SourceIndex(0) -2 >Emitted(30, 2) Source(29, 2) + SourceIndex(0) -3 >Emitted(30, 4) Source(17, 8) + SourceIndex(0) -4 >Emitted(30, 5) Source(17, 9) + SourceIndex(0) -5 >Emitted(30, 10) Source(17, 8) + SourceIndex(0) -6 >Emitted(30, 11) Source(17, 9) + SourceIndex(0) -7 >Emitted(30, 19) Source(29, 2) + SourceIndex(0) +1 >Emitted(32, 1) Source(29, 1) + SourceIndex(0) +2 >Emitted(32, 2) Source(29, 2) + SourceIndex(0) +3 >Emitted(32, 4) Source(17, 8) + SourceIndex(0) +4 >Emitted(32, 5) Source(17, 9) + SourceIndex(0) +5 >Emitted(32, 10) Source(17, 8) + SourceIndex(0) +6 >Emitted(32, 11) Source(17, 9) + SourceIndex(0) +7 >Emitted(32, 19) Source(29, 2) + SourceIndex(0) --- >>>var M; 1 > @@ -563,10 +598,10 @@ sourceFile:file.tsx > // Emit M.S.Bar > S.Bar, ; > } -1 >Emitted(31, 1) Source(31, 1) + SourceIndex(0) -2 >Emitted(31, 5) Source(31, 8) + SourceIndex(0) -3 >Emitted(31, 6) Source(31, 9) + SourceIndex(0) -4 >Emitted(31, 7) Source(34, 2) + SourceIndex(0) +1 >Emitted(33, 1) Source(31, 1) + SourceIndex(0) +2 >Emitted(33, 5) Source(31, 8) + SourceIndex(0) +3 >Emitted(33, 6) Source(31, 9) + SourceIndex(0) +4 >Emitted(33, 7) Source(34, 2) + SourceIndex(0) --- >>>(function (M) { 1-> @@ -580,11 +615,11 @@ sourceFile:file.tsx 3 > M 4 > 5 > { -1->Emitted(32, 1) Source(31, 1) + SourceIndex(0) -2 >Emitted(32, 12) Source(31, 8) + SourceIndex(0) -3 >Emitted(32, 13) Source(31, 9) + SourceIndex(0) -4 >Emitted(32, 15) Source(31, 10) + SourceIndex(0) -5 >Emitted(32, 16) Source(31, 11) + SourceIndex(0) +1->Emitted(34, 1) Source(31, 1) + SourceIndex(0) +2 >Emitted(34, 12) Source(31, 8) + SourceIndex(0) +3 >Emitted(34, 13) Source(31, 9) + SourceIndex(0) +4 >Emitted(34, 15) Source(31, 10) + SourceIndex(0) +5 >Emitted(34, 16) Source(31, 11) + SourceIndex(0) --- >>> // Emit M.S.Bar 1->^^^^ @@ -593,44 +628,50 @@ sourceFile:file.tsx 1-> > 2 > // Emit M.S.Bar -1->Emitted(33, 5) Source(32, 2) + SourceIndex(0) -2 >Emitted(33, 20) Source(32, 17) + SourceIndex(0) +1->Emitted(35, 5) Source(32, 2) + SourceIndex(0) +2 >Emitted(35, 20) Source(32, 17) + SourceIndex(0) --- >>> M.S.Bar, ; 1->^^^^ -2 > ^^^ -3 > ^ -4 > ^^^ -5 > ^^ -6 > ^ -7 > ^^^ -8 > ^ -9 > ^^^ -10> ^^^ -11> ^ +2 > ^^ +3 > ^ +4 > ^ +5 > ^^^ +6 > ^^ +7 > ^ +8 > ^^ +9 > ^ +10> ^ +11> ^^^ +12> ^^^ +13> ^ 1-> > -2 > S -3 > . -4 > Bar -5 > , -6 > < -7 > S -8 > . -9 > Bar -10> /> -11> ; -1->Emitted(34, 5) Source(33, 2) + SourceIndex(0) -2 >Emitted(34, 8) Source(33, 3) + SourceIndex(0) -3 >Emitted(34, 9) Source(33, 4) + SourceIndex(0) -4 >Emitted(34, 12) Source(33, 7) + SourceIndex(0) -5 >Emitted(34, 14) Source(33, 9) + SourceIndex(0) -6 >Emitted(34, 15) Source(33, 10) + SourceIndex(0) -7 >Emitted(34, 18) Source(33, 11) + SourceIndex(0) -8 >Emitted(34, 19) Source(33, 12) + SourceIndex(0) -9 >Emitted(34, 22) Source(33, 15) + SourceIndex(0) -10>Emitted(34, 25) Source(33, 18) + SourceIndex(0) -11>Emitted(34, 26) Source(33, 19) + SourceIndex(0) +2 > +3 > S +4 > . +5 > Bar +6 > , +7 > < +8 > +9 > S +10> . +11> Bar +12> /> +13> ; +1->Emitted(36, 5) Source(33, 2) + SourceIndex(0) +2 >Emitted(36, 7) Source(33, 2) + SourceIndex(0) +3 >Emitted(36, 8) Source(33, 3) + SourceIndex(0) +4 >Emitted(36, 9) Source(33, 4) + SourceIndex(0) +5 >Emitted(36, 12) Source(33, 7) + SourceIndex(0) +6 >Emitted(36, 14) Source(33, 9) + SourceIndex(0) +7 >Emitted(36, 15) Source(33, 10) + SourceIndex(0) +8 >Emitted(36, 17) Source(33, 10) + SourceIndex(0) +9 >Emitted(36, 18) Source(33, 11) + SourceIndex(0) +10>Emitted(36, 19) Source(33, 12) + SourceIndex(0) +11>Emitted(36, 22) Source(33, 15) + SourceIndex(0) +12>Emitted(36, 25) Source(33, 18) + SourceIndex(0) +13>Emitted(36, 26) Source(33, 19) + SourceIndex(0) --- >>>})(M || (M = {})); 1 > @@ -651,13 +692,13 @@ sourceFile:file.tsx > // Emit M.S.Bar > S.Bar, ; > } -1 >Emitted(35, 1) Source(34, 1) + SourceIndex(0) -2 >Emitted(35, 2) Source(34, 2) + SourceIndex(0) -3 >Emitted(35, 4) Source(31, 8) + SourceIndex(0) -4 >Emitted(35, 5) Source(31, 9) + SourceIndex(0) -5 >Emitted(35, 10) Source(31, 8) + SourceIndex(0) -6 >Emitted(35, 11) Source(31, 9) + SourceIndex(0) -7 >Emitted(35, 19) Source(34, 2) + SourceIndex(0) +1 >Emitted(37, 1) Source(34, 1) + SourceIndex(0) +2 >Emitted(37, 2) Source(34, 2) + SourceIndex(0) +3 >Emitted(37, 4) Source(31, 8) + SourceIndex(0) +4 >Emitted(37, 5) Source(31, 9) + SourceIndex(0) +5 >Emitted(37, 10) Source(31, 8) + SourceIndex(0) +6 >Emitted(37, 11) Source(31, 9) + SourceIndex(0) +7 >Emitted(37, 19) Source(34, 2) + SourceIndex(0) --- >>>var M; 1 > @@ -675,10 +716,10 @@ sourceFile:file.tsx > // Emit M_1.Foo > Foo, ; > } -1 >Emitted(36, 1) Source(36, 1) + SourceIndex(0) -2 >Emitted(36, 5) Source(36, 8) + SourceIndex(0) -3 >Emitted(36, 6) Source(36, 9) + SourceIndex(0) -4 >Emitted(36, 7) Source(40, 2) + SourceIndex(0) +1 >Emitted(38, 1) Source(36, 1) + SourceIndex(0) +2 >Emitted(38, 5) Source(36, 8) + SourceIndex(0) +3 >Emitted(38, 6) Source(36, 9) + SourceIndex(0) +4 >Emitted(38, 7) Source(40, 2) + SourceIndex(0) --- >>>(function (M_1) { 1-> @@ -691,11 +732,11 @@ sourceFile:file.tsx 3 > M 4 > 5 > { -1->Emitted(37, 1) Source(36, 1) + SourceIndex(0) -2 >Emitted(37, 12) Source(36, 8) + SourceIndex(0) -3 >Emitted(37, 15) Source(36, 9) + SourceIndex(0) -4 >Emitted(37, 17) Source(36, 10) + SourceIndex(0) -5 >Emitted(37, 18) Source(36, 11) + SourceIndex(0) +1->Emitted(39, 1) Source(36, 1) + SourceIndex(0) +2 >Emitted(39, 12) Source(36, 8) + SourceIndex(0) +3 >Emitted(39, 15) Source(36, 9) + SourceIndex(0) +4 >Emitted(39, 17) Source(36, 10) + SourceIndex(0) +5 >Emitted(39, 18) Source(36, 11) + SourceIndex(0) --- >>> var M = 100; 1 >^^^^ @@ -712,12 +753,12 @@ sourceFile:file.tsx 4 > = 5 > 100 6 > ; -1 >Emitted(38, 5) Source(37, 2) + SourceIndex(0) -2 >Emitted(38, 9) Source(37, 6) + SourceIndex(0) -3 >Emitted(38, 10) Source(37, 7) + SourceIndex(0) -4 >Emitted(38, 13) Source(37, 10) + SourceIndex(0) -5 >Emitted(38, 16) Source(37, 13) + SourceIndex(0) -6 >Emitted(38, 17) Source(37, 14) + SourceIndex(0) +1 >Emitted(40, 5) Source(37, 2) + SourceIndex(0) +2 >Emitted(40, 9) Source(37, 6) + SourceIndex(0) +3 >Emitted(40, 10) Source(37, 7) + SourceIndex(0) +4 >Emitted(40, 13) Source(37, 10) + SourceIndex(0) +5 >Emitted(40, 16) Source(37, 13) + SourceIndex(0) +6 >Emitted(40, 17) Source(37, 14) + SourceIndex(0) --- >>> // Emit M_1.Foo 1->^^^^ @@ -726,32 +767,38 @@ sourceFile:file.tsx 1-> > 2 > // Emit M_1.Foo -1->Emitted(39, 5) Source(38, 2) + SourceIndex(0) -2 >Emitted(39, 20) Source(38, 17) + SourceIndex(0) +1->Emitted(41, 5) Source(38, 2) + SourceIndex(0) +2 >Emitted(41, 20) Source(38, 17) + SourceIndex(0) --- >>> M_1.Foo, ; 1->^^^^ -2 > ^^^^^^^ -3 > ^^ -4 > ^ -5 > ^^^^^^^ -6 > ^^^ -7 > ^ +2 > ^^^^ +3 > ^^^ +4 > ^^ +5 > ^ +6 > ^^^^ +7 > ^^^ +8 > ^^^ +9 > ^ 1-> > -2 > Foo -3 > , -4 > < -5 > Foo -6 > /> -7 > ; -1->Emitted(40, 5) Source(39, 2) + SourceIndex(0) -2 >Emitted(40, 12) Source(39, 5) + SourceIndex(0) -3 >Emitted(40, 14) Source(39, 7) + SourceIndex(0) -4 >Emitted(40, 15) Source(39, 8) + SourceIndex(0) -5 >Emitted(40, 22) Source(39, 11) + SourceIndex(0) -6 >Emitted(40, 25) Source(39, 14) + SourceIndex(0) -7 >Emitted(40, 26) Source(39, 15) + SourceIndex(0) +2 > +3 > Foo +4 > , +5 > < +6 > +7 > Foo +8 > /> +9 > ; +1->Emitted(42, 5) Source(39, 2) + SourceIndex(0) +2 >Emitted(42, 9) Source(39, 2) + SourceIndex(0) +3 >Emitted(42, 12) Source(39, 5) + SourceIndex(0) +4 >Emitted(42, 14) Source(39, 7) + SourceIndex(0) +5 >Emitted(42, 15) Source(39, 8) + SourceIndex(0) +6 >Emitted(42, 19) Source(39, 8) + SourceIndex(0) +7 >Emitted(42, 22) Source(39, 11) + SourceIndex(0) +8 >Emitted(42, 25) Source(39, 14) + SourceIndex(0) +9 >Emitted(42, 26) Source(39, 15) + SourceIndex(0) --- >>>})(M || (M = {})); 1 > @@ -774,12 +821,12 @@ sourceFile:file.tsx > // Emit M_1.Foo > Foo, ; > } -1 >Emitted(41, 1) Source(40, 1) + SourceIndex(0) -2 >Emitted(41, 2) Source(40, 2) + SourceIndex(0) -3 >Emitted(41, 4) Source(36, 8) + SourceIndex(0) -4 >Emitted(41, 5) Source(36, 9) + SourceIndex(0) -5 >Emitted(41, 10) Source(36, 8) + SourceIndex(0) -6 >Emitted(41, 11) Source(36, 9) + SourceIndex(0) -7 >Emitted(41, 19) Source(40, 2) + SourceIndex(0) +1 >Emitted(43, 1) Source(40, 1) + SourceIndex(0) +2 >Emitted(43, 2) Source(40, 2) + SourceIndex(0) +3 >Emitted(43, 4) Source(36, 8) + SourceIndex(0) +4 >Emitted(43, 5) Source(36, 9) + SourceIndex(0) +5 >Emitted(43, 10) Source(36, 8) + SourceIndex(0) +6 >Emitted(43, 11) Source(36, 9) + SourceIndex(0) +7 >Emitted(43, 19) Source(40, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=file.jsx.map \ No newline at end of file