From 232ee608d5482cf0ca8bec9bf7ed8cafcb51fef0 Mon Sep 17 00:00:00 2001 From: Titian Cernicova-Dragomir Date: Thu, 11 Jul 2019 14:38:59 +0300 Subject: [PATCH 01/48] Improved const extraction for function expressions and arrow functions. The behavior applies if the function: - is contextually typed (because otherwise no type annotation for the variable would have been generated anyway) - is not generic - doesn't have parameters inferred as any If these conditions are met, we add missing parameters type and we add this parameter to the function. --- src/services/refactors/extractSymbol.ts | 74 ++++++++++++++++++- .../extractConstant_ContextualType_Lambda.ts | 2 +- ...extract-const-callback-function-generic.ts | 15 ++++ ...act-const-callback-function-no-context1.ts | 15 ++++ ...act-const-callback-function-no-context2.ts | 15 ++++ ...act-const-callback-function-no-context3.ts | 15 ++++ .../extract-const-callback-function-rest.ts | 18 +++++ .../extract-const-callback-function-this1.ts | 15 ++++ .../extract-const-callback-function-this2.ts | 15 ++++ .../extract-const-callback-function-this3.ts | 17 +++++ .../extract-const-callback-function.ts | 13 ++++ .../cases/fourslash/extract-const-callback.ts | 13 ++++ 12 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 tests/cases/fourslash/extract-const-callback-function-generic.ts create mode 100644 tests/cases/fourslash/extract-const-callback-function-no-context1.ts create mode 100644 tests/cases/fourslash/extract-const-callback-function-no-context2.ts create mode 100644 tests/cases/fourslash/extract-const-callback-function-no-context3.ts create mode 100644 tests/cases/fourslash/extract-const-callback-function-rest.ts create mode 100644 tests/cases/fourslash/extract-const-callback-function-this1.ts create mode 100644 tests/cases/fourslash/extract-const-callback-function-this2.ts create mode 100644 tests/cases/fourslash/extract-const-callback-function-this3.ts create mode 100644 tests/cases/fourslash/extract-const-callback-function.ts create mode 100644 tests/cases/fourslash/extract-const-callback.ts diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts index 823bd640a59..df8be2808ff 100644 --- a/src/services/refactors/extractSymbol.ts +++ b/src/services/refactors/extractSymbol.ts @@ -1006,11 +1006,14 @@ namespace ts.refactor.extractSymbol { const localNameText = getUniqueName(isClassLike(scope) ? "newProperty" : "newLocal", file); const isJS = isInJSFile(scope); - const variableType = isJS || !checker.isContextSensitive(node) + let variableType = isJS || !checker.isContextSensitive(node) ? undefined : checker.typeToTypeNode(checker.getContextualType(node)!, scope, NodeBuilderFlags.NoTruncation); // TODO: GH#18217 - const initializer = transformConstantInitializer(node, substitutions); + let initializer = transformConstantInitializer(node, substitutions); + + ({ variableType, initializer } = transformFunctionInitializerAndType(variableType, initializer)); + suppressLeadingAndTrailingTrivia(initializer); const changeTracker = textChanges.ChangeTracker.fromContext(context); @@ -1102,6 +1105,73 @@ namespace ts.refactor.extractSymbol { const renameFilename = node.getSourceFile().fileName; const renameLocation = getRenameLocation(edits, renameFilename, localNameText, /*isDeclaredBeforeUse*/ true); return { renameFilename, renameLocation, edits }; + + function transformFunctionInitializerAndType(variableType: TypeNode | undefined, initializer: Expression): { variableType: TypeNode | undefined, initializer: Expression } { + // If no contextual type exists there is noting to transfer to the function signature + if (variableType === undefined) return { variableType, initializer }; + // Only do this for function expressions and arrow functions that are not generic + if (!isFunctionExpression(initializer) && !isArrowFunction(initializer) || !!initializer.typeParameters) return { variableType, initializer }; + const functionType = checker.getTypeAtLocation(node); + const functionSignature = singleOrUndefined(checker.getSignaturesOfType(functionType, SignatureKind.Call)); + + // If no function signature, maybe there was an error, do nothing + if (!functionSignature) return { variableType, initializer }; + // If the function signature has generic type parameters we don't attempt to move the parameters + if (!!functionSignature.getTypeParameters()) return { variableType, initializer }; + + // We add parameter types if needed + const parameters: ParameterDeclaration[] = []; + let hasAny = false; + for (const p of initializer.parameters) { + if (p.type) { + parameters.push(p); + } + else { + const paramType = checker.getTypeAtLocation(p); + if (paramType === checker.getAnyType()) hasAny = true; + + parameters.push(updateParameter(p, + p.decorators, p.modifiers, p.dotDotDotToken, + p.name, p.questionToken, p.type || checker.typeToTypeNode(paramType, scope, NodeBuilderFlags.NoTruncation), p.initializer)); + } + } + // If a parameter was inferred as any we skip adding function parameters at all. + // Turning an implicit any (which under common settings is a error) to an explicit + // is probably actually a worse refactor outcome. + if (hasAny) return { variableType, initializer }; + variableType = undefined; + if (isArrowFunction(initializer)) { + initializer = updateArrowFunction(initializer, node.modifiers, initializer.typeParameters, + parameters, + initializer.type || checker.typeToTypeNode(functionSignature.getReturnType(), scope, NodeBuilderFlags.NoTruncation), + initializer.equalsGreaterThanToken, + initializer.body); + } + else { + if (functionSignature && !!functionSignature.thisParameter) { + const firstParameter = firstOrUndefined(parameters); + // If the function signature has a this parameter and if the first defined parameter is not the this parameter, we must add it + // Note: If this parameter was already there, it would have been previously updated with the type if not type was present + if ((!firstParameter || (isIdentifier(firstParameter.name) && firstParameter.name.escapedText !== "this"))) { + const thisType = checker.getTypeOfSymbolAtLocation(functionSignature.thisParameter, node); + parameters.splice(0, 0, createParameter( + /* decorators */ undefined, + /* modifiers */ undefined, + /* dotDotDotToken */ undefined, + "this", + /* questionToken */ undefined, + checker.typeToTypeNode(thisType, scope, NodeBuilderFlags.NoTruncation) + )); + } + } + initializer = updateFunctionExpression(initializer, node.modifiers, initializer.asteriskToken, + initializer.name, initializer.typeParameters, + parameters, + initializer.type || checker.typeToTypeNode(functionSignature.getReturnType(), scope, NodeBuilderFlags.NoTruncation), + initializer.body); + } + return { variableType, initializer }; + } } function getContainingVariableDeclarationIfInList(node: Node, scope: Scope) { diff --git a/tests/baselines/reference/extractConstant/extractConstant_ContextualType_Lambda.ts b/tests/baselines/reference/extractConstant/extractConstant_ContextualType_Lambda.ts index d5a5a55bc27..fae0a6812cd 100644 --- a/tests/baselines/reference/extractConstant/extractConstant_ContextualType_Lambda.ts +++ b/tests/baselines/reference/extractConstant/extractConstant_ContextualType_Lambda.ts @@ -5,7 +5,7 @@ const myObj: { member(x: number, y: string): void } = { } // ==SCOPE::Extract to constant in enclosing scope== -const newLocal: (x: number, y: string) => void = (x, y) => x + y; +const newLocal = (x: number, y: string): string => x + y; const myObj: { member(x: number, y: string): void } = { member: /*RENAME*/newLocal, } diff --git a/tests/cases/fourslash/extract-const-callback-function-generic.ts b/tests/cases/fourslash/extract-const-callback-function-generic.ts new file mode 100644 index 00000000000..cafba8f8245 --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function-generic.ts @@ -0,0 +1,15 @@ +/// + +////declare function fnUnion(fn: (a: T) => T): void +////fnUnion(/*a*/a => a/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`declare function fnUnion(fn: (a: T) => T): void +const newLocal: (a: T) => T = a => a; +fnUnion(/*RENAME*/newLocal);` +}); \ No newline at end of file diff --git a/tests/cases/fourslash/extract-const-callback-function-no-context1.ts b/tests/cases/fourslash/extract-const-callback-function-no-context1.ts new file mode 100644 index 00000000000..4bd09076868 --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function-no-context1.ts @@ -0,0 +1,15 @@ +/// + +////declare function fnUnion(fn: ((a: number) => number) | ((a: string) => string)): void +////fnUnion(/*a*/(a: any) => a/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`declare function fnUnion(fn: ((a: number) => number) | ((a: string) => string)): void +const newLocal = (a: any) => a; +fnUnion(/*RENAME*/newLocal);` +}); diff --git a/tests/cases/fourslash/extract-const-callback-function-no-context2.ts b/tests/cases/fourslash/extract-const-callback-function-no-context2.ts new file mode 100644 index 00000000000..eb392bcb445 --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function-no-context2.ts @@ -0,0 +1,15 @@ +/// + +////declare function fnUnion(fn: ((a: number) => number) | ((a: string) => string)): void +////fnUnion(/*a*/(a) => a/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`declare function fnUnion(fn: ((a: number) => number) | ((a: string) => string)): void +const newLocal: ((a: number) => number) | ((a: string) => string) = (a) => a; +fnUnion(/*RENAME*/newLocal);` +}); diff --git a/tests/cases/fourslash/extract-const-callback-function-no-context3.ts b/tests/cases/fourslash/extract-const-callback-function-no-context3.ts new file mode 100644 index 00000000000..92835d0d38c --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function-no-context3.ts @@ -0,0 +1,15 @@ +/// + +////declare function fnUnion(fn: ((a: number) => number) | ((a: string) => string)): void +////fnUnion(/*a*/(a: string) => a/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`declare function fnUnion(fn: ((a: number) => number) | ((a: string) => string)): void +const newLocal = (a: string) => a; +fnUnion(/*RENAME*/newLocal);` +}); diff --git a/tests/cases/fourslash/extract-const-callback-function-rest.ts b/tests/cases/fourslash/extract-const-callback-function-rest.ts new file mode 100644 index 00000000000..50feb63dd20 --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function-rest.ts @@ -0,0 +1,18 @@ +/// + + +////function fWithRest(fn: (...a: number[]) => number) { } +////fWithRest(/*a*/(a, b, c) => a + b + c/*b*/); + + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`function fWithRest(fn: (...a: number[]) => number) { } +const newLocal = (a: number, b: number, c: number): number => a + b + c; +fWithRest(/*RENAME*/newLocal);` +}); + diff --git a/tests/cases/fourslash/extract-const-callback-function-this1.ts b/tests/cases/fourslash/extract-const-callback-function-this1.ts new file mode 100644 index 00000000000..b0d269400bb --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function-this1.ts @@ -0,0 +1,15 @@ +/// + +////declare function fWithThis(fn: (this: { a: string }, a: string) => string): void; +////fWithThis(/*a*/function (a: string): string { return this.a; }/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`declare function fWithThis(fn: (this: { a: string }, a: string) => string): void; +const newLocal = function(this: { a: string; }, a: string): string { return this.a; }; +fWithThis(/*RENAME*/newLocal);` +}); diff --git a/tests/cases/fourslash/extract-const-callback-function-this2.ts b/tests/cases/fourslash/extract-const-callback-function-this2.ts new file mode 100644 index 00000000000..518c39e26e5 --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function-this2.ts @@ -0,0 +1,15 @@ +/// + +////declare function fWithThis(fn: (this: { a: string }, a: string) => string): void; +////fWithThis(/*a*/function (a) { return this.a; }/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`declare function fWithThis(fn: (this: { a: string }, a: string) => string): void; +const newLocal = function(this: { a: string; }, a: string): string { return this.a; }; +fWithThis(/*RENAME*/newLocal);` +}); diff --git a/tests/cases/fourslash/extract-const-callback-function-this3.ts b/tests/cases/fourslash/extract-const-callback-function-this3.ts new file mode 100644 index 00000000000..1d9d8ba59e7 --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function-this3.ts @@ -0,0 +1,17 @@ +/// + +////declare function fWithThis(fn: (this: { a: string }, a: string) => string): void; +////fWithThis(/*a*/function (this: { a: string }, a) { return this.a; }/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`declare function fWithThis(fn: (this: { a: string }, a: string) => string): void; +const newLocal = function(this: { + a: string; +}, a: string): string { return this.a; }; +fWithThis(/*RENAME*/newLocal);` +}); diff --git a/tests/cases/fourslash/extract-const-callback-function.ts b/tests/cases/fourslash/extract-const-callback-function.ts new file mode 100644 index 00000000000..ccf05c6c1ad --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback-function.ts @@ -0,0 +1,13 @@ +/// + +////const x = [1,2,3].map(/*a*/function (x) { return x + 1 }/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`const newLocal = function(x: number): number { return x + 1; }; +const x = [1,2,3].map(/*RENAME*/newLocal);` +}); diff --git a/tests/cases/fourslash/extract-const-callback.ts b/tests/cases/fourslash/extract-const-callback.ts new file mode 100644 index 00000000000..4bd71ba16b1 --- /dev/null +++ b/tests/cases/fourslash/extract-const-callback.ts @@ -0,0 +1,13 @@ +/// + +////const x = [1,2,3].map(/*a*/x => x + 1/*b*/); + +goTo.select("a", "b"); +edit.applyRefactor({ + refactorName: "Extract Symbol", + actionName: "constant_scope_0", + actionDescription: "Extract to constant in enclosing scope", + newContent: +`const newLocal = (x: number): number => x + 1; +const x = [1,2,3].map(/*RENAME*/newLocal);` +}); From 1d942f4ddc96a8f23491d1cd7de0379b99377947 Mon Sep 17 00:00:00 2001 From: Klaus Meinhardt Date: Sun, 18 Aug 2019 21:46:53 +0200 Subject: [PATCH 02/48] Detect more TS syntax in JS files * optional class methods * type arguments on tagged template expressions --- src/compiler/program.ts | 15 +++++++------- ...tionalClassElementSyntaxOfClass.errors.txt | 18 +++++++++++++++++ ...ilationTypeArgumentSyntaxOfCall.errors.txt | 20 +++++++++++++------ ...FileCompilationTypeArgumentSyntaxOfCall.js | 15 ++++++++++++++ ...lationOptionalClassElementSyntaxOfClass.ts | 8 ++++++++ ...FileCompilationTypeArgumentSyntaxOfCall.ts | 8 ++++++-- 6 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 tests/baselines/reference/jsFileCompilationOptionalClassElementSyntaxOfClass.errors.txt create mode 100644 tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.js create mode 100644 tests/cases/compiler/jsFileCompilationOptionalClassElementSyntaxOfClass.ts diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 76c92ad74bb..cbe1fbd7845 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1760,13 +1760,12 @@ namespace ts { switch (parent.kind) { case SyntaxKind.Parameter: case SyntaxKind.PropertyDeclaration: - if ((parent).questionToken === node) { + case SyntaxKind.MethodDeclaration: + if ((parent).questionToken === node) { diagnostics.push(createDiagnosticForNode(node, Diagnostics._0_can_only_be_used_in_a_ts_file, "?")); return; } // falls through - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: case SyntaxKind.Constructor: case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: @@ -1835,7 +1834,6 @@ namespace ts { case SyntaxKind.ClassDeclaration: case SyntaxKind.ClassExpression: case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: case SyntaxKind.Constructor: case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: @@ -1843,15 +1841,15 @@ namespace ts { case SyntaxKind.FunctionDeclaration: case SyntaxKind.ArrowFunction: // Check type parameters - if (nodes === (parent).typeParameters) { + if (nodes === (parent).typeParameters) { diagnostics.push(createDiagnosticForNodeArray(nodes, Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file)); return; } // falls through case SyntaxKind.VariableStatement: // Check modifiers - if (nodes === (parent).modifiers) { - return checkModifiers(>nodes, parent.kind === SyntaxKind.VariableStatement); + if (nodes === parent.modifiers) { + return checkModifiers(parent.modifiers, parent.kind === SyntaxKind.VariableStatement); } break; case SyntaxKind.PropertyDeclaration: @@ -1877,8 +1875,9 @@ namespace ts { case SyntaxKind.ExpressionWithTypeArguments: case SyntaxKind.JsxSelfClosingElement: case SyntaxKind.JsxOpeningElement: + case SyntaxKind.TaggedTemplateExpression: // Check type arguments - if (nodes === (parent).typeArguments) { + if (nodes === (parent).typeArguments) { diagnostics.push(createDiagnosticForNodeArray(nodes, Diagnostics.type_arguments_can_only_be_used_in_a_ts_file)); return; } diff --git a/tests/baselines/reference/jsFileCompilationOptionalClassElementSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationOptionalClassElementSyntaxOfClass.errors.txt new file mode 100644 index 00000000000..b4ebcf41983 --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationOptionalClassElementSyntaxOfClass.errors.txt @@ -0,0 +1,18 @@ +error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. + Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. +tests/cases/compiler/a.js(2,8): error TS8009: '?' can only be used in a .ts file. +tests/cases/compiler/a.js(4,8): error TS8009: '?' can only be used in a .ts file. + + +!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. +!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. +==== tests/cases/compiler/a.js (2 errors) ==== + class C { + foo?() { + ~ +!!! error TS8009: '?' can only be used in a .ts file. + } + bar? = 1; + ~ +!!! error TS8009: '?' can only be used in a .ts file. + } \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt index 8d8a1a1a83e..5b47b12c534 100644 --- a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt @@ -1,11 +1,19 @@ -error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -tests/cases/compiler/a.js(1,5): error TS8011: 'type arguments' can only be used in a .ts file. +tests/cases/compiler/a.jsx(1,5): error TS8011: 'type arguments' can only be used in a .ts file. +tests/cases/compiler/a.jsx(2,5): error TS8011: 'type arguments' can only be used in a .ts file. +tests/cases/compiler/a.jsx(3,6): error TS8011: 'type arguments' can only be used in a .ts file. +tests/cases/compiler/a.jsx(4,6): error TS8011: 'type arguments' can only be used in a .ts file. -!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -==== tests/cases/compiler/a.js (1 errors) ==== +==== tests/cases/compiler/a.jsx (4 errors) ==== Foo(); ~~~~~~ +!!! error TS8011: 'type arguments' can only be used in a .ts file. + Foo``; + ~~~~~~ +!!! error TS8011: 'type arguments' can only be used in a .ts file. + >; + ~~~~~~ +!!! error TS8011: 'type arguments' can only be used in a .ts file. + />; + ~~~~~~ !!! error TS8011: 'type arguments' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.js b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.js new file mode 100644 index 00000000000..f51afa0a6db --- /dev/null +++ b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.js @@ -0,0 +1,15 @@ +//// [a.jsx] +Foo(); +Foo``; +>; +/>; + +//// [a.js] +var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) { + if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; } + return cooked; +}; +Foo(); +Foo(__makeTemplateObject([""], [""])); +; +; diff --git a/tests/cases/compiler/jsFileCompilationOptionalClassElementSyntaxOfClass.ts b/tests/cases/compiler/jsFileCompilationOptionalClassElementSyntaxOfClass.ts new file mode 100644 index 00000000000..27739f58d6c --- /dev/null +++ b/tests/cases/compiler/jsFileCompilationOptionalClassElementSyntaxOfClass.ts @@ -0,0 +1,8 @@ +// @allowJs: true +// @noTypesAndSymbols: true +// @filename: a.js +class C { + foo?() { + } + bar? = 1; +} \ No newline at end of file diff --git a/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts b/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts index a5bcdae904b..008714f0df7 100644 --- a/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts +++ b/tests/cases/compiler/jsFileCompilationTypeArgumentSyntaxOfCall.ts @@ -1,3 +1,7 @@ // @allowJs: true -// @filename: a.js -Foo(); \ No newline at end of file +// @noTypesAndSymbols: true +// @filename: a.jsx +Foo(); +Foo``; +>; +/>; \ No newline at end of file From 27697551e262e299c699f51768dcb5ddb942c843 Mon Sep 17 00:00:00 2001 From: Klaus Meinhardt Date: Sun, 18 Aug 2019 21:48:55 +0200 Subject: [PATCH 03/48] remove useless baselines --- .../jsFileCompilationTypeArgumentSyntaxOfCall.symbols | 3 --- .../jsFileCompilationTypeArgumentSyntaxOfCall.types | 5 ----- 2 files changed, 8 deletions(-) delete mode 100644 tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.symbols delete mode 100644 tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.types diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.symbols b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.symbols deleted file mode 100644 index e0926bb6748..00000000000 --- a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.symbols +++ /dev/null @@ -1,3 +0,0 @@ -=== tests/cases/compiler/a.js === -Foo(); -No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.types b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.types deleted file mode 100644 index ac42dd32d4c..00000000000 --- a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.types +++ /dev/null @@ -1,5 +0,0 @@ -=== tests/cases/compiler/a.js === -Foo(); ->Foo() : any ->Foo : any - From 909bc61f01253dcb9bc944463434d4117ad910a9 Mon Sep 17 00:00:00 2001 From: xiaofa Date: Fri, 30 Aug 2019 17:37:27 +0800 Subject: [PATCH 04/48] Add convert const to let --- src/compiler/diagnosticMessages.json | 4 +++ src/services/codefixes/convertConstToLet.ts | 32 +++++++++++++++++++++ src/services/tsconfig.json | 1 + tests/cases/fourslash/codeFixConstToLet.ts | 12 ++++++++ 4 files changed, 49 insertions(+) create mode 100644 src/services/codefixes/convertConstToLet.ts create mode 100644 tests/cases/fourslash/codeFixConstToLet.ts diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index b296c224d08..bf08c95f10c 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -5124,6 +5124,10 @@ "category": "Message", "code": 95090 }, + "Convert 'const' to 'let'": { + "category": "Message", + "code": 95091 + }, "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": { "category": "Error", diff --git a/src/services/codefixes/convertConstToLet.ts b/src/services/codefixes/convertConstToLet.ts new file mode 100644 index 00000000000..df027f7d8c8 --- /dev/null +++ b/src/services/codefixes/convertConstToLet.ts @@ -0,0 +1,32 @@ +/* @internal */ +namespace ts.codefix { + const fixId = "fixConvertConstToLet"; + const errorCodes = [Diagnostics.Cannot_assign_to_0_because_it_is_a_constant.code]; + + registerCodeFix({ + errorCodes, + getCodeActions: context => { + const { sourceFile, span, program } = context; + const variableStatement = getVaribleStatement(sourceFile, span.start, program); + const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, variableStatement)); + return [createCodeFixAction(fixId, changes, Diagnostics.Convert_const_to_let, fixId, Diagnostics.Convert_const_to_let)]; + }, + fixIds: [fixId] + }); + + function getVaribleStatement(sourceFile: SourceFile, pos: number, program: Program) { + const token = getTokenAtPosition(sourceFile, pos); + const checker = program.getTypeChecker(); + const symbol = checker.getSymbolAtLocation(token); + if (symbol) { + return symbol.valueDeclaration.parent.parent as VariableStatement; + } + } + function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, variableStatement?: VariableStatement) { + if (!variableStatement) { + return; + } + const start = variableStatement.getStart(); + changes.replaceRangeWithText(sourceFile, { pos: start, end: start + 5 }, "let"); + } +} diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json index 6b52393422c..965ea4d5ac4 100644 --- a/src/services/tsconfig.json +++ b/src/services/tsconfig.json @@ -82,6 +82,7 @@ "codefixes/fixAddModuleReferTypeMissingTypeof.ts", "codefixes/convertToMappedObjectType.ts", "codefixes/removeUnnecessaryAwait.ts", + "codefixes/convertConstToLet.ts", "refactors/convertExport.ts", "refactors/convertImport.ts", "refactors/extractSymbol.ts", diff --git a/tests/cases/fourslash/codeFixConstToLet.ts b/tests/cases/fourslash/codeFixConstToLet.ts new file mode 100644 index 00000000000..949c45104a2 --- /dev/null +++ b/tests/cases/fourslash/codeFixConstToLet.ts @@ -0,0 +1,12 @@ +/// + +//// const x = 42; +//// x = 75; + +verify.codeFix({ + description: "Convert 'const' to 'let'", + index: 0, + newFileContent: +`let x = 42; +x = 75;` +}); \ No newline at end of file From 99f9719ab3f9eaeaf5c1e9235680f98336fe050a Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sat, 7 Sep 2019 18:43:32 -0400 Subject: [PATCH 05/48] Added codefix for numeric literals >= 2 ** 53 `Number.MAX_SAFE_INTEGER` is `2 ** 53 - 1`, so anything greater than that is a 'dangerous' integer to store as a traditional number. This adds a codefix to suggest converting them to a `bigint` literal. --- src/compiler/checker.ts | 23 ++++++ src/compiler/diagnosticMessages.json | 12 ++++ src/services/codefixes/useBigintLiteral.ts | 33 +++++++++ src/services/tsconfig.json | 1 + .../fourslash/codeFixUseBigIntLiteral.ts | 70 +++++++++++++++++++ 5 files changed, 139 insertions(+) create mode 100644 src/services/codefixes/useBigintLiteral.ts create mode 100644 tests/cases/fourslash/codeFixUseBigIntLiteral.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index cfad47b6533..363bcd50241 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -33681,9 +33681,32 @@ namespace ts { return grammarErrorOnNode(withMinus ? node.parent : node, diagnosticMessage, literal); } } + + // Realism (size) checking + checkNumericLiteralValueSize(node); + return false; } + function checkNumericLiteralValueSize(node: NumericLiteral) { + // Literals with 15 or fewer characters aren't long enough to reach past 2^53 - 1 + // Fractional numbers (e.g. 9000000000000000.001) are inherently imprecise anyway + if (node.text.length <= 15 || node.text.indexOf(".") !== -1) { + return; + } + + // We can't rely on the runtime to accurately store and compare extremely large numeric values + // Even for internal use, we use getTextOfNode: https://github.com/microsoft/TypeScript/issues/33298 + // Thus, if the runtime claims a too-large number is lower than Number.MAX_SAFE_INTEGER, + // it's likely addition operations on it will fail too + const apparentValue = +getTextOfNode(node); + if (apparentValue <= 2 ** 53 - 1 && apparentValue + 1 > apparentValue) { + return; + } + + addErrorOrSuggestion(/*isError*/ false, createDiagnosticForNode(node, Diagnostics.Numeric_literals_with_absolute_values_equal_to_2_53_or_greater_are_too_large_to_be_represented_accurately_as_integers)); + } + function checkGrammarBigIntLiteral(node: BigIntLiteral): boolean { const literalType = isLiteralTypeNode(node.parent) || isPrefixUnaryExpression(node.parent) && isLiteralTypeNode(node.parent.parent); diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index b296c224d08..188977298d8 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -4643,6 +4643,10 @@ "category": "Suggestion", "code": 80007 }, + "Numeric literals with absolute values equal to 2^53 or greater are too large to be represented accurately as integers.": { + "category": "Suggestion", + "code": 80008 + }, "Add missing 'super()' call": { "category": "Message", @@ -5124,6 +5128,14 @@ "category": "Message", "code": 95090 }, + "Convert to a bigint numeric literal": { + "category": "Message", + "code": 95091 + }, + "Convert all to bigint numeric literals": { + "category": "Message", + "code": 95092 + }, "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": { "category": "Error", diff --git a/src/services/codefixes/useBigintLiteral.ts b/src/services/codefixes/useBigintLiteral.ts new file mode 100644 index 00000000000..0749cc1a677 --- /dev/null +++ b/src/services/codefixes/useBigintLiteral.ts @@ -0,0 +1,33 @@ +/* @internal */ +namespace ts.codefix { + const fixId = "useBigintLiteral"; + const errorCodes = [ + Diagnostics.Numeric_literals_with_absolute_values_equal_to_2_53_or_greater_are_too_large_to_be_represented_accurately_as_integers.code, + ]; + + registerCodeFix({ + errorCodes, + getCodeActions: context => { + const changes = textChanges.ChangeTracker.with(context, t => makeChange(t, context.sourceFile, context.span)); + if (changes.length > 0) { + return [createCodeFixAction(fixId, changes, Diagnostics.Convert_to_a_bigint_numeric_literal, fixId, Diagnostics.Convert_all_to_bigint_numeric_literals)]; + } + }, + fixIds: [fixId], + getAllCodeActions: context => { + return codeFixAll(context, errorCodes, (changes, diag) => makeChange(changes, diag.file, diag)); + }, + }); + + function makeChange(changeTracker: textChanges.ChangeTracker, sourceFile: SourceFile, span: TextSpan) { + const numericLiteral = tryCast(getTokenAtPosition(sourceFile, span.start), isNumericLiteral); + if (!numericLiteral) { + return; + } + + // We use .getText to overcome parser inaccuracies: https://github.com/microsoft/TypeScript/issues/33298 + const newText = numericLiteral.getText(sourceFile) + "n"; + + changeTracker.replaceNode(sourceFile, numericLiteral, createBigIntLiteral(newText)); + } +} diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json index 6b52393422c..74495bc54f8 100644 --- a/src/services/tsconfig.json +++ b/src/services/tsconfig.json @@ -79,6 +79,7 @@ "codefixes/fixStrictClassInitialization.ts", "codefixes/requireInTs.ts", "codefixes/useDefaultImport.ts", + "codefixes/useBigintLiteral.ts", "codefixes/fixAddModuleReferTypeMissingTypeof.ts", "codefixes/convertToMappedObjectType.ts", "codefixes/removeUnnecessaryAwait.ts", diff --git a/tests/cases/fourslash/codeFixUseBigIntLiteral.ts b/tests/cases/fourslash/codeFixUseBigIntLiteral.ts new file mode 100644 index 00000000000..089f73cba97 --- /dev/null +++ b/tests/cases/fourslash/codeFixUseBigIntLiteral.ts @@ -0,0 +1,70 @@ +/// +////9007199254740991; +////-9007199254740991; +////9007199254740992; +////-9007199254740992; +////9007199254740993; +////-9007199254740993; +////9007199254740994; +////-9007199254740994; +////0x19999999999998; +////-0x19999999999998; +////0x19999999999999; +////-0x19999999999999; +////0x20000000000000; +////-0x20000000000000; +////0x20000000000001; +////-0x20000000000001; +////2e52; +////2e53; +////2e54; + +verify.codeFix({ + description: ts.Diagnostics.Convert_to_a_bigint_numeric_literal.message, + index: 0, + newFileContent: +`9007199254740991; +-9007199254740991; +9007199254740992n; +-9007199254740992; +9007199254740993; +-9007199254740993; +9007199254740994; +-9007199254740994; +0x19999999999998; +-0x19999999999998; +0x19999999999999; +-0x19999999999999; +0x20000000000000; +-0x20000000000000; +0x20000000000001; +-0x20000000000001; +2e52; +2e53; +2e54;` +}); + +verify.codeFixAll({ + fixAllDescription: ts.Diagnostics.Convert_all_to_bigint_numeric_literals.message, + fixId: "useBigintLiteral", + newFileContent: +`9007199254740991; +-9007199254740991; +9007199254740992n; +-9007199254740992n; +9007199254740993n; +-9007199254740993n; +9007199254740994n; +-9007199254740994n; +0x19999999999998; +-0x19999999999998; +0x19999999999999; +-0x19999999999999; +0x20000000000000n; +-0x20000000000000n; +0x20000000000001n; +-0x20000000000001n; +2e52; +2e53; +2e54;` +}); From 79e9bb1c8f7504a60ee1bc0f926adddf4ae03a92 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sat, 7 Sep 2019 19:41:03 -0400 Subject: [PATCH 06/48] Added explicit check for scientific notation --- src/compiler/checker.ts | 3 ++- tests/cases/fourslash/codeFixUseBigIntLiteral.ts | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 363bcd50241..d14efb247e1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -33689,9 +33689,10 @@ namespace ts { } function checkNumericLiteralValueSize(node: NumericLiteral) { + // Scientific notation (e.g. 2e54 and 1e00000000010) can't be converted to bigint // Literals with 15 or fewer characters aren't long enough to reach past 2^53 - 1 // Fractional numbers (e.g. 9000000000000000.001) are inherently imprecise anyway - if (node.text.length <= 15 || node.text.indexOf(".") !== -1) { + if (node.numericLiteralFlags & TokenFlags.Scientific || node.text.length <= 15 || node.text.indexOf(".") !== -1) { return; } diff --git a/tests/cases/fourslash/codeFixUseBigIntLiteral.ts b/tests/cases/fourslash/codeFixUseBigIntLiteral.ts index 089f73cba97..dcdff381af3 100644 --- a/tests/cases/fourslash/codeFixUseBigIntLiteral.ts +++ b/tests/cases/fourslash/codeFixUseBigIntLiteral.ts @@ -18,6 +18,7 @@ ////2e52; ////2e53; ////2e54; +////1e00000000010; verify.codeFix({ description: ts.Diagnostics.Convert_to_a_bigint_numeric_literal.message, @@ -41,7 +42,8 @@ verify.codeFix({ -0x20000000000001; 2e52; 2e53; -2e54;` +2e54; +1e00000000010;` }); verify.codeFixAll({ @@ -66,5 +68,6 @@ verify.codeFixAll({ -0x20000000000001n; 2e52; 2e53; -2e54;` +2e54; +1e00000000010;` }); From 566d32b2e8bb355fe40bb2398b978e89e0f23f93 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 9 Sep 2019 13:40:10 -0700 Subject: [PATCH 07/48] Refactor to write baseline of sourcemaps that are written --- .../unittests/tsbuild/amdModulesWithOut.ts | 14 +- src/testRunner/unittests/tsbuild/helpers.ts | 28 +- src/testRunner/unittests/tsbuild/outFile.ts | 10 +- src/testRunner/unittests/tsbuild/sample.ts | 18 +- ...e-resolution-finds-original-source-file.js | 232 ++ ...en-one-two-three-are-prepended-in-order.js | 3215 ---------------- .../stripInternal-jsdoc-style-comment.js | 1634 -------- ...en-one-two-three-are-prepended-in-order.js | 3215 ---------------- ...en-one-two-three-are-prepended-in-order.js | 3415 ----------------- ...tripInternal-with-comments-emit-enabled.js | 1734 --------- .../stripInternal.js | 1634 -------- 11 files changed, 256 insertions(+), 14893 deletions(-) diff --git a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts index 73e2af33fd9..e28f1ffc840 100644 --- a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts +++ b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts @@ -67,12 +67,7 @@ namespace ts { tick, proj: "amdModulesWithOut", rootNames: ["/src/app"], - expectedMapFileNames: [ - outputFiles[project.lib][ext.jsmap], - outputFiles[project.lib][ext.dtsmap], - outputFiles[project.app][ext.jsmap], - outputFiles[project.app][ext.dtsmap], - ], + baselineSourceMap: true, expectedBuildInfoFilesForSectionBaselines: [ [outputFiles[project.lib][ext.buildinfo], outputFiles[project.lib][ext.js], outputFiles[project.lib][ext.dts]], [outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]] @@ -221,12 +216,7 @@ ${internal} export enum internalEnum { a, b, c }`); tick, proj: "amdModulesWithOut", rootNames: ["/src/app"], - expectedMapFileNames: [ - libOutputFile[ext.jsmap], - libOutputFile[ext.dtsmap], - outputFiles[project.app][ext.jsmap], - outputFiles[project.app][ext.dtsmap], - ], + baselineSourceMap: true, expectedBuildInfoFilesForSectionBaselines: [ [libOutputFile[ext.buildinfo], libOutputFile[ext.js], libOutputFile[ext.dts]], [outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]] diff --git a/src/testRunner/unittests/tsbuild/helpers.ts b/src/testRunner/unittests/tsbuild/helpers.ts index 4542733d2e6..88a9d403454 100644 --- a/src/testRunner/unittests/tsbuild/helpers.ts +++ b/src/testRunner/unittests/tsbuild/helpers.ts @@ -164,8 +164,10 @@ interface Symbol { } } - function generateSourceMapBaselineFiles(fs: vfs.FileSystem, mapFileNames: ReadonlyArray) { - for (const mapFile of mapFileNames) { + function generateSourceMapBaselineFiles(fs: vfs.FileSystem, mapFileNames: Iterator) { + while (true) { + const { value: mapFile, done } = mapFileNames.next(); + if (done) break; if (!fs.existsSync(mapFile)) continue; const text = Harness.SourceMapRecorder.getSourceMapRecordWithVFS(fs, mapFile); fs.writeFileSync(`${mapFile}.baseline.txt`, text); @@ -233,17 +235,24 @@ interface Symbol { fs: vfs.FileSystem; tick: () => void; rootNames: ReadonlyArray; - expectedMapFileNames?: ReadonlyArray; + baselineSourceMap?: true; expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray; modifyFs: (fs: vfs.FileSystem) => void; } - function build({ fs, tick, rootNames, expectedMapFileNames, expectedBuildInfoFilesForSectionBaselines, modifyFs }: BuildInput) { + function build({ fs, tick, rootNames, baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, modifyFs }: BuildInput) { const actualReadFileMap = createMap(); modifyFs(fs); tick(); const host = new fakes.SolutionBuilderHost(fs); + const writtenFiles = createMap(); + const originalWriteFile = host.writeFile; + host.writeFile = (fileName, content, writeByteOrderMark) => { + assert.isFalse(writtenFiles.has(fileName)); + writtenFiles.set(fileName, true); + return originalWriteFile.call(host, fileName, content, writeByteOrderMark); + }; const builder = createSolutionBuilder(host, rootNames, { dry: false, force: false, verbose: true }); host.clearDiagnostics(); const originalReadFile = host.readFile; @@ -255,7 +264,7 @@ interface Symbol { return originalReadFile.call(host, path); }; builder.build(); - if (expectedMapFileNames) generateSourceMapBaselineFiles(fs, expectedMapFileNames); + if (baselineSourceMap) generateSourceMapBaselineFiles(fs, mapDefinedIterator(writtenFiles.keys(), f => f.endsWith(".map") ? f : undefined)); generateBuildInfoSectionBaselineFiles(fs, expectedBuildInfoFilesForSectionBaselines || emptyArray); fs.makeReadonly(); return { fs, actualReadFileMap, host, builder }; @@ -302,8 +311,6 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt tick: () => void; proj: string; rootNames: ReadonlyArray; - /** map file names to generate baseline of */ - expectedMapFileNames?: ReadonlyArray; expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray; lastProjectOutput: string; initialBuild: BuildState; @@ -313,11 +320,12 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt incrementalHeaderChangedBuild?: BuildState; baselineOnly?: true; verifyDiagnostics?: true; + baselineSourceMap?: true; } export function verifyTsbuildOutput({ scenario, projFs, time, tick, proj, rootNames, outputFiles, baselineOnly, verifyDiagnostics, - expectedMapFileNames, expectedBuildInfoFilesForSectionBaselines, lastProjectOutput, + baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, lastProjectOutput, initialBuild, incrementalDtsChangedBuild, incrementalDtsUnchangedBuild, incrementalHeaderChangedBuild }: VerifyTsBuildInput) { describe(`tsc --b ${proj}:: ${scenario}`, () => { @@ -330,7 +338,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt fs: projFs().shadow(), tick, rootNames, - expectedMapFileNames, + baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, modifyFs: initialBuild.modifyFs, }); @@ -374,7 +382,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt fs: newFs, tick, rootNames, - expectedMapFileNames, + baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, modifyFs: incrementalModifyFs, })); diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts index 4b81160cc99..f813f61542c 100644 --- a/src/testRunner/unittests/tsbuild/outFile.ts +++ b/src/testRunner/unittests/tsbuild/outFile.ts @@ -55,14 +55,6 @@ namespace ts { ] ] ]; - const expectedMapFileNames = [ - outputFiles[project.first][ext.jsmap], - outputFiles[project.first][ext.dtsmap], - outputFiles[project.second][ext.jsmap], - outputFiles[project.second][ext.dtsmap], - outputFiles[project.third][ext.jsmap], - outputFiles[project.third][ext.dtsmap] - ]; const expectedTsbuildInfoFileNames: ReadonlyArray = [ [outputFiles[project.first][ext.buildinfo], outputFiles[project.first][ext.js], outputFiles[project.first][ext.dts]], [outputFiles[project.second][ext.buildinfo], outputFiles[project.second][ext.js], outputFiles[project.second][ext.dts]], @@ -286,7 +278,7 @@ namespace ts { tick, proj: "outfile-concat", rootNames: ["/src/third"], - expectedMapFileNames, + baselineSourceMap: true, expectedBuildInfoFilesForSectionBaselines: expectedBuildInfoFilesForSectionBaselines || expectedTsbuildInfoFileNames, lastProjectOutput: outputFiles[project.third][ext.js], initialBuild: { diff --git a/src/testRunner/unittests/tsbuild/sample.ts b/src/testRunner/unittests/tsbuild/sample.ts index 91574c3a920..8e921c97aee 100644 --- a/src/testRunner/unittests/tsbuild/sample.ts +++ b/src/testRunner/unittests/tsbuild/sample.ts @@ -612,11 +612,7 @@ export class cNew {}`); tick, proj: "sample1", rootNames: ["/src/tests"], - expectedMapFileNames: [ - "/src/core/anotherModule.d.ts.map", - "/src/core/index.d.ts.map", - "/src/logic/index.js.map" - ], + baselineSourceMap: true, lastProjectOutput: "/src/tests/index.js", initialBuild, incrementalDtsChangedBuild: { @@ -722,11 +718,7 @@ class someClass { }`), tick, proj: "sample1", rootNames: ["/src/tests"], - expectedMapFileNames: [ - "/src/core/anotherModule.d.ts.map", - "/src/core/index.d.ts.map", - "/src/logic/index.js.map" - ], + baselineSourceMap: true, lastProjectOutput: "/src/tests/index.js", initialBuild, incrementalDtsChangedBuild: { @@ -790,11 +782,7 @@ class someClass { }`), tick, proj: "sample1", rootNames: ["/src/tests"], - expectedMapFileNames: [ - "/src/core/anotherModule.d.ts.map", - "/src/core/index.d.ts.map", - "/src/logic/index.js.map" - ], + baselineSourceMap: true, lastProjectOutput: "/src/tests/index.js", initialBuild: { modifyFs: fs => replaceText(fs, "/src/logic/tsconfig.json", `"composite": true,`, `"composite": true, diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js index 3fdb37efb3a..feae4ea8dc8 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js @@ -521,6 +521,123 @@ declare const globalConst = 10; //// [/src/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["lib/file0.ts","lib/file1.ts","lib/file2.ts","lib/global.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,MAAM,KAAK,CAAC;;ICAlB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;;ICApB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,WAAW,KAAK,CAAC"} +//// [/src/module.d.ts.map.baseline.txt] +=================================================================== +JsFile: module.d.ts +mapUrl: module.d.ts.map +sourceRoot: +sources: lib/file0.ts,lib/file1.ts,lib/file2.ts,lib/global.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:/src/module.d.ts +sourceFile:lib/file0.ts +------------------------------------------------------------------- +>>>declare const myGlob = 20; +1 > +2 >^^^^^^^^ +3 > ^^^^^^ +4 > ^^^^^^ +5 > ^^^^^ +6 > ^ +7 > ^^^-> +1 > +2 > +3 > const +4 > myGlob +5 > = 20 +6 > ; +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(1, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(1, 7) + SourceIndex(0) +4 >Emitted(1, 21) Source(1, 13) + SourceIndex(0) +5 >Emitted(1, 26) Source(1, 18) + SourceIndex(0) +6 >Emitted(1, 27) Source(1, 19) + SourceIndex(0) +--- +------------------------------------------------------------------- +emittedFile:/src/module.d.ts +sourceFile:lib/file1.ts +------------------------------------------------------------------- +>>>declare module "lib/file1" { +>>> export const x = 10; +1->^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^^^^^ +5 > ^ +6 > ^^^^^ +7 > ^ +1-> +2 > export +3 > +4 > const +5 > x +6 > = 10 +7 > ; +1->Emitted(3, 5) Source(1, 1) + SourceIndex(1) +2 >Emitted(3, 11) Source(1, 7) + SourceIndex(1) +3 >Emitted(3, 12) Source(1, 8) + SourceIndex(1) +4 >Emitted(3, 18) Source(1, 14) + SourceIndex(1) +5 >Emitted(3, 19) Source(1, 15) + SourceIndex(1) +6 >Emitted(3, 24) Source(1, 20) + SourceIndex(1) +7 >Emitted(3, 25) Source(1, 21) + SourceIndex(1) +--- +------------------------------------------------------------------- +emittedFile:/src/module.d.ts +sourceFile:lib/file2.ts +------------------------------------------------------------------- +>>>} +>>>declare module "lib/file2" { +>>> export const y = 20; +1 >^^^^ +2 > ^^^^^^ +3 > ^ +4 > ^^^^^^ +5 > ^ +6 > ^^^^^ +7 > ^ +1 > +2 > export +3 > +4 > const +5 > y +6 > = 20 +7 > ; +1 >Emitted(6, 5) Source(1, 1) + SourceIndex(2) +2 >Emitted(6, 11) Source(1, 7) + SourceIndex(2) +3 >Emitted(6, 12) Source(1, 8) + SourceIndex(2) +4 >Emitted(6, 18) Source(1, 14) + SourceIndex(2) +5 >Emitted(6, 19) Source(1, 15) + SourceIndex(2) +6 >Emitted(6, 24) Source(1, 20) + SourceIndex(2) +7 >Emitted(6, 25) Source(1, 21) + SourceIndex(2) +--- +------------------------------------------------------------------- +emittedFile:/src/module.d.ts +sourceFile:lib/global.ts +------------------------------------------------------------------- +>>>} +>>>declare const globalConst = 10; +1 > +2 >^^^^^^^^ +3 > ^^^^^^ +4 > ^^^^^^^^^^^ +5 > ^^^^^ +6 > ^ +7 > ^^^^-> +1 > +2 > +3 > const +4 > globalConst +5 > = 10 +6 > ; +1 >Emitted(8, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(8, 9) Source(1, 1) + SourceIndex(3) +3 >Emitted(8, 15) Source(1, 7) + SourceIndex(3) +4 >Emitted(8, 26) Source(1, 18) + SourceIndex(3) +5 >Emitted(8, 31) Source(1, 23) + SourceIndex(3) +6 >Emitted(8, 32) Source(1, 24) + SourceIndex(3) +--- +>>>//# sourceMappingURL=module.d.ts.map + //// [/src/module.js] var myGlob = 20; define("lib/file1", ["require", "exports"], function (require, exports) { @@ -539,6 +656,121 @@ var globalConst = 10; //// [/src/module.js.map] {"version":3,"file":"module.js","sourceRoot":"","sources":["lib/file0.ts","lib/file1.ts","lib/file2.ts","lib/global.ts"],"names":[],"mappings":"AAAA,IAAM,MAAM,GAAG,EAAE,CAAC;;;;ICAL,QAAA,CAAC,GAAG,EAAE,CAAC;;;;;ICAP,QAAA,CAAC,GAAG,EAAE,CAAC;;ACApB,IAAM,WAAW,GAAG,EAAE,CAAC"} +//// [/src/module.js.map.baseline.txt] +=================================================================== +JsFile: module.js +mapUrl: module.js.map +sourceRoot: +sources: lib/file0.ts,lib/file1.ts,lib/file2.ts,lib/global.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:/src/module.js +sourceFile:lib/file0.ts +------------------------------------------------------------------- +>>>var myGlob = 20; +1 > +2 >^^^^ +3 > ^^^^^^ +4 > ^^^ +5 > ^^ +6 > ^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > +2 >const +3 > myGlob +4 > = +5 > 20 +6 > ; +1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0) +3 >Emitted(1, 11) Source(1, 13) + SourceIndex(0) +4 >Emitted(1, 14) Source(1, 16) + SourceIndex(0) +5 >Emitted(1, 16) Source(1, 18) + SourceIndex(0) +6 >Emitted(1, 17) Source(1, 19) + SourceIndex(0) +--- +------------------------------------------------------------------- +emittedFile:/src/module.js +sourceFile:lib/file1.ts +------------------------------------------------------------------- +>>>define("lib/file1", ["require", "exports"], function (require, exports) { +>>> "use strict"; +>>> Object.defineProperty(exports, "__esModule", { value: true }); +>>> exports.x = 10; +1->^^^^ +2 > ^^^^^^^^ +3 > ^ +4 > ^^^ +5 > ^^ +6 > ^ +1->export const +2 > +3 > x +4 > = +5 > 10 +6 > ; +1->Emitted(5, 5) Source(1, 14) + SourceIndex(1) +2 >Emitted(5, 13) Source(1, 14) + SourceIndex(1) +3 >Emitted(5, 14) Source(1, 15) + SourceIndex(1) +4 >Emitted(5, 17) Source(1, 18) + SourceIndex(1) +5 >Emitted(5, 19) Source(1, 20) + SourceIndex(1) +6 >Emitted(5, 20) Source(1, 21) + SourceIndex(1) +--- +------------------------------------------------------------------- +emittedFile:/src/module.js +sourceFile:lib/file2.ts +------------------------------------------------------------------- +>>>}); +>>>define("lib/file2", ["require", "exports"], function (require, exports) { +>>> "use strict"; +>>> Object.defineProperty(exports, "__esModule", { value: true }); +>>> exports.y = 20; +1 >^^^^ +2 > ^^^^^^^^ +3 > ^ +4 > ^^^ +5 > ^^ +6 > ^ +1 >export const +2 > +3 > y +4 > = +5 > 20 +6 > ; +1 >Emitted(10, 5) Source(1, 14) + SourceIndex(2) +2 >Emitted(10, 13) Source(1, 14) + SourceIndex(2) +3 >Emitted(10, 14) Source(1, 15) + SourceIndex(2) +4 >Emitted(10, 17) Source(1, 18) + SourceIndex(2) +5 >Emitted(10, 19) Source(1, 20) + SourceIndex(2) +6 >Emitted(10, 20) Source(1, 21) + SourceIndex(2) +--- +------------------------------------------------------------------- +emittedFile:/src/module.js +sourceFile:lib/global.ts +------------------------------------------------------------------- +>>>}); +>>>var globalConst = 10; +1 > +2 >^^^^ +3 > ^^^^^^^^^^^ +4 > ^^^ +5 > ^^ +6 > ^ +7 > ^^^^^^^^^^^^-> +1 > +2 >const +3 > globalConst +4 > = +5 > 10 +6 > ; +1 >Emitted(12, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(12, 5) Source(1, 7) + SourceIndex(3) +3 >Emitted(12, 16) Source(1, 18) + SourceIndex(3) +4 >Emitted(12, 19) Source(1, 21) + SourceIndex(3) +5 >Emitted(12, 21) Source(1, 23) + SourceIndex(3) +6 >Emitted(12, 22) Source(1, 24) + SourceIndex(3) +--- +>>>//# sourceMappingURL=module.js.map + //// [/src/module.tsbuildinfo] { "bundle": { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index 965863d088e..f3c8dccc27a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -778,1587 +778,6 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.d.ts.map -//// [/src/2/second-output.js.map.baseline.txt] -=================================================================== -JsFile: second-output.js -mapUrl: second-output.js.map -sourceRoot: -sources: ../first/first_PART1.ts,../first/first_part2.ts,../first/first_part3.ts,../second/second_part1.ts,../second/second_part2.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> function normalC() { -1->^^^^ -2 > ^^-> -1->class normalC { - > /**@internal*/ -1->Emitted(15, 5) Source(14, 20) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->constructor() { -2 > } -1->Emitted(16, 5) Source(14, 36) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 37) + SourceIndex(3) ---- ->>> normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ -6 > ^^^^^^-> -1-> - > /**@internal*/ prop: string; - > /**@internal*/ -2 > method -3 > -4 > method() { -5 > } -1->Emitted(17, 5) Source(16, 20) + SourceIndex(3) -2 >Emitted(17, 29) Source(16, 26) + SourceIndex(3) -3 >Emitted(17, 32) Source(16, 20) + SourceIndex(3) -4 >Emitted(17, 46) Source(16, 31) + SourceIndex(3) -5 >Emitted(17, 47) Source(16, 32) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -1-> - > /**@internal*/ -2 > get -3 > c -1->Emitted(18, 5) Source(17, 20) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 24) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 25) + SourceIndex(3) ---- ->>> get: function () { return 10; }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^ -5 > ^ -6 > ^ -7 > ^ -1 > -2 > get c() { -3 > return -4 > 10 -5 > ; -6 > -7 > } -1 >Emitted(19, 14) Source(17, 20) + SourceIndex(3) -2 >Emitted(19, 28) Source(17, 30) + SourceIndex(3) -3 >Emitted(19, 35) Source(17, 37) + SourceIndex(3) -4 >Emitted(19, 37) Source(17, 39) + SourceIndex(3) -5 >Emitted(19, 38) Source(17, 40) + SourceIndex(3) -6 >Emitted(19, 39) Source(17, 41) + SourceIndex(3) -7 >Emitted(19, 40) Source(17, 42) + SourceIndex(3) ---- ->>> set: function (val) { }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^^^ -5 > ^ -1 > - > /**@internal*/ -2 > set c( -3 > val: number -4 > ) { -5 > } -1 >Emitted(20, 14) Source(18, 20) + SourceIndex(3) -2 >Emitted(20, 24) Source(18, 26) + SourceIndex(3) -3 >Emitted(20, 27) Source(18, 37) + SourceIndex(3) -4 >Emitted(20, 31) Source(18, 41) + SourceIndex(3) -5 >Emitted(20, 32) Source(18, 42) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 42) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /**@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /**@internal*/ constructor() { } - > /**@internal*/ prop: string; - > /**@internal*/ method() { } - > /**@internal*/ get c() { return 10; } - > /**@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /**@internal*/ export class C { } - > /**@internal*/ export function foo() {} - > /**@internal*/ export namespace someNamespace { export class C {} } - > /**@internal*/ export namespace someOther.something { export class someClass {} } - > /**@internal*/ export import someImport = someNamespace.C; - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const internalConst = 10; - > /**@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { - > /**@internal*/ -1->Emitted(28, 5) Source(21, 20) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 20) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 37) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 38) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 37) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 38) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 37) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 38) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 20) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 38) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 33) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 34) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 38) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 38) + SourceIndex(3) ---- ->>> function foo() { } -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^-> -1-> - > /**@internal*/ -2 > export function -3 > foo -4 > () { -5 > } -1->Emitted(34, 5) Source(22, 20) + SourceIndex(3) -2 >Emitted(34, 14) Source(22, 36) + SourceIndex(3) -3 >Emitted(34, 17) Source(22, 39) + SourceIndex(3) -4 >Emitted(34, 22) Source(22, 43) + SourceIndex(3) -5 >Emitted(34, 23) Source(22, 44) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^-> -1-> -2 > foo -3 > () {} -4 > -1->Emitted(35, 5) Source(22, 36) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 39) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 44) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 44) + SourceIndex(3) ---- ->>> var someNamespace; -1->^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > /**@internal*/ -2 > export namespace -3 > someNamespace -4 > { export class C {} } -1->Emitted(36, 5) Source(23, 20) + SourceIndex(3) -2 >Emitted(36, 9) Source(23, 37) + SourceIndex(3) -3 >Emitted(36, 22) Source(23, 50) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 72) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^-> -1-> -2 > export namespace -3 > someNamespace -1->Emitted(37, 5) Source(23, 20) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 37) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 50) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 53) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 53) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 69) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 70) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 69) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 69) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 70) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 53) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 70) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 66) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 67) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 70) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 70) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 71) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 72) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 37) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 50) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 37) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 50) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 37) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 50) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 72) + SourceIndex(3) ---- ->>> var someOther; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - > /**@internal*/ -2 > export namespace -3 > someOther -4 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 20) + SourceIndex(3) -2 >Emitted(45, 9) Source(24, 37) + SourceIndex(3) -3 >Emitted(45, 18) Source(24, 46) + SourceIndex(3) -4 >Emitted(45, 19) Source(24, 86) + SourceIndex(3) ---- ->>> (function (someOther) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1-> -2 > export namespace -3 > someOther -1->Emitted(46, 5) Source(24, 20) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 37) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 46) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 47) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 47) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 56) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 86) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 47) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 47) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 56) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 59) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 59) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 83) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 84) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 83) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 84) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 83) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 84) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 59) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 84) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 72) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 81) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 84) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 84) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 85) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 86) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 47) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 56) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 47) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 56) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 47) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 56) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 86) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 85) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 86) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 37) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 46) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 37) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 46) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 37) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 46) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 86) + SourceIndex(3) ---- ->>> normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^ -5 > ^ -6 > ^ -7 > ^ -1 > - > /**@internal*/ export import -2 > someImport -3 > = -4 > someNamespace -5 > . -6 > C -7 > ; -1 >Emitted(57, 5) Source(25, 34) + SourceIndex(3) -2 >Emitted(57, 23) Source(25, 44) + SourceIndex(3) -3 >Emitted(57, 26) Source(25, 47) + SourceIndex(3) -4 >Emitted(57, 39) Source(25, 60) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 61) + SourceIndex(3) -6 >Emitted(57, 41) Source(25, 62) + SourceIndex(3) -7 >Emitted(57, 42) Source(25, 63) + SourceIndex(3) ---- ->>> normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -1 > - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const -2 > internalConst -3 > = -4 > 10 -5 > ; -1 >Emitted(58, 5) Source(27, 33) + SourceIndex(3) -2 >Emitted(58, 26) Source(27, 46) + SourceIndex(3) -3 >Emitted(58, 29) Source(27, 49) + SourceIndex(3) -4 >Emitted(58, 31) Source(27, 51) + SourceIndex(3) -5 >Emitted(58, 32) Source(27, 52) + SourceIndex(3) ---- ->>> var internalEnum; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - > /**@internal*/ -2 > export enum -3 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 20) + SourceIndex(3) -2 >Emitted(59, 9) Source(28, 32) + SourceIndex(3) -3 >Emitted(59, 21) Source(28, 56) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > export enum -3 > internalEnum -1->Emitted(60, 5) Source(28, 20) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 32) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 44) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 47) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 48) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 48) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 50) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 51) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 51) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 53) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 54) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 54) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 55) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 56) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 32) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 44) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 32) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 44) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 32) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 44) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 56) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /**@internal*/ export class C { } - > /**@internal*/ export function foo() {} - > /**@internal*/ export namespace someNamespace { export class C {} } - > /**@internal*/ export namespace someOther.something { export class someClass {} } - > /**@internal*/ export import someImport = someNamespace.C; - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const internalConst = 10; - > /**@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>var internalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - >/**@internal*/ -1->Emitted(66, 1) Source(30, 16) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 16) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 33) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 34) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 33) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 34) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 33) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 34) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 16) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 34) + SourceIndex(3) ---- ->>>function internalfoo() { } -1-> -2 >^^^^^^^^^ -3 > ^^^^^^^^^^^ -4 > ^^^^^ -5 > ^ -1-> - >/**@internal*/ -2 >function -3 > internalfoo -4 > () { -5 > } -1->Emitted(71, 1) Source(31, 16) + SourceIndex(3) -2 >Emitted(71, 10) Source(31, 25) + SourceIndex(3) -3 >Emitted(71, 21) Source(31, 36) + SourceIndex(3) -4 >Emitted(71, 26) Source(31, 40) + SourceIndex(3) -5 >Emitted(71, 27) Source(31, 41) + SourceIndex(3) ---- ->>>var internalNamespace; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >namespace -3 > internalNamespace -4 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 16) + SourceIndex(3) -2 >Emitted(72, 5) Source(32, 26) + SourceIndex(3) -3 >Emitted(72, 22) Source(32, 43) + SourceIndex(3) -4 >Emitted(72, 23) Source(32, 73) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > internalNamespace -1->Emitted(73, 1) Source(32, 16) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 26) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 43) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 46) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 46) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 70) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 71) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 70) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 71) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 70) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 71) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 46) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 71) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 59) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 68) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 71) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 71) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 72) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 73) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 26) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 43) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 26) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 43) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 73) + SourceIndex(3) ---- ->>>var internalOther; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >namespace -3 > internalOther -4 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 16) + SourceIndex(3) -2 >Emitted(81, 5) Source(33, 26) + SourceIndex(3) -3 >Emitted(81, 18) Source(33, 39) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 79) + SourceIndex(3) ---- ->>>(function (internalOther) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1-> -2 >namespace -3 > internalOther -1->Emitted(82, 1) Source(33, 16) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 26) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 39) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 40) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 40) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 49) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 79) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 40) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 40) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 49) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 52) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 76) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 77) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 76) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 77) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 76) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 77) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 52) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 77) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 65) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 74) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 77) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 77) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 78) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 79) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 40) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 49) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 40) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 49) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 40) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 49) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 79) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 78) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 79) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 26) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 39) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 26) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 39) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 79) + SourceIndex(3) ---- ->>>var internalImport = internalNamespace.someClass; -1-> -2 >^^^^ -3 > ^^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -7 > ^^^^^^^^^ -8 > ^ -1-> - >/**@internal*/ -2 >import -3 > internalImport -4 > = -5 > internalNamespace -6 > . -7 > someClass -8 > ; -1->Emitted(93, 1) Source(34, 16) + SourceIndex(3) -2 >Emitted(93, 5) Source(34, 23) + SourceIndex(3) -3 >Emitted(93, 19) Source(34, 37) + SourceIndex(3) -4 >Emitted(93, 22) Source(34, 40) + SourceIndex(3) -5 >Emitted(93, 39) Source(34, 57) + SourceIndex(3) -6 >Emitted(93, 40) Source(34, 58) + SourceIndex(3) -7 >Emitted(93, 49) Source(34, 67) + SourceIndex(3) -8 >Emitted(93, 50) Source(34, 68) + SourceIndex(3) ---- ->>>var internalConst = 10; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^ -6 > ^ -1 > - >/**@internal*/ type internalType = internalC; - >/**@internal*/ -2 >const -3 > internalConst -4 > = -5 > 10 -6 > ; -1 >Emitted(94, 1) Source(36, 16) + SourceIndex(3) -2 >Emitted(94, 5) Source(36, 22) + SourceIndex(3) -3 >Emitted(94, 18) Source(36, 35) + SourceIndex(3) -4 >Emitted(94, 21) Source(36, 38) + SourceIndex(3) -5 >Emitted(94, 23) Source(36, 40) + SourceIndex(3) -6 >Emitted(94, 24) Source(36, 41) + SourceIndex(3) ---- ->>>var internalEnum; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >enum -3 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 16) + SourceIndex(3) -2 >Emitted(95, 5) Source(37, 21) + SourceIndex(3) -3 >Emitted(95, 17) Source(37, 45) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >enum -3 > internalEnum -1->Emitted(96, 1) Source(37, 16) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 21) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 33) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 36) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 37) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 37) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 39) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 40) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 40) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 42) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 43) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 43) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 44) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 45) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 21) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 33) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 21) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 33) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 45) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- ->>>//# sourceMappingURL=second-output.js.map - //// [/src/2/second-output.tsbuildinfo] { "bundle": { @@ -3326,1640 +1745,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.d.ts.map -//// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] -=================================================================== -JsFile: third-output.js -mapUrl: third-output.js.map -sourceRoot: -sources: ../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts,../../third_part1.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> function normalC() { -1->^^^^ -2 > ^^-> -1->class normalC { - > /**@internal*/ -1->Emitted(15, 5) Source(14, 20) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->constructor() { -2 > } -1->Emitted(16, 5) Source(14, 36) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 37) + SourceIndex(3) ---- ->>> normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ -6 > ^^^^^^-> -1-> - > /**@internal*/ prop: string; - > /**@internal*/ -2 > method -3 > -4 > method() { -5 > } -1->Emitted(17, 5) Source(16, 20) + SourceIndex(3) -2 >Emitted(17, 29) Source(16, 26) + SourceIndex(3) -3 >Emitted(17, 32) Source(16, 20) + SourceIndex(3) -4 >Emitted(17, 46) Source(16, 31) + SourceIndex(3) -5 >Emitted(17, 47) Source(16, 32) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -1-> - > /**@internal*/ -2 > get -3 > c -1->Emitted(18, 5) Source(17, 20) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 24) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 25) + SourceIndex(3) ---- ->>> get: function () { return 10; }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^ -5 > ^ -6 > ^ -7 > ^ -1 > -2 > get c() { -3 > return -4 > 10 -5 > ; -6 > -7 > } -1 >Emitted(19, 14) Source(17, 20) + SourceIndex(3) -2 >Emitted(19, 28) Source(17, 30) + SourceIndex(3) -3 >Emitted(19, 35) Source(17, 37) + SourceIndex(3) -4 >Emitted(19, 37) Source(17, 39) + SourceIndex(3) -5 >Emitted(19, 38) Source(17, 40) + SourceIndex(3) -6 >Emitted(19, 39) Source(17, 41) + SourceIndex(3) -7 >Emitted(19, 40) Source(17, 42) + SourceIndex(3) ---- ->>> set: function (val) { }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^^^ -5 > ^ -1 > - > /**@internal*/ -2 > set c( -3 > val: number -4 > ) { -5 > } -1 >Emitted(20, 14) Source(18, 20) + SourceIndex(3) -2 >Emitted(20, 24) Source(18, 26) + SourceIndex(3) -3 >Emitted(20, 27) Source(18, 37) + SourceIndex(3) -4 >Emitted(20, 31) Source(18, 41) + SourceIndex(3) -5 >Emitted(20, 32) Source(18, 42) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 42) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /**@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /**@internal*/ constructor() { } - > /**@internal*/ prop: string; - > /**@internal*/ method() { } - > /**@internal*/ get c() { return 10; } - > /**@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /**@internal*/ export class C { } - > /**@internal*/ export function foo() {} - > /**@internal*/ export namespace someNamespace { export class C {} } - > /**@internal*/ export namespace someOther.something { export class someClass {} } - > /**@internal*/ export import someImport = someNamespace.C; - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const internalConst = 10; - > /**@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { - > /**@internal*/ -1->Emitted(28, 5) Source(21, 20) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 20) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 37) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 38) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 37) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 38) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 37) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 38) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 20) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 38) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 33) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 34) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 38) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 38) + SourceIndex(3) ---- ->>> function foo() { } -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^-> -1-> - > /**@internal*/ -2 > export function -3 > foo -4 > () { -5 > } -1->Emitted(34, 5) Source(22, 20) + SourceIndex(3) -2 >Emitted(34, 14) Source(22, 36) + SourceIndex(3) -3 >Emitted(34, 17) Source(22, 39) + SourceIndex(3) -4 >Emitted(34, 22) Source(22, 43) + SourceIndex(3) -5 >Emitted(34, 23) Source(22, 44) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^-> -1-> -2 > foo -3 > () {} -4 > -1->Emitted(35, 5) Source(22, 36) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 39) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 44) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 44) + SourceIndex(3) ---- ->>> var someNamespace; -1->^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > /**@internal*/ -2 > export namespace -3 > someNamespace -4 > { export class C {} } -1->Emitted(36, 5) Source(23, 20) + SourceIndex(3) -2 >Emitted(36, 9) Source(23, 37) + SourceIndex(3) -3 >Emitted(36, 22) Source(23, 50) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 72) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^-> -1-> -2 > export namespace -3 > someNamespace -1->Emitted(37, 5) Source(23, 20) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 37) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 50) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 53) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 53) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 69) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 70) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 69) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 69) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 70) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 53) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 70) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 66) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 67) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 70) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 70) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 71) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 72) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 37) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 50) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 37) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 50) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 37) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 50) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 72) + SourceIndex(3) ---- ->>> var someOther; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - > /**@internal*/ -2 > export namespace -3 > someOther -4 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 20) + SourceIndex(3) -2 >Emitted(45, 9) Source(24, 37) + SourceIndex(3) -3 >Emitted(45, 18) Source(24, 46) + SourceIndex(3) -4 >Emitted(45, 19) Source(24, 86) + SourceIndex(3) ---- ->>> (function (someOther) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1-> -2 > export namespace -3 > someOther -1->Emitted(46, 5) Source(24, 20) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 37) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 46) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 47) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 47) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 56) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 86) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 47) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 47) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 56) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 59) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 59) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 83) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 84) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 83) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 84) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 83) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 84) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 59) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 84) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 72) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 81) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 84) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 84) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 85) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 86) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 47) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 56) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 47) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 56) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 47) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 56) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 86) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 85) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 86) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 37) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 46) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 37) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 46) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 37) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 46) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 86) + SourceIndex(3) ---- ->>> normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^ -5 > ^ -6 > ^ -7 > ^ -1 > - > /**@internal*/ export import -2 > someImport -3 > = -4 > someNamespace -5 > . -6 > C -7 > ; -1 >Emitted(57, 5) Source(25, 34) + SourceIndex(3) -2 >Emitted(57, 23) Source(25, 44) + SourceIndex(3) -3 >Emitted(57, 26) Source(25, 47) + SourceIndex(3) -4 >Emitted(57, 39) Source(25, 60) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 61) + SourceIndex(3) -6 >Emitted(57, 41) Source(25, 62) + SourceIndex(3) -7 >Emitted(57, 42) Source(25, 63) + SourceIndex(3) ---- ->>> normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -1 > - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const -2 > internalConst -3 > = -4 > 10 -5 > ; -1 >Emitted(58, 5) Source(27, 33) + SourceIndex(3) -2 >Emitted(58, 26) Source(27, 46) + SourceIndex(3) -3 >Emitted(58, 29) Source(27, 49) + SourceIndex(3) -4 >Emitted(58, 31) Source(27, 51) + SourceIndex(3) -5 >Emitted(58, 32) Source(27, 52) + SourceIndex(3) ---- ->>> var internalEnum; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - > /**@internal*/ -2 > export enum -3 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 20) + SourceIndex(3) -2 >Emitted(59, 9) Source(28, 32) + SourceIndex(3) -3 >Emitted(59, 21) Source(28, 56) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > export enum -3 > internalEnum -1->Emitted(60, 5) Source(28, 20) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 32) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 44) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 47) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 48) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 48) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 50) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 51) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 51) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 53) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 54) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 54) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 55) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 56) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 32) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 44) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 32) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 44) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 32) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 44) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 56) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /**@internal*/ export class C { } - > /**@internal*/ export function foo() {} - > /**@internal*/ export namespace someNamespace { export class C {} } - > /**@internal*/ export namespace someOther.something { export class someClass {} } - > /**@internal*/ export import someImport = someNamespace.C; - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const internalConst = 10; - > /**@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>var internalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - >/**@internal*/ -1->Emitted(66, 1) Source(30, 16) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 16) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 33) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 34) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 33) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 34) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 33) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 34) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 16) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 34) + SourceIndex(3) ---- ->>>function internalfoo() { } -1-> -2 >^^^^^^^^^ -3 > ^^^^^^^^^^^ -4 > ^^^^^ -5 > ^ -1-> - >/**@internal*/ -2 >function -3 > internalfoo -4 > () { -5 > } -1->Emitted(71, 1) Source(31, 16) + SourceIndex(3) -2 >Emitted(71, 10) Source(31, 25) + SourceIndex(3) -3 >Emitted(71, 21) Source(31, 36) + SourceIndex(3) -4 >Emitted(71, 26) Source(31, 40) + SourceIndex(3) -5 >Emitted(71, 27) Source(31, 41) + SourceIndex(3) ---- ->>>var internalNamespace; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >namespace -3 > internalNamespace -4 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 16) + SourceIndex(3) -2 >Emitted(72, 5) Source(32, 26) + SourceIndex(3) -3 >Emitted(72, 22) Source(32, 43) + SourceIndex(3) -4 >Emitted(72, 23) Source(32, 73) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > internalNamespace -1->Emitted(73, 1) Source(32, 16) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 26) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 43) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 46) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 46) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 70) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 71) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 70) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 71) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 70) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 71) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 46) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 71) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 59) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 68) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 71) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 71) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 72) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 73) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 26) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 43) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 26) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 43) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 73) + SourceIndex(3) ---- ->>>var internalOther; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >namespace -3 > internalOther -4 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 16) + SourceIndex(3) -2 >Emitted(81, 5) Source(33, 26) + SourceIndex(3) -3 >Emitted(81, 18) Source(33, 39) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 79) + SourceIndex(3) ---- ->>>(function (internalOther) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1-> -2 >namespace -3 > internalOther -1->Emitted(82, 1) Source(33, 16) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 26) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 39) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 40) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 40) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 49) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 79) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 40) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 40) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 49) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 52) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 76) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 77) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 76) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 77) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 76) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 77) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 52) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 77) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 65) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 74) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 77) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 77) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 78) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 79) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 40) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 49) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 40) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 49) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 40) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 49) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 79) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 78) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 79) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 26) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 39) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 26) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 39) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 79) + SourceIndex(3) ---- ->>>var internalImport = internalNamespace.someClass; -1-> -2 >^^^^ -3 > ^^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -7 > ^^^^^^^^^ -8 > ^ -1-> - >/**@internal*/ -2 >import -3 > internalImport -4 > = -5 > internalNamespace -6 > . -7 > someClass -8 > ; -1->Emitted(93, 1) Source(34, 16) + SourceIndex(3) -2 >Emitted(93, 5) Source(34, 23) + SourceIndex(3) -3 >Emitted(93, 19) Source(34, 37) + SourceIndex(3) -4 >Emitted(93, 22) Source(34, 40) + SourceIndex(3) -5 >Emitted(93, 39) Source(34, 57) + SourceIndex(3) -6 >Emitted(93, 40) Source(34, 58) + SourceIndex(3) -7 >Emitted(93, 49) Source(34, 67) + SourceIndex(3) -8 >Emitted(93, 50) Source(34, 68) + SourceIndex(3) ---- ->>>var internalConst = 10; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^ -6 > ^ -1 > - >/**@internal*/ type internalType = internalC; - >/**@internal*/ -2 >const -3 > internalConst -4 > = -5 > 10 -6 > ; -1 >Emitted(94, 1) Source(36, 16) + SourceIndex(3) -2 >Emitted(94, 5) Source(36, 22) + SourceIndex(3) -3 >Emitted(94, 18) Source(36, 35) + SourceIndex(3) -4 >Emitted(94, 21) Source(36, 38) + SourceIndex(3) -5 >Emitted(94, 23) Source(36, 40) + SourceIndex(3) -6 >Emitted(94, 24) Source(36, 41) + SourceIndex(3) ---- ->>>var internalEnum; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >enum -3 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 16) + SourceIndex(3) -2 >Emitted(95, 5) Source(37, 21) + SourceIndex(3) -3 >Emitted(95, 17) Source(37, 45) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >enum -3 > internalEnum -1->Emitted(96, 1) Source(37, 16) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 21) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 33) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 36) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 37) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 37) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 39) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 40) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 40) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 42) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 43) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 43) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 44) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 45) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 21) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 33) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 21) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 33) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 45) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../third_part1.ts -------------------------------------------------------------------- ->>>var c = new C(); -1-> -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^-> -1-> -2 >var -3 > c -4 > = -5 > new -6 > C -7 > () -8 > ; -1->Emitted(109, 1) Source(1, 1) + SourceIndex(5) -2 >Emitted(109, 5) Source(1, 5) + SourceIndex(5) -3 >Emitted(109, 6) Source(1, 6) + SourceIndex(5) -4 >Emitted(109, 9) Source(1, 9) + SourceIndex(5) -5 >Emitted(109, 13) Source(1, 13) + SourceIndex(5) -6 >Emitted(109, 14) Source(1, 14) + SourceIndex(5) -7 >Emitted(109, 16) Source(1, 16) + SourceIndex(5) -8 >Emitted(109, 17) Source(1, 17) + SourceIndex(5) ---- ->>>c.doSomething(); -1-> -2 >^ -3 > ^ -4 > ^^^^^^^^^^^ -5 > ^^ -6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >c -3 > . -4 > doSomething -5 > () -6 > ; -1->Emitted(110, 1) Source(2, 1) + SourceIndex(5) -2 >Emitted(110, 2) Source(2, 2) + SourceIndex(5) -3 >Emitted(110, 3) Source(2, 3) + SourceIndex(5) -4 >Emitted(110, 14) Source(2, 14) + SourceIndex(5) -5 >Emitted(110, 16) Source(2, 16) + SourceIndex(5) -6 >Emitted(110, 17) Source(2, 17) + SourceIndex(5) ---- ->>>//# sourceMappingURL=third-output.js.map - //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js index e57ae860e88..d91fca25e4c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js @@ -671,1640 +671,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.d.ts.map -//// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] -=================================================================== -JsFile: third-output.js -mapUrl: third-output.js.map -sourceRoot: -sources: ../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts,../../third_part1.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> function normalC() { -1->^^^^ -2 > ^^-> -1->class normalC { - > /**@internal*/ -1->Emitted(15, 5) Source(14, 20) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->constructor() { -2 > } -1->Emitted(16, 5) Source(14, 36) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 37) + SourceIndex(3) ---- ->>> normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ -6 > ^^^^^^-> -1-> - > /**@internal*/ prop: string; - > /**@internal*/ -2 > method -3 > -4 > method() { -5 > } -1->Emitted(17, 5) Source(16, 20) + SourceIndex(3) -2 >Emitted(17, 29) Source(16, 26) + SourceIndex(3) -3 >Emitted(17, 32) Source(16, 20) + SourceIndex(3) -4 >Emitted(17, 46) Source(16, 31) + SourceIndex(3) -5 >Emitted(17, 47) Source(16, 32) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -1-> - > /**@internal*/ -2 > get -3 > c -1->Emitted(18, 5) Source(17, 20) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 24) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 25) + SourceIndex(3) ---- ->>> get: function () { return 10; }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^ -5 > ^ -6 > ^ -7 > ^ -1 > -2 > get c() { -3 > return -4 > 10 -5 > ; -6 > -7 > } -1 >Emitted(19, 14) Source(17, 20) + SourceIndex(3) -2 >Emitted(19, 28) Source(17, 30) + SourceIndex(3) -3 >Emitted(19, 35) Source(17, 37) + SourceIndex(3) -4 >Emitted(19, 37) Source(17, 39) + SourceIndex(3) -5 >Emitted(19, 38) Source(17, 40) + SourceIndex(3) -6 >Emitted(19, 39) Source(17, 41) + SourceIndex(3) -7 >Emitted(19, 40) Source(17, 42) + SourceIndex(3) ---- ->>> set: function (val) { }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^^^ -5 > ^ -1 > - > /**@internal*/ -2 > set c( -3 > val: number -4 > ) { -5 > } -1 >Emitted(20, 14) Source(18, 20) + SourceIndex(3) -2 >Emitted(20, 24) Source(18, 26) + SourceIndex(3) -3 >Emitted(20, 27) Source(18, 37) + SourceIndex(3) -4 >Emitted(20, 31) Source(18, 41) + SourceIndex(3) -5 >Emitted(20, 32) Source(18, 42) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 42) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /**@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /**@internal*/ constructor() { } - > /**@internal*/ prop: string; - > /**@internal*/ method() { } - > /**@internal*/ get c() { return 10; } - > /**@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /**@internal*/ export class C { } - > /**@internal*/ export function foo() {} - > /**@internal*/ export namespace someNamespace { export class C {} } - > /**@internal*/ export namespace someOther.something { export class someClass {} } - > /**@internal*/ export import someImport = someNamespace.C; - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const internalConst = 10; - > /**@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { - > /**@internal*/ -1->Emitted(28, 5) Source(21, 20) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 20) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 37) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 38) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 37) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 38) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 37) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 38) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 20) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 38) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 33) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 34) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 38) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 38) + SourceIndex(3) ---- ->>> function foo() { } -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^-> -1-> - > /**@internal*/ -2 > export function -3 > foo -4 > () { -5 > } -1->Emitted(34, 5) Source(22, 20) + SourceIndex(3) -2 >Emitted(34, 14) Source(22, 36) + SourceIndex(3) -3 >Emitted(34, 17) Source(22, 39) + SourceIndex(3) -4 >Emitted(34, 22) Source(22, 43) + SourceIndex(3) -5 >Emitted(34, 23) Source(22, 44) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^-> -1-> -2 > foo -3 > () {} -4 > -1->Emitted(35, 5) Source(22, 36) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 39) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 44) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 44) + SourceIndex(3) ---- ->>> var someNamespace; -1->^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > /**@internal*/ -2 > export namespace -3 > someNamespace -4 > { export class C {} } -1->Emitted(36, 5) Source(23, 20) + SourceIndex(3) -2 >Emitted(36, 9) Source(23, 37) + SourceIndex(3) -3 >Emitted(36, 22) Source(23, 50) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 72) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^-> -1-> -2 > export namespace -3 > someNamespace -1->Emitted(37, 5) Source(23, 20) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 37) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 50) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 53) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 53) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 69) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 70) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 69) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 69) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 70) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 53) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 70) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 66) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 67) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 70) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 70) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 71) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 72) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 37) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 50) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 37) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 50) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 37) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 50) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 72) + SourceIndex(3) ---- ->>> var someOther; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - > /**@internal*/ -2 > export namespace -3 > someOther -4 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 20) + SourceIndex(3) -2 >Emitted(45, 9) Source(24, 37) + SourceIndex(3) -3 >Emitted(45, 18) Source(24, 46) + SourceIndex(3) -4 >Emitted(45, 19) Source(24, 86) + SourceIndex(3) ---- ->>> (function (someOther) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1-> -2 > export namespace -3 > someOther -1->Emitted(46, 5) Source(24, 20) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 37) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 46) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 47) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 47) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 56) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 86) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 47) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 47) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 56) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 59) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 59) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 83) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 84) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 83) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 84) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 83) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 84) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 59) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 84) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 72) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 81) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 84) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 84) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 85) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 86) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 47) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 56) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 47) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 56) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 47) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 56) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 86) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 85) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 86) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 37) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 46) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 37) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 46) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 37) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 46) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 86) + SourceIndex(3) ---- ->>> normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^ -5 > ^ -6 > ^ -7 > ^ -1 > - > /**@internal*/ export import -2 > someImport -3 > = -4 > someNamespace -5 > . -6 > C -7 > ; -1 >Emitted(57, 5) Source(25, 34) + SourceIndex(3) -2 >Emitted(57, 23) Source(25, 44) + SourceIndex(3) -3 >Emitted(57, 26) Source(25, 47) + SourceIndex(3) -4 >Emitted(57, 39) Source(25, 60) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 61) + SourceIndex(3) -6 >Emitted(57, 41) Source(25, 62) + SourceIndex(3) -7 >Emitted(57, 42) Source(25, 63) + SourceIndex(3) ---- ->>> normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -1 > - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const -2 > internalConst -3 > = -4 > 10 -5 > ; -1 >Emitted(58, 5) Source(27, 33) + SourceIndex(3) -2 >Emitted(58, 26) Source(27, 46) + SourceIndex(3) -3 >Emitted(58, 29) Source(27, 49) + SourceIndex(3) -4 >Emitted(58, 31) Source(27, 51) + SourceIndex(3) -5 >Emitted(58, 32) Source(27, 52) + SourceIndex(3) ---- ->>> var internalEnum; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - > /**@internal*/ -2 > export enum -3 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 20) + SourceIndex(3) -2 >Emitted(59, 9) Source(28, 32) + SourceIndex(3) -3 >Emitted(59, 21) Source(28, 56) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > export enum -3 > internalEnum -1->Emitted(60, 5) Source(28, 20) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 32) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 44) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 47) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 48) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 48) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 50) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 51) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 51) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 53) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 54) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 54) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 55) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 56) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 32) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 44) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 32) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 44) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 32) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 44) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 56) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /**@internal*/ export class C { } - > /**@internal*/ export function foo() {} - > /**@internal*/ export namespace someNamespace { export class C {} } - > /**@internal*/ export namespace someOther.something { export class someClass {} } - > /**@internal*/ export import someImport = someNamespace.C; - > /**@internal*/ export type internalType = internalC; - > /**@internal*/ export const internalConst = 10; - > /**@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>var internalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - >/**@internal*/ -1->Emitted(66, 1) Source(30, 16) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 16) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 33) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 34) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 33) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 34) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 33) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 34) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 16) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 34) + SourceIndex(3) ---- ->>>function internalfoo() { } -1-> -2 >^^^^^^^^^ -3 > ^^^^^^^^^^^ -4 > ^^^^^ -5 > ^ -1-> - >/**@internal*/ -2 >function -3 > internalfoo -4 > () { -5 > } -1->Emitted(71, 1) Source(31, 16) + SourceIndex(3) -2 >Emitted(71, 10) Source(31, 25) + SourceIndex(3) -3 >Emitted(71, 21) Source(31, 36) + SourceIndex(3) -4 >Emitted(71, 26) Source(31, 40) + SourceIndex(3) -5 >Emitted(71, 27) Source(31, 41) + SourceIndex(3) ---- ->>>var internalNamespace; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >namespace -3 > internalNamespace -4 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 16) + SourceIndex(3) -2 >Emitted(72, 5) Source(32, 26) + SourceIndex(3) -3 >Emitted(72, 22) Source(32, 43) + SourceIndex(3) -4 >Emitted(72, 23) Source(32, 73) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > internalNamespace -1->Emitted(73, 1) Source(32, 16) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 26) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 43) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 46) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 46) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 70) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 71) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 70) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 71) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 70) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 71) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 46) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 71) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 59) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 68) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 71) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 71) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 72) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 73) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 26) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 43) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 26) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 43) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 73) + SourceIndex(3) ---- ->>>var internalOther; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >namespace -3 > internalOther -4 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 16) + SourceIndex(3) -2 >Emitted(81, 5) Source(33, 26) + SourceIndex(3) -3 >Emitted(81, 18) Source(33, 39) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 79) + SourceIndex(3) ---- ->>>(function (internalOther) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1-> -2 >namespace -3 > internalOther -1->Emitted(82, 1) Source(33, 16) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 26) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 39) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 40) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 40) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 49) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 79) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 40) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 40) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 49) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 52) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 76) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 77) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 76) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 77) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 76) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 77) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 52) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 77) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 65) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 74) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 77) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 77) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 78) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 79) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 40) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 49) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 40) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 49) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 40) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 49) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 79) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 78) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 79) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 26) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 39) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 26) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 39) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 79) + SourceIndex(3) ---- ->>>var internalImport = internalNamespace.someClass; -1-> -2 >^^^^ -3 > ^^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -7 > ^^^^^^^^^ -8 > ^ -1-> - >/**@internal*/ -2 >import -3 > internalImport -4 > = -5 > internalNamespace -6 > . -7 > someClass -8 > ; -1->Emitted(93, 1) Source(34, 16) + SourceIndex(3) -2 >Emitted(93, 5) Source(34, 23) + SourceIndex(3) -3 >Emitted(93, 19) Source(34, 37) + SourceIndex(3) -4 >Emitted(93, 22) Source(34, 40) + SourceIndex(3) -5 >Emitted(93, 39) Source(34, 57) + SourceIndex(3) -6 >Emitted(93, 40) Source(34, 58) + SourceIndex(3) -7 >Emitted(93, 49) Source(34, 67) + SourceIndex(3) -8 >Emitted(93, 50) Source(34, 68) + SourceIndex(3) ---- ->>>var internalConst = 10; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^ -6 > ^ -1 > - >/**@internal*/ type internalType = internalC; - >/**@internal*/ -2 >const -3 > internalConst -4 > = -5 > 10 -6 > ; -1 >Emitted(94, 1) Source(36, 16) + SourceIndex(3) -2 >Emitted(94, 5) Source(36, 22) + SourceIndex(3) -3 >Emitted(94, 18) Source(36, 35) + SourceIndex(3) -4 >Emitted(94, 21) Source(36, 38) + SourceIndex(3) -5 >Emitted(94, 23) Source(36, 40) + SourceIndex(3) -6 >Emitted(94, 24) Source(36, 41) + SourceIndex(3) ---- ->>>var internalEnum; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - >/**@internal*/ -2 >enum -3 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 16) + SourceIndex(3) -2 >Emitted(95, 5) Source(37, 21) + SourceIndex(3) -3 >Emitted(95, 17) Source(37, 45) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >enum -3 > internalEnum -1->Emitted(96, 1) Source(37, 16) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 21) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 33) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 36) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 37) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 37) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 39) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 40) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 40) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 42) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 43) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 43) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 44) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 45) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 21) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 33) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 21) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 33) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 45) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../third_part1.ts -------------------------------------------------------------------- ->>>var c = new C(); -1-> -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^-> -1-> -2 >var -3 > c -4 > = -5 > new -6 > C -7 > () -8 > ; -1->Emitted(109, 1) Source(1, 1) + SourceIndex(5) -2 >Emitted(109, 5) Source(1, 5) + SourceIndex(5) -3 >Emitted(109, 6) Source(1, 6) + SourceIndex(5) -4 >Emitted(109, 9) Source(1, 9) + SourceIndex(5) -5 >Emitted(109, 13) Source(1, 13) + SourceIndex(5) -6 >Emitted(109, 14) Source(1, 14) + SourceIndex(5) -7 >Emitted(109, 16) Source(1, 16) + SourceIndex(5) -8 >Emitted(109, 17) Source(1, 17) + SourceIndex(5) ---- ->>>c.doSomething(); -1-> -2 >^ -3 > ^ -4 > ^^^^^^^^^^^ -5 > ^^ -6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >c -3 > . -4 > doSomething -5 > () -6 > ; -1->Emitted(110, 1) Source(2, 1) + SourceIndex(5) -2 >Emitted(110, 2) Source(2, 2) + SourceIndex(5) -3 >Emitted(110, 3) Source(2, 3) + SourceIndex(5) -4 >Emitted(110, 14) Source(2, 14) + SourceIndex(5) -5 >Emitted(110, 16) Source(2, 16) + SourceIndex(5) -6 >Emitted(110, 17) Source(2, 17) + SourceIndex(5) ---- ->>>//# sourceMappingURL=third-output.js.map - //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js index 8330077b7b9..4cc32daee93 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -778,1587 +778,6 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.d.ts.map -//// [/src/2/second-output.js.map.baseline.txt] -=================================================================== -JsFile: second-output.js -mapUrl: second-output.js.map -sourceRoot: -sources: ../first/first_PART1.ts,../first/first_part2.ts,../first/first_part3.ts,../second/second_part1.ts,../second/second_part2.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> function normalC() { -1->^^^^ -2 > ^^-> -1->class normalC { - > /*@internal*/ -1->Emitted(15, 5) Source(14, 19) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->constructor() { -2 > } -1->Emitted(16, 5) Source(14, 35) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 36) + SourceIndex(3) ---- ->>> normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ -6 > ^^^^^^-> -1-> - > /*@internal*/ prop: string; - > /*@internal*/ -2 > method -3 > -4 > method() { -5 > } -1->Emitted(17, 5) Source(16, 19) + SourceIndex(3) -2 >Emitted(17, 29) Source(16, 25) + SourceIndex(3) -3 >Emitted(17, 32) Source(16, 19) + SourceIndex(3) -4 >Emitted(17, 46) Source(16, 30) + SourceIndex(3) -5 >Emitted(17, 47) Source(16, 31) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -1-> - > /*@internal*/ -2 > get -3 > c -1->Emitted(18, 5) Source(17, 19) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 23) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 24) + SourceIndex(3) ---- ->>> get: function () { return 10; }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^ -5 > ^ -6 > ^ -7 > ^ -1 > -2 > get c() { -3 > return -4 > 10 -5 > ; -6 > -7 > } -1 >Emitted(19, 14) Source(17, 19) + SourceIndex(3) -2 >Emitted(19, 28) Source(17, 29) + SourceIndex(3) -3 >Emitted(19, 35) Source(17, 36) + SourceIndex(3) -4 >Emitted(19, 37) Source(17, 38) + SourceIndex(3) -5 >Emitted(19, 38) Source(17, 39) + SourceIndex(3) -6 >Emitted(19, 39) Source(17, 40) + SourceIndex(3) -7 >Emitted(19, 40) Source(17, 41) + SourceIndex(3) ---- ->>> set: function (val) { }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^^^ -5 > ^ -1 > - > /*@internal*/ -2 > set c( -3 > val: number -4 > ) { -5 > } -1 >Emitted(20, 14) Source(18, 19) + SourceIndex(3) -2 >Emitted(20, 24) Source(18, 25) + SourceIndex(3) -3 >Emitted(20, 27) Source(18, 36) + SourceIndex(3) -4 >Emitted(20, 31) Source(18, 40) + SourceIndex(3) -5 >Emitted(20, 32) Source(18, 41) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 41) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /*@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /*@internal*/ constructor() { } - > /*@internal*/ prop: string; - > /*@internal*/ method() { } - > /*@internal*/ get c() { return 10; } - > /*@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { - > /*@internal*/ -1->Emitted(28, 5) Source(21, 19) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 19) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 37) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 37) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 36) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 37) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 19) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 37) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 32) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 33) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 37) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 37) + SourceIndex(3) ---- ->>> function foo() { } -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^-> -1-> - > /*@internal*/ -2 > export function -3 > foo -4 > () { -5 > } -1->Emitted(34, 5) Source(22, 19) + SourceIndex(3) -2 >Emitted(34, 14) Source(22, 35) + SourceIndex(3) -3 >Emitted(34, 17) Source(22, 38) + SourceIndex(3) -4 >Emitted(34, 22) Source(22, 42) + SourceIndex(3) -5 >Emitted(34, 23) Source(22, 43) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^-> -1-> -2 > foo -3 > () {} -4 > -1->Emitted(35, 5) Source(22, 35) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 38) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 43) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 43) + SourceIndex(3) ---- ->>> var someNamespace; -1->^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > /*@internal*/ -2 > export namespace -3 > someNamespace -4 > { export class C {} } -1->Emitted(36, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(36, 9) Source(23, 36) + SourceIndex(3) -3 >Emitted(36, 22) Source(23, 49) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 71) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^-> -1-> -2 > export namespace -3 > someNamespace -1->Emitted(37, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 36) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 49) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 52) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 69) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 69) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 68) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 69) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 52) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 69) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 65) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 66) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 69) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 69) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 70) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 71) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 36) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 49) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 36) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 49) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 36) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 49) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 71) + SourceIndex(3) ---- ->>> var someOther; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - > /*@internal*/ -2 > export namespace -3 > someOther -4 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(45, 9) Source(24, 36) + SourceIndex(3) -3 >Emitted(45, 18) Source(24, 45) + SourceIndex(3) -4 >Emitted(45, 19) Source(24, 85) + SourceIndex(3) ---- ->>> (function (someOther) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1-> -2 > export namespace -3 > someOther -1->Emitted(46, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 36) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 45) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 46) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 55) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 85) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 46) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 55) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 58) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 58) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 83) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 83) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 82) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 83) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 58) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 83) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 71) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 80) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 83) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 83) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 84) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 85) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 46) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 55) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 46) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 55) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 46) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 55) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 85) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 84) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 85) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 36) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 45) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 36) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 45) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 36) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 45) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 85) + SourceIndex(3) ---- ->>> normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^ -5 > ^ -6 > ^ -7 > ^ -1 > - > /*@internal*/ export import -2 > someImport -3 > = -4 > someNamespace -5 > . -6 > C -7 > ; -1 >Emitted(57, 5) Source(25, 33) + SourceIndex(3) -2 >Emitted(57, 23) Source(25, 43) + SourceIndex(3) -3 >Emitted(57, 26) Source(25, 46) + SourceIndex(3) -4 >Emitted(57, 39) Source(25, 59) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 60) + SourceIndex(3) -6 >Emitted(57, 41) Source(25, 61) + SourceIndex(3) -7 >Emitted(57, 42) Source(25, 62) + SourceIndex(3) ---- ->>> normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -1 > - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const -2 > internalConst -3 > = -4 > 10 -5 > ; -1 >Emitted(58, 5) Source(27, 32) + SourceIndex(3) -2 >Emitted(58, 26) Source(27, 45) + SourceIndex(3) -3 >Emitted(58, 29) Source(27, 48) + SourceIndex(3) -4 >Emitted(58, 31) Source(27, 50) + SourceIndex(3) -5 >Emitted(58, 32) Source(27, 51) + SourceIndex(3) ---- ->>> var internalEnum; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - > /*@internal*/ -2 > export enum -3 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(59, 9) Source(28, 31) + SourceIndex(3) -3 >Emitted(59, 21) Source(28, 55) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > export enum -3 > internalEnum -1->Emitted(60, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 31) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 43) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 46) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 47) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 47) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 49) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 50) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 50) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 52) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 53) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 53) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 54) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 55) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 31) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 43) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 31) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 43) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 31) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 43) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 55) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>var internalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - >/*@internal*/ -1->Emitted(66, 1) Source(30, 15) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 15) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 33) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 33) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 32) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 33) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 15) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 33) + SourceIndex(3) ---- ->>>function internalfoo() { } -1-> -2 >^^^^^^^^^ -3 > ^^^^^^^^^^^ -4 > ^^^^^ -5 > ^ -1-> - >/*@internal*/ -2 >function -3 > internalfoo -4 > () { -5 > } -1->Emitted(71, 1) Source(31, 15) + SourceIndex(3) -2 >Emitted(71, 10) Source(31, 24) + SourceIndex(3) -3 >Emitted(71, 21) Source(31, 35) + SourceIndex(3) -4 >Emitted(71, 26) Source(31, 39) + SourceIndex(3) -5 >Emitted(71, 27) Source(31, 40) + SourceIndex(3) ---- ->>>var internalNamespace; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >namespace -3 > internalNamespace -4 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(72, 5) Source(32, 25) + SourceIndex(3) -3 >Emitted(72, 22) Source(32, 42) + SourceIndex(3) -4 >Emitted(72, 23) Source(32, 72) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > internalNamespace -1->Emitted(73, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 25) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 42) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 45) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 45) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 70) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 69) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 70) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 45) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 70) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 58) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 67) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 70) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 70) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 71) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 72) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 25) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 42) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 25) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 42) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 72) + SourceIndex(3) ---- ->>>var internalOther; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >namespace -3 > internalOther -4 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(81, 5) Source(33, 25) + SourceIndex(3) -3 >Emitted(81, 18) Source(33, 38) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 78) + SourceIndex(3) ---- ->>>(function (internalOther) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1-> -2 >namespace -3 > internalOther -1->Emitted(82, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 25) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 38) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 39) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 48) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 78) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 39) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 48) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 51) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 51) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 76) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 76) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 75) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 76) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 51) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 76) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 64) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 73) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 76) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 76) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 77) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 78) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 39) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 48) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 39) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 48) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 39) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 48) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 78) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 77) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 78) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 25) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 38) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 25) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 38) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 78) + SourceIndex(3) ---- ->>>var internalImport = internalNamespace.someClass; -1-> -2 >^^^^ -3 > ^^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -7 > ^^^^^^^^^ -8 > ^ -1-> - >/*@internal*/ -2 >import -3 > internalImport -4 > = -5 > internalNamespace -6 > . -7 > someClass -8 > ; -1->Emitted(93, 1) Source(34, 15) + SourceIndex(3) -2 >Emitted(93, 5) Source(34, 22) + SourceIndex(3) -3 >Emitted(93, 19) Source(34, 36) + SourceIndex(3) -4 >Emitted(93, 22) Source(34, 39) + SourceIndex(3) -5 >Emitted(93, 39) Source(34, 56) + SourceIndex(3) -6 >Emitted(93, 40) Source(34, 57) + SourceIndex(3) -7 >Emitted(93, 49) Source(34, 66) + SourceIndex(3) -8 >Emitted(93, 50) Source(34, 67) + SourceIndex(3) ---- ->>>var internalConst = 10; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^ -6 > ^ -1 > - >/*@internal*/ type internalType = internalC; - >/*@internal*/ -2 >const -3 > internalConst -4 > = -5 > 10 -6 > ; -1 >Emitted(94, 1) Source(36, 15) + SourceIndex(3) -2 >Emitted(94, 5) Source(36, 21) + SourceIndex(3) -3 >Emitted(94, 18) Source(36, 34) + SourceIndex(3) -4 >Emitted(94, 21) Source(36, 37) + SourceIndex(3) -5 >Emitted(94, 23) Source(36, 39) + SourceIndex(3) -6 >Emitted(94, 24) Source(36, 40) + SourceIndex(3) ---- ->>>var internalEnum; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >enum -3 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(95, 5) Source(37, 20) + SourceIndex(3) -3 >Emitted(95, 17) Source(37, 44) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >enum -3 > internalEnum -1->Emitted(96, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 20) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 32) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 35) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 36) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 36) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 38) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 39) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 39) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 41) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 42) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 42) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 43) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 44) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 20) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 32) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 20) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 32) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 44) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- ->>>//# sourceMappingURL=second-output.js.map - //// [/src/2/second-output.tsbuildinfo] { "bundle": { @@ -3326,1640 +1745,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.d.ts.map -//// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] -=================================================================== -JsFile: third-output.js -mapUrl: third-output.js.map -sourceRoot: -sources: ../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts,../../third_part1.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> function normalC() { -1->^^^^ -2 > ^^-> -1->class normalC { - > /*@internal*/ -1->Emitted(15, 5) Source(14, 19) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->constructor() { -2 > } -1->Emitted(16, 5) Source(14, 35) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 36) + SourceIndex(3) ---- ->>> normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ -6 > ^^^^^^-> -1-> - > /*@internal*/ prop: string; - > /*@internal*/ -2 > method -3 > -4 > method() { -5 > } -1->Emitted(17, 5) Source(16, 19) + SourceIndex(3) -2 >Emitted(17, 29) Source(16, 25) + SourceIndex(3) -3 >Emitted(17, 32) Source(16, 19) + SourceIndex(3) -4 >Emitted(17, 46) Source(16, 30) + SourceIndex(3) -5 >Emitted(17, 47) Source(16, 31) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -1-> - > /*@internal*/ -2 > get -3 > c -1->Emitted(18, 5) Source(17, 19) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 23) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 24) + SourceIndex(3) ---- ->>> get: function () { return 10; }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^ -5 > ^ -6 > ^ -7 > ^ -1 > -2 > get c() { -3 > return -4 > 10 -5 > ; -6 > -7 > } -1 >Emitted(19, 14) Source(17, 19) + SourceIndex(3) -2 >Emitted(19, 28) Source(17, 29) + SourceIndex(3) -3 >Emitted(19, 35) Source(17, 36) + SourceIndex(3) -4 >Emitted(19, 37) Source(17, 38) + SourceIndex(3) -5 >Emitted(19, 38) Source(17, 39) + SourceIndex(3) -6 >Emitted(19, 39) Source(17, 40) + SourceIndex(3) -7 >Emitted(19, 40) Source(17, 41) + SourceIndex(3) ---- ->>> set: function (val) { }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^^^ -5 > ^ -1 > - > /*@internal*/ -2 > set c( -3 > val: number -4 > ) { -5 > } -1 >Emitted(20, 14) Source(18, 19) + SourceIndex(3) -2 >Emitted(20, 24) Source(18, 25) + SourceIndex(3) -3 >Emitted(20, 27) Source(18, 36) + SourceIndex(3) -4 >Emitted(20, 31) Source(18, 40) + SourceIndex(3) -5 >Emitted(20, 32) Source(18, 41) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 41) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /*@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /*@internal*/ constructor() { } - > /*@internal*/ prop: string; - > /*@internal*/ method() { } - > /*@internal*/ get c() { return 10; } - > /*@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { - > /*@internal*/ -1->Emitted(28, 5) Source(21, 19) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 19) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 37) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 37) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 36) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 37) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 19) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 37) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 32) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 33) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 37) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 37) + SourceIndex(3) ---- ->>> function foo() { } -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^-> -1-> - > /*@internal*/ -2 > export function -3 > foo -4 > () { -5 > } -1->Emitted(34, 5) Source(22, 19) + SourceIndex(3) -2 >Emitted(34, 14) Source(22, 35) + SourceIndex(3) -3 >Emitted(34, 17) Source(22, 38) + SourceIndex(3) -4 >Emitted(34, 22) Source(22, 42) + SourceIndex(3) -5 >Emitted(34, 23) Source(22, 43) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^-> -1-> -2 > foo -3 > () {} -4 > -1->Emitted(35, 5) Source(22, 35) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 38) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 43) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 43) + SourceIndex(3) ---- ->>> var someNamespace; -1->^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > /*@internal*/ -2 > export namespace -3 > someNamespace -4 > { export class C {} } -1->Emitted(36, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(36, 9) Source(23, 36) + SourceIndex(3) -3 >Emitted(36, 22) Source(23, 49) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 71) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^-> -1-> -2 > export namespace -3 > someNamespace -1->Emitted(37, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 36) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 49) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 52) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 69) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 69) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 68) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 69) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 52) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 69) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 65) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 66) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 69) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 69) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 70) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 71) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 36) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 49) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 36) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 49) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 36) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 49) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 71) + SourceIndex(3) ---- ->>> var someOther; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - > /*@internal*/ -2 > export namespace -3 > someOther -4 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(45, 9) Source(24, 36) + SourceIndex(3) -3 >Emitted(45, 18) Source(24, 45) + SourceIndex(3) -4 >Emitted(45, 19) Source(24, 85) + SourceIndex(3) ---- ->>> (function (someOther) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1-> -2 > export namespace -3 > someOther -1->Emitted(46, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 36) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 45) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 46) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 55) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 85) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 46) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 55) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 58) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 58) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 83) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 83) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 82) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 83) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 58) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 83) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 71) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 80) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 83) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 83) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 84) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 85) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 46) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 55) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 46) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 55) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 46) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 55) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 85) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 84) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 85) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 36) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 45) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 36) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 45) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 36) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 45) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 85) + SourceIndex(3) ---- ->>> normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^ -5 > ^ -6 > ^ -7 > ^ -1 > - > /*@internal*/ export import -2 > someImport -3 > = -4 > someNamespace -5 > . -6 > C -7 > ; -1 >Emitted(57, 5) Source(25, 33) + SourceIndex(3) -2 >Emitted(57, 23) Source(25, 43) + SourceIndex(3) -3 >Emitted(57, 26) Source(25, 46) + SourceIndex(3) -4 >Emitted(57, 39) Source(25, 59) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 60) + SourceIndex(3) -6 >Emitted(57, 41) Source(25, 61) + SourceIndex(3) -7 >Emitted(57, 42) Source(25, 62) + SourceIndex(3) ---- ->>> normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -1 > - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const -2 > internalConst -3 > = -4 > 10 -5 > ; -1 >Emitted(58, 5) Source(27, 32) + SourceIndex(3) -2 >Emitted(58, 26) Source(27, 45) + SourceIndex(3) -3 >Emitted(58, 29) Source(27, 48) + SourceIndex(3) -4 >Emitted(58, 31) Source(27, 50) + SourceIndex(3) -5 >Emitted(58, 32) Source(27, 51) + SourceIndex(3) ---- ->>> var internalEnum; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - > /*@internal*/ -2 > export enum -3 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(59, 9) Source(28, 31) + SourceIndex(3) -3 >Emitted(59, 21) Source(28, 55) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > export enum -3 > internalEnum -1->Emitted(60, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 31) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 43) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 46) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 47) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 47) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 49) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 50) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 50) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 52) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 53) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 53) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 54) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 55) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 31) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 43) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 31) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 43) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 31) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 43) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 55) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>var internalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - >/*@internal*/ -1->Emitted(66, 1) Source(30, 15) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 15) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 33) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 33) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 32) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 33) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 15) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 33) + SourceIndex(3) ---- ->>>function internalfoo() { } -1-> -2 >^^^^^^^^^ -3 > ^^^^^^^^^^^ -4 > ^^^^^ -5 > ^ -1-> - >/*@internal*/ -2 >function -3 > internalfoo -4 > () { -5 > } -1->Emitted(71, 1) Source(31, 15) + SourceIndex(3) -2 >Emitted(71, 10) Source(31, 24) + SourceIndex(3) -3 >Emitted(71, 21) Source(31, 35) + SourceIndex(3) -4 >Emitted(71, 26) Source(31, 39) + SourceIndex(3) -5 >Emitted(71, 27) Source(31, 40) + SourceIndex(3) ---- ->>>var internalNamespace; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >namespace -3 > internalNamespace -4 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(72, 5) Source(32, 25) + SourceIndex(3) -3 >Emitted(72, 22) Source(32, 42) + SourceIndex(3) -4 >Emitted(72, 23) Source(32, 72) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > internalNamespace -1->Emitted(73, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 25) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 42) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 45) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 45) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 70) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 69) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 70) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 45) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 70) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 58) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 67) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 70) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 70) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 71) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 72) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 25) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 42) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 25) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 42) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 72) + SourceIndex(3) ---- ->>>var internalOther; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >namespace -3 > internalOther -4 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(81, 5) Source(33, 25) + SourceIndex(3) -3 >Emitted(81, 18) Source(33, 38) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 78) + SourceIndex(3) ---- ->>>(function (internalOther) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1-> -2 >namespace -3 > internalOther -1->Emitted(82, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 25) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 38) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 39) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 48) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 78) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 39) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 48) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 51) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 51) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 76) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 76) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 75) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 76) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 51) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 76) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 64) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 73) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 76) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 76) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 77) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 78) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 39) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 48) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 39) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 48) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 39) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 48) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 78) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 77) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 78) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 25) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 38) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 25) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 38) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 78) + SourceIndex(3) ---- ->>>var internalImport = internalNamespace.someClass; -1-> -2 >^^^^ -3 > ^^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -7 > ^^^^^^^^^ -8 > ^ -1-> - >/*@internal*/ -2 >import -3 > internalImport -4 > = -5 > internalNamespace -6 > . -7 > someClass -8 > ; -1->Emitted(93, 1) Source(34, 15) + SourceIndex(3) -2 >Emitted(93, 5) Source(34, 22) + SourceIndex(3) -3 >Emitted(93, 19) Source(34, 36) + SourceIndex(3) -4 >Emitted(93, 22) Source(34, 39) + SourceIndex(3) -5 >Emitted(93, 39) Source(34, 56) + SourceIndex(3) -6 >Emitted(93, 40) Source(34, 57) + SourceIndex(3) -7 >Emitted(93, 49) Source(34, 66) + SourceIndex(3) -8 >Emitted(93, 50) Source(34, 67) + SourceIndex(3) ---- ->>>var internalConst = 10; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^ -6 > ^ -1 > - >/*@internal*/ type internalType = internalC; - >/*@internal*/ -2 >const -3 > internalConst -4 > = -5 > 10 -6 > ; -1 >Emitted(94, 1) Source(36, 15) + SourceIndex(3) -2 >Emitted(94, 5) Source(36, 21) + SourceIndex(3) -3 >Emitted(94, 18) Source(36, 34) + SourceIndex(3) -4 >Emitted(94, 21) Source(36, 37) + SourceIndex(3) -5 >Emitted(94, 23) Source(36, 39) + SourceIndex(3) -6 >Emitted(94, 24) Source(36, 40) + SourceIndex(3) ---- ->>>var internalEnum; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >enum -3 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(95, 5) Source(37, 20) + SourceIndex(3) -3 >Emitted(95, 17) Source(37, 44) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >enum -3 > internalEnum -1->Emitted(96, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 20) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 32) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 35) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 36) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 36) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 38) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 39) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 39) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 41) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 42) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 42) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 43) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 44) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 20) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 32) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 20) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 32) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 44) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../third_part1.ts -------------------------------------------------------------------- ->>>var c = new C(); -1-> -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^-> -1-> -2 >var -3 > c -4 > = -5 > new -6 > C -7 > () -8 > ; -1->Emitted(109, 1) Source(1, 1) + SourceIndex(5) -2 >Emitted(109, 5) Source(1, 5) + SourceIndex(5) -3 >Emitted(109, 6) Source(1, 6) + SourceIndex(5) -4 >Emitted(109, 9) Source(1, 9) + SourceIndex(5) -5 >Emitted(109, 13) Source(1, 13) + SourceIndex(5) -6 >Emitted(109, 14) Source(1, 14) + SourceIndex(5) -7 >Emitted(109, 16) Source(1, 16) + SourceIndex(5) -8 >Emitted(109, 17) Source(1, 17) + SourceIndex(5) ---- ->>>c.doSomething(); -1-> -2 >^ -3 > ^ -4 > ^^^^^^^^^^^ -5 > ^^ -6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >c -3 > . -4 > doSomething -5 > () -6 > ; -1->Emitted(110, 1) Source(2, 1) + SourceIndex(5) -2 >Emitted(110, 2) Source(2, 2) + SourceIndex(5) -3 >Emitted(110, 3) Source(2, 3) + SourceIndex(5) -4 >Emitted(110, 14) Source(2, 14) + SourceIndex(5) -5 >Emitted(110, 16) Source(2, 16) + SourceIndex(5) -6 >Emitted(110, 17) Source(2, 17) + SourceIndex(5) ---- ->>>//# sourceMappingURL=third-output.js.map - //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 962e2c19099..b52187573a3 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -778,1687 +778,6 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.d.ts.map -//// [/src/2/second-output.js.map.baseline.txt] -=================================================================== -JsFile: second-output.js -mapUrl: second-output.js.map -sourceRoot: -sources: ../first/first_PART1.ts,../first/first_part2.ts,../first/first_part3.ts,../second/second_part1.ts,../second/second_part2.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = /** @class */ (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> /*@internal*/ function normalC() { -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -1->class normalC { - > -2 > /*@internal*/ -3 > -1->Emitted(15, 5) Source(14, 5) + SourceIndex(3) -2 >Emitted(15, 18) Source(14, 18) + SourceIndex(3) -3 >Emitted(15, 19) Source(14, 19) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >constructor() { -2 > } -1 >Emitted(16, 5) Source(14, 35) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 36) + SourceIndex(3) ---- ->>> /*@internal*/ normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^ -7 > ^ -1-> - > /*@internal*/ prop: string; - > -2 > /*@internal*/ -3 > -4 > method -5 > -6 > method() { -7 > } -1->Emitted(17, 5) Source(16, 5) + SourceIndex(3) -2 >Emitted(17, 18) Source(16, 18) + SourceIndex(3) -3 >Emitted(17, 19) Source(16, 19) + SourceIndex(3) -4 >Emitted(17, 43) Source(16, 25) + SourceIndex(3) -5 >Emitted(17, 46) Source(16, 19) + SourceIndex(3) -6 >Emitted(17, 60) Source(16, 30) + SourceIndex(3) -7 >Emitted(17, 61) Source(16, 31) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1 > - > /*@internal*/ -2 > get -3 > c -1 >Emitted(18, 5) Source(17, 19) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 23) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 24) + SourceIndex(3) ---- ->>> /*@internal*/ get: function () { return 10; }, -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^^ -6 > ^^ -7 > ^ -8 > ^ -9 > ^ -1-> -2 > /*@internal*/ -3 > -4 > get c() { -5 > return -6 > 10 -7 > ; -8 > -9 > } -1->Emitted(19, 9) Source(17, 5) + SourceIndex(3) -2 >Emitted(19, 22) Source(17, 18) + SourceIndex(3) -3 >Emitted(19, 28) Source(17, 19) + SourceIndex(3) -4 >Emitted(19, 42) Source(17, 29) + SourceIndex(3) -5 >Emitted(19, 49) Source(17, 36) + SourceIndex(3) -6 >Emitted(19, 51) Source(17, 38) + SourceIndex(3) -7 >Emitted(19, 52) Source(17, 39) + SourceIndex(3) -8 >Emitted(19, 53) Source(17, 40) + SourceIndex(3) -9 >Emitted(19, 54) Source(17, 41) + SourceIndex(3) ---- ->>> /*@internal*/ set: function (val) { }, -1 >^^^^^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^ -5 > ^^^ -6 > ^^^^ -7 > ^ -1 > - > -2 > /*@internal*/ -3 > -4 > set c( -5 > val: number -6 > ) { -7 > } -1 >Emitted(20, 9) Source(18, 5) + SourceIndex(3) -2 >Emitted(20, 22) Source(18, 18) + SourceIndex(3) -3 >Emitted(20, 28) Source(18, 19) + SourceIndex(3) -4 >Emitted(20, 38) Source(18, 25) + SourceIndex(3) -5 >Emitted(20, 41) Source(18, 36) + SourceIndex(3) -6 >Emitted(20, 45) Source(18, 40) + SourceIndex(3) -7 >Emitted(20, 46) Source(18, 41) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 41) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /*@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /*@internal*/ constructor() { } - > /*@internal*/ prop: string; - > /*@internal*/ method() { } - > /*@internal*/ get c() { return 10; } - > /*@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> /*@internal*/ var C = /** @class */ (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^-> -1-> { - > -2 > /*@internal*/ -3 > -1->Emitted(28, 5) Source(21, 5) + SourceIndex(3) -2 >Emitted(28, 18) Source(21, 18) + SourceIndex(3) -3 >Emitted(28, 19) Source(21, 19) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 19) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 37) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 37) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 36) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 37) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 19) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 37) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 32) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 33) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 37) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 37) + SourceIndex(3) ---- ->>> /*@internal*/ function foo() { } -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^ -7 > ^ -1-> - > -2 > /*@internal*/ -3 > -4 > export function -5 > foo -6 > () { -7 > } -1->Emitted(34, 5) Source(22, 5) + SourceIndex(3) -2 >Emitted(34, 18) Source(22, 18) + SourceIndex(3) -3 >Emitted(34, 19) Source(22, 19) + SourceIndex(3) -4 >Emitted(34, 28) Source(22, 35) + SourceIndex(3) -5 >Emitted(34, 31) Source(22, 38) + SourceIndex(3) -6 >Emitted(34, 36) Source(22, 42) + SourceIndex(3) -7 >Emitted(34, 37) Source(22, 43) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^-> -1 > -2 > foo -3 > () {} -4 > -1 >Emitted(35, 5) Source(22, 35) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 38) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 43) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 43) + SourceIndex(3) ---- ->>> /*@internal*/ var someNamespace; -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^ -1-> - > -2 > /*@internal*/ -3 > -4 > export namespace -5 > someNamespace -6 > { export class C {} } -1->Emitted(36, 5) Source(23, 5) + SourceIndex(3) -2 >Emitted(36, 18) Source(23, 18) + SourceIndex(3) -3 >Emitted(36, 19) Source(23, 19) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 36) + SourceIndex(3) -5 >Emitted(36, 36) Source(23, 49) + SourceIndex(3) -6 >Emitted(36, 37) Source(23, 71) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^-> -1 > -2 > export namespace -3 > someNamespace -1 >Emitted(37, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 36) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 49) + SourceIndex(3) ---- ->>> var C = /** @class */ (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 52) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 69) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 69) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 68) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 69) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 52) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 69) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 65) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 66) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 69) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 69) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 70) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 71) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 36) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 49) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 36) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 49) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 36) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 49) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 71) + SourceIndex(3) ---- ->>> /*@internal*/ var someOther; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^ -6 > ^ -1 > - > -2 > /*@internal*/ -3 > -4 > export namespace -5 > someOther -6 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 5) + SourceIndex(3) -2 >Emitted(45, 18) Source(24, 18) + SourceIndex(3) -3 >Emitted(45, 19) Source(24, 19) + SourceIndex(3) -4 >Emitted(45, 23) Source(24, 36) + SourceIndex(3) -5 >Emitted(45, 32) Source(24, 45) + SourceIndex(3) -6 >Emitted(45, 33) Source(24, 85) + SourceIndex(3) ---- ->>> (function (someOther) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1 > -2 > export namespace -3 > someOther -1 >Emitted(46, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 36) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 45) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 46) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 55) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 85) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 46) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 55) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 58) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 58) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 83) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 83) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 82) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 83) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 58) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 83) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 71) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 80) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 83) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 83) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 84) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 85) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 46) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 55) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 46) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 55) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 46) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 55) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 85) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 84) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 85) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 36) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 45) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 36) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 45) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 36) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 45) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 85) + SourceIndex(3) ---- ->>> /*@internal*/ normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^ -7 > ^ -8 > ^ -9 > ^ -1 > - > -2 > /*@internal*/ -3 > export import -4 > someImport -5 > = -6 > someNamespace -7 > . -8 > C -9 > ; -1 >Emitted(57, 5) Source(25, 5) + SourceIndex(3) -2 >Emitted(57, 18) Source(25, 18) + SourceIndex(3) -3 >Emitted(57, 19) Source(25, 33) + SourceIndex(3) -4 >Emitted(57, 37) Source(25, 43) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 46) + SourceIndex(3) -6 >Emitted(57, 53) Source(25, 59) + SourceIndex(3) -7 >Emitted(57, 54) Source(25, 60) + SourceIndex(3) -8 >Emitted(57, 55) Source(25, 61) + SourceIndex(3) -9 >Emitted(57, 56) Source(25, 62) + SourceIndex(3) ---- ->>> /*@internal*/ normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^ -7 > ^ -1 > - > /*@internal*/ export type internalType = internalC; - > -2 > /*@internal*/ -3 > export const -4 > internalConst -5 > = -6 > 10 -7 > ; -1 >Emitted(58, 5) Source(27, 5) + SourceIndex(3) -2 >Emitted(58, 18) Source(27, 18) + SourceIndex(3) -3 >Emitted(58, 19) Source(27, 32) + SourceIndex(3) -4 >Emitted(58, 40) Source(27, 45) + SourceIndex(3) -5 >Emitted(58, 43) Source(27, 48) + SourceIndex(3) -6 >Emitted(58, 45) Source(27, 50) + SourceIndex(3) -7 >Emitted(58, 46) Source(27, 51) + SourceIndex(3) ---- ->>> /*@internal*/ var internalEnum; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^ -1 > - > -2 > /*@internal*/ -3 > -4 > export enum -5 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 5) + SourceIndex(3) -2 >Emitted(59, 18) Source(28, 18) + SourceIndex(3) -3 >Emitted(59, 19) Source(28, 19) + SourceIndex(3) -4 >Emitted(59, 23) Source(28, 31) + SourceIndex(3) -5 >Emitted(59, 35) Source(28, 55) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > export enum -3 > internalEnum -1 >Emitted(60, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 31) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 43) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 46) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 47) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 47) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 49) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 50) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 50) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 52) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 53) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 53) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 54) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 55) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 31) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 43) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 31) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 43) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 31) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 43) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 55) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>/*@internal*/ var internalC = /** @class */ (function () { -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^-> -1-> - > -2 >/*@internal*/ -3 > -1->Emitted(66, 1) Source(30, 1) + SourceIndex(3) -2 >Emitted(66, 14) Source(30, 14) + SourceIndex(3) -3 >Emitted(66, 15) Source(30, 15) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 15) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 33) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 33) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 32) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 33) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 15) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 33) + SourceIndex(3) ---- ->>>/*@internal*/ function internalfoo() { } -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^ -5 > ^^^^^^^^^^^ -6 > ^^^^^ -7 > ^ -1-> - > -2 >/*@internal*/ -3 > -4 > function -5 > internalfoo -6 > () { -7 > } -1->Emitted(71, 1) Source(31, 1) + SourceIndex(3) -2 >Emitted(71, 14) Source(31, 14) + SourceIndex(3) -3 >Emitted(71, 15) Source(31, 15) + SourceIndex(3) -4 >Emitted(71, 24) Source(31, 24) + SourceIndex(3) -5 >Emitted(71, 35) Source(31, 35) + SourceIndex(3) -6 >Emitted(71, 40) Source(31, 39) + SourceIndex(3) -7 >Emitted(71, 41) Source(31, 40) + SourceIndex(3) ---- ->>>/*@internal*/ var internalNamespace; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -1 > - > -2 >/*@internal*/ -3 > -4 > namespace -5 > internalNamespace -6 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 1) + SourceIndex(3) -2 >Emitted(72, 14) Source(32, 14) + SourceIndex(3) -3 >Emitted(72, 15) Source(32, 15) + SourceIndex(3) -4 >Emitted(72, 19) Source(32, 25) + SourceIndex(3) -5 >Emitted(72, 36) Source(32, 42) + SourceIndex(3) -6 >Emitted(72, 37) Source(32, 72) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >namespace -3 > internalNamespace -1 >Emitted(73, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 25) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 42) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 45) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 45) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 70) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 69) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 70) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 45) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 70) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 58) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 67) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 70) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 70) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 71) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 72) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 25) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 42) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 25) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 42) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 72) + SourceIndex(3) ---- ->>>/*@internal*/ var internalOther; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^ -1 > - > -2 >/*@internal*/ -3 > -4 > namespace -5 > internalOther -6 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 1) + SourceIndex(3) -2 >Emitted(81, 14) Source(33, 14) + SourceIndex(3) -3 >Emitted(81, 15) Source(33, 15) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 25) + SourceIndex(3) -5 >Emitted(81, 32) Source(33, 38) + SourceIndex(3) -6 >Emitted(81, 33) Source(33, 78) + SourceIndex(3) ---- ->>>(function (internalOther) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1 > -2 >namespace -3 > internalOther -1 >Emitted(82, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 25) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 38) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 39) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 48) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 78) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 39) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 48) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 51) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 51) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 76) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 76) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 75) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 76) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 51) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 76) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 64) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 73) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 76) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 76) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 77) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 78) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 39) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 48) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 39) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 48) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 39) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 48) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 78) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 77) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 78) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 25) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 38) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 25) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 38) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 78) + SourceIndex(3) ---- ->>>/*@internal*/ var internalImport = internalNamespace.someClass; -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^^^ -7 > ^^^^^^^^^^^^^^^^^ -8 > ^ -9 > ^^^^^^^^^ -10> ^ -1-> - > -2 >/*@internal*/ -3 > -4 > import -5 > internalImport -6 > = -7 > internalNamespace -8 > . -9 > someClass -10> ; -1->Emitted(93, 1) Source(34, 1) + SourceIndex(3) -2 >Emitted(93, 14) Source(34, 14) + SourceIndex(3) -3 >Emitted(93, 15) Source(34, 15) + SourceIndex(3) -4 >Emitted(93, 19) Source(34, 22) + SourceIndex(3) -5 >Emitted(93, 33) Source(34, 36) + SourceIndex(3) -6 >Emitted(93, 36) Source(34, 39) + SourceIndex(3) -7 >Emitted(93, 53) Source(34, 56) + SourceIndex(3) -8 >Emitted(93, 54) Source(34, 57) + SourceIndex(3) -9 >Emitted(93, 63) Source(34, 66) + SourceIndex(3) -10>Emitted(93, 64) Source(34, 67) + SourceIndex(3) ---- ->>>/*@internal*/ var internalConst = 10; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^^^ -7 > ^^ -8 > ^ -1 > - >/*@internal*/ type internalType = internalC; - > -2 >/*@internal*/ -3 > -4 > const -5 > internalConst -6 > = -7 > 10 -8 > ; -1 >Emitted(94, 1) Source(36, 1) + SourceIndex(3) -2 >Emitted(94, 14) Source(36, 14) + SourceIndex(3) -3 >Emitted(94, 15) Source(36, 15) + SourceIndex(3) -4 >Emitted(94, 19) Source(36, 21) + SourceIndex(3) -5 >Emitted(94, 32) Source(36, 34) + SourceIndex(3) -6 >Emitted(94, 35) Source(36, 37) + SourceIndex(3) -7 >Emitted(94, 37) Source(36, 39) + SourceIndex(3) -8 >Emitted(94, 38) Source(36, 40) + SourceIndex(3) ---- ->>>/*@internal*/ var internalEnum; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^ -1 > - > -2 >/*@internal*/ -3 > -4 > enum -5 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 1) + SourceIndex(3) -2 >Emitted(95, 14) Source(37, 14) + SourceIndex(3) -3 >Emitted(95, 15) Source(37, 15) + SourceIndex(3) -4 >Emitted(95, 19) Source(37, 20) + SourceIndex(3) -5 >Emitted(95, 31) Source(37, 44) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >enum -3 > internalEnum -1 >Emitted(96, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 20) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 32) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 35) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 36) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 36) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 38) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 39) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 39) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 41) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 42) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 42) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 43) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 44) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 20) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 32) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 20) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 32) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 44) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/2/second-output.js -sourceFile:../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = /** @class */ (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- ->>>//# sourceMappingURL=second-output.js.map - //// [/src/2/second-output.tsbuildinfo] { "bundle": { @@ -3426,1740 +1745,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.d.ts.map -//// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] -=================================================================== -JsFile: third-output.js -mapUrl: third-output.js.map -sourceRoot: -sources: ../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts,../../third_part1.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = /** @class */ (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> /*@internal*/ function normalC() { -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -1->class normalC { - > -2 > /*@internal*/ -3 > -1->Emitted(15, 5) Source(14, 5) + SourceIndex(3) -2 >Emitted(15, 18) Source(14, 18) + SourceIndex(3) -3 >Emitted(15, 19) Source(14, 19) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >constructor() { -2 > } -1 >Emitted(16, 5) Source(14, 35) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 36) + SourceIndex(3) ---- ->>> /*@internal*/ normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^ -7 > ^ -1-> - > /*@internal*/ prop: string; - > -2 > /*@internal*/ -3 > -4 > method -5 > -6 > method() { -7 > } -1->Emitted(17, 5) Source(16, 5) + SourceIndex(3) -2 >Emitted(17, 18) Source(16, 18) + SourceIndex(3) -3 >Emitted(17, 19) Source(16, 19) + SourceIndex(3) -4 >Emitted(17, 43) Source(16, 25) + SourceIndex(3) -5 >Emitted(17, 46) Source(16, 19) + SourceIndex(3) -6 >Emitted(17, 60) Source(16, 30) + SourceIndex(3) -7 >Emitted(17, 61) Source(16, 31) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1 > - > /*@internal*/ -2 > get -3 > c -1 >Emitted(18, 5) Source(17, 19) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 23) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 24) + SourceIndex(3) ---- ->>> /*@internal*/ get: function () { return 10; }, -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^^ -6 > ^^ -7 > ^ -8 > ^ -9 > ^ -1-> -2 > /*@internal*/ -3 > -4 > get c() { -5 > return -6 > 10 -7 > ; -8 > -9 > } -1->Emitted(19, 9) Source(17, 5) + SourceIndex(3) -2 >Emitted(19, 22) Source(17, 18) + SourceIndex(3) -3 >Emitted(19, 28) Source(17, 19) + SourceIndex(3) -4 >Emitted(19, 42) Source(17, 29) + SourceIndex(3) -5 >Emitted(19, 49) Source(17, 36) + SourceIndex(3) -6 >Emitted(19, 51) Source(17, 38) + SourceIndex(3) -7 >Emitted(19, 52) Source(17, 39) + SourceIndex(3) -8 >Emitted(19, 53) Source(17, 40) + SourceIndex(3) -9 >Emitted(19, 54) Source(17, 41) + SourceIndex(3) ---- ->>> /*@internal*/ set: function (val) { }, -1 >^^^^^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^ -5 > ^^^ -6 > ^^^^ -7 > ^ -1 > - > -2 > /*@internal*/ -3 > -4 > set c( -5 > val: number -6 > ) { -7 > } -1 >Emitted(20, 9) Source(18, 5) + SourceIndex(3) -2 >Emitted(20, 22) Source(18, 18) + SourceIndex(3) -3 >Emitted(20, 28) Source(18, 19) + SourceIndex(3) -4 >Emitted(20, 38) Source(18, 25) + SourceIndex(3) -5 >Emitted(20, 41) Source(18, 36) + SourceIndex(3) -6 >Emitted(20, 45) Source(18, 40) + SourceIndex(3) -7 >Emitted(20, 46) Source(18, 41) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 41) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /*@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /*@internal*/ constructor() { } - > /*@internal*/ prop: string; - > /*@internal*/ method() { } - > /*@internal*/ get c() { return 10; } - > /*@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> /*@internal*/ var C = /** @class */ (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^-> -1-> { - > -2 > /*@internal*/ -3 > -1->Emitted(28, 5) Source(21, 5) + SourceIndex(3) -2 >Emitted(28, 18) Source(21, 18) + SourceIndex(3) -3 >Emitted(28, 19) Source(21, 19) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 19) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 37) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 37) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 36) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 37) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 19) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 37) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 32) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 33) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 37) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 37) + SourceIndex(3) ---- ->>> /*@internal*/ function foo() { } -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^ -7 > ^ -1-> - > -2 > /*@internal*/ -3 > -4 > export function -5 > foo -6 > () { -7 > } -1->Emitted(34, 5) Source(22, 5) + SourceIndex(3) -2 >Emitted(34, 18) Source(22, 18) + SourceIndex(3) -3 >Emitted(34, 19) Source(22, 19) + SourceIndex(3) -4 >Emitted(34, 28) Source(22, 35) + SourceIndex(3) -5 >Emitted(34, 31) Source(22, 38) + SourceIndex(3) -6 >Emitted(34, 36) Source(22, 42) + SourceIndex(3) -7 >Emitted(34, 37) Source(22, 43) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^-> -1 > -2 > foo -3 > () {} -4 > -1 >Emitted(35, 5) Source(22, 35) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 38) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 43) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 43) + SourceIndex(3) ---- ->>> /*@internal*/ var someNamespace; -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^ -1-> - > -2 > /*@internal*/ -3 > -4 > export namespace -5 > someNamespace -6 > { export class C {} } -1->Emitted(36, 5) Source(23, 5) + SourceIndex(3) -2 >Emitted(36, 18) Source(23, 18) + SourceIndex(3) -3 >Emitted(36, 19) Source(23, 19) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 36) + SourceIndex(3) -5 >Emitted(36, 36) Source(23, 49) + SourceIndex(3) -6 >Emitted(36, 37) Source(23, 71) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^-> -1 > -2 > export namespace -3 > someNamespace -1 >Emitted(37, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 36) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 49) + SourceIndex(3) ---- ->>> var C = /** @class */ (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 52) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 69) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 69) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 68) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 69) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 52) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 69) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 65) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 66) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 69) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 69) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 70) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 71) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 36) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 49) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 36) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 49) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 36) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 49) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 71) + SourceIndex(3) ---- ->>> /*@internal*/ var someOther; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^ -6 > ^ -1 > - > -2 > /*@internal*/ -3 > -4 > export namespace -5 > someOther -6 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 5) + SourceIndex(3) -2 >Emitted(45, 18) Source(24, 18) + SourceIndex(3) -3 >Emitted(45, 19) Source(24, 19) + SourceIndex(3) -4 >Emitted(45, 23) Source(24, 36) + SourceIndex(3) -5 >Emitted(45, 32) Source(24, 45) + SourceIndex(3) -6 >Emitted(45, 33) Source(24, 85) + SourceIndex(3) ---- ->>> (function (someOther) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1 > -2 > export namespace -3 > someOther -1 >Emitted(46, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 36) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 45) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 46) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 55) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 85) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 46) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 55) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 58) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 58) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 83) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 83) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 82) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 83) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 58) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 83) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 71) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 80) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 83) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 83) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 84) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 85) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 46) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 55) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 46) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 55) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 46) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 55) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 85) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 84) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 85) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 36) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 45) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 36) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 45) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 36) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 45) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 85) + SourceIndex(3) ---- ->>> /*@internal*/ normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^ -7 > ^ -8 > ^ -9 > ^ -1 > - > -2 > /*@internal*/ -3 > export import -4 > someImport -5 > = -6 > someNamespace -7 > . -8 > C -9 > ; -1 >Emitted(57, 5) Source(25, 5) + SourceIndex(3) -2 >Emitted(57, 18) Source(25, 18) + SourceIndex(3) -3 >Emitted(57, 19) Source(25, 33) + SourceIndex(3) -4 >Emitted(57, 37) Source(25, 43) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 46) + SourceIndex(3) -6 >Emitted(57, 53) Source(25, 59) + SourceIndex(3) -7 >Emitted(57, 54) Source(25, 60) + SourceIndex(3) -8 >Emitted(57, 55) Source(25, 61) + SourceIndex(3) -9 >Emitted(57, 56) Source(25, 62) + SourceIndex(3) ---- ->>> /*@internal*/ normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^ -7 > ^ -1 > - > /*@internal*/ export type internalType = internalC; - > -2 > /*@internal*/ -3 > export const -4 > internalConst -5 > = -6 > 10 -7 > ; -1 >Emitted(58, 5) Source(27, 5) + SourceIndex(3) -2 >Emitted(58, 18) Source(27, 18) + SourceIndex(3) -3 >Emitted(58, 19) Source(27, 32) + SourceIndex(3) -4 >Emitted(58, 40) Source(27, 45) + SourceIndex(3) -5 >Emitted(58, 43) Source(27, 48) + SourceIndex(3) -6 >Emitted(58, 45) Source(27, 50) + SourceIndex(3) -7 >Emitted(58, 46) Source(27, 51) + SourceIndex(3) ---- ->>> /*@internal*/ var internalEnum; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^ -1 > - > -2 > /*@internal*/ -3 > -4 > export enum -5 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 5) + SourceIndex(3) -2 >Emitted(59, 18) Source(28, 18) + SourceIndex(3) -3 >Emitted(59, 19) Source(28, 19) + SourceIndex(3) -4 >Emitted(59, 23) Source(28, 31) + SourceIndex(3) -5 >Emitted(59, 35) Source(28, 55) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > export enum -3 > internalEnum -1 >Emitted(60, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 31) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 43) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 46) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 47) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 47) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 49) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 50) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 50) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 52) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 53) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 53) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 54) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 55) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 31) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 43) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 31) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 43) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 31) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 43) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 55) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>/*@internal*/ var internalC = /** @class */ (function () { -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^-> -1-> - > -2 >/*@internal*/ -3 > -1->Emitted(66, 1) Source(30, 1) + SourceIndex(3) -2 >Emitted(66, 14) Source(30, 14) + SourceIndex(3) -3 >Emitted(66, 15) Source(30, 15) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 15) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 33) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 33) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 32) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 33) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 15) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 33) + SourceIndex(3) ---- ->>>/*@internal*/ function internalfoo() { } -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^ -5 > ^^^^^^^^^^^ -6 > ^^^^^ -7 > ^ -1-> - > -2 >/*@internal*/ -3 > -4 > function -5 > internalfoo -6 > () { -7 > } -1->Emitted(71, 1) Source(31, 1) + SourceIndex(3) -2 >Emitted(71, 14) Source(31, 14) + SourceIndex(3) -3 >Emitted(71, 15) Source(31, 15) + SourceIndex(3) -4 >Emitted(71, 24) Source(31, 24) + SourceIndex(3) -5 >Emitted(71, 35) Source(31, 35) + SourceIndex(3) -6 >Emitted(71, 40) Source(31, 39) + SourceIndex(3) -7 >Emitted(71, 41) Source(31, 40) + SourceIndex(3) ---- ->>>/*@internal*/ var internalNamespace; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -1 > - > -2 >/*@internal*/ -3 > -4 > namespace -5 > internalNamespace -6 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 1) + SourceIndex(3) -2 >Emitted(72, 14) Source(32, 14) + SourceIndex(3) -3 >Emitted(72, 15) Source(32, 15) + SourceIndex(3) -4 >Emitted(72, 19) Source(32, 25) + SourceIndex(3) -5 >Emitted(72, 36) Source(32, 42) + SourceIndex(3) -6 >Emitted(72, 37) Source(32, 72) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >namespace -3 > internalNamespace -1 >Emitted(73, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 25) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 42) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 45) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 45) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 70) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 69) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 70) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 45) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 70) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 58) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 67) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 70) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 70) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 71) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 72) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 25) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 42) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 25) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 42) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 72) + SourceIndex(3) ---- ->>>/*@internal*/ var internalOther; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^ -1 > - > -2 >/*@internal*/ -3 > -4 > namespace -5 > internalOther -6 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 1) + SourceIndex(3) -2 >Emitted(81, 14) Source(33, 14) + SourceIndex(3) -3 >Emitted(81, 15) Source(33, 15) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 25) + SourceIndex(3) -5 >Emitted(81, 32) Source(33, 38) + SourceIndex(3) -6 >Emitted(81, 33) Source(33, 78) + SourceIndex(3) ---- ->>>(function (internalOther) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1 > -2 >namespace -3 > internalOther -1 >Emitted(82, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 25) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 38) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 39) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 48) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 78) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 39) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 48) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 51) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 51) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 76) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 76) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 75) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 76) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 51) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 76) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 64) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 73) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 76) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 76) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 77) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 78) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 39) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 48) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 39) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 48) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 39) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 48) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 78) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 77) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 78) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 25) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 38) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 25) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 38) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 78) + SourceIndex(3) ---- ->>>/*@internal*/ var internalImport = internalNamespace.someClass; -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^^^ -7 > ^^^^^^^^^^^^^^^^^ -8 > ^ -9 > ^^^^^^^^^ -10> ^ -1-> - > -2 >/*@internal*/ -3 > -4 > import -5 > internalImport -6 > = -7 > internalNamespace -8 > . -9 > someClass -10> ; -1->Emitted(93, 1) Source(34, 1) + SourceIndex(3) -2 >Emitted(93, 14) Source(34, 14) + SourceIndex(3) -3 >Emitted(93, 15) Source(34, 15) + SourceIndex(3) -4 >Emitted(93, 19) Source(34, 22) + SourceIndex(3) -5 >Emitted(93, 33) Source(34, 36) + SourceIndex(3) -6 >Emitted(93, 36) Source(34, 39) + SourceIndex(3) -7 >Emitted(93, 53) Source(34, 56) + SourceIndex(3) -8 >Emitted(93, 54) Source(34, 57) + SourceIndex(3) -9 >Emitted(93, 63) Source(34, 66) + SourceIndex(3) -10>Emitted(93, 64) Source(34, 67) + SourceIndex(3) ---- ->>>/*@internal*/ var internalConst = 10; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^^^ -7 > ^^ -8 > ^ -1 > - >/*@internal*/ type internalType = internalC; - > -2 >/*@internal*/ -3 > -4 > const -5 > internalConst -6 > = -7 > 10 -8 > ; -1 >Emitted(94, 1) Source(36, 1) + SourceIndex(3) -2 >Emitted(94, 14) Source(36, 14) + SourceIndex(3) -3 >Emitted(94, 15) Source(36, 15) + SourceIndex(3) -4 >Emitted(94, 19) Source(36, 21) + SourceIndex(3) -5 >Emitted(94, 32) Source(36, 34) + SourceIndex(3) -6 >Emitted(94, 35) Source(36, 37) + SourceIndex(3) -7 >Emitted(94, 37) Source(36, 39) + SourceIndex(3) -8 >Emitted(94, 38) Source(36, 40) + SourceIndex(3) ---- ->>>/*@internal*/ var internalEnum; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^ -1 > - > -2 >/*@internal*/ -3 > -4 > enum -5 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 1) + SourceIndex(3) -2 >Emitted(95, 14) Source(37, 14) + SourceIndex(3) -3 >Emitted(95, 15) Source(37, 15) + SourceIndex(3) -4 >Emitted(95, 19) Source(37, 20) + SourceIndex(3) -5 >Emitted(95, 31) Source(37, 44) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >enum -3 > internalEnum -1 >Emitted(96, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 20) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 32) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 35) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 36) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 36) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 38) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 39) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 39) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 41) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 42) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 42) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 43) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 44) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 20) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 32) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 20) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 32) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 44) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = /** @class */ (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../third_part1.ts -------------------------------------------------------------------- ->>>var c = new C(); -1-> -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^-> -1-> -2 >var -3 > c -4 > = -5 > new -6 > C -7 > () -8 > ; -1->Emitted(109, 1) Source(1, 1) + SourceIndex(5) -2 >Emitted(109, 5) Source(1, 5) + SourceIndex(5) -3 >Emitted(109, 6) Source(1, 6) + SourceIndex(5) -4 >Emitted(109, 9) Source(1, 9) + SourceIndex(5) -5 >Emitted(109, 13) Source(1, 13) + SourceIndex(5) -6 >Emitted(109, 14) Source(1, 14) + SourceIndex(5) -7 >Emitted(109, 16) Source(1, 16) + SourceIndex(5) -8 >Emitted(109, 17) Source(1, 17) + SourceIndex(5) ---- ->>>c.doSomething(); -1-> -2 >^ -3 > ^ -4 > ^^^^^^^^^^^ -5 > ^^ -6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >c -3 > . -4 > doSomething -5 > () -6 > ; -1->Emitted(110, 1) Source(2, 1) + SourceIndex(5) -2 >Emitted(110, 2) Source(2, 2) + SourceIndex(5) -3 >Emitted(110, 3) Source(2, 3) + SourceIndex(5) -4 >Emitted(110, 14) Source(2, 14) + SourceIndex(5) -5 >Emitted(110, 16) Source(2, 16) + SourceIndex(5) -6 >Emitted(110, 17) Source(2, 17) + SourceIndex(5) ---- ->>>//# sourceMappingURL=third-output.js.map - //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js index fb04c867b4e..65791f61896 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js @@ -671,1740 +671,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.d.ts.map -//// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] -=================================================================== -JsFile: third-output.js -mapUrl: third-output.js.map -sourceRoot: -sources: ../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts,../../third_part1.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = /** @class */ (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> /*@internal*/ function normalC() { -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -1->class normalC { - > -2 > /*@internal*/ -3 > -1->Emitted(15, 5) Source(14, 5) + SourceIndex(3) -2 >Emitted(15, 18) Source(14, 18) + SourceIndex(3) -3 >Emitted(15, 19) Source(14, 19) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >constructor() { -2 > } -1 >Emitted(16, 5) Source(14, 35) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 36) + SourceIndex(3) ---- ->>> /*@internal*/ normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^ -7 > ^ -1-> - > /*@internal*/ prop: string; - > -2 > /*@internal*/ -3 > -4 > method -5 > -6 > method() { -7 > } -1->Emitted(17, 5) Source(16, 5) + SourceIndex(3) -2 >Emitted(17, 18) Source(16, 18) + SourceIndex(3) -3 >Emitted(17, 19) Source(16, 19) + SourceIndex(3) -4 >Emitted(17, 43) Source(16, 25) + SourceIndex(3) -5 >Emitted(17, 46) Source(16, 19) + SourceIndex(3) -6 >Emitted(17, 60) Source(16, 30) + SourceIndex(3) -7 >Emitted(17, 61) Source(16, 31) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1 > - > /*@internal*/ -2 > get -3 > c -1 >Emitted(18, 5) Source(17, 19) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 23) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 24) + SourceIndex(3) ---- ->>> /*@internal*/ get: function () { return 10; }, -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^^^^^^^ -6 > ^^ -7 > ^ -8 > ^ -9 > ^ -1-> -2 > /*@internal*/ -3 > -4 > get c() { -5 > return -6 > 10 -7 > ; -8 > -9 > } -1->Emitted(19, 9) Source(17, 5) + SourceIndex(3) -2 >Emitted(19, 22) Source(17, 18) + SourceIndex(3) -3 >Emitted(19, 28) Source(17, 19) + SourceIndex(3) -4 >Emitted(19, 42) Source(17, 29) + SourceIndex(3) -5 >Emitted(19, 49) Source(17, 36) + SourceIndex(3) -6 >Emitted(19, 51) Source(17, 38) + SourceIndex(3) -7 >Emitted(19, 52) Source(17, 39) + SourceIndex(3) -8 >Emitted(19, 53) Source(17, 40) + SourceIndex(3) -9 >Emitted(19, 54) Source(17, 41) + SourceIndex(3) ---- ->>> /*@internal*/ set: function (val) { }, -1 >^^^^^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^^^^^^^^^^ -5 > ^^^ -6 > ^^^^ -7 > ^ -1 > - > -2 > /*@internal*/ -3 > -4 > set c( -5 > val: number -6 > ) { -7 > } -1 >Emitted(20, 9) Source(18, 5) + SourceIndex(3) -2 >Emitted(20, 22) Source(18, 18) + SourceIndex(3) -3 >Emitted(20, 28) Source(18, 19) + SourceIndex(3) -4 >Emitted(20, 38) Source(18, 25) + SourceIndex(3) -5 >Emitted(20, 41) Source(18, 36) + SourceIndex(3) -6 >Emitted(20, 45) Source(18, 40) + SourceIndex(3) -7 >Emitted(20, 46) Source(18, 41) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 41) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /*@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /*@internal*/ constructor() { } - > /*@internal*/ prop: string; - > /*@internal*/ method() { } - > /*@internal*/ get c() { return 10; } - > /*@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> /*@internal*/ var C = /** @class */ (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^-> -1-> { - > -2 > /*@internal*/ -3 > -1->Emitted(28, 5) Source(21, 5) + SourceIndex(3) -2 >Emitted(28, 18) Source(21, 18) + SourceIndex(3) -3 >Emitted(28, 19) Source(21, 19) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 19) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 37) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 37) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 36) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 37) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 19) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 37) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 32) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 33) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 37) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 37) + SourceIndex(3) ---- ->>> /*@internal*/ function foo() { } -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^ -7 > ^ -1-> - > -2 > /*@internal*/ -3 > -4 > export function -5 > foo -6 > () { -7 > } -1->Emitted(34, 5) Source(22, 5) + SourceIndex(3) -2 >Emitted(34, 18) Source(22, 18) + SourceIndex(3) -3 >Emitted(34, 19) Source(22, 19) + SourceIndex(3) -4 >Emitted(34, 28) Source(22, 35) + SourceIndex(3) -5 >Emitted(34, 31) Source(22, 38) + SourceIndex(3) -6 >Emitted(34, 36) Source(22, 42) + SourceIndex(3) -7 >Emitted(34, 37) Source(22, 43) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^-> -1 > -2 > foo -3 > () {} -4 > -1 >Emitted(35, 5) Source(22, 35) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 38) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 43) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 43) + SourceIndex(3) ---- ->>> /*@internal*/ var someNamespace; -1->^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^ -1-> - > -2 > /*@internal*/ -3 > -4 > export namespace -5 > someNamespace -6 > { export class C {} } -1->Emitted(36, 5) Source(23, 5) + SourceIndex(3) -2 >Emitted(36, 18) Source(23, 18) + SourceIndex(3) -3 >Emitted(36, 19) Source(23, 19) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 36) + SourceIndex(3) -5 >Emitted(36, 36) Source(23, 49) + SourceIndex(3) -6 >Emitted(36, 37) Source(23, 71) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^-> -1 > -2 > export namespace -3 > someNamespace -1 >Emitted(37, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 36) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 49) + SourceIndex(3) ---- ->>> var C = /** @class */ (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 52) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 69) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 69) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 68) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 69) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 52) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 69) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 65) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 66) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 69) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 69) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 70) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 71) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 36) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 49) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 36) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 49) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 36) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 49) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 71) + SourceIndex(3) ---- ->>> /*@internal*/ var someOther; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^ -6 > ^ -1 > - > -2 > /*@internal*/ -3 > -4 > export namespace -5 > someOther -6 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 5) + SourceIndex(3) -2 >Emitted(45, 18) Source(24, 18) + SourceIndex(3) -3 >Emitted(45, 19) Source(24, 19) + SourceIndex(3) -4 >Emitted(45, 23) Source(24, 36) + SourceIndex(3) -5 >Emitted(45, 32) Source(24, 45) + SourceIndex(3) -6 >Emitted(45, 33) Source(24, 85) + SourceIndex(3) ---- ->>> (function (someOther) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1 > -2 > export namespace -3 > someOther -1 >Emitted(46, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 36) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 45) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 46) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 55) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 85) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 46) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 55) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 58) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 58) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 83) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 83) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 82) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 83) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 58) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 83) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 71) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 80) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 83) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 83) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 84) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 85) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 46) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 55) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 46) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 55) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 46) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 55) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 85) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 84) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 85) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 36) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 45) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 36) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 45) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 36) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 45) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 85) + SourceIndex(3) ---- ->>> /*@internal*/ normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^ -7 > ^ -8 > ^ -9 > ^ -1 > - > -2 > /*@internal*/ -3 > export import -4 > someImport -5 > = -6 > someNamespace -7 > . -8 > C -9 > ; -1 >Emitted(57, 5) Source(25, 5) + SourceIndex(3) -2 >Emitted(57, 18) Source(25, 18) + SourceIndex(3) -3 >Emitted(57, 19) Source(25, 33) + SourceIndex(3) -4 >Emitted(57, 37) Source(25, 43) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 46) + SourceIndex(3) -6 >Emitted(57, 53) Source(25, 59) + SourceIndex(3) -7 >Emitted(57, 54) Source(25, 60) + SourceIndex(3) -8 >Emitted(57, 55) Source(25, 61) + SourceIndex(3) -9 >Emitted(57, 56) Source(25, 62) + SourceIndex(3) ---- ->>> /*@internal*/ normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^ -7 > ^ -1 > - > /*@internal*/ export type internalType = internalC; - > -2 > /*@internal*/ -3 > export const -4 > internalConst -5 > = -6 > 10 -7 > ; -1 >Emitted(58, 5) Source(27, 5) + SourceIndex(3) -2 >Emitted(58, 18) Source(27, 18) + SourceIndex(3) -3 >Emitted(58, 19) Source(27, 32) + SourceIndex(3) -4 >Emitted(58, 40) Source(27, 45) + SourceIndex(3) -5 >Emitted(58, 43) Source(27, 48) + SourceIndex(3) -6 >Emitted(58, 45) Source(27, 50) + SourceIndex(3) -7 >Emitted(58, 46) Source(27, 51) + SourceIndex(3) ---- ->>> /*@internal*/ var internalEnum; -1 >^^^^ -2 > ^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^ -1 > - > -2 > /*@internal*/ -3 > -4 > export enum -5 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 5) + SourceIndex(3) -2 >Emitted(59, 18) Source(28, 18) + SourceIndex(3) -3 >Emitted(59, 19) Source(28, 19) + SourceIndex(3) -4 >Emitted(59, 23) Source(28, 31) + SourceIndex(3) -5 >Emitted(59, 35) Source(28, 55) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1 >^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > export enum -3 > internalEnum -1 >Emitted(60, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 31) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 43) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 46) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 47) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 47) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 49) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 50) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 50) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 52) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 53) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 53) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 54) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 55) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 31) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 43) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 31) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 43) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 31) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 43) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 55) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>/*@internal*/ var internalC = /** @class */ (function () { -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^-> -1-> - > -2 >/*@internal*/ -3 > -1->Emitted(66, 1) Source(30, 1) + SourceIndex(3) -2 >Emitted(66, 14) Source(30, 14) + SourceIndex(3) -3 >Emitted(66, 15) Source(30, 15) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 15) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 33) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 33) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 32) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 33) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 15) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 33) + SourceIndex(3) ---- ->>>/*@internal*/ function internalfoo() { } -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^ -5 > ^^^^^^^^^^^ -6 > ^^^^^ -7 > ^ -1-> - > -2 >/*@internal*/ -3 > -4 > function -5 > internalfoo -6 > () { -7 > } -1->Emitted(71, 1) Source(31, 1) + SourceIndex(3) -2 >Emitted(71, 14) Source(31, 14) + SourceIndex(3) -3 >Emitted(71, 15) Source(31, 15) + SourceIndex(3) -4 >Emitted(71, 24) Source(31, 24) + SourceIndex(3) -5 >Emitted(71, 35) Source(31, 35) + SourceIndex(3) -6 >Emitted(71, 40) Source(31, 39) + SourceIndex(3) -7 >Emitted(71, 41) Source(31, 40) + SourceIndex(3) ---- ->>>/*@internal*/ var internalNamespace; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -1 > - > -2 >/*@internal*/ -3 > -4 > namespace -5 > internalNamespace -6 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 1) + SourceIndex(3) -2 >Emitted(72, 14) Source(32, 14) + SourceIndex(3) -3 >Emitted(72, 15) Source(32, 15) + SourceIndex(3) -4 >Emitted(72, 19) Source(32, 25) + SourceIndex(3) -5 >Emitted(72, 36) Source(32, 42) + SourceIndex(3) -6 >Emitted(72, 37) Source(32, 72) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >namespace -3 > internalNamespace -1 >Emitted(73, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 25) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 42) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 45) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 45) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 70) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 69) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 70) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 45) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 70) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 58) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 67) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 70) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 70) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 71) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 72) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 25) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 42) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 25) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 42) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 72) + SourceIndex(3) ---- ->>>/*@internal*/ var internalOther; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^ -1 > - > -2 >/*@internal*/ -3 > -4 > namespace -5 > internalOther -6 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 1) + SourceIndex(3) -2 >Emitted(81, 14) Source(33, 14) + SourceIndex(3) -3 >Emitted(81, 15) Source(33, 15) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 25) + SourceIndex(3) -5 >Emitted(81, 32) Source(33, 38) + SourceIndex(3) -6 >Emitted(81, 33) Source(33, 78) + SourceIndex(3) ---- ->>>(function (internalOther) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1 > -2 >namespace -3 > internalOther -1 >Emitted(82, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 25) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 38) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 39) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 48) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 78) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 39) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 48) + SourceIndex(3) ---- ->>> var someClass = /** @class */ (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 51) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 51) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 76) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 76) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 75) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 76) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 51) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 76) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 64) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 73) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 76) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 76) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 77) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 78) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 39) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 48) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 39) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 48) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 39) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 48) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 78) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 77) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 78) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 25) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 38) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 25) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 38) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 78) + SourceIndex(3) ---- ->>>/*@internal*/ var internalImport = internalNamespace.someClass; -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^^^ -7 > ^^^^^^^^^^^^^^^^^ -8 > ^ -9 > ^^^^^^^^^ -10> ^ -1-> - > -2 >/*@internal*/ -3 > -4 > import -5 > internalImport -6 > = -7 > internalNamespace -8 > . -9 > someClass -10> ; -1->Emitted(93, 1) Source(34, 1) + SourceIndex(3) -2 >Emitted(93, 14) Source(34, 14) + SourceIndex(3) -3 >Emitted(93, 15) Source(34, 15) + SourceIndex(3) -4 >Emitted(93, 19) Source(34, 22) + SourceIndex(3) -5 >Emitted(93, 33) Source(34, 36) + SourceIndex(3) -6 >Emitted(93, 36) Source(34, 39) + SourceIndex(3) -7 >Emitted(93, 53) Source(34, 56) + SourceIndex(3) -8 >Emitted(93, 54) Source(34, 57) + SourceIndex(3) -9 >Emitted(93, 63) Source(34, 66) + SourceIndex(3) -10>Emitted(93, 64) Source(34, 67) + SourceIndex(3) ---- ->>>/*@internal*/ var internalConst = 10; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^^ -6 > ^^^ -7 > ^^ -8 > ^ -1 > - >/*@internal*/ type internalType = internalC; - > -2 >/*@internal*/ -3 > -4 > const -5 > internalConst -6 > = -7 > 10 -8 > ; -1 >Emitted(94, 1) Source(36, 1) + SourceIndex(3) -2 >Emitted(94, 14) Source(36, 14) + SourceIndex(3) -3 >Emitted(94, 15) Source(36, 15) + SourceIndex(3) -4 >Emitted(94, 19) Source(36, 21) + SourceIndex(3) -5 >Emitted(94, 32) Source(36, 34) + SourceIndex(3) -6 >Emitted(94, 35) Source(36, 37) + SourceIndex(3) -7 >Emitted(94, 37) Source(36, 39) + SourceIndex(3) -8 >Emitted(94, 38) Source(36, 40) + SourceIndex(3) ---- ->>>/*@internal*/ var internalEnum; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^ -5 > ^^^^^^^^^^^^ -1 > - > -2 >/*@internal*/ -3 > -4 > enum -5 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 1) + SourceIndex(3) -2 >Emitted(95, 14) Source(37, 14) + SourceIndex(3) -3 >Emitted(95, 15) Source(37, 15) + SourceIndex(3) -4 >Emitted(95, 19) Source(37, 20) + SourceIndex(3) -5 >Emitted(95, 31) Source(37, 44) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1 > -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >enum -3 > internalEnum -1 >Emitted(96, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 20) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 32) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 35) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 36) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 36) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 38) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 39) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 39) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 41) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 42) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 42) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 43) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 44) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 20) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 32) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 20) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 32) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 44) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = /** @class */ (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../third_part1.ts -------------------------------------------------------------------- ->>>var c = new C(); -1-> -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^-> -1-> -2 >var -3 > c -4 > = -5 > new -6 > C -7 > () -8 > ; -1->Emitted(109, 1) Source(1, 1) + SourceIndex(5) -2 >Emitted(109, 5) Source(1, 5) + SourceIndex(5) -3 >Emitted(109, 6) Source(1, 6) + SourceIndex(5) -4 >Emitted(109, 9) Source(1, 9) + SourceIndex(5) -5 >Emitted(109, 13) Source(1, 13) + SourceIndex(5) -6 >Emitted(109, 14) Source(1, 14) + SourceIndex(5) -7 >Emitted(109, 16) Source(1, 16) + SourceIndex(5) -8 >Emitted(109, 17) Source(1, 17) + SourceIndex(5) ---- ->>>c.doSomething(); -1-> -2 >^ -3 > ^ -4 > ^^^^^^^^^^^ -5 > ^^ -6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >c -3 > . -4 > doSomething -5 > () -6 > ; -1->Emitted(110, 1) Source(2, 1) + SourceIndex(5) -2 >Emitted(110, 2) Source(2, 2) + SourceIndex(5) -3 >Emitted(110, 3) Source(2, 3) + SourceIndex(5) -4 >Emitted(110, 14) Source(2, 14) + SourceIndex(5) -5 >Emitted(110, 16) Source(2, 16) + SourceIndex(5) -6 >Emitted(110, 17) Source(2, 17) + SourceIndex(5) ---- ->>>//# sourceMappingURL=third-output.js.map - //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js index 4c263d59de8..75a1379fe9f 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js @@ -671,1640 +671,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.d.ts.map -//// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] -=================================================================== -JsFile: third-output.js -mapUrl: third-output.js.map -sourceRoot: -sources: ../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts,../../third_part1.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_PART1.ts -------------------------------------------------------------------- ->>>var s = "Hello, world"; -1 > -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^ -6 > ^ -1 >interface TheFirst { - > none: any; - >} - > - > -2 >const -3 > s -4 > = -5 > "Hello, world" -6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(0) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(0) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(0) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(0) ---- ->>>console.log(s); -1 > -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^ -8 > ^ -9 > ^^^-> -1 > - > - >interface NoJsForHereEither { - > none: any; - >} - > - > -2 >console -3 > . -4 > log -5 > ( -6 > s -7 > ) -8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(0) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(0) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(0) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(0) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(0) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(0) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(0) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part2.ts -------------------------------------------------------------------- ->>>console.log(f()); -1-> -2 >^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^ -1-> -2 >console -3 > . -4 > log -5 > ( -6 > f -7 > () -8 > ) -9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(1) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(1) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(1) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(1) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(1) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(1) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(1) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../first/first_part3.ts -------------------------------------------------------------------- ->>>function f() { -1 > -2 >^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> -1 > -2 >function -3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(2) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(2) ---- ->>> return "JS does hoists"; -1->^^^^ -2 > ^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -1->() { - > -2 > return -3 > "JS does hoists" -4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(2) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(2) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(2) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(2) ---- ->>>} -1 > -2 >^ -3 > ^^^^^^-> -1 > - > -2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(2) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(2) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part1.ts -------------------------------------------------------------------- ->>>var N; -1-> -2 >^^^^ -3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1->namespace N { - > // Comment text - >} - > - > -2 >namespace -3 > N -4 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(7, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(7, 5) Source(5, 11) + SourceIndex(3) -3 >Emitted(7, 6) Source(5, 12) + SourceIndex(3) -4 >Emitted(7, 7) Source(11, 2) + SourceIndex(3) ---- ->>>(function (N) { -1-> -2 >^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > N -1->Emitted(8, 1) Source(5, 1) + SourceIndex(3) -2 >Emitted(8, 12) Source(5, 11) + SourceIndex(3) -3 >Emitted(8, 13) Source(5, 12) + SourceIndex(3) ---- ->>> function f() { -1->^^^^ -2 > ^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^-> -1-> { - > -2 > function -3 > f -1->Emitted(9, 5) Source(6, 5) + SourceIndex(3) -2 >Emitted(9, 14) Source(6, 14) + SourceIndex(3) -3 >Emitted(9, 15) Source(6, 15) + SourceIndex(3) ---- ->>> console.log('testing'); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^ -7 > ^ -8 > ^ -1->() { - > -2 > console -3 > . -4 > log -5 > ( -6 > 'testing' -7 > ) -8 > ; -1->Emitted(10, 9) Source(7, 9) + SourceIndex(3) -2 >Emitted(10, 16) Source(7, 16) + SourceIndex(3) -3 >Emitted(10, 17) Source(7, 17) + SourceIndex(3) -4 >Emitted(10, 20) Source(7, 20) + SourceIndex(3) -5 >Emitted(10, 21) Source(7, 21) + SourceIndex(3) -6 >Emitted(10, 30) Source(7, 30) + SourceIndex(3) -7 >Emitted(10, 31) Source(7, 31) + SourceIndex(3) -8 >Emitted(10, 32) Source(7, 32) + SourceIndex(3) ---- ->>> } -1 >^^^^ -2 > ^ -3 > ^^^^-> -1 > - > -2 > } -1 >Emitted(11, 5) Source(8, 5) + SourceIndex(3) -2 >Emitted(11, 6) Source(8, 6) + SourceIndex(3) ---- ->>> f(); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^-> -1-> - > - > -2 > f -3 > () -4 > ; -1->Emitted(12, 5) Source(10, 5) + SourceIndex(3) -2 >Emitted(12, 6) Source(10, 6) + SourceIndex(3) -3 >Emitted(12, 8) Source(10, 8) + SourceIndex(3) -4 >Emitted(12, 9) Source(10, 9) + SourceIndex(3) ---- ->>>})(N || (N = {})); -1-> -2 >^ -3 > ^^ -4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^-> -1-> - > -2 >} -3 > -4 > N -5 > -6 > N -7 > { - > function f() { - > console.log('testing'); - > } - > - > f(); - > } -1->Emitted(13, 1) Source(11, 1) + SourceIndex(3) -2 >Emitted(13, 2) Source(11, 2) + SourceIndex(3) -3 >Emitted(13, 4) Source(5, 11) + SourceIndex(3) -4 >Emitted(13, 5) Source(5, 12) + SourceIndex(3) -5 >Emitted(13, 10) Source(5, 11) + SourceIndex(3) -6 >Emitted(13, 11) Source(5, 12) + SourceIndex(3) -7 >Emitted(13, 19) Source(11, 2) + SourceIndex(3) ---- ->>>var normalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > - > -1->Emitted(14, 1) Source(13, 1) + SourceIndex(3) ---- ->>> function normalC() { -1->^^^^ -2 > ^^-> -1->class normalC { - > /*@internal*/ -1->Emitted(15, 5) Source(14, 19) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->constructor() { -2 > } -1->Emitted(16, 5) Source(14, 35) + SourceIndex(3) -2 >Emitted(16, 6) Source(14, 36) + SourceIndex(3) ---- ->>> normalC.prototype.method = function () { }; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^^ -5 > ^ -6 > ^^^^^^-> -1-> - > /*@internal*/ prop: string; - > /*@internal*/ -2 > method -3 > -4 > method() { -5 > } -1->Emitted(17, 5) Source(16, 19) + SourceIndex(3) -2 >Emitted(17, 29) Source(16, 25) + SourceIndex(3) -3 >Emitted(17, 32) Source(16, 19) + SourceIndex(3) -4 >Emitted(17, 46) Source(16, 30) + SourceIndex(3) -5 >Emitted(17, 47) Source(16, 31) + SourceIndex(3) ---- ->>> Object.defineProperty(normalC.prototype, "c", { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^ -1-> - > /*@internal*/ -2 > get -3 > c -1->Emitted(18, 5) Source(17, 19) + SourceIndex(3) -2 >Emitted(18, 27) Source(17, 23) + SourceIndex(3) -3 >Emitted(18, 49) Source(17, 24) + SourceIndex(3) ---- ->>> get: function () { return 10; }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^ -5 > ^ -6 > ^ -7 > ^ -1 > -2 > get c() { -3 > return -4 > 10 -5 > ; -6 > -7 > } -1 >Emitted(19, 14) Source(17, 19) + SourceIndex(3) -2 >Emitted(19, 28) Source(17, 29) + SourceIndex(3) -3 >Emitted(19, 35) Source(17, 36) + SourceIndex(3) -4 >Emitted(19, 37) Source(17, 38) + SourceIndex(3) -5 >Emitted(19, 38) Source(17, 39) + SourceIndex(3) -6 >Emitted(19, 39) Source(17, 40) + SourceIndex(3) -7 >Emitted(19, 40) Source(17, 41) + SourceIndex(3) ---- ->>> set: function (val) { }, -1 >^^^^^^^^^^^^^ -2 > ^^^^^^^^^^ -3 > ^^^ -4 > ^^^^ -5 > ^ -1 > - > /*@internal*/ -2 > set c( -3 > val: number -4 > ) { -5 > } -1 >Emitted(20, 14) Source(18, 19) + SourceIndex(3) -2 >Emitted(20, 24) Source(18, 25) + SourceIndex(3) -3 >Emitted(20, 27) Source(18, 36) + SourceIndex(3) -4 >Emitted(20, 31) Source(18, 40) + SourceIndex(3) -5 >Emitted(20, 32) Source(18, 41) + SourceIndex(3) ---- ->>> enumerable: true, ->>> configurable: true ->>> }); -1 >^^^^^^^ -2 > ^^^^^^^^^^^^^-> -1 > -1 >Emitted(23, 8) Source(17, 41) + SourceIndex(3) ---- ->>> return normalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^ -1-> - > /*@internal*/ set c(val: number) { } - > -2 > } -1->Emitted(24, 5) Source(19, 1) + SourceIndex(3) -2 >Emitted(24, 19) Source(19, 2) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > class normalC { - > /*@internal*/ constructor() { } - > /*@internal*/ prop: string; - > /*@internal*/ method() { } - > /*@internal*/ get c() { return 10; } - > /*@internal*/ set c(val: number) { } - > } -1 >Emitted(25, 1) Source(19, 1) + SourceIndex(3) -2 >Emitted(25, 2) Source(19, 2) + SourceIndex(3) -3 >Emitted(25, 2) Source(13, 1) + SourceIndex(3) -4 >Emitted(25, 6) Source(19, 2) + SourceIndex(3) ---- ->>>var normalN; -1-> -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > -2 >namespace -3 > normalN -4 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1->Emitted(26, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(26, 5) Source(20, 11) + SourceIndex(3) -3 >Emitted(26, 12) Source(20, 18) + SourceIndex(3) -4 >Emitted(26, 13) Source(29, 2) + SourceIndex(3) ---- ->>>(function (normalN) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^ -4 > ^^^^^^^^^-> -1-> -2 >namespace -3 > normalN -1->Emitted(27, 1) Source(20, 1) + SourceIndex(3) -2 >Emitted(27, 12) Source(20, 11) + SourceIndex(3) -3 >Emitted(27, 19) Source(20, 18) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { - > /*@internal*/ -1->Emitted(28, 5) Source(21, 19) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(29, 9) Source(21, 19) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(30, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(30, 10) Source(21, 37) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(31, 9) Source(21, 36) + SourceIndex(3) -2 >Emitted(31, 17) Source(21, 37) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C { } -1 >Emitted(32, 5) Source(21, 36) + SourceIndex(3) -2 >Emitted(32, 6) Source(21, 37) + SourceIndex(3) -3 >Emitted(32, 6) Source(21, 19) + SourceIndex(3) -4 >Emitted(32, 10) Source(21, 37) + SourceIndex(3) ---- ->>> normalN.C = C; -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^-> -1-> -2 > C -3 > { } -4 > -1->Emitted(33, 5) Source(21, 32) + SourceIndex(3) -2 >Emitted(33, 14) Source(21, 33) + SourceIndex(3) -3 >Emitted(33, 18) Source(21, 37) + SourceIndex(3) -4 >Emitted(33, 19) Source(21, 37) + SourceIndex(3) ---- ->>> function foo() { } -1->^^^^ -2 > ^^^^^^^^^ -3 > ^^^ -4 > ^^^^^ -5 > ^ -6 > ^-> -1-> - > /*@internal*/ -2 > export function -3 > foo -4 > () { -5 > } -1->Emitted(34, 5) Source(22, 19) + SourceIndex(3) -2 >Emitted(34, 14) Source(22, 35) + SourceIndex(3) -3 >Emitted(34, 17) Source(22, 38) + SourceIndex(3) -4 >Emitted(34, 22) Source(22, 42) + SourceIndex(3) -5 >Emitted(34, 23) Source(22, 43) + SourceIndex(3) ---- ->>> normalN.foo = foo; -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^ -4 > ^ -5 > ^-> -1-> -2 > foo -3 > () {} -4 > -1->Emitted(35, 5) Source(22, 35) + SourceIndex(3) -2 >Emitted(35, 16) Source(22, 38) + SourceIndex(3) -3 >Emitted(35, 22) Source(22, 43) + SourceIndex(3) -4 >Emitted(35, 23) Source(22, 43) + SourceIndex(3) ---- ->>> var someNamespace; -1->^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1-> - > /*@internal*/ -2 > export namespace -3 > someNamespace -4 > { export class C {} } -1->Emitted(36, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(36, 9) Source(23, 36) + SourceIndex(3) -3 >Emitted(36, 22) Source(23, 49) + SourceIndex(3) -4 >Emitted(36, 23) Source(23, 71) + SourceIndex(3) ---- ->>> (function (someNamespace) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^-> -1-> -2 > export namespace -3 > someNamespace -1->Emitted(37, 5) Source(23, 19) + SourceIndex(3) -2 >Emitted(37, 16) Source(23, 36) + SourceIndex(3) -3 >Emitted(37, 29) Source(23, 49) + SourceIndex(3) ---- ->>> var C = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(38, 9) Source(23, 52) + SourceIndex(3) ---- ->>> function C() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(39, 13) Source(23, 52) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1->export class C { -2 > } -1->Emitted(40, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(40, 14) Source(23, 69) + SourceIndex(3) ---- ->>> return C; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^ -1-> -2 > } -1->Emitted(41, 13) Source(23, 68) + SourceIndex(3) -2 >Emitted(41, 21) Source(23, 69) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class C {} -1 >Emitted(42, 9) Source(23, 68) + SourceIndex(3) -2 >Emitted(42, 10) Source(23, 69) + SourceIndex(3) -3 >Emitted(42, 10) Source(23, 52) + SourceIndex(3) -4 >Emitted(42, 14) Source(23, 69) + SourceIndex(3) ---- ->>> someNamespace.C = C; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^ -3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > C -3 > {} -4 > -1->Emitted(43, 9) Source(23, 65) + SourceIndex(3) -2 >Emitted(43, 24) Source(23, 66) + SourceIndex(3) -3 >Emitted(43, 28) Source(23, 69) + SourceIndex(3) -4 >Emitted(43, 29) Source(23, 69) + SourceIndex(3) ---- ->>> })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > someNamespace -5 > -6 > someNamespace -7 > -8 > someNamespace -9 > { export class C {} } -1->Emitted(44, 5) Source(23, 70) + SourceIndex(3) -2 >Emitted(44, 6) Source(23, 71) + SourceIndex(3) -3 >Emitted(44, 8) Source(23, 36) + SourceIndex(3) -4 >Emitted(44, 21) Source(23, 49) + SourceIndex(3) -5 >Emitted(44, 24) Source(23, 36) + SourceIndex(3) -6 >Emitted(44, 45) Source(23, 49) + SourceIndex(3) -7 >Emitted(44, 50) Source(23, 36) + SourceIndex(3) -8 >Emitted(44, 71) Source(23, 49) + SourceIndex(3) -9 >Emitted(44, 79) Source(23, 71) + SourceIndex(3) ---- ->>> var someOther; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - > /*@internal*/ -2 > export namespace -3 > someOther -4 > .something { export class someClass {} } -1 >Emitted(45, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(45, 9) Source(24, 36) + SourceIndex(3) -3 >Emitted(45, 18) Source(24, 45) + SourceIndex(3) -4 >Emitted(45, 19) Source(24, 85) + SourceIndex(3) ---- ->>> (function (someOther) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -1-> -2 > export namespace -3 > someOther -1->Emitted(46, 5) Source(24, 19) + SourceIndex(3) -2 >Emitted(46, 16) Source(24, 36) + SourceIndex(3) -3 >Emitted(46, 25) Source(24, 45) + SourceIndex(3) ---- ->>> var something; -1 >^^^^^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(47, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(47, 13) Source(24, 46) + SourceIndex(3) -3 >Emitted(47, 22) Source(24, 55) + SourceIndex(3) -4 >Emitted(47, 23) Source(24, 85) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(48, 9) Source(24, 46) + SourceIndex(3) -2 >Emitted(48, 20) Source(24, 46) + SourceIndex(3) -3 >Emitted(48, 29) Source(24, 55) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(49, 13) Source(24, 58) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(50, 17) Source(24, 58) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(51, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(51, 18) Source(24, 83) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(52, 17) Source(24, 82) + SourceIndex(3) -2 >Emitted(52, 33) Source(24, 83) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(53, 13) Source(24, 82) + SourceIndex(3) -2 >Emitted(53, 14) Source(24, 83) + SourceIndex(3) -3 >Emitted(53, 14) Source(24, 58) + SourceIndex(3) -4 >Emitted(53, 18) Source(24, 83) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(54, 13) Source(24, 71) + SourceIndex(3) -2 >Emitted(54, 32) Source(24, 80) + SourceIndex(3) -3 >Emitted(54, 44) Source(24, 83) + SourceIndex(3) -4 >Emitted(54, 45) Source(24, 83) + SourceIndex(3) ---- ->>> })(something = someOther.something || (someOther.something = {})); -1->^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(55, 9) Source(24, 84) + SourceIndex(3) -2 >Emitted(55, 10) Source(24, 85) + SourceIndex(3) -3 >Emitted(55, 12) Source(24, 46) + SourceIndex(3) -4 >Emitted(55, 21) Source(24, 55) + SourceIndex(3) -5 >Emitted(55, 24) Source(24, 46) + SourceIndex(3) -6 >Emitted(55, 43) Source(24, 55) + SourceIndex(3) -7 >Emitted(55, 48) Source(24, 46) + SourceIndex(3) -8 >Emitted(55, 67) Source(24, 55) + SourceIndex(3) -9 >Emitted(55, 75) Source(24, 85) + SourceIndex(3) ---- ->>> })(someOther = normalN.someOther || (normalN.someOther = {})); -1 >^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1 > -2 > } -3 > -4 > someOther -5 > -6 > someOther -7 > -8 > someOther -9 > .something { export class someClass {} } -1 >Emitted(56, 5) Source(24, 84) + SourceIndex(3) -2 >Emitted(56, 6) Source(24, 85) + SourceIndex(3) -3 >Emitted(56, 8) Source(24, 36) + SourceIndex(3) -4 >Emitted(56, 17) Source(24, 45) + SourceIndex(3) -5 >Emitted(56, 20) Source(24, 36) + SourceIndex(3) -6 >Emitted(56, 37) Source(24, 45) + SourceIndex(3) -7 >Emitted(56, 42) Source(24, 36) + SourceIndex(3) -8 >Emitted(56, 59) Source(24, 45) + SourceIndex(3) -9 >Emitted(56, 67) Source(24, 85) + SourceIndex(3) ---- ->>> normalN.someImport = someNamespace.C; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^ -5 > ^ -6 > ^ -7 > ^ -1 > - > /*@internal*/ export import -2 > someImport -3 > = -4 > someNamespace -5 > . -6 > C -7 > ; -1 >Emitted(57, 5) Source(25, 33) + SourceIndex(3) -2 >Emitted(57, 23) Source(25, 43) + SourceIndex(3) -3 >Emitted(57, 26) Source(25, 46) + SourceIndex(3) -4 >Emitted(57, 39) Source(25, 59) + SourceIndex(3) -5 >Emitted(57, 40) Source(25, 60) + SourceIndex(3) -6 >Emitted(57, 41) Source(25, 61) + SourceIndex(3) -7 >Emitted(57, 42) Source(25, 62) + SourceIndex(3) ---- ->>> normalN.internalConst = 10; -1 >^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^ -5 > ^ -1 > - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const -2 > internalConst -3 > = -4 > 10 -5 > ; -1 >Emitted(58, 5) Source(27, 32) + SourceIndex(3) -2 >Emitted(58, 26) Source(27, 45) + SourceIndex(3) -3 >Emitted(58, 29) Source(27, 48) + SourceIndex(3) -4 >Emitted(58, 31) Source(27, 50) + SourceIndex(3) -5 >Emitted(58, 32) Source(27, 51) + SourceIndex(3) ---- ->>> var internalEnum; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - > /*@internal*/ -2 > export enum -3 > internalEnum { a, b, c } -1 >Emitted(59, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(59, 9) Source(28, 31) + SourceIndex(3) -3 >Emitted(59, 21) Source(28, 55) + SourceIndex(3) ---- ->>> (function (internalEnum) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > export enum -3 > internalEnum -1->Emitted(60, 5) Source(28, 19) + SourceIndex(3) -2 >Emitted(60, 16) Source(28, 31) + SourceIndex(3) -3 >Emitted(60, 28) Source(28, 43) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(61, 9) Source(28, 46) + SourceIndex(3) -2 >Emitted(61, 50) Source(28, 47) + SourceIndex(3) -3 >Emitted(61, 51) Source(28, 47) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(62, 9) Source(28, 49) + SourceIndex(3) -2 >Emitted(62, 50) Source(28, 50) + SourceIndex(3) -3 >Emitted(62, 51) Source(28, 50) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->, -2 > c -3 > -1->Emitted(63, 9) Source(28, 52) + SourceIndex(3) -2 >Emitted(63, 50) Source(28, 53) + SourceIndex(3) -3 >Emitted(63, 51) Source(28, 53) + SourceIndex(3) ---- ->>> })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > -8 > internalEnum -9 > { a, b, c } -1->Emitted(64, 5) Source(28, 54) + SourceIndex(3) -2 >Emitted(64, 6) Source(28, 55) + SourceIndex(3) -3 >Emitted(64, 8) Source(28, 31) + SourceIndex(3) -4 >Emitted(64, 20) Source(28, 43) + SourceIndex(3) -5 >Emitted(64, 23) Source(28, 31) + SourceIndex(3) -6 >Emitted(64, 43) Source(28, 43) + SourceIndex(3) -7 >Emitted(64, 48) Source(28, 31) + SourceIndex(3) -8 >Emitted(64, 68) Source(28, 43) + SourceIndex(3) -9 >Emitted(64, 76) Source(28, 55) + SourceIndex(3) ---- ->>>})(normalN || (normalN = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^ -7 > ^^^^^^^^ -8 > ^-> -1 > - > -2 >} -3 > -4 > normalN -5 > -6 > normalN -7 > { - > /*@internal*/ export class C { } - > /*@internal*/ export function foo() {} - > /*@internal*/ export namespace someNamespace { export class C {} } - > /*@internal*/ export namespace someOther.something { export class someClass {} } - > /*@internal*/ export import someImport = someNamespace.C; - > /*@internal*/ export type internalType = internalC; - > /*@internal*/ export const internalConst = 10; - > /*@internal*/ export enum internalEnum { a, b, c } - > } -1 >Emitted(65, 1) Source(29, 1) + SourceIndex(3) -2 >Emitted(65, 2) Source(29, 2) + SourceIndex(3) -3 >Emitted(65, 4) Source(20, 11) + SourceIndex(3) -4 >Emitted(65, 11) Source(20, 18) + SourceIndex(3) -5 >Emitted(65, 16) Source(20, 11) + SourceIndex(3) -6 >Emitted(65, 23) Source(20, 18) + SourceIndex(3) -7 >Emitted(65, 31) Source(29, 2) + SourceIndex(3) ---- ->>>var internalC = (function () { -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - >/*@internal*/ -1->Emitted(66, 1) Source(30, 15) + SourceIndex(3) ---- ->>> function internalC() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(67, 5) Source(30, 15) + SourceIndex(3) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->class internalC { -2 > } -1->Emitted(68, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(68, 6) Source(30, 33) + SourceIndex(3) ---- ->>> return internalC; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(69, 5) Source(30, 32) + SourceIndex(3) -2 >Emitted(69, 21) Source(30, 33) + SourceIndex(3) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class internalC {} -1 >Emitted(70, 1) Source(30, 32) + SourceIndex(3) -2 >Emitted(70, 2) Source(30, 33) + SourceIndex(3) -3 >Emitted(70, 2) Source(30, 15) + SourceIndex(3) -4 >Emitted(70, 6) Source(30, 33) + SourceIndex(3) ---- ->>>function internalfoo() { } -1-> -2 >^^^^^^^^^ -3 > ^^^^^^^^^^^ -4 > ^^^^^ -5 > ^ -1-> - >/*@internal*/ -2 >function -3 > internalfoo -4 > () { -5 > } -1->Emitted(71, 1) Source(31, 15) + SourceIndex(3) -2 >Emitted(71, 10) Source(31, 24) + SourceIndex(3) -3 >Emitted(71, 21) Source(31, 35) + SourceIndex(3) -4 >Emitted(71, 26) Source(31, 39) + SourceIndex(3) -5 >Emitted(71, 27) Source(31, 40) + SourceIndex(3) ---- ->>>var internalNamespace; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >namespace -3 > internalNamespace -4 > { export class someClass {} } -1 >Emitted(72, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(72, 5) Source(32, 25) + SourceIndex(3) -3 >Emitted(72, 22) Source(32, 42) + SourceIndex(3) -4 >Emitted(72, 23) Source(32, 72) + SourceIndex(3) ---- ->>>(function (internalNamespace) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^ -4 > ^^^^^^^-> -1-> -2 >namespace -3 > internalNamespace -1->Emitted(73, 1) Source(32, 15) + SourceIndex(3) -2 >Emitted(73, 12) Source(32, 25) + SourceIndex(3) -3 >Emitted(73, 29) Source(32, 42) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(74, 5) Source(32, 45) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(75, 9) Source(32, 45) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(76, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(76, 10) Source(32, 70) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(77, 9) Source(32, 69) + SourceIndex(3) -2 >Emitted(77, 25) Source(32, 70) + SourceIndex(3) ---- ->>> }()); -1 >^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(78, 5) Source(32, 69) + SourceIndex(3) -2 >Emitted(78, 6) Source(32, 70) + SourceIndex(3) -3 >Emitted(78, 6) Source(32, 45) + SourceIndex(3) -4 >Emitted(78, 10) Source(32, 70) + SourceIndex(3) ---- ->>> internalNamespace.someClass = someClass; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(79, 5) Source(32, 58) + SourceIndex(3) -2 >Emitted(79, 32) Source(32, 67) + SourceIndex(3) -3 >Emitted(79, 44) Source(32, 70) + SourceIndex(3) -4 >Emitted(79, 45) Source(32, 70) + SourceIndex(3) ---- ->>>})(internalNamespace || (internalNamespace = {})); -1-> -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1-> -2 >} -3 > -4 > internalNamespace -5 > -6 > internalNamespace -7 > { export class someClass {} } -1->Emitted(80, 1) Source(32, 71) + SourceIndex(3) -2 >Emitted(80, 2) Source(32, 72) + SourceIndex(3) -3 >Emitted(80, 4) Source(32, 25) + SourceIndex(3) -4 >Emitted(80, 21) Source(32, 42) + SourceIndex(3) -5 >Emitted(80, 26) Source(32, 25) + SourceIndex(3) -6 >Emitted(80, 43) Source(32, 42) + SourceIndex(3) -7 >Emitted(80, 51) Source(32, 72) + SourceIndex(3) ---- ->>>var internalOther; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >namespace -3 > internalOther -4 > .something { export class someClass {} } -1 >Emitted(81, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(81, 5) Source(33, 25) + SourceIndex(3) -3 >Emitted(81, 18) Source(33, 38) + SourceIndex(3) -4 >Emitted(81, 19) Source(33, 78) + SourceIndex(3) ---- ->>>(function (internalOther) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^ -1-> -2 >namespace -3 > internalOther -1->Emitted(82, 1) Source(33, 15) + SourceIndex(3) -2 >Emitted(82, 12) Source(33, 25) + SourceIndex(3) -3 >Emitted(82, 25) Source(33, 38) + SourceIndex(3) ---- ->>> var something; -1 >^^^^ -2 > ^^^^ -3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. -2 > -3 > something -4 > { export class someClass {} } -1 >Emitted(83, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(83, 9) Source(33, 39) + SourceIndex(3) -3 >Emitted(83, 18) Source(33, 48) + SourceIndex(3) -4 >Emitted(83, 19) Source(33, 78) + SourceIndex(3) ---- ->>> (function (something) { -1->^^^^ -2 > ^^^^^^^^^^^ -3 > ^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^-> -1-> -2 > -3 > something -1->Emitted(84, 5) Source(33, 39) + SourceIndex(3) -2 >Emitted(84, 16) Source(33, 39) + SourceIndex(3) -3 >Emitted(84, 25) Source(33, 48) + SourceIndex(3) ---- ->>> var someClass = (function () { -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { -1->Emitted(85, 9) Source(33, 51) + SourceIndex(3) ---- ->>> function someClass() { -1->^^^^^^^^^^^^ -2 > ^^-> -1-> -1->Emitted(86, 13) Source(33, 51) + SourceIndex(3) ---- ->>> } -1->^^^^^^^^^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^-> -1->export class someClass { -2 > } -1->Emitted(87, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(87, 14) Source(33, 76) + SourceIndex(3) ---- ->>> return someClass; -1->^^^^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^ -1-> -2 > } -1->Emitted(88, 13) Source(33, 75) + SourceIndex(3) -2 >Emitted(88, 29) Source(33, 76) + SourceIndex(3) ---- ->>> }()); -1 >^^^^^^^^ -2 > ^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > -2 > } -3 > -4 > export class someClass {} -1 >Emitted(89, 9) Source(33, 75) + SourceIndex(3) -2 >Emitted(89, 10) Source(33, 76) + SourceIndex(3) -3 >Emitted(89, 10) Source(33, 51) + SourceIndex(3) -4 >Emitted(89, 14) Source(33, 76) + SourceIndex(3) ---- ->>> something.someClass = someClass; -1->^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 > someClass -3 > {} -4 > -1->Emitted(90, 9) Source(33, 64) + SourceIndex(3) -2 >Emitted(90, 28) Source(33, 73) + SourceIndex(3) -3 >Emitted(90, 40) Source(33, 76) + SourceIndex(3) -4 >Emitted(90, 41) Source(33, 76) + SourceIndex(3) ---- ->>> })(something = internalOther.something || (internalOther.something = {})); -1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> -2 > } -3 > -4 > something -5 > -6 > something -7 > -8 > something -9 > { export class someClass {} } -1->Emitted(91, 5) Source(33, 77) + SourceIndex(3) -2 >Emitted(91, 6) Source(33, 78) + SourceIndex(3) -3 >Emitted(91, 8) Source(33, 39) + SourceIndex(3) -4 >Emitted(91, 17) Source(33, 48) + SourceIndex(3) -5 >Emitted(91, 20) Source(33, 39) + SourceIndex(3) -6 >Emitted(91, 43) Source(33, 48) + SourceIndex(3) -7 >Emitted(91, 48) Source(33, 39) + SourceIndex(3) -8 >Emitted(91, 71) Source(33, 48) + SourceIndex(3) -9 >Emitted(91, 79) Source(33, 78) + SourceIndex(3) ---- ->>>})(internalOther || (internalOther = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^-> -1 > -2 >} -3 > -4 > internalOther -5 > -6 > internalOther -7 > .something { export class someClass {} } -1 >Emitted(92, 1) Source(33, 77) + SourceIndex(3) -2 >Emitted(92, 2) Source(33, 78) + SourceIndex(3) -3 >Emitted(92, 4) Source(33, 25) + SourceIndex(3) -4 >Emitted(92, 17) Source(33, 38) + SourceIndex(3) -5 >Emitted(92, 22) Source(33, 25) + SourceIndex(3) -6 >Emitted(92, 35) Source(33, 38) + SourceIndex(3) -7 >Emitted(92, 43) Source(33, 78) + SourceIndex(3) ---- ->>>var internalImport = internalNamespace.someClass; -1-> -2 >^^^^ -3 > ^^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^^^^^^^^^^^^^^^^ -6 > ^ -7 > ^^^^^^^^^ -8 > ^ -1-> - >/*@internal*/ -2 >import -3 > internalImport -4 > = -5 > internalNamespace -6 > . -7 > someClass -8 > ; -1->Emitted(93, 1) Source(34, 15) + SourceIndex(3) -2 >Emitted(93, 5) Source(34, 22) + SourceIndex(3) -3 >Emitted(93, 19) Source(34, 36) + SourceIndex(3) -4 >Emitted(93, 22) Source(34, 39) + SourceIndex(3) -5 >Emitted(93, 39) Source(34, 56) + SourceIndex(3) -6 >Emitted(93, 40) Source(34, 57) + SourceIndex(3) -7 >Emitted(93, 49) Source(34, 66) + SourceIndex(3) -8 >Emitted(93, 50) Source(34, 67) + SourceIndex(3) ---- ->>>var internalConst = 10; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^^ -4 > ^^^ -5 > ^^ -6 > ^ -1 > - >/*@internal*/ type internalType = internalC; - >/*@internal*/ -2 >const -3 > internalConst -4 > = -5 > 10 -6 > ; -1 >Emitted(94, 1) Source(36, 15) + SourceIndex(3) -2 >Emitted(94, 5) Source(36, 21) + SourceIndex(3) -3 >Emitted(94, 18) Source(36, 34) + SourceIndex(3) -4 >Emitted(94, 21) Source(36, 37) + SourceIndex(3) -5 >Emitted(94, 23) Source(36, 39) + SourceIndex(3) -6 >Emitted(94, 24) Source(36, 40) + SourceIndex(3) ---- ->>>var internalEnum; -1 > -2 >^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^-> -1 > - >/*@internal*/ -2 >enum -3 > internalEnum { a, b, c } -1 >Emitted(95, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(95, 5) Source(37, 20) + SourceIndex(3) -3 >Emitted(95, 17) Source(37, 44) + SourceIndex(3) ---- ->>>(function (internalEnum) { -1-> -2 >^^^^^^^^^^^ -3 > ^^^^^^^^^^^^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> -2 >enum -3 > internalEnum -1->Emitted(96, 1) Source(37, 15) + SourceIndex(3) -2 >Emitted(96, 12) Source(37, 20) + SourceIndex(3) -3 >Emitted(96, 24) Source(37, 32) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["a"] = 0] = "a"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1-> { -2 > a -3 > -1->Emitted(97, 5) Source(37, 35) + SourceIndex(3) -2 >Emitted(97, 46) Source(37, 36) + SourceIndex(3) -3 >Emitted(97, 47) Source(37, 36) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["b"] = 1] = "b"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1->, -2 > b -3 > -1->Emitted(98, 5) Source(37, 38) + SourceIndex(3) -2 >Emitted(98, 46) Source(37, 39) + SourceIndex(3) -3 >Emitted(98, 47) Source(37, 39) + SourceIndex(3) ---- ->>> internalEnum[internalEnum["c"] = 2] = "c"; -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^ -1->, -2 > c -3 > -1->Emitted(99, 5) Source(37, 41) + SourceIndex(3) -2 >Emitted(99, 46) Source(37, 42) + SourceIndex(3) -3 >Emitted(99, 47) Source(37, 42) + SourceIndex(3) ---- ->>>})(internalEnum || (internalEnum = {})); -1 > -2 >^ -3 > ^^ -4 > ^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > -2 >} -3 > -4 > internalEnum -5 > -6 > internalEnum -7 > { a, b, c } -1 >Emitted(100, 1) Source(37, 43) + SourceIndex(3) -2 >Emitted(100, 2) Source(37, 44) + SourceIndex(3) -3 >Emitted(100, 4) Source(37, 20) + SourceIndex(3) -4 >Emitted(100, 16) Source(37, 32) + SourceIndex(3) -5 >Emitted(100, 21) Source(37, 20) + SourceIndex(3) -6 >Emitted(100, 33) Source(37, 32) + SourceIndex(3) -7 >Emitted(100, 41) Source(37, 44) + SourceIndex(3) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part2.ts -------------------------------------------------------------------- ->>>var C = (function () { -1 > -2 >^^^^^^^^^^^^^^^^^^^-> -1 > -1 >Emitted(101, 1) Source(1, 1) + SourceIndex(4) ---- ->>> function C() { -1->^^^^ -2 > ^^-> -1-> -1->Emitted(102, 5) Source(1, 1) + SourceIndex(4) ---- ->>> } -1->^^^^ -2 > ^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->class C { - > doSomething() { - > console.log("something got done"); - > } - > -2 > } -1->Emitted(103, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(103, 6) Source(5, 2) + SourceIndex(4) ---- ->>> C.prototype.doSomething = function () { -1->^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^ -4 > ^^^^^^^^^^^^^-> -1-> -2 > doSomething -3 > -1->Emitted(104, 5) Source(2, 5) + SourceIndex(4) -2 >Emitted(104, 28) Source(2, 16) + SourceIndex(4) -3 >Emitted(104, 31) Source(2, 5) + SourceIndex(4) ---- ->>> console.log("something got done"); -1->^^^^^^^^ -2 > ^^^^^^^ -3 > ^ -4 > ^^^ -5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^ -7 > ^ -8 > ^ -1->doSomething() { - > -2 > console -3 > . -4 > log -5 > ( -6 > "something got done" -7 > ) -8 > ; -1->Emitted(105, 9) Source(3, 9) + SourceIndex(4) -2 >Emitted(105, 16) Source(3, 16) + SourceIndex(4) -3 >Emitted(105, 17) Source(3, 17) + SourceIndex(4) -4 >Emitted(105, 20) Source(3, 20) + SourceIndex(4) -5 >Emitted(105, 21) Source(3, 21) + SourceIndex(4) -6 >Emitted(105, 41) Source(3, 41) + SourceIndex(4) -7 >Emitted(105, 42) Source(3, 42) + SourceIndex(4) -8 >Emitted(105, 43) Source(3, 43) + SourceIndex(4) ---- ->>> }; -1 >^^^^ -2 > ^ -3 > ^^^^^^^^^-> -1 > - > -2 > } -1 >Emitted(106, 5) Source(4, 5) + SourceIndex(4) -2 >Emitted(106, 6) Source(4, 6) + SourceIndex(4) ---- ->>> return C; -1->^^^^ -2 > ^^^^^^^^ -1-> - > -2 > } -1->Emitted(107, 5) Source(5, 1) + SourceIndex(4) -2 >Emitted(107, 13) Source(5, 2) + SourceIndex(4) ---- ->>>}()); -1 > -2 >^ -3 > -4 > ^^^^ -5 > ^^^^^^^^^^^^-> -1 > -2 >} -3 > -4 > class C { - > doSomething() { - > console.log("something got done"); - > } - > } -1 >Emitted(108, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(108, 2) Source(5, 2) + SourceIndex(4) -3 >Emitted(108, 2) Source(1, 1) + SourceIndex(4) -4 >Emitted(108, 6) Source(5, 2) + SourceIndex(4) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../third_part1.ts -------------------------------------------------------------------- ->>>var c = new C(); -1-> -2 >^^^^ -3 > ^ -4 > ^^^ -5 > ^^^^ -6 > ^ -7 > ^^ -8 > ^ -9 > ^-> -1-> -2 >var -3 > c -4 > = -5 > new -6 > C -7 > () -8 > ; -1->Emitted(109, 1) Source(1, 1) + SourceIndex(5) -2 >Emitted(109, 5) Source(1, 5) + SourceIndex(5) -3 >Emitted(109, 6) Source(1, 6) + SourceIndex(5) -4 >Emitted(109, 9) Source(1, 9) + SourceIndex(5) -5 >Emitted(109, 13) Source(1, 13) + SourceIndex(5) -6 >Emitted(109, 14) Source(1, 14) + SourceIndex(5) -7 >Emitted(109, 16) Source(1, 16) + SourceIndex(5) -8 >Emitted(109, 17) Source(1, 17) + SourceIndex(5) ---- ->>>c.doSomething(); -1-> -2 >^ -3 > ^ -4 > ^^^^^^^^^^^ -5 > ^^ -6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 >c -3 > . -4 > doSomething -5 > () -6 > ; -1->Emitted(110, 1) Source(2, 1) + SourceIndex(5) -2 >Emitted(110, 2) Source(2, 2) + SourceIndex(5) -3 >Emitted(110, 3) Source(2, 3) + SourceIndex(5) -4 >Emitted(110, 14) Source(2, 14) + SourceIndex(5) -5 >Emitted(110, 16) Source(2, 16) + SourceIndex(5) -6 >Emitted(110, 17) Source(2, 17) + SourceIndex(5) ---- ->>>//# sourceMappingURL=third-output.js.map - //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { From 1f149ccfd7f8cf8c6ace3a2cf4ac3a2232a6c98a Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 9 Sep 2019 14:09:28 -0700 Subject: [PATCH 08/48] Use clean and written files to verify the tsbuild incremental compilation = clean build compilation --- .../unittests/tsbuild/amdModulesWithOut.ts | 8 --- .../unittests/tsbuild/emitDeclarationOnly.ts | 22 ------ src/testRunner/unittests/tsbuild/helpers.ts | 18 ++--- .../inferredTypeFromTransitiveModule.ts | 7 -- .../unittests/tsbuild/lateBoundSymbol.ts | 5 -- src/testRunner/unittests/tsbuild/outFile.ts | 1 - src/testRunner/unittests/tsbuild/sample.ts | 68 ------------------- 7 files changed, 7 insertions(+), 122 deletions(-) diff --git a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts index e28f1ffc840..19413d89989 100644 --- a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts +++ b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts @@ -82,10 +82,6 @@ namespace ts { incrementalHeaderChangedBuild: modifyAgainFs ? { modifyFs: modifyAgainFs } : undefined, - outputFiles: [ - ...outputFiles[project.lib], - ...outputFiles[project.app] - ], baselineOnly: true }); } @@ -232,10 +228,6 @@ ${internal} export enum internalEnum { a, b, c }`); [Diagnostics.Building_project_0, sources[project.app][source.config]], ] }, - outputFiles: [ - ...libOutputFile, - ...outputFiles[project.app] - ], baselineOnly: true, verifyDiagnostics: true }); diff --git a/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts b/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts index 1999737a50f..73dc36c1a0a 100644 --- a/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts +++ b/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts @@ -18,19 +18,6 @@ namespace ts { proj: "emitDeclarationOnly", rootNames: ["/src"], lastProjectOutput: `/src/lib/index.d.ts`, - outputFiles: [ - "/src/lib/a.d.ts", - "/src/lib/b.d.ts", - "/src/lib/c.d.ts", - "/src/lib/index.d.ts", - "/src/tsconfig.tsbuildinfo", - ...(disableMap ? emptyArray : [ - "/src/lib/a.d.ts.map", - "/src/lib/b.d.ts.map", - "/src/lib/c.d.ts.map", - "/src/lib/index.d.ts.map" - ]) - ], initialBuild: { modifyFs: disableMap ? (fs => replaceText(fs, "/src/tsconfig.json", `"declarationMap": true,`, "")) : @@ -64,15 +51,6 @@ namespace ts { proj: "emitDeclarationOnly", rootNames: ["/src"], lastProjectOutput: `/src/lib/a.d.ts`, - outputFiles: [ - "/src/lib/a.d.ts", - "/src/lib/b.d.ts", - "/src/lib/c.d.ts", - "/src/tsconfig.tsbuildinfo", - "/src/lib/a.d.ts.map", - "/src/lib/b.d.ts.map", - "/src/lib/c.d.ts.map", - ], initialBuild: { modifyFs: fs => { fs.rimrafSync("/src/src/index.ts"); diff --git a/src/testRunner/unittests/tsbuild/helpers.ts b/src/testRunner/unittests/tsbuild/helpers.ts index 88a9d403454..5d656589b71 100644 --- a/src/testRunner/unittests/tsbuild/helpers.ts +++ b/src/testRunner/unittests/tsbuild/helpers.ts @@ -267,7 +267,7 @@ interface Symbol { if (baselineSourceMap) generateSourceMapBaselineFiles(fs, mapDefinedIterator(writtenFiles.keys(), f => f.endsWith(".map") ? f : undefined)); generateBuildInfoSectionBaselineFiles(fs, expectedBuildInfoFilesForSectionBaselines || emptyArray); fs.makeReadonly(); - return { fs, actualReadFileMap, host, builder }; + return { fs, actualReadFileMap, host, builder, writtenFiles }; } function generateBaseline(fs: vfs.FileSystem, proj: string, scenario: string, subScenario: string, baseFs: vfs.FileSystem) { @@ -314,7 +314,6 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray; lastProjectOutput: string; initialBuild: BuildState; - outputFiles?: ReadonlyArray; incrementalDtsChangedBuild?: BuildState; incrementalDtsUnchangedBuild?: BuildState; incrementalHeaderChangedBuild?: BuildState; @@ -324,7 +323,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt } export function verifyTsbuildOutput({ - scenario, projFs, time, tick, proj, rootNames, outputFiles, baselineOnly, verifyDiagnostics, + scenario, projFs, time, tick, proj, rootNames, baselineOnly, verifyDiagnostics, baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, lastProjectOutput, initialBuild, incrementalDtsChangedBuild, incrementalDtsUnchangedBuild, incrementalHeaderChangedBuild }: VerifyTsBuildInput) { @@ -417,22 +416,19 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt }); } it(`Verify emit output file text is same when built clean`, () => { - const expectedOutputFiles = Debug.assertDefined(outputFiles); - const { fs } = build({ + const { fs, writtenFiles } = build({ fs: newFs.shadow(), tick, rootNames, modifyFs: fs => { // Delete output files - for (const outputFile of expectedOutputFiles) { - if (fs.existsSync(outputFile)) { - fs.rimrafSync(outputFile); - } - } + const host = new fakes.SolutionBuilderHost(fs); + const builder = createSolutionBuilder(host, rootNames, { clean: true }); + builder.clean(); }, }); - for (const outputFile of expectedOutputFiles) { + for (const outputFile of arrayFrom(writtenFiles.keys())) { const expectedText = fs.existsSync(outputFile) ? fs.readFileSync(outputFile, "utf8") : undefined; const actualText = newFs.existsSync(outputFile) ? newFs.readFileSync(outputFile, "utf8") : undefined; assert.equal(actualText, expectedText, `File: ${outputFile}`); diff --git a/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts b/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts index 301f9894fde..81822df5652 100644 --- a/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts +++ b/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts @@ -17,13 +17,6 @@ namespace ts { proj: "inferredTypeFromTransitiveModule", rootNames: ["/src"], lastProjectOutput: `/src/obj/index.js`, - outputFiles: [ - "/src/obj/bar.js", "/src/obj/bar.d.ts", - "/src/obj/bundling.js", "/src/obj/bundling.d.ts", - "/src/obj/lazyIndex.js", "/src/obj/lazyIndex.d.ts", - "/src/obj/index.js", "/src/obj/index.d.ts", - "/src/obj/tsconfig.tsbuildinfo" - ], initialBuild: { modifyFs: noop, expectedDiagnostics: [ diff --git a/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts b/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts index 781dd6938b9..72c7c0b80e2 100644 --- a/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts +++ b/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts @@ -17,11 +17,6 @@ namespace ts { proj: "lateBoundSymbol", rootNames: ["/src/tsconfig.json"], lastProjectOutput: "/src/src/main.js", - outputFiles: [ - "/src/src/hkt.js", - "/src/src/main.js", - "/src/tsconfig.tsbuildinfo", - ], initialBuild: { modifyFs: noop, expectedDiagnostics: [ diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts index f813f61542c..dfc6d4cc327 100644 --- a/src/testRunner/unittests/tsbuild/outFile.ts +++ b/src/testRunner/unittests/tsbuild/outFile.ts @@ -303,7 +303,6 @@ namespace ts { expectedDiagnostics: dtsUnchanged && dtsUnchanged.expectedDiagnostics, expectedReadFiles: dtsUnchanged && dtsUnchanged.expectedReadFiles } : undefined, - outputFiles: expectedOutputFiles, baselineOnly }); } diff --git a/src/testRunner/unittests/tsbuild/sample.ts b/src/testRunner/unittests/tsbuild/sample.ts index 8e921c97aee..7e3f12bc4e7 100644 --- a/src/testRunner/unittests/tsbuild/sample.ts +++ b/src/testRunner/unittests/tsbuild/sample.ts @@ -693,22 +693,6 @@ class someClass { }`), ], ) }, - outputFiles: [ - "/src/core/anotherModule.js", - "/src/core/anotherModule.d.ts", - "/src/core/anotherModule.d.ts.map", - "/src/core/index.js", - "/src/core/index.d.ts", - "/src/core/index.d.ts.map", - "/src/core/tsconfig.tsbuildinfo", - "/src/logic/index.js", - "/src/logic/index.js.map", - "/src/logic/index.d.ts", - "/src/logic/tsconfig.tsbuildinfo", - "/src/tests/index.js", - "/src/tests/index.d.ts", - "/src/tests/tsconfig.tsbuildinfo", - ] }); verifyTsbuildOutput({ @@ -757,22 +741,6 @@ class someClass { }`), ] ) }, - outputFiles: [ - "/src/core/anotherModule.js", - "/src/core/anotherModule.d.ts", - "/src/core/anotherModule.d.ts.map", - "/src/core/index.js", - "/src/core/index.d.ts", - "/src/core/index.d.ts.map", - "/src/core/tsconfig.tsbuildinfo", - "/src/logic/index.js", - "/src/logic/index.js.map", - "/src/logic/decls/index.d.ts", - "/src/logic/tsconfig.tsbuildinfo", - "/src/tests/index.js", - "/src/tests/index.d.ts", - "/src/tests/tsconfig.tsbuildinfo", - ], }); verifyTsbuildOutput({ @@ -814,22 +782,6 @@ class someClass { }`), ] ) }, - outputFiles: [ - "/src/core/anotherModule.js", - "/src/core/anotherModule.d.ts", - "/src/core/anotherModule.d.ts.map", - "/src/core/index.js", - "/src/core/index.d.ts", - "/src/core/index.d.ts.map", - "/src/core/tsconfig.tsbuildinfo", - "/src/logic/index.js", - "/src/logic/index.js.map", - "/src/logic/index.d.ts", - "/src/logic/ownFile.tsbuildinfo", - "/src/tests/index.js", - "/src/tests/index.d.ts", - "/src/tests/tsconfig.tsbuildinfo", - ] }); verifyTsbuildOutput({ @@ -861,13 +813,6 @@ class someClass { }`), [Diagnostics.Building_project_0, "/src/core/tsconfig.json"] ] }, - outputFiles: [ - "/src/core/anotherModule.js", - "/src/core/anotherModule.d.ts", - "/src/core/index.js", - "/src/core/index.d.ts", - "/src/core/tsconfig.tsbuildinfo", - ], baselineOnly: true, verifyDiagnostics: true }); @@ -910,13 +855,6 @@ class someClass { }`), [Diagnostics.Building_project_0, "/src/core/tsconfig.json"] ] }, - outputFiles: [ - "/src/core/anotherModule.js", - "/src/core/anotherModule.d.ts", - "/src/core/index.js", - "/src/core/index.d.ts", - "/src/core/tsconfig.tsbuildinfo", - ], baselineOnly: true, verifyDiagnostics: true }); @@ -950,11 +888,6 @@ class someClass { }`), [Diagnostics.Building_project_0, "/src/core/tsconfig.json"] ] }, - outputFiles: [ - "/src/core/anotherModule.js", - "/src/core/index.js", - "/src/core/tsconfig.tsbuildinfo", - ], baselineOnly: true, verifyDiagnostics: true }); @@ -1002,7 +935,6 @@ class someClass { }`), [Diagnostics.Building_project_0, "/src/tests/tsconfig.json"] ] }, - outputFiles: [], baselineOnly: true, verifyDiagnostics: true }); From bfc4f7a12f9f27da1e31f40b8ffefb5ae8abdc43 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 9 Sep 2019 14:17:58 -0700 Subject: [PATCH 09/48] Get the last output from the written files --- src/testRunner/unittests/tsbuild/amdModulesWithOut.ts | 2 -- src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts | 2 -- src/testRunner/unittests/tsbuild/helpers.ts | 8 +++++--- .../unittests/tsbuild/inferredTypeFromTransitiveModule.ts | 1 - src/testRunner/unittests/tsbuild/lateBoundSymbol.ts | 1 - src/testRunner/unittests/tsbuild/moduleSpecifiers.ts | 1 - src/testRunner/unittests/tsbuild/outFile.ts | 1 - src/testRunner/unittests/tsbuild/sample.ts | 7 ------- 8 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts index 19413d89989..c037c310043 100644 --- a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts +++ b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts @@ -72,7 +72,6 @@ namespace ts { [outputFiles[project.lib][ext.buildinfo], outputFiles[project.lib][ext.js], outputFiles[project.lib][ext.dts]], [outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]] ], - lastProjectOutput: outputFiles[project.app][ext.js], initialBuild: { modifyFs }, @@ -217,7 +216,6 @@ ${internal} export enum internalEnum { a, b, c }`); [libOutputFile[ext.buildinfo], libOutputFile[ext.js], libOutputFile[ext.dts]], [outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]] ], - lastProjectOutput: outputFiles[project.app][ext.js], initialBuild: { modifyFs, expectedDiagnostics: [ diff --git a/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts b/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts index 73dc36c1a0a..e9ce4b46024 100644 --- a/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts +++ b/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts @@ -17,7 +17,6 @@ namespace ts { tick, proj: "emitDeclarationOnly", rootNames: ["/src"], - lastProjectOutput: `/src/lib/index.d.ts`, initialBuild: { modifyFs: disableMap ? (fs => replaceText(fs, "/src/tsconfig.json", `"declarationMap": true,`, "")) : @@ -50,7 +49,6 @@ namespace ts { tick, proj: "emitDeclarationOnly", rootNames: ["/src"], - lastProjectOutput: `/src/lib/a.d.ts`, initialBuild: { modifyFs: fs => { fs.rimrafSync("/src/src/index.ts"); diff --git a/src/testRunner/unittests/tsbuild/helpers.ts b/src/testRunner/unittests/tsbuild/helpers.ts index 5d656589b71..b204daef0fb 100644 --- a/src/testRunner/unittests/tsbuild/helpers.ts +++ b/src/testRunner/unittests/tsbuild/helpers.ts @@ -312,7 +312,6 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt proj: string; rootNames: ReadonlyArray; expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray; - lastProjectOutput: string; initialBuild: BuildState; incrementalDtsChangedBuild?: BuildState; incrementalDtsUnchangedBuild?: BuildState; @@ -324,7 +323,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt export function verifyTsbuildOutput({ scenario, projFs, time, tick, proj, rootNames, baselineOnly, verifyDiagnostics, - baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, lastProjectOutput, + baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, initialBuild, incrementalDtsChangedBuild, incrementalDtsUnchangedBuild, incrementalHeaderChangedBuild }: VerifyTsBuildInput) { describe(`tsc --b ${proj}:: ${scenario}`, () => { @@ -332,6 +331,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt let actualReadFileMap: Map; let firstBuildTime: number; let host: fakes.SolutionBuilderHost; + let initialWrittenFiles: Map; before(() => { const result = build({ fs: projFs().shadow(), @@ -341,13 +341,14 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt expectedBuildInfoFilesForSectionBaselines, modifyFs: initialBuild.modifyFs, }); - ({ fs, actualReadFileMap, host } = result); + ({ fs, actualReadFileMap, host, writtenFiles: initialWrittenFiles } = result); firstBuildTime = time(); }); after(() => { fs = undefined!; actualReadFileMap = undefined!; host = undefined!; + initialWrittenFiles = undefined!; }); describe("initialBuild", () => { if (!baselineOnly || verifyDiagnostics) { @@ -373,6 +374,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt let beforeBuildTime: number; let afterBuildTime: number; before(() => { + const lastProjectOutput = last(arrayFrom(initialWrittenFiles.keys())); beforeBuildTime = fs.statSync(lastProjectOutput).mtimeMs; tick(); newFs = fs.shadow(); diff --git a/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts b/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts index 81822df5652..92762dfd49d 100644 --- a/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts +++ b/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts @@ -16,7 +16,6 @@ namespace ts { tick, proj: "inferredTypeFromTransitiveModule", rootNames: ["/src"], - lastProjectOutput: `/src/obj/index.js`, initialBuild: { modifyFs: noop, expectedDiagnostics: [ diff --git a/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts b/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts index 72c7c0b80e2..02224b3fa88 100644 --- a/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts +++ b/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts @@ -16,7 +16,6 @@ namespace ts { tick, proj: "lateBoundSymbol", rootNames: ["/src/tsconfig.json"], - lastProjectOutput: "/src/src/main.js", initialBuild: { modifyFs: noop, expectedDiagnostics: [ diff --git a/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts b/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts index c6737b9d2f7..86328788a3b 100644 --- a/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts +++ b/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts @@ -96,7 +96,6 @@ namespace ts { tick, proj: "moduleSpecifiers", rootNames: ["/"], - lastProjectOutput: `/src/lib/index.d.ts`, initialBuild: { modifyFs: noop, }, diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts index dfc6d4cc327..db8d0873e76 100644 --- a/src/testRunner/unittests/tsbuild/outFile.ts +++ b/src/testRunner/unittests/tsbuild/outFile.ts @@ -280,7 +280,6 @@ namespace ts { rootNames: ["/src/third"], baselineSourceMap: true, expectedBuildInfoFilesForSectionBaselines: expectedBuildInfoFilesForSectionBaselines || expectedTsbuildInfoFileNames, - lastProjectOutput: outputFiles[project.third][ext.js], initialBuild: { modifyFs, expectedDiagnostics: initialExpectedDiagnostics, diff --git a/src/testRunner/unittests/tsbuild/sample.ts b/src/testRunner/unittests/tsbuild/sample.ts index 7e3f12bc4e7..d95ba5e514a 100644 --- a/src/testRunner/unittests/tsbuild/sample.ts +++ b/src/testRunner/unittests/tsbuild/sample.ts @@ -613,7 +613,6 @@ export class cNew {}`); proj: "sample1", rootNames: ["/src/tests"], baselineSourceMap: true, - lastProjectOutput: "/src/tests/index.js", initialBuild, incrementalDtsChangedBuild: { modifyFs: fs => appendText(fs, "/src/core/index.ts", ` @@ -703,7 +702,6 @@ class someClass { }`), proj: "sample1", rootNames: ["/src/tests"], baselineSourceMap: true, - lastProjectOutput: "/src/tests/index.js", initialBuild, incrementalDtsChangedBuild: { modifyFs: fs => replaceText(fs, "/src/logic/tsconfig.json", `"declaration": true,`, `"declaration": true, @@ -751,7 +749,6 @@ class someClass { }`), proj: "sample1", rootNames: ["/src/tests"], baselineSourceMap: true, - lastProjectOutput: "/src/tests/index.js", initialBuild: { modifyFs: fs => replaceText(fs, "/src/logic/tsconfig.json", `"composite": true,`, `"composite": true, "tsBuildInfoFile": "ownFile.tsbuildinfo",`), @@ -791,7 +788,6 @@ class someClass { }`), tick, proj: "sample1", rootNames: ["/src/core"], - lastProjectOutput: "/src/core/index.js", initialBuild: { modifyFs: fs => fs.writeFileSync("/src/core/tsconfig.json", `{ "compilerOptions": { @@ -824,7 +820,6 @@ class someClass { }`), tick, proj: "sample1", rootNames: ["/src/core"], - lastProjectOutput: "/src/core/index.js", initialBuild: { modifyFs: fs => { fs.writeFileSync("/lib/lib.esnext.full.d.ts", `/// @@ -866,7 +861,6 @@ class someClass { }`), tick, proj: "sample1", rootNames: ["/src/core"], - lastProjectOutput: "/src/core/index.js", initialBuild: { modifyFs: fs => fs.writeFileSync("/src/core/tsconfig.json", `{ "compilerOptions": { @@ -899,7 +893,6 @@ class someClass { }`), tick, proj: "sample1", rootNames: ["/src/tests"], - lastProjectOutput: "/src/tests/index.js", initialBuild: { modifyFs: fs => fs.writeFileSync("/src/tests/tsconfig.json", `{ "references": [ From e43d5044226e95fac66105564b188d389ee5845f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 9 Sep 2019 15:00:44 -0700 Subject: [PATCH 10/48] Baseline tsbuild info section files from written files --- src/compiler/tsbuild.ts | 5 +++ .../unittests/tsbuild/amdModulesWithOut.ts | 33 ----------------- src/testRunner/unittests/tsbuild/helpers.ts | 35 +++++++++++++------ src/testRunner/unittests/tsbuild/outFile.ts | 13 ------- ...e-resolution-finds-original-source-file.js | 34 ++++++++++++++++++ 5 files changed, 63 insertions(+), 57 deletions(-) diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index 0503d0a49da..f1ac23f0052 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -308,6 +308,7 @@ namespace ts { /*@internal*/ getUpToDateStatusOfProject(project: string): UpToDateStatus; /*@internal*/ invalidateProject(configFilePath: ResolvedConfigFilePath, reloadLevel?: ConfigFileProgramReloadLevel): void; /*@internal*/ buildNextInvalidatedProject(): void; + /*@internal*/ getAllParsedConfigs(): readonly ParsedCommandLine[]; } /** @@ -2047,6 +2048,10 @@ namespace ts { }, invalidateProject: (configFilePath, reloadLevel) => invalidateProject(state, configFilePath, reloadLevel || ConfigFileProgramReloadLevel.None), buildNextInvalidatedProject: () => buildNextInvalidatedProject(state), + getAllParsedConfigs: () => arrayFrom(mapDefinedIterator( + state.configFileCache.values(), + config => isParsedCommandLine(config) ? config : undefined + )), }; } diff --git a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts index c037c310043..e28c2a928db 100644 --- a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts +++ b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts @@ -2,26 +2,8 @@ namespace ts { describe("unittests:: tsbuild:: outFile:: on amd modules with --out", () => { let outFileFs: vfs.FileSystem; const { time, tick } = getTime(); - const enum ext { js, jsmap, dts, dtsmap, buildinfo } const enum project { lib, app } - type OutputFile = [string, string, string, string, string]; function relName(path: string) { return path.slice(1); } - const outputFiles: [OutputFile, OutputFile] = [ - [ - "/src/lib/module.js", - "/src/lib/module.js.map", - "/src/lib/module.d.ts", - "/src/lib/module.d.ts.map", - "/src/lib/module.tsbuildinfo" - ], - [ - "/src/app/module.js", - "/src/app/module.js.map", - "/src/app/module.d.ts", - "/src/app/module.d.ts.map", - "/src/app/module.tsbuildinfo" - ] - ]; type Sources = [string, ReadonlyArray]; const enum source { config, ts } const sources: [Sources, Sources] = [ @@ -68,10 +50,6 @@ namespace ts { proj: "amdModulesWithOut", rootNames: ["/src/app"], baselineSourceMap: true, - expectedBuildInfoFilesForSectionBaselines: [ - [outputFiles[project.lib][ext.buildinfo], outputFiles[project.lib][ext.js], outputFiles[project.lib][ext.dts]], - [outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]] - ], initialBuild: { modifyFs }, @@ -197,13 +175,6 @@ ${internal} export enum internalEnum { a, b, c }`); replaceText(fs, sources[project.app][source.ts][0], "file1", "lib/file1"); } - const libOutputFile: OutputFile = [ - "/src/lib/module.js", - "/src/lib/module.js.map", - "/src/lib/module.d.ts", - "/src/lib/module.d.ts.map", - "/src/lib/module.tsbuildinfo" - ]; verifyTsbuildOutput({ scenario: "when the module resolution finds original source file", projFs: () => outFileFs, @@ -212,10 +183,6 @@ ${internal} export enum internalEnum { a, b, c }`); proj: "amdModulesWithOut", rootNames: ["/src/app"], baselineSourceMap: true, - expectedBuildInfoFilesForSectionBaselines: [ - [libOutputFile[ext.buildinfo], libOutputFile[ext.js], libOutputFile[ext.dts]], - [outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]] - ], initialBuild: { modifyFs, expectedDiagnostics: [ diff --git a/src/testRunner/unittests/tsbuild/helpers.ts b/src/testRunner/unittests/tsbuild/helpers.ts index b204daef0fb..c20cdeb7f94 100644 --- a/src/testRunner/unittests/tsbuild/helpers.ts +++ b/src/testRunner/unittests/tsbuild/helpers.ts @@ -235,12 +235,12 @@ interface Symbol { fs: vfs.FileSystem; tick: () => void; rootNames: ReadonlyArray; - baselineSourceMap?: true; - expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray; modifyFs: (fs: vfs.FileSystem) => void; + baselineSourceMap?: true; + baselineBuildInfo?: true; } - function build({ fs, tick, rootNames, baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, modifyFs }: BuildInput) { + function build({ fs, tick, rootNames, modifyFs, baselineSourceMap, baselineBuildInfo }: BuildInput) { const actualReadFileMap = createMap(); modifyFs(fs); tick(); @@ -265,7 +265,21 @@ interface Symbol { }; builder.build(); if (baselineSourceMap) generateSourceMapBaselineFiles(fs, mapDefinedIterator(writtenFiles.keys(), f => f.endsWith(".map") ? f : undefined)); - generateBuildInfoSectionBaselineFiles(fs, expectedBuildInfoFilesForSectionBaselines || emptyArray); + if (baselineBuildInfo) { + let expectedBuildInfoFiles: BuildInfoSectionBaselineFiles[] | undefined; + for (const { options } of builder.getAllParsedConfigs()) { + const out = options.outFile || options.out; + if (out) { + const { jsFilePath, declarationFilePath, buildInfoPath } = getOutputPathsForBundle(options, /*forceDts*/ false); + if (buildInfoPath && writtenFiles.has(buildInfoPath)) { + (expectedBuildInfoFiles || (expectedBuildInfoFiles = [])).push( + [buildInfoPath, jsFilePath, declarationFilePath] + ); + } + } + } + if (expectedBuildInfoFiles) generateBuildInfoSectionBaselineFiles(fs, expectedBuildInfoFiles); + } fs.makeReadonly(); return { fs, actualReadFileMap, host, builder, writtenFiles }; } @@ -311,7 +325,6 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt tick: () => void; proj: string; rootNames: ReadonlyArray; - expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray; initialBuild: BuildState; incrementalDtsChangedBuild?: BuildState; incrementalDtsUnchangedBuild?: BuildState; @@ -322,8 +335,8 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt } export function verifyTsbuildOutput({ - scenario, projFs, time, tick, proj, rootNames, baselineOnly, verifyDiagnostics, - baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, + scenario, projFs, time, tick, proj, rootNames, + baselineOnly, verifyDiagnostics, baselineSourceMap, initialBuild, incrementalDtsChangedBuild, incrementalDtsUnchangedBuild, incrementalHeaderChangedBuild }: VerifyTsBuildInput) { describe(`tsc --b ${proj}:: ${scenario}`, () => { @@ -337,9 +350,9 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt fs: projFs().shadow(), tick, rootNames, - baselineSourceMap, - expectedBuildInfoFilesForSectionBaselines, modifyFs: initialBuild.modifyFs, + baselineSourceMap, + baselineBuildInfo: true, }); ({ fs, actualReadFileMap, host, writtenFiles: initialWrittenFiles } = result); firstBuildTime = time(); @@ -383,9 +396,9 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt fs: newFs, tick, rootNames, - baselineSourceMap, - expectedBuildInfoFilesForSectionBaselines, modifyFs: incrementalModifyFs, + baselineSourceMap, + baselineBuildInfo: true, })); afterBuildTime = newFs.statSync(lastProjectOutput).mtimeMs; }); diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts index db8d0873e76..6fae1e443ab 100644 --- a/src/testRunner/unittests/tsbuild/outFile.ts +++ b/src/testRunner/unittests/tsbuild/outFile.ts @@ -55,11 +55,6 @@ namespace ts { ] ] ]; - const expectedTsbuildInfoFileNames: ReadonlyArray = [ - [outputFiles[project.first][ext.buildinfo], outputFiles[project.first][ext.js], outputFiles[project.first][ext.dts]], - [outputFiles[project.second][ext.buildinfo], outputFiles[project.second][ext.js], outputFiles[project.second][ext.dts]], - [outputFiles[project.third][ext.buildinfo], outputFiles[project.third][ext.js], outputFiles[project.third][ext.dts]] - ]; const relSources = sources.map(([config, sources]) => [relName(config), sources.map(relName)]) as any as [Sources, Sources, Sources]; const { time, tick } = getTime(); let expectedOutputFiles = [ @@ -244,7 +239,6 @@ namespace ts { modifyFs: (fs: vfs.FileSystem) => void; modifyAgainFs?: (fs: vfs.FileSystem) => void; additionalSourceFiles?: ReadonlyArray; - expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray; dependOrdered?: true; ignoreDtsChanged?: true; ignoreDtsUnchanged?: true; @@ -256,7 +250,6 @@ namespace ts { modifyFs, modifyAgainFs, additionalSourceFiles, - expectedBuildInfoFilesForSectionBaselines, dependOrdered, ignoreDtsChanged, ignoreDtsUnchanged, @@ -279,7 +272,6 @@ namespace ts { proj: "outfile-concat", rootNames: ["/src/third"], baselineSourceMap: true, - expectedBuildInfoFilesForSectionBaselines: expectedBuildInfoFilesForSectionBaselines || expectedTsbuildInfoFileNames, initialBuild: { modifyFs, expectedDiagnostics: initialExpectedDiagnostics, @@ -334,11 +326,6 @@ namespace ts { scenario: "when final project specifies tsBuildInfoFile", modifyFs: fs => replaceText(fs, sources[project.third][source.config], `"composite": true,`, `"composite": true, "tsBuildInfoFile": "./thirdjs/output/third.tsbuildinfo",`), - expectedBuildInfoFilesForSectionBaselines: [ - expectedTsbuildInfoFileNames[0], - expectedTsbuildInfoFileNames[1], - ["/src/third/thirdjs/output/third.tsbuildinfo", expectedTsbuildInfoFileNames[2][1], expectedTsbuildInfoFileNames[2][2]] - ], ignoreDtsChanged: true, ignoreDtsUnchanged: true, baselineOnly: true diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js index feae4ea8dc8..3611d355563 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js @@ -803,3 +803,37 @@ sourceFile:lib/global.ts "version": "FakeTSVersion" } +//// [/src/module.tsbuildinfo.baseline.txt] +====================================================================== +File:: /src/module.js +---------------------------------------------------------------------- +text: (0-417) +var myGlob = 20; +define("lib/file1", ["require", "exports"], function (require, exports) { + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = 10; +}); +define("lib/file2", ["require", "exports"], function (require, exports) { + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.y = 20; +}); +var globalConst = 10; + +====================================================================== +====================================================================== +File:: /src/module.d.ts +---------------------------------------------------------------------- +text: (0-179) +declare const myGlob = 20; +declare module "lib/file1" { + export const x = 10; +} +declare module "lib/file2" { + export const y = 20; +} +declare const globalConst = 10; + +====================================================================== + From 8521002dff8311f2ac3994c8379090fee4ffe38b Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 9 Sep 2019 15:29:38 -0700 Subject: [PATCH 11/48] Baseline emitted files that are written even if same file contents --- src/harness/vfs.ts | 49 +++++++++++++------ src/testRunner/unittests/tsbuild/helpers.ts | 2 +- .../modules-and-globals-mixed-in-amd.js | 3 ++ .../multiple-emitHelpers-in-all-projects.js | 3 ++ .../multiple-prologues-in-all-projects.js | 3 ++ .../shebang-in-all-projects.js | 3 ++ .../stripInternal.js | 3 ++ .../triple-slash-refs-in-all-projects.js | 3 ++ .../multiple-emitHelpers-in-all-projects.js | 3 ++ .../multiple-prologues-in-all-projects.js | 1 + .../stripInternal.js | 1 + ...-emitDeclarationOnly-and-declarationMap.js | 6 +++ ...import-project-with-emitDeclarationOnly.js | 3 ++ ...mports-project-with-emitDeclarationOnly.js | 4 ++ ...mports-project-with-emitDeclarationOnly.js | 1 + .../inferred-type-from-transitive-module.js | 3 ++ .../baseline-sectioned-sourcemaps.js | 3 ++ .../emitHelpers-in-all-projects.js | 3 ++ ...tHelpers-in-only-one-dependency-project.js | 3 ++ .../multiple-emitHelpers-in-all-projects.js | 3 ++ ...tiple-emitHelpers-in-different-projects.js | 3 ++ .../multiple-prologues-in-all-projects.js | 3 ++ ...ultiple-prologues-in-different-projects.js | 3 ++ .../shebang-in-all-projects.js | 3 ++ .../shebang-in-only-one-dependency-project.js | 3 ++ .../strict-in-all-projects.js | 3 ++ .../strict-in-one-dependency.js | 3 ++ ...en-one-two-three-are-prepended-in-order.js | 3 ++ .../stripInternal-jsdoc-style-comment.js | 3 ++ ...en-one-two-three-are-prepended-in-order.js | 3 ++ ...-jsdoc-style-with-comments-emit-enabled.js | 3 ++ ...en-one-two-three-are-prepended-in-order.js | 3 ++ ...en-one-two-three-are-prepended-in-order.js | 3 ++ ...tripInternal-with-comments-emit-enabled.js | 3 ++ .../stripInternal.js | 3 ++ .../triple-slash-refs-in-all-projects.js | 3 ++ .../triple-slash-refs-in-one-project.js | 3 ++ ...t-composite-but-uses-project-references.js | 6 +++ ...-source-files-are-empty-in-the-own-file.js | 3 ++ .../emitHelpers-in-all-projects.js | 1 + ...tHelpers-in-only-one-dependency-project.js | 1 + .../multiple-emitHelpers-in-all-projects.js | 1 + ...tiple-emitHelpers-in-different-projects.js | 1 + .../multiple-prologues-in-all-projects.js | 1 + ...ultiple-prologues-in-different-projects.js | 1 + .../strict-in-all-projects.js | 1 + .../strict-in-one-dependency.js | 1 + ...en-one-two-three-are-prepended-in-order.js | 3 ++ .../stripInternal-jsdoc-style-comment.js | 3 ++ ...en-one-two-three-are-prepended-in-order.js | 3 ++ ...en-one-two-three-are-prepended-in-order.js | 3 ++ ...tripInternal-with-comments-emit-enabled.js | 3 ++ .../stripInternal.js | 3 ++ .../incremental-declaration-changes/sample.js | 6 +++ .../when-declaration-option-changes.js | 2 + .../when-esModuleInterop-option-changes.js | 1 + ...en-logic-config-changes-declaration-dir.js | 5 ++ .../sample.js | 3 ++ 58 files changed, 191 insertions(+), 15 deletions(-) diff --git a/src/harness/vfs.ts b/src/harness/vfs.ts index 5ef5851433a..25da3149834 100644 --- a/src/harness/vfs.ts +++ b/src/harness/vfs.ts @@ -33,6 +33,10 @@ namespace vfs { let devCount = 0; // A monotonically increasing count of device ids let inoCount = 0; // A monotonically increasing count of inodes + export interface DiffOptions { + includeChangedFileWithSameContent?: boolean; + } + /** * Represents a virtual POSIX-like file system. */ @@ -693,21 +697,25 @@ namespace vfs { * Generates a `FileSet` patch containing all the entries in this `FileSystem` that are not in `base`. * @param base The base file system. If not provided, this file system's `shadowRoot` is used (if present). */ - public diff(base = this.shadowRoot) { + public diff(base = this.shadowRoot, options: DiffOptions = {}) { const differences: FileSet = {}; - const hasDifferences = base ? FileSystem.rootDiff(differences, this, base) : FileSystem.trackCreatedInodes(differences, this, this._getRootLinks()); + const hasDifferences = base ? + FileSystem.rootDiff(differences, this, base, options) : + FileSystem.trackCreatedInodes(differences, this, this._getRootLinks()); return hasDifferences ? differences : undefined; } /** * Generates a `FileSet` patch containing all the entries in `chagned` that are not in `base`. */ - public static diff(changed: FileSystem, base: FileSystem) { + public static diff(changed: FileSystem, base: FileSystem, options: DiffOptions = {}) { const differences: FileSet = {}; - return FileSystem.rootDiff(differences, changed, base) ? differences : undefined; + return FileSystem.rootDiff(differences, changed, base, options) ? + differences : + undefined; } - private static diffWorker(container: FileSet, changed: FileSystem, changedLinks: ReadonlyMap | undefined, base: FileSystem, baseLinks: ReadonlyMap | undefined) { + private static diffWorker(container: FileSet, changed: FileSystem, changedLinks: ReadonlyMap | undefined, base: FileSystem, baseLinks: ReadonlyMap | undefined, options: DiffOptions) { if (changedLinks && !baseLinks) return FileSystem.trackCreatedInodes(container, changed, changedLinks); if (baseLinks && !changedLinks) return FileSystem.trackDeletedInodes(container, baseLinks); if (changedLinks && baseLinks) { @@ -724,10 +732,10 @@ namespace vfs { const baseNode = baseLinks.get(basename); if (baseNode) { if (isDirectory(changedNode) && isDirectory(baseNode)) { - return hasChanges = FileSystem.directoryDiff(container, basename, changed, changedNode, base, baseNode) || hasChanges; + return hasChanges = FileSystem.directoryDiff(container, basename, changed, changedNode, base, baseNode, options) || hasChanges; } if (isFile(changedNode) && isFile(baseNode)) { - return hasChanges = FileSystem.fileDiff(container, basename, changed, changedNode, base, baseNode) || hasChanges; + return hasChanges = FileSystem.fileDiff(container, basename, changed, changedNode, base, baseNode, options) || hasChanges; } if (isSymlink(changedNode) && isSymlink(baseNode)) { return hasChanges = FileSystem.symlinkDiff(container, basename, changedNode, baseNode) || hasChanges; @@ -740,7 +748,7 @@ namespace vfs { return false; } - private static rootDiff(container: FileSet, changed: FileSystem, base: FileSystem) { + private static rootDiff(container: FileSet, changed: FileSystem, base: FileSystem, options: DiffOptions) { while (!changed._lazy.links && changed._shadowRoot) changed = changed._shadowRoot; while (!base._lazy.links && base._shadowRoot) base = base._shadowRoot; @@ -750,10 +758,10 @@ namespace vfs { // no difference if the root links are empty and unshadowed if (!changed._lazy.links && !changed._shadowRoot && !base._lazy.links && !base._shadowRoot) return false; - return FileSystem.diffWorker(container, changed, changed._getRootLinks(), base, base._getRootLinks()); + return FileSystem.diffWorker(container, changed, changed._getRootLinks(), base, base._getRootLinks(), options); } - private static directoryDiff(container: FileSet, basename: string, changed: FileSystem, changedNode: DirectoryInode, base: FileSystem, baseNode: DirectoryInode) { + private static directoryDiff(container: FileSet, basename: string, changed: FileSystem, changedNode: DirectoryInode, base: FileSystem, baseNode: DirectoryInode, options: DiffOptions) { while (!changedNode.links && changedNode.shadowRoot) changedNode = changedNode.shadowRoot; while (!baseNode.links && baseNode.shadowRoot) baseNode = baseNode.shadowRoot; @@ -770,7 +778,7 @@ namespace vfs { // no difference if both nodes have identical children const children: FileSet = {}; - if (!FileSystem.diffWorker(children, changed, changed._getLinks(changedNode), base, base._getLinks(baseNode))) { + if (!FileSystem.diffWorker(children, changed, changed._getLinks(changedNode), base, base._getLinks(baseNode), options)) { return false; } @@ -778,7 +786,7 @@ namespace vfs { return true; } - private static fileDiff(container: FileSet, basename: string, changed: FileSystem, changedNode: FileInode, base: FileSystem, baseNode: FileInode) { + private static fileDiff(container: FileSet, basename: string, changed: FileSystem, changedNode: FileInode, base: FileSystem, baseNode: FileInode, options: DiffOptions) { while (!changedNode.buffer && changedNode.shadowRoot) changedNode = changedNode.shadowRoot; while (!baseNode.buffer && baseNode.shadowRoot) baseNode = baseNode.shadowRoot; @@ -800,7 +808,11 @@ namespace vfs { if (changedBuffer === baseBuffer) return false; // no difference if both buffers are identical - if (Buffer.compare(changedBuffer, baseBuffer) === 0) return false; + if (Buffer.compare(changedBuffer, baseBuffer) === 0) { + if (!options.includeChangedFileWithSameContent) return false; + container[basename] = new SameFileContentFile(changedBuffer); + return true; + } container[basename] = new File(changedBuffer); return true; @@ -1360,6 +1372,12 @@ namespace vfs { } } + export class SameFileContentFile extends File { + constructor(data: Buffer | string, metaAndEncoding?: { encoding?: string, meta?: Record }) { + super(data, metaAndEncoding); + } + } + /** Extended options for a hard link in a `FileSet` */ export class Link { public readonly path: string; @@ -1546,6 +1564,9 @@ namespace vfs { else if (entry instanceof Directory) { text += formatPatchWorker(file, entry.files); } + else if (entry instanceof SameFileContentFile) { + text += `//// [${file}] file written with same contents\r\n`; + } else if (entry instanceof File) { const content = typeof entry.data === "string" ? entry.data : entry.data.toString("utf8"); text += `//// [${file}]\r\n${content}\r\n\r\n`; @@ -1582,4 +1603,4 @@ namespace vfs { } } } -// tslint:enable:no-null-keyword \ No newline at end of file +// tslint:enable:no-null-keyword diff --git a/src/testRunner/unittests/tsbuild/helpers.ts b/src/testRunner/unittests/tsbuild/helpers.ts index c20cdeb7f94..ab8461a14e6 100644 --- a/src/testRunner/unittests/tsbuild/helpers.ts +++ b/src/testRunner/unittests/tsbuild/helpers.ts @@ -285,7 +285,7 @@ interface Symbol { } function generateBaseline(fs: vfs.FileSystem, proj: string, scenario: string, subScenario: string, baseFs: vfs.FileSystem) { - const patch = fs.diff(baseFs); + const patch = fs.diff(baseFs, { includeChangedFileWithSameContent: true }); // tslint:disable-next-line:no-null-keyword Harness.Baseline.runBaseline(`tsbuild/${proj}/${subScenario.split(" ").join("-")}/${scenario.split(" ").join("-")}.js`, patch ? vfs.formatPatch(patch) : null); } diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js index e30eed1615a..87ace04e448 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js @@ -332,6 +332,9 @@ declare const myVar = 30; //// [/src/lib/file1.ts] export const x = 10;console.log(x); +//// [/src/lib/module.d.ts] file written with same contents +//// [/src/lib/module.d.ts.map] file written with same contents +//// [/src/lib/module.d.ts.map.baseline.txt] file written with same contents //// [/src/lib/module.js] var myGlob = 20; define("file1", ["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js index 6297215f3ca..2b4e0a0a838 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js @@ -790,6 +790,9 @@ export const x = 10;function forlibfile1Rest() { const { b, ...rest } = { a: 10, b: 30, yy: 30 }; }console.log(x); +//// [/src/lib/module.d.ts] file written with same contents +//// [/src/lib/module.d.ts.map] file written with same contents +//// [/src/lib/module.d.ts.map.baseline.txt] file written with same contents //// [/src/lib/module.js] var __read = (this && this.__read) || function (o, n) { var m = typeof Symbol === "function" && o[Symbol.iterator]; diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js index 689dc08570f..f7252e6dcbc 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js @@ -482,6 +482,9 @@ declare const myVar = 30; //// [/src/lib/file1.ts] export const x = 10;console.log(x); +//// [/src/lib/module.d.ts] file written with same contents +//// [/src/lib/module.d.ts.map] file written with same contents +//// [/src/lib/module.d.ts.map.baseline.txt] file written with same contents //// [/src/lib/module.js] "use strict"; "myPrologue"; diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js index d55f61ae925..3cf10ffbe19 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js @@ -338,6 +338,9 @@ declare const myVar = 30; #!someshebang lib file1 export const x = 10;console.log(x); +//// [/src/lib/module.d.ts] file written with same contents +//// [/src/lib/module.d.ts.map] file written with same contents +//// [/src/lib/module.d.ts.map.baseline.txt] file written with same contents //// [/src/lib/module.js] #!someshebang lib file0 var myGlob = 20; diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js index 16f1d50a224..4de45c6d0ec 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js @@ -1893,6 +1893,9 @@ export namespace normalN { /*@internal*/ export const internalConst = 10; /*@internal*/ export enum internalEnum { a, b, c }console.log(x); +//// [/src/lib/module.d.ts] file written with same contents +//// [/src/lib/module.d.ts.map] file written with same contents +//// [/src/lib/module.d.ts.map.baseline.txt] file written with same contents //// [/src/lib/module.js] /*@internal*/ var myGlob = 20; define("file1", ["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js index ece0a5fc25a..479ea723921 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js @@ -432,6 +432,9 @@ declare const myVar = 30; //// [/src/lib/file1.ts] export const x = 10;console.log(x); +//// [/src/lib/module.d.ts] file written with same contents +//// [/src/lib/module.d.ts.map] file written with same contents +//// [/src/lib/module.d.ts.map.baseline.txt] file written with same contents //// [/src/lib/module.js] /// var file0Const = new libfile0(); diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js index 6c9be3154a5..54c0b8fe21e 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js @@ -724,6 +724,9 @@ declare function appfile4Spread(...b: number[]): void; //// [/src/lib/file1.ts] export const x = 10;function forlibfile1Rest() { } +//// [/src/lib/module.d.ts] file written with same contents +//// [/src/lib/module.d.ts.map] file written with same contents +//// [/src/lib/module.d.ts.map.baseline.txt] file written with same contents //// [/src/lib/module.js] var __read = (this && this.__read) || function (o, n) { var m = typeof Symbol === "function" && o[Symbol.iterator]; diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js index df3412c267c..ad401641be8 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js @@ -647,6 +647,7 @@ declare const myVar = 30; "myPrologue5" export const x = 10; +//// [/src/lib/module.d.ts] file written with same contents //// [/src/lib/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":"AACA,QAAA,MAAM,MAAM,KAAK,CAAC;;ICAlB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;;ICApB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,WAAW,KAAK,CAAC"} diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js index 1c8bad6c40a..218681bea8f 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js @@ -2071,6 +2071,7 @@ export namespace normalN { /*@internal*/ export const internalConst = 10; /*@internal*/ export enum internalEnum { a, b, c } +//// [/src/lib/module.d.ts] file written with same contents //// [/src/lib/module.d.ts.map] {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":"AAAc,QAAA,MAAM,MAAM,KAAK,CAAC;;ICAlB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;IAClC,MAAM,OAAO,OAAO;;QAEF,IAAI,EAAE,MAAM,CAAC;QACb,MAAM;sBACF,CAAC,EACM,MAAM;KAClC;IACD,MAAM,WAAW,OAAO,CAAC;QACP,MAAa,CAAC;SAAI;QAClB,SAAgB,GAAG,SAAK;QACxB,UAAiB,aAAa,CAAC;YAAE,MAAa,CAAC;aAAG;SAAE;QACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;YAAE,MAAa,SAAS;aAAG;SAAE;QAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;QAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;QAC9B,MAAM,aAAa,KAAK,CAAC;QAChC,KAAY,YAAY;YAAG,CAAC,IAAA;YAAE,CAAC,IAAA;YAAE,CAAC,IAAA;SAAE;KACrD;IACa,MAAM,OAAO,SAAS;KAAG;IACzB,MAAM,UAAU,WAAW,SAAK;IAChC,MAAM,WAAW,iBAAiB,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAChE,MAAM,WAAW,aAAa,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACtE,MAAM,QAAQ,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;IAC3D,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC;IACrC,MAAM,CAAC,MAAM,aAAa,KAAK,CAAC;IAChC,MAAM,MAAM,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;;;ICzBlD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;;ACApB,QAAA,MAAM,WAAW,KAAK,CAAC"} diff --git a/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-circular-import-project-with-emitDeclarationOnly-and-declarationMap.js b/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-circular-import-project-with-emitDeclarationOnly-and-declarationMap.js index 9a793388ac0..f4675cfcd15 100644 --- a/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-circular-import-project-with-emitDeclarationOnly-and-declarationMap.js +++ b/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-circular-import-project-with-emitDeclarationOnly-and-declarationMap.js @@ -9,6 +9,12 @@ export interface A { //// [/src/lib/a.d.ts.map] {"version":3,"file":"a.d.ts","sourceRoot":"","sources":["../src/a.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,WAAW,CAAC;IAChB,CAAC,EAAE,CAAC,CAAC;IAAC,GAAG,EAAE,GAAG,CAAC;CAChB"} +//// [/src/lib/b.d.ts] file written with same contents +//// [/src/lib/b.d.ts.map] file written with same contents +//// [/src/lib/c.d.ts] file written with same contents +//// [/src/lib/c.d.ts.map] file written with same contents +//// [/src/lib/index.d.ts] file written with same contents +//// [/src/lib/index.d.ts.map] file written with same contents //// [/src/src/a.ts] import { B } from "./b"; diff --git a/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-circular-import-project-with-emitDeclarationOnly.js b/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-circular-import-project-with-emitDeclarationOnly.js index a86656dbed5..a1297732a88 100644 --- a/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-circular-import-project-with-emitDeclarationOnly.js +++ b/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-circular-import-project-with-emitDeclarationOnly.js @@ -6,6 +6,9 @@ export interface A { } +//// [/src/lib/b.d.ts] file written with same contents +//// [/src/lib/c.d.ts] file written with same contents +//// [/src/lib/index.d.ts] file written with same contents //// [/src/src/a.ts] import { B } from "./b"; diff --git a/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js b/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js index 8a70278d315..c5eb746e843 100644 --- a/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js +++ b/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-changes/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js @@ -11,6 +11,10 @@ export interface A { //// [/src/lib/a.d.ts.map] {"version":3,"file":"a.d.ts","sourceRoot":"","sources":["../src/a.ts"],"names":[],"mappings":"AAAA,qBAAa,CAAC;IAAG,IAAI,SAAW;CAAE;AAElC,MAAM,WAAW,CAAC;IAChB,CAAC,EAAE,CAAC,CAAC;IAAC,GAAG,EAAE,GAAG,CAAC;CAChB"} +//// [/src/lib/b.d.ts] file written with same contents +//// [/src/lib/b.d.ts.map] file written with same contents +//// [/src/lib/c.d.ts] file written with same contents +//// [/src/lib/c.d.ts.map] file written with same contents //// [/src/src/a.ts] export class B { prop = "hello"; } diff --git a/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-doesnt-change/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js b/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-doesnt-change/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js index 7facc60eef5..0eb46f39556 100644 --- a/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-doesnt-change/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js +++ b/tests/baselines/reference/tsbuild/emitDeclarationOnly/incremental-declaration-doesnt-change/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js @@ -1,3 +1,4 @@ +//// [/src/lib/a.d.ts] file written with same contents //// [/src/lib/a.d.ts.map] {"version":3,"file":"a.d.ts","sourceRoot":"","sources":["../src/a.ts"],"names":[],"mappings":"AAAA,qBAAa,CAAC;IAAG,IAAI,SAAW;CAAE;AAGlC,MAAM,WAAW,CAAC;IAChB,CAAC,EAAE,CAAC,CAAC;CACN"} diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js index 727875a5d40..e27d6055603 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js @@ -26,6 +26,9 @@ import { LazyAction } from './bundling'; export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex")>; +//// [/src/obj/index.js] file written with same contents +//// [/src/obj/lazyIndex.d.ts] file written with same contents +//// [/src/obj/lazyIndex.js] file written with same contents //// [/src/obj/tsconfig.tsbuildinfo] { "program": { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js index de8f6f9b0db..0c1de645252 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js index 2c8eeceeac3..4049a658d5d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var __rest = (this && this.__rest) || function (s, e) { var t = {}; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js index 80c79449ce1..91d63e81d93 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js index 9a1d94824d4..4ea169f5940 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var __rest = (this && this.__rest) || function (s, e) { var t = {}; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js index 5a6d733931e..ac94261ec5b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var __rest = (this && this.__rest) || function (s, e) { var t = {}; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js index c8eae0ea272..a1075353f3e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] "use strict"; "myPrologue"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js index cbf38cf0642..75a66a9473f 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] "use strict"; var s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js index b0c4c820ac2..66cbcb79b2c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] #!someshebang first first_PART1 var s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js index d89f565e375..4771fa447ef 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js index 5cf3ea7abd4..1e7436f9df8 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] "use strict"; var s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js index 372ef671910..654b18ce483 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index d9691fde1a8..6ec1100b4bd 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -2024,6 +2024,9 @@ declare class C { ====================================================================== +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js index 38403c4693d..a21376924f6 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index a48020f4ba7..d68b80c42a4 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2124,6 +2124,9 @@ declare class C { ====================================================================== +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js index 29ad265d6ab..b779dcffa53 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js index 08a0bffd148..f312697a726 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -2024,6 +2024,9 @@ declare class C { ====================================================================== +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index e17e3f05842..4ccb69a5a8d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2124,6 +2124,9 @@ declare class C { ====================================================================== +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js index 29c643c43f5..b64f0367708 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js index e91c046c278..2fc43e90ec5 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js index a7e041fe565..0303c231a2d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js index c34e752d808..d317b8f29b6 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js index eb117294ec4..126759e3719 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); @@ -257,6 +260,9 @@ interface NoJsForHereEither { console.log(s); console.log(s); +//// [/src/third/thirdjs/output/third-output.d.ts] file written with same contents +//// [/src/third/thirdjs/output/third-output.d.ts.map] file written with same contents +//// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] file written with same contents //// [/src/third/thirdjs/output/third-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js index d050ca2dd0c..a3b4c95b0f2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js @@ -1,3 +1,6 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents +//// [/src/first/bin/first-output.d.ts.map] file written with same contents +//// [/src/first/bin/first-output.d.ts.map.baseline.txt] file written with same contents //// [/src/first/bin/first-output.js] var s = "Hello, world"; console.log(s); diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js index f595aac7193..40ab1fa6dd0 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AAGD,iBAAS,uBAAuB,SAAM;AEXtC,iBAAS,CAAC,WAET"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js index 65d56d99c99..95c8bdbb672 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AAGD,iBAAS,uBAAuB,SAE/B;AEbD,iBAAS,CAAC,WAET"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js index 85a0007b0ff..d5a6f310b95 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AAGD,iBAAS,uBAAuB,SAAM;AEXtC,iBAAS,CAAC,WAET;AACD,iBAAS,sBAAsB,CAAC,GAAG,GAAG,MAAM,EAAE,QAAK"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js index ea399602b00..c7426fd026e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AAGD,iBAAS,uBAAuB,SAAM;AEXtC,iBAAS,CAAC,WAET"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js index 948b6e8233a..e31929fda61 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAEA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AEVD,iBAAS,CAAC,WAET"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js index f16a24a3fb8..441559cdf45 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AACA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AETD,iBAAS,CAAC,WAET"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js index 7e96f8915da..00e04704f80 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AACA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AETD,iBAAS,CAAC,WAET"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js index ebb00b3b84c..59205be8064 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AACA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AETD,iBAAS,CAAC,WAET"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index f3c8dccc27a..887c845e48b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -1072,6 +1072,7 @@ declare class C { ====================================================================== +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AERD,iBAAS,CAAC,WAET"} @@ -1205,6 +1206,8 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.d.ts.map +//// [/src/first/bin/first-output.js] file written with same contents +//// [/src/first/bin/first-output.js.map] file written with same contents //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== JsFile: first-output.js diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js index d91fca25e4c..3d722243740 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AERD,iBAAS,CAAC,WAET"} @@ -131,6 +132,8 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.d.ts.map +//// [/src/first/bin/first-output.js] file written with same contents +//// [/src/first/bin/first-output.js.map] file written with same contents //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== JsFile: first-output.js diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js index 4cc32daee93..5f9b856f99c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -1072,6 +1072,7 @@ declare class C { ====================================================================== +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AERD,iBAAS,CAAC,WAET"} @@ -1205,6 +1206,8 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.d.ts.map +//// [/src/first/bin/first-output.js] file written with same contents +//// [/src/first/bin/first-output.js.map] file written with same contents //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== JsFile: first-output.js diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index b52187573a3..dcaa317a0d2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -1072,6 +1072,7 @@ declare class C { ====================================================================== +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AERD,iBAAS,CAAC,WAET"} @@ -1205,6 +1206,8 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.d.ts.map +//// [/src/first/bin/first-output.js] file written with same contents +//// [/src/first/bin/first-output.js.map] file written with same contents //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== JsFile: first-output.js diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js index 65791f61896..93681166f46 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AERD,iBAAS,CAAC,WAET"} @@ -131,6 +132,8 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.d.ts.map +//// [/src/first/bin/first-output.js] file written with same contents +//// [/src/first/bin/first-output.js.map] file written with same contents //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== JsFile: first-output.js diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js index 75a1379fe9f..832ea5e5de0 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js @@ -1,3 +1,4 @@ +//// [/src/first/bin/first-output.d.ts] file written with same contents //// [/src/first/bin/first-output.d.ts.map] {"version":3,"file":"first-output.d.ts","sourceRoot":"","sources":["../first_PART1.ts","../first_part2.ts","../first_part3.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;AERD,iBAAS,CAAC,WAET"} @@ -131,6 +132,8 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.d.ts.map +//// [/src/first/bin/first-output.js] file written with same contents +//// [/src/first/bin/first-output.js.map] file written with same contents //// [/src/first/bin/first-output.js.map.baseline.txt] =================================================================== JsFile: first-output.js diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js index f1124ae44eb..0a2ce56cb64 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js @@ -207,6 +207,10 @@ export class someClass { } "version": "FakeTSVersion" } +//// [/src/logic/index.d.ts] file written with same contents +//// [/src/logic/index.js] file written with same contents +//// [/src/logic/index.js.map] file written with same contents +//// [/src/logic/index.js.map.baseline.txt] file written with same contents //// [/src/logic/tsconfig.tsbuildinfo] { "program": { @@ -257,6 +261,8 @@ export class someClass { } "version": "FakeTSVersion" } +//// [/src/tests/index.d.ts] file written with same contents +//// [/src/tests/index.js] file written with same contents //// [/src/tests/tsconfig.tsbuildinfo] { "program": { diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js index 8a87cafe69e..b3c22649712 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js @@ -2,12 +2,14 @@ export declare const World = "hello"; +//// [/src/core/anotherModule.js] file written with same contents //// [/src/core/index.d.ts] export declare const someString: string; export declare function leftPad(s: string, n: number): string; export declare function multiply(a: number, b: number): number; +//// [/src/core/index.js] file written with same contents //// [/src/core/tsconfig.json] { "compilerOptions": { diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-esModuleInterop-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-esModuleInterop-option-changes.js index ce9044faa05..a701b09575a 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-esModuleInterop-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-esModuleInterop-option-changes.js @@ -1,3 +1,4 @@ +//// [/src/tests/index.d.ts] file written with same contents //// [/src/tests/index.js] "use strict"; var __importStar = (this && this.__importStar) || function (mod) { diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js index 13d6ef5c3ba..701737ec3b5 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js @@ -4,6 +4,9 @@ import * as mod from '../core/anotherModule'; export declare const m: typeof mod; +//// [/src/logic/index.js] file written with same contents +//// [/src/logic/index.js.map] file written with same contents +//// [/src/logic/index.js.map.baseline.txt] file written with same contents //// [/src/logic/tsconfig.json] { "compilerOptions": { @@ -71,6 +74,8 @@ export declare const m: typeof mod; "version": "FakeTSVersion" } +//// [/src/tests/index.d.ts] file written with same contents +//// [/src/tests/index.js] file written with same contents //// [/src/tests/tsconfig.tsbuildinfo] { "program": { diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js index 82e64bc9330..658377ce3a3 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js @@ -1,3 +1,6 @@ +//// [/src/core/index.d.ts] file written with same contents +//// [/src/core/index.d.ts.map] file written with same contents +//// [/src/core/index.d.ts.map.baseline.txt] file written with same contents //// [/src/core/index.js] "use strict"; exports.__esModule = true; From 11fd654cf997f6d031c7437fcb4c0b6e0862264e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 9 Sep 2019 16:16:57 -0700 Subject: [PATCH 12/48] Separate emitOnlyDtsFiles and forcing dts emit (for builder signature detection where we want it irrespective of settings) --- src/compiler/builderState.ts | 13 ++++++++++--- src/compiler/emitter.ts | 21 ++++++++++++++------- src/compiler/program.ts | 10 ++++++---- src/compiler/types.ts | 2 ++ 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/compiler/builderState.ts b/src/compiler/builderState.ts index 9d2c55b5610..d1a9b2f5d59 100644 --- a/src/compiler/builderState.ts +++ b/src/compiler/builderState.ts @@ -15,9 +15,9 @@ namespace ts { /*@internal*/ namespace ts { export function getFileEmitOutput(program: Program, sourceFile: SourceFile, emitOnlyDtsFiles: boolean, - cancellationToken?: CancellationToken, customTransformers?: CustomTransformers): EmitOutput { + cancellationToken?: CancellationToken, customTransformers?: CustomTransformers, forceDtsEmit?: boolean): EmitOutput { const outputFiles: OutputFile[] = []; - const emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); + const emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit); return { outputFiles, emitSkipped: emitResult.emitSkipped, exportedModulesFromDeclarationEmit: emitResult.exportedModulesFromDeclarationEmit }; function writeFile(fileName: string, text: string, writeByteOrderMark: boolean) { @@ -344,7 +344,14 @@ namespace ts.BuilderState { } } else { - const emitOutput = getFileEmitOutput(programOfThisState, sourceFile, /*emitOnlyDtsFiles*/ true, cancellationToken); + const emitOutput = getFileEmitOutput( + programOfThisState, + sourceFile, + /*emitOnlyDtsFiles*/ true, + cancellationToken, + /*customTransformers*/ undefined, + /*forceDtsEmit*/ true + ); const firstDts = emitOutput.outputFiles && programOfThisState.getCompilerOptions().declarationMap ? emitOutput.outputFiles.length > 1 ? emitOutput.outputFiles[1] : undefined : diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 57cc47cf0e1..3f396aa2d9b 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -20,7 +20,7 @@ namespace ts { export function forEachEmittedFile( host: EmitHost, action: (emitFileNames: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle | undefined) => T, sourceFilesOrTargetSourceFile?: ReadonlyArray | SourceFile, - emitOnlyDtsFiles = false, + forceDtsEmit = false, onlyBuildInfo?: boolean, includeBuildInfo?: boolean) { const sourceFiles = isArray(sourceFilesOrTargetSourceFile) ? sourceFilesOrTargetSourceFile : getSourceFilesToEmit(host, sourceFilesOrTargetSourceFile); @@ -29,7 +29,7 @@ namespace ts { const prepends = host.getPrependNodes(); if (sourceFiles.length || prepends.length) { const bundle = createBundle(sourceFiles, prepends); - const result = action(getOutputPathsFor(bundle, host, emitOnlyDtsFiles), bundle); + const result = action(getOutputPathsFor(bundle, host, forceDtsEmit), bundle); if (result) { return result; } @@ -38,7 +38,7 @@ namespace ts { else { if (!onlyBuildInfo) { for (const sourceFile of sourceFiles) { - const result = action(getOutputPathsFor(sourceFile, host, emitOnlyDtsFiles), sourceFile); + const result = action(getOutputPathsFor(sourceFile, host, forceDtsEmit), sourceFile); if (result) { return result; } @@ -227,7 +227,7 @@ namespace ts { /*@internal*/ // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature - export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile | undefined, { scriptTransformers, declarationTransformers }: EmitTransformers, emitOnlyDtsFiles?: boolean, onlyBuildInfo?: boolean): EmitResult { + export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile | undefined, { scriptTransformers, declarationTransformers }: EmitTransformers, emitOnlyDtsFiles?: boolean, onlyBuildInfo?: boolean, forceDtsEmit?: boolean): EmitResult { const compilerOptions = host.getCompilerOptions(); const sourceMapDataList: SourceMapEmitResult[] | undefined = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined; const emittedFilesList: string[] | undefined = compilerOptions.listEmittedFiles ? [] : undefined; @@ -241,7 +241,14 @@ namespace ts { // Emit each output file enter(); - forEachEmittedFile(host, emitSourceFileOrBundle, getSourceFilesToEmit(host, targetSourceFile), emitOnlyDtsFiles, onlyBuildInfo, !targetSourceFile); + forEachEmittedFile( + host, + emitSourceFileOrBundle, + getSourceFilesToEmit(host, targetSourceFile), + forceDtsEmit, + onlyBuildInfo, + !targetSourceFile + ); exit(); @@ -400,7 +407,7 @@ namespace ts { }); const declBlocked = (!!declarationTransform.diagnostics && !!declarationTransform.diagnostics.length) || !!host.isEmitBlocked(declarationFilePath) || !!compilerOptions.noEmit; emitSkipped = emitSkipped || declBlocked; - if (!declBlocked || emitOnlyDtsFiles) { + if (!declBlocked || forceDtsEmit) { Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform"); printSourceFileOrBundle( declarationFilePath, @@ -415,7 +422,7 @@ namespace ts { // Explicitly do not passthru either `inline` option } ); - if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === SyntaxKind.SourceFile) { + if (forceDtsEmit && declarationTransform.transformed[0].kind === SyntaxKind.SourceFile) { const sourceFile = declarationTransform.transformed[0]; exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit; } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 76c92ad74bb..76cccf79749 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1533,18 +1533,18 @@ namespace ts { return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = createTypeChecker(program, /*produceDiagnostics:*/ false)); } - function emit(sourceFile?: SourceFile, writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, transformers?: CustomTransformers): EmitResult { - return runWithCancellationToken(() => emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, transformers)); + function emit(sourceFile?: SourceFile, writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, transformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult { + return runWithCancellationToken(() => emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, transformers, forceDtsEmit)); } function isEmitBlocked(emitFileName: string): boolean { return hasEmitBlockingDiagnostics.has(toPath(emitFileName)); } - function emitWorker(program: Program, sourceFile: SourceFile | undefined, writeFileCallback: WriteFileCallback | undefined, cancellationToken: CancellationToken | undefined, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult { + function emitWorker(program: Program, sourceFile: SourceFile | undefined, writeFileCallback: WriteFileCallback | undefined, cancellationToken: CancellationToken | undefined, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult { let declarationDiagnostics: ReadonlyArray = []; - if (!emitOnlyDtsFiles) { + if (!forceDtsEmit) { if (options.noEmit) { return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true }; } @@ -1593,6 +1593,8 @@ namespace ts { sourceFile, getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles, + /*onlyBuildInfo*/ false, + forceDtsEmit ); performance.mark("afterEmit"); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 999a9220412..285f3101727 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2980,6 +2980,8 @@ namespace ts { * will be invoked when writing the JavaScript and declaration files. */ emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult; + /*@internal*/ + emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers, forceDtsEmit?: boolean): EmitResult; // tslint:disable-line unified-signatures getOptionsDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray; getGlobalDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray; From 49be51dcf323624e31c1c9acc3356d9825eddb98 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Mon, 9 Sep 2019 22:11:56 -0400 Subject: [PATCH 13/48] Added more helpful syntax error for enum member commas Switches the error message emitted by the parser to the more specific _"An enum member name must be followed by a ',' or '='."_ when the expected comma doesn't follow the member. --- src/compiler/diagnosticMessages.json | 4 ++ src/compiler/parser.ts | 6 ++- .../baselines/reference/enumErrors.errors.txt | 44 ++++++++++++++++++- tests/baselines/reference/enumErrors.js | 34 ++++++++++++++ tests/baselines/reference/enumErrors.symbols | 33 ++++++++++++++ tests/baselines/reference/enumErrors.types | 34 ++++++++++++++ tests/cases/conformance/enums/enumErrors.ts | 12 +++++ 7 files changed, 165 insertions(+), 2 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index b296c224d08..1c3563c9c11 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1035,6 +1035,10 @@ "category": "Error", "code": 1356 }, + "An enum member name must be followed by a ',' or '='.": { + "category": "Error", + "code": 1357 + }, "Duplicate identifier '{0}'.": { "category": "Error", diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index f1221883bde..f752d887d8d 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2125,7 +2125,7 @@ namespace ts { // We didn't get a comma, and the list wasn't terminated, explicitly parse // out a comma so we give a good error message. - parseExpected(SyntaxKind.CommaToken); + parseExpected(SyntaxKind.CommaToken, getExpectedCommaDiagnostic(kind)); // If the token was a semicolon, and the caller allows that, then skip it and // continue. This ensures we get back on track and don't result in tons of @@ -2168,6 +2168,10 @@ namespace ts { return result; } + function getExpectedCommaDiagnostic(kind: ParsingContext) { + return kind === ParsingContext.EnumMembers ? Diagnostics.An_enum_member_name_must_be_followed_by_a_or : undefined; + } + interface MissingList extends NodeArray { isMissingList: true; } diff --git a/tests/baselines/reference/enumErrors.errors.txt b/tests/baselines/reference/enumErrors.errors.txt index 49205e3630e..6c43f318389 100644 --- a/tests/baselines/reference/enumErrors.errors.txt +++ b/tests/baselines/reference/enumErrors.errors.txt @@ -11,9 +11,19 @@ tests/cases/conformance/enums/enumErrors.ts(35,9): error TS2553: Computed values tests/cases/conformance/enums/enumErrors.ts(36,9): error TS2553: Computed values are not permitted in an enum with string valued members. tests/cases/conformance/enums/enumErrors.ts(37,9): error TS2553: Computed values are not permitted in an enum with string valued members. tests/cases/conformance/enums/enumErrors.ts(38,9): error TS2553: Computed values are not permitted in an enum with string valued members. +tests/cases/conformance/enums/enumErrors.ts(46,18): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(47,24): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(47,26): error TS2452: An enum member cannot have a numeric name. +tests/cases/conformance/enums/enumErrors.ts(48,28): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(48,30): error TS2452: An enum member cannot have a numeric name. +tests/cases/conformance/enums/enumErrors.ts(48,31): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(51,16): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(51,22): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(51,30): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(51,33): error TS2452: An enum member cannot have a numeric name. -==== tests/cases/conformance/enums/enumErrors.ts (13 errors) ==== +==== tests/cases/conformance/enums/enumErrors.ts (23 errors) ==== // Enum named with PredefinedTypes enum any { } ~~~ @@ -79,4 +89,36 @@ tests/cases/conformance/enums/enumErrors.ts(38,9): error TS2553: Computed values ~~~~~ !!! error TS2553: Computed values are not permitted in an enum with string valued members. } + + // Enum with incorrect syntax + enum E13 { + postComma, + postValueComma = 1, + + postSemicolon; + ~ +!!! error TS1357: An enum member name must be followed by a ',' or '='. + postColonValueComma: 2, + ~ +!!! error TS1357: An enum member name must be followed by a ',' or '='. + ~ +!!! error TS2452: An enum member cannot have a numeric name. + postColonValueSemicolon: 3; + ~ +!!! error TS1357: An enum member name must be followed by a ',' or '='. + ~ +!!! error TS2452: An enum member cannot have a numeric name. + ~ +!!! error TS1357: An enum member name must be followed by a ',' or '='. + }; + + enum E14 { a, b: any "hello" += 1, c, d} + ~ +!!! error TS1357: An enum member name must be followed by a ',' or '='. + ~~~~~~~ +!!! error TS1357: An enum member name must be followed by a ',' or '='. + ~~ +!!! error TS1357: An enum member name must be followed by a ',' or '='. + ~ +!!! error TS2452: An enum member cannot have a numeric name. \ No newline at end of file diff --git a/tests/baselines/reference/enumErrors.js b/tests/baselines/reference/enumErrors.js index 17b67864c70..64a884a0979 100644 --- a/tests/baselines/reference/enumErrors.js +++ b/tests/baselines/reference/enumErrors.js @@ -38,6 +38,18 @@ enum E12 { D = {}, E = 1 + 1, } + +// Enum with incorrect syntax +enum E13 { + postComma, + postValueComma = 1, + + postSemicolon; + postColonValueComma: 2, + postColonValueSemicolon: 3; +}; + +enum E14 { a, b: any "hello" += 1, c, d} //// [enumErrors.js] @@ -88,3 +100,25 @@ var E12; E12[E12["D"] = 0] = "D"; E12[E12["E"] = 0] = "E"; })(E12 || (E12 = {})); +// Enum with incorrect syntax +var E13; +(function (E13) { + E13[E13["postComma"] = 0] = "postComma"; + E13[E13["postValueComma"] = 1] = "postValueComma"; + E13[E13["postSemicolon"] = 2] = "postSemicolon"; + E13[E13["postColonValueComma"] = 3] = "postColonValueComma"; + E13[E13[2] = 4] = 2; + E13[E13["postColonValueSemicolon"] = 5] = "postColonValueSemicolon"; + E13[E13[3] = 6] = 3; +})(E13 || (E13 = {})); +; +var E14; +(function (E14) { + E14[E14["a"] = 0] = "a"; + E14[E14["b"] = 1] = "b"; + E14[E14["any"] = 2] = "any"; + E14[E14["hello"] = 3] = "hello"; + E14[E14[1] = 4] = 1; + E14[E14["c"] = 5] = "c"; + E14[E14["d"] = 6] = "d"; +})(E14 || (E14 = {})); diff --git a/tests/baselines/reference/enumErrors.symbols b/tests/baselines/reference/enumErrors.symbols index 3dab3ef5f76..d20fea828b1 100644 --- a/tests/baselines/reference/enumErrors.symbols +++ b/tests/baselines/reference/enumErrors.symbols @@ -91,3 +91,36 @@ enum E12 { >E : Symbol(E12.E, Decl(enumErrors.ts, 36, 11)) } +// Enum with incorrect syntax +enum E13 { +>E13 : Symbol(E13, Decl(enumErrors.ts, 38, 1)) + + postComma, +>postComma : Symbol(E13.postComma, Decl(enumErrors.ts, 41, 10)) + + postValueComma = 1, +>postValueComma : Symbol(E13.postValueComma, Decl(enumErrors.ts, 42, 14)) + + postSemicolon; +>postSemicolon : Symbol(E13.postSemicolon, Decl(enumErrors.ts, 43, 23)) + + postColonValueComma: 2, +>postColonValueComma : Symbol(E13.postColonValueComma, Decl(enumErrors.ts, 45, 18)) +>2 : Symbol(E13[2], Decl(enumErrors.ts, 46, 24)) + + postColonValueSemicolon: 3; +>postColonValueSemicolon : Symbol(E13.postColonValueSemicolon, Decl(enumErrors.ts, 46, 27)) +>3 : Symbol(E13[3], Decl(enumErrors.ts, 47, 28)) + +}; + +enum E14 { a, b: any "hello" += 1, c, d} +>E14 : Symbol(E14, Decl(enumErrors.ts, 48, 2)) +>a : Symbol(E14.a, Decl(enumErrors.ts, 50, 10)) +>b : Symbol(E14.b, Decl(enumErrors.ts, 50, 13)) +>any : Symbol(E14.any, Decl(enumErrors.ts, 50, 16)) +>"hello" : Symbol(E14["hello"], Decl(enumErrors.ts, 50, 20)) +>1 : Symbol(E14[1], Decl(enumErrors.ts, 50, 31)) +>c : Symbol(E14.c, Decl(enumErrors.ts, 50, 34)) +>d : Symbol(E14.d, Decl(enumErrors.ts, 50, 37)) + diff --git a/tests/baselines/reference/enumErrors.types b/tests/baselines/reference/enumErrors.types index 9759ec25390..24859e89b97 100644 --- a/tests/baselines/reference/enumErrors.types +++ b/tests/baselines/reference/enumErrors.types @@ -102,3 +102,37 @@ enum E12 { >1 : 1 } +// Enum with incorrect syntax +enum E13 { +>E13 : E13 + + postComma, +>postComma : E13.postComma + + postValueComma = 1, +>postValueComma : E13.postValueComma +>1 : 1 + + postSemicolon; +>postSemicolon : E13.postSemicolon + + postColonValueComma: 2, +>postColonValueComma : E13.postColonValueComma +>2 : E13.2 + + postColonValueSemicolon: 3; +>postColonValueSemicolon : E13.postColonValueSemicolon +>3 : E13.3 + +}; + +enum E14 { a, b: any "hello" += 1, c, d} +>E14 : E14 +>a : E14.a +>b : E14.b +>any : E14.any +>"hello" : E14.hello +>1 : E14.1 +>c : E14.c +>d : E14.d + diff --git a/tests/cases/conformance/enums/enumErrors.ts b/tests/cases/conformance/enums/enumErrors.ts index 99de3d4bc0d..16360574167 100644 --- a/tests/cases/conformance/enums/enumErrors.ts +++ b/tests/cases/conformance/enums/enumErrors.ts @@ -37,3 +37,15 @@ enum E12 { D = {}, E = 1 + 1, } + +// Enum with incorrect syntax +enum E13 { + postComma, + postValueComma = 1, + + postSemicolon; + postColonValueComma: 2, + postColonValueSemicolon: 3; +}; + +enum E14 { a, b: any "hello" += 1, c, d} From 92dbb65376b5f1df609170c1216aa62d1389b596 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Mon, 9 Sep 2019 22:29:48 -0400 Subject: [PATCH 14/48] Accepted a few more baselines, why not --- tests/baselines/reference/constEnum2.errors.txt | 4 ++-- .../parserComputedPropertyName30.errors.txt | 4 ++-- tests/baselines/reference/parserEnum5.errors.txt | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/baselines/reference/constEnum2.errors.txt b/tests/baselines/reference/constEnum2.errors.txt index 4748b1840b8..3a3036404bf 100644 --- a/tests/baselines/reference/constEnum2.errors.txt +++ b/tests/baselines/reference/constEnum2.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/constEnums/constEnum2.ts(10,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values. tests/cases/conformance/constEnums/constEnum2.ts(11,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values. -tests/cases/conformance/constEnums/constEnum2.ts(12,5): error TS1005: ',' expected. +tests/cases/conformance/constEnums/constEnum2.ts(12,5): error TS1357: An enum member name must be followed by a ',' or '='. tests/cases/conformance/constEnums/constEnum2.ts(12,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values. @@ -22,7 +22,7 @@ tests/cases/conformance/constEnums/constEnum2.ts(12,9): error TS2474: const enum !!! error TS2474: const enum member initializers can only contain literal values and other computed enum values. g = CONST, ~ -!!! error TS1005: ',' expected. +!!! error TS1357: An enum member name must be followed by a ',' or '='. ~~~~~ !!! error TS2474: const enum member initializers can only contain literal values and other computed enum values. } \ No newline at end of file diff --git a/tests/baselines/reference/parserComputedPropertyName30.errors.txt b/tests/baselines/reference/parserComputedPropertyName30.errors.txt index 94ab013c8be..bf99b4888a4 100644 --- a/tests/baselines/reference/parserComputedPropertyName30.errors.txt +++ b/tests/baselines/reference/parserComputedPropertyName30.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(3,5): error TS1164: Computed property names are not allowed in enums. tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(3,11): error TS2304: Cannot find name 'id'. -tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1005: ',' expected. +tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1357: An enum member name must be followed by a ',' or '='. tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1164: Computed property names are not allowed in enums. @@ -14,7 +14,7 @@ tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedP !!! error TS2304: Cannot find name 'id'. [e2] = 1 ~ -!!! error TS1005: ',' expected. +!!! error TS1357: An enum member name must be followed by a ',' or '='. ~~~~ !!! error TS1164: Computed property names are not allowed in enums. } \ No newline at end of file diff --git a/tests/baselines/reference/parserEnum5.errors.txt b/tests/baselines/reference/parserEnum5.errors.txt index 6315de88da7..8b052a047d9 100644 --- a/tests/baselines/reference/parserEnum5.errors.txt +++ b/tests/baselines/reference/parserEnum5.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,12): error TS1005: ',' expected. +tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,12): error TS1357: An enum member name must be followed by a ',' or '='. tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,14): error TS2452: An enum member cannot have a numeric name. -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,15): error TS1005: ',' expected. +tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,15): error TS1357: An enum member name must be followed by a ',' or '='. tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,17): error TS2452: An enum member cannot have a numeric name. -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,24): error TS1005: ',' expected. +tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,24): error TS1357: An enum member name must be followed by a ',' or '='. tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,26): error TS2452: An enum member cannot have a numeric name. @@ -10,15 +10,15 @@ tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,26) enum E2 { a, } enum E3 { a: 1, } ~ -!!! error TS1005: ',' expected. +!!! error TS1357: An enum member name must be followed by a ',' or '='. ~ !!! error TS2452: An enum member cannot have a numeric name. enum E1 { a, b: 1, c, d: 2 = 3 } ~ -!!! error TS1005: ',' expected. +!!! error TS1357: An enum member name must be followed by a ',' or '='. ~ !!! error TS2452: An enum member cannot have a numeric name. ~ -!!! error TS1005: ',' expected. +!!! error TS1357: An enum member name must be followed by a ',' or '='. ~ !!! error TS2452: An enum member cannot have a numeric name. \ No newline at end of file From 686e9a42db5f62901a3da0be7bbc5ef5fd9d529c Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 10 Sep 2019 12:53:17 -0700 Subject: [PATCH 15/48] Do not emit .js files if only d.ts file will be impacted. --- src/compiler/builder.ts | 99 ++++++++++++++----- .../inferred-type-from-transitive-module.js | 1 - 2 files changed, 74 insertions(+), 26 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index d80283ce3cf..1d2f5d2417e 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -60,6 +60,10 @@ namespace ts { * Files pending to be emitted */ affectedFilesPendingEmit?: ReadonlyArray | undefined; + /** + * Files pending to be emitted kind. + */ + affectedFilesPendingEmitKind?: ReadonlyMap | undefined; /** * Current index to retrieve pending affected file */ @@ -70,6 +74,11 @@ namespace ts { hasReusableDiagnostic?: true; } + export const enum BuilderFileEmit { + DtsOnly, + Full + } + /** * State to store the changed files, affected files and cache semantic diagnostics */ @@ -127,7 +136,11 @@ namespace ts { /** * Files pending to be emitted */ - affectedFilesPendingEmit: ReadonlyArray | undefined; + affectedFilesPendingEmit: Path[] | undefined; + /** + * Files pending to be emitted kind. + */ + affectedFilesPendingEmitKind: Map | undefined; /** * Current index to retrieve pending affected file */ @@ -139,7 +152,7 @@ namespace ts { /** * Already seen emitted files */ - seenEmittedFiles: Map | undefined; + seenEmittedFiles: Map | undefined; /** * true if program has been emitted */ @@ -186,7 +199,8 @@ namespace ts { copyEntries(changedFilesSet, state.changedFilesSet); } if (!compilerOptions.outFile && !compilerOptions.out && oldState!.affectedFilesPendingEmit) { - state.affectedFilesPendingEmit = oldState!.affectedFilesPendingEmit; + state.affectedFilesPendingEmit = oldState!.affectedFilesPendingEmit.slice(); + state.affectedFilesPendingEmitKind = cloneMapOrUndefined(oldState!.affectedFilesPendingEmitKind); state.affectedFilesPendingEmitIndex = oldState!.affectedFilesPendingEmitIndex; } } @@ -233,7 +247,7 @@ namespace ts { if (oldCompilerOptions && compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) { // Add all files to affectedFilesPendingEmit since emit changed - addToAffectedFilesPendingEmit(state, newProgram.getSourceFiles().map(f => f.path)); + newProgram.getSourceFiles().forEach(f => addToAffectedFilesPendingEmit(state, f.path, BuilderFileEmit.Full)); Debug.assert(state.seenAffectedFiles === undefined); state.seenAffectedFiles = createMap(); } @@ -295,7 +309,8 @@ namespace ts { newState.semanticDiagnosticsFromOldState = cloneMapOrUndefined(state.semanticDiagnosticsFromOldState); newState.program = state.program; newState.compilerOptions = state.compilerOptions; - newState.affectedFilesPendingEmit = state.affectedFilesPendingEmit; + newState.affectedFilesPendingEmit = state.affectedFilesPendingEmit && state.affectedFilesPendingEmit.slice(); + newState.affectedFilesPendingEmitKind = cloneMapOrUndefined(state.affectedFilesPendingEmitKind); newState.affectedFilesPendingEmitIndex = state.affectedFilesPendingEmitIndex; newState.seenEmittedFiles = cloneMapOrUndefined(state.seenEmittedFiles); newState.programEmitComplete = state.programEmitComplete; @@ -373,19 +388,24 @@ namespace ts { /** * Returns next file to be emitted from files that retrieved semantic diagnostics but did not emit yet */ - function getNextAffectedFilePendingEmit(state: BuilderProgramState): SourceFile | undefined { + function getNextAffectedFilePendingEmit(state: BuilderProgramState) { const { affectedFilesPendingEmit } = state; if (affectedFilesPendingEmit) { const seenEmittedFiles = state.seenEmittedFiles || (state.seenEmittedFiles = createMap()); for (let i = state.affectedFilesPendingEmitIndex!; i < affectedFilesPendingEmit.length; i++) { const affectedFile = Debug.assertDefined(state.program).getSourceFileByPath(affectedFilesPendingEmit[i]); - if (affectedFile && !seenEmittedFiles.has(affectedFile.path)) { - // emit this file - state.affectedFilesPendingEmitIndex = i; - return affectedFile; + if (affectedFile) { + const seenKind = seenEmittedFiles.get(affectedFile.path); + const emitKind = Debug.assertDefined(Debug.assertDefined(state.affectedFilesPendingEmitKind).get(affectedFile.path)); + if (seenKind === undefined || seenKind < emitKind) { + // emit this file + state.affectedFilesPendingEmitIndex = i; + return { affectedFile, emitKind }; + } } } state.affectedFilesPendingEmit = undefined; + state.affectedFilesPendingEmitKind = undefined; state.affectedFilesPendingEmitIndex = undefined; } return undefined; @@ -442,7 +462,7 @@ namespace ts { ); // If not dts emit, nothing more to do if (getEmitDeclarations(state.compilerOptions)) { - addToAffectedFilesPendingEmit(state, [path]); + addToAffectedFilesPendingEmit(state, path, BuilderFileEmit.DtsOnly); } } } @@ -548,7 +568,13 @@ namespace ts { * This is called after completing operation on the next affected file. * The operations here are postponed to ensure that cancellation during the iteration is handled correctly */ - function doneWithAffectedFile(state: BuilderProgramState, affected: SourceFile | Program, isPendingEmit?: boolean, isBuildInfoEmit?: boolean, isEmitResult?: boolean) { + function doneWithAffectedFile( + state: BuilderProgramState, + affected: SourceFile | Program, + emitKind?: BuilderFileEmit, + isPendingEmit?: boolean, + isBuildInfoEmit?: boolean + ) { if (isBuildInfoEmit) { state.emittedBuildInfo = true; } @@ -558,8 +584,8 @@ namespace ts { } else { state.seenAffectedFiles!.set((affected as SourceFile).path, true); - if (isEmitResult) { - (state.seenEmittedFiles || (state.seenEmittedFiles = createMap())).set((affected as SourceFile).path, true); + if (emitKind !== undefined) { + (state.seenEmittedFiles || (state.seenEmittedFiles = createMap())).set((affected as SourceFile).path, emitKind); } if (isPendingEmit) { state.affectedFilesPendingEmitIndex!++; @@ -573,16 +599,23 @@ namespace ts { /** * Returns the result with affected file */ - function toAffectedFileResult(state: BuilderProgramState, result: T, affected: SourceFile | Program, isPendingEmit?: boolean, isBuildInfoEmit?: boolean): AffectedFileResult { - doneWithAffectedFile(state, affected, isPendingEmit, isBuildInfoEmit); + function toAffectedFileResult(state: BuilderProgramState, result: T, affected: SourceFile | Program): AffectedFileResult { + doneWithAffectedFile(state, affected); return { result, affected }; } /** * Returns the result with affected file */ - function toAffectedFileEmitResult(state: BuilderProgramState, result: EmitResult, affected: SourceFile | Program, isPendingEmit?: boolean, isBuildInfoEmit?: boolean): AffectedFileResult { - doneWithAffectedFile(state, affected, isPendingEmit, isBuildInfoEmit, /*isEmitResult*/ true); + function toAffectedFileEmitResult( + state: BuilderProgramState, + result: EmitResult, + affected: SourceFile | Program, + emitKind: BuilderFileEmit, + isPendingEmit?: boolean, + isBuildInfoEmit?: boolean + ): AffectedFileResult { + doneWithAffectedFile(state, affected, emitKind, isPendingEmit, isBuildInfoEmit); return { result, affected }; } @@ -849,11 +882,12 @@ namespace ts { */ function emitNextAffectedFile(writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): AffectedFileResult { let affected = getNextAffectedFile(state, cancellationToken, computeHash); + let emitKind = BuilderFileEmit.Full; let isPendingEmitFile = false; if (!affected) { if (!state.compilerOptions.out && !state.compilerOptions.outFile) { - affected = getNextAffectedFilePendingEmit(state); - if (!affected) { + const pendingAffectedFile = getNextAffectedFilePendingEmit(state); + if (!pendingAffectedFile) { if (state.emittedBuildInfo) { return undefined; } @@ -865,10 +899,12 @@ namespace ts { // Otherwise just affected file affected.emitBuildInfo(writeFile || maybeBind(host, host.writeFile), cancellationToken), affected, + /*emitKind*/ BuilderFileEmit.Full, /*isPendingEmitFile*/ false, /*isBuildInfoEmit*/ true ); } + ({ affectedFile: affected, emitKind } = pendingAffectedFile); isPendingEmitFile = true; } else { @@ -886,10 +922,17 @@ namespace ts { state, // When whole program is affected, do emit only once (eg when --out or --outFile is specified) // Otherwise just affected file - Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected as SourceFile, writeFile || maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers), + Debug.assertDefined(state.program).emit( + affected === state.program ? undefined : affected as SourceFile, + writeFile || maybeBind(host, host.writeFile), + cancellationToken, + emitOnlyDtsFiles || emitKind === BuilderFileEmit.DtsOnly, + customTransformers + ), affected, + emitKind, isPendingEmitFile, - ); + ); } /** @@ -953,7 +996,7 @@ namespace ts { // Add file to affected file pending emit to handle for later emit time if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) { - addToAffectedFilesPendingEmit(state, [(affected as SourceFile).path]); + addToAffectedFilesPendingEmit(state, (affected as SourceFile).path, BuilderFileEmit.Full); } // Get diagnostics for the affected file if its not ignored @@ -1006,8 +1049,14 @@ namespace ts { } } - function addToAffectedFilesPendingEmit(state: BuilderProgramState, affectedFilesPendingEmit: readonly Path[]) { - state.affectedFilesPendingEmit = concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit); + function addToAffectedFilesPendingEmit(state: BuilderProgramState, affectedFilePendingEmit: Path, kind: BuilderFileEmit) { + if (!state.affectedFilesPendingEmit) state.affectedFilesPendingEmit = []; + if (!state.affectedFilesPendingEmitKind) state.affectedFilesPendingEmitKind = createMap(); + + const existingKind = state.affectedFilesPendingEmitKind.get(affectedFilePendingEmit); + state.affectedFilesPendingEmit.push(affectedFilePendingEmit); + state.affectedFilesPendingEmitKind.set(affectedFilePendingEmit, existingKind || kind); + // affectedFilesPendingEmitIndex === undefined // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files // so start from 0 as array would be affectedFilesPendingEmit diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js index e27d6055603..556f32082f5 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js @@ -26,7 +26,6 @@ import { LazyAction } from './bundling'; export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex")>; -//// [/src/obj/index.js] file written with same contents //// [/src/obj/lazyIndex.d.ts] file written with same contents //// [/src/obj/lazyIndex.js] file written with same contents //// [/src/obj/tsconfig.tsbuildinfo] From 630499eca20db3193752b1d11c3f9a834d5eae24 Mon Sep 17 00:00:00 2001 From: Jack Williams Date: Mon, 2 Sep 2019 23:33:15 +0100 Subject: [PATCH 16/48] Assume void variables are initialized --- src/compiler/checker.ts | 2 +- .../logicalAndOperatorStrictMode.types | 2 +- .../baselines/reference/voidIsInitialized.js | 23 +++++++++++++++ .../reference/voidIsInitialized.symbols | 23 +++++++++++++++ .../reference/voidIsInitialized.types | 29 +++++++++++++++++++ tests/cases/compiler/voidIsInitialized.ts | 12 ++++++++ 6 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/voidIsInitialized.js create mode 100644 tests/baselines/reference/voidIsInitialized.symbols create mode 100644 tests/baselines/reference/voidIsInitialized.types create mode 100644 tests/cases/compiler/voidIsInitialized.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index cfad47b6533..14fcd2eea46 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -18027,7 +18027,7 @@ namespace ts { // the entire control flow graph from the variable's declaration (i.e. when the flow container and // declaration container are the same). const assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || isBindingElement(declaration) || - type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & TypeFlags.AnyOrUnknown) !== 0 || + type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & (TypeFlags.AnyOrUnknown | TypeFlags.Void)) !== 0 || isInTypeQuery(node) || node.parent.kind === SyntaxKind.ExportSpecifier) || node.parent.kind === SyntaxKind.NonNullExpression || declaration.kind === SyntaxKind.VariableDeclaration && (declaration).exclamationToken || diff --git a/tests/baselines/reference/logicalAndOperatorStrictMode.types b/tests/baselines/reference/logicalAndOperatorStrictMode.types index 2d7ef648aee..6bf592c8b7b 100644 --- a/tests/baselines/reference/logicalAndOperatorStrictMode.types +++ b/tests/baselines/reference/logicalAndOperatorStrictMode.types @@ -256,7 +256,7 @@ const v5 = v && v; >v5 : void >v && v : void >v : void ->v : never +>v : void const v6 = v && u; >v6 : void diff --git a/tests/baselines/reference/voidIsInitialized.js b/tests/baselines/reference/voidIsInitialized.js new file mode 100644 index 00000000000..4aaa550d44f --- /dev/null +++ b/tests/baselines/reference/voidIsInitialized.js @@ -0,0 +1,23 @@ +//// [voidIsInitialized.ts] +const x: void = undefined; +const y: void = undefined; + +if(typeof x === "undefined") { + x // no error: assume x2 is initialised +} + +if(typeof y !== "undefined") { + y // no error: do not narrow void +} + + +//// [voidIsInitialized.js] +"use strict"; +var x = undefined; +var y = undefined; +if (typeof x === "undefined") { + x; // no error: assume x2 is initialised +} +if (typeof y !== "undefined") { + y; // no error: do not narrow void +} diff --git a/tests/baselines/reference/voidIsInitialized.symbols b/tests/baselines/reference/voidIsInitialized.symbols new file mode 100644 index 00000000000..23ce56b309f --- /dev/null +++ b/tests/baselines/reference/voidIsInitialized.symbols @@ -0,0 +1,23 @@ +=== tests/cases/compiler/voidIsInitialized.ts === +const x: void = undefined; +>x : Symbol(x, Decl(voidIsInitialized.ts, 0, 5)) +>undefined : Symbol(undefined) + +const y: void = undefined; +>y : Symbol(y, Decl(voidIsInitialized.ts, 1, 5)) +>undefined : Symbol(undefined) + +if(typeof x === "undefined") { +>x : Symbol(x, Decl(voidIsInitialized.ts, 0, 5)) + + x // no error: assume x2 is initialised +>x : Symbol(x, Decl(voidIsInitialized.ts, 0, 5)) +} + +if(typeof y !== "undefined") { +>y : Symbol(y, Decl(voidIsInitialized.ts, 1, 5)) + + y // no error: do not narrow void +>y : Symbol(y, Decl(voidIsInitialized.ts, 1, 5)) +} + diff --git a/tests/baselines/reference/voidIsInitialized.types b/tests/baselines/reference/voidIsInitialized.types new file mode 100644 index 00000000000..a8b5767d2c4 --- /dev/null +++ b/tests/baselines/reference/voidIsInitialized.types @@ -0,0 +1,29 @@ +=== tests/cases/compiler/voidIsInitialized.ts === +const x: void = undefined; +>x : void +>undefined : undefined + +const y: void = undefined; +>y : void +>undefined : undefined + +if(typeof x === "undefined") { +>typeof x === "undefined" : boolean +>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" +>x : void +>"undefined" : "undefined" + + x // no error: assume x2 is initialised +>x : void +} + +if(typeof y !== "undefined") { +>typeof y !== "undefined" : boolean +>typeof y : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" +>y : void +>"undefined" : "undefined" + + y // no error: do not narrow void +>y : void +} + diff --git a/tests/cases/compiler/voidIsInitialized.ts b/tests/cases/compiler/voidIsInitialized.ts new file mode 100644 index 00000000000..b2027c21df3 --- /dev/null +++ b/tests/cases/compiler/voidIsInitialized.ts @@ -0,0 +1,12 @@ +// @strict: true + +const x: void = undefined; +const y: void = undefined; + +if(typeof x === "undefined") { + x // no error: assume x2 is initialised +} + +if(typeof y !== "undefined") { + y // no error: do not narrow void +} From 1d97ae62b63de876c7b73aff2ca152d57f787495 Mon Sep 17 00:00:00 2001 From: Titian Cernicova-Dragomir Date: Wed, 11 Sep 2019 21:20:55 +0300 Subject: [PATCH 17/48] Update src/services/refactors/extractSymbol.ts Fixed typo in comment Co-Authored-By: Orta --- src/services/refactors/extractSymbol.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts index df8be2808ff..8a4003ac4a2 100644 --- a/src/services/refactors/extractSymbol.ts +++ b/src/services/refactors/extractSymbol.ts @@ -1107,7 +1107,7 @@ namespace ts.refactor.extractSymbol { return { renameFilename, renameLocation, edits }; function transformFunctionInitializerAndType(variableType: TypeNode | undefined, initializer: Expression): { variableType: TypeNode | undefined, initializer: Expression } { - // If no contextual type exists there is noting to transfer to the function signature + // If no contextual type exists there is nothing to transfer to the function signature if (variableType === undefined) return { variableType, initializer }; // Only do this for function expressions and arrow functions that are not generic if (!isFunctionExpression(initializer) && !isArrowFunction(initializer) || !!initializer.typeParameters) return { variableType, initializer }; From 4e1768c1707b0a595f51f0c383f18105f83424c7 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Wed, 11 Sep 2019 15:32:58 -0400 Subject: [PATCH 18/48] Added '}' to allowed characters in diagnostic message --- src/compiler/diagnosticMessages.json | 2 +- .../baselines/reference/constEnum2.errors.txt | 4 +-- .../baselines/reference/enumErrors.errors.txt | 28 +++++++++---------- .../parserComputedPropertyName30.errors.txt | 4 +-- .../reference/parserEnum5.errors.txt | 12 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 1c3563c9c11..7aa8c36696c 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1035,7 +1035,7 @@ "category": "Error", "code": 1356 }, - "An enum member name must be followed by a ',' or '='.": { + "An enum member name must be followed by a ',', '=', or '}'.": { "category": "Error", "code": 1357 }, diff --git a/tests/baselines/reference/constEnum2.errors.txt b/tests/baselines/reference/constEnum2.errors.txt index 3a3036404bf..2ab0f624d60 100644 --- a/tests/baselines/reference/constEnum2.errors.txt +++ b/tests/baselines/reference/constEnum2.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/constEnums/constEnum2.ts(10,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values. tests/cases/conformance/constEnums/constEnum2.ts(11,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values. -tests/cases/conformance/constEnums/constEnum2.ts(12,5): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/constEnums/constEnum2.ts(12,5): error TS1357: An enum member name must be followed by a ',', '=', or '}'. tests/cases/conformance/constEnums/constEnum2.ts(12,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values. @@ -22,7 +22,7 @@ tests/cases/conformance/constEnums/constEnum2.ts(12,9): error TS2474: const enum !!! error TS2474: const enum member initializers can only contain literal values and other computed enum values. g = CONST, ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~~~~~ !!! error TS2474: const enum member initializers can only contain literal values and other computed enum values. } \ No newline at end of file diff --git a/tests/baselines/reference/enumErrors.errors.txt b/tests/baselines/reference/enumErrors.errors.txt index 6c43f318389..23b5e97e71b 100644 --- a/tests/baselines/reference/enumErrors.errors.txt +++ b/tests/baselines/reference/enumErrors.errors.txt @@ -11,15 +11,15 @@ tests/cases/conformance/enums/enumErrors.ts(35,9): error TS2553: Computed values tests/cases/conformance/enums/enumErrors.ts(36,9): error TS2553: Computed values are not permitted in an enum with string valued members. tests/cases/conformance/enums/enumErrors.ts(37,9): error TS2553: Computed values are not permitted in an enum with string valued members. tests/cases/conformance/enums/enumErrors.ts(38,9): error TS2553: Computed values are not permitted in an enum with string valued members. -tests/cases/conformance/enums/enumErrors.ts(46,18): error TS1357: An enum member name must be followed by a ',' or '='. -tests/cases/conformance/enums/enumErrors.ts(47,24): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(46,18): error TS1357: An enum member name must be followed by a ',', '=', or '}'. +tests/cases/conformance/enums/enumErrors.ts(47,24): error TS1357: An enum member name must be followed by a ',', '=', or '}'. tests/cases/conformance/enums/enumErrors.ts(47,26): error TS2452: An enum member cannot have a numeric name. -tests/cases/conformance/enums/enumErrors.ts(48,28): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(48,28): error TS1357: An enum member name must be followed by a ',', '=', or '}'. tests/cases/conformance/enums/enumErrors.ts(48,30): error TS2452: An enum member cannot have a numeric name. -tests/cases/conformance/enums/enumErrors.ts(48,31): error TS1357: An enum member name must be followed by a ',' or '='. -tests/cases/conformance/enums/enumErrors.ts(51,16): error TS1357: An enum member name must be followed by a ',' or '='. -tests/cases/conformance/enums/enumErrors.ts(51,22): error TS1357: An enum member name must be followed by a ',' or '='. -tests/cases/conformance/enums/enumErrors.ts(51,30): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/enums/enumErrors.ts(48,31): error TS1357: An enum member name must be followed by a ',', '=', or '}'. +tests/cases/conformance/enums/enumErrors.ts(51,16): error TS1357: An enum member name must be followed by a ',', '=', or '}'. +tests/cases/conformance/enums/enumErrors.ts(51,22): error TS1357: An enum member name must be followed by a ',', '=', or '}'. +tests/cases/conformance/enums/enumErrors.ts(51,30): error TS1357: An enum member name must be followed by a ',', '=', or '}'. tests/cases/conformance/enums/enumErrors.ts(51,33): error TS2452: An enum member cannot have a numeric name. @@ -97,28 +97,28 @@ tests/cases/conformance/enums/enumErrors.ts(51,33): error TS2452: An enum member postSemicolon; ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. postColonValueComma: 2, ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~ !!! error TS2452: An enum member cannot have a numeric name. postColonValueSemicolon: 3; ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~ !!! error TS2452: An enum member cannot have a numeric name. ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. }; enum E14 { a, b: any "hello" += 1, c, d} ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~~~~~~~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~ !!! error TS2452: An enum member cannot have a numeric name. \ No newline at end of file diff --git a/tests/baselines/reference/parserComputedPropertyName30.errors.txt b/tests/baselines/reference/parserComputedPropertyName30.errors.txt index bf99b4888a4..cbb4e7c096e 100644 --- a/tests/baselines/reference/parserComputedPropertyName30.errors.txt +++ b/tests/baselines/reference/parserComputedPropertyName30.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(3,5): error TS1164: Computed property names are not allowed in enums. tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(3,11): error TS2304: Cannot find name 'id'. -tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1357: An enum member name must be followed by a ',', '=', or '}'. tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1164: Computed property names are not allowed in enums. @@ -14,7 +14,7 @@ tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedP !!! error TS2304: Cannot find name 'id'. [e2] = 1 ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~~~~ !!! error TS1164: Computed property names are not allowed in enums. } \ No newline at end of file diff --git a/tests/baselines/reference/parserEnum5.errors.txt b/tests/baselines/reference/parserEnum5.errors.txt index 8b052a047d9..706cac4af4e 100644 --- a/tests/baselines/reference/parserEnum5.errors.txt +++ b/tests/baselines/reference/parserEnum5.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,12): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,12): error TS1357: An enum member name must be followed by a ',', '=', or '}'. tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,14): error TS2452: An enum member cannot have a numeric name. -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,15): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,15): error TS1357: An enum member name must be followed by a ',', '=', or '}'. tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,17): error TS2452: An enum member cannot have a numeric name. -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,24): error TS1357: An enum member name must be followed by a ',' or '='. +tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,24): error TS1357: An enum member name must be followed by a ',', '=', or '}'. tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,26): error TS2452: An enum member cannot have a numeric name. @@ -10,15 +10,15 @@ tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,26) enum E2 { a, } enum E3 { a: 1, } ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~ !!! error TS2452: An enum member cannot have a numeric name. enum E1 { a, b: 1, c, d: 2 = 3 } ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~ !!! error TS2452: An enum member cannot have a numeric name. ~ -!!! error TS1357: An enum member name must be followed by a ',' or '='. +!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'. ~ !!! error TS2452: An enum member cannot have a numeric name. \ No newline at end of file From 3a868af5f538909f54f72debbb5c5161a3df336e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 11 Sep 2019 12:34:20 -0700 Subject: [PATCH 19/48] Fix typo --- src/harness/vfs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/harness/vfs.ts b/src/harness/vfs.ts index 25da3149834..c6931d21611 100644 --- a/src/harness/vfs.ts +++ b/src/harness/vfs.ts @@ -706,7 +706,7 @@ namespace vfs { } /** - * Generates a `FileSet` patch containing all the entries in `chagned` that are not in `base`. + * Generates a `FileSet` patch containing all the entries in `changed` that are not in `base`. */ public static diff(changed: FileSystem, base: FileSystem, options: DiffOptions = {}) { const differences: FileSet = {}; From 07b9715fde05b3d405423a7303ea3d180706cbde Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 4 Sep 2019 13:42:11 -0700 Subject: [PATCH 20/48] Allow .d.ts with --isolatedModules Fixes #29490 --- src/compiler/program.ts | 4 ---- .../reference/isolatedModulesDeclaration.errors.txt | 6 ------ 2 files changed, 10 deletions(-) delete mode 100644 tests/baselines/reference/isolatedModulesDeclaration.errors.txt diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 275acb64641..6a8a36dd590 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -2808,10 +2808,6 @@ namespace ts { } if (options.isolatedModules) { - if (getEmitDeclarations(options)) { - createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules"); - } - if (options.out) { createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules"); } diff --git a/tests/baselines/reference/isolatedModulesDeclaration.errors.txt b/tests/baselines/reference/isolatedModulesDeclaration.errors.txt deleted file mode 100644 index 09a655c6da0..00000000000 --- a/tests/baselines/reference/isolatedModulesDeclaration.errors.txt +++ /dev/null @@ -1,6 +0,0 @@ -error TS5053: Option 'declaration' cannot be specified with option 'isolatedModules'. - - -!!! error TS5053: Option 'declaration' cannot be specified with option 'isolatedModules'. -==== tests/cases/compiler/file1.ts (0 errors) ==== - export var x; \ No newline at end of file From 2692b2e214fa531436a5701e5227c539e987e214 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 4 Sep 2019 15:40:38 -0700 Subject: [PATCH 21/48] Add failing test cases for isolatedModules after enabling declaration emit --- src/testRunner/unittests/tsbuild/helpers.ts | 10 +- .../inferredTypeFromTransitiveModule.ts | 52 ++++++- .../unittests/tscWatch/emitAndErrorUpdates.ts | 144 ++++++++++++++---- ...-transitive-module-with-isolatedModules.js | 82 ++++++++++ ...-transitive-module-with-isolatedModules.js | 135 ++++++++++++++++ 5 files changed, 390 insertions(+), 33 deletions(-) create mode 100644 tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module-with-isolatedModules.js create mode 100644 tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module-with-isolatedModules.js diff --git a/src/testRunner/unittests/tsbuild/helpers.ts b/src/testRunner/unittests/tsbuild/helpers.ts index e33edf289d3..126b8d2f7d5 100644 --- a/src/testRunner/unittests/tsbuild/helpers.ts +++ b/src/testRunner/unittests/tsbuild/helpers.ts @@ -230,7 +230,7 @@ interface Symbol { } } - interface BuildInput { + export interface BuildInput { fs: vfs.FileSystem; tick: () => void; rootNames: readonly string[]; @@ -239,7 +239,7 @@ interface Symbol { baselineBuildInfo?: true; } - function build({ fs, tick, rootNames, modifyFs, baselineSourceMap, baselineBuildInfo }: BuildInput) { + export function tscBuild({ fs, tick, rootNames, modifyFs, baselineSourceMap, baselineBuildInfo }: BuildInput) { const actualReadFileMap = createMap(); modifyFs(fs); tick(); @@ -344,7 +344,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt let host: fakes.SolutionBuilderHost; let initialWrittenFiles: Map; before(() => { - const result = build({ + const result = tscBuild({ fs: projFs().shadow(), tick, rootNames, @@ -390,7 +390,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt tick(); newFs = fs.shadow(); tick(); - ({ actualReadFileMap, host } = build({ + ({ actualReadFileMap, host } = tscBuild({ fs: newFs, tick, rootNames, @@ -429,7 +429,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt }); } it(`Verify emit output file text is same when built clean`, () => { - const { fs, writtenFiles } = build({ + const { fs, writtenFiles } = tscBuild({ fs: newFs.shadow(), tick, rootNames, diff --git a/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts b/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts index 92762dfd49d..5383b7d32be 100644 --- a/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts +++ b/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts @@ -25,7 +25,7 @@ namespace ts { ] }, incrementalDtsChangedBuild: { - modifyFs: fs => replaceText(fs, "/src/bar.ts", "param: string", ""), + modifyFs: changeBarParam, expectedDiagnostics: [ getExpectedDiagnosticForProjectsInBuild("src/tsconfig.json"), [Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, "src/tsconfig.json", "src/obj/bar.js", "src/bar.ts"], @@ -36,5 +36,55 @@ namespace ts { baselineOnly: true, verifyDiagnostics: true }); + + verifyTsbuildOutput({ + scenario: "inferred type from transitive module with isolatedModules", + projFs: () => projFs, + time, + tick, + proj: "inferredTypeFromTransitiveModule", + rootNames: ["/src"], + initialBuild: { modifyFs: changeToIsolatedModules }, + incrementalDtsChangedBuild: { modifyFs: changeBarParam }, + baselineOnly: true, + }); + + it("reports errors in files affected by change in signature", () => { + const { fs, host } = tscBuild({ + fs: projFs.shadow(), + tick, + rootNames: ["/src"], + modifyFs: fs => { + changeToIsolatedModules(fs); + appendText(fs, "/src/lazyIndex.ts", ` +import { default as bar } from './bar'; +bar("hello");`); + } + }); + host.assertErrors(/*empty*/); + + tick(); + const { fs: newFs, host: newHost, writtenFiles } = tscBuild({ + fs: fs.shadow(), + tick, + rootNames: ["/src"], + modifyFs: changeBarParam + }); + // Has errors + newHost.assertErrors({ + message: [Diagnostics.Expected_0_arguments_but_got_1, 0, 1], + location: expectedLocationIndexOf(newFs, "/src/lazyIndex.ts", `"hello"`) + }); + // No written files + assert.equal(writtenFiles.size, 0); + }); }); + + function changeToIsolatedModules(fs: vfs.FileSystem) { + replaceText(fs, "/src/tsconfig.json", `"incremental": true`, `"incremental": true, "isolatedModules": true`); + } + + function changeBarParam(fs: vfs.FileSystem) { + replaceText(fs, "/src/bar.ts", "param: string", ""); + } } diff --git a/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts b/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts index f41b07b157d..908c609e703 100644 --- a/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts +++ b/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts @@ -12,7 +12,8 @@ namespace ts.tscWatch { file, fileStamp: host.getModifiedTime(file.path.replace(".ts", ".js")), errors: builderProgram.getSemanticDiagnostics(watch().getSourceFileByPath(file.path as Path)), - errorsFromOldState: !!state.semanticDiagnosticsFromOldState && state.semanticDiagnosticsFromOldState.has(file.path) + errorsFromOldState: !!state.semanticDiagnosticsFromOldState && state.semanticDiagnosticsFromOldState.has(file.path), + dtsStamp: host.getModifiedTime(file.path.replace(".ts", ".d.ts")) }; } @@ -24,21 +25,36 @@ namespace ts.tscWatch { return find(stampsAndErrors, info => info.file === file)!; } - function verifyOutputFileStampsAndErrors( - file: File, - emitExpected: boolean, - errorRefershExpected: boolean, - beforeChangeFileStampsAndErrors: readonly ReturnType[], - afterChangeFileStampsAndErrors: readonly ReturnType[] - ) { + interface VerifyOutputFileStampAndErrors { + file: File; + jsEmitExpected: boolean; + dtsEmitExpected: boolean; + errorRefershExpected: boolean; + beforeChangeFileStampsAndErrors: readonly ReturnType[]; + afterChangeFileStampsAndErrors: readonly ReturnType[]; + } + function verifyOutputFileStampsAndErrors({ + file, + jsEmitExpected, + dtsEmitExpected, + errorRefershExpected, + beforeChangeFileStampsAndErrors, + afterChangeFileStampsAndErrors + }: VerifyOutputFileStampAndErrors) { const beforeChange = findStampAndErrors(beforeChangeFileStampsAndErrors, file); const afterChange = findStampAndErrors(afterChangeFileStampsAndErrors, file); - if (emitExpected) { + if (jsEmitExpected) { assert.notStrictEqual(afterChange.fileStamp, beforeChange.fileStamp, `Expected emit for file ${file.path}`); } else { assert.strictEqual(afterChange.fileStamp, beforeChange.fileStamp, `Did not expect new emit for file ${file.path}`); } + if (dtsEmitExpected) { + assert.notStrictEqual(afterChange.dtsStamp, beforeChange.dtsStamp, `Expected emit for file ${file.path}`); + } + else { + assert.strictEqual(afterChange.dtsStamp, beforeChange.dtsStamp, `Did not expect new emit for file ${file.path}`); + } if (errorRefershExpected) { if (afterChange.errors !== emptyArray || beforeChange.errors !== emptyArray) { assert.notStrictEqual(afterChange.errors, beforeChange.errors, `Expected new errors for file ${file.path}`); @@ -51,19 +67,22 @@ namespace ts.tscWatch { } } - interface VerifyEmitAndErrorUpdates { - change: (host: WatchedSystem) => void; - getInitialErrors: (watch: Watch) => readonly Diagnostic[] | readonly string[]; - getIncrementalErrors: (watch: Watch) => readonly Diagnostic[] | readonly string[]; - filesWithNewEmit: readonly File[]; - filesWithOnlyErrorRefresh: readonly File[]; - filesNotTouched: readonly File[]; - configFile?: File; + interface VerifyEmitAndErrorUpdatesWorker extends VerifyEmitAndErrorUpdates { + configFile: File; } - - function verifyEmitAndErrorUpdates({ filesWithNewEmit, filesWithOnlyErrorRefresh, filesNotTouched, configFile = config, change, getInitialErrors, getIncrementalErrors }: VerifyEmitAndErrorUpdates) { + function verifyEmitAndErrorUpdatesWorker({ + fileWithChange, + filesWithNewEmit, + filesWithOnlyErrorRefresh, + filesNotTouched, + configFile, + change, + getInitialErrors, + getIncrementalErrors + }: VerifyEmitAndErrorUpdatesWorker) { const nonLibFiles = [...filesWithNewEmit, ...filesWithOnlyErrorRefresh, ...filesNotTouched]; const files = [...nonLibFiles, configFile, libFile]; + const compilerOptions = (JSON.parse(configFile.content).compilerOptions || {}) as CompilerOptions; const host = createWatchedSystem(files, { currentDirectory }); const watch = createWatchOfConfigFile("tsconfig.json", host); checkProgramActualFiles(watch(), [...nonLibFiles.map(f => f.path), libFile.path]); @@ -73,9 +92,77 @@ namespace ts.tscWatch { host.runQueuedTimeoutCallbacks(); checkOutputErrorsIncremental(host, getIncrementalErrors(watch)); const afterChange = getOutputFileStampsAndErrors(host, watch, nonLibFiles); - filesWithNewEmit.forEach(file => verifyOutputFileStampsAndErrors(file, /*emitExpected*/ true, /*errorRefershExpected*/ true, beforeChange, afterChange)); - filesWithOnlyErrorRefresh.forEach(file => verifyOutputFileStampsAndErrors(file, /*emitExpected*/ false, /*errorRefershExpected*/ true, beforeChange, afterChange)); - filesNotTouched.forEach(file => verifyOutputFileStampsAndErrors(file, /*emitExpected*/ false, /*errorRefershExpected*/ false, beforeChange, afterChange)); + filesWithNewEmit.forEach(file => verifyOutputFileStampsAndErrors({ + file, + jsEmitExpected: !compilerOptions.isolatedModules || fileWithChange === file, + dtsEmitExpected: getEmitDeclarations(compilerOptions), + errorRefershExpected: true, + beforeChangeFileStampsAndErrors: beforeChange, + afterChangeFileStampsAndErrors: afterChange + })); + filesWithOnlyErrorRefresh.forEach(file => verifyOutputFileStampsAndErrors({ + file, + jsEmitExpected: false, + dtsEmitExpected: getEmitDeclarations(compilerOptions) && !file.path.endsWith(".d.ts"), + errorRefershExpected: true, + beforeChangeFileStampsAndErrors: beforeChange, + afterChangeFileStampsAndErrors: afterChange + })); + filesNotTouched.forEach(file => verifyOutputFileStampsAndErrors({ + file, + jsEmitExpected: false, + dtsEmitExpected: false, + errorRefershExpected: false, + beforeChangeFileStampsAndErrors: beforeChange, + afterChangeFileStampsAndErrors: afterChange + })); + } + + function changeCompilerOptions(input: VerifyEmitAndErrorUpdates, additionalOptions: CompilerOptions): File { + const configFile = input.configFile || config; + const content = JSON.parse(configFile.content); + content.compilerOptions = { ...content.compilerOptions, ...additionalOptions }; + return { path: configFile.path, content: JSON.stringify(content) }; + } + + interface VerifyEmitAndErrorUpdates { + change: (host: WatchedSystem) => void; + getInitialErrors: (watch: Watch) => readonly Diagnostic[] | readonly string[]; + getIncrementalErrors: (watch: Watch) => readonly Diagnostic[] | readonly string[]; + fileWithChange: File; + filesWithNewEmit: readonly File[]; + filesWithOnlyErrorRefresh: readonly File[]; + filesNotTouched: readonly File[]; + configFile?: File; + } + function verifyEmitAndErrorUpdates(input: VerifyEmitAndErrorUpdates) { + it("with default config", () => { + verifyEmitAndErrorUpdatesWorker({ + ...input, + configFile: input.configFile || config + }); + }); + + it("with default config and --declaration", () => { + verifyEmitAndErrorUpdatesWorker({ + ...input, + configFile: changeCompilerOptions(input, { declaration: true }) + }); + }); + + it("config with --isolatedModules", () => { + verifyEmitAndErrorUpdatesWorker({ + ...input, + configFile: changeCompilerOptions(input, { isolatedModules: true }) + }); + }); + + it("config with --isolatedModules and --declaration", () => { + verifyEmitAndErrorUpdatesWorker({ + ...input, + configFile: changeCompilerOptions(input, { isolatedModules: true, declaration: true }) + }); + }); } describe("deep import changes", () => { @@ -93,6 +180,7 @@ console.log(b.c.d);` addImportedModule(bFile); addImportedModule(cFile); verifyEmitAndErrorUpdates({ + fileWithChange: cFile, filesWithNewEmit, filesWithOnlyErrorRefresh, filesNotTouched: emptyArray, @@ -113,7 +201,7 @@ console.log(b.c.d);` } } - it("updates errors when deep import file changes", () => { + describe("updates errors when deep import file changes", () => { const bFile: File = { path: `${currentDirectory}/b.ts`, content: `import {C} from './c'; @@ -132,7 +220,7 @@ export class B verifyDeepImportChange(bFile, cFile); }); - it("updates errors when deep import through declaration file changes", () => { + describe("updates errors when deep import through declaration file changes", () => { const bFile: File = { path: `${currentDirectory}/b.d.ts`, content: `import {C} from './c'; @@ -152,7 +240,7 @@ export class B }); }); - it("updates errors in file not exporting a deep multilevel import that changes", () => { + describe("updates errors in file not exporting a deep multilevel import that changes", () => { const aFile: File = { path: `${currentDirectory}/a.ts`, content: `export interface Point { @@ -193,6 +281,7 @@ getPoint().c.x;` content: `import "./d";` }; verifyEmitAndErrorUpdates({ + fileWithChange: aFile, filesWithNewEmit: [aFile, bFile], filesWithOnlyErrorRefresh: [cFile, dFile], filesNotTouched: [eFile], @@ -265,6 +354,7 @@ export class Data { filesWithOnlyErrorRefresh.push(lib2Data2); } verifyEmitAndErrorUpdates({ + fileWithChange: lib1ToolsInterface, filesWithNewEmit, filesWithOnlyErrorRefresh, filesNotTouched: emptyArray, @@ -276,11 +366,11 @@ export class Data { ] }); } - it("when there are no circular import and exports", () => { + describe("when there are no circular import and exports", () => { verifyTransitiveExports(lib2Data); }); - it("when there are circular import and exports", () => { + describe("when there are circular import and exports", () => { const lib2Data: File = { path: `${currentDirectory}/lib2/data.ts`, content: `import { ITest } from "lib1/public"; import { Data2 } from "./data2"; diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module-with-isolatedModules.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module-with-isolatedModules.js new file mode 100644 index 00000000000..bf9b03d9b2d --- /dev/null +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module-with-isolatedModules.js @@ -0,0 +1,82 @@ +//// [/src/bar.ts] +interface RawAction { + (...args: any[]): Promise | void; +} +interface ActionFactory { + (target: T): T; +} +declare function foo(): ActionFactory; +export default foo()(function foobar(): void { +}); + +//// [/src/obj/bar.d.ts] +declare const _default: () => void; +export default _default; + + +//// [/src/obj/bar.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = foo()(function foobar() { +}); + + +//// [/src/obj/tsconfig.tsbuildinfo] +{ + "program": { + "fileInfos": { + "../../lib/lib.d.ts": { + "version": "3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };", + "signature": "3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };" + }, + "../bar.ts": { + "version": "747071916-interface RawAction {\r\n (...args: any[]): Promise | void;\r\n}\r\ninterface ActionFactory {\r\n (target: T): T;\r\n}\r\ndeclare function foo(): ActionFactory;\r\nexport default foo()(function foobar(): void {\r\n});", + "signature": "-9232740537-declare const _default: () => void;\r\nexport default _default;\r\n" + }, + "../bundling.ts": { + "version": "-21659820217-export class LazyModule {\r\n constructor(private importCallback: () => Promise) {}\r\n}\r\n\r\nexport class LazyAction<\r\n TAction extends (...args: any[]) => any,\r\n TModule\r\n> {\r\n constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction) {\r\n }\r\n}\r\n", + "signature": "-40032907372-export declare class LazyModule {\r\n private importCallback;\r\n constructor(importCallback: () => Promise);\r\n}\r\nexport declare class LazyAction any, TModule> {\r\n constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction);\r\n}\r\n" + }, + "../global.d.ts": { + "version": "-9780226215-interface PromiseConstructor {\r\n new (): Promise;\r\n}\r\ndeclare var Promise: PromiseConstructor;\r\ninterface Promise {\r\n}", + "signature": "-9780226215-interface PromiseConstructor {\r\n new (): Promise;\r\n}\r\ndeclare var Promise: PromiseConstructor;\r\ninterface Promise {\r\n}" + }, + "../lazyindex.ts": { + "version": "-6956449754-export { default as bar } from './bar';\n", + "signature": "-6224542381-export { default as bar } from './bar';\r\n" + }, + "../index.ts": { + "version": "-11602502901-import { LazyAction, LazyModule } from './bundling';\r\nconst lazyModule = new LazyModule(() =>\r\n import('./lazyIndex')\r\n);\r\nexport const lazyBar = new LazyAction(lazyModule, m => m.bar);", + "signature": "18468008756-import { LazyAction } from './bundling';\r\nexport declare const lazyBar: LazyAction<(param: string) => void, typeof import(\"./lazyIndex\")>;\r\n" + } + }, + "options": { + "target": 1, + "declaration": true, + "outDir": "./", + "incremental": true, + "isolatedModules": true, + "configFilePath": "../tsconfig.json" + }, + "referencedMap": { + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" + ], + "../lazyindex.ts": [ + "../bar.ts" + ] + }, + "exportedModulesMap": { + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" + ], + "../lazyindex.ts": [ + "../bar.ts" + ] + } + }, + "version": "FakeTSVersion" +} + diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module-with-isolatedModules.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module-with-isolatedModules.js new file mode 100644 index 00000000000..3ebfc183fa9 --- /dev/null +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module-with-isolatedModules.js @@ -0,0 +1,135 @@ +//// [/src/obj/bar.d.ts] +declare const _default: (param: string) => void; +export default _default; + + +//// [/src/obj/bar.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = foo()(function foobar(param) { +}); + + +//// [/src/obj/bundling.d.ts] +export declare class LazyModule { + private importCallback; + constructor(importCallback: () => Promise); +} +export declare class LazyAction any, TModule> { + constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction); +} + + +//// [/src/obj/bundling.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var LazyModule = /** @class */ (function () { + function LazyModule(importCallback) { + this.importCallback = importCallback; + } + return LazyModule; +}()); +exports.LazyModule = LazyModule; +var LazyAction = /** @class */ (function () { + function LazyAction(_lazyModule, _getter) { + } + return LazyAction; +}()); +exports.LazyAction = LazyAction; + + +//// [/src/obj/index.d.ts] +import { LazyAction } from './bundling'; +export declare const lazyBar: LazyAction<(param: string) => void, typeof import("./lazyIndex")>; + + +//// [/src/obj/index.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var bundling_1 = require("./bundling"); +var lazyModule = new bundling_1.LazyModule(function () { + return Promise.resolve().then(function () { return require('./lazyIndex'); }); +}); +exports.lazyBar = new bundling_1.LazyAction(lazyModule, function (m) { return m.bar; }); + + +//// [/src/obj/lazyIndex.d.ts] +export { default as bar } from './bar'; + + +//// [/src/obj/lazyIndex.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var bar_1 = require("./bar"); +exports.bar = bar_1.default; + + +//// [/src/obj/tsconfig.tsbuildinfo] +{ + "program": { + "fileInfos": { + "../../lib/lib.d.ts": { + "version": "3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };", + "signature": "3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };" + }, + "../bar.ts": { + "version": "5936740878-interface RawAction {\r\n (...args: any[]): Promise | void;\r\n}\r\ninterface ActionFactory {\r\n (target: T): T;\r\n}\r\ndeclare function foo(): ActionFactory;\r\nexport default foo()(function foobar(param: string): void {\r\n});", + "signature": "11191036521-declare const _default: (param: string) => void;\r\nexport default _default;\r\n" + }, + "../bundling.ts": { + "version": "-21659820217-export class LazyModule {\r\n constructor(private importCallback: () => Promise) {}\r\n}\r\n\r\nexport class LazyAction<\r\n TAction extends (...args: any[]) => any,\r\n TModule\r\n> {\r\n constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction) {\r\n }\r\n}\r\n", + "signature": "-40032907372-export declare class LazyModule {\r\n private importCallback;\r\n constructor(importCallback: () => Promise);\r\n}\r\nexport declare class LazyAction any, TModule> {\r\n constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction);\r\n}\r\n" + }, + "../global.d.ts": { + "version": "-9780226215-interface PromiseConstructor {\r\n new (): Promise;\r\n}\r\ndeclare var Promise: PromiseConstructor;\r\ninterface Promise {\r\n}", + "signature": "-9780226215-interface PromiseConstructor {\r\n new (): Promise;\r\n}\r\ndeclare var Promise: PromiseConstructor;\r\ninterface Promise {\r\n}" + }, + "../lazyindex.ts": { + "version": "-6956449754-export { default as bar } from './bar';\n", + "signature": "-6224542381-export { default as bar } from './bar';\r\n" + }, + "../index.ts": { + "version": "-11602502901-import { LazyAction, LazyModule } from './bundling';\r\nconst lazyModule = new LazyModule(() =>\r\n import('./lazyIndex')\r\n);\r\nexport const lazyBar = new LazyAction(lazyModule, m => m.bar);", + "signature": "18468008756-import { LazyAction } from './bundling';\r\nexport declare const lazyBar: LazyAction<(param: string) => void, typeof import(\"./lazyIndex\")>;\r\n" + } + }, + "options": { + "target": 1, + "declaration": true, + "outDir": "./", + "incremental": true, + "isolatedModules": true, + "configFilePath": "../tsconfig.json" + }, + "referencedMap": { + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" + ], + "../lazyindex.ts": [ + "../bar.ts" + ] + }, + "exportedModulesMap": { + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" + ], + "../lazyindex.ts": [ + "../bar.ts" + ] + } + }, + "version": "FakeTSVersion" +} + +//// [/src/tsconfig.json] +{ + "compilerOptions": { + "target": "es5", + "declaration": true, + "outDir": "obj", + "incremental": true, "isolatedModules": true + } +} + From 0019cee6de55842fe56d8e58ab4f85a8c2adabd2 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 11 Sep 2019 12:11:59 -0700 Subject: [PATCH 22/48] Handle --isolatedModules and d.ts emit in the builder --- src/compiler/builder.ts | 32 +++++++++++++++++-- src/compiler/builderState.ts | 2 +- ...-transitive-module-with-isolatedModules.js | 18 +++++++++-- ...-transitive-module-with-isolatedModules.js | 10 +++++- 4 files changed, 55 insertions(+), 7 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index 653832c8dbd..72526fc4b90 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -173,8 +173,7 @@ namespace ts { const compilerOptions = newProgram.getCompilerOptions(); state.compilerOptions = compilerOptions; // With --out or --outFile, any change affects all semantic diagnostics so no need to cache them - // With --isolatedModules, emitting changed file doesnt emit dependent files so we cant know of dependent files to retrieve errors so dont cache the errors - if (!compilerOptions.outFile && !compilerOptions.out && !compilerOptions.isolatedModules) { + if (!compilerOptions.outFile && !compilerOptions.out) { state.semanticDiagnosticsPerFile = createMap(); } state.changedFilesSet = createMap(); @@ -483,16 +482,43 @@ namespace ts { return !state.semanticDiagnosticsFromOldState.size; } + function isChangedSignagure(state: BuilderProgramState, path: Path) { + const newSignature = Debug.assertDefined(state.currentAffectedFilesSignatures).get(path); + const oldSignagure = Debug.assertDefined(state.fileInfos.get(path)).signature; + return newSignature !== oldSignagure; + } + /** * Iterate on referencing modules that export entities from affected file */ function forEachReferencingModulesOfExportOfAffectedFile(state: BuilderProgramState, affectedFile: SourceFile, fn: (state: BuilderProgramState, filePath: Path) => boolean) { // If there was change in signature (dts output) for the changed file, // then only we need to handle pending file emit - if (!state.exportedModulesMap || state.affectedFiles!.length === 1 || !state.changedFilesSet.has(affectedFile.path)) { + if (!state.exportedModulesMap || !state.changedFilesSet.has(affectedFile.path)) { return; } + if (!isChangedSignagure(state, affectedFile.path)) return; + + // Since isolated modules dont change js files, files affected by change in signature is itself + // But we need to cleanup semantic diagnostics and queue dts emit for affected files + if (state.compilerOptions.isolatedModules) { + const seenFileNamesMap = createMap(); + seenFileNamesMap.set(affectedFile.path, true); + const queue = BuilderState.getReferencedByPaths(state, affectedFile.resolvedPath); + while (queue.length > 0) { + const currentPath = queue.pop()!; + if (!seenFileNamesMap.has(currentPath)) { + seenFileNamesMap.set(currentPath, true); + const result = fn(state, currentPath); + if (result && isChangedSignagure(state, currentPath)) { + const currentSourceFile = Debug.assertDefined(state.program).getSourceFileByPath(currentPath)!; + queue.push(...BuilderState.getReferencedByPaths(state, currentSourceFile.resolvedPath)); + } + } + } + } + Debug.assert(!!state.currentAffectedFilesExportedModulesMap); const seenFileAndExportsOfFile = createMap(); // Go through exported modules from cache first diff --git a/src/compiler/builderState.ts b/src/compiler/builderState.ts index 189d801777d..b34a0bf8370 100644 --- a/src/compiler/builderState.ts +++ b/src/compiler/builderState.ts @@ -466,7 +466,7 @@ namespace ts.BuilderState { /** * Gets the files referenced by the the file path */ - function getReferencedByPaths(state: Readonly, referencedFilePath: Path) { + export function getReferencedByPaths(state: Readonly, referencedFilePath: Path) { return arrayFrom(mapDefinedIterator(state.referencedMap!.entries(), ([filePath, referencesInFile]) => referencesInFile.has(referencedFilePath) ? filePath as Path : undefined )); diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module-with-isolatedModules.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module-with-isolatedModules.js index bf9b03d9b2d..f8dfdc7e146 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module-with-isolatedModules.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module-with-isolatedModules.js @@ -21,6 +21,12 @@ exports.default = foo()(function foobar() { }); +//// [/src/obj/index.d.ts] +import { LazyAction } from './bundling'; +export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex")>; + + +//// [/src/obj/lazyIndex.d.ts] file written with same contents //// [/src/obj/tsconfig.tsbuildinfo] { "program": { @@ -47,7 +53,7 @@ exports.default = foo()(function foobar() { }, "../index.ts": { "version": "-11602502901-import { LazyAction, LazyModule } from './bundling';\r\nconst lazyModule = new LazyModule(() =>\r\n import('./lazyIndex')\r\n);\r\nexport const lazyBar = new LazyAction(lazyModule, m => m.bar);", - "signature": "18468008756-import { LazyAction } from './bundling';\r\nexport declare const lazyBar: LazyAction<(param: string) => void, typeof import(\"./lazyIndex\")>;\r\n" + "signature": "6256067474-import { LazyAction } from './bundling';\r\nexport declare const lazyBar: LazyAction<() => void, typeof import(\"./lazyIndex\")>;\r\n" } }, "options": { @@ -75,7 +81,15 @@ exports.default = foo()(function foobar() { "../lazyindex.ts": [ "../bar.ts" ] - } + }, + "semanticDiagnosticsPerFile": [ + "../../lib/lib.d.ts", + "../bar.ts", + "../bundling.ts", + "../global.d.ts", + "../index.ts", + "../lazyindex.ts" + ] }, "version": "FakeTSVersion" } diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module-with-isolatedModules.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module-with-isolatedModules.js index 3ebfc183fa9..568116485a4 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module-with-isolatedModules.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module-with-isolatedModules.js @@ -118,7 +118,15 @@ exports.bar = bar_1.default; "../lazyindex.ts": [ "../bar.ts" ] - } + }, + "semanticDiagnosticsPerFile": [ + "../../lib/lib.d.ts", + "../bar.ts", + "../bundling.ts", + "../global.d.ts", + "../index.ts", + "../lazyindex.ts" + ] }, "version": "FakeTSVersion" } From fd6fbdf7fe9230b64127fab39b29f7dfcbd7d7ee Mon Sep 17 00:00:00 2001 From: Jesse Trinity <42591254+jessetrinity@users.noreply.github.com> Date: Wed, 11 Sep 2019 15:54:27 -0700 Subject: [PATCH 23/48] Show more items in the navbar (#33040) * show more items in navbar * fixed missing node kind for property assignments * updated navBarNestedCommonJsExports test * updated navigationBarMerging_grandchildren test * updated navigationBarItemsFunctions test * updated navigationBarAnonymousClassAndFunctionExpressions test * updated navigationBarFunctionIndirectlyInVariableDeclaration test * updated navigationBarInitializerSpans test * updated navigationBarItemsPropertiesDefinedInConstructors test * updated tests * change nav icon for properties with function-like initializers * add test case for binding element with function-like initializer * add navigationBarNestedObjectLiterals test * add navigationBarFunctionLikePropertyAssignments test * made some silly names less silly (?) * added SpreadAssignments and ShorthandPropertyAssignments * new wording for primary menu items --- src/services/navigationBar.ts | 76 +++++----- src/services/utilities.ts | 5 + .../fourslash/navbarNestedCommonJsExports.ts | 18 ++- ...BarAnonymousClassAndFunctionExpressions.ts | 4 +- .../fourslash/navigationBarAssignmentTypes.ts | 64 ++++++++ ...FunctionIndirectlyInVariableDeclaration.ts | 48 +++++- ...ationBarFunctionLikePropertyAssignments.ts | 91 ++++++++++++ .../navigationBarFunctionPrototype.ts | 38 ++++- .../navigationBarFunctionPrototypeBroken.ts | 35 ++++- .../navigationBarFunctionPrototypeNested.ts | 10 ++ .../navigationBarInitializerSpans.ts | 118 ++++++++++++++- .../navigationBarItemsBindingPatterns.ts | 9 ++ .../fourslash/navigationBarItemsFunctions.ts | 25 +++- ...BarItemsPropertiesDefinedInConstructors.ts | 12 ++ .../navigationBarMerging_grandchildren.ts | 38 ++++- .../navigationBarNestedObjectLiterals.ts | 139 ++++++++++++++++++ 16 files changed, 664 insertions(+), 66 deletions(-) create mode 100644 tests/cases/fourslash/navigationBarAssignmentTypes.ts create mode 100644 tests/cases/fourslash/navigationBarFunctionLikePropertyAssignments.ts create mode 100644 tests/cases/fourslash/navigationBarNestedObjectLiterals.ts diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index fb0a1503214..7a91fcdcad2 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -56,7 +56,7 @@ namespace ts.NavigationBar { curCancellationToken = cancellationToken; curSourceFile = sourceFile; try { - return map(topLevelItems(rootNavigationBarNode(sourceFile)), convertToTopLevelItem); + return map(primaryNavBarMenuItems(rootNavigationBarNode(sourceFile)), convertToPrimaryNavBarMenuItem); } finally { reset(); @@ -111,8 +111,8 @@ namespace ts.NavigationBar { return root; } - function addLeafNode(node: Node): void { - pushChild(parent, emptyNavigationBarNode(node)); + function addLeafNode(node: Node, name?: DeclarationName): void { + pushChild(parent, emptyNavigationBarNode(node, name)); } function emptyNavigationBarNode(node: Node, name?: DeclarationName): NavigationBarNode { @@ -243,23 +243,26 @@ namespace ts.NavigationBar { } break; + case SyntaxKind.ShorthandPropertyAssignment: + addNodeWithRecursiveChild(node, (node).name); + break; + case SyntaxKind.SpreadAssignment: + const { expression } = node; + // Use the expression as the name of the SpreadAssignment, otherwise show as . + isIdentifier(expression) ? addLeafNode(node, expression) : addLeafNode(node); + break; case SyntaxKind.BindingElement: + case SyntaxKind.PropertyAssignment: case SyntaxKind.VariableDeclaration: - const { name, initializer } = node; + const { name, initializer } = node; if (isBindingPattern(name)) { addChildrenRecursively(name); } else if (initializer && isFunctionOrClassExpression(initializer)) { - if (initializer.name) { - // Don't add a node for the VariableDeclaration, just for the initializer. - addChildrenRecursively(initializer); - } - else { - // Add a node for the VariableDeclaration, but not for the initializer. - startNode(node); - forEachChild(initializer, addChildrenRecursively); - endNode(); - } + // Add a node for the VariableDeclaration, but not for the initializer. + startNode(node); + forEachChild(initializer, addChildrenRecursively); + endNode(); } else { addNodeWithRecursiveChild(node, initializer); @@ -699,12 +702,15 @@ namespace ts.NavigationBar { } } - /** Flattens the NavNode tree to a list, keeping only the top-level items. */ - function topLevelItems(root: NavigationBarNode): NavigationBarNode[] { - const topLevel: NavigationBarNode[] = []; + /** Flattens the NavNode tree to a list of items to appear in the primary navbar menu. */ + function primaryNavBarMenuItems(root: NavigationBarNode): NavigationBarNode[] { + // The primary (middle) navbar menu displays the general code navigation hierarchy, similar to the navtree. + // The secondary (right) navbar menu displays the child items of whichever primary item is selected. + // Some less interesting items without their own child navigation items (e.g. a local variable declaration) only show up in the secondary menu. + const primaryNavBarMenuItems: NavigationBarNode[] = []; function recur(item: NavigationBarNode) { - if (isTopLevel(item)) { - topLevel.push(item); + if (shouldAppearInPrimaryNavBarMenu(item)) { + primaryNavBarMenuItems.push(item); if (item.children) { for (const child of item.children) { recur(child); @@ -713,9 +719,16 @@ namespace ts.NavigationBar { } } recur(root); - return topLevel; + return primaryNavBarMenuItems; - function isTopLevel(item: NavigationBarNode): boolean { + /** Determines if a node should appear in the primary navbar menu. */ + function shouldAppearInPrimaryNavBarMenu(item: NavigationBarNode): boolean { + // Items with children should always appear in the primary navbar menu. + if (item.children) { + return true; + } + + // Some nodes are otherwise important enough to always include in the primary navigation menu. switch (navigationBarNodeKind(item)) { case SyntaxKind.ClassDeclaration: case SyntaxKind.ClassExpression: @@ -728,13 +741,6 @@ namespace ts.NavigationBar { case SyntaxKind.JSDocCallbackTag: return true; - case SyntaxKind.Constructor: - case SyntaxKind.MethodDeclaration: - case SyntaxKind.GetAccessor: - case SyntaxKind.SetAccessor: - case SyntaxKind.VariableDeclaration: - return hasSomeImportantChild(item); - case SyntaxKind.ArrowFunction: case SyntaxKind.FunctionDeclaration: case SyntaxKind.FunctionExpression: @@ -755,15 +761,9 @@ namespace ts.NavigationBar { case SyntaxKind.Constructor: return true; default: - return hasSomeImportantChild(item); + return false; } } - function hasSomeImportantChild(item: NavigationBarNode): boolean { - return some(item.children, child => { - const childKind = navigationBarNodeKind(child); - return childKind !== SyntaxKind.VariableDeclaration && childKind !== SyntaxKind.BindingElement; - }); - } } } @@ -778,19 +778,19 @@ namespace ts.NavigationBar { }; } - function convertToTopLevelItem(n: NavigationBarNode): NavigationBarItem { + function convertToPrimaryNavBarMenuItem(n: NavigationBarNode): NavigationBarItem { return { text: getItemName(n.node, n.name), kind: getNodeKind(n.node), kindModifiers: getModifiers(n.node), spans: getSpans(n), - childItems: map(n.children, convertToChildItem) || emptyChildItemArray, + childItems: map(n.children, convertToSecondaryNavBarMenuItem) || emptyChildItemArray, indent: n.indent, bolded: false, grayed: false }; - function convertToChildItem(n: NavigationBarNode): NavigationBarItem { + function convertToSecondaryNavBarMenuItem(n: NavigationBarNode): NavigationBarItem { return { text: getItemName(n.node, n.name), kind: getNodeKind(n.node), diff --git a/src/services/utilities.ts b/src/services/utilities.ts index 95d501de110..91b0a7a1991 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -353,8 +353,13 @@ namespace ts { case SyntaxKind.MethodDeclaration: case SyntaxKind.MethodSignature: return ScriptElementKind.memberFunctionElement; + case SyntaxKind.PropertyAssignment: + const {initializer} = node as PropertyAssignment; + return isFunctionLike(initializer) ? ScriptElementKind.memberFunctionElement : ScriptElementKind.memberVariableElement; case SyntaxKind.PropertyDeclaration: case SyntaxKind.PropertySignature: + case SyntaxKind.ShorthandPropertyAssignment: + case SyntaxKind.SpreadAssignment: return ScriptElementKind.memberVariableElement; case SyntaxKind.IndexSignature: return ScriptElementKind.indexSignatureElement; case SyntaxKind.ConstructSignature: return ScriptElementKind.constructSignatureElement; diff --git a/tests/cases/fourslash/navbarNestedCommonJsExports.ts b/tests/cases/fourslash/navbarNestedCommonJsExports.ts index 3c2d4499172..14c289a3bc2 100644 --- a/tests/cases/fourslash/navbarNestedCommonJsExports.ts +++ b/tests/cases/fourslash/navbarNestedCommonJsExports.ts @@ -29,7 +29,23 @@ verify.navigationBar([ kind: "script", childItems: [ { text: "a", kind: "const" }, - ], + ] }, + { + text: "a", + kind: "const", + childItems: [ + { text: "b", kind: "const"}, + ], + indent: 1, + }, + { + text: "b", + kind: "const", + childItems: [ + { text: "c", kind: "const" }, + ], + indent: 2, + } ]); diff --git a/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts b/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts index ad1ba1e72f9..d35d051eda6 100644 --- a/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts +++ b/tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts @@ -62,7 +62,7 @@ verify.navigationTree({ "childItems": [ { "text": "foo", - "kind": "function" + "kind": "method" } ] } @@ -185,7 +185,7 @@ verify.navigationBar([ "childItems": [ { "text": "foo", - "kind": "function" + "kind": "method" } ], "indent": 2 diff --git a/tests/cases/fourslash/navigationBarAssignmentTypes.ts b/tests/cases/fourslash/navigationBarAssignmentTypes.ts new file mode 100644 index 00000000000..d3ee66f9b08 --- /dev/null +++ b/tests/cases/fourslash/navigationBarAssignmentTypes.ts @@ -0,0 +1,64 @@ +/// +////'use strict' +////const a = { +//// ...b, +//// c, +//// d: 0 +////}; + +verify.navigationTree({ + text: "", + kind: "script", + childItems: [ + { + text: "a", + kind: "const", + childItems: [ + { + text: "b", + kind: "property", + }, + { + text: "c", + kind: "property" + }, + { + text: "d", + kind: "property" + } + ] + } + ] +}); + +verify.navigationBar([ + { + text: "", + kind: "script", + childItems: [ + { + text: "a", + kind: "const" + } + ] + }, + { + text: "a", + kind: "const", + childItems: [ + { + text: "b", + kind: "property", + }, + { + text: "c", + kind: "property" + }, + { + text: "d", + kind: "property" + } + ], + indent: 1 + } +]); diff --git a/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts b/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts index a0ed5174f56..a9b588041dd 100644 --- a/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts +++ b/tests/cases/fourslash/navigationBarFunctionIndirectlyInVariableDeclaration.ts @@ -1,11 +1,16 @@ /// ////var a = { -//// propA: function() {} +//// propA: function() { +//// var c; +//// } ////}; ////var b; ////b = { -//// propB: function() {} +//// propB: function() { +//// // function must not have an empty body to appear top level +//// var d; +//// } ////}; verify.navigationTree({ @@ -18,7 +23,13 @@ verify.navigationTree({ "childItems": [ { "text": "propA", - "kind": "function" + "kind": "method", + "childItems": [ + { + "text": "c", + "kind": "var" + } + ] } ] }, @@ -28,7 +39,13 @@ verify.navigationTree({ }, { "text": "propB", - "kind": "function" + "kind": "method", + "childItems": [ + { + "text": "d", + "kind": "var" + } + ] } ] }); @@ -48,7 +65,7 @@ verify.navigationBar([ }, { "text": "propB", - "kind": "function" + "kind": "method" } ] }, @@ -58,14 +75,31 @@ verify.navigationBar([ "childItems": [ { "text": "propA", - "kind": "function" + "kind": "method" } ], "indent": 1 }, + { + "text": "propA", + "kind": "method", + "childItems": [ + { + "text": "c", + "kind": "var" + } + ], + "indent": 2 + }, { "text": "propB", - "kind": "function", + "kind": "method", + "childItems": [ + { + "text": "d", + "kind": "var" + } + ], "indent": 1 } ]); diff --git a/tests/cases/fourslash/navigationBarFunctionLikePropertyAssignments.ts b/tests/cases/fourslash/navigationBarFunctionLikePropertyAssignments.ts new file mode 100644 index 00000000000..39bc0e1893e --- /dev/null +++ b/tests/cases/fourslash/navigationBarFunctionLikePropertyAssignments.ts @@ -0,0 +1,91 @@ +/// + +////var functions = { +//// a: 0, +//// b: function () { }, +//// c: function x() { }, +//// d: () => { }, +//// e: y(), +//// f() { } +////}; + +verify.navigationTree({ + text: "", + kind: "script", + childItems: [ + { + text: "functions", + kind: "var", + childItems: [ + { + text: "a", + kind: "property" + }, + { + text: "b", + kind: "method" + }, + { + text: "c", + kind: "method" + }, + { + text: "d", + kind: "method" + }, + { + text: "e", + kind: "property" + }, + { + text: "f", + kind: "method" + } + ] + } + ] +}); + +verify.navigationBar([ + { + "text": "", + "kind": "script", + "childItems": [ + { + "text": "functions", + "kind": "var" + } + ] + }, + { + "text": "functions", + "kind": "var", + "childItems": [ + { + "text": "a", + "kind": "property" + }, + { + "text": "b", + "kind": "method" + }, + { + "text": "c", + "kind": "method" + }, + { + "text": "d", + "kind": "method" + }, + { + "text": "e", + "kind": "property" + }, + { + "text": "f", + "kind": "method" + } + ], + "indent": 1 + } +]); \ No newline at end of file diff --git a/tests/cases/fourslash/navigationBarFunctionPrototype.ts b/tests/cases/fourslash/navigationBarFunctionPrototype.ts index fbd3ba2c16f..2806f36dae9 100644 --- a/tests/cases/fourslash/navigationBarFunctionPrototype.ts +++ b/tests/cases/fourslash/navigationBarFunctionPrototype.ts @@ -44,11 +44,11 @@ verify.navigationTree({ "childItems": [ { "text": "get", - "kind": "function" + "kind": "method" }, { "text": "set", - "kind": "function" + "kind": "method" } ] }, @@ -57,11 +57,11 @@ verify.navigationTree({ "childItems": [ { "text": "get", - "kind": "function" + "kind": "method" }, { "text": "set", - "kind": "function" + "kind": "method" } ] } @@ -108,5 +108,33 @@ verify.navigationBar([ } ], "indent": 1 - } + }, + { + "text": "staticProp", + "childItems": [ + { + "text": "get", + "kind": "method" + }, + { + "text": "set", + "kind": "method" + } + ], + "indent": 2 + }, + { + "text": "name", + "childItems": [ + { + "text": "get", + "kind": "method" + }, + { + "text": "set", + "kind": "method" + } + ], + "indent": 2 + } ]); diff --git a/tests/cases/fourslash/navigationBarFunctionPrototypeBroken.ts b/tests/cases/fourslash/navigationBarFunctionPrototypeBroken.ts index 48270dc3aa1..01d70c61170 100644 --- a/tests/cases/fourslash/navigationBarFunctionPrototypeBroken.ts +++ b/tests/cases/fourslash/navigationBarFunctionPrototypeBroken.ts @@ -138,6 +138,28 @@ verify.navigationBar([ } ] }, + { + "text": "G", + "kind": "method", + "childItems": [ + { + "text": "A", + "kind": "method" + } + ], + "indent": 1 + }, + { + "text": "A", + "kind": "method", + "childItems": [ + { + "text": "a", + "kind": "function" + } + ], + "indent": 2 + }, { "text": "A", "kind": "class", @@ -152,5 +174,16 @@ verify.navigationBar([ } ], "indent": 1 - } + }, + { + "text": "A", + "kind": "method", + "childItems": [ + { + "text": "a", + "kind": "function" + } + ], + "indent": 2 + }, ]); diff --git a/tests/cases/fourslash/navigationBarFunctionPrototypeNested.ts b/tests/cases/fourslash/navigationBarFunctionPrototypeNested.ts index dea8b872061..97f9a5a5805 100644 --- a/tests/cases/fourslash/navigationBarFunctionPrototypeNested.ts +++ b/tests/cases/fourslash/navigationBarFunctionPrototypeNested.ts @@ -208,6 +208,16 @@ verify.navigationBar([ ], "indent": 2 }, + { + "text": "x", + "childItems": [ + { + "text": "get", + "kind": "method" + } + ], + "indent": 3 + }, { "text": "D", "kind": "class", diff --git a/tests/cases/fourslash/navigationBarInitializerSpans.ts b/tests/cases/fourslash/navigationBarInitializerSpans.ts index 7b044db9c4c..036b83cf318 100644 --- a/tests/cases/fourslash/navigationBarInitializerSpans.ts +++ b/tests/cases/fourslash/navigationBarInitializerSpans.ts @@ -1,10 +1,25 @@ /// -////const [|[|x|] = () => 0|]; -////const f = [|function [|f|]() {}|]; +////// get the name for the navbar from the variable name rather than the function name +////const [|[|x|] = () => { var [|a|]; }|]; +////const [|[|f|] = function f() { var [|b|]; }|]; +////const [|[|y|] = { [|[|z|]: function z() { var [|c|]; }|] }|]; -const [s0, s0Name, s1, s1Name] = test.spans(); -const sGlobal = { start: 0, length: 45 }; +const [ + s0, + s0Name, + s0Child, + s1, + s1Name, + s1Child, + s2, + s2Name, + s2Child, + s2ChildName, + s2GrandChildName +] = test.spans(); + +const sGlobal = { start: 0, length: 188 }; verify.navigationTree({ text: "", @@ -13,16 +28,54 @@ verify.navigationTree({ childItems: [ { text: "f", - kind: "function", + kind: "const", spans: [s1], nameSpan: s1Name, + childItems: [ + { + text: "b", + kind: "var", + spans: [s1Child], + nameSpan: s1Child, + }, + ], }, { text: "x", kind: "const", spans: [s0], nameSpan: s0Name, + childItems: [ + { + text: "a", + kind: "var", + spans: [s0Child], + nameSpan: s0Child, + }, + ], }, + { + text: "y", + kind: "const", + spans: [s2], + nameSpan: s2Name, + childItems:[ + { + text: "z", + kind: "method", + spans: [s2Child], + nameSpan: s2ChildName, + childItems: [ + { + text: "c", + kind: "var", + spans: [s2GrandChildName], + nameSpan: s2GrandChildName, + }, + ], + }, + ], + } ] }, { checkSpans: true }); @@ -34,7 +87,7 @@ verify.navigationBar([ childItems: [ { text: "f", - kind: "function", + kind: "const", spans: [s1], }, { @@ -42,12 +95,63 @@ verify.navigationBar([ kind: "const", spans: [s0], }, + { + text: "y", + kind: "const", + spans: [s2], + } ], }, { text: "f", - kind: "function", + kind: "const", spans: [s1], + childItems: [ + { + text: "b", + kind: "var", + spans: [s1Child], + }, + ], indent: 1, }, + { + text: "x", + kind: "const", + spans: [s0], + childItems: [ + { + text: "a", + kind: "var", + spans: [s0Child], + }, + ], + indent: 1, + }, + { + text: "y", + kind: "const", + spans: [s2], + childItems: [ + { + text: "z", + kind: "method", + spans: [s2Child], + }, + ], + indent: 1, + }, + { + text: "z", + kind: "method", + spans: [s2Child], + childItems: [ + { + text: "c", + kind: "var", + spans: [s2GrandChildName], + }, + ], + indent: 2, + }, ], { checkSpans: true }); diff --git a/tests/cases/fourslash/navigationBarItemsBindingPatterns.ts b/tests/cases/fourslash/navigationBarItemsBindingPatterns.ts index d2b8b24bcbf..7e64257604c 100644 --- a/tests/cases/fourslash/navigationBarItemsBindingPatterns.ts +++ b/tests/cases/fourslash/navigationBarItemsBindingPatterns.ts @@ -5,6 +5,7 @@ ////let foo1, {a, b} ////const bar1, [c, d] ////var {e, x: [f, g]} = {a:1, x:[]}; +////var { h: i = function j() {} } = obj; verify.navigationTree({ "text": "", @@ -53,6 +54,10 @@ verify.navigationTree({ { "text": "g", "kind": "var" + }, + { + "text": "i", + "kind": "var" } ] }); @@ -105,6 +110,10 @@ verify.navigationBar([ { "text": "g", "kind": "var" + }, + { + "text": "i", + "kind": "var" } ] } diff --git a/tests/cases/fourslash/navigationBarItemsFunctions.ts b/tests/cases/fourslash/navigationBarItemsFunctions.ts index f43cd3effaf..5978a1b940d 100644 --- a/tests/cases/fourslash/navigationBarItemsFunctions.ts +++ b/tests/cases/fourslash/navigationBarItemsFunctions.ts @@ -7,6 +7,9 @@ //// function biz() { //// var z = 10; //// } +//// function qux() { +//// // A function with an empty body should not be top level +//// } //// } ////} //// @@ -46,6 +49,10 @@ verify.navigationTree({ } ] }, + { + "text": "qux", + "kind": "function" + }, { "text": "y", "kind": "var" @@ -110,11 +117,27 @@ verify.navigationBar([ "text": "biz", "kind": "function" }, + { + "text": "qux", + "kind": "function" + }, { "text": "y", "kind": "var" } ], "indent": 2 - } + }, + { + "text": "biz", + "kind": "function", + "childItems": [ + { + "text": "z", + "kind": "var" + } + ], + "indent": 3 + }, + ]); diff --git a/tests/cases/fourslash/navigationBarItemsPropertiesDefinedInConstructors.ts b/tests/cases/fourslash/navigationBarItemsPropertiesDefinedInConstructors.ts index 6e8e0ea350c..d880c6e3844 100644 --- a/tests/cases/fourslash/navigationBarItemsPropertiesDefinedInConstructors.ts +++ b/tests/cases/fourslash/navigationBarItemsPropertiesDefinedInConstructors.ts @@ -78,5 +78,17 @@ verify.navigationBar([ } ], "indent": 1 + }, + { + "text": "constructor", + "kind": "constructor", + "childItems": [ + { + "text": "local", + "kind": "var" + } + ], + "indent": 2 } + ]); diff --git a/tests/cases/fourslash/navigationBarMerging_grandchildren.ts b/tests/cases/fourslash/navigationBarMerging_grandchildren.ts index 732b1794b68..87b70558548 100644 --- a/tests/cases/fourslash/navigationBarMerging_grandchildren.ts +++ b/tests/cases/fourslash/navigationBarMerging_grandchildren.ts @@ -1,5 +1,6 @@ /// +////// Should not merge grandchildren with property assignments ////const o = { //// a: { //// m() {}, @@ -17,8 +18,20 @@ verify.navigationTree({ text: "o", kind: "const", childItems: [ - { text: "m", kind: "method" }, - { text: "m", kind: "method" }, + { + text: "a", + kind: "property", + childItems: [ + { text: "m", kind: "method" } + ] + }, + { + text: "b", + kind: "property", + childItems: [ + { text: "m", kind: "method" } + ] + }, ], }, ] @@ -36,9 +49,26 @@ verify.navigationBar([ text: "o", kind: "const", childItems: [ - { text: "m", kind: "method" }, - { text: "m", kind: "method" }, + { text: "a", kind: "property" }, + { text: "b", kind: "property" }, ], indent: 1, }, + { + text: "a", + kind: "property", + childItems: [ + { text: "m", kind: "method" }, + ], + indent: 2, + }, + { + text: "b", + kind: "property", + childItems: [ + { text: "m", kind: "method" }, + ], + indent: 2, + }, + ]); diff --git a/tests/cases/fourslash/navigationBarNestedObjectLiterals.ts b/tests/cases/fourslash/navigationBarNestedObjectLiterals.ts new file mode 100644 index 00000000000..5c62a7e26fb --- /dev/null +++ b/tests/cases/fourslash/navigationBarNestedObjectLiterals.ts @@ -0,0 +1,139 @@ +/// + +////var a = { +//// b: 0, +//// c: {}, +//// d: { +//// e: 1, +//// }, +//// f: { +//// g: 2, +//// h: { +//// i: 3, +//// }, +//// }, +////} + +verify.navigationTree({ + "text": "", + "kind": "script", + "childItems": [ + { + "text": "a", + "kind": "var", + "childItems": [ + { + "text": "b", + "kind": "property" + }, + { + "text": "c", + "kind": "property" + }, + { + "text": "d", + "kind": "property", + "childItems": [ + { + "text": "e", + "kind": "property" + } + ] + }, + { + "text": "f", + "kind": "property", + "childItems": [ + { + "text": "g", + "kind": "property" + }, + { + "text": "h", + "kind": "property", + "childItems": [ + { + "text": "i", + "kind": "property" + } + ] + } + ] + } + ] + } + ] + }); + +verify.navigationBar([ + { + "text": "", + "kind": "script", + "childItems": [ + { + "text": "a", + "kind": "var" + } + ] + }, + { + "text": "a", + "kind": "var", + "childItems": [ + { + "text": "b", + "kind": "property" + }, + { + "text": "c", + "kind": "property" + }, + { + "text": "d", + "kind": "property" + }, + { + "text": "f", + "kind": "property" + } + ], + "indent": 1 + }, + { + "text": "d", + "kind": "property", + "childItems": [ + { + "text": "e", + "kind": "property" + } + ], + "indent": 2 + }, + { + "text": "f", + "kind": "property", + "childItems": [ + { + "text": "g", + "kind": "property" + }, + { + "text": "h", + "kind": "property" + } + ], + "indent": 2 + }, + { + "text": "h", + "kind": "property", + "childItems": [ + { + "text": "i", + "kind": "property" + } + ], + "indent": 3 + } + ]); \ No newline at end of file From a8d04b2db98f47d38a2ed9346b156b584cccc2c7 Mon Sep 17 00:00:00 2001 From: Arpad Borsos Date: Thu, 12 Sep 2019 13:23:16 +0200 Subject: [PATCH 24/48] Fix `Identifiers: NaN` diagnostic when having JSON SourceFiles This makes sure that the `identifierCount` and `nodeCount` properties are always initialized for `SourceFile` objects. --- src/compiler/parser.ts | 4 ++++ src/testRunner/unittests/programApi.ts | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index c22717bc8e3..f437ca697a8 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -770,7 +770,11 @@ namespace ts { fixupParentReferences(sourceFile); } + sourceFile.nodeCount = nodeCount; + sourceFile.identifierCount = identifierCount; + sourceFile.identifiers = identifiers; sourceFile.parseDiagnostics = parseDiagnostics; + const result = sourceFile as JsonSourceFile; clearState(); return result; diff --git a/src/testRunner/unittests/programApi.ts b/src/testRunner/unittests/programApi.ts index 51e1b8ffa50..5f5251afaf2 100644 --- a/src/testRunner/unittests/programApi.ts +++ b/src/testRunner/unittests/programApi.ts @@ -160,4 +160,22 @@ namespace ts { } } }); + + describe("unittests:: Program.getNodeCount / Program.getIdentifierCount", () => { + it("works on projects that have .json files", () => { + const main = new documents.TextDocument("/main.ts", 'export { version } from "./package.json";'); + const pkg = new documents.TextDocument("/package.json", '{"version": "1.0.0"}'); + + const fs = vfs.createFromFileSystem(Harness.IO, /*ignoreCase*/ false, { documents: [main, pkg], cwd: "/" }); + const program = createProgram(["/main.ts"], { resolveJsonModule: true }, new fakes.CompilerHost(fs, { newLine: NewLineKind.LineFeed })); + + const json = program.getSourceFile("/package.json")!; + assert.equal(json.scriptKind, ScriptKind.JSON); + assert.isNumber(json.nodeCount); + assert.isNumber(json.identifierCount); + + assert.isNotNaN(program.getNodeCount()); + assert.isNotNaN(program.getIdentifierCount()); + }); + }); } From d94d715cdfd33295e5789490d7cd5ec8d3e5b4fd Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> Date: Thu, 12 Sep 2019 13:31:11 -0700 Subject: [PATCH 25/48] Make perf count functions public Previously they were internal --- src/compiler/types.ts | 10 +++++----- tests/baselines/reference/api/tsserverlibrary.d.ts | 9 +++++++++ tests/baselines/reference/api/typescript.d.ts | 9 +++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5acc831f127..1828d056405 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -3007,11 +3007,11 @@ namespace ts { /* @internal */ getClassifiableNames(): UnderscoreEscapedMap; - /* @internal */ getNodeCount(): number; - /* @internal */ getIdentifierCount(): number; - /* @internal */ getSymbolCount(): number; - /* @internal */ getTypeCount(): number; - /* @internal */ getRelationCacheSizes(): { assignable: number, identity: number, subtype: number }; + getNodeCount(): number; + getIdentifierCount(): number; + getSymbolCount(): number; + getTypeCount(): number; + getRelationCacheSizes(): { assignable: number, identity: number, subtype: number }; /* @internal */ getFileProcessingDiagnostics(): DiagnosticCollection; /* @internal */ getResolvedTypeReferenceDirectives(): Map; diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 6620848321c..41ea5756204 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -1883,6 +1883,15 @@ declare namespace ts { * Gets a type checker that can be used to semantically analyze source files in the program. */ getTypeChecker(): TypeChecker; + getNodeCount(): number; + getIdentifierCount(): number; + getSymbolCount(): number; + getTypeCount(): number; + getRelationCacheSizes(): { + assignable: number; + identity: number; + subtype: number; + }; isSourceFileFromExternalLibrary(file: SourceFile): boolean; isSourceFileDefaultLibrary(file: SourceFile): boolean; getProjectReferences(): readonly ProjectReference[] | undefined; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index eaef5a454e2..8402150f2a0 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -1883,6 +1883,15 @@ declare namespace ts { * Gets a type checker that can be used to semantically analyze source files in the program. */ getTypeChecker(): TypeChecker; + getNodeCount(): number; + getIdentifierCount(): number; + getSymbolCount(): number; + getTypeCount(): number; + getRelationCacheSizes(): { + assignable: number; + identity: number; + subtype: number; + }; isSourceFileFromExternalLibrary(file: SourceFile): boolean; isSourceFileDefaultLibrary(file: SourceFile): boolean; getProjectReferences(): readonly ProjectReference[] | undefined; From 93a250b9a6d5c1869d5c7c9d9633d049484b7427 Mon Sep 17 00:00:00 2001 From: kingwl Date: Sat, 14 Sep 2019 02:22:59 +0800 Subject: [PATCH 26/48] fix duplicate async modifier codefix --- src/services/codefixes/fixAwaitInSyncFunction.ts | 13 ++++++++----- .../fourslash/codeFixAwaitInSyncFunction_all.ts | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/services/codefixes/fixAwaitInSyncFunction.ts b/src/services/codefixes/fixAwaitInSyncFunction.ts index e5b3a24dbea..55dd4bd0556 100644 --- a/src/services/codefixes/fixAwaitInSyncFunction.ts +++ b/src/services/codefixes/fixAwaitInSyncFunction.ts @@ -15,11 +15,14 @@ namespace ts.codefix { return [createCodeFixAction(fixId, changes, Diagnostics.Add_async_modifier_to_containing_function, fixId, Diagnostics.Add_all_missing_async_modifiers)]; }, fixIds: [fixId], - getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => { - const nodes = getNodes(diag.file, diag.start); - if (!nodes) return; - doChange(changes, context.sourceFile, nodes); - }), + getAllCodeActions: context => { + const seen = createMap(); + return codeFixAll(context, errorCodes, (changes, diag) => { + const nodes = getNodes(diag.file, diag.start); + if (!nodes || !addToSeen(seen, getNodeId(nodes.insertBefore))) return; + doChange(changes, context.sourceFile, nodes); + }); + }, }); function getReturnType(expr: FunctionDeclaration | MethodDeclaration | FunctionExpression | ArrowFunction) { diff --git a/tests/cases/fourslash/codeFixAwaitInSyncFunction_all.ts b/tests/cases/fourslash/codeFixAwaitInSyncFunction_all.ts index 4b5f7aea0a3..fadb5f30ca8 100644 --- a/tests/cases/fourslash/codeFixAwaitInSyncFunction_all.ts +++ b/tests/cases/fourslash/codeFixAwaitInSyncFunction_all.ts @@ -2,10 +2,12 @@ ////function f() { //// await Promise.resolve(); +//// await Promise.resolve(); ////} //// ////const g = () => { //// await f(); +//// await f(); ////} verify.codeFixAll({ @@ -14,9 +16,11 @@ verify.codeFixAll({ newFileContent: `async function f() { await Promise.resolve(); + await Promise.resolve(); } const g = async () => { await f(); + await f(); }`, }); From 1755db4d8129b521a4a7a4a35882dcb9b9a24040 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Fri, 13 Sep 2019 14:38:10 -0700 Subject: [PATCH 27/48] Add build-eslint-rules to npm prepare script (#33417) * Add build-eslint-rules to local build * Switch to prepare script --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 478538926ce..7a59b95a130 100644 --- a/package.json +++ b/package.json @@ -102,6 +102,7 @@ "xml2js": "^0.4.19" }, "scripts": { + "prepare": "gulp build-eslint-rules", "pretest": "gulp tests", "test": "gulp runtests-parallel --light=false", "test:eslint-rules": "gulp run-eslint-rules-tests", From 99229f88dd785f0eb559a668663843db782eff4e Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Fri, 13 Sep 2019 15:14:25 -0700 Subject: [PATCH 28/48] Update user baselines (#33411) --- .../baselines/reference/docker/azure-sdk.log | 4 ++-- .../reference/docker/office-ui-fabric.log | 7 +++++-- tests/baselines/reference/docker/vscode.log | 20 ++++++++++++++----- tests/baselines/reference/user/jimp.log | 6 +----- tests/baselines/reference/user/prettier.log | 8 +++++--- tests/baselines/reference/user/webpack.log | 10 ++++++++++ tests/cases/user/axios-src/axios-src | 2 +- .../user/create-react-app/create-react-app | 2 +- tests/cases/user/prettier/prettier | 2 +- tests/cases/user/puppeteer/puppeteer | 2 +- tests/cases/user/webpack/webpack | 2 +- 11 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 tests/baselines/reference/user/webpack.log diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index 347a6c188a9..ad0dbf4e9d6 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -24,7 +24,7 @@ Warning: You have changed the public API signature for this project. Updating re dist-esm/index.js → dist/index.js... (!) Unresolved dependencies https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency -tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) +tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js) @azure/cosmos-sign (imported by dist-esm/auth.js) universal-user-agent (imported by dist-esm/common/platform.js) uuid/v4 (imported by dist-esm/ClientContext.js, dist-esm/client/Item/Items.js) @@ -96,7 +96,7 @@ Warning: You have changed the public API signature for this project. Updating re dist-esm/index.js → dist/index.js... (!) Unresolved dependencies https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency -tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) +tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js) @azure/cosmos-sign (imported by dist-esm/auth.js) universal-user-agent (imported by dist-esm/common/platform.js) uuid/v4 (imported by dist-esm/ClientContext.js, dist-esm/client/Item/Items.js) diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log index b36e3e50ffc..67398753776 100644 --- a/tests/baselines/reference/docker/office-ui-fabric.log +++ b/tests/baselines/reference/docker/office-ui-fabric.log @@ -34,6 +34,10 @@ Standard output: @uifabric/migration: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/migration/tsconfig.json @uifabric/migration: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module commonjs --project "/office-ui-fabric-react/packages/migration/tsconfig.json" @uifabric/migration: Done in ?s. +@uifabric/monaco-editor: yarn run vX.X.X +@uifabric/monaco-editor: $ just-scripts build --production --lint +@uifabric/monaco-editor: [XX:XX:XX XM] ■ Removing [lib] +@uifabric/monaco-editor: Done in ?s. @uifabric/set-version: yarn run vX.X.X @uifabric/set-version: $ just-scripts build --production --lint @uifabric/set-version: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts] @@ -84,7 +88,6 @@ Standard output: @uifabric/merge-styles: PASS src/Stylesheet.test.ts @uifabric/merge-styles: PASS src/extractStyleParts.test.ts @uifabric/merge-styles: PASS src/server.test.ts -@uifabric/merge-styles: PASS src/fontFace.test.ts @uifabric/merge-styles: [XX:XX:XX XM] ■ Extracting Public API surface from '/office-ui-fabric-react/packages/merge-styles/lib/index.d.ts' @uifabric/merge-styles: Done in ?s. @uifabric/jest-serializer-merge-styles: yarn run vX.X.X @@ -223,7 +226,7 @@ Standard output: Standard error: info cli using local version of lerna lerna notice cli vX.X.X -lerna info Executing command in 41 packages: "yarn run build --production --lint" +lerna info Executing command in 42 packages: "yarn run build --production --lint" @uifabric/codepen-loader: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. @uifabric/codepen-loader: Force exiting Jest @uifabric/codepen-loader: diff --git a/tests/baselines/reference/docker/vscode.log b/tests/baselines/reference/docker/vscode.log index 8bc85ffef12..fdd7db9d713 100644 --- a/tests/baselines/reference/docker/vscode.log +++ b/tests/baselines/reference/docker/vscode.log @@ -1,14 +1,24 @@ -Exit Code: 0 +Exit Code: 1 Standard output: yarn run vX.X.X $ gulp compile --max_old_space_size=4095 [XX:XX:XX] Node flags detected: --max_old_space_size=4095 [XX:XX:XX] Using gulpfile /vscode/gulpfile.js -Done in ?s. +info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. Standard error: -{"type":"warning","data":"package.json: No license field"} -{"type":"warning","data":"../package.json: No license field"} -{"type":"warning","data":"vscode-web@X.X.X: No license field"} +[XX:XX:XX] 'compile' errored after ?s +[XX:XX:XX] TypeError: Cannot read property 'text' of undefined + at DeclarationResolver._getDeclarationSourceFile (/vscode/build/monaco/api.js:519:75) + at DeclarationResolver.getDeclarationSourceFile (/vscode/build/monaco/api.js:493:52) + at sourceFileGetter (/vscode/build/monaco/api.js:525:53) + at lines.forEach.line (/vscode/build/monaco/api.js:330:32) + at Array.forEach () + at generateDeclarationFile (/vscode/build/monaco/api.js:319:11) + at _run (/vscode/build/monaco/api.js:438:15) + at Object.run3 (/vscode/build/monaco/api.js:526:12) + at MonacoGenerator._run (/vscode/build/lib/compilation.js:142:27) + at MonacoGenerator.execute (/vscode/build/lib/compilation.js:154:29) +error Command failed with exit code 1. diff --git a/tests/baselines/reference/user/jimp.log b/tests/baselines/reference/user/jimp.log index 94ca297844b..d9a47363e22 100644 --- a/tests/baselines/reference/user/jimp.log +++ b/tests/baselines/reference/user/jimp.log @@ -1,10 +1,6 @@ Exit Code: 1 Standard output: -node_modules/@jimp/core/index.d.ts(200,3): error TS2411: Property 'class' of type 'undefined' is not assignable to string index type 'Function'. -node_modules/@jimp/core/index.d.ts(201,3): error TS2411: Property 'constants' of type 'undefined' is not assignable to string index type 'Function'. -node_modules/@jimp/core/index.d.ts(255,42): error TS2344: Type 'T' does not satisfy the constraint 'WellFormedPlugin'. - Type 'JimpType | undefined' is not assignable to type 'WellFormedPlugin'. - Type 'undefined' is not assignable to type 'WellFormedPlugin'. +index.ts(1,23): error TS2307: Cannot find module 'jimp'. diff --git a/tests/baselines/reference/user/prettier.log b/tests/baselines/reference/user/prettier.log index 6e7cf800473..743c7a71167 100644 --- a/tests/baselines/reference/user/prettier.log +++ b/tests/baselines/reference/user/prettier.log @@ -244,9 +244,11 @@ src/language-js/printer-estree.js(4201,24): error TS2532: Object is possibly 'un src/language-js/printer-estree.js(4557,5): error TS2345: Argument of type '"" | { type: string; parts: any; } | { type: string; contents: any; }' is not assignable to parameter of type 'string'. Type '{ type: string; parts: any; }' is not assignable to type 'string'. src/language-js/printer-estree.js(4561,16): error TS2345: Argument of type '{ type: string; parts: any; }' is not assignable to parameter of type 'string'. -src/language-js/printer-estree.js(4603,9): error TS2345: Argument of type '{ type: string; parts: any; }' is not assignable to parameter of type 'string'. -src/language-js/printer-estree.js(4905,9): error TS2554: Expected 0-2 arguments, but got 3. -src/language-js/printer-estree.js(6112,7): error TS2769: No overload matches this call. +src/language-js/printer-estree.js(4609,11): error TS2322: Type '{ type: string; id: any; contents: any; break: boolean; expandedStates: any; }' is not assignable to type 'string'. +src/language-js/printer-estree.js(4624,11): error TS2322: Type '{ type: string; parts: any; }' is not assignable to type 'string'. +src/language-js/printer-estree.js(4636,9): error TS2345: Argument of type '{ type: string; parts: any; }' is not assignable to parameter of type 'string'. +src/language-js/printer-estree.js(4923,9): error TS2554: Expected 0-2 arguments, but got 3. +src/language-js/printer-estree.js(6130,7): error TS2769: No overload matches this call. Overload 1 of 2, '(...items: ConcatArray<(childPath: any) => any>[]): ((childPath: any) => any)[]', gave the following error. Argument of type '(string | number)[]' is not assignable to parameter of type 'ConcatArray<(childPath: any) => any>'. Types of property 'slice' are incompatible. diff --git a/tests/baselines/reference/user/webpack.log b/tests/baselines/reference/user/webpack.log new file mode 100644 index 00000000000..d1fbc9df903 --- /dev/null +++ b/tests/baselines/reference/user/webpack.log @@ -0,0 +1,10 @@ +Exit Code: 1 +Standard output: +lib/Compilation.js(575,5): error TS2322: Type 'number | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | ... 29 more ... | "trimRight"' is not assignable to type 'string'. + Type 'number' is not assignable to type 'string'. +lib/Compiler.js(228,48): error TS2345: Argument of type 'number | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | ... 29 more ... | "trimRight"' is not assignable to parameter of type 'string'. + Type 'number' is not assignable to type 'string'. + + + +Standard error: diff --git a/tests/cases/user/axios-src/axios-src b/tests/cases/user/axios-src/axios-src index 6a4a85c57fc..d74385f1c8f 160000 --- a/tests/cases/user/axios-src/axios-src +++ b/tests/cases/user/axios-src/axios-src @@ -1 +1 @@ -Subproject commit 6a4a85c57fcaba912eee61b87ba34d07323bc60c +Subproject commit d74385f1c8f944a6d94ae0680d3841859a2fcb38 diff --git a/tests/cases/user/create-react-app/create-react-app b/tests/cases/user/create-react-app/create-react-app index c9b95047b97..74eb65a4626 160000 --- a/tests/cases/user/create-react-app/create-react-app +++ b/tests/cases/user/create-react-app/create-react-app @@ -1 +1 @@ -Subproject commit c9b95047b979bebe89ee70590b2a32ab67ef68af +Subproject commit 74eb65a46269d5c2cc5483841e271281477c650e diff --git a/tests/cases/user/prettier/prettier b/tests/cases/user/prettier/prettier index 9f5bd298db2..e83b4537fea 160000 --- a/tests/cases/user/prettier/prettier +++ b/tests/cases/user/prettier/prettier @@ -1 +1 @@ -Subproject commit 9f5bd298db26f76e95ad17f8406edd7ebefacc5a +Subproject commit e83b4537feaa6c063a1598b8d3972b6ad600f2a7 diff --git a/tests/cases/user/puppeteer/puppeteer b/tests/cases/user/puppeteer/puppeteer index c2651c2b5cc..a5f03ce1c85 160000 --- a/tests/cases/user/puppeteer/puppeteer +++ b/tests/cases/user/puppeteer/puppeteer @@ -1 +1 @@ -Subproject commit c2651c2b5cc888ebd0ca6be87063d9f98b9eb59c +Subproject commit a5f03ce1c85c2630739f2a894a303c68632aa250 diff --git a/tests/cases/user/webpack/webpack b/tests/cases/user/webpack/webpack index 77cd3d0cff3..e4c7d8c0ae0 160000 --- a/tests/cases/user/webpack/webpack +++ b/tests/cases/user/webpack/webpack @@ -1 +1 @@ -Subproject commit 77cd3d0cff39def2f8bd6355dcd270dd80bc5da2 +Subproject commit e4c7d8c0ae0c93306f07920bc28fe72119bc098a From 038d95144d8b93c2799d1732181c89c3d84362d5 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 13 Sep 2019 16:14:33 -0700 Subject: [PATCH 29/48] Remove all submodules - just force clone and reset on run instead (#33425) --- .gitignore | 12 +++++- .gitmodules | 40 ------------------- src/testRunner/externalCompileRunner.ts | 15 ++++--- .../TypeScript-Node-Starter | 1 - .../user/TypeScript-Node-Starter/test.json | 1 + .../TypeScript-React-Native-Starter | 1 - .../TypeScript-React-Native-Starter/test.json | 1 + .../TypeScript-React-Starter | 1 - .../user/TypeScript-React-Starter/test.json | 1 + .../TypeScript-Vue-Starter | 1 - .../user/TypeScript-Vue-Starter/test.json | 1 + .../TypeScript-WeChat-Starter | 1 - .../user/TypeScript-WeChat-Starter/test.json | 1 + tests/cases/user/axios-src/axios-src | 1 - tests/cases/user/axios-src/test.json | 1 + .../user/create-react-app/create-react-app | 1 - tests/cases/user/create-react-app/test.json | 1 + tests/cases/user/prettier/prettier | 1 - tests/cases/user/prettier/test.json | 1 + tests/cases/user/puppeteer/puppeteer | 1 - tests/cases/user/puppeteer/test.json | 1 + tests/cases/user/webpack/test.json | 1 + tests/cases/user/webpack/webpack | 1 - 23 files changed, 31 insertions(+), 56 deletions(-) delete mode 160000 tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter delete mode 160000 tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter delete mode 160000 tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter delete mode 160000 tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter delete mode 160000 tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter delete mode 160000 tests/cases/user/axios-src/axios-src delete mode 160000 tests/cases/user/create-react-app/create-react-app delete mode 160000 tests/cases/user/prettier/prettier delete mode 160000 tests/cases/user/puppeteer/puppeteer delete mode 160000 tests/cases/user/webpack/webpack diff --git a/.gitignore b/.gitignore index a220522b5f0..da243079549 100644 --- a/.gitignore +++ b/.gitignore @@ -81,4 +81,14 @@ tests/cases/user/*/**/*.d.ts tests/baselines/reference/dt .failed-tests TEST-results.xml -package-lock.json \ No newline at end of file +package-lock.json +tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter +tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter +tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter +tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter +tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter +tests/cases/user/create-react-app/create-react-app +tests/cases/user/webpack/webpack +tests/cases/user/puppeteer/puppeteer +tests/cases/user/axios-src/axios-src +tests/cases/user/prettier/prettier \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 0e4e0b3ed77..e69de29bb2d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,40 +0,0 @@ -[submodule "tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter"] - path = tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter - url = https://github.com/Microsoft/TypeScript-React-Starter - ignore = all -[submodule "tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter"] - path = tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter - url = https://github.com/Microsoft/TypeScript-Node-Starter.git - ignore = all -[submodule "tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter"] - path = tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter - url = https://github.com/Microsoft/TypeScript-React-Native-Starter.git - ignore = all -[submodule "tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter"] - path = tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter - url = https://github.com/Microsoft/TypeScript-Vue-Starter.git - ignore = all -[submodule "tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter"] - path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter - url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git - ignore = all -[submodule "tests/cases/user/create-react-app/create-react-app"] - path = tests/cases/user/create-react-app/create-react-app - url = https://github.com/facebook/create-react-app.git - ignore = all -[submodule "tests/cases/user/webpack/webpack"] - path = tests/cases/user/webpack/webpack - url = https://github.com/webpack/webpack.git - ignore = all -[submodule "tests/cases/user/puppeteer/puppeteer"] - path = tests/cases/user/puppeteer/puppeteer - url = https://github.com/GoogleChrome/puppeteer.git - ignore = all -[submodule "tests/cases/user/axios-src/axios-src"] - path = tests/cases/user/axios-src/axios-src - url = https://github.com/axios/axios.git - ignore = all -[submodule "tests/cases/user/prettier/prettier"] - path = tests/cases/user/prettier/prettier - url = https://github.com/prettier/prettier.git - ignore = all diff --git a/src/testRunner/externalCompileRunner.ts b/src/testRunner/externalCompileRunner.ts index c9e800713c3..7698fc3f086 100644 --- a/src/testRunner/externalCompileRunner.ts +++ b/src/testRunner/externalCompileRunner.ts @@ -10,6 +10,7 @@ interface ExecResult { interface UserConfig { types: string[]; + cloneUrl: string; path?: string; } @@ -49,13 +50,17 @@ abstract class ExternalCompileRunnerBase extends RunnerBase { const stdio = isWorker ? "pipe" : "inherit"; let types: string[] | undefined; if (fs.existsSync(path.join(cwd, "test.json"))) { - const submoduleDir = path.join(cwd, directoryName); - exec("git", ["reset", "HEAD", "--hard"], { cwd: submoduleDir }); - exec("git", ["clean", "-f"], { cwd: submoduleDir }); - exec("git", ["submodule", "update", "--init", "--remote", "."], { cwd: originalCwd }); - const config = JSON.parse(fs.readFileSync(path.join(cwd, "test.json"), { encoding: "utf8" })) as UserConfig; ts.Debug.assert(!!config.types, "Bad format from test.json: Types field must be present."); + ts.Debug.assert(!!config.cloneUrl, "Bad format from test.json: cloneUrl field must be present."); + const submoduleDir = path.join(cwd, directoryName); + if (!fs.existsSync(submoduleDir)) { + exec("git", ["clone", config.cloneUrl, directoryName], { cwd }); + } + exec("git", ["reset", "HEAD", "--hard"], { cwd: submoduleDir }); + exec("git", ["clean", "-f"], { cwd: submoduleDir }); + exec("git", ["pull", "-f"], { cwd: submoduleDir }); + types = config.types; cwd = config.path ? path.join(cwd, config.path) : submoduleDir; diff --git a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter deleted file mode 160000 index ca14e7ccbca..00000000000 --- a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ca14e7ccbca8a821d3b860ebb6f3c81c68ccbd06 diff --git a/tests/cases/user/TypeScript-Node-Starter/test.json b/tests/cases/user/TypeScript-Node-Starter/test.json index 11d2aa87c59..c37bf34ad15 100644 --- a/tests/cases/user/TypeScript-Node-Starter/test.json +++ b/tests/cases/user/TypeScript-Node-Starter/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/Microsoft/TypeScript-Node-Starter.git", "types": ["jquery"] } diff --git a/tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter b/tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter deleted file mode 160000 index 30acce5e136..00000000000 --- a/tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 30acce5e136e86bcf4eff1df151742f78142aa1a diff --git a/tests/cases/user/TypeScript-React-Native-Starter/test.json b/tests/cases/user/TypeScript-React-Native-Starter/test.json index cbe38c569ee..a87cd1ed89e 100644 --- a/tests/cases/user/TypeScript-React-Native-Starter/test.json +++ b/tests/cases/user/TypeScript-React-Native-Starter/test.json @@ -1,4 +1,5 @@ { + "cloneUrl": "https://github.com/Microsoft/TypeScript-React-Native-Starter.git", "types": ["jest"], "path": "TypeScript-React-Native-Starter/ExampleProject" } diff --git a/tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter b/tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter deleted file mode 160000 index 19c71f2c6a2..00000000000 --- a/tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 19c71f2c6a2b874b1b2bb28a8526b19185b8eece diff --git a/tests/cases/user/TypeScript-React-Starter/test.json b/tests/cases/user/TypeScript-React-Starter/test.json index f3613bf3b01..caa97357cb7 100644 --- a/tests/cases/user/TypeScript-React-Starter/test.json +++ b/tests/cases/user/TypeScript-React-Starter/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/Microsoft/TypeScript-React-Starter", "types": ["jest", "node"] } diff --git a/tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter b/tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter deleted file mode 160000 index 56024cfe414..00000000000 --- a/tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 56024cfe414491a9097e9dd33661a5ad5d51d975 diff --git a/tests/cases/user/TypeScript-Vue-Starter/test.json b/tests/cases/user/TypeScript-Vue-Starter/test.json index e0d4d26bdca..4504c4c1cd5 100644 --- a/tests/cases/user/TypeScript-Vue-Starter/test.json +++ b/tests/cases/user/TypeScript-Vue-Starter/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/Microsoft/TypeScript-Vue-Starter.git", "types": [] } diff --git a/tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter b/tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter deleted file mode 160000 index 3fb8b460102..00000000000 --- a/tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3fb8b4601022f7e2df899eb0ac0178f531e6f027 diff --git a/tests/cases/user/TypeScript-WeChat-Starter/test.json b/tests/cases/user/TypeScript-WeChat-Starter/test.json index e0d4d26bdca..92c47595d1a 100644 --- a/tests/cases/user/TypeScript-WeChat-Starter/test.json +++ b/tests/cases/user/TypeScript-WeChat-Starter/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/Microsoft/TypeScript-React-Starter", "types": [] } diff --git a/tests/cases/user/axios-src/axios-src b/tests/cases/user/axios-src/axios-src deleted file mode 160000 index d74385f1c8f..00000000000 --- a/tests/cases/user/axios-src/axios-src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d74385f1c8f944a6d94ae0680d3841859a2fcb38 diff --git a/tests/cases/user/axios-src/test.json b/tests/cases/user/axios-src/test.json index b6495a1b80b..36c01c495bd 100644 --- a/tests/cases/user/axios-src/test.json +++ b/tests/cases/user/axios-src/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/axios/axios.git", "types": ["node"] } diff --git a/tests/cases/user/create-react-app/create-react-app b/tests/cases/user/create-react-app/create-react-app deleted file mode 160000 index 74eb65a4626..00000000000 --- a/tests/cases/user/create-react-app/create-react-app +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 74eb65a46269d5c2cc5483841e271281477c650e diff --git a/tests/cases/user/create-react-app/test.json b/tests/cases/user/create-react-app/test.json index e0d4d26bdca..98888de7fdb 100644 --- a/tests/cases/user/create-react-app/test.json +++ b/tests/cases/user/create-react-app/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/facebook/create-react-app.git", "types": [] } diff --git a/tests/cases/user/prettier/prettier b/tests/cases/user/prettier/prettier deleted file mode 160000 index e83b4537fea..00000000000 --- a/tests/cases/user/prettier/prettier +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e83b4537feaa6c063a1598b8d3972b6ad600f2a7 diff --git a/tests/cases/user/prettier/test.json b/tests/cases/user/prettier/test.json index b6495a1b80b..7b041238424 100644 --- a/tests/cases/user/prettier/test.json +++ b/tests/cases/user/prettier/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/prettier/prettier.git", "types": ["node"] } diff --git a/tests/cases/user/puppeteer/puppeteer b/tests/cases/user/puppeteer/puppeteer deleted file mode 160000 index a5f03ce1c85..00000000000 --- a/tests/cases/user/puppeteer/puppeteer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a5f03ce1c85c2630739f2a894a303c68632aa250 diff --git a/tests/cases/user/puppeteer/test.json b/tests/cases/user/puppeteer/test.json index e0d4d26bdca..f2e61aca5f9 100644 --- a/tests/cases/user/puppeteer/test.json +++ b/tests/cases/user/puppeteer/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/GoogleChrome/puppeteer.git", "types": [] } diff --git a/tests/cases/user/webpack/test.json b/tests/cases/user/webpack/test.json index e0d4d26bdca..a3fcf317a74 100644 --- a/tests/cases/user/webpack/test.json +++ b/tests/cases/user/webpack/test.json @@ -1,3 +1,4 @@ { + "cloneUrl": "https://github.com/webpack/webpack.git", "types": [] } diff --git a/tests/cases/user/webpack/webpack b/tests/cases/user/webpack/webpack deleted file mode 160000 index e4c7d8c0ae0..00000000000 --- a/tests/cases/user/webpack/webpack +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e4c7d8c0ae0c93306f07920bc28fe72119bc098a From f06f32d945bc5a07a443840ddccc7838a9a49125 Mon Sep 17 00:00:00 2001 From: typescript-bot Date: Mon, 16 Sep 2019 14:10:30 +0000 Subject: [PATCH 30/48] Update user baselines --- .../baselines/reference/docker/azure-sdk.log | 4 +- .../reference/docker/office-ui-fabric.log | 27 ++++- .../user/TypeScript-WeChat-Starter.log | 17 +++ tests/baselines/reference/user/axios-src.log | 22 ++-- tests/baselines/reference/user/jimp.log | 47 +++++++- tests/baselines/reference/user/prettier.log | 114 ++++++++++-------- 6 files changed, 166 insertions(+), 65 deletions(-) create mode 100644 tests/baselines/reference/user/TypeScript-WeChat-Starter.log diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index ad0dbf4e9d6..347a6c188a9 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -24,7 +24,7 @@ Warning: You have changed the public API signature for this project. Updating re dist-esm/index.js → dist/index.js... (!) Unresolved dependencies https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency -tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js) +tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) @azure/cosmos-sign (imported by dist-esm/auth.js) universal-user-agent (imported by dist-esm/common/platform.js) uuid/v4 (imported by dist-esm/ClientContext.js, dist-esm/client/Item/Items.js) @@ -96,7 +96,7 @@ Warning: You have changed the public API signature for this project. Updating re dist-esm/index.js → dist/index.js... (!) Unresolved dependencies https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency -tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js) +tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) @azure/cosmos-sign (imported by dist-esm/auth.js) universal-user-agent (imported by dist-esm/common/platform.js) uuid/v4 (imported by dist-esm/ClientContext.js, dist-esm/client/Item/Items.js) diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log index 67398753776..56cc33c98c6 100644 --- a/tests/baselines/reference/docker/office-ui-fabric.log +++ b/tests/baselines/reference/docker/office-ui-fabric.log @@ -164,6 +164,26 @@ Standard output: @uifabric/utilities: PASS src/keyboard.test.ts @uifabric/utilities: [XX:XX:XX XM] ■ Extracting Public API surface from '/office-ui-fabric-react/packages/utilities/lib/index.d.ts' @uifabric/utilities: Done in ?s. +@uifabric/react-hooks: yarn run vX.X.X +@uifabric/react-hooks: $ just-scripts build --production --lint +@uifabric/react-hooks: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts] +@uifabric/react-hooks: [XX:XX:XX XM] ■ Running tslint +@uifabric/react-hooks: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/tslint/lib/tslintCli.js" --project "/office-ui-fabric-react/packages/react-hooks/tsconfig.json" -t stylish -r /office-ui-fabric-react/node_modules/tslint-microsoft-contrib +@uifabric/react-hooks: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/react-hooks/tsconfig.json +@uifabric/react-hooks: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/react-hooks/tsconfig.json" +@uifabric/react-hooks: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/react-hooks/tsconfig.json +@uifabric/react-hooks: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/react-hooks/tsconfig.json" +@uifabric/react-hooks: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/react-hooks/tsconfig.json +@uifabric/react-hooks: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/react-hooks/tsconfig.json" +@uifabric/react-hooks: [XX:XX:XX XM] ■ Running Jest +@uifabric/react-hooks: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/jest/bin/jest.js" --config "/office-ui-fabric-react/packages/react-hooks/jest.config.js" --passWithNoTests --colors --forceExit +@uifabric/react-hooks: [XX:XX:XX XM] ■ Running Webpack +@uifabric/react-hooks: [XX:XX:XX XM] ■ Webpack Config Path: /office-ui-fabric-react/packages/react-hooks/webpack.config.js +@uifabric/react-hooks: Webpack version: 4.29.5 +@uifabric/react-hooks: PASS src/useConst.test.tsx +@uifabric/react-hooks: PASS src/useId.test.tsx +@uifabric/react-hooks: [XX:XX:XX XM] ■ Extracting Public API surface from '/office-ui-fabric-react/packages/react-hooks/lib/index.d.ts' +@uifabric/react-hooks: Done in ?s. @uifabric/styling: yarn run vX.X.X @uifabric/styling: $ just-scripts build --production --lint @uifabric/styling: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts] @@ -226,7 +246,7 @@ Standard output: Standard error: info cli using local version of lerna lerna notice cli vX.X.X -lerna info Executing command in 42 packages: "yarn run build --production --lint" +lerna info Executing command in 43 packages: "yarn run build --production --lint" @uifabric/codepen-loader: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. @uifabric/codepen-loader: Force exiting Jest @uifabric/codepen-loader: @@ -247,6 +267,11 @@ lerna info Executing command in 42 packages: "yarn run build --production --lint @uifabric/utilities: Force exiting Jest @uifabric/utilities: @uifabric/utilities: Have you considered using `--detectOpenHandles` to detect async operations that kept running after all tests finished? +@uifabric/react-hooks: [XX:XX:XX XM] ▲ One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect +@uifabric/react-hooks: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. +@uifabric/react-hooks: Force exiting Jest +@uifabric/react-hooks: +@uifabric/react-hooks: Have you considered using `--detectOpenHandles` to detect async operations that kept running after all tests finished? @uifabric/styling: [XX:XX:XX XM] ▲ One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect @uifabric/styling: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. @uifabric/styling: Force exiting Jest diff --git a/tests/baselines/reference/user/TypeScript-WeChat-Starter.log b/tests/baselines/reference/user/TypeScript-WeChat-Starter.log new file mode 100644 index 00000000000..825eae70a53 --- /dev/null +++ b/tests/baselines/reference/user/TypeScript-WeChat-Starter.log @@ -0,0 +1,17 @@ +Exit Code: 1 +Standard output: +src/App.test.tsx(5,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig. +src/components/Hello.test.tsx(5,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig. +src/components/Hello.test.tsx(7,3): error TS2304: Cannot find name 'expect'. +src/components/Hello.test.tsx(10,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig. +src/components/Hello.test.tsx(12,3): error TS2304: Cannot find name 'expect'. +src/components/Hello.test.tsx(15,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig. +src/components/Hello.test.tsx(17,3): error TS2304: Cannot find name 'expect'. +src/components/Hello.test.tsx(20,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig. +src/components/Hello.test.tsx(21,3): error TS2304: Cannot find name 'expect'. +src/components/Hello.test.tsx(26,1): error TS2593: Cannot find name 'it'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig. +src/components/Hello.test.tsx(27,3): error TS2304: Cannot find name 'expect'. + + + +Standard error: diff --git a/tests/baselines/reference/user/axios-src.log b/tests/baselines/reference/user/axios-src.log index adc8d7e0a48..d24af763712 100644 --- a/tests/baselines/reference/user/axios-src.log +++ b/tests/baselines/reference/user/axios-src.log @@ -1,18 +1,18 @@ Exit Code: 1 Standard output: lib/adapters/http.js(13,19): error TS2732: Cannot find module './../../package.json'. Consider using '--resolveJsonModule' to import module with '.json' extension -lib/adapters/http.js(87,22): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'. +lib/adapters/http.js(84,22): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'. Type 'undefined' is not assignable to type 'string'. -lib/adapters/http.js(123,17): error TS2532: Object is possibly 'undefined'. -lib/adapters/http.js(123,40): error TS2532: Object is possibly 'undefined'. -lib/adapters/http.js(124,17): error TS2531: Object is possibly 'null'. -lib/adapters/http.js(124,54): error TS2531: Object is possibly 'null'. -lib/adapters/http.js(124,54): error TS2532: Object is possibly 'undefined'. -lib/adapters/http.js(223,23): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. -lib/adapters/http.js(229,44): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. -lib/adapters/http.js(235,13): error TS2322: Type 'string' is not assignable to type 'Buffer'. -lib/adapters/http.js(247,40): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. -lib/adapters/http.js(271,42): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. +lib/adapters/http.js(120,17): error TS2532: Object is possibly 'undefined'. +lib/adapters/http.js(120,40): error TS2532: Object is possibly 'undefined'. +lib/adapters/http.js(121,17): error TS2531: Object is possibly 'null'. +lib/adapters/http.js(121,54): error TS2531: Object is possibly 'null'. +lib/adapters/http.js(121,54): error TS2532: Object is possibly 'undefined'. +lib/adapters/http.js(220,23): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. +lib/adapters/http.js(226,44): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. +lib/adapters/http.js(232,13): error TS2322: Type 'string' is not assignable to type 'Buffer'. +lib/adapters/http.js(244,40): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. +lib/adapters/http.js(273,42): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. lib/adapters/xhr.js(64,7): error TS2322: Type 'null' is not assignable to type 'XMLHttpRequest'. lib/adapters/xhr.js(76,7): error TS2322: Type 'null' is not assignable to type 'XMLHttpRequest'. lib/adapters/xhr.js(83,51): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'. diff --git a/tests/baselines/reference/user/jimp.log b/tests/baselines/reference/user/jimp.log index d9a47363e22..8aa96e8bb82 100644 --- a/tests/baselines/reference/user/jimp.log +++ b/tests/baselines/reference/user/jimp.log @@ -1,6 +1,51 @@ Exit Code: 1 Standard output: -index.ts(1,23): error TS2307: Cannot find module 'jimp'. +node_modules/@jimp/bmp/index.d.ts(1,38): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/gif/index.d.ts(1,27): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/jpeg/index.d.ts(1,59): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-blit/index.d.ts(1,54): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-blur/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-color/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-contain/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-cover/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-crop/index.d.ts(1,37): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-displace/index.d.ts(1,54): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-dither/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-flip/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-gaussian/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-invert/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-mask/index.d.ts(1,54): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-normalize/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-print/index.d.ts(1,54): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-resize/index.d.ts(1,37): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-rotate/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/plugin-scale/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/png/index.d.ts(1,59): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/@jimp/tiff/index.d.ts(1,38): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` +node_modules/jimp/types/ts3.1/index.d.ts(16,8): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. + Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` diff --git a/tests/baselines/reference/user/prettier.log b/tests/baselines/reference/user/prettier.log index 743c7a71167..93ccd99a0d6 100644 --- a/tests/baselines/reference/user/prettier.log +++ b/tests/baselines/reference/user/prettier.log @@ -55,16 +55,18 @@ src/doc/doc-printer.js(501,37): error TS2345: Argument of type 'any[][]' is not src/index.js(3,25): error TS2732: Cannot find module '../package.json'. Consider using '--resolveJsonModule' to import module with '.json' extension src/index.js(30,17): error TS2339: Property 'sync' does not exist on type '(...args: any[]) => any'. src/language-css/clean.js(3,30): error TS2307: Cannot find module 'html-tag-names'. -src/language-css/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/css'. -src/language-css/index.js(8,58): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-css/index.js(15,26): error TS2307: Cannot find module 'linguist-languages/data/postcss'. -src/language-css/index.js(25,26): error TS2307: Cannot find module 'linguist-languages/data/less'. -src/language-css/index.js(25,59): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-css/index.js(32,26): error TS2307: Cannot find module 'linguist-languages/data/scss'. -src/language-css/index.js(32,59): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. +src/language-css/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/CSS'. +src/language-css/index.js(8,58): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-css/index.js(15,26): error TS2307: Cannot find module 'linguist-languages/data/PostCSS'. +src/language-css/index.js(15,62): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { extensions: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Property 'exclude' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { extensions: string[]; }; }' but required in type '{ extend: any; override: any; exclude: any; }'. +src/language-css/index.js(25,26): error TS2307: Cannot find module 'linguist-languages/data/Less'. +src/language-css/index.js(25,59): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-css/index.js(32,26): error TS2307: Cannot find module 'linguist-languages/data/SCSS'. +src/language-css/index.js(32,59): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude src/language-css/parser-postcss.js(64,32): error TS2345: Argument of type '{ groups: never[]; type: string; }' is not assignable to parameter of type 'never'. src/language-css/parser-postcss.js(74,30): error TS2345: Argument of type '{ open: null; close: null; groups: never[]; type: string; }' is not assignable to parameter of type 'never'. src/language-css/parser-postcss.js(79,30): error TS2345: Argument of type '{ groups: never[]; type: string; }' is not assignable to parameter of type 'never'. @@ -72,12 +74,12 @@ src/language-css/parser-postcss.js(86,30): error TS2345: Argument of type 'any' src/language-css/parser-postcss.js(90,28): error TS2345: Argument of type '{ groups: never[]; type: string; }' is not assignable to parameter of type 'never'. src/language-css/parser-postcss.js(449,32): error TS2531: Object is possibly 'null'. src/language-css/utils.js(3,30): error TS2307: Cannot find module 'html-tag-names'. -src/language-graphql/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/graphql'. -src/language-graphql/index.js(8,62): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-handlebars/index.js(7,26): error TS2307: Cannot find module 'linguist-languages/data/handlebars'. -src/language-handlebars/index.js(7,65): error TS2345: Argument of type '{ override: { since: null; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: null; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. +src/language-graphql/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/GraphQL'. +src/language-graphql/index.js(8,62): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-handlebars/index.js(7,26): error TS2307: Cannot find module 'linguist-languages/data/Handlebars'. +src/language-handlebars/index.js(7,65): error TS2345: Argument of type '{ override: { since: null; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: null; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude src/language-html/ast.js(53,11): error TS2536: Type 'Extract' cannot be used to index type 'Node'. src/language-html/ast.js(56,15): error TS2339: Property 'index' does not exist on type 'Node'. src/language-html/ast.js(56,22): error TS2339: Property 'siblings' does not exist on type 'Node'. @@ -100,16 +102,18 @@ src/language-html/ast.js(90,69): error TS2339: Property 'name' does not exist on src/language-html/conditional-comment.js(23,16): error TS2349: This expression is not callable. Not all constituents of type 'RegExp | ((node: any) => { type: string; sourceSpan: any; })' are callable. Type 'RegExp' has no call signatures. -src/language-html/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/html'. -src/language-html/index.js(8,59): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: string[]; filenames: never[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: string[]; filenames: never[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-html/index.js(19,26): error TS2307: Cannot find module 'linguist-languages/data/html'. -src/language-html/index.js(31,26): error TS2307: Cannot find module 'linguist-languages/data/html'. -src/language-html/index.js(31,59): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: never[]; filenames: never[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: never[]; filenames: never[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-html/index.js(42,26): error TS2307: Cannot find module 'linguist-languages/data/vue'. -src/language-html/index.js(42,58): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. +src/language-html/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/HTML'. +src/language-html/index.js(8,59): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: string[]; filenames: never[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: string[]; filenames: never[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-html/index.js(19,26): error TS2307: Cannot find module 'linguist-languages/data/HTML'. +src/language-html/index.js(19,59): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { extensions: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Property 'exclude' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { extensions: string[]; }; }' but required in type '{ extend: any; override: any; exclude: any; }'. +src/language-html/index.js(31,26): error TS2307: Cannot find module 'linguist-languages/data/HTML'. +src/language-html/index.js(31,59): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: never[]; filenames: never[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: never[]; filenames: never[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-html/index.js(42,26): error TS2307: Cannot find module 'linguist-languages/data/Vue'. +src/language-html/index.js(42,58): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude src/language-html/parser-html.js(52,12): error TS2339: Property 'type' does not exist on type 'Attribute'. src/language-html/parser-html.js(54,12): error TS2339: Property 'type' does not exist on type 'CDATA'. src/language-html/parser-html.js(56,12): error TS2339: Property 'type' does not exist on type 'Comment'. @@ -166,24 +170,33 @@ src/language-html/utils.js(10,30): error TS2307: Cannot find module 'html-tag-na src/language-html/utils.js(11,39): error TS2307: Cannot find module 'html-element-attributes'. src/language-html/utils.js(444,17): error TS2554: Expected 0 arguments, but got 1. src/language-js/comments.js(864,64): error TS2554: Expected 0 arguments, but got 1. -src/language-js/index.js(9,26): error TS2307: Cannot find module 'linguist-languages/data/javascript'. -src/language-js/index.js(19,26): error TS2307: Cannot find module 'linguist-languages/data/javascript'. -src/language-js/index.js(19,65): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; aliases: never[]; filenames: never[]; extensions: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; aliases: never[]; filenames: never[]; extensions: string[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-js/index.js(31,26): error TS2307: Cannot find module 'linguist-languages/data/jsx'. -src/language-js/index.js(31,58): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-js/index.js(38,26): error TS2307: Cannot find module 'linguist-languages/data/typescript'. -src/language-js/index.js(38,65): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-js/index.js(45,26): error TS2307: Cannot find module 'linguist-languages/data/json'. -src/language-js/index.js(45,59): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: never[]; filenames: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: never[]; filenames: string[]; }; }' but required in type '{ extend: any; override: any; }'. -src/language-js/index.js(56,26): error TS2307: Cannot find module 'linguist-languages/data/json'. -src/language-js/index.js(66,26): error TS2307: Cannot find module 'linguist-languages/data/json-with-comments'. -src/language-js/index.js(76,26): error TS2307: Cannot find module 'linguist-languages/data/json5'. -src/language-js/index.js(76,60): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. +src/language-js/index.js(9,26): error TS2307: Cannot find module 'linguist-languages/data/JavaScript'. +src/language-js/index.js(9,65): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { interpreters: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Property 'exclude' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { interpreters: string[]; }; }' but required in type '{ extend: any; override: any; exclude: any; }'. +src/language-js/index.js(19,26): error TS2307: Cannot find module 'linguist-languages/data/JavaScript'. +src/language-js/index.js(19,65): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; aliases: never[]; filenames: never[]; extensions: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; aliases: never[]; filenames: never[]; extensions: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-js/index.js(30,26): error TS2307: Cannot find module 'linguist-languages/data/JSX'. +src/language-js/index.js(30,58): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-js/index.js(37,26): error TS2307: Cannot find module 'linguist-languages/data/TypeScript'. +src/language-js/index.js(37,65): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-js/index.js(44,26): error TS2307: Cannot find module 'linguist-languages/data/TSX'. +src/language-js/index.js(44,58): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-js/index.js(51,26): error TS2307: Cannot find module 'linguist-languages/data/JSON'. +src/language-js/index.js(51,59): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: never[]; filenames: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; extensions: never[]; filenames: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude +src/language-js/index.js(61,26): error TS2307: Cannot find module 'linguist-languages/data/JSON'. +src/language-js/index.js(61,59): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { filenames: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Property 'exclude' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { filenames: string[]; }; }' but required in type '{ extend: any; override: any; exclude: any; }'. +src/language-js/index.js(71,26): error TS2307: Cannot find module 'linguist-languages/data/JSON with Comments'. +src/language-js/index.js(71,73): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { filenames: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Property 'exclude' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; extend: { filenames: string[]; }; }' but required in type '{ extend: any; override: any; exclude: any; }'. +src/language-js/index.js(81,26): error TS2307: Cannot find module 'linguist-languages/data/JSON5'. +src/language-js/index.js(81,60): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude src/language-js/needs-parens.js(871,14): error TS2769: No overload matches this call. Overload 1 of 2, '(...items: ConcatArray<(childPath: any) => any>[]): ((childPath: any) => any)[]', gave the following error. Argument of type '(string | number)[]' is not assignable to parameter of type 'ConcatArray<(childPath: any) => any>'. @@ -260,17 +273,18 @@ src/language-js/printer-estree.js(6130,7): error TS2769: No overload matches thi Argument of type '(string | number)[]' is not assignable to parameter of type '((childPath: any) => any) | ConcatArray<(childPath: any) => any>'. Type '(string | number)[]' is not assignable to type 'ConcatArray<(childPath: any) => any>'. src/language-js/utils.js(107,55): error TS2554: Expected 0-1 arguments, but got 2. -src/language-markdown/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/markdown'. -src/language-markdown/index.js(20,5): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. +src/language-markdown/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/Markdown'. +src/language-markdown/index.js(21,26): error TS2307: Cannot find module 'linguist-languages/data/Markdown'. +src/language-markdown/index.js(21,63): error TS2345: Argument of type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; filenames: never[]; extensions: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { name: string; since: string; parsers: string[]; vscodeLanguageIds: string[]; filenames: never[]; extensions: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude src/language-markdown/printer-markdown.js(278,18): error TS2532: Object is possibly 'undefined'. src/language-markdown/printer-markdown.js(279,17): error TS2532: Object is possibly 'undefined'. src/language-markdown/printer-markdown.js(300,14): error TS2532: Object is possibly 'undefined'. src/language-markdown/utils.js(203,5): error TS2322: Type 'never[]' is not assignable to type 'null'. src/language-markdown/utils.js(213,47): error TS2345: Argument of type 'any[]' is not assignable to parameter of type 'null'. -src/language-yaml/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/yaml'. -src/language-yaml/index.js(8,59): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; }'. - Property 'extend' is missing in type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' but required in type '{ extend: any; override: any; }'. +src/language-yaml/index.js(8,26): error TS2307: Cannot find module 'linguist-languages/data/YAML'. +src/language-yaml/index.js(8,59): error TS2345: Argument of type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is not assignable to parameter of type '{ extend: any; override: any; exclude: any; }'. + Type '{ override: { since: string; parsers: string[]; vscodeLanguageIds: string[]; }; }' is missing the following properties from type '{ extend: any; override: any; exclude: any; }': extend, exclude src/language-yaml/printer-yaml.js(226,41): error TS2769: No overload matches this call. Overload 1 of 2, '(...items: ConcatArray[]): never[]', gave the following error. Argument of type '"" | { type: string; parts: any; }' is not assignable to parameter of type 'ConcatArray'. From 58e0469252a244b3b1fae44b133657495dca03a6 Mon Sep 17 00:00:00 2001 From: xiaofa Date: Tue, 17 Sep 2019 18:56:19 +0800 Subject: [PATCH 31/48] fix typo --- src/services/codefixes/convertConstToLet.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/codefixes/convertConstToLet.ts b/src/services/codefixes/convertConstToLet.ts index df027f7d8c8..610aaf5daa4 100644 --- a/src/services/codefixes/convertConstToLet.ts +++ b/src/services/codefixes/convertConstToLet.ts @@ -7,14 +7,14 @@ namespace ts.codefix { errorCodes, getCodeActions: context => { const { sourceFile, span, program } = context; - const variableStatement = getVaribleStatement(sourceFile, span.start, program); + const variableStatement = getVariableStatement(sourceFile, span.start, program); const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, variableStatement)); return [createCodeFixAction(fixId, changes, Diagnostics.Convert_const_to_let, fixId, Diagnostics.Convert_const_to_let)]; }, fixIds: [fixId] }); - function getVaribleStatement(sourceFile: SourceFile, pos: number, program: Program) { + function getVariableStatement(sourceFile: SourceFile, pos: number, program: Program) { const token = getTokenAtPosition(sourceFile, pos); const checker = program.getTypeChecker(); const symbol = checker.getSymbolAtLocation(token); From f10e38fea7996f746b79fc86f6fd47c1516cb307 Mon Sep 17 00:00:00 2001 From: Andrew Casey Date: Mon, 16 Sep 2019 19:08:01 -0700 Subject: [PATCH 32/48] Make extractSymbol explicitly drop JSDoc nodes Fixes #33332 --- src/compiler/utilities.ts | 2 ++ src/services/refactors/extractSymbol.ts | 5 +++++ src/testRunner/unittests/services/extract/ranges.ts | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index b338d3ba657..cb71df1fa93 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -975,6 +975,8 @@ namespace ts { return getSpanOfTokenAtPosition(sourceFile, node.pos); } + Debug.assert(!isJSDoc(errorNode)); + const isMissing = nodeIsMissing(errorNode); const pos = isMissing || isJsxText(node) ? errorNode.pos diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts index 859f7e1d3cc..e7f57a57351 100644 --- a/src/services/refactors/extractSymbol.ts +++ b/src/services/refactors/extractSymbol.ts @@ -116,6 +116,7 @@ namespace ts.refactor.extractSymbol { export const cannotExtractRange: DiagnosticMessage = createMessage("Cannot extract range."); export const cannotExtractImport: DiagnosticMessage = createMessage("Cannot extract import statement."); export const cannotExtractSuper: DiagnosticMessage = createMessage("Cannot extract super call."); + export const cannotExtractJSDoc: DiagnosticMessage = createMessage("Cannot extract JSDoc."); export const cannotExtractEmpty: DiagnosticMessage = createMessage("Cannot extract empty range."); export const expressionExpected: DiagnosticMessage = createMessage("expression expected."); export const uselessConstantType: DiagnosticMessage = createMessage("No reason to extract constant of type."); @@ -246,6 +247,10 @@ namespace ts.refactor.extractSymbol { return { targetRange: { range: statements, facts: rangeFacts, declarations } }; } + if (isJSDoc(start)) { + return { errors: [createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractJSDoc)] }; + } + if (isReturnStatement(start) && !start.expression) { // Makes no sense to extract an expression-less return statement. return { errors: [createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] }; diff --git a/src/testRunner/unittests/services/extract/ranges.ts b/src/testRunner/unittests/services/extract/ranges.ts index d2ac6a0a883..ab205288b33 100644 --- a/src/testRunner/unittests/services/extract/ranges.ts +++ b/src/testRunner/unittests/services/extract/ranges.ts @@ -380,6 +380,10 @@ switch (x) { `[#|{ 1;|] }`, [refactor.extractSymbol.Messages.cannotExtractRange.message]); + testExtractRangeFailed("extractRangeFailed19", + `[#|/** @type {number} */|] const foo = 1;`, + [refactor.extractSymbol.Messages.cannotExtractJSDoc.message]); + testExtractRangeFailed("extract-method-not-for-token-expression-statement", `[#|a|]`, [refactor.extractSymbol.Messages.cannotExtractIdentifier.message]); }); } From 800eaedbfa9d34eb136496e24bc026e5ad1dc9d5 Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Tue, 17 Sep 2019 11:36:09 -0700 Subject: [PATCH 33/48] =?UTF-8?q?=F0=9F=A4=96=20User=20test=20baselines=20?= =?UTF-8?q?have=20changed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/baselines/reference/docker/azure-sdk.log | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index 347a6c188a9..fb911c5a367 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -9,12 +9,11 @@ XX of XX: [@azure/abort-controller] completed successfully in ? seconds XX of XX: [@azure/core-auth] completed successfully in ? seconds XX of XX: [@azure/core-tracing] completed successfully in ? seconds XX of XX: [@azure/core-http] completed successfully in ? seconds -XX of XX: [@azure/identity] completed successfully in ? seconds -XX of XX: [@azure/core-amqp] completed successfully in ? seconds XX of XX: [@azure/core-arm] completed successfully in ? seconds XX of XX: [@azure/core-paging] completed successfully in ? seconds +XX of XX: [@azure/identity] completed successfully in ? seconds XX of XX: [@azure/test-utils-recorder] completed successfully in ? seconds -XX of XX: [@azure/event-hubs] completed successfully in ? seconds +XX of XX: [@azure/core-amqp] completed successfully in ? seconds XX of XX: [@azure/event-processor-host] completed successfully in ? seconds XX of XX: [@azure/keyvault-keys] completed successfully in ? seconds XX of XX: [@azure/keyvault-secrets] completed successfully in ? seconds @@ -56,6 +55,7 @@ atob (guessing 'atob') (!) Circular dependency: dist-esm/index.js -> dist-esm/CosmosClient.js -> dist-esm/client/Database/index.js -> dist-esm/client/Database/Database.js -> dist-esm/client/Container/index.js -> dist-esm/client/Container/Container.js -> dist-esm/client/Script/Scripts.js -> dist-esm/index.js (!) Circular dependency: dist-esm/request/RequestHandler.js -> dist-esm/retry/retryUtility.js -> dist-esm/request/RequestHandler.js created dist/index.js in ?s +XX of XX: [@azure/event-hubs] completed successfully in ? seconds XX of XX: [@azure/eventhubs-checkpointstore-blob] completed successfully in ? seconds XX of XX: [@azure/keyvault-certificates] completed successfully in ? seconds Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md @@ -70,17 +70,17 @@ SUCCESS (22) @azure/core-auth (? seconds) @azure/core-tracing (? seconds) @azure/core-http (? seconds) -@azure/identity (? seconds) -@azure/core-amqp (? seconds) @azure/core-arm (? seconds) @azure/core-paging (? seconds) +@azure/identity (? seconds) @azure/test-utils-recorder (? seconds) -@azure/event-hubs (? seconds) +@azure/core-amqp (? seconds) @azure/event-processor-host (? seconds) @azure/keyvault-keys (? seconds) @azure/keyvault-secrets (? seconds) @azure/app-configuration (? seconds) @azure/core-asynciterator-polyfill (? seconds) +@azure/event-hubs (? seconds) @azure/eventhubs-checkpointstore-blob (? seconds) @azure/keyvault-certificates (? seconds) @azure/storage-blob (? seconds) From 6bb7e5c086ecbe40dfda84c75b5b5b46a8a389c2 Mon Sep 17 00:00:00 2001 From: Martin Probst Date: Mon, 9 Sep 2019 14:08:00 +0200 Subject: [PATCH 34/48] Handle parentless nodes in isParameterPropertyDeclaration Fixes #33295. This follows a similar pattern as in #20314 by requiring an explicit `parent` parameter. Where possible, it uses the appopriate variable at the call sites. In several locations there is no context available though (e.g. inspecting `valueDeclarations`) and we access `.parent` as the code previously did. From a cursory inspection this seems correct, these callpaths originate in phases where there must be a `parent` (i.e. in checker, binder, etc). Change-Id: I28e4726777b57237bec776e4001e9e69ac591b11 --- src/compiler/binder.ts | 2 +- src/compiler/checker.ts | 4 +-- src/compiler/transformers/classFields.ts | 2 +- .../transformers/declarations/diagnostics.ts | 2 +- src/compiler/transformers/ts.ts | 4 +-- src/compiler/utilities.ts | 6 ++-- src/services/findAllReferences.ts | 4 +-- src/services/navigationBar.ts | 2 +- .../generateGetAccessorAndSetAccessor.ts | 4 +-- src/testRunner/unittests/transform.ts | 30 ++++++++++++++++++- .../reference/api/tsserverlibrary.d.ts | 2 +- tests/baselines/reference/api/typescript.d.ts | 2 +- ...rmsCorrectly.transformParameterProperty.js | 18 +++++++++++ 13 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 tests/baselines/reference/transformApi/transformsCorrectly.transformParameterProperty.js diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 3bc03cdbab9..705ec3b75f4 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -2859,7 +2859,7 @@ namespace ts { // If this is a property-parameter, then also declare the property symbol into the // containing class. - if (isParameterPropertyDeclaration(node)) { + if (isParameterPropertyDeclaration(node, node.parent)) { const classDeclaration = node.parent.parent; declareSymbol(classDeclaration.symbol.members!, classDeclaration.symbol, node, SymbolFlags.Property | (node.questionToken ? SymbolFlags.Optional : SymbolFlags.None), SymbolFlags.PropertyExcludes); } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f8c88178885..2fa1d8acf4a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -25705,7 +25705,7 @@ namespace ts { for (const member of node.members) { if (member.kind === SyntaxKind.Constructor) { for (const param of (member as ConstructorDeclaration).parameters) { - if (isParameterPropertyDeclaration(param) && !isBindingPattern(param.name)) { + if (isParameterPropertyDeclaration(param, member) && !isBindingPattern(param.name)) { addName(instanceNames, param.name, param.name.escapedText, DeclarationMeaning.GetOrSetAccessor); } } @@ -27469,7 +27469,7 @@ namespace ts { const parameter = local.valueDeclaration && tryGetRootParameterDeclaration(local.valueDeclaration); const name = local.valueDeclaration && getNameOfDeclaration(local.valueDeclaration); if (parameter && name) { - if (!isParameterPropertyDeclaration(parameter) && !parameterIsThisKeyword(parameter) && !isIdentifierThatStartsWithUnderscore(name)) { + if (!isParameterPropertyDeclaration(parameter, parameter.parent) && !parameterIsThisKeyword(parameter) && !isIdentifierThatStartsWithUnderscore(name)) { addDiagnostic(parameter, UnusedKind.Parameter, createDiagnosticForNode(name, Diagnostics._0_is_declared_but_its_value_is_never_read, symbolName(local))); } } diff --git a/src/compiler/transformers/classFields.ts b/src/compiler/transformers/classFields.ts index 4efe4ad7b38..37473d9bb20 100644 --- a/src/compiler/transformers/classFields.ts +++ b/src/compiler/transformers/classFields.ts @@ -337,7 +337,7 @@ namespace ts { if (constructor && constructor.body) { let parameterPropertyDeclarationCount = 0; for (let i = indexOfFirstStatement; i < constructor.body.statements.length; i++) { - if (isParameterPropertyDeclaration(getOriginalNode(constructor.body.statements[i]))) { + if (isParameterPropertyDeclaration(getOriginalNode(constructor.body.statements[i]), constructor)) { parameterPropertyDeclarationCount++; } else { diff --git a/src/compiler/transformers/declarations/diagnostics.ts b/src/compiler/transformers/declarations/diagnostics.ts index 61d4dd30a67..91c960ea942 100644 --- a/src/compiler/transformers/declarations/diagnostics.ts +++ b/src/compiler/transformers/declarations/diagnostics.ts @@ -135,7 +135,7 @@ namespace ts { return getReturnTypeVisibilityError; } else if (isParameter(node)) { - if (isParameterPropertyDeclaration(node) && hasModifier(node.parent, ModifierFlags.Private)) { + if (isParameterPropertyDeclaration(node, node.parent) && hasModifier(node.parent, ModifierFlags.Private)) { return getVariableDeclarationTypeVisibilityError; } return getParameterDeclarationTypeVisibilityError; diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts index 4cbc8e565df..06b3fb53ec1 100644 --- a/src/compiler/transformers/ts.ts +++ b/src/compiler/transformers/ts.ts @@ -895,7 +895,7 @@ namespace ts { const members: ClassElement[] = []; const constructor = getFirstConstructorWithBody(node); const parametersWithPropertyAssignments = constructor && - filter(constructor.parameters, isParameterPropertyDeclaration); + filter(constructor.parameters, p => isParameterPropertyDeclaration(p, constructor)); if (parametersWithPropertyAssignments) { for (const parameter of parametersWithPropertyAssignments) { @@ -1907,7 +1907,7 @@ namespace ts { function transformConstructorBody(body: Block, constructor: ConstructorDeclaration) { const parametersWithPropertyAssignments = constructor && - filter(constructor.parameters, isParameterPropertyDeclaration); + filter(constructor.parameters, p => isParameterPropertyDeclaration(p, constructor)); if (!some(parametersWithPropertyAssignments)) { return visitFunctionBody(body, visitor, context); } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index cb71df1fa93..1645b9339ae 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1009,7 +1009,7 @@ namespace ts { } export function isDeclarationReadonly(declaration: Declaration): boolean { - return !!(getCombinedModifierFlags(declaration) & ModifierFlags.Readonly && !isParameterPropertyDeclaration(declaration)); + return !!(getCombinedModifierFlags(declaration) & ModifierFlags.Readonly && !isParameterPropertyDeclaration(declaration, declaration.parent)); } export function isVarConst(node: VariableDeclaration | VariableDeclarationList): boolean { @@ -4983,8 +4983,8 @@ namespace ts { } export type ParameterPropertyDeclaration = ParameterDeclaration & { parent: ConstructorDeclaration, name: Identifier }; - export function isParameterPropertyDeclaration(node: Node): node is ParameterPropertyDeclaration { - return hasModifier(node, ModifierFlags.ParameterPropertyModifier) && node.parent.kind === SyntaxKind.Constructor; + export function isParameterPropertyDeclaration(node: Node, parent: Node): node is ParameterPropertyDeclaration { + return hasModifier(node, ModifierFlags.ParameterPropertyModifier) && parent.kind === SyntaxKind.Constructor; } export function isEmptyBindingPattern(node: BindingName): node is BindingPattern { diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts index 5d667ee55a4..f98fb2f75b8 100644 --- a/src/services/findAllReferences.ts +++ b/src/services/findAllReferences.ts @@ -1145,7 +1145,7 @@ namespace ts.FindAllReferences.Core { } export function eachSymbolReferenceInFile(definition: Identifier, checker: TypeChecker, sourceFile: SourceFile, cb: (token: Identifier) => T): T | undefined { - const symbol = isParameterPropertyDeclaration(definition.parent) + const symbol = isParameterPropertyDeclaration(definition.parent, definition.parent.parent) ? first(checker.getSymbolsOfParameterPropertyDeclaration(definition.parent, definition.text)) : checker.getSymbolAtLocation(definition); if (!symbol) return undefined; @@ -1886,7 +1886,7 @@ namespace ts.FindAllReferences.Core { const res = fromRoot(symbol); if (res) return res; - if (symbol.valueDeclaration && isParameterPropertyDeclaration(symbol.valueDeclaration)) { + if (symbol.valueDeclaration && isParameterPropertyDeclaration(symbol.valueDeclaration, symbol.valueDeclaration.parent)) { // For a parameter property, now try on the other symbol (property if this was a parameter, parameter if this was a property). const paramProps = checker.getSymbolsOfParameterPropertyDeclaration(cast(symbol.valueDeclaration, isParameter), symbol.name); Debug.assert(paramProps.length === 2 && !!(paramProps[0].flags & SymbolFlags.FunctionScopedVariable) && !!(paramProps[1].flags & SymbolFlags.Property)); // is [parameter, property] diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index 7a91fcdcad2..dd3bdcffd32 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -197,7 +197,7 @@ namespace ts.NavigationBar { // Parameter properties are children of the class, not the constructor. for (const param of ctr.parameters) { - if (isParameterPropertyDeclaration(param)) { + if (isParameterPropertyDeclaration(param, ctr)) { addLeafNode(param); } } diff --git a/src/services/refactors/generateGetAccessorAndSetAccessor.ts b/src/services/refactors/generateGetAccessorAndSetAccessor.ts index 7e4ca1a6645..a1bd32b37fc 100644 --- a/src/services/refactors/generateGetAccessorAndSetAccessor.ts +++ b/src/services/refactors/generateGetAccessorAndSetAccessor.ts @@ -92,7 +92,7 @@ namespace ts.refactor.generateGetAccessorAndSetAccessor { } function isAcceptedDeclaration(node: Node): node is AcceptedDeclaration { - return isParameterPropertyDeclaration(node) || isPropertyDeclaration(node) || isPropertyAssignment(node); + return isParameterPropertyDeclaration(node, node.parent) || isPropertyDeclaration(node) || isPropertyAssignment(node); } function createPropertyName (name: string, originalName: AcceptedNameType) { @@ -214,7 +214,7 @@ namespace ts.refactor.generateGetAccessorAndSetAccessor { } function insertAccessor(changeTracker: textChanges.ChangeTracker, file: SourceFile, accessor: AccessorDeclaration, declaration: AcceptedDeclaration, container: ContainerDeclaration) { - isParameterPropertyDeclaration(declaration) ? changeTracker.insertNodeAtClassStart(file, container, accessor) : + isParameterPropertyDeclaration(declaration, declaration.parent) ? changeTracker.insertNodeAtClassStart(file, container, accessor) : isPropertyAssignment(declaration) ? changeTracker.insertNodeAfterComma(file, declaration, accessor) : changeTracker.insertNodeAfter(file, declaration, accessor); } diff --git a/src/testRunner/unittests/transform.ts b/src/testRunner/unittests/transform.ts index 5203e69e813..ffd5ba7609f 100644 --- a/src/testRunner/unittests/transform.ts +++ b/src/testRunner/unittests/transform.ts @@ -300,6 +300,34 @@ namespace ts { }); }); + // https://github.com/microsoft/TypeScript/issues/33295 + testBaseline("transformParameterProperty", () => { + return transpileModule("", { + transformers: { + before: [transformAddParameterProperty], + }, + compilerOptions: { + target: ScriptTarget.ES5, + newLine: NewLineKind.CarriageReturnLineFeed, + } + }).outputText; + + function transformAddParameterProperty(_context: TransformationContext) { + return (sourceFile: SourceFile): SourceFile => { + return visitNode(sourceFile); + }; + function visitNode(sf: SourceFile) { + // produce `class Foo { constructor(@Dec private x) {} }`; + // The decorator is required to trigger ts.ts transformations. + const classDecl = createClassDeclaration([], [], "Foo", /*typeParameters*/ undefined, /*heritageClauses*/ undefined, [ + createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, [ + createParameter(/*decorators*/ [createDecorator(createIdentifier("Dec"))], /*modifiers*/ [createModifier(SyntaxKind.PrivateKeyword)], /*dotDotDotToken*/ undefined, "x")], createBlock([])) + ]); + return updateSourceFileNode(sf, [classDecl]); + } + } + }); + function baselineDeclarationTransform(text: string, opts: TranspileOptions) { const fs = vfs.createFromFileSystem(Harness.IO, /*caseSensitive*/ true, { documents: [new documents.TextDocument("/.src/index.ts", text)] }); const host = new fakes.CompilerHost(fs, opts.compilerOptions); @@ -389,7 +417,7 @@ class Clazz { } `, { transformers: { - before: [addSyntheticComment(n => isPropertyDeclaration(n) || isParameterPropertyDeclaration(n) || isClassDeclaration(n) || isConstructorDeclaration(n))], + before: [addSyntheticComment(n => isPropertyDeclaration(n) || isParameterPropertyDeclaration(n, n.parent) || isClassDeclaration(n) || isConstructorDeclaration(n))], }, compilerOptions: { target: ScriptTarget.ES2015, diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 41ea5756204..58d513b2e0a 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -3274,7 +3274,7 @@ declare namespace ts { parent: ConstructorDeclaration; name: Identifier; }; - function isParameterPropertyDeclaration(node: Node): node is ParameterPropertyDeclaration; + function isParameterPropertyDeclaration(node: Node, parent: Node): node is ParameterPropertyDeclaration; function isEmptyBindingPattern(node: BindingName): node is BindingPattern; function isEmptyBindingElement(node: BindingElement): boolean; function walkUpBindingElementsAndPatterns(binding: BindingElement): VariableDeclaration | ParameterDeclaration; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 8402150f2a0..bc71eaffa37 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -3274,7 +3274,7 @@ declare namespace ts { parent: ConstructorDeclaration; name: Identifier; }; - function isParameterPropertyDeclaration(node: Node): node is ParameterPropertyDeclaration; + function isParameterPropertyDeclaration(node: Node, parent: Node): node is ParameterPropertyDeclaration; function isEmptyBindingPattern(node: BindingName): node is BindingPattern; function isEmptyBindingElement(node: BindingElement): boolean; function walkUpBindingElementsAndPatterns(binding: BindingElement): VariableDeclaration | ParameterDeclaration; diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.transformParameterProperty.js b/tests/baselines/reference/transformApi/transformsCorrectly.transformParameterProperty.js new file mode 100644 index 00000000000..d121694872f --- /dev/null +++ b/tests/baselines/reference/transformApi/transformsCorrectly.transformParameterProperty.js @@ -0,0 +1,18 @@ +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __param = (this && this.__param) || function (paramIndex, decorator) { + return function (target, key) { decorator(target, key, paramIndex); } +}; +var Foo = /** @class */ (function () { + function Foo(x) { + this.x = x; + } + Foo = __decorate([ + __param(0, Dec) + ], Foo); + return Foo; +}()); From 56e2cb31ad95b08fa4f4c9578522777c18b687b2 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 17 Sep 2019 15:36:00 -0700 Subject: [PATCH 35/48] Reverse mapped types should have inferable indexes if their source had an inferable index (#33450) --- src/compiler/checker.ts | 6 +-- .../reverseMappedTypeAssignableToIndex.js | 22 ++++++++ ...reverseMappedTypeAssignableToIndex.symbols | 54 +++++++++++++++++++ .../reverseMappedTypeAssignableToIndex.types | 42 +++++++++++++++ .../reverseMappedTypeAssignableToIndex.ts | 19 +++++++ 5 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 tests/baselines/reference/reverseMappedTypeAssignableToIndex.js create mode 100644 tests/baselines/reference/reverseMappedTypeAssignableToIndex.symbols create mode 100644 tests/baselines/reference/reverseMappedTypeAssignableToIndex.types create mode 100644 tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 2fa1d8acf4a..e3907885a4c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15004,9 +15004,9 @@ namespace ts { * Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module * with no call or construct signatures. */ - function isObjectTypeWithInferableIndex(type: Type) { - return type.symbol && (type.symbol.flags & (SymbolFlags.ObjectLiteral | SymbolFlags.TypeLiteral | SymbolFlags.Enum | SymbolFlags.ValueModule)) !== 0 && - !typeHasCallOrConstructSignatures(type); + function isObjectTypeWithInferableIndex(type: Type): boolean { + return !!(type.symbol && (type.symbol.flags & (SymbolFlags.ObjectLiteral | SymbolFlags.TypeLiteral | SymbolFlags.Enum | SymbolFlags.ValueModule)) !== 0 && + !typeHasCallOrConstructSignatures(type)) || !!(getObjectFlags(type) & ObjectFlags.ReverseMapped && isObjectTypeWithInferableIndex((type as ReverseMappedType).source)); } function createSymbolWithType(source: Symbol, type: Type | undefined) { diff --git a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.js b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.js new file mode 100644 index 00000000000..b3ee2dcda2e --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.js @@ -0,0 +1,22 @@ +//// [reverseMappedTypeAssignableToIndex.ts] +// Simple mapped type and inferrence +type Mapped = { [K in keyof T]: { name: T[K] } }; +type InferFromMapped = T extends Mapped ? R : never; + +// Object literal type and associated mapped type +// Note that in the real code we don't have a direct reference to LiteralType +type LiteralType = { + first: "first"; + second: "second"; +} +type MappedLiteralType = { + first: { name: "first" }, + second: { name: "second" }, +}; + +type Inferred = InferFromMapped; + +// UNEXPECTED resolves to false +type Test1 = Inferred extends Record ? true : false; + +//// [reverseMappedTypeAssignableToIndex.js] diff --git a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.symbols b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.symbols new file mode 100644 index 00000000000..38ed9ff039f --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.symbols @@ -0,0 +1,54 @@ +=== tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts === +// Simple mapped type and inferrence +type Mapped = { [K in keyof T]: { name: T[K] } }; +>Mapped : Symbol(Mapped, Decl(reverseMappedTypeAssignableToIndex.ts, 0, 0)) +>T : Symbol(T, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 12)) +>K : Symbol(K, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 20)) +>T : Symbol(T, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 12)) +>name : Symbol(name, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 36)) +>T : Symbol(T, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 12)) +>K : Symbol(K, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 20)) + +type InferFromMapped = T extends Mapped ? R : never; +>InferFromMapped : Symbol(InferFromMapped, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 52)) +>T : Symbol(T, Decl(reverseMappedTypeAssignableToIndex.ts, 2, 21)) +>T : Symbol(T, Decl(reverseMappedTypeAssignableToIndex.ts, 2, 21)) +>Mapped : Symbol(Mapped, Decl(reverseMappedTypeAssignableToIndex.ts, 0, 0)) +>R : Symbol(R, Decl(reverseMappedTypeAssignableToIndex.ts, 2, 48)) +>R : Symbol(R, Decl(reverseMappedTypeAssignableToIndex.ts, 2, 48)) + +// Object literal type and associated mapped type +// Note that in the real code we don't have a direct reference to LiteralType +type LiteralType = { +>LiteralType : Symbol(LiteralType, Decl(reverseMappedTypeAssignableToIndex.ts, 2, 64)) + + first: "first"; +>first : Symbol(first, Decl(reverseMappedTypeAssignableToIndex.ts, 6, 20)) + + second: "second"; +>second : Symbol(second, Decl(reverseMappedTypeAssignableToIndex.ts, 7, 16)) +} +type MappedLiteralType = { +>MappedLiteralType : Symbol(MappedLiteralType, Decl(reverseMappedTypeAssignableToIndex.ts, 9, 1)) + + first: { name: "first" }, +>first : Symbol(first, Decl(reverseMappedTypeAssignableToIndex.ts, 10, 26)) +>name : Symbol(name, Decl(reverseMappedTypeAssignableToIndex.ts, 11, 9)) + + second: { name: "second" }, +>second : Symbol(second, Decl(reverseMappedTypeAssignableToIndex.ts, 11, 26)) +>name : Symbol(name, Decl(reverseMappedTypeAssignableToIndex.ts, 12, 10)) + +}; + +type Inferred = InferFromMapped; +>Inferred : Symbol(Inferred, Decl(reverseMappedTypeAssignableToIndex.ts, 13, 2)) +>InferFromMapped : Symbol(InferFromMapped, Decl(reverseMappedTypeAssignableToIndex.ts, 1, 52)) +>MappedLiteralType : Symbol(MappedLiteralType, Decl(reverseMappedTypeAssignableToIndex.ts, 9, 1)) + +// UNEXPECTED resolves to false +type Test1 = Inferred extends Record ? true : false; +>Test1 : Symbol(Test1, Decl(reverseMappedTypeAssignableToIndex.ts, 15, 51)) +>Inferred : Symbol(Inferred, Decl(reverseMappedTypeAssignableToIndex.ts, 13, 2)) +>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) + diff --git a/tests/baselines/reference/reverseMappedTypeAssignableToIndex.types b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.types new file mode 100644 index 00000000000..589e9ff3477 --- /dev/null +++ b/tests/baselines/reference/reverseMappedTypeAssignableToIndex.types @@ -0,0 +1,42 @@ +=== tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts === +// Simple mapped type and inferrence +type Mapped = { [K in keyof T]: { name: T[K] } }; +>Mapped : Mapped +>name : T[K] + +type InferFromMapped = T extends Mapped ? R : never; +>InferFromMapped : InferFromMapped + +// Object literal type and associated mapped type +// Note that in the real code we don't have a direct reference to LiteralType +type LiteralType = { +>LiteralType : LiteralType + + first: "first"; +>first : "first" + + second: "second"; +>second : "second" +} +type MappedLiteralType = { +>MappedLiteralType : MappedLiteralType + + first: { name: "first" }, +>first : { name: "first"; } +>name : "first" + + second: { name: "second" }, +>second : { name: "second"; } +>name : "second" + +}; + +type Inferred = InferFromMapped; +>Inferred : { first: "first"; second: "second"; } + +// UNEXPECTED resolves to false +type Test1 = Inferred extends Record ? true : false; +>Test1 : true +>true : true +>false : false + diff --git a/tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts b/tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts new file mode 100644 index 00000000000..a1244fe8eb2 --- /dev/null +++ b/tests/cases/compiler/reverseMappedTypeAssignableToIndex.ts @@ -0,0 +1,19 @@ +// Simple mapped type and inferrence +type Mapped = { [K in keyof T]: { name: T[K] } }; +type InferFromMapped = T extends Mapped ? R : never; + +// Object literal type and associated mapped type +// Note that in the real code we don't have a direct reference to LiteralType +type LiteralType = { + first: "first"; + second: "second"; +} +type MappedLiteralType = { + first: { name: "first" }, + second: { name: "second" }, +}; + +type Inferred = InferFromMapped; + +// UNEXPECTED resolves to false +type Test1 = Inferred extends Record ? true : false; \ No newline at end of file From 344dba8809e82ff74b9616c872fa5a781c264d42 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 17 Sep 2019 21:02:12 -0700 Subject: [PATCH 36/48] Fix incorrect parameter types for AsyncIterator next/return (#33354) --- src/compiler/checker.ts | 6 ++-- src/lib/es2018.asyncgenerator.d.ts | 2 +- src/lib/es2018.asynciterable.d.ts | 2 +- .../reference/customAsyncIterator.js | 26 ++++++++++++++ .../reference/customAsyncIterator.symbols | 35 +++++++++++++++++++ .../reference/customAsyncIterator.types | 32 +++++++++++++++++ .../types.asyncGenerators.es2018.1.symbols | 9 +++++ .../types.asyncGenerators.es2018.1.types | 9 +++++ .../types.asyncGenerators.es2018.2.errors.txt | 20 +++++------ tests/cases/compiler/customAsyncIterator.ts | 13 +++++++ .../types.asyncGenerators.es2018.1.ts | 3 ++ 11 files changed, 143 insertions(+), 14 deletions(-) create mode 100644 tests/baselines/reference/customAsyncIterator.js create mode 100644 tests/baselines/reference/customAsyncIterator.symbols create mode 100644 tests/baselines/reference/customAsyncIterator.types create mode 100644 tests/cases/compiler/customAsyncIterator.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e3907885a4c..9a8cf2f8038 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -28740,11 +28740,13 @@ namespace ts { let nextType: Type | undefined; if (methodName !== "throw") { const methodParameterType = methodParameterTypes ? getUnionType(methodParameterTypes) : unknownType; - const resolvedMethodParameterType = resolver.resolveIterationType(methodParameterType, errorNode) || anyType; if (methodName === "next") { - nextType = resolvedMethodParameterType; + // The value of `next(value)` is *not* awaited by async generators + nextType = methodParameterType; } else if (methodName === "return") { + // The value of `return(value)` *is* awaited by async generators + const resolvedMethodParameterType = resolver.resolveIterationType(methodParameterType, errorNode) || anyType; returnTypes = append(returnTypes, resolvedMethodParameterType); } } diff --git a/src/lib/es2018.asyncgenerator.d.ts b/src/lib/es2018.asyncgenerator.d.ts index 76275c92575..f6966264c8b 100644 --- a/src/lib/es2018.asyncgenerator.d.ts +++ b/src/lib/es2018.asyncgenerator.d.ts @@ -2,7 +2,7 @@ interface AsyncGenerator extends AsyncIterator { // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places. - next(...args: [] | [TNext | PromiseLike]): Promise>; + next(...args: [] | [TNext]): Promise>; return(value: TReturn | PromiseLike): Promise>; throw(e: any): Promise>; [Symbol.asyncIterator](): AsyncGenerator; diff --git a/src/lib/es2018.asynciterable.d.ts b/src/lib/es2018.asynciterable.d.ts index d5d83f31893..19a31c72ca4 100644 --- a/src/lib/es2018.asynciterable.d.ts +++ b/src/lib/es2018.asynciterable.d.ts @@ -11,7 +11,7 @@ interface SymbolConstructor { interface AsyncIterator { // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places. - next(...args: [] | [TNext | PromiseLike]): Promise>; + next(...args: [] | [TNext]): Promise>; return?(value?: TReturn | PromiseLike): Promise>; throw?(e?: any): Promise>; } diff --git a/tests/baselines/reference/customAsyncIterator.js b/tests/baselines/reference/customAsyncIterator.js new file mode 100644 index 00000000000..c0a86218e8d --- /dev/null +++ b/tests/baselines/reference/customAsyncIterator.js @@ -0,0 +1,26 @@ +//// [customAsyncIterator.ts] +// GH: https://github.com/microsoft/TypeScript/issues/33239 +class ConstantIterator implements AsyncIterator { + constructor(private constant: T) { + } + async next(value?: T): Promise> { + if (value != null) { + throw new Error("ConstantIterator.prototype.next may not take any values"); + } + return { value: this.constant, done: false }; + } +} + +//// [customAsyncIterator.js] +// GH: https://github.com/microsoft/TypeScript/issues/33239 +class ConstantIterator { + constructor(constant) { + this.constant = constant; + } + async next(value) { + if (value != null) { + throw new Error("ConstantIterator.prototype.next may not take any values"); + } + return { value: this.constant, done: false }; + } +} diff --git a/tests/baselines/reference/customAsyncIterator.symbols b/tests/baselines/reference/customAsyncIterator.symbols new file mode 100644 index 00000000000..59c099ec403 --- /dev/null +++ b/tests/baselines/reference/customAsyncIterator.symbols @@ -0,0 +1,35 @@ +=== tests/cases/compiler/customAsyncIterator.ts === +// GH: https://github.com/microsoft/TypeScript/issues/33239 +class ConstantIterator implements AsyncIterator { +>ConstantIterator : Symbol(ConstantIterator, Decl(customAsyncIterator.ts, 0, 0)) +>T : Symbol(T, Decl(customAsyncIterator.ts, 1, 23)) +>AsyncIterator : Symbol(AsyncIterator, Decl(lib.es2018.asynciterable.d.ts, --, --)) +>T : Symbol(T, Decl(customAsyncIterator.ts, 1, 23)) +>T : Symbol(T, Decl(customAsyncIterator.ts, 1, 23)) + + constructor(private constant: T) { +>constant : Symbol(ConstantIterator.constant, Decl(customAsyncIterator.ts, 2, 16)) +>T : Symbol(T, Decl(customAsyncIterator.ts, 1, 23)) + } + async next(value?: T): Promise> { +>next : Symbol(ConstantIterator.next, Decl(customAsyncIterator.ts, 3, 5)) +>value : Symbol(value, Decl(customAsyncIterator.ts, 4, 15)) +>T : Symbol(T, Decl(customAsyncIterator.ts, 1, 23)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --)) +>IteratorResult : Symbol(IteratorResult, Decl(lib.es2015.iterable.d.ts, --, --)) +>T : Symbol(T, Decl(customAsyncIterator.ts, 1, 23)) + + if (value != null) { +>value : Symbol(value, Decl(customAsyncIterator.ts, 4, 15)) + + throw new Error("ConstantIterator.prototype.next may not take any values"); +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) + } + return { value: this.constant, done: false }; +>value : Symbol(value, Decl(customAsyncIterator.ts, 8, 16)) +>this.constant : Symbol(ConstantIterator.constant, Decl(customAsyncIterator.ts, 2, 16)) +>this : Symbol(ConstantIterator, Decl(customAsyncIterator.ts, 0, 0)) +>constant : Symbol(ConstantIterator.constant, Decl(customAsyncIterator.ts, 2, 16)) +>done : Symbol(done, Decl(customAsyncIterator.ts, 8, 38)) + } +} diff --git a/tests/baselines/reference/customAsyncIterator.types b/tests/baselines/reference/customAsyncIterator.types new file mode 100644 index 00000000000..63c67cfddd3 --- /dev/null +++ b/tests/baselines/reference/customAsyncIterator.types @@ -0,0 +1,32 @@ +=== tests/cases/compiler/customAsyncIterator.ts === +// GH: https://github.com/microsoft/TypeScript/issues/33239 +class ConstantIterator implements AsyncIterator { +>ConstantIterator : ConstantIterator + + constructor(private constant: T) { +>constant : T + } + async next(value?: T): Promise> { +>next : (value?: T) => Promise> +>value : T + + if (value != null) { +>value != null : boolean +>value : T +>null : null + + throw new Error("ConstantIterator.prototype.next may not take any values"); +>new Error("ConstantIterator.prototype.next may not take any values") : Error +>Error : ErrorConstructor +>"ConstantIterator.prototype.next may not take any values" : "ConstantIterator.prototype.next may not take any values" + } + return { value: this.constant, done: false }; +>{ value: this.constant, done: false } : { value: T; done: false; } +>value : T +>this.constant : T +>this : this +>constant : T +>done : false +>false : false + } +} diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.1.symbols b/tests/baselines/reference/types.asyncGenerators.es2018.1.symbols index 3a0e33ce1b1..5cf681477e5 100644 --- a/tests/baselines/reference/types.asyncGenerators.es2018.1.symbols +++ b/tests/baselines/reference/types.asyncGenerators.es2018.1.symbols @@ -289,4 +289,13 @@ async function * awaitedType2() { >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) } +async function * nextType1(): { next(...args: [] | [number | PromiseLike]): any } { +>nextType1 : Symbol(nextType1, Decl(types.asyncGenerators.es2018.1.ts, 122, 1)) +>next : Symbol(next, Decl(types.asyncGenerators.es2018.1.ts, 123, 31)) +>args : Symbol(args, Decl(types.asyncGenerators.es2018.1.ts, 123, 37)) +>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --)) + + const x = yield; // `number | PromiseLike` (should not await TNext) +>x : Symbol(x, Decl(types.asyncGenerators.es2018.1.ts, 124, 9)) +} diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.1.types b/tests/baselines/reference/types.asyncGenerators.es2018.1.types index 54db9b890ec..3c6e51c56d2 100644 --- a/tests/baselines/reference/types.asyncGenerators.es2018.1.types +++ b/tests/baselines/reference/types.asyncGenerators.es2018.1.types @@ -430,4 +430,13 @@ async function * awaitedType2() { >resolve : { (value: T | PromiseLike): Promise; (): Promise; } >1 : 1 } +async function * nextType1(): { next(...args: [] | [number | PromiseLike]): any } { +>nextType1 : () => { next(...args: [] | [number | PromiseLike]): any; } +>next : (...args: [] | [number | PromiseLike]) => any +>args : [] | [number | PromiseLike] + + const x = yield; // `number | PromiseLike` (should not await TNext) +>x : number | PromiseLike +>yield : number | PromiseLike +} diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.2.errors.txt b/tests/baselines/reference/types.asyncGenerators.es2018.2.errors.txt index d7ec011bced..9f22060b9e9 100644 --- a/tests/baselines/reference/types.asyncGenerators.es2018.2.errors.txt +++ b/tests/baselines/reference/types.asyncGenerators.es2018.2.errors.txt @@ -3,7 +3,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(10,7): error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterableIterator'. Type 'AsyncGenerator' is not assignable to type 'AsyncIterableIterator'. Types of property 'next' are incompatible. - Type '(...args: [] | [PromiseLike]) => Promise>' is not assignable to type '(...args: [] | [PromiseLike]) => Promise>'. + Type '(...args: [] | [undefined]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => Promise>'. Type 'Promise>' is not assignable to type 'Promise>'. Type 'IteratorResult' is not assignable to type 'IteratorResult'. Type 'IteratorYieldResult' is not assignable to type 'IteratorResult'. @@ -14,7 +14,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(16,7): error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterableIterator'. Type 'AsyncGenerator' is not assignable to type 'AsyncIterableIterator'. Types of property 'next' are incompatible. - Type '(...args: [] | [unknown]) => Promise>' is not assignable to type '(...args: [] | [PromiseLike]) => Promise>'. + Type '(...args: [] | [unknown]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => Promise>'. Type 'Promise>' is not assignable to type 'Promise>'. tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(19,7): error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterable'. Type 'AsyncGenerator' is not assignable to type 'AsyncIterable'. @@ -22,7 +22,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterator'. Type 'AsyncGenerator' is not assignable to type 'AsyncIterator'. Types of property 'next' are incompatible. - Type '(...args: [] | [PromiseLike]) => Promise>' is not assignable to type '(...args: [] | [PromiseLike]) => Promise>'. + Type '(...args: [] | [undefined]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => Promise>'. Type 'Promise>' is not assignable to type 'Promise>'. tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(22,7): error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterable'. Type 'AsyncGenerator' is not assignable to type 'AsyncIterable'. @@ -32,7 +32,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterator'. Type 'AsyncGenerator' is not assignable to type 'AsyncIterator'. Types of property 'next' are incompatible. - Type '(...args: [] | [unknown]) => Promise>' is not assignable to type '(...args: [] | [PromiseLike]) => Promise>'. + Type '(...args: [] | [unknown]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => Promise>'. Type 'Promise>' is not assignable to type 'Promise>'. tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(28,7): error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterator'. Type 'AsyncGenerator' is not assignable to type 'AsyncIterator'. @@ -53,7 +53,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(67,42): error TS2741: Property '[Symbol.iterator]' is missing in type 'AsyncGenerator' but required in type 'Iterable'. tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(70,42): error TS2322: Type 'AsyncGenerator' is not assignable to type 'Iterator'. Types of property 'next' are incompatible. - Type '(...args: [] | [PromiseLike]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult'. + Type '(...args: [] | [undefined]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult'. Type 'Promise>' is not assignable to type 'IteratorResult'. Property 'value' is missing in type 'Promise>' but required in type 'IteratorYieldResult'. tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(74,12): error TS2504: Type '{}' must have a '[Symbol.asyncIterator]()' method that returns an async iterator. @@ -79,7 +79,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( !!! error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterableIterator'. !!! error TS2322: Type 'AsyncGenerator' is not assignable to type 'AsyncIterableIterator'. !!! error TS2322: Types of property 'next' are incompatible. -!!! error TS2322: Type '(...args: [] | [PromiseLike]) => Promise>' is not assignable to type '(...args: [] | [PromiseLike]) => Promise>'. +!!! error TS2322: Type '(...args: [] | [undefined]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => Promise>'. !!! error TS2322: Type 'Promise>' is not assignable to type 'Promise>'. !!! error TS2322: Type 'IteratorResult' is not assignable to type 'IteratorResult'. !!! error TS2322: Type 'IteratorYieldResult' is not assignable to type 'IteratorResult'. @@ -98,7 +98,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( !!! error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterableIterator'. !!! error TS2322: Type 'AsyncGenerator' is not assignable to type 'AsyncIterableIterator'. !!! error TS2322: Types of property 'next' are incompatible. -!!! error TS2322: Type '(...args: [] | [unknown]) => Promise>' is not assignable to type '(...args: [] | [PromiseLike]) => Promise>'. +!!! error TS2322: Type '(...args: [] | [unknown]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => Promise>'. !!! error TS2322: Type 'Promise>' is not assignable to type 'Promise>'. yield* (async function * () { yield "a"; })(); }; @@ -110,7 +110,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( !!! error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterator'. !!! error TS2322: Type 'AsyncGenerator' is not assignable to type 'AsyncIterator'. !!! error TS2322: Types of property 'next' are incompatible. -!!! error TS2322: Type '(...args: [] | [PromiseLike]) => Promise>' is not assignable to type '(...args: [] | [PromiseLike]) => Promise>'. +!!! error TS2322: Type '(...args: [] | [undefined]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => Promise>'. !!! error TS2322: Type 'Promise>' is not assignable to type 'Promise>'. yield "a"; }; @@ -128,7 +128,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( !!! error TS2322: Type '() => AsyncGenerator' is not assignable to type '() => AsyncIterator'. !!! error TS2322: Type 'AsyncGenerator' is not assignable to type 'AsyncIterator'. !!! error TS2322: Types of property 'next' are incompatible. -!!! error TS2322: Type '(...args: [] | [unknown]) => Promise>' is not assignable to type '(...args: [] | [PromiseLike]) => Promise>'. +!!! error TS2322: Type '(...args: [] | [unknown]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => Promise>'. !!! error TS2322: Type 'Promise>' is not assignable to type 'Promise>'. yield* (async function * () { yield "a"; })(); }; @@ -211,7 +211,7 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts( ~~~~~~~~~~~~~~~~ !!! error TS2322: Type 'AsyncGenerator' is not assignable to type 'Iterator'. !!! error TS2322: Types of property 'next' are incompatible. -!!! error TS2322: Type '(...args: [] | [PromiseLike]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult'. +!!! error TS2322: Type '(...args: [] | [undefined]) => Promise>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult'. !!! error TS2322: Type 'Promise>' is not assignable to type 'IteratorResult'. !!! error TS2322: Property 'value' is missing in type 'Promise>' but required in type 'IteratorYieldResult'. !!! related TS2728 /.ts/lib.es2015.iterable.d.ts:33:5: 'value' is declared here. diff --git a/tests/cases/compiler/customAsyncIterator.ts b/tests/cases/compiler/customAsyncIterator.ts new file mode 100644 index 00000000000..dcd1140f6b5 --- /dev/null +++ b/tests/cases/compiler/customAsyncIterator.ts @@ -0,0 +1,13 @@ +// @target: esnext + +// GH: https://github.com/microsoft/TypeScript/issues/33239 +class ConstantIterator implements AsyncIterator { + constructor(private constant: T) { + } + async next(value?: T): Promise> { + if (value != null) { + throw new Error("ConstantIterator.prototype.next may not take any values"); + } + return { value: this.constant, done: false }; + } +} \ No newline at end of file diff --git a/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.1.ts b/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.1.ts index f31f453ba5f..6d39be9cef7 100644 --- a/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.1.ts +++ b/tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.1.ts @@ -124,3 +124,6 @@ async function * awaitedType1() { async function * awaitedType2() { const x = await Promise.resolve(1); } +async function * nextType1(): { next(...args: [] | [number | PromiseLike]): any } { + const x = yield; // `number | PromiseLike` (should not await TNext) +} From 1c20aa0b1abdfe60efa6cb08ad667f328daf74a8 Mon Sep 17 00:00:00 2001 From: Jack Williams Date: Wed, 18 Sep 2019 18:54:42 +0100 Subject: [PATCH 37/48] Narrow unknown under inequality when assumed false (#33488) --- src/compiler/checker.ts | 2 +- .../reference/unknownType2.errors.txt | 37 ++++++ tests/baselines/reference/unknownType2.js | 63 ++++++++++ .../baselines/reference/unknownType2.symbols | 105 ++++++++++++++++ tests/baselines/reference/unknownType2.types | 118 ++++++++++++++++++ .../conformance/types/unknown/unknownType2.ts | 37 ++++++ 6 files changed, 361 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9a8cf2f8038..c5787c3b29d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -17453,7 +17453,7 @@ namespace ts { assumeTrue = !assumeTrue; } const valueType = getTypeOfExpression(value); - if ((type.flags & TypeFlags.Unknown) && (operator === SyntaxKind.EqualsEqualsEqualsToken) && assumeTrue) { + if ((type.flags & TypeFlags.Unknown) && assumeTrue && (operator === SyntaxKind.EqualsEqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken)) { if (valueType.flags & (TypeFlags.Primitive | TypeFlags.NonPrimitive)) { return valueType; } diff --git a/tests/baselines/reference/unknownType2.errors.txt b/tests/baselines/reference/unknownType2.errors.txt index 5f08804b9e0..1469526182b 100644 --- a/tests/baselines/reference/unknownType2.errors.txt +++ b/tests/baselines/reference/unknownType2.errors.txt @@ -228,4 +228,41 @@ tests/cases/conformance/types/unknown/unknownType2.ts(216,13): error TS2322: Typ // Arguably this should be never. type End = isTrue> } + + // Repro from #33483 + + function f2(x: unknown): string | undefined { + if (x !== undefined && typeof x !== 'string') { + throw new Error(); + } + return x; + } + + function notNotEquals(u: unknown) { + if (u !== NumberEnum) { } + else { + const o: object = u; + } + + if (u !== NumberEnum.A) { } + else { + const a: NumberEnum.A = u; + } + + + if (u !== NumberEnum.A && u !== NumberEnum.B && u !== StringEnum.A) { } + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; + } + + // equivalent to + if (!(u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A)) { } + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; + } + } + + + + \ No newline at end of file diff --git a/tests/baselines/reference/unknownType2.js b/tests/baselines/reference/unknownType2.js index 2ec5b3ed205..cb1b0a58029 100644 --- a/tests/baselines/reference/unknownType2.js +++ b/tests/baselines/reference/unknownType2.js @@ -221,6 +221,43 @@ function switchResponseWrong(x: unknown): SomeResponse { // Arguably this should be never. type End = isTrue> } + +// Repro from #33483 + +function f2(x: unknown): string | undefined { + if (x !== undefined && typeof x !== 'string') { + throw new Error(); + } + return x; +} + +function notNotEquals(u: unknown) { + if (u !== NumberEnum) { } + else { + const o: object = u; + } + + if (u !== NumberEnum.A) { } + else { + const a: NumberEnum.A = u; + } + + + if (u !== NumberEnum.A && u !== NumberEnum.B && u !== StringEnum.A) { } + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; + } + + // equivalent to + if (!(u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A)) { } + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; + } +} + + + + //// [unknownType2.js] @@ -388,3 +425,29 @@ function switchResponseWrong(x) { throw new Error('Can you repeat the question?'); } } +// Repro from #33483 +function f2(x) { + if (x !== undefined && typeof x !== 'string') { + throw new Error(); + } + return x; +} +function notNotEquals(u) { + if (u !== NumberEnum) { } + else { + var o = u; + } + if (u !== NumberEnum.A) { } + else { + var a = u; + } + if (u !== NumberEnum.A && u !== NumberEnum.B && u !== StringEnum.A) { } + else { + var aOrB = u; + } + // equivalent to + if (!(u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A)) { } + else { + var aOrB = u; + } +} diff --git a/tests/baselines/reference/unknownType2.symbols b/tests/baselines/reference/unknownType2.symbols index 6e871bd4de4..19a1c7fca6e 100644 --- a/tests/baselines/reference/unknownType2.symbols +++ b/tests/baselines/reference/unknownType2.symbols @@ -582,3 +582,108 @@ function switchResponseWrong(x: unknown): SomeResponse { >x : Symbol(x, Decl(unknownType2.ts, 210, 29)) } +// Repro from #33483 + +function f2(x: unknown): string | undefined { +>f2 : Symbol(f2, Decl(unknownType2.ts, 221, 1)) +>x : Symbol(x, Decl(unknownType2.ts, 225, 12)) + + if (x !== undefined && typeof x !== 'string') { +>x : Symbol(x, Decl(unknownType2.ts, 225, 12)) +>undefined : Symbol(undefined) +>x : Symbol(x, Decl(unknownType2.ts, 225, 12)) + + throw new Error(); +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) + } + return x; +>x : Symbol(x, Decl(unknownType2.ts, 225, 12)) +} + +function notNotEquals(u: unknown) { +>notNotEquals : Symbol(notNotEquals, Decl(unknownType2.ts, 230, 1)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) + + if (u !== NumberEnum) { } +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) + + else { + const o: object = u; +>o : Symbol(o, Decl(unknownType2.ts, 235, 13)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) + } + + if (u !== NumberEnum.A) { } +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) +>NumberEnum.A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) + + else { + const a: NumberEnum.A = u; +>a : Symbol(a, Decl(unknownType2.ts, 240, 13)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) + } + + + if (u !== NumberEnum.A && u !== NumberEnum.B && u !== StringEnum.A) { } +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) +>NumberEnum.A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) +>NumberEnum.B : Symbol(NumberEnum.B, Decl(unknownType2.ts, 93, 6)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>B : Symbol(NumberEnum.B, Decl(unknownType2.ts, 93, 6)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) +>StringEnum.A : Symbol(StringEnum.A, Decl(unknownType2.ts, 98, 17)) +>StringEnum : Symbol(StringEnum, Decl(unknownType2.ts, 96, 1)) +>A : Symbol(StringEnum.A, Decl(unknownType2.ts, 98, 17)) + + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; +>aOrB : Symbol(aOrB, Decl(unknownType2.ts, 246, 13)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>B : Symbol(NumberEnum.B, Decl(unknownType2.ts, 93, 6)) +>StringEnum : Symbol(StringEnum, Decl(unknownType2.ts, 96, 1)) +>A : Symbol(StringEnum.A, Decl(unknownType2.ts, 98, 17)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) + } + + // equivalent to + if (!(u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A)) { } +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) +>NumberEnum.A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) +>NumberEnum.B : Symbol(NumberEnum.B, Decl(unknownType2.ts, 93, 6)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>B : Symbol(NumberEnum.B, Decl(unknownType2.ts, 93, 6)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) +>StringEnum.A : Symbol(StringEnum.A, Decl(unknownType2.ts, 98, 17)) +>StringEnum : Symbol(StringEnum, Decl(unknownType2.ts, 96, 1)) +>A : Symbol(StringEnum.A, Decl(unknownType2.ts, 98, 17)) + + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; +>aOrB : Symbol(aOrB, Decl(unknownType2.ts, 252, 13)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>A : Symbol(NumberEnum.A, Decl(unknownType2.ts, 92, 17)) +>NumberEnum : Symbol(NumberEnum, Decl(unknownType2.ts, 90, 1)) +>B : Symbol(NumberEnum.B, Decl(unknownType2.ts, 93, 6)) +>StringEnum : Symbol(StringEnum, Decl(unknownType2.ts, 96, 1)) +>A : Symbol(StringEnum.A, Decl(unknownType2.ts, 98, 17)) +>u : Symbol(u, Decl(unknownType2.ts, 232, 22)) + } +} + + + + + diff --git a/tests/baselines/reference/unknownType2.types b/tests/baselines/reference/unknownType2.types index 7fc3c3d1038..ce3332138d5 100644 --- a/tests/baselines/reference/unknownType2.types +++ b/tests/baselines/reference/unknownType2.types @@ -627,3 +627,121 @@ function switchResponseWrong(x: unknown): SomeResponse { >x : unknown } +// Repro from #33483 + +function f2(x: unknown): string | undefined { +>f2 : (x: unknown) => string | undefined +>x : unknown + + if (x !== undefined && typeof x !== 'string') { +>x !== undefined && typeof x !== 'string' : boolean +>x !== undefined : boolean +>x : unknown +>undefined : undefined +>typeof x !== 'string' : boolean +>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function" +>x : unknown +>'string' : "string" + + throw new Error(); +>new Error() : Error +>Error : ErrorConstructor + } + return x; +>x : string | undefined +} + +function notNotEquals(u: unknown) { +>notNotEquals : (u: unknown) => void +>u : unknown + + if (u !== NumberEnum) { } +>u !== NumberEnum : boolean +>u : unknown +>NumberEnum : typeof NumberEnum + + else { + const o: object = u; +>o : object +>u : object + } + + if (u !== NumberEnum.A) { } +>u !== NumberEnum.A : boolean +>u : unknown +>NumberEnum.A : NumberEnum.A +>NumberEnum : typeof NumberEnum +>A : NumberEnum.A + + else { + const a: NumberEnum.A = u; +>a : NumberEnum.A +>NumberEnum : any +>u : NumberEnum.A + } + + + if (u !== NumberEnum.A && u !== NumberEnum.B && u !== StringEnum.A) { } +>u !== NumberEnum.A && u !== NumberEnum.B && u !== StringEnum.A : boolean +>u !== NumberEnum.A && u !== NumberEnum.B : boolean +>u !== NumberEnum.A : boolean +>u : unknown +>NumberEnum.A : NumberEnum.A +>NumberEnum : typeof NumberEnum +>A : NumberEnum.A +>u !== NumberEnum.B : boolean +>u : unknown +>NumberEnum.B : NumberEnum.B +>NumberEnum : typeof NumberEnum +>B : NumberEnum.B +>u !== StringEnum.A : boolean +>u : unknown +>StringEnum.A : StringEnum.A +>StringEnum : typeof StringEnum +>A : StringEnum.A + + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; +>aOrB : NumberEnum.A | NumberEnum.B | StringEnum.A +>NumberEnum : any +>NumberEnum : any +>StringEnum : any +>u : NumberEnum.A | NumberEnum.B | StringEnum.A + } + + // equivalent to + if (!(u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A)) { } +>!(u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A) : boolean +>(u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A) : boolean +>u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A : boolean +>u === NumberEnum.A || u === NumberEnum.B : boolean +>u === NumberEnum.A : boolean +>u : unknown +>NumberEnum.A : NumberEnum.A +>NumberEnum : typeof NumberEnum +>A : NumberEnum.A +>u === NumberEnum.B : boolean +>u : unknown +>NumberEnum.B : NumberEnum.B +>NumberEnum : typeof NumberEnum +>B : NumberEnum.B +>u === StringEnum.A : boolean +>u : unknown +>StringEnum.A : StringEnum.A +>StringEnum : typeof StringEnum +>A : StringEnum.A + + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; +>aOrB : NumberEnum.A | NumberEnum.B | StringEnum.A +>NumberEnum : any +>NumberEnum : any +>StringEnum : any +>u : NumberEnum.A | NumberEnum.B | StringEnum.A + } +} + + + + + diff --git a/tests/cases/conformance/types/unknown/unknownType2.ts b/tests/cases/conformance/types/unknown/unknownType2.ts index b3d16654b80..7da3093634e 100644 --- a/tests/cases/conformance/types/unknown/unknownType2.ts +++ b/tests/cases/conformance/types/unknown/unknownType2.ts @@ -222,3 +222,40 @@ function switchResponseWrong(x: unknown): SomeResponse { // Arguably this should be never. type End = isTrue> } + +// Repro from #33483 + +function f2(x: unknown): string | undefined { + if (x !== undefined && typeof x !== 'string') { + throw new Error(); + } + return x; +} + +function notNotEquals(u: unknown) { + if (u !== NumberEnum) { } + else { + const o: object = u; + } + + if (u !== NumberEnum.A) { } + else { + const a: NumberEnum.A = u; + } + + + if (u !== NumberEnum.A && u !== NumberEnum.B && u !== StringEnum.A) { } + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; + } + + // equivalent to + if (!(u === NumberEnum.A || u === NumberEnum.B || u === StringEnum.A)) { } + else { + const aOrB: NumberEnum.A | NumberEnum.B | StringEnum.A = u; + } +} + + + + From 683e2810403079c1b99ac39c09698e61a84c70ce Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 18 Sep 2019 13:14:39 -0700 Subject: [PATCH 38/48] Reintroduce cloneInferredPartOfContext to fix overloaded inferences with returnMappers (#33478) --- src/compiler/checker.ts | 9 +- .../twiceNestedKeyofIndexInference.js | 43 ++++++ .../twiceNestedKeyofIndexInference.symbols | 139 ++++++++++++++++++ .../twiceNestedKeyofIndexInference.types | 76 ++++++++++ .../twiceNestedKeyofIndexInference.ts | 32 ++++ 5 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/twiceNestedKeyofIndexInference.js create mode 100644 tests/baselines/reference/twiceNestedKeyofIndexInference.symbols create mode 100644 tests/baselines/reference/twiceNestedKeyofIndexInference.types create mode 100644 tests/cases/compiler/twiceNestedKeyofIndexInference.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c5787c3b29d..3273b7cb185 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15408,6 +15408,13 @@ namespace ts { }; } + function cloneInferredPartOfContext(context: InferenceContext): InferenceContext | undefined { + const inferences = filter(context.inferences, hasInferenceCandidates); + return inferences.length ? + createInferenceContextWorker(map(inferences, cloneInferenceInfo), context.signature, context.flags, context.compareTypes) : + undefined; + } + function getMapperFromContext(context: T): TypeMapper | T & undefined { return context && context.mapper; } @@ -21465,7 +21472,7 @@ namespace ts { const returnContext = createInferenceContext(signature.typeParameters!, signature, context.flags); const returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper); inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType); - context.returnMapper = some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(returnContext) : undefined; + context.returnMapper = some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(cloneInferredPartOfContext(returnContext)) : undefined; } } diff --git a/tests/baselines/reference/twiceNestedKeyofIndexInference.js b/tests/baselines/reference/twiceNestedKeyofIndexInference.js new file mode 100644 index 00000000000..ed4f0c6bfb5 --- /dev/null +++ b/tests/baselines/reference/twiceNestedKeyofIndexInference.js @@ -0,0 +1,43 @@ +//// [twiceNestedKeyofIndexInference.ts] +type Set1 = T extends any[] ? T : Pick> & { + [SK1 in K1]-?: Required>; +}[K1]; + +type Set2 = T extends any[] ? T : Pick> & { + [SK1 in K1]-?: Required<{ + [key in K1]: Set1; + }>; +}[K1]; + +declare function set(source: T, path: [K1], value: T[K1]): Set1; + +declare function set(source: T, path: [K1, K2], value: T[K1][K2]): Set2; + + +interface State { + a: { + b: string; + c: number; + }; + d: boolean; +} + +const state: State = { + a: { + b: "", + c: 0, + }, + d: false, +}; + +const newState: State = set(state, ["a", 'b'], 'why'); // shouldn't be an error + +//// [twiceNestedKeyofIndexInference.js] +var state = { + a: { + b: "", + c: 0 + }, + d: false +}; +var newState = set(state, ["a", 'b'], 'why'); // shouldn't be an error diff --git a/tests/baselines/reference/twiceNestedKeyofIndexInference.symbols b/tests/baselines/reference/twiceNestedKeyofIndexInference.symbols new file mode 100644 index 00000000000..57fa8e738b2 --- /dev/null +++ b/tests/baselines/reference/twiceNestedKeyofIndexInference.symbols @@ -0,0 +1,139 @@ +=== tests/cases/compiler/twiceNestedKeyofIndexInference.ts === +type Set1 = T extends any[] ? T : Pick> & { +>Set1 : Symbol(Set1, Decl(twiceNestedKeyofIndexInference.ts, 0, 0)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 0, 10)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 0, 12)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 0, 10)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 0, 10)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 0, 10)) +>Pick : Symbol(Pick, Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 0, 10)) +>Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 0, 10)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 0, 12)) + + [SK1 in K1]-?: Required>; +>SK1 : Symbol(SK1, Decl(twiceNestedKeyofIndexInference.ts, 1, 5)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 0, 12)) +>Required : Symbol(Required, Decl(lib.es5.d.ts, --, --)) +>Pick : Symbol(Pick, Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 0, 10)) +>SK1 : Symbol(SK1, Decl(twiceNestedKeyofIndexInference.ts, 1, 5)) + +}[K1]; +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 0, 12)) + +type Set2 = T extends any[] ? T : Pick> & { +>Set2 : Symbol(Set2, Decl(twiceNestedKeyofIndexInference.ts, 2, 6)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 4, 10)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 4, 12)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 4, 10)) +>K2 : Symbol(K2, Decl(twiceNestedKeyofIndexInference.ts, 4, 32)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 4, 10)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 4, 12)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 4, 10)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 4, 10)) +>Pick : Symbol(Pick, Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 4, 10)) +>Exclude : Symbol(Exclude, Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 4, 10)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 4, 12)) + + [SK1 in K1]-?: Required<{ +>SK1 : Symbol(SK1, Decl(twiceNestedKeyofIndexInference.ts, 5, 5)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 4, 12)) +>Required : Symbol(Required, Decl(lib.es5.d.ts, --, --)) + + [key in K1]: Set1; +>key : Symbol(key, Decl(twiceNestedKeyofIndexInference.ts, 6, 9)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 4, 12)) +>Set1 : Symbol(Set1, Decl(twiceNestedKeyofIndexInference.ts, 0, 0)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 4, 10)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 4, 12)) +>K2 : Symbol(K2, Decl(twiceNestedKeyofIndexInference.ts, 4, 32)) + + }>; +}[K1]; +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 4, 12)) + +declare function set(source: T, path: [K1], value: T[K1]): Set1; +>set : Symbol(set, Decl(twiceNestedKeyofIndexInference.ts, 8, 6), Decl(twiceNestedKeyofIndexInference.ts, 10, 94)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 10, 21)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 10, 23)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 10, 21)) +>source : Symbol(source, Decl(twiceNestedKeyofIndexInference.ts, 10, 44)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 10, 21)) +>path : Symbol(path, Decl(twiceNestedKeyofIndexInference.ts, 10, 54)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 10, 23)) +>value : Symbol(value, Decl(twiceNestedKeyofIndexInference.ts, 10, 66)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 10, 21)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 10, 23)) +>Set1 : Symbol(Set1, Decl(twiceNestedKeyofIndexInference.ts, 0, 0)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 10, 21)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 10, 23)) + +declare function set(source: T, path: [K1, K2], value: T[K1][K2]): Set2; +>set : Symbol(set, Decl(twiceNestedKeyofIndexInference.ts, 8, 6), Decl(twiceNestedKeyofIndexInference.ts, 10, 94)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 12, 21)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 12, 23)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 12, 21)) +>K2 : Symbol(K2, Decl(twiceNestedKeyofIndexInference.ts, 12, 43)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 12, 21)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 12, 23)) +>source : Symbol(source, Decl(twiceNestedKeyofIndexInference.ts, 12, 68)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 12, 21)) +>path : Symbol(path, Decl(twiceNestedKeyofIndexInference.ts, 12, 78)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 12, 23)) +>K2 : Symbol(K2, Decl(twiceNestedKeyofIndexInference.ts, 12, 43)) +>value : Symbol(value, Decl(twiceNestedKeyofIndexInference.ts, 12, 94)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 12, 21)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 12, 23)) +>K2 : Symbol(K2, Decl(twiceNestedKeyofIndexInference.ts, 12, 43)) +>Set2 : Symbol(Set2, Decl(twiceNestedKeyofIndexInference.ts, 2, 6)) +>T : Symbol(T, Decl(twiceNestedKeyofIndexInference.ts, 12, 21)) +>K1 : Symbol(K1, Decl(twiceNestedKeyofIndexInference.ts, 12, 23)) +>K2 : Symbol(K2, Decl(twiceNestedKeyofIndexInference.ts, 12, 43)) + + +interface State { +>State : Symbol(State, Decl(twiceNestedKeyofIndexInference.ts, 12, 130)) + + a: { +>a : Symbol(State.a, Decl(twiceNestedKeyofIndexInference.ts, 15, 17)) + + b: string; +>b : Symbol(b, Decl(twiceNestedKeyofIndexInference.ts, 16, 8)) + + c: number; +>c : Symbol(c, Decl(twiceNestedKeyofIndexInference.ts, 17, 18)) + + }; + d: boolean; +>d : Symbol(State.d, Decl(twiceNestedKeyofIndexInference.ts, 19, 6)) +} + +const state: State = { +>state : Symbol(state, Decl(twiceNestedKeyofIndexInference.ts, 23, 5)) +>State : Symbol(State, Decl(twiceNestedKeyofIndexInference.ts, 12, 130)) + + a: { +>a : Symbol(a, Decl(twiceNestedKeyofIndexInference.ts, 23, 22)) + + b: "", +>b : Symbol(b, Decl(twiceNestedKeyofIndexInference.ts, 24, 8)) + + c: 0, +>c : Symbol(c, Decl(twiceNestedKeyofIndexInference.ts, 25, 14)) + + }, + d: false, +>d : Symbol(d, Decl(twiceNestedKeyofIndexInference.ts, 27, 6)) + +}; + +const newState: State = set(state, ["a", 'b'], 'why'); // shouldn't be an error +>newState : Symbol(newState, Decl(twiceNestedKeyofIndexInference.ts, 31, 5)) +>State : Symbol(State, Decl(twiceNestedKeyofIndexInference.ts, 12, 130)) +>set : Symbol(set, Decl(twiceNestedKeyofIndexInference.ts, 8, 6), Decl(twiceNestedKeyofIndexInference.ts, 10, 94)) +>state : Symbol(state, Decl(twiceNestedKeyofIndexInference.ts, 23, 5)) + diff --git a/tests/baselines/reference/twiceNestedKeyofIndexInference.types b/tests/baselines/reference/twiceNestedKeyofIndexInference.types new file mode 100644 index 00000000000..68622038e72 --- /dev/null +++ b/tests/baselines/reference/twiceNestedKeyofIndexInference.types @@ -0,0 +1,76 @@ +=== tests/cases/compiler/twiceNestedKeyofIndexInference.ts === +type Set1 = T extends any[] ? T : Pick> & { +>Set1 : Set1 + + [SK1 in K1]-?: Required>; +}[K1]; + +type Set2 = T extends any[] ? T : Pick> & { +>Set2 : Set2 + + [SK1 in K1]-?: Required<{ + [key in K1]: Set1; + }>; +}[K1]; + +declare function set(source: T, path: [K1], value: T[K1]): Set1; +>set : { (source: T, path: [K1], value: T[K1]): Set1; (source: T, path: [K1, K2], value: T[K1][K2]): Set2; } +>source : T +>path : [K1] +>value : T[K1] + +declare function set(source: T, path: [K1, K2], value: T[K1][K2]): Set2; +>set : { (source: T, path: [K1], value: T[K1]): Set1; (source: T, path: [K1, K2], value: T[K1][K2]): Set2; } +>source : T +>path : [K1, K2] +>value : T[K1][K2] + + +interface State { + a: { +>a : { b: string; c: number; } + + b: string; +>b : string + + c: number; +>c : number + + }; + d: boolean; +>d : boolean +} + +const state: State = { +>state : State +>{ a: { b: "", c: 0, }, d: false,} : { a: { b: string; c: number; }; d: false; } + + a: { +>a : { b: string; c: number; } +>{ b: "", c: 0, } : { b: string; c: number; } + + b: "", +>b : string +>"" : "" + + c: 0, +>c : number +>0 : 0 + + }, + d: false, +>d : false +>false : false + +}; + +const newState: State = set(state, ["a", 'b'], 'why'); // shouldn't be an error +>newState : State +>set(state, ["a", 'b'], 'why') : Pick & Required<{ a: Pick<{ b: string; c: number; }, "c"> & Required>; }> +>set : { (source: T, path: [K1], value: T[K1]): Set1; (source: T, path: [K1, K2], value: T[K1][K2]): Set2; } +>state : State +>["a", 'b'] : ["a", "b"] +>"a" : "a" +>'b' : "b" +>'why' : "why" + diff --git a/tests/cases/compiler/twiceNestedKeyofIndexInference.ts b/tests/cases/compiler/twiceNestedKeyofIndexInference.ts new file mode 100644 index 00000000000..35fb39b009e --- /dev/null +++ b/tests/cases/compiler/twiceNestedKeyofIndexInference.ts @@ -0,0 +1,32 @@ +type Set1 = T extends any[] ? T : Pick> & { + [SK1 in K1]-?: Required>; +}[K1]; + +type Set2 = T extends any[] ? T : Pick> & { + [SK1 in K1]-?: Required<{ + [key in K1]: Set1; + }>; +}[K1]; + +declare function set(source: T, path: [K1], value: T[K1]): Set1; + +declare function set(source: T, path: [K1, K2], value: T[K1][K2]): Set2; + + +interface State { + a: { + b: string; + c: number; + }; + d: boolean; +} + +const state: State = { + a: { + b: "", + c: 0, + }, + d: false, +}; + +const newState: State = set(state, ["a", 'b'], 'why'); // shouldn't be an error \ No newline at end of file From 5e06bea48155d3ffea13917a3bda72b09bf18488 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 18 Sep 2019 13:56:24 -0700 Subject: [PATCH 39/48] =?UTF-8?q?getConstraintDeclaration=20gets=20the=20f?= =?UTF-8?q?irst=20declaration=20with=20a=20constraint=E2=80=A6=20(#33426)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * getConstraintDeclaration gets the first declaration with a constraint, rather than just the first declaration * Add type annotation * Update comment --- src/compiler/checker.ts | 14 +++-- ...UnconstrainedNoErrorIrrespectiveOfOrder.js | 28 ++++++++++ ...strainedNoErrorIrrespectiveOfOrder.symbols | 51 +++++++++++++++++++ ...onstrainedNoErrorIrrespectiveOfOrder.types | 27 ++++++++++ ...erfacesWithDifferentConstraints.errors.txt | 10 +--- ...nericInterfacesWithDifferentConstraints.js | 2 +- ...InterfacesWithDifferentConstraints.symbols | 2 +- ...icInterfacesWithDifferentConstraints.types | 2 +- ...UnconstrainedNoErrorIrrespectiveOfOrder.ts | 19 +++++++ ...nericInterfacesWithDifferentConstraints.ts | 2 +- 10 files changed, 137 insertions(+), 20 deletions(-) create mode 100644 tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.js create mode 100644 tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.symbols create mode 100644 tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.types create mode 100644 tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 3273b7cb185..463d00c13e2 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -8971,9 +8971,8 @@ namespace ts { return undefined; } - function getConstraintDeclaration(type: TypeParameter) { - const decl = type.symbol && getDeclarationOfKind(type.symbol, SyntaxKind.TypeParameter); - return decl && getEffectiveConstraintOfTypeParameter(decl); + function getConstraintDeclaration(type: TypeParameter): TypeNode | undefined { + return mapDefined(filter(type.symbol && type.symbol.declarations, isTypeParameterDeclaration), getEffectiveConstraintOfTypeParameter)[0]; } function getInferredTypeParameterConstraint(typeParameter: TypeParameter) { @@ -29242,11 +29241,10 @@ namespace ts { const constraint = getEffectiveConstraintOfTypeParameter(source); const sourceConstraint = constraint && getTypeFromTypeNode(constraint); const targetConstraint = getConstraintOfTypeParameter(target); - if (sourceConstraint) { - // relax check if later interface augmentation has no constraint - if (!targetConstraint || !isTypeIdenticalTo(sourceConstraint, targetConstraint)) { - return false; - } + // relax check if later interface augmentation has no constraint, it's more broad and is OK to merge with + // a more constrained interface (this could be generalized to a full heirarchy check, but that's maybe overkill) + if (sourceConstraint && targetConstraint && !isTypeIdenticalTo(sourceConstraint, targetConstraint)) { + return false; } // If the type parameter node has a default and it is not identical to the default diff --git a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.js b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.js new file mode 100644 index 00000000000..a4241186639 --- /dev/null +++ b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.js @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts] //// + +//// [working.ts] +// minmal samples from #33395 +export namespace ns { + interface Function any> { + throttle(): Function; + } + interface Function { + unary(): Function<() => ReturnType>; + } +} +//// [regression.ts] +export namespace ns { + interface Function { + unary(): Function<() => ReturnType>; + } + interface Function any> { + throttle(): Function; + } +} + +//// [working.js] +"use strict"; +exports.__esModule = true; +//// [regression.js] +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.symbols b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.symbols new file mode 100644 index 00000000000..5dc01da7c48 --- /dev/null +++ b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.symbols @@ -0,0 +1,51 @@ +=== tests/cases/compiler/working.ts === +// minmal samples from #33395 +export namespace ns { +>ns : Symbol(ns, Decl(working.ts, 0, 0)) + + interface Function any> { +>Function : Symbol(Function, Decl(working.ts, 1, 21), Decl(working.ts, 4, 5)) +>T : Symbol(T, Decl(working.ts, 2, 23), Decl(working.ts, 5, 23)) +>args : Symbol(args, Decl(working.ts, 2, 34)) + + throttle(): Function; +>throttle : Symbol(Function.throttle, Decl(working.ts, 2, 57)) +>Function : Symbol(Function, Decl(working.ts, 1, 21), Decl(working.ts, 4, 5)) +>T : Symbol(T, Decl(working.ts, 2, 23), Decl(working.ts, 5, 23)) + } + interface Function { +>Function : Symbol(Function, Decl(working.ts, 1, 21), Decl(working.ts, 4, 5)) +>T : Symbol(T, Decl(working.ts, 2, 23), Decl(working.ts, 5, 23)) + + unary(): Function<() => ReturnType>; +>unary : Symbol(Function.unary, Decl(working.ts, 5, 27)) +>Function : Symbol(Function, Decl(working.ts, 1, 21), Decl(working.ts, 4, 5)) +>ReturnType : Symbol(ReturnType, Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(working.ts, 2, 23), Decl(working.ts, 5, 23)) + } +} +=== tests/cases/compiler/regression.ts === +export namespace ns { +>ns : Symbol(ns, Decl(regression.ts, 0, 0)) + + interface Function { +>Function : Symbol(Function, Decl(regression.ts, 0, 21), Decl(regression.ts, 3, 5)) +>T : Symbol(T, Decl(regression.ts, 1, 23), Decl(regression.ts, 4, 23)) + + unary(): Function<() => ReturnType>; +>unary : Symbol(Function.unary, Decl(regression.ts, 1, 27)) +>Function : Symbol(Function, Decl(regression.ts, 0, 21), Decl(regression.ts, 3, 5)) +>ReturnType : Symbol(ReturnType, Decl(lib.es5.d.ts, --, --)) +>T : Symbol(T, Decl(regression.ts, 1, 23), Decl(regression.ts, 4, 23)) + } + interface Function any> { +>Function : Symbol(Function, Decl(regression.ts, 0, 21), Decl(regression.ts, 3, 5)) +>T : Symbol(T, Decl(regression.ts, 1, 23), Decl(regression.ts, 4, 23)) +>args : Symbol(args, Decl(regression.ts, 4, 34)) + + throttle(): Function; +>throttle : Symbol(Function.throttle, Decl(regression.ts, 4, 57)) +>Function : Symbol(Function, Decl(regression.ts, 0, 21), Decl(regression.ts, 3, 5)) +>T : Symbol(T, Decl(regression.ts, 1, 23), Decl(regression.ts, 4, 23)) + } +} diff --git a/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.types b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.types new file mode 100644 index 00000000000..e42e438c983 --- /dev/null +++ b/tests/baselines/reference/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.types @@ -0,0 +1,27 @@ +=== tests/cases/compiler/working.ts === +// minmal samples from #33395 +export namespace ns { + interface Function any> { +>args : any + + throttle(): Function; +>throttle : () => Function + } + interface Function { + unary(): Function<() => ReturnType>; +>unary : () => Function<() => ReturnType> + } +} +=== tests/cases/compiler/regression.ts === +export namespace ns { + interface Function { + unary(): Function<() => ReturnType>; +>unary : () => Function<() => ReturnType> + } + interface Function any> { +>args : any + + throttle(): Function; +>throttle : () => Function + } +} diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt index 21a35e0553b..edc33d6b1ba 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt @@ -4,11 +4,9 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDi tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(14,15): error TS2428: All declarations of 'B' must have identical type parameters. tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(32,22): error TS2428: All declarations of 'A' must have identical type parameters. tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(38,22): error TS2428: All declarations of 'A' must have identical type parameters. -tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(53,11): error TS2428: All declarations of 'C' must have identical type parameters. -tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(57,11): error TS2428: All declarations of 'C' must have identical type parameters. -==== tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts (8 errors) ==== +==== tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts (6 errors) ==== interface A { ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. @@ -74,14 +72,10 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDi } interface C { - ~ -!!! error TS2428: All declarations of 'C' must have identical type parameters. x: T; } - interface C { // error - ~ -!!! error TS2428: All declarations of 'C' must have identical type parameters. + interface C { // ok y: T; } diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js index 5b1964b2891..7e62915cb54 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js @@ -55,7 +55,7 @@ interface C { x: T; } -interface C { // error +interface C { // ok y: T; } diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols index a1ad41441bd..6dd5de33354 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols @@ -137,7 +137,7 @@ interface C { >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 52, 12), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 56, 12)) } -interface C { // error +interface C { // ok >C : Symbol(C, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 50, 1), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 54, 1)) >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 52, 12), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 56, 12)) diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types index 70a8be8cb3a..87877311b53 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types @@ -70,7 +70,7 @@ interface C { >x : T } -interface C { // error +interface C { // ok y: T; >y : T } diff --git a/tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts b/tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts new file mode 100644 index 00000000000..7bbce8e8b03 --- /dev/null +++ b/tests/cases/compiler/interfaceMergedUnconstrainedNoErrorIrrespectiveOfOrder.ts @@ -0,0 +1,19 @@ +// @filename: working.ts +// minmal samples from #33395 +export namespace ns { + interface Function any> { + throttle(): Function; + } + interface Function { + unary(): Function<() => ReturnType>; + } +} +// @filename: regression.ts +export namespace ns { + interface Function { + unary(): Function<() => ReturnType>; + } + interface Function any> { + throttle(): Function; + } +} \ No newline at end of file diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts index 4c698626eb0..6963277915a 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts @@ -54,7 +54,7 @@ interface C { x: T; } -interface C { // error +interface C { // ok y: T; } From e430f2a81cafb3fe31a32c42321c769a3d084056 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 18 Sep 2019 14:02:41 -0700 Subject: [PATCH 40/48] Add output file names api for supporting ts-loader --- src/compiler/builder.ts | 4 +- src/compiler/emitter.ts | 90 +++++++++++++------ src/compiler/program.ts | 4 +- src/compiler/tsbuild.ts | 2 +- src/compiler/watch.ts | 2 +- .../reference/api/tsserverlibrary.d.ts | 2 + tests/baselines/reference/api/typescript.d.ts | 2 + 7 files changed, 71 insertions(+), 35 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index 653832c8dbd..a67a6a246cc 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -257,7 +257,7 @@ namespace ts { function convertToDiagnostics(diagnostics: readonly ReusableDiagnostic[], newProgram: Program, getCanonicalFileName: GetCanonicalFileName): readonly Diagnostic[] { if (!diagnostics.length) return emptyArray; - const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!, newProgram.getCurrentDirectory())); + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(newProgram.getCompilerOptions())!, newProgram.getCurrentDirectory())); return diagnostics.map(diagnostic => { const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath); result.reportsUnnecessary = diagnostic.reportsUnnecessary; @@ -656,7 +656,7 @@ namespace ts { function getProgramBuildInfo(state: Readonly, getCanonicalFileName: GetCanonicalFileName): ProgramBuildInfo | undefined { if (state.compilerOptions.outFile || state.compilerOptions.out) return undefined; const currentDirectory = Debug.assertDefined(state.program).getCurrentDirectory(); - const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getOutputPathForBuildInfo(state.compilerOptions)!, currentDirectory)); + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(state.compilerOptions)!, currentDirectory)); const fileInfos: MapLike = {}; state.fileInfos.forEach((value, key) => { const signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key); diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 91df5402be3..7bad8359b26 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -45,14 +45,13 @@ namespace ts { } } if (includeBuildInfo) { - const buildInfoPath = getOutputPathForBuildInfo(host.getCompilerOptions()); + const buildInfoPath = getTsBuildInfoEmitOutputFilePath(host.getCompilerOptions()); if (buildInfoPath) return action({ buildInfoPath }, /*sourceFileOrBundle*/ undefined); } } } - /*@internal*/ - export function getOutputPathForBuildInfo(options: CompilerOptions) { + export function getTsBuildInfoEmitOutputFilePath(options: CompilerOptions) { const configFile = options.configFilePath; if (!isIncrementalCompilation(options)) return undefined; if (options.tsBuildInfoFile) return options.tsBuildInfoFile; @@ -80,7 +79,7 @@ namespace ts { const sourceMapFilePath = jsFilePath && getSourceMapFilePath(jsFilePath, options); const declarationFilePath = (forceDtsPaths || getEmitDeclarations(options)) ? removeFileExtension(outPath) + Extension.Dts : undefined; const declarationMapPath = declarationFilePath && getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined; - const buildInfoPath = getOutputPathForBuildInfo(options); + const buildInfoPath = getTsBuildInfoEmitOutputFilePath(options); return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }; } @@ -170,38 +169,71 @@ namespace ts { undefined; } + function createAddOutput() { + let outputs: string[] | undefined; + return { addOutput, getOutputs }; + function addOutput(path: string | undefined) { + if (path) { + (outputs || (outputs = [])).push(path); + } + } + function getOutputs(): readonly string[] { + return outputs || emptyArray; + } + } + + function getSingleOutputFileNames(configFile: ParsedCommandLine, addOutput: ReturnType["addOutput"]) { + const { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath } = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false); + addOutput(jsFilePath); + addOutput(sourceMapFilePath); + addOutput(declarationFilePath); + addOutput(declarationMapPath); + addOutput(buildInfoPath); + } + + function getOwnOutputFileNames(configFile: ParsedCommandLine, inputFileName: string, ignoreCase: boolean, addOutput: ReturnType["addOutput"]) { + if (fileExtensionIs(inputFileName, Extension.Dts)) return; + const js = getOutputJSFileName(inputFileName, configFile, ignoreCase); + addOutput(js); + if (fileExtensionIs(inputFileName, Extension.Json)) return; + if (js && configFile.options.sourceMap) { + addOutput(`${js}.map`); + } + if (getEmitDeclarations(configFile.options) && hasTSFileExtension(inputFileName)) { + const dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase); + addOutput(dts); + if (configFile.options.declarationMap) { + addOutput(`${dts}.map`); + } + } + } + /*@internal*/ export function getAllProjectOutputs(configFile: ParsedCommandLine, ignoreCase: boolean): readonly string[] { - let outputs: string[] | undefined; - const addOutput = (path: string | undefined) => path && (outputs || (outputs = [])).push(path); + const { addOutput, getOutputs } = createAddOutput(); if (configFile.options.outFile || configFile.options.out) { - const { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath } = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false); - addOutput(jsFilePath); - addOutput(sourceMapFilePath); - addOutput(declarationFilePath); - addOutput(declarationMapPath); - addOutput(buildInfoPath); + getSingleOutputFileNames(configFile, addOutput); } else { for (const inputFileName of configFile.fileNames) { - if (fileExtensionIs(inputFileName, Extension.Dts)) continue; - const js = getOutputJSFileName(inputFileName, configFile, ignoreCase); - addOutput(js); - if (fileExtensionIs(inputFileName, Extension.Json)) continue; - if (js && configFile.options.sourceMap) { - addOutput(`${js}.map`); - } - if (getEmitDeclarations(configFile.options) && hasTSFileExtension(inputFileName)) { - const dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase); - addOutput(dts); - if (configFile.options.declarationMap) { - addOutput(`${dts}.map`); - } - } + getOwnOutputFileNames(configFile, inputFileName, ignoreCase, addOutput); } - addOutput(getOutputPathForBuildInfo(configFile.options)); + addOutput(getTsBuildInfoEmitOutputFilePath(configFile.options)); } - return outputs || emptyArray; + return getOutputs(); + } + + export function getOutputFileNames(commandLine: ParsedCommandLine, inputFileName: string, ignoreCase: boolean): readonly string[] { + inputFileName = normalizePath(inputFileName); + Debug.assert(contains(commandLine.fileNames, inputFileName), `Expected fileName to be present in command line`); + const { addOutput, getOutputs } = createAddOutput(); + if (commandLine.options.outFile || commandLine.options.out) { + getSingleOutputFileNames(commandLine, addOutput); + } + else { + getOwnOutputFileNames(commandLine, inputFileName, ignoreCase, addOutput); + } + return getOutputs(); } /*@internal*/ @@ -220,7 +252,7 @@ namespace ts { return getOutputDeclarationFileName(inputFileName, configFile, ignoreCase); } } - const buildInfoPath = getOutputPathForBuildInfo(configFile.options); + const buildInfoPath = getTsBuildInfoEmitOutputFilePath(configFile.options); if (buildInfoPath) return buildInfoPath; return Debug.fail(`project ${configFile.options.configFilePath} expected to have at least one output`); } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 68eccdff307..427ab577bf3 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -3108,7 +3108,7 @@ namespace ts { } function verifyProjectReferences() { - const buildInfoPath = !options.noEmit && !options.suppressOutputPathCheck ? getOutputPathForBuildInfo(options) : undefined; + const buildInfoPath = !options.noEmit && !options.suppressOutputPathCheck ? getTsBuildInfoEmitOutputFilePath(options) : undefined; forEachProjectReference(projectReferences, resolvedProjectReferences, (resolvedRef, index, parent) => { const ref = (parent ? parent.commandLine.projectReferences : projectReferences)![index]; const parentFile = parent && parent.sourceFile as JsonSourceFile; @@ -3135,7 +3135,7 @@ namespace ts { createDiagnosticForReference(parentFile, index, Diagnostics.Cannot_prepend_project_0_because_it_does_not_have_outFile_set, ref.path); } } - if (!parent && buildInfoPath && buildInfoPath === getOutputPathForBuildInfo(options)) { + if (!parent && buildInfoPath && buildInfoPath === getTsBuildInfoEmitOutputFilePath(options)) { createDiagnosticForReference(parentFile, index, Diagnostics.Cannot_write_file_0_because_it_will_overwrite_tsbuildinfo_file_generated_by_referenced_project_1, buildInfoPath, ref.path); hasEmitBlockingDiagnostics.set(toPath(buildInfoPath), true); } diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index d572fc9dad8..69b90135fd0 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -1621,7 +1621,7 @@ namespace ts { if (!state.buildInfoChecked.has(resolvedPath)) { state.buildInfoChecked.set(resolvedPath, true); - const buildInfoPath = getOutputPathForBuildInfo(project.options); + const buildInfoPath = getTsBuildInfoEmitOutputFilePath(project.options); if (buildInfoPath) { const value = state.readFileWithCache(buildInfoPath); const buildInfo = value && getBuildInfo(value); diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index b3b4739a2c6..652b85d000d 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -447,7 +447,7 @@ namespace ts { } export function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost) { if (compilerOptions.out || compilerOptions.outFile) return undefined; - const buildInfoPath = getOutputPathForBuildInfo(compilerOptions); + const buildInfoPath = getTsBuildInfoEmitOutputFilePath(compilerOptions); if (!buildInfoPath) return undefined; const content = host.readFile(buildInfoPath); if (!content) return undefined; diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 58d513b2e0a..79450ca83c9 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -4289,6 +4289,8 @@ declare namespace ts { function visitEachChild(node: T | undefined, visitor: Visitor, context: TransformationContext, nodesVisitor?: typeof visitNodes, tokenVisitor?: Visitor): T | undefined; } declare namespace ts { + function getTsBuildInfoEmitOutputFilePath(options: CompilerOptions): string | undefined; + function getOutputFileNames(commandLine: ParsedCommandLine, inputFileName: string, ignoreCase: boolean): readonly string[]; function createPrinter(printerOptions?: PrinterOptions, handlers?: PrintHandlers): Printer; } declare namespace ts { diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index bc71eaffa37..f0ae718d570 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4289,6 +4289,8 @@ declare namespace ts { function visitEachChild(node: T | undefined, visitor: Visitor, context: TransformationContext, nodesVisitor?: typeof visitNodes, tokenVisitor?: Visitor): T | undefined; } declare namespace ts { + function getTsBuildInfoEmitOutputFilePath(options: CompilerOptions): string | undefined; + function getOutputFileNames(commandLine: ParsedCommandLine, inputFileName: string, ignoreCase: boolean): readonly string[]; function createPrinter(printerOptions?: PrinterOptions, handlers?: PrintHandlers): Printer; } declare namespace ts { From 7b77b497810273c2a58f812d5082fab05333893e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 19 Sep 2019 08:26:52 -0700 Subject: [PATCH 41/48] Enable caching for control flow paths that precede loops --- src/compiler/checker.ts | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 463d00c13e2..19ffdf46ae0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -17309,24 +17309,31 @@ namespace ts { const antecedentTypes: Type[] = []; let subtypeReduction = false; let firstAntecedentType: FlowType | undefined; - flowLoopNodes[flowLoopCount] = flow; - flowLoopKeys[flowLoopCount] = key; - flowLoopTypes[flowLoopCount] = antecedentTypes; for (const antecedent of flow.antecedents!) { - flowLoopCount++; - const flowType = getTypeAtFlowNode(antecedent); - flowLoopCount--; + let flowType; if (!firstAntecedentType) { - firstAntecedentType = flowType; + // The first antecedent of a loop junction is always the non-looping control + // flow path that leads to the top. + flowType = firstAntecedentType = getTypeAtFlowNode(antecedent); + } + else { + // All but the first antecedent are the looping control flow paths that lead + // back to the loop junction. We track these on the flow loop stack. + flowLoopNodes[flowLoopCount] = flow; + flowLoopKeys[flowLoopCount] = key; + flowLoopTypes[flowLoopCount] = antecedentTypes; + flowLoopCount++; + flowType = getTypeAtFlowNode(antecedent); + flowLoopCount--; + // If we see a value appear in the cache it is a sign that control flow analysis + // was restarted and completed by checkExpressionCached. We can simply pick up + // the resulting type and bail out. + const cached = cache.get(key); + if (cached) { + return cached; + } } const type = getTypeFromFlowType(flowType); - // If we see a value appear in the cache it is a sign that control flow analysis - // was restarted and completed by checkExpressionCached. We can simply pick up - // the resulting type and bail out. - const cached = cache.get(key); - if (cached) { - return cached; - } pushIfUnique(antecedentTypes, type); // If an antecedent type is not a subset of the declared type, we need to perform // subtype reduction. This happens when a "foreign" type is injected into the control From 816e3f32ea39320281965ebbda390fde2c0ed667 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Thu, 19 Sep 2019 11:35:19 -0700 Subject: [PATCH 42/48] Fix ESLint extension config (#33501) * Fix ESLint extension config * Delete workingDirectories --- .vscode/settings.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4f481751900..14f7984e7e9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,8 +6,7 @@ } ], "eslint.options": { - "rulePaths": ["../scripts/eslint/built/rules/"], + "rulePaths": ["./scripts/eslint/built/rules/"], "ext": [".ts"] - }, - "eslint.workingDirectories": ["./src", "./scripts"] + } } \ No newline at end of file From e60d28e6f76e7bbb25e06a1742dc9a24fd7a1f16 Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Thu, 19 Sep 2019 14:09:54 -0700 Subject: [PATCH 43/48] Update user baselines (#33508) --- .../baselines/reference/docker/azure-sdk.log | 20 +++---- .../reference/docker/office-ui-fabric.log | 5 +- tests/baselines/reference/user/jimp.log | 52 ------------------- 3 files changed, 14 insertions(+), 63 deletions(-) delete mode 100644 tests/baselines/reference/user/jimp.log diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index fb911c5a367..a7ec47a5a84 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -9,11 +9,12 @@ XX of XX: [@azure/abort-controller] completed successfully in ? seconds XX of XX: [@azure/core-auth] completed successfully in ? seconds XX of XX: [@azure/core-tracing] completed successfully in ? seconds XX of XX: [@azure/core-http] completed successfully in ? seconds +XX of XX: [@azure/identity] completed successfully in ? seconds +XX of XX: [@azure/core-amqp] completed successfully in ? seconds XX of XX: [@azure/core-arm] completed successfully in ? seconds XX of XX: [@azure/core-paging] completed successfully in ? seconds -XX of XX: [@azure/identity] completed successfully in ? seconds XX of XX: [@azure/test-utils-recorder] completed successfully in ? seconds -XX of XX: [@azure/core-amqp] completed successfully in ? seconds +XX of XX: [@azure/event-hubs] completed successfully in ? seconds XX of XX: [@azure/event-processor-host] completed successfully in ? seconds XX of XX: [@azure/keyvault-keys] completed successfully in ? seconds XX of XX: [@azure/keyvault-secrets] completed successfully in ? seconds @@ -23,7 +24,7 @@ Warning: You have changed the public API signature for this project. Updating re dist-esm/index.js → dist/index.js... (!) Unresolved dependencies https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency -tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) +tslib (imported by dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/auth.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) @azure/cosmos-sign (imported by dist-esm/auth.js) universal-user-agent (imported by dist-esm/common/platform.js) uuid/v4 (imported by dist-esm/ClientContext.js, dist-esm/client/Item/Items.js) @@ -38,7 +39,7 @@ crypto-hash (imported by dist-esm/queryExecutionContext/EndpointComponent/Ordere fast-json-stable-stringify (imported by dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js) (!) Missing global variable names Use output.globals to specify browser global variable names corresponding to external modules -universal-user-agent (guessing 'userAgent') +universal-user-agent (guessing 'universalUserAgent') tslib (guessing 'tslib') @azure/cosmos-sign (guessing 'cosmosSign') debug (guessing 'debugLib') @@ -55,7 +56,6 @@ atob (guessing 'atob') (!) Circular dependency: dist-esm/index.js -> dist-esm/CosmosClient.js -> dist-esm/client/Database/index.js -> dist-esm/client/Database/Database.js -> dist-esm/client/Container/index.js -> dist-esm/client/Container/Container.js -> dist-esm/client/Script/Scripts.js -> dist-esm/index.js (!) Circular dependency: dist-esm/request/RequestHandler.js -> dist-esm/retry/retryUtility.js -> dist-esm/request/RequestHandler.js created dist/index.js in ?s -XX of XX: [@azure/event-hubs] completed successfully in ? seconds XX of XX: [@azure/eventhubs-checkpointstore-blob] completed successfully in ? seconds XX of XX: [@azure/keyvault-certificates] completed successfully in ? seconds Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md @@ -70,17 +70,17 @@ SUCCESS (22) @azure/core-auth (? seconds) @azure/core-tracing (? seconds) @azure/core-http (? seconds) +@azure/identity (? seconds) +@azure/core-amqp (? seconds) @azure/core-arm (? seconds) @azure/core-paging (? seconds) -@azure/identity (? seconds) @azure/test-utils-recorder (? seconds) -@azure/core-amqp (? seconds) +@azure/event-hubs (? seconds) @azure/event-processor-host (? seconds) @azure/keyvault-keys (? seconds) @azure/keyvault-secrets (? seconds) @azure/app-configuration (? seconds) @azure/core-asynciterator-polyfill (? seconds) -@azure/event-hubs (? seconds) @azure/eventhubs-checkpointstore-blob (? seconds) @azure/keyvault-certificates (? seconds) @azure/storage-blob (? seconds) @@ -96,7 +96,7 @@ Warning: You have changed the public API signature for this project. Updating re dist-esm/index.js → dist/index.js... (!) Unresolved dependencies https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency -tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) +tslib (imported by dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/auth.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) @azure/cosmos-sign (imported by dist-esm/auth.js) universal-user-agent (imported by dist-esm/common/platform.js) uuid/v4 (imported by dist-esm/ClientContext.js, dist-esm/client/Item/Items.js) @@ -111,7 +111,7 @@ crypto-hash (imported by dist-esm/queryExecutionContext/EndpointComponent/Ordere fast-json-stable-stringify (imported by dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js) (!) Missing global variable names Use output.globals to specify browser global variable names corresponding to external modules -universal-user-agent (guessing 'userAgent') +universal-user-agent (guessing 'universalUserAgent') tslib (guessing 'tslib') @azure/cosmos-sign (guessing 'cosmosSign') debug (guessing 'debugLib') diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log index 56cc33c98c6..30424b5874c 100644 --- a/tests/baselines/reference/docker/office-ui-fabric.log +++ b/tests/baselines/reference/docker/office-ui-fabric.log @@ -36,7 +36,9 @@ Standard output: @uifabric/migration: Done in ?s. @uifabric/monaco-editor: yarn run vX.X.X @uifabric/monaco-editor: $ just-scripts build --production --lint -@uifabric/monaco-editor: [XX:XX:XX XM] ■ Removing [lib] +@uifabric/monaco-editor: [XX:XX:XX XM] ■ Removing [esm, lib] +@uifabric/monaco-editor: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/monaco-editor/tsconfig.json +@uifabric/monaco-editor: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/monaco-editor/tsconfig.json" @uifabric/monaco-editor: Done in ?s. @uifabric/set-version: yarn run vX.X.X @uifabric/set-version: $ just-scripts build --production --lint @@ -88,6 +90,7 @@ Standard output: @uifabric/merge-styles: PASS src/Stylesheet.test.ts @uifabric/merge-styles: PASS src/extractStyleParts.test.ts @uifabric/merge-styles: PASS src/server.test.ts +@uifabric/merge-styles: PASS src/fontFace.test.ts @uifabric/merge-styles: [XX:XX:XX XM] ■ Extracting Public API surface from '/office-ui-fabric-react/packages/merge-styles/lib/index.d.ts' @uifabric/merge-styles: Done in ?s. @uifabric/jest-serializer-merge-styles: yarn run vX.X.X diff --git a/tests/baselines/reference/user/jimp.log b/tests/baselines/reference/user/jimp.log deleted file mode 100644 index 8aa96e8bb82..00000000000 --- a/tests/baselines/reference/user/jimp.log +++ /dev/null @@ -1,52 +0,0 @@ -Exit Code: 1 -Standard output: -node_modules/@jimp/bmp/index.d.ts(1,38): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/gif/index.d.ts(1,27): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/jpeg/index.d.ts(1,59): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-blit/index.d.ts(1,54): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-blur/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-color/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-contain/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-cover/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-crop/index.d.ts(1,37): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-displace/index.d.ts(1,54): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-dither/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-flip/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-gaussian/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-invert/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-mask/index.d.ts(1,54): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-normalize/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-print/index.d.ts(1,54): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-resize/index.d.ts(1,37): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-rotate/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/plugin-scale/index.d.ts(1,31): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/png/index.d.ts(1,59): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/@jimp/tiff/index.d.ts(1,38): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` -node_modules/jimp/types/ts3.1/index.d.ts(16,8): error TS7016: Could not find a declaration file for module '@jimp/core'. '../../../tests/cases/user/jimp/node_modules/@jimp/core/dist/index.js' implicitly has an 'any' type. - Try `npm install @types/jimp__core` if it exists or add a new declaration (.d.ts) file containing `declare module '@jimp/core';` - - - -Standard error: From d4ad0d53dcb9b5fc529f6455074fad1230522f66 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 20 Sep 2019 06:47:42 -0700 Subject: [PATCH 44/48] Cheaper caching scheme --- src/compiler/checker.ts | 54 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 19ffdf46ae0..b1d7a00bd48 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -819,6 +819,7 @@ namespace ts { let flowLoopCount = 0; let sharedFlowCount = 0; let flowAnalysisDisabled = false; + let flowInvocationCount = 0; const emptyStringType = getLiteralType(""); const zeroType = getLiteralType(0); @@ -834,8 +835,7 @@ namespace ts { const symbolLinks: SymbolLinks[] = []; const nodeLinks: NodeLinks[] = []; const flowLoopCaches: Map[] = []; - const flowAssignmentKeys: string[] = []; - const flowAssignmentTypes: FlowType[] = []; + const flowAssignmentTypes: Type[] = []; const flowLoopNodes: FlowNode[] = []; const flowLoopKeys: string[] = []; const flowLoopTypes: Type[][] = []; @@ -16698,12 +16698,6 @@ namespace ts { getInitialTypeOfBindingElement(node); } - function getInitialOrAssignedType(node: VariableDeclaration | BindingElement | Expression, reference: Node) { - return getConstraintForLocation(node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement ? - getInitialType(node) : - getAssignedType(node), reference); - } - function isEmptyArrayAssignment(node: VariableDeclaration | BindingElement | Expression) { return node.kind === SyntaxKind.VariableDeclaration && (node).initializer && isEmptyArrayLiteral((node).initializer!) || @@ -16990,6 +16984,7 @@ namespace ts { if (!reference.flowNode || !couldBeUninitialized && !(declaredType.flags & TypeFlags.Narrowable)) { return declaredType; } + flowInvocationCount++; const sharedFlowStart = sharedFlowCount; const evolvedType = getTypeFromFlowType(getTypeAtFlowNode(reference.flowNode)); sharedFlowCount = sharedFlowStart; @@ -17022,15 +17017,6 @@ namespace ts { flowDepth++; while (true) { const flags = flow.flags; - if (flags & FlowFlags.Cached) { - const key = getOrSetCacheKey(); - if (key) { - const id = getFlowNodeId(flow); - if (flowAssignmentKeys[id] === key) { - return flowAssignmentTypes[id]; - } - } - } if (flags & FlowFlags.Shared) { // We cache results of flow type resolution for shared nodes that were previously visited in // the same getFlowTypeOfReference invocation. A node is considered shared when it is the @@ -17061,15 +17047,6 @@ namespace ts { flow = (flow).antecedent; continue; } - else if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis - const key = getOrSetCacheKey(); - if (key && !isIncomplete(type)) { - flow.flags |= FlowFlags.Cached; - const id = getFlowNodeId(flow); - flowAssignmentKeys[id] = key; - flowAssignmentTypes[id] = type; - } - } } else if (flags & FlowFlags.Condition) { type = getTypeAtFlowCondition(flow); @@ -17122,6 +17099,27 @@ namespace ts { } } + function getInitialOrAssignedType(flow: FlowAssignment, reference: Node) { + const node = flow.node; + if (flow.flags & FlowFlags.Cached) { + const cached = flowAssignmentTypes[getNodeId(node)]; + if (cached) { + return cached; + } + } + const startInvocationCount = flowInvocationCount; + const type = getConstraintForLocation(node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement ? + getInitialType(node) : + getAssignedType(node), reference); + // We cache the assigned type when getFlowTypeOfReference was recursively invoked in the + // resolution of the assigned type and we're not within loop analysis. + if (flowInvocationCount !== startInvocationCount && flowLoopCount === flowLoopStart) { + flow.flags |= FlowFlags.Cached; + flowAssignmentTypes[getNodeId(node)] = type; + } + return type; + } + function getTypeAtFlowAssignment(flow: FlowAssignment) { const node = flow.node; // Assignments only narrow the computed type if the declared type is a union type. Thus, we @@ -17135,11 +17133,11 @@ namespace ts { if (isEmptyArrayAssignment(node)) { return getEvolvingArrayType(neverType); } - const assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(node, reference)); + const assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(flow, reference)); return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType; } if (declaredType.flags & TypeFlags.Union) { - return getAssignmentReducedType(declaredType, getInitialOrAssignedType(node, reference)); + return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow, reference)); } return declaredType; } From 7573a6d0f81bafe626bc11f55b46b431ddafbd7a Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Fri, 20 Sep 2019 09:17:19 -0700 Subject: [PATCH 45/48] Update user baselines (#33534) --- tests/baselines/reference/docker/azure-sdk.log | 14 ++++++++------ .../reference/docker/office-ui-fabric.log | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index a7ec47a5a84..ba878ab443a 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -18,13 +18,13 @@ XX of XX: [@azure/event-hubs] completed successfully in ? seconds XX of XX: [@azure/event-processor-host] completed successfully in ? seconds XX of XX: [@azure/keyvault-keys] completed successfully in ? seconds XX of XX: [@azure/keyvault-secrets] completed successfully in ? seconds -XX of XX: [@azure/app-configuration] completed successfully in ? seconds +Warning: You have changed the public API signature for this project. Updating review/app-configuration.api.md XX of XX: [@azure/core-asynciterator-polyfill] completed successfully in ? seconds Warning: You have changed the public API signature for this project. Updating review/cosmos.api.md dist-esm/index.js → dist/index.js... (!) Unresolved dependencies https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency -tslib (imported by dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/auth.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) +tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) @azure/cosmos-sign (imported by dist-esm/auth.js) universal-user-agent (imported by dist-esm/common/platform.js) uuid/v4 (imported by dist-esm/ClientContext.js, dist-esm/client/Item/Items.js) @@ -64,7 +64,7 @@ XX of XX: [@azure/storage-file] completed successfully in ? seconds XX of XX: [@azure/storage-queue] completed successfully in ? seconds XX of XX: [@azure/template] completed successfully in ? seconds XX of XX: [testhub] completed successfully in ? seconds -SUCCESS (22) +SUCCESS (21) ================================ @azure/abort-controller (? seconds) @azure/core-auth (? seconds) @@ -79,7 +79,6 @@ SUCCESS (22) @azure/event-processor-host (? seconds) @azure/keyvault-keys (? seconds) @azure/keyvault-secrets (? seconds) -@azure/app-configuration (? seconds) @azure/core-asynciterator-polyfill (? seconds) @azure/eventhubs-checkpointstore-blob (? seconds) @azure/keyvault-certificates (? seconds) @@ -89,14 +88,16 @@ SUCCESS (22) @azure/template (? seconds) testhub (? seconds) ================================ -SUCCESS WITH WARNINGS (2) +SUCCESS WITH WARNINGS (3) ================================ +@azure/app-configuration (? seconds) +Warning: You have changed the public API signature for this project. Updating review/app-configuration.api.md @azure/cosmos (? seconds) Warning: You have changed the public API signature for this project. Updating review/cosmos.api.md dist-esm/index.js → dist/index.js... (!) Unresolved dependencies https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency -tslib (imported by dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/auth.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) +tslib (imported by dist-esm/auth.js, dist-esm/queryIterator.js, dist-esm/CosmosClient.js, dist-esm/plugins/Plugin.js, dist-esm/ClientContext.js, dist-esm/globalEndpointManager.js, dist-esm/client/Conflict/Conflict.js, dist-esm/client/Container/Container.js, dist-esm/client/Container/Containers.js, dist-esm/client/Database/Database.js, dist-esm/client/Database/Databases.js, dist-esm/client/Item/Item.js, dist-esm/client/Item/Items.js, dist-esm/client/Offer/Offer.js, dist-esm/client/Permission/Permission.js, dist-esm/client/Permission/Permissions.js, dist-esm/client/StoredProcedure/StoredProcedure.js, dist-esm/client/StoredProcedure/StoredProcedures.js, dist-esm/client/Trigger/Trigger.js, dist-esm/client/Trigger/Triggers.js, dist-esm/client/User/User.js, dist-esm/client/User/Users.js, dist-esm/client/UserDefinedFunction/UserDefinedFunction.js, dist-esm/client/UserDefinedFunction/UserDefinedFunctions.js, dist-esm/queryExecutionContext/defaultQueryExecutionContext.js, dist-esm/queryExecutionContext/documentProducer.js, dist-esm/queryExecutionContext/parallelQueryExecutionContextBase.js, dist-esm/queryExecutionContext/pipelinedQueryExecutionContext.js, dist-esm/request/request.js, dist-esm/request/RequestHandler.js, dist-esm/ChangeFeedIterator.js, dist-esm/routing/smartRoutingMapProvider.js, dist-esm/queryExecutionContext/EndpointComponent/AggregateEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OffsetLimitEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderByEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/OrderedDistinctEndpointComponent.js, dist-esm/queryExecutionContext/EndpointComponent/UnorderedDistinctEndpointComponent.js, dist-esm/retry/retryUtility.js, dist-esm/routing/partitionKeyRangeCache.js, dist-esm/retry/defaultRetryPolicy.js, dist-esm/retry/endpointDiscoveryRetryPolicy.js, dist-esm/retry/resourceThrottleRetryPolicy.js, dist-esm/retry/sessionRetryPolicy.js) @azure/cosmos-sign (imported by dist-esm/auth.js) universal-user-agent (imported by dist-esm/common/platform.js) uuid/v4 (imported by dist-esm/ClientContext.js, dist-esm/client/Item/Items.js) @@ -136,6 +137,7 @@ rush rebuild ( ? seconds) Standard error: +XX of XX: [@azure/app-configuration] completed with warnings in ? seconds XX of XX: [@azure/cosmos] completed with warnings in ? seconds XX of XX: [@azure/service-bus] completed with warnings in ? seconds Project(s) succeeded with warnings diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log index 30424b5874c..7bd402b8327 100644 --- a/tests/baselines/reference/docker/office-ui-fabric.log +++ b/tests/baselines/reference/docker/office-ui-fabric.log @@ -90,7 +90,7 @@ Standard output: @uifabric/merge-styles: PASS src/Stylesheet.test.ts @uifabric/merge-styles: PASS src/extractStyleParts.test.ts @uifabric/merge-styles: PASS src/server.test.ts -@uifabric/merge-styles: PASS src/fontFace.test.ts +@uifabric/merge-styles: PASS src/concatStyleSetsWithProps.test.ts @uifabric/merge-styles: [XX:XX:XX XM] ■ Extracting Public API surface from '/office-ui-fabric-react/packages/merge-styles/lib/index.d.ts' @uifabric/merge-styles: Done in ?s. @uifabric/jest-serializer-merge-styles: yarn run vX.X.X From 007b4b1e31623aa8a108219262819d07ba63202a Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 20 Sep 2019 10:24:02 -0700 Subject: [PATCH 46/48] Minor simplification --- src/compiler/checker.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b1d7a00bd48..28e20febdcd 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -17099,7 +17099,7 @@ namespace ts { } } - function getInitialOrAssignedType(flow: FlowAssignment, reference: Node) { + function getInitialOrAssignedType(flow: FlowAssignment) { const node = flow.node; if (flow.flags & FlowFlags.Cached) { const cached = flowAssignmentTypes[getNodeId(node)]; @@ -17133,11 +17133,11 @@ namespace ts { if (isEmptyArrayAssignment(node)) { return getEvolvingArrayType(neverType); } - const assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(flow, reference)); + const assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(flow)); return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType; } if (declaredType.flags & TypeFlags.Union) { - return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow, reference)); + return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow)); } return declaredType; } From 26c816f932a0177ffda094dc4b4b46a4b5f582f2 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Fri, 20 Sep 2019 15:20:10 -0400 Subject: [PATCH 47/48] When a packed version of TypeScript ios requested, also send a request to create a build of monaco for the playground --- scripts/post-vsts-artifact-comment.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/post-vsts-artifact-comment.js b/scripts/post-vsts-artifact-comment.js index 6d84294bcfe..5b1685ae040 100644 --- a/scripts/post-vsts-artifact-comment.js +++ b/scripts/post-vsts-artifact-comment.js @@ -28,6 +28,10 @@ async function main() { type: "token", token: process.argv[2] }); + + // Please keep the strings "an installable tgz" and "packed" in this message, as well as the devDependencies section, + // so that the playgrounds deployment process can find these comments. + await gh.issues.createComment({ number: +process.env.SOURCE_ISSUE, owner: "Microsoft", @@ -43,6 +47,9 @@ async function main() { and then running \`npm install\`. ` }); + + // Send a ping to https://github.com/orta/make-monaco-builds#pull-request-builds + await gh.request("POST /repos/orta/make-monaco-builds/dispatches", { event_type: +process.env.SOURCE_ISSUE }) } main().catch(async e => { @@ -61,4 +68,4 @@ main().catch(async e => { body: `Hey @${process.env.REQUESTING_USER}, something went wrong when looking for the build artifact. ([You can check the log here](https://typescript.visualstudio.com/TypeScript/_build/index?buildId=${process.env.BUILD_BUILDID}&_a=summary)).` }); } -}); \ No newline at end of file +}); From cc3ee3013d419908daf92f4b2b0b7b0cc381fe36 Mon Sep 17 00:00:00 2001 From: Nuno Arruda Date: Fri, 20 Sep 2019 22:11:22 +0200 Subject: [PATCH 48/48] Fix grammar issues on CONTRIBUTING.md (#33535) --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 18c0a352cbd..4b804414ab5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,7 +71,7 @@ Design changes will not be accepted at this time. If you have a design change pr You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright. -Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.pdf](https://opensource.microsoft.com/pdf/microsoft-contribution-license-agreement.pdf)), sign, scan, and email it back to . Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. +Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.pdf](https://opensource.microsoft.com/pdf/microsoft-contribution-license-agreement.pdf)), sign, scan, and email it back to . Be sure to include your GitHub user name along with the agreement. Once we have received the signed CLA, we'll review the request. ## Housekeeping @@ -148,7 +148,7 @@ You will probably only want to debug one test at a time: gulp runtests-browser --tests=2dArrays ``` -You can specify which browser to use for debugging. Currently Chrome and IE are supported: +You can specify which browser to use for debugging. Currently, Chrome and IE are supported: ```Shell gulp runtests-browser --tests=2dArrays --browser=chrome