diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts index 2b2a75e3c24c3..add17449edf3d 100644 --- a/src/compiler/transformers/declarations.ts +++ b/src/compiler/transformers/declarations.ts @@ -86,7 +86,6 @@ namespace ts { let emittedImports: readonly AnyImportSyntax[] | undefined; // must be declared in container so it can be `undefined` while transformer's first pass const resolver = context.getEmitResolver(); const options = context.getCompilerOptions(); - const newLine = getNewLineCharacter(options); const { noResolve, stripInternal } = options; return transformRoot; @@ -861,35 +860,25 @@ namespace ts { return cleanup(sig); } case SyntaxKind.GetAccessor: { - // For now, only emit class accessors as accessors if they were already declared in an ambient context. - if (input.flags & NodeFlags.Ambient) { - const isPrivate = hasModifier(input, ModifierFlags.Private); - const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input)); - return cleanup(updateGetAccessor( - input, - /*decorators*/ undefined, - ensureModifiers(input), - input.name, - updateAccessorParamsList(input, isPrivate), - !isPrivate ? ensureType(input, accessorType) : undefined, - /*body*/ undefined)); - } - const newNode = ensureAccessor(input); - return cleanup(newNode); + const isPrivate = hasModifier(input, ModifierFlags.Private); + const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input)); + return cleanup(updateGetAccessor( + input, + /*decorators*/ undefined, + ensureModifiers(input), + input.name, + updateAccessorParamsList(input, isPrivate), + !isPrivate ? ensureType(input, accessorType) : undefined, + /*body*/ undefined)); } case SyntaxKind.SetAccessor: { - // For now, only emit class accessors as accessors if they were already declared in an ambient context. - if (input.flags & NodeFlags.Ambient) { - return cleanup(updateSetAccessor( - input, - /*decorators*/ undefined, - ensureModifiers(input), - input.name, - updateAccessorParamsList(input, hasModifier(input, ModifierFlags.Private)), - /*body*/ undefined)); - } - const newNode = ensureAccessor(input); - return cleanup(newNode); + return cleanup(updateSetAccessor( + input, + /*decorators*/ undefined, + ensureModifiers(input), + input.name, + updateAccessorParamsList(input, hasModifier(input, ModifierFlags.Private)), + /*body*/ undefined)); } case SyntaxKind.PropertyDeclaration: return cleanup(updateProperty( @@ -1462,36 +1451,6 @@ namespace ts { return accessorType; } - function ensureAccessor(node: AccessorDeclaration): PropertyDeclaration | undefined { - const accessors = resolver.getAllAccessorDeclarations(node); - if (node.kind !== accessors.firstAccessor.kind) { - return; - } - const accessorType = getTypeAnnotationFromAllAccessorDeclarations(node, accessors); - const prop = createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? ModifierFlags.Readonly : ModifierFlags.None), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined); - const leadingsSyntheticCommentRanges = accessors.secondAccessor && getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile); - if (leadingsSyntheticCommentRanges) { - for (const range of leadingsSyntheticCommentRanges) { - if (range.kind === SyntaxKind.MultiLineCommentTrivia) { - let text = currentSourceFile.text.slice(range.pos + 2, range.end - 2); - const lines = text.split(/\r\n?|\n/g); - if (lines.length > 1) { - const lastLines = lines.slice(1); - const indentation = guessIndentation(lastLines); - text = [lines[0], ...map(lastLines, l => l.slice(indentation))].join(newLine); - } - addSyntheticLeadingComment( - prop, - range.kind, - text, - range.hasTrailingNewLine - ); - } - } - } - return prop; - } - function transformHeritageClauses(nodes: NodeArray | undefined) { return createNodeArray(filter(map(nodes, clause => updateHeritageClause(clause, visitNodes(createNodeArray(filter(clause.types, t => { return isEntityNameExpression(t.expression) || (clause.token === SyntaxKind.ExtendsKeyword && t.expression.kind === SyntaxKind.NullKeyword); diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js index 42dd8b7d114ab..43d67d0cb1110 100644 --- a/tests/baselines/reference/classdecl.js +++ b/tests/baselines/reference/classdecl.js @@ -218,13 +218,14 @@ declare class a { constructor(s: string); pgF(): void; pv: any; - d: number; - static readonly p2: { + get d(): number; + set d(a: number); + static get p2(): { x: number; y: number; }; private static d2; - private static readonly p3; + private static get p3(); private pv3; private foo; } diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js index 9918b0758ae40..bba4b44fc6023 100644 --- a/tests/baselines/reference/commentsClassMembers.js +++ b/tests/baselines/reference/commentsClassMembers.js @@ -486,15 +486,17 @@ declare class c1 { /** sum with property*/ p2(/** number to add*/ b: number): number; /** getter property*/ + get p3(): number; /** setter property*/ - p3: number; + set p3(/** this is value*/ value: number); /** pp1 is property of c1*/ private pp1; /** sum with property*/ private pp2; /** getter property*/ + private get pp3(); /** setter property*/ - private pp3; + private set pp3(value); /** Constructor method*/ constructor(); /** s1 is static property of c1*/ @@ -502,49 +504,59 @@ declare class c1 { /** static sum with property*/ static s2(/** number to add*/ b: number): number; /** static getter property*/ + static get s3(): number; /** setter property*/ - static s3: number; + static set s3(/** this is value*/ value: number); nc_p1: number; nc_p2(b: number): number; - nc_p3: number; + get nc_p3(): number; + set nc_p3(value: number); private nc_pp1; private nc_pp2; - private nc_pp3; + private get nc_pp3(); + private set nc_pp3(value); static nc_s1: number; static nc_s2(b: number): number; - static nc_s3: number; + static get nc_s3(): number; + static set nc_s3(value: number); a_p1: number; a_p2(b: number): number; - a_p3: number; + get a_p3(): number; + set a_p3(value: number); private a_pp1; private a_pp2; - private a_pp3; + private get a_pp3(); + private set a_pp3(value); static a_s1: number; static a_s2(b: number): number; - static a_s3: number; + static get a_s3(): number; + static set a_s3(value: number); /** p1 is property of c1 */ b_p1: number; /** sum with property */ b_p2(b: number): number; /** getter property */ + get b_p3(): number; /** setter property */ - b_p3: number; + set b_p3(value: number); /** pp1 is property of c1 */ private b_pp1; /** sum with property */ private b_pp2; /** getter property */ + private get b_pp3(); /** setter property */ - private b_pp3; + private set b_pp3(value); /** s1 is static property of c1 */ static b_s1: number; /** static sum with property */ static b_s2(b: number): number; /** static getter property */ + static get b_s3(): number; /** setter property */ - static b_s3: number; + static set b_s3(value: number); } declare var i1: c1; declare var i1_p: number; @@ -567,11 +579,11 @@ declare var i1_c: typeof c1; declare class cProperties { private val; /** getter only property*/ - readonly p1: number; - readonly nc_p1: number; + get p1(): number; + get nc_p1(): number; /**setter only property*/ - p2: number; - nc_p2: number; + set p2(value: number); + set nc_p2(value: number); x: number; private y; } diff --git a/tests/baselines/reference/commentsInheritance.js b/tests/baselines/reference/commentsInheritance.js index 58e243301b4e2..9779df371a2ec 100644 --- a/tests/baselines/reference/commentsInheritance.js +++ b/tests/baselines/reference/commentsInheritance.js @@ -323,19 +323,19 @@ declare class c2 { /** c2 c2_f1*/ c2_f1(): void; /** c2 c2_prop*/ - readonly c2_prop: number; + get c2_prop(): number; c2_nc_p1: number; c2_nc_f1(): void; - readonly c2_nc_prop: number; + get c2_nc_prop(): number; /** c2 p1*/ p1: number; /** c2 f1*/ f1(): void; /** c2 prop*/ - readonly prop: number; + get prop(): number; nc_p1: number; nc_f1(): void; - readonly nc_prop: number; + get nc_prop(): number; /** c2 constructor*/ constructor(a: number); } @@ -346,10 +346,10 @@ declare class c3 extends c2 { /** c3 f1*/ f1(): void; /** c3 prop*/ - readonly prop: number; + get prop(): number; nc_p1: number; nc_f1(): void; - readonly nc_prop: number; + get nc_prop(): number; } declare var c2_i: c2; declare var c3_i: c3; diff --git a/tests/baselines/reference/commentsdoNotEmitComments.js b/tests/baselines/reference/commentsdoNotEmitComments.js index ae7442f109a64..865ae43c4de22 100644 --- a/tests/baselines/reference/commentsdoNotEmitComments.js +++ b/tests/baselines/reference/commentsdoNotEmitComments.js @@ -144,7 +144,8 @@ declare class c { constructor(); b: number; myFoo(): number; - prop1: number; + get prop1(): number; + set prop1(val: number); foo1(a: number): string; foo1(b: string): string; } diff --git a/tests/baselines/reference/commentsemitComments.js b/tests/baselines/reference/commentsemitComments.js index dd8f3608cf33f..8bfb1c59c9abd 100644 --- a/tests/baselines/reference/commentsemitComments.js +++ b/tests/baselines/reference/commentsemitComments.js @@ -160,8 +160,9 @@ declare class c { /** function comment */ myFoo(): number; /** getter comment*/ + get prop1(): number; /** setter comment*/ - prop1: number; + set prop1(val: number); /** overload signature1*/ foo1(a: number): string; /** Overload signature 2*/ diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js index c6175ec7ede0a..103f86d688e69 100644 --- a/tests/baselines/reference/declFileAccessors.js +++ b/tests/baselines/reference/declFileAccessors.js @@ -273,35 +273,47 @@ var c2 = /** @class */ (function () { /** This is comment for c1*/ export declare class c1 { /** getter property*/ + get p3(): number; /** setter property*/ - p3: number; + set p3(/** this is value*/ value: number); /** private getter property*/ + private get pp3(); /** private setter property*/ - private pp3; + private set pp3(value); /** static getter property*/ + static get s3(): number; /** setter property*/ - static s3: number; - nc_p3: number; - private nc_pp3; - static nc_s3: string; - readonly onlyGetter: number; - onlySetter: number; + static set s3(/** this is value*/ value: number); + get nc_p3(): number; + set nc_p3(value: number); + private get nc_pp3(); + private set nc_pp3(value); + static get nc_s3(): string; + static set nc_s3(value: string); + get onlyGetter(): number; + set onlySetter(value: number); } //// [declFileAccessors_1.d.ts] /** This is comment for c2 - the global class*/ declare class c2 { /** getter property*/ + get p3(): number; /** setter property*/ - p3: number; + set p3(/** this is value*/ value: number); /** private getter property*/ + private get pp3(); /** private setter property*/ - private pp3; + private set pp3(value); /** static getter property*/ + static get s3(): number; /** setter property*/ - static s3: number; - nc_p3: number; - private nc_pp3; - static nc_s3: string; - readonly onlyGetter: number; - onlySetter: number; + static set s3(/** this is value*/ value: number); + get nc_p3(): number; + set nc_p3(value: number); + private get nc_pp3(); + private set nc_pp3(value); + static get nc_s3(): string; + static set nc_s3(value: string); + get onlyGetter(): number; + set onlySetter(value: number); } diff --git a/tests/baselines/reference/declFilePrivateStatic.js b/tests/baselines/reference/declFilePrivateStatic.js index 67469327265b5..9dd2adc8c59ef 100644 --- a/tests/baselines/reference/declFilePrivateStatic.js +++ b/tests/baselines/reference/declFilePrivateStatic.js @@ -51,8 +51,8 @@ declare class C { static y: number; private static a; static b(): void; - private static readonly c; - static readonly d: number; - private static e; - static f: any; + private static get c(); + static get d(): number; + private static set e(value); + static set f(v: any); } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js index 6018176153396..598ac67c20ed5 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js @@ -271,21 +271,27 @@ declare module m { } } export class c { - readonly foo1: private1; - readonly foo2: private1; - foo3: private1; - foo4: private1; - foo5: private1; - readonly foo11: public1; - readonly foo12: public1; - foo13: public1; - foo14: public1; - foo15: public1; - readonly foo111: m2.public2; - readonly foo112: m2.public2; - foo113: m2.public2; - foo114: m2.public2; - foo115: m2.public2; + get foo1(): private1; + get foo2(): private1; + set foo3(param: private1); + get foo4(): private1; + set foo4(param: private1); + get foo5(): private1; + set foo5(param: private1); + get foo11(): public1; + get foo12(): public1; + set foo13(param: public1); + get foo14(): public1; + set foo14(param: public1); + get foo15(): public1; + set foo15(param: public1); + get foo111(): m2.public2; + get foo112(): m2.public2; + set foo113(param: m2.public2); + get foo114(): m2.public2; + set foo114(param: m2.public2); + get foo115(): m2.public2; + set foo115(param: m2.public2); } export {}; } diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js index 77732ea94f889..43523aba38f0e 100644 --- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js @@ -103,10 +103,10 @@ export declare class C2 { bar(): (t: typeof C2) => void; } export declare class C3 { - readonly C3: number; + get C3(): number; bar(): (t: typeof C3) => void; } export declare class C4 { - C4: any; + set C4(v: any); bar(): (t: typeof C4) => void; } diff --git a/tests/baselines/reference/declarationEmitProtectedMembers.js b/tests/baselines/reference/declarationEmitProtectedMembers.js index fb0a9cb933914..e0a2b40ffd50c 100644 --- a/tests/baselines/reference/declarationEmitProtectedMembers.js +++ b/tests/baselines/reference/declarationEmitProtectedMembers.js @@ -138,11 +138,12 @@ var C4 = /** @class */ (function () { declare class C1 { protected x: number; protected f(): number; - protected accessor: number; + protected set accessor(a: number); + protected get accessor(): number; protected static sx: number; protected static sf(): number; - protected static staticSetter: number; - protected static readonly staticGetter: number; + protected static set staticSetter(a: number); + protected static get staticGetter(): number; } declare class C2 extends C1 { protected f(): number; @@ -153,7 +154,7 @@ declare class C3 extends C2 { static sx: number; f(): number; static sf(): number; - static readonly staticGetter: number; + static get staticGetter(): number; } declare class C4 { protected a: number; diff --git a/tests/baselines/reference/dynamicNamesErrors.js b/tests/baselines/reference/dynamicNamesErrors.js index ff6bdec604f31..8433527d73fd6 100644 --- a/tests/baselines/reference/dynamicNamesErrors.js +++ b/tests/baselines/reference/dynamicNamesErrors.js @@ -101,12 +101,12 @@ export interface InterfaceMemberVisibility { export declare class ClassMemberVisibility { static [x]: number; static [y](): number; - static readonly [z]: number; - static [w]: number; + static get [z](): number; + static set [w](value: number); [x]: number; [y](): number; - readonly [z]: number; - [w]: number; + get [z](): number; + set [w](value: number); } export declare type ObjectTypeVisibility = { [x]: number; diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 85686faa01e98..9adf046d8cfc2 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -1120,19 +1120,19 @@ export declare class eC { pF(): void; private rF; pgF(): void; - readonly pgF: any; + get pgF(): any; psF(param: any): void; - psF: any; + set psF(param: any); private rgF; - private readonly rgF; - private rsF; + private get rgF(); private rsF; + private set rsF(value); static tV: any; static tF(): void; static tsF(param: any): void; - static tsF: any; + static set tsF(param: any); static tgF(): void; - static readonly tgF: any; + static get tgF(): any; } export interface eI { (): any; @@ -1172,19 +1172,19 @@ export declare module eM { pF(): void; private rF; pgF(): void; - readonly pgF: any; + get pgF(): any; psF(param: any): void; - psF: any; + set psF(param: any); private rgF; - private readonly rgF; - private rsF; + private get rgF(); private rsF; + private set rsF(value); static tV: any; static tF(): void; static tsF(param: any): void; - static tsF: any; + static set tsF(param: any); static tgF(): void; - static readonly tgF: any; + static get tgF(): any; } interface eI { (): any; diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js index 83a926ab7d2eb..40f5e59083c0c 100644 --- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js +++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js @@ -184,7 +184,7 @@ declare module schema { } declare module schema { class T { - readonly createValidator9: (data: T) => T; - createValidator10: (data: T) => T; + get createValidator9(): (data: T) => T; + set createValidator10(v: (data: T) => T); } } diff --git a/tests/baselines/reference/moduledecl.js b/tests/baselines/reference/moduledecl.js index de7a5434e4df6..9672b980929b0 100644 --- a/tests/baselines/reference/moduledecl.js +++ b/tests/baselines/reference/moduledecl.js @@ -457,10 +457,10 @@ declare module exportTests { class C3_public { private getC2_private; private setC2_private; - private readonly c2; + private get c2(); getC1_public(): C1_public; setC1_public(arg: C1_public): void; - readonly c1: C1_public; + get c1(): C1_public; } } declare module mAmbient { diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index a7eb6296f5c8e..1c84bd63749d6 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -3562,46 +3562,46 @@ declare class privateClass { export declare class publicClass { } export declare class publicClassWithWithPrivateGetAccessorTypes { - static readonly myPublicStaticMethod: privateClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: privateClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: privateClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: privateClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): privateClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): privateClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): privateClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): privateClass; + private get myPrivateMethod1(); } export declare class publicClassWithWithPublicGetAccessorTypes { - static readonly myPublicStaticMethod: publicClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: publicClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: publicClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: publicClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): publicClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): publicClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): publicClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): publicClass; + private get myPrivateMethod1(); } export declare class publicClassWithWithPrivateSetAccessorTypes { - static myPublicStaticMethod: privateClass; - private static myPrivateStaticMethod; - myPublicMethod: privateClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: privateClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: privateClass); + private set myPrivateMethod(value); } export declare class publicClassWithWithPublicSetAccessorTypes { - static myPublicStaticMethod: publicClass; - private static myPrivateStaticMethod; - myPublicMethod: publicClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: publicClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: publicClass); + private set myPrivateMethod(value); } export declare class publicClassWithPrivateModuleGetAccessorTypes { - static readonly myPublicStaticMethod: privateModule.publicClass; - readonly myPublicMethod: privateModule.publicClass; - static readonly myPublicStaticMethod1: privateModule.publicClass; - readonly myPublicMethod1: privateModule.publicClass; + static get myPublicStaticMethod(): privateModule.publicClass; + get myPublicMethod(): privateModule.publicClass; + static get myPublicStaticMethod1(): privateModule.publicClass; + get myPublicMethod1(): privateModule.publicClass; } export declare class publicClassWithPrivateModuleSetAccessorTypes { - static myPublicStaticMethod: privateModule.publicClass; - myPublicMethod: privateModule.publicClass; + static set myPublicStaticMethod(param: privateModule.publicClass); + set myPublicMethod(param: privateModule.publicClass); } export declare module publicModule { class privateClass { @@ -3609,46 +3609,46 @@ export declare module publicModule { export class publicClass { } export class publicClassWithWithPrivateGetAccessorTypes { - static readonly myPublicStaticMethod: privateClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: privateClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: privateClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: privateClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): privateClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): privateClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): privateClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): privateClass; + private get myPrivateMethod1(); } export class publicClassWithWithPublicGetAccessorTypes { - static readonly myPublicStaticMethod: publicClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: publicClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: publicClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: publicClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): publicClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): publicClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): publicClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): publicClass; + private get myPrivateMethod1(); } export class publicClassWithWithPrivateSetAccessorTypes { - static myPublicStaticMethod: privateClass; - private static myPrivateStaticMethod; - myPublicMethod: privateClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: privateClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: privateClass); + private set myPrivateMethod(value); } export class publicClassWithWithPublicSetAccessorTypes { - static myPublicStaticMethod: publicClass; - private static myPrivateStaticMethod; - myPublicMethod: publicClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: publicClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: publicClass); + private set myPrivateMethod(value); } export class publicClassWithPrivateModuleGetAccessorTypes { - static readonly myPublicStaticMethod: privateModule.publicClass; - readonly myPublicMethod: privateModule.publicClass; - static readonly myPublicStaticMethod1: privateModule.publicClass; - readonly myPublicMethod1: privateModule.publicClass; + static get myPublicStaticMethod(): privateModule.publicClass; + get myPublicMethod(): privateModule.publicClass; + static get myPublicStaticMethod1(): privateModule.publicClass; + get myPublicMethod1(): privateModule.publicClass; } export class publicClassWithPrivateModuleSetAccessorTypes { - static myPublicStaticMethod: privateModule.publicClass; - myPublicMethod: privateModule.publicClass; + static set myPublicStaticMethod(param: privateModule.publicClass); + set myPublicMethod(param: privateModule.publicClass); } export {}; } @@ -3658,46 +3658,46 @@ declare module privateModule { export class publicClass { } export class publicClassWithWithPrivateGetAccessorTypes { - static readonly myPublicStaticMethod: privateClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: privateClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: privateClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: privateClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): privateClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): privateClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): privateClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): privateClass; + private get myPrivateMethod1(); } export class publicClassWithWithPublicGetAccessorTypes { - static readonly myPublicStaticMethod: publicClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: publicClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: publicClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: publicClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): publicClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): publicClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): publicClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): publicClass; + private get myPrivateMethod1(); } export class publicClassWithWithPrivateSetAccessorTypes { - static myPublicStaticMethod: privateClass; - private static myPrivateStaticMethod; - myPublicMethod: privateClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: privateClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: privateClass); + private set myPrivateMethod(value); } export class publicClassWithWithPublicSetAccessorTypes { - static myPublicStaticMethod: publicClass; - private static myPrivateStaticMethod; - myPublicMethod: publicClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: publicClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: publicClass); + private set myPrivateMethod(value); } export class publicClassWithPrivateModuleGetAccessorTypes { - static readonly myPublicStaticMethod: privateModule.publicClass; - readonly myPublicMethod: privateModule.publicClass; - static readonly myPublicStaticMethod1: publicClass; - readonly myPublicMethod1: publicClass; + static get myPublicStaticMethod(): privateModule.publicClass; + get myPublicMethod(): privateModule.publicClass; + static get myPublicStaticMethod1(): publicClass; + get myPublicMethod1(): publicClass; } export class publicClassWithPrivateModuleSetAccessorTypes { - static myPublicStaticMethod: privateModule.publicClass; - myPublicMethod: privateModule.publicClass; + static set myPublicStaticMethod(param: privateModule.publicClass); + set myPublicMethod(param: privateModule.publicClass); } export {}; } @@ -3706,20 +3706,20 @@ export {}; declare class publicClassInGlobal { } declare class publicClassInGlobalWithPublicGetAccessorTypes { - static readonly myPublicStaticMethod: publicClassInGlobal; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: publicClassInGlobal; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: publicClassInGlobal; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: publicClassInGlobal; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): publicClassInGlobal; + private static get myPrivateStaticMethod(); + get myPublicMethod(): publicClassInGlobal; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): publicClassInGlobal; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): publicClassInGlobal; + private get myPrivateMethod1(); } declare class publicClassInGlobalWithWithPublicSetAccessorTypes { - static myPublicStaticMethod: publicClassInGlobal; - private static myPrivateStaticMethod; - myPublicMethod: publicClassInGlobal; - private myPrivateMethod; + static set myPublicStaticMethod(param: publicClassInGlobal); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: publicClassInGlobal); + private set myPrivateMethod(value); } declare module publicModuleInGlobal { class privateClass { @@ -3732,90 +3732,90 @@ declare module publicModuleInGlobal { export class publicClass { } export class publicClassWithWithPrivateGetAccessorTypes { - static readonly myPublicStaticMethod: privateClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: privateClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: privateClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: privateClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): privateClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): privateClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): privateClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): privateClass; + private get myPrivateMethod1(); } export class publicClassWithWithPublicGetAccessorTypes { - static readonly myPublicStaticMethod: publicClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: publicClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: publicClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: publicClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): publicClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): publicClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): publicClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): publicClass; + private get myPrivateMethod1(); } export class publicClassWithWithPrivateSetAccessorTypes { - static myPublicStaticMethod: privateClass; - private static myPrivateStaticMethod; - myPublicMethod: privateClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: privateClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: privateClass); + private set myPrivateMethod(value); } export class publicClassWithWithPublicSetAccessorTypes { - static myPublicStaticMethod: publicClass; - private static myPrivateStaticMethod; - myPublicMethod: publicClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: publicClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: publicClass); + private set myPrivateMethod(value); } export class publicClassWithPrivateModuleGetAccessorTypes { - static readonly myPublicStaticMethod: privateModule.publicClass; - readonly myPublicMethod: privateModule.publicClass; - static readonly myPublicStaticMethod1: publicClass; - readonly myPublicMethod1: publicClass; + static get myPublicStaticMethod(): privateModule.publicClass; + get myPublicMethod(): privateModule.publicClass; + static get myPublicStaticMethod1(): publicClass; + get myPublicMethod1(): publicClass; } export class publicClassWithPrivateModuleSetAccessorTypes { - static myPublicStaticMethod: privateModule.publicClass; - myPublicMethod: privateModule.publicClass; + static set myPublicStaticMethod(param: privateModule.publicClass); + set myPublicMethod(param: privateModule.publicClass); } export {}; } export class publicClassWithWithPrivateGetAccessorTypes { - static readonly myPublicStaticMethod: privateClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: privateClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: privateClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: privateClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): privateClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): privateClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): privateClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): privateClass; + private get myPrivateMethod1(); } export class publicClassWithWithPublicGetAccessorTypes { - static readonly myPublicStaticMethod: publicClass; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: publicClass; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: publicClass; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: publicClass; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): publicClass; + private static get myPrivateStaticMethod(); + get myPublicMethod(): publicClass; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): publicClass; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): publicClass; + private get myPrivateMethod1(); } export class publicClassWithWithPrivateSetAccessorTypes { - static myPublicStaticMethod: privateClass; - private static myPrivateStaticMethod; - myPublicMethod: privateClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: privateClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: privateClass); + private set myPrivateMethod(value); } export class publicClassWithWithPublicSetAccessorTypes { - static myPublicStaticMethod: publicClass; - private static myPrivateStaticMethod; - myPublicMethod: publicClass; - private myPrivateMethod; + static set myPublicStaticMethod(param: publicClass); + private static set myPrivateStaticMethod(value); + set myPublicMethod(param: publicClass); + private set myPrivateMethod(value); } export class publicClassWithPrivateModuleGetAccessorTypes { - static readonly myPublicStaticMethod: privateModule.publicClass; - readonly myPublicMethod: privateModule.publicClass; - static readonly myPublicStaticMethod1: privateModule.publicClass; - readonly myPublicMethod1: privateModule.publicClass; + static get myPublicStaticMethod(): privateModule.publicClass; + get myPublicMethod(): privateModule.publicClass; + static get myPublicStaticMethod1(): privateModule.publicClass; + get myPublicMethod1(): privateModule.publicClass; } export class publicClassWithPrivateModuleSetAccessorTypes { - static myPublicStaticMethod: privateModule.publicClass; - myPublicMethod: privateModule.publicClass; + static set myPublicStaticMethod(param: privateModule.publicClass); + set myPublicMethod(param: privateModule.publicClass); } export {}; } diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js index 42f7639986913..e0dc38bcfcd58 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -417,18 +417,18 @@ export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidge //// [privacyCannotNameAccessorDeclFile_consumer.d.ts] /// export declare class publicClassWithWithPrivateGetAccessorTypes { - static readonly myPublicStaticMethod: import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1; - private static readonly myPrivateStaticMethod; - readonly myPublicMethod: import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1; - private readonly myPrivateMethod; - static readonly myPublicStaticMethod1: import("GlobalWidgets").Widget3; - private static readonly myPrivateStaticMethod1; - readonly myPublicMethod1: import("GlobalWidgets").Widget3; - private readonly myPrivateMethod1; + static get myPublicStaticMethod(): import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1; + private static get myPrivateStaticMethod(); + get myPublicMethod(): import("./privacyCannotNameAccessorDeclFile_Widgets").Widget1; + private get myPrivateMethod(); + static get myPublicStaticMethod1(): import("GlobalWidgets").Widget3; + private static get myPrivateStaticMethod1(); + get myPublicMethod1(): import("GlobalWidgets").Widget3; + private get myPrivateMethod1(); } export declare class publicClassWithPrivateModuleGetAccessorTypes { - static readonly myPublicStaticMethod: import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2; - readonly myPublicMethod: import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2; - static readonly myPublicStaticMethod1: import("GlobalWidgets").SpecializedGlobalWidget.Widget4; - readonly myPublicMethod1: import("GlobalWidgets").SpecializedGlobalWidget.Widget4; + static get myPublicStaticMethod(): import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2; + get myPublicMethod(): import("./privacyCannotNameAccessorDeclFile_Widgets").SpecializedWidget.Widget2; + static get myPublicStaticMethod1(): import("GlobalWidgets").SpecializedGlobalWidget.Widget4; + get myPublicMethod1(): import("GlobalWidgets").SpecializedGlobalWidget.Widget4; } diff --git a/tests/baselines/reference/properties.js b/tests/baselines/reference/properties.js index 0b81d7671cdbb..27688f5837578 100644 --- a/tests/baselines/reference/properties.js +++ b/tests/baselines/reference/properties.js @@ -32,5 +32,6 @@ var MyClass = /** @class */ (function () { //// [properties.d.ts] declare class MyClass { - Count: number; + get Count(): number; + set Count(value: number); } diff --git a/tests/baselines/reference/readonlyInDeclarationFile.js b/tests/baselines/reference/readonlyInDeclarationFile.js index 667d2582f100d..7419e27c013b5 100644 --- a/tests/baselines/reference/readonlyInDeclarationFile.js +++ b/tests/baselines/reference/readonlyInDeclarationFile.js @@ -149,21 +149,27 @@ declare class C { private readonly a1; protected readonly a2: number; readonly a3: number; - private readonly b1; - protected readonly b2: number; - readonly b3: number; - private c1; - protected c2: number; - c3: number; + private get b1(); + protected get b2(): number; + get b3(): number; + private get c1(); + private set c1(value); + protected get c2(): number; + protected set c2(value: number); + get c3(): number; + set c3(value: number); private static readonly s1; protected static readonly s2: number; static readonly s3: number; - private static readonly t1; - protected static readonly t2: number; - static readonly t3: number; - private static u1; - protected static u2: number; - static u3: number; + private static get t1(); + protected static get t2(): number; + static get t3(): number; + private static get u1(); + private static set u1(value); + protected static get u2(): number; + protected static set u2(value: number); + static get u3(): number; + static set u3(value: number); } declare var z: { readonly a: string; diff --git a/tests/baselines/reference/symbolDeclarationEmit11.js b/tests/baselines/reference/symbolDeclarationEmit11.js index 25af4c4306475..b0cd9cfddbd5b 100644 --- a/tests/baselines/reference/symbolDeclarationEmit11.js +++ b/tests/baselines/reference/symbolDeclarationEmit11.js @@ -19,5 +19,6 @@ C[Symbol.iterator] = 0; declare class C { static [Symbol.iterator]: number; static [Symbol.isConcatSpreadable](): void; - static [Symbol.toPrimitive]: string; + static get [Symbol.toPrimitive](): string; + static set [Symbol.toPrimitive](x: string); } diff --git a/tests/baselines/reference/symbolDeclarationEmit12.js b/tests/baselines/reference/symbolDeclarationEmit12.js index 0b2034e045000..5d9f70334d44e 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.js +++ b/tests/baselines/reference/symbolDeclarationEmit12.js @@ -35,8 +35,8 @@ declare module M { [Symbol.iterator]: I; [Symbol.toPrimitive](x: I): void; [Symbol.isConcatSpreadable](): I; - readonly [Symbol.toPrimitive]: any; - [Symbol.toPrimitive]: I; + get [Symbol.toPrimitive](): any; + set [Symbol.toPrimitive](x: I); } export {}; } diff --git a/tests/baselines/reference/symbolDeclarationEmit13.js b/tests/baselines/reference/symbolDeclarationEmit13.js index bbd2c15cfcd1a..dc00d00fc9828 100644 --- a/tests/baselines/reference/symbolDeclarationEmit13.js +++ b/tests/baselines/reference/symbolDeclarationEmit13.js @@ -13,6 +13,6 @@ class C { //// [symbolDeclarationEmit13.d.ts] declare class C { - readonly [Symbol.toPrimitive]: string; - [Symbol.toStringTag]: any; + get [Symbol.toPrimitive](): string; + set [Symbol.toStringTag](x: any); } diff --git a/tests/baselines/reference/symbolDeclarationEmit14.js b/tests/baselines/reference/symbolDeclarationEmit14.js index d4ae3eeb43c35..f79c4e254f03b 100644 --- a/tests/baselines/reference/symbolDeclarationEmit14.js +++ b/tests/baselines/reference/symbolDeclarationEmit14.js @@ -13,6 +13,6 @@ class C { //// [symbolDeclarationEmit14.d.ts] declare class C { - readonly [Symbol.toPrimitive]: string; - readonly [Symbol.toStringTag]: string; + get [Symbol.toPrimitive](): string; + get [Symbol.toStringTag](): string; } diff --git a/tests/baselines/reference/symbolDeclarationEmit4.js b/tests/baselines/reference/symbolDeclarationEmit4.js index 75680aacb66fa..fb3099ec49dbd 100644 --- a/tests/baselines/reference/symbolDeclarationEmit4.js +++ b/tests/baselines/reference/symbolDeclarationEmit4.js @@ -13,5 +13,6 @@ class C { //// [symbolDeclarationEmit4.d.ts] declare class C { - [Symbol.toPrimitive]: string; + get [Symbol.toPrimitive](): string; + set [Symbol.toPrimitive](x: string); } 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 4de45c6d0ecf5..ebb144304fbb6 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 @@ -3533,32 +3533,32 @@ sourceFile:global.ts }, { "pos": 108, - "end": 212, + "end": 233, "kind": "internal" }, { - "pos": 214, - "end": 253, + "pos": 235, + "end": 274, "kind": "text" }, { - "pos": 253, - "end": 721, + "pos": 274, + "end": 742, "kind": "internal" }, { - "pos": 723, - "end": 730, + "pos": 744, + "end": 751, "kind": "text" }, { - "pos": 730, - "end": 1219, + "pos": 751, + "end": 1240, "kind": "internal" }, { - "pos": 1221, - "end": 1312, + "pos": 1242, + "end": 1333, "kind": "text" } ] @@ -3689,18 +3689,19 @@ declare module "file1" { export class normalC { ---------------------------------------------------------------------- -internal: (108-212) +internal: (108-233) constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (214-253) +text: (235-274) } export namespace normalN { ---------------------------------------------------------------------- -internal: (253-721) +internal: (274-742) class C { } function foo(): void; @@ -3721,11 +3722,11 @@ internal: (253-721) c = 2 } ---------------------------------------------------------------------- -text: (723-730) +text: (744-751) } ---------------------------------------------------------------------- -internal: (730-1219) +internal: (751-1240) export class internalC { } export function internalfoo(): void; @@ -3746,7 +3747,7 @@ internal: (730-1219) c = 2 } ---------------------------------------------------------------------- -text: (1221-1312) +text: (1242-1333) } declare module "file2" { export const y = 20; 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 218681bea8ffd..62a70092797fd 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 @@ -2073,7 +2073,7 @@ export namespace normalN { //// [/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"} +{"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;QACN,IAAI,CAAC,IACM,MAAM,CADK;QACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;KACvC;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"} //// [/src/lib/module.d.ts.map.baseline.txt] =================================================================== @@ -2174,35 +2174,66 @@ sourceFile:file1.ts >>> method(): void; 1->^^^^^^^^ 2 > ^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(7, 9) Source(5, 19) + SourceIndex(1) 2 >Emitted(7, 15) Source(5, 25) + SourceIndex(1) --- ->>> /*@internal*/ c: number; -1->^^^^^^^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +>>> get c(): number; +1->^^^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(8, 23) Source(6, 23) + SourceIndex(1) -2 >Emitted(8, 24) Source(6, 24) + SourceIndex(1) -3 >Emitted(8, 26) Source(7, 30) + SourceIndex(1) -4 >Emitted(8, 32) Source(7, 36) + SourceIndex(1) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(8, 9) Source(6, 19) + SourceIndex(1) +2 >Emitted(8, 13) Source(6, 23) + SourceIndex(1) +3 >Emitted(8, 14) Source(6, 24) + SourceIndex(1) +4 >Emitted(8, 18) Source(7, 30) + SourceIndex(1) +5 >Emitted(8, 24) Source(7, 36) + SourceIndex(1) +6 >Emitted(8, 25) Source(6, 41) + SourceIndex(1) +--- +>>> set c(val: number); +1->^^^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(9, 9) Source(7, 19) + SourceIndex(1) +2 >Emitted(9, 13) Source(7, 23) + SourceIndex(1) +3 >Emitted(9, 14) Source(7, 24) + SourceIndex(1) +4 >Emitted(9, 15) Source(7, 25) + SourceIndex(1) +5 >Emitted(9, 20) Source(7, 30) + SourceIndex(1) +6 >Emitted(9, 26) Source(7, 36) + SourceIndex(1) +7 >Emitted(9, 28) Source(7, 41) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(9, 6) Source(8, 2) + SourceIndex(1) +1 >Emitted(10, 6) Source(8, 2) + SourceIndex(1) --- >>> export namespace normalN { 1->^^^^ @@ -2216,11 +2247,11 @@ sourceFile:file1.ts 3 > namespace 4 > normalN 5 > -1->Emitted(10, 5) Source(9, 1) + SourceIndex(1) -2 >Emitted(10, 11) Source(9, 7) + SourceIndex(1) -3 >Emitted(10, 22) Source(9, 18) + SourceIndex(1) -4 >Emitted(10, 29) Source(9, 25) + SourceIndex(1) -5 >Emitted(10, 30) Source(9, 26) + SourceIndex(1) +1->Emitted(11, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(11, 11) Source(9, 7) + SourceIndex(1) +3 >Emitted(11, 22) Source(9, 18) + SourceIndex(1) +4 >Emitted(11, 29) Source(9, 25) + SourceIndex(1) +5 >Emitted(11, 30) Source(9, 26) + SourceIndex(1) --- >>> class C { 1 >^^^^^^^^ @@ -2230,15 +2261,15 @@ sourceFile:file1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(11, 9) Source(10, 19) + SourceIndex(1) -2 >Emitted(11, 15) Source(10, 32) + SourceIndex(1) -3 >Emitted(11, 16) Source(10, 33) + SourceIndex(1) +1 >Emitted(12, 9) Source(10, 19) + SourceIndex(1) +2 >Emitted(12, 15) Source(10, 32) + SourceIndex(1) +3 >Emitted(12, 16) Source(10, 33) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(12, 10) Source(10, 37) + SourceIndex(1) +1 >Emitted(13, 10) Source(10, 37) + SourceIndex(1) --- >>> function foo(): void; 1->^^^^^^^^ @@ -2251,10 +2282,10 @@ sourceFile:file1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(13, 9) Source(11, 19) + SourceIndex(1) -2 >Emitted(13, 18) Source(11, 35) + SourceIndex(1) -3 >Emitted(13, 21) Source(11, 38) + SourceIndex(1) -4 >Emitted(13, 30) Source(11, 43) + SourceIndex(1) +1->Emitted(14, 9) Source(11, 19) + SourceIndex(1) +2 >Emitted(14, 18) Source(11, 35) + SourceIndex(1) +3 >Emitted(14, 21) Source(11, 38) + SourceIndex(1) +4 >Emitted(14, 30) Source(11, 43) + SourceIndex(1) --- >>> namespace someNamespace { 1->^^^^^^^^ @@ -2266,10 +2297,10 @@ sourceFile:file1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(14, 9) Source(12, 19) + SourceIndex(1) -2 >Emitted(14, 19) Source(12, 36) + SourceIndex(1) -3 >Emitted(14, 32) Source(12, 49) + SourceIndex(1) -4 >Emitted(14, 33) Source(12, 50) + SourceIndex(1) +1->Emitted(15, 9) Source(12, 19) + SourceIndex(1) +2 >Emitted(15, 19) Source(12, 36) + SourceIndex(1) +3 >Emitted(15, 32) Source(12, 49) + SourceIndex(1) +4 >Emitted(15, 33) Source(12, 50) + SourceIndex(1) --- >>> class C { 1 >^^^^^^^^^^^^ @@ -2278,20 +2309,20 @@ sourceFile:file1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(15, 13) Source(12, 52) + SourceIndex(1) -2 >Emitted(15, 19) Source(12, 65) + SourceIndex(1) -3 >Emitted(15, 20) Source(12, 66) + SourceIndex(1) +1 >Emitted(16, 13) Source(12, 52) + SourceIndex(1) +2 >Emitted(16, 19) Source(12, 65) + SourceIndex(1) +3 >Emitted(16, 20) Source(12, 66) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^^^^^ 1 > {} -1 >Emitted(16, 14) Source(12, 69) + SourceIndex(1) +1 >Emitted(17, 14) Source(12, 69) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(17, 10) Source(12, 71) + SourceIndex(1) +1 >Emitted(18, 10) Source(12, 71) + SourceIndex(1) --- >>> namespace someOther.something { 1->^^^^^^^^ @@ -2307,12 +2338,12 @@ sourceFile:file1.ts 4 > . 5 > something 6 > -1->Emitted(18, 9) Source(13, 19) + SourceIndex(1) -2 >Emitted(18, 19) Source(13, 36) + SourceIndex(1) -3 >Emitted(18, 28) Source(13, 45) + SourceIndex(1) -4 >Emitted(18, 29) Source(13, 46) + SourceIndex(1) -5 >Emitted(18, 38) Source(13, 55) + SourceIndex(1) -6 >Emitted(18, 39) Source(13, 56) + SourceIndex(1) +1->Emitted(19, 9) Source(13, 19) + SourceIndex(1) +2 >Emitted(19, 19) Source(13, 36) + SourceIndex(1) +3 >Emitted(19, 28) Source(13, 45) + SourceIndex(1) +4 >Emitted(19, 29) Source(13, 46) + SourceIndex(1) +5 >Emitted(19, 38) Source(13, 55) + SourceIndex(1) +6 >Emitted(19, 39) Source(13, 56) + SourceIndex(1) --- >>> class someClass { 1 >^^^^^^^^^^^^ @@ -2321,20 +2352,20 @@ sourceFile:file1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(19, 13) Source(13, 58) + SourceIndex(1) -2 >Emitted(19, 19) Source(13, 71) + SourceIndex(1) -3 >Emitted(19, 28) Source(13, 80) + SourceIndex(1) +1 >Emitted(20, 13) Source(13, 58) + SourceIndex(1) +2 >Emitted(20, 19) Source(13, 71) + SourceIndex(1) +3 >Emitted(20, 28) Source(13, 80) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^^^^^ 1 > {} -1 >Emitted(20, 14) Source(13, 83) + SourceIndex(1) +1 >Emitted(21, 14) Source(13, 83) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(21, 10) Source(13, 85) + SourceIndex(1) +1 >Emitted(22, 10) Source(13, 85) + SourceIndex(1) --- >>> export import someImport = someNamespace.C; 1->^^^^^^^^ @@ -2356,15 +2387,15 @@ sourceFile:file1.ts 7 > . 8 > C 9 > ; -1->Emitted(22, 9) Source(14, 19) + SourceIndex(1) -2 >Emitted(22, 15) Source(14, 25) + SourceIndex(1) -3 >Emitted(22, 23) Source(14, 33) + SourceIndex(1) -4 >Emitted(22, 33) Source(14, 43) + SourceIndex(1) -5 >Emitted(22, 36) Source(14, 46) + SourceIndex(1) -6 >Emitted(22, 49) Source(14, 59) + SourceIndex(1) -7 >Emitted(22, 50) Source(14, 60) + SourceIndex(1) -8 >Emitted(22, 51) Source(14, 61) + SourceIndex(1) -9 >Emitted(22, 52) Source(14, 62) + SourceIndex(1) +1->Emitted(23, 9) Source(14, 19) + SourceIndex(1) +2 >Emitted(23, 15) Source(14, 25) + SourceIndex(1) +3 >Emitted(23, 23) Source(14, 33) + SourceIndex(1) +4 >Emitted(23, 33) Source(14, 43) + SourceIndex(1) +5 >Emitted(23, 36) Source(14, 46) + SourceIndex(1) +6 >Emitted(23, 49) Source(14, 59) + SourceIndex(1) +7 >Emitted(23, 50) Source(14, 60) + SourceIndex(1) +8 >Emitted(23, 51) Source(14, 61) + SourceIndex(1) +9 >Emitted(23, 52) Source(14, 62) + SourceIndex(1) --- >>> type internalType = internalC; 1 >^^^^^^^^ @@ -2380,12 +2411,12 @@ sourceFile:file1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(23, 9) Source(15, 19) + SourceIndex(1) -2 >Emitted(23, 14) Source(15, 31) + SourceIndex(1) -3 >Emitted(23, 26) Source(15, 43) + SourceIndex(1) -4 >Emitted(23, 29) Source(15, 46) + SourceIndex(1) -5 >Emitted(23, 38) Source(15, 55) + SourceIndex(1) -6 >Emitted(23, 39) Source(15, 56) + SourceIndex(1) +1 >Emitted(24, 9) Source(15, 19) + SourceIndex(1) +2 >Emitted(24, 14) Source(15, 31) + SourceIndex(1) +3 >Emitted(24, 26) Source(15, 43) + SourceIndex(1) +4 >Emitted(24, 29) Source(15, 46) + SourceIndex(1) +5 >Emitted(24, 38) Source(15, 55) + SourceIndex(1) +6 >Emitted(24, 39) Source(15, 56) + SourceIndex(1) --- >>> const internalConst = 10; 1 >^^^^^^^^ @@ -2399,11 +2430,11 @@ sourceFile:file1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(24, 9) Source(16, 26) + SourceIndex(1) -2 >Emitted(24, 15) Source(16, 32) + SourceIndex(1) -3 >Emitted(24, 28) Source(16, 45) + SourceIndex(1) -4 >Emitted(24, 33) Source(16, 50) + SourceIndex(1) -5 >Emitted(24, 34) Source(16, 51) + SourceIndex(1) +1 >Emitted(25, 9) Source(16, 26) + SourceIndex(1) +2 >Emitted(25, 15) Source(16, 32) + SourceIndex(1) +3 >Emitted(25, 28) Source(16, 45) + SourceIndex(1) +4 >Emitted(25, 33) Source(16, 50) + SourceIndex(1) +5 >Emitted(25, 34) Source(16, 51) + SourceIndex(1) --- >>> enum internalEnum { 1 >^^^^^^^^ @@ -2413,9 +2444,9 @@ sourceFile:file1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(25, 9) Source(17, 19) + SourceIndex(1) -2 >Emitted(25, 14) Source(17, 31) + SourceIndex(1) -3 >Emitted(25, 26) Source(17, 43) + SourceIndex(1) +1 >Emitted(26, 9) Source(17, 19) + SourceIndex(1) +2 >Emitted(26, 14) Source(17, 31) + SourceIndex(1) +3 >Emitted(26, 26) Source(17, 43) + SourceIndex(1) --- >>> a = 0, 1 >^^^^^^^^^^^^ @@ -2425,9 +2456,9 @@ sourceFile:file1.ts 1 > { 2 > a 3 > -1 >Emitted(26, 13) Source(17, 46) + SourceIndex(1) -2 >Emitted(26, 14) Source(17, 47) + SourceIndex(1) -3 >Emitted(26, 18) Source(17, 47) + SourceIndex(1) +1 >Emitted(27, 13) Source(17, 46) + SourceIndex(1) +2 >Emitted(27, 14) Source(17, 47) + SourceIndex(1) +3 >Emitted(27, 18) Source(17, 47) + SourceIndex(1) --- >>> b = 1, 1->^^^^^^^^^^^^ @@ -2437,9 +2468,9 @@ sourceFile:file1.ts 1->, 2 > b 3 > -1->Emitted(27, 13) Source(17, 49) + SourceIndex(1) -2 >Emitted(27, 14) Source(17, 50) + SourceIndex(1) -3 >Emitted(27, 18) Source(17, 50) + SourceIndex(1) +1->Emitted(28, 13) Source(17, 49) + SourceIndex(1) +2 >Emitted(28, 14) Source(17, 50) + SourceIndex(1) +3 >Emitted(28, 18) Source(17, 50) + SourceIndex(1) --- >>> c = 2 1->^^^^^^^^^^^^ @@ -2448,21 +2479,21 @@ sourceFile:file1.ts 1->, 2 > c 3 > -1->Emitted(28, 13) Source(17, 52) + SourceIndex(1) -2 >Emitted(28, 14) Source(17, 53) + SourceIndex(1) -3 >Emitted(28, 18) Source(17, 53) + SourceIndex(1) +1->Emitted(29, 13) Source(17, 52) + SourceIndex(1) +2 >Emitted(29, 14) Source(17, 53) + SourceIndex(1) +3 >Emitted(29, 18) Source(17, 53) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 1 > } -1 >Emitted(29, 10) Source(17, 55) + SourceIndex(1) +1 >Emitted(30, 10) Source(17, 55) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(30, 6) Source(18, 2) + SourceIndex(1) +1 >Emitted(31, 6) Source(18, 2) + SourceIndex(1) --- >>> export class internalC { 1->^^^^ @@ -2474,16 +2505,16 @@ sourceFile:file1.ts 2 > export 3 > class 4 > internalC -1->Emitted(31, 5) Source(19, 15) + SourceIndex(1) -2 >Emitted(31, 11) Source(19, 21) + SourceIndex(1) -3 >Emitted(31, 18) Source(19, 28) + SourceIndex(1) -4 >Emitted(31, 27) Source(19, 37) + SourceIndex(1) +1->Emitted(32, 5) Source(19, 15) + SourceIndex(1) +2 >Emitted(32, 11) Source(19, 21) + SourceIndex(1) +3 >Emitted(32, 18) Source(19, 28) + SourceIndex(1) +4 >Emitted(32, 27) Source(19, 37) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(32, 6) Source(19, 40) + SourceIndex(1) +1 >Emitted(33, 6) Source(19, 40) + SourceIndex(1) --- >>> export function internalfoo(): void; 1->^^^^ @@ -2498,11 +2529,11 @@ sourceFile:file1.ts 3 > function 4 > internalfoo 5 > () {} -1->Emitted(33, 5) Source(20, 15) + SourceIndex(1) -2 >Emitted(33, 11) Source(20, 21) + SourceIndex(1) -3 >Emitted(33, 21) Source(20, 31) + SourceIndex(1) -4 >Emitted(33, 32) Source(20, 42) + SourceIndex(1) -5 >Emitted(33, 41) Source(20, 47) + SourceIndex(1) +1->Emitted(34, 5) Source(20, 15) + SourceIndex(1) +2 >Emitted(34, 11) Source(20, 21) + SourceIndex(1) +3 >Emitted(34, 21) Source(20, 31) + SourceIndex(1) +4 >Emitted(34, 32) Source(20, 42) + SourceIndex(1) +5 >Emitted(34, 41) Source(20, 47) + SourceIndex(1) --- >>> export namespace internalNamespace { 1->^^^^ @@ -2516,11 +2547,11 @@ sourceFile:file1.ts 3 > namespace 4 > internalNamespace 5 > -1->Emitted(34, 5) Source(21, 15) + SourceIndex(1) -2 >Emitted(34, 11) Source(21, 21) + SourceIndex(1) -3 >Emitted(34, 22) Source(21, 32) + SourceIndex(1) -4 >Emitted(34, 39) Source(21, 49) + SourceIndex(1) -5 >Emitted(34, 40) Source(21, 50) + SourceIndex(1) +1->Emitted(35, 5) Source(21, 15) + SourceIndex(1) +2 >Emitted(35, 11) Source(21, 21) + SourceIndex(1) +3 >Emitted(35, 22) Source(21, 32) + SourceIndex(1) +4 >Emitted(35, 39) Source(21, 49) + SourceIndex(1) +5 >Emitted(35, 40) Source(21, 50) + SourceIndex(1) --- >>> class someClass { 1 >^^^^^^^^ @@ -2529,20 +2560,20 @@ sourceFile:file1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(35, 9) Source(21, 52) + SourceIndex(1) -2 >Emitted(35, 15) Source(21, 65) + SourceIndex(1) -3 >Emitted(35, 24) Source(21, 74) + SourceIndex(1) +1 >Emitted(36, 9) Source(21, 52) + SourceIndex(1) +2 >Emitted(36, 15) Source(21, 65) + SourceIndex(1) +3 >Emitted(36, 24) Source(21, 74) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(36, 10) Source(21, 77) + SourceIndex(1) +1 >Emitted(37, 10) Source(21, 77) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(37, 6) Source(21, 79) + SourceIndex(1) +1 >Emitted(38, 6) Source(21, 79) + SourceIndex(1) --- >>> export namespace internalOther.something { 1->^^^^ @@ -2560,13 +2591,13 @@ sourceFile:file1.ts 5 > . 6 > something 7 > -1->Emitted(38, 5) Source(22, 15) + SourceIndex(1) -2 >Emitted(38, 11) Source(22, 21) + SourceIndex(1) -3 >Emitted(38, 22) Source(22, 32) + SourceIndex(1) -4 >Emitted(38, 35) Source(22, 45) + SourceIndex(1) -5 >Emitted(38, 36) Source(22, 46) + SourceIndex(1) -6 >Emitted(38, 45) Source(22, 55) + SourceIndex(1) -7 >Emitted(38, 46) Source(22, 56) + SourceIndex(1) +1->Emitted(39, 5) Source(22, 15) + SourceIndex(1) +2 >Emitted(39, 11) Source(22, 21) + SourceIndex(1) +3 >Emitted(39, 22) Source(22, 32) + SourceIndex(1) +4 >Emitted(39, 35) Source(22, 45) + SourceIndex(1) +5 >Emitted(39, 36) Source(22, 46) + SourceIndex(1) +6 >Emitted(39, 45) Source(22, 55) + SourceIndex(1) +7 >Emitted(39, 46) Source(22, 56) + SourceIndex(1) --- >>> class someClass { 1 >^^^^^^^^ @@ -2575,20 +2606,20 @@ sourceFile:file1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(39, 9) Source(22, 58) + SourceIndex(1) -2 >Emitted(39, 15) Source(22, 71) + SourceIndex(1) -3 >Emitted(39, 24) Source(22, 80) + SourceIndex(1) +1 >Emitted(40, 9) Source(22, 58) + SourceIndex(1) +2 >Emitted(40, 15) Source(22, 71) + SourceIndex(1) +3 >Emitted(40, 24) Source(22, 80) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(40, 10) Source(22, 83) + SourceIndex(1) +1 >Emitted(41, 10) Source(22, 83) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(41, 6) Source(22, 85) + SourceIndex(1) +1 >Emitted(42, 6) Source(22, 85) + SourceIndex(1) --- >>> export import internalImport = internalNamespace.someClass; 1->^^^^ @@ -2610,15 +2641,15 @@ sourceFile:file1.ts 7 > . 8 > someClass 9 > ; -1->Emitted(42, 5) Source(23, 15) + SourceIndex(1) -2 >Emitted(42, 11) Source(23, 21) + SourceIndex(1) -3 >Emitted(42, 19) Source(23, 29) + SourceIndex(1) -4 >Emitted(42, 33) Source(23, 43) + SourceIndex(1) -5 >Emitted(42, 36) Source(23, 46) + SourceIndex(1) -6 >Emitted(42, 53) Source(23, 63) + SourceIndex(1) -7 >Emitted(42, 54) Source(23, 64) + SourceIndex(1) -8 >Emitted(42, 63) Source(23, 73) + SourceIndex(1) -9 >Emitted(42, 64) Source(23, 74) + SourceIndex(1) +1->Emitted(43, 5) Source(23, 15) + SourceIndex(1) +2 >Emitted(43, 11) Source(23, 21) + SourceIndex(1) +3 >Emitted(43, 19) Source(23, 29) + SourceIndex(1) +4 >Emitted(43, 33) Source(23, 43) + SourceIndex(1) +5 >Emitted(43, 36) Source(23, 46) + SourceIndex(1) +6 >Emitted(43, 53) Source(23, 63) + SourceIndex(1) +7 >Emitted(43, 54) Source(23, 64) + SourceIndex(1) +8 >Emitted(43, 63) Source(23, 73) + SourceIndex(1) +9 >Emitted(43, 64) Source(23, 74) + SourceIndex(1) --- >>> export type internalType = internalC; 1 >^^^^ @@ -2636,13 +2667,13 @@ sourceFile:file1.ts 5 > = 6 > internalC 7 > ; -1 >Emitted(43, 5) Source(24, 15) + SourceIndex(1) -2 >Emitted(43, 11) Source(24, 21) + SourceIndex(1) -3 >Emitted(43, 17) Source(24, 27) + SourceIndex(1) -4 >Emitted(43, 29) Source(24, 39) + SourceIndex(1) -5 >Emitted(43, 32) Source(24, 42) + SourceIndex(1) -6 >Emitted(43, 41) Source(24, 51) + SourceIndex(1) -7 >Emitted(43, 42) Source(24, 52) + SourceIndex(1) +1 >Emitted(44, 5) Source(24, 15) + SourceIndex(1) +2 >Emitted(44, 11) Source(24, 21) + SourceIndex(1) +3 >Emitted(44, 17) Source(24, 27) + SourceIndex(1) +4 >Emitted(44, 29) Source(24, 39) + SourceIndex(1) +5 >Emitted(44, 32) Source(24, 42) + SourceIndex(1) +6 >Emitted(44, 41) Source(24, 51) + SourceIndex(1) +7 >Emitted(44, 42) Source(24, 52) + SourceIndex(1) --- >>> export const internalConst = 10; 1 >^^^^ @@ -2660,13 +2691,13 @@ sourceFile:file1.ts 5 > internalConst 6 > = 10 7 > ; -1 >Emitted(44, 5) Source(25, 15) + SourceIndex(1) -2 >Emitted(44, 11) Source(25, 21) + SourceIndex(1) -3 >Emitted(44, 12) Source(25, 22) + SourceIndex(1) -4 >Emitted(44, 18) Source(25, 28) + SourceIndex(1) -5 >Emitted(44, 31) Source(25, 41) + SourceIndex(1) -6 >Emitted(44, 36) Source(25, 46) + SourceIndex(1) -7 >Emitted(44, 37) Source(25, 47) + SourceIndex(1) +1 >Emitted(45, 5) Source(25, 15) + SourceIndex(1) +2 >Emitted(45, 11) Source(25, 21) + SourceIndex(1) +3 >Emitted(45, 12) Source(25, 22) + SourceIndex(1) +4 >Emitted(45, 18) Source(25, 28) + SourceIndex(1) +5 >Emitted(45, 31) Source(25, 41) + SourceIndex(1) +6 >Emitted(45, 36) Source(25, 46) + SourceIndex(1) +7 >Emitted(45, 37) Source(25, 47) + SourceIndex(1) --- >>> export enum internalEnum { 1 >^^^^ @@ -2678,10 +2709,10 @@ sourceFile:file1.ts 2 > export 3 > enum 4 > internalEnum -1 >Emitted(45, 5) Source(26, 15) + SourceIndex(1) -2 >Emitted(45, 11) Source(26, 21) + SourceIndex(1) -3 >Emitted(45, 17) Source(26, 27) + SourceIndex(1) -4 >Emitted(45, 29) Source(26, 39) + SourceIndex(1) +1 >Emitted(46, 5) Source(26, 15) + SourceIndex(1) +2 >Emitted(46, 11) Source(26, 21) + SourceIndex(1) +3 >Emitted(46, 17) Source(26, 27) + SourceIndex(1) +4 >Emitted(46, 29) Source(26, 39) + SourceIndex(1) --- >>> a = 0, 1 >^^^^^^^^ @@ -2691,9 +2722,9 @@ sourceFile:file1.ts 1 > { 2 > a 3 > -1 >Emitted(46, 9) Source(26, 42) + SourceIndex(1) -2 >Emitted(46, 10) Source(26, 43) + SourceIndex(1) -3 >Emitted(46, 14) Source(26, 43) + SourceIndex(1) +1 >Emitted(47, 9) Source(26, 42) + SourceIndex(1) +2 >Emitted(47, 10) Source(26, 43) + SourceIndex(1) +3 >Emitted(47, 14) Source(26, 43) + SourceIndex(1) --- >>> b = 1, 1->^^^^^^^^ @@ -2703,9 +2734,9 @@ sourceFile:file1.ts 1->, 2 > b 3 > -1->Emitted(47, 9) Source(26, 45) + SourceIndex(1) -2 >Emitted(47, 10) Source(26, 46) + SourceIndex(1) -3 >Emitted(47, 14) Source(26, 46) + SourceIndex(1) +1->Emitted(48, 9) Source(26, 45) + SourceIndex(1) +2 >Emitted(48, 10) Source(26, 46) + SourceIndex(1) +3 >Emitted(48, 14) Source(26, 46) + SourceIndex(1) --- >>> c = 2 1->^^^^^^^^ @@ -2714,14 +2745,14 @@ sourceFile:file1.ts 1->, 2 > c 3 > -1->Emitted(48, 9) Source(26, 48) + SourceIndex(1) -2 >Emitted(48, 10) Source(26, 49) + SourceIndex(1) -3 >Emitted(48, 14) Source(26, 49) + SourceIndex(1) +1->Emitted(49, 9) Source(26, 48) + SourceIndex(1) +2 >Emitted(49, 10) Source(26, 49) + SourceIndex(1) +3 >Emitted(49, 14) Source(26, 49) + SourceIndex(1) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(49, 6) Source(26, 51) + SourceIndex(1) +1 >Emitted(50, 6) Source(26, 51) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/lib/module.d.ts @@ -2744,13 +2775,13 @@ sourceFile:file2.ts 5 > y 6 > = 20 7 > ; -1 >Emitted(52, 5) Source(1, 1) + SourceIndex(2) -2 >Emitted(52, 11) Source(1, 7) + SourceIndex(2) -3 >Emitted(52, 12) Source(1, 8) + SourceIndex(2) -4 >Emitted(52, 18) Source(1, 14) + SourceIndex(2) -5 >Emitted(52, 19) Source(1, 15) + SourceIndex(2) -6 >Emitted(52, 24) Source(1, 20) + SourceIndex(2) -7 >Emitted(52, 25) Source(1, 21) + SourceIndex(2) +1 >Emitted(53, 5) Source(1, 1) + SourceIndex(2) +2 >Emitted(53, 11) Source(1, 7) + SourceIndex(2) +3 >Emitted(53, 12) Source(1, 8) + SourceIndex(2) +4 >Emitted(53, 18) Source(1, 14) + SourceIndex(2) +5 >Emitted(53, 19) Source(1, 15) + SourceIndex(2) +6 >Emitted(53, 24) Source(1, 20) + SourceIndex(2) +7 >Emitted(53, 25) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/lib/module.d.ts @@ -2771,12 +2802,12 @@ sourceFile:global.ts 4 > globalConst 5 > = 10 6 > ; -1 >Emitted(54, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(54, 9) Source(1, 1) + SourceIndex(3) -3 >Emitted(54, 15) Source(1, 7) + SourceIndex(3) -4 >Emitted(54, 26) Source(1, 18) + SourceIndex(3) -5 >Emitted(54, 31) Source(1, 23) + SourceIndex(3) -6 >Emitted(54, 32) Source(1, 24) + SourceIndex(3) +1 >Emitted(55, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(55, 9) Source(1, 1) + SourceIndex(3) +3 >Emitted(55, 15) Source(1, 7) + SourceIndex(3) +4 >Emitted(55, 26) Source(1, 18) + SourceIndex(3) +5 >Emitted(55, 31) Source(1, 23) + SourceIndex(3) +6 >Emitted(55, 32) Source(1, 24) + SourceIndex(3) --- >>>//# sourceMappingURL=module.d.ts.map @@ -4406,32 +4437,32 @@ sourceFile:global.ts }, { "pos": 108, - "end": 212, + "end": 233, "kind": "internal" }, { - "pos": 214, - "end": 253, + "pos": 235, + "end": 274, "kind": "text" }, { - "pos": 253, - "end": 721, + "pos": 274, + "end": 742, "kind": "internal" }, { - "pos": 723, - "end": 730, + "pos": 744, + "end": 751, "kind": "text" }, { - "pos": 730, - "end": 1219, + "pos": 751, + "end": 1240, "kind": "internal" }, { - "pos": 1221, - "end": 1312, + "pos": 1242, + "end": 1333, "kind": "text" } ] @@ -4566,18 +4597,19 @@ text: (80-108) export class normalC { ---------------------------------------------------------------------- -internal: (108-212) +internal: (108-233) constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (214-253) +text: (235-274) } export namespace normalN { ---------------------------------------------------------------------- -internal: (253-721) +internal: (274-742) class C { } function foo(): void; @@ -4598,11 +4630,11 @@ internal: (253-721) c = 2 } ---------------------------------------------------------------------- -text: (723-730) +text: (744-751) } ---------------------------------------------------------------------- -internal: (730-1219) +internal: (751-1240) export class internalC { } export function internalfoo(): void; @@ -4623,7 +4655,7 @@ internal: (730-1219) c = 2 } ---------------------------------------------------------------------- -text: (1221-1312) +text: (1242-1333) } declare module "file2" { export const y = 20; diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js index dcac12cae9f3b..6f01109d21024 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js @@ -2120,7 +2120,8 @@ declare module "file1" { constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); } export namespace normalN { class C { @@ -2170,7 +2171,7 @@ declare const globalConst = 10; //# sourceMappingURL=module.d.ts.map //// [/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;;ICAhC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;IACpB,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"} +{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["file0.ts","file1.ts","file2.ts","global.ts"],"names":[],"mappings":"AAAc,QAAA,MAAM,MAAM,KAAK,CAAC;;ICAhC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;IACpB,MAAM,OAAO,OAAO;;QAEF,IAAI,EAAE,MAAM,CAAC;QACb,MAAM;QACN,IAAI,CAAC,IACM,MAAM,CADK;QACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;KACvC;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"} //// [/src/lib/module.d.ts.map.baseline.txt] =================================================================== @@ -2271,35 +2272,66 @@ sourceFile:file1.ts >>> method(): void; 1->^^^^^^^^ 2 > ^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(7, 9) Source(5, 19) + SourceIndex(1) 2 >Emitted(7, 15) Source(5, 25) + SourceIndex(1) --- ->>> /*@internal*/ c: number; -1->^^^^^^^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +>>> get c(): number; +1->^^^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(8, 23) Source(6, 23) + SourceIndex(1) -2 >Emitted(8, 24) Source(6, 24) + SourceIndex(1) -3 >Emitted(8, 26) Source(7, 30) + SourceIndex(1) -4 >Emitted(8, 32) Source(7, 36) + SourceIndex(1) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(8, 9) Source(6, 19) + SourceIndex(1) +2 >Emitted(8, 13) Source(6, 23) + SourceIndex(1) +3 >Emitted(8, 14) Source(6, 24) + SourceIndex(1) +4 >Emitted(8, 18) Source(7, 30) + SourceIndex(1) +5 >Emitted(8, 24) Source(7, 36) + SourceIndex(1) +6 >Emitted(8, 25) Source(6, 41) + SourceIndex(1) +--- +>>> set c(val: number); +1->^^^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(9, 9) Source(7, 19) + SourceIndex(1) +2 >Emitted(9, 13) Source(7, 23) + SourceIndex(1) +3 >Emitted(9, 14) Source(7, 24) + SourceIndex(1) +4 >Emitted(9, 15) Source(7, 25) + SourceIndex(1) +5 >Emitted(9, 20) Source(7, 30) + SourceIndex(1) +6 >Emitted(9, 26) Source(7, 36) + SourceIndex(1) +7 >Emitted(9, 28) Source(7, 41) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(9, 6) Source(8, 2) + SourceIndex(1) +1 >Emitted(10, 6) Source(8, 2) + SourceIndex(1) --- >>> export namespace normalN { 1->^^^^ @@ -2313,11 +2345,11 @@ sourceFile:file1.ts 3 > namespace 4 > normalN 5 > -1->Emitted(10, 5) Source(9, 1) + SourceIndex(1) -2 >Emitted(10, 11) Source(9, 7) + SourceIndex(1) -3 >Emitted(10, 22) Source(9, 18) + SourceIndex(1) -4 >Emitted(10, 29) Source(9, 25) + SourceIndex(1) -5 >Emitted(10, 30) Source(9, 26) + SourceIndex(1) +1->Emitted(11, 5) Source(9, 1) + SourceIndex(1) +2 >Emitted(11, 11) Source(9, 7) + SourceIndex(1) +3 >Emitted(11, 22) Source(9, 18) + SourceIndex(1) +4 >Emitted(11, 29) Source(9, 25) + SourceIndex(1) +5 >Emitted(11, 30) Source(9, 26) + SourceIndex(1) --- >>> class C { 1 >^^^^^^^^ @@ -2327,15 +2359,15 @@ sourceFile:file1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(11, 9) Source(10, 19) + SourceIndex(1) -2 >Emitted(11, 15) Source(10, 32) + SourceIndex(1) -3 >Emitted(11, 16) Source(10, 33) + SourceIndex(1) +1 >Emitted(12, 9) Source(10, 19) + SourceIndex(1) +2 >Emitted(12, 15) Source(10, 32) + SourceIndex(1) +3 >Emitted(12, 16) Source(10, 33) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(12, 10) Source(10, 37) + SourceIndex(1) +1 >Emitted(13, 10) Source(10, 37) + SourceIndex(1) --- >>> function foo(): void; 1->^^^^^^^^ @@ -2348,10 +2380,10 @@ sourceFile:file1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(13, 9) Source(11, 19) + SourceIndex(1) -2 >Emitted(13, 18) Source(11, 35) + SourceIndex(1) -3 >Emitted(13, 21) Source(11, 38) + SourceIndex(1) -4 >Emitted(13, 30) Source(11, 43) + SourceIndex(1) +1->Emitted(14, 9) Source(11, 19) + SourceIndex(1) +2 >Emitted(14, 18) Source(11, 35) + SourceIndex(1) +3 >Emitted(14, 21) Source(11, 38) + SourceIndex(1) +4 >Emitted(14, 30) Source(11, 43) + SourceIndex(1) --- >>> namespace someNamespace { 1->^^^^^^^^ @@ -2363,10 +2395,10 @@ sourceFile:file1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(14, 9) Source(12, 19) + SourceIndex(1) -2 >Emitted(14, 19) Source(12, 36) + SourceIndex(1) -3 >Emitted(14, 32) Source(12, 49) + SourceIndex(1) -4 >Emitted(14, 33) Source(12, 50) + SourceIndex(1) +1->Emitted(15, 9) Source(12, 19) + SourceIndex(1) +2 >Emitted(15, 19) Source(12, 36) + SourceIndex(1) +3 >Emitted(15, 32) Source(12, 49) + SourceIndex(1) +4 >Emitted(15, 33) Source(12, 50) + SourceIndex(1) --- >>> class C { 1 >^^^^^^^^^^^^ @@ -2375,20 +2407,20 @@ sourceFile:file1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(15, 13) Source(12, 52) + SourceIndex(1) -2 >Emitted(15, 19) Source(12, 65) + SourceIndex(1) -3 >Emitted(15, 20) Source(12, 66) + SourceIndex(1) +1 >Emitted(16, 13) Source(12, 52) + SourceIndex(1) +2 >Emitted(16, 19) Source(12, 65) + SourceIndex(1) +3 >Emitted(16, 20) Source(12, 66) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^^^^^ 1 > {} -1 >Emitted(16, 14) Source(12, 69) + SourceIndex(1) +1 >Emitted(17, 14) Source(12, 69) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(17, 10) Source(12, 71) + SourceIndex(1) +1 >Emitted(18, 10) Source(12, 71) + SourceIndex(1) --- >>> namespace someOther.something { 1->^^^^^^^^ @@ -2404,12 +2436,12 @@ sourceFile:file1.ts 4 > . 5 > something 6 > -1->Emitted(18, 9) Source(13, 19) + SourceIndex(1) -2 >Emitted(18, 19) Source(13, 36) + SourceIndex(1) -3 >Emitted(18, 28) Source(13, 45) + SourceIndex(1) -4 >Emitted(18, 29) Source(13, 46) + SourceIndex(1) -5 >Emitted(18, 38) Source(13, 55) + SourceIndex(1) -6 >Emitted(18, 39) Source(13, 56) + SourceIndex(1) +1->Emitted(19, 9) Source(13, 19) + SourceIndex(1) +2 >Emitted(19, 19) Source(13, 36) + SourceIndex(1) +3 >Emitted(19, 28) Source(13, 45) + SourceIndex(1) +4 >Emitted(19, 29) Source(13, 46) + SourceIndex(1) +5 >Emitted(19, 38) Source(13, 55) + SourceIndex(1) +6 >Emitted(19, 39) Source(13, 56) + SourceIndex(1) --- >>> class someClass { 1 >^^^^^^^^^^^^ @@ -2418,20 +2450,20 @@ sourceFile:file1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(19, 13) Source(13, 58) + SourceIndex(1) -2 >Emitted(19, 19) Source(13, 71) + SourceIndex(1) -3 >Emitted(19, 28) Source(13, 80) + SourceIndex(1) +1 >Emitted(20, 13) Source(13, 58) + SourceIndex(1) +2 >Emitted(20, 19) Source(13, 71) + SourceIndex(1) +3 >Emitted(20, 28) Source(13, 80) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^^^^^ 1 > {} -1 >Emitted(20, 14) Source(13, 83) + SourceIndex(1) +1 >Emitted(21, 14) Source(13, 83) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(21, 10) Source(13, 85) + SourceIndex(1) +1 >Emitted(22, 10) Source(13, 85) + SourceIndex(1) --- >>> export import someImport = someNamespace.C; 1->^^^^^^^^ @@ -2453,15 +2485,15 @@ sourceFile:file1.ts 7 > . 8 > C 9 > ; -1->Emitted(22, 9) Source(14, 19) + SourceIndex(1) -2 >Emitted(22, 15) Source(14, 25) + SourceIndex(1) -3 >Emitted(22, 23) Source(14, 33) + SourceIndex(1) -4 >Emitted(22, 33) Source(14, 43) + SourceIndex(1) -5 >Emitted(22, 36) Source(14, 46) + SourceIndex(1) -6 >Emitted(22, 49) Source(14, 59) + SourceIndex(1) -7 >Emitted(22, 50) Source(14, 60) + SourceIndex(1) -8 >Emitted(22, 51) Source(14, 61) + SourceIndex(1) -9 >Emitted(22, 52) Source(14, 62) + SourceIndex(1) +1->Emitted(23, 9) Source(14, 19) + SourceIndex(1) +2 >Emitted(23, 15) Source(14, 25) + SourceIndex(1) +3 >Emitted(23, 23) Source(14, 33) + SourceIndex(1) +4 >Emitted(23, 33) Source(14, 43) + SourceIndex(1) +5 >Emitted(23, 36) Source(14, 46) + SourceIndex(1) +6 >Emitted(23, 49) Source(14, 59) + SourceIndex(1) +7 >Emitted(23, 50) Source(14, 60) + SourceIndex(1) +8 >Emitted(23, 51) Source(14, 61) + SourceIndex(1) +9 >Emitted(23, 52) Source(14, 62) + SourceIndex(1) --- >>> type internalType = internalC; 1 >^^^^^^^^ @@ -2477,12 +2509,12 @@ sourceFile:file1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(23, 9) Source(15, 19) + SourceIndex(1) -2 >Emitted(23, 14) Source(15, 31) + SourceIndex(1) -3 >Emitted(23, 26) Source(15, 43) + SourceIndex(1) -4 >Emitted(23, 29) Source(15, 46) + SourceIndex(1) -5 >Emitted(23, 38) Source(15, 55) + SourceIndex(1) -6 >Emitted(23, 39) Source(15, 56) + SourceIndex(1) +1 >Emitted(24, 9) Source(15, 19) + SourceIndex(1) +2 >Emitted(24, 14) Source(15, 31) + SourceIndex(1) +3 >Emitted(24, 26) Source(15, 43) + SourceIndex(1) +4 >Emitted(24, 29) Source(15, 46) + SourceIndex(1) +5 >Emitted(24, 38) Source(15, 55) + SourceIndex(1) +6 >Emitted(24, 39) Source(15, 56) + SourceIndex(1) --- >>> const internalConst = 10; 1 >^^^^^^^^ @@ -2496,11 +2528,11 @@ sourceFile:file1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(24, 9) Source(16, 26) + SourceIndex(1) -2 >Emitted(24, 15) Source(16, 32) + SourceIndex(1) -3 >Emitted(24, 28) Source(16, 45) + SourceIndex(1) -4 >Emitted(24, 33) Source(16, 50) + SourceIndex(1) -5 >Emitted(24, 34) Source(16, 51) + SourceIndex(1) +1 >Emitted(25, 9) Source(16, 26) + SourceIndex(1) +2 >Emitted(25, 15) Source(16, 32) + SourceIndex(1) +3 >Emitted(25, 28) Source(16, 45) + SourceIndex(1) +4 >Emitted(25, 33) Source(16, 50) + SourceIndex(1) +5 >Emitted(25, 34) Source(16, 51) + SourceIndex(1) --- >>> enum internalEnum { 1 >^^^^^^^^ @@ -2510,9 +2542,9 @@ sourceFile:file1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(25, 9) Source(17, 19) + SourceIndex(1) -2 >Emitted(25, 14) Source(17, 31) + SourceIndex(1) -3 >Emitted(25, 26) Source(17, 43) + SourceIndex(1) +1 >Emitted(26, 9) Source(17, 19) + SourceIndex(1) +2 >Emitted(26, 14) Source(17, 31) + SourceIndex(1) +3 >Emitted(26, 26) Source(17, 43) + SourceIndex(1) --- >>> a = 0, 1 >^^^^^^^^^^^^ @@ -2522,9 +2554,9 @@ sourceFile:file1.ts 1 > { 2 > a 3 > -1 >Emitted(26, 13) Source(17, 46) + SourceIndex(1) -2 >Emitted(26, 14) Source(17, 47) + SourceIndex(1) -3 >Emitted(26, 18) Source(17, 47) + SourceIndex(1) +1 >Emitted(27, 13) Source(17, 46) + SourceIndex(1) +2 >Emitted(27, 14) Source(17, 47) + SourceIndex(1) +3 >Emitted(27, 18) Source(17, 47) + SourceIndex(1) --- >>> b = 1, 1->^^^^^^^^^^^^ @@ -2534,9 +2566,9 @@ sourceFile:file1.ts 1->, 2 > b 3 > -1->Emitted(27, 13) Source(17, 49) + SourceIndex(1) -2 >Emitted(27, 14) Source(17, 50) + SourceIndex(1) -3 >Emitted(27, 18) Source(17, 50) + SourceIndex(1) +1->Emitted(28, 13) Source(17, 49) + SourceIndex(1) +2 >Emitted(28, 14) Source(17, 50) + SourceIndex(1) +3 >Emitted(28, 18) Source(17, 50) + SourceIndex(1) --- >>> c = 2 1->^^^^^^^^^^^^ @@ -2545,21 +2577,21 @@ sourceFile:file1.ts 1->, 2 > c 3 > -1->Emitted(28, 13) Source(17, 52) + SourceIndex(1) -2 >Emitted(28, 14) Source(17, 53) + SourceIndex(1) -3 >Emitted(28, 18) Source(17, 53) + SourceIndex(1) +1->Emitted(29, 13) Source(17, 52) + SourceIndex(1) +2 >Emitted(29, 14) Source(17, 53) + SourceIndex(1) +3 >Emitted(29, 18) Source(17, 53) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 1 > } -1 >Emitted(29, 10) Source(17, 55) + SourceIndex(1) +1 >Emitted(30, 10) Source(17, 55) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(30, 6) Source(18, 2) + SourceIndex(1) +1 >Emitted(31, 6) Source(18, 2) + SourceIndex(1) --- >>> export class internalC { 1->^^^^ @@ -2571,16 +2603,16 @@ sourceFile:file1.ts 2 > export 3 > class 4 > internalC -1->Emitted(31, 5) Source(19, 15) + SourceIndex(1) -2 >Emitted(31, 11) Source(19, 21) + SourceIndex(1) -3 >Emitted(31, 18) Source(19, 28) + SourceIndex(1) -4 >Emitted(31, 27) Source(19, 37) + SourceIndex(1) +1->Emitted(32, 5) Source(19, 15) + SourceIndex(1) +2 >Emitted(32, 11) Source(19, 21) + SourceIndex(1) +3 >Emitted(32, 18) Source(19, 28) + SourceIndex(1) +4 >Emitted(32, 27) Source(19, 37) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(32, 6) Source(19, 40) + SourceIndex(1) +1 >Emitted(33, 6) Source(19, 40) + SourceIndex(1) --- >>> export function internalfoo(): void; 1->^^^^ @@ -2595,11 +2627,11 @@ sourceFile:file1.ts 3 > function 4 > internalfoo 5 > () {} -1->Emitted(33, 5) Source(20, 15) + SourceIndex(1) -2 >Emitted(33, 11) Source(20, 21) + SourceIndex(1) -3 >Emitted(33, 21) Source(20, 31) + SourceIndex(1) -4 >Emitted(33, 32) Source(20, 42) + SourceIndex(1) -5 >Emitted(33, 41) Source(20, 47) + SourceIndex(1) +1->Emitted(34, 5) Source(20, 15) + SourceIndex(1) +2 >Emitted(34, 11) Source(20, 21) + SourceIndex(1) +3 >Emitted(34, 21) Source(20, 31) + SourceIndex(1) +4 >Emitted(34, 32) Source(20, 42) + SourceIndex(1) +5 >Emitted(34, 41) Source(20, 47) + SourceIndex(1) --- >>> export namespace internalNamespace { 1->^^^^ @@ -2613,11 +2645,11 @@ sourceFile:file1.ts 3 > namespace 4 > internalNamespace 5 > -1->Emitted(34, 5) Source(21, 15) + SourceIndex(1) -2 >Emitted(34, 11) Source(21, 21) + SourceIndex(1) -3 >Emitted(34, 22) Source(21, 32) + SourceIndex(1) -4 >Emitted(34, 39) Source(21, 49) + SourceIndex(1) -5 >Emitted(34, 40) Source(21, 50) + SourceIndex(1) +1->Emitted(35, 5) Source(21, 15) + SourceIndex(1) +2 >Emitted(35, 11) Source(21, 21) + SourceIndex(1) +3 >Emitted(35, 22) Source(21, 32) + SourceIndex(1) +4 >Emitted(35, 39) Source(21, 49) + SourceIndex(1) +5 >Emitted(35, 40) Source(21, 50) + SourceIndex(1) --- >>> class someClass { 1 >^^^^^^^^ @@ -2626,20 +2658,20 @@ sourceFile:file1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(35, 9) Source(21, 52) + SourceIndex(1) -2 >Emitted(35, 15) Source(21, 65) + SourceIndex(1) -3 >Emitted(35, 24) Source(21, 74) + SourceIndex(1) +1 >Emitted(36, 9) Source(21, 52) + SourceIndex(1) +2 >Emitted(36, 15) Source(21, 65) + SourceIndex(1) +3 >Emitted(36, 24) Source(21, 74) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(36, 10) Source(21, 77) + SourceIndex(1) +1 >Emitted(37, 10) Source(21, 77) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(37, 6) Source(21, 79) + SourceIndex(1) +1 >Emitted(38, 6) Source(21, 79) + SourceIndex(1) --- >>> export namespace internalOther.something { 1->^^^^ @@ -2657,13 +2689,13 @@ sourceFile:file1.ts 5 > . 6 > something 7 > -1->Emitted(38, 5) Source(22, 15) + SourceIndex(1) -2 >Emitted(38, 11) Source(22, 21) + SourceIndex(1) -3 >Emitted(38, 22) Source(22, 32) + SourceIndex(1) -4 >Emitted(38, 35) Source(22, 45) + SourceIndex(1) -5 >Emitted(38, 36) Source(22, 46) + SourceIndex(1) -6 >Emitted(38, 45) Source(22, 55) + SourceIndex(1) -7 >Emitted(38, 46) Source(22, 56) + SourceIndex(1) +1->Emitted(39, 5) Source(22, 15) + SourceIndex(1) +2 >Emitted(39, 11) Source(22, 21) + SourceIndex(1) +3 >Emitted(39, 22) Source(22, 32) + SourceIndex(1) +4 >Emitted(39, 35) Source(22, 45) + SourceIndex(1) +5 >Emitted(39, 36) Source(22, 46) + SourceIndex(1) +6 >Emitted(39, 45) Source(22, 55) + SourceIndex(1) +7 >Emitted(39, 46) Source(22, 56) + SourceIndex(1) --- >>> class someClass { 1 >^^^^^^^^ @@ -2672,20 +2704,20 @@ sourceFile:file1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(39, 9) Source(22, 58) + SourceIndex(1) -2 >Emitted(39, 15) Source(22, 71) + SourceIndex(1) -3 >Emitted(39, 24) Source(22, 80) + SourceIndex(1) +1 >Emitted(40, 9) Source(22, 58) + SourceIndex(1) +2 >Emitted(40, 15) Source(22, 71) + SourceIndex(1) +3 >Emitted(40, 24) Source(22, 80) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(40, 10) Source(22, 83) + SourceIndex(1) +1 >Emitted(41, 10) Source(22, 83) + SourceIndex(1) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(41, 6) Source(22, 85) + SourceIndex(1) +1 >Emitted(42, 6) Source(22, 85) + SourceIndex(1) --- >>> export import internalImport = internalNamespace.someClass; 1->^^^^ @@ -2707,15 +2739,15 @@ sourceFile:file1.ts 7 > . 8 > someClass 9 > ; -1->Emitted(42, 5) Source(23, 15) + SourceIndex(1) -2 >Emitted(42, 11) Source(23, 21) + SourceIndex(1) -3 >Emitted(42, 19) Source(23, 29) + SourceIndex(1) -4 >Emitted(42, 33) Source(23, 43) + SourceIndex(1) -5 >Emitted(42, 36) Source(23, 46) + SourceIndex(1) -6 >Emitted(42, 53) Source(23, 63) + SourceIndex(1) -7 >Emitted(42, 54) Source(23, 64) + SourceIndex(1) -8 >Emitted(42, 63) Source(23, 73) + SourceIndex(1) -9 >Emitted(42, 64) Source(23, 74) + SourceIndex(1) +1->Emitted(43, 5) Source(23, 15) + SourceIndex(1) +2 >Emitted(43, 11) Source(23, 21) + SourceIndex(1) +3 >Emitted(43, 19) Source(23, 29) + SourceIndex(1) +4 >Emitted(43, 33) Source(23, 43) + SourceIndex(1) +5 >Emitted(43, 36) Source(23, 46) + SourceIndex(1) +6 >Emitted(43, 53) Source(23, 63) + SourceIndex(1) +7 >Emitted(43, 54) Source(23, 64) + SourceIndex(1) +8 >Emitted(43, 63) Source(23, 73) + SourceIndex(1) +9 >Emitted(43, 64) Source(23, 74) + SourceIndex(1) --- >>> export type internalType = internalC; 1 >^^^^ @@ -2733,13 +2765,13 @@ sourceFile:file1.ts 5 > = 6 > internalC 7 > ; -1 >Emitted(43, 5) Source(24, 15) + SourceIndex(1) -2 >Emitted(43, 11) Source(24, 21) + SourceIndex(1) -3 >Emitted(43, 17) Source(24, 27) + SourceIndex(1) -4 >Emitted(43, 29) Source(24, 39) + SourceIndex(1) -5 >Emitted(43, 32) Source(24, 42) + SourceIndex(1) -6 >Emitted(43, 41) Source(24, 51) + SourceIndex(1) -7 >Emitted(43, 42) Source(24, 52) + SourceIndex(1) +1 >Emitted(44, 5) Source(24, 15) + SourceIndex(1) +2 >Emitted(44, 11) Source(24, 21) + SourceIndex(1) +3 >Emitted(44, 17) Source(24, 27) + SourceIndex(1) +4 >Emitted(44, 29) Source(24, 39) + SourceIndex(1) +5 >Emitted(44, 32) Source(24, 42) + SourceIndex(1) +6 >Emitted(44, 41) Source(24, 51) + SourceIndex(1) +7 >Emitted(44, 42) Source(24, 52) + SourceIndex(1) --- >>> export const internalConst = 10; 1 >^^^^ @@ -2757,13 +2789,13 @@ sourceFile:file1.ts 5 > internalConst 6 > = 10 7 > ; -1 >Emitted(44, 5) Source(25, 15) + SourceIndex(1) -2 >Emitted(44, 11) Source(25, 21) + SourceIndex(1) -3 >Emitted(44, 12) Source(25, 22) + SourceIndex(1) -4 >Emitted(44, 18) Source(25, 28) + SourceIndex(1) -5 >Emitted(44, 31) Source(25, 41) + SourceIndex(1) -6 >Emitted(44, 36) Source(25, 46) + SourceIndex(1) -7 >Emitted(44, 37) Source(25, 47) + SourceIndex(1) +1 >Emitted(45, 5) Source(25, 15) + SourceIndex(1) +2 >Emitted(45, 11) Source(25, 21) + SourceIndex(1) +3 >Emitted(45, 12) Source(25, 22) + SourceIndex(1) +4 >Emitted(45, 18) Source(25, 28) + SourceIndex(1) +5 >Emitted(45, 31) Source(25, 41) + SourceIndex(1) +6 >Emitted(45, 36) Source(25, 46) + SourceIndex(1) +7 >Emitted(45, 37) Source(25, 47) + SourceIndex(1) --- >>> export enum internalEnum { 1 >^^^^ @@ -2775,10 +2807,10 @@ sourceFile:file1.ts 2 > export 3 > enum 4 > internalEnum -1 >Emitted(45, 5) Source(26, 15) + SourceIndex(1) -2 >Emitted(45, 11) Source(26, 21) + SourceIndex(1) -3 >Emitted(45, 17) Source(26, 27) + SourceIndex(1) -4 >Emitted(45, 29) Source(26, 39) + SourceIndex(1) +1 >Emitted(46, 5) Source(26, 15) + SourceIndex(1) +2 >Emitted(46, 11) Source(26, 21) + SourceIndex(1) +3 >Emitted(46, 17) Source(26, 27) + SourceIndex(1) +4 >Emitted(46, 29) Source(26, 39) + SourceIndex(1) --- >>> a = 0, 1 >^^^^^^^^ @@ -2788,9 +2820,9 @@ sourceFile:file1.ts 1 > { 2 > a 3 > -1 >Emitted(46, 9) Source(26, 42) + SourceIndex(1) -2 >Emitted(46, 10) Source(26, 43) + SourceIndex(1) -3 >Emitted(46, 14) Source(26, 43) + SourceIndex(1) +1 >Emitted(47, 9) Source(26, 42) + SourceIndex(1) +2 >Emitted(47, 10) Source(26, 43) + SourceIndex(1) +3 >Emitted(47, 14) Source(26, 43) + SourceIndex(1) --- >>> b = 1, 1->^^^^^^^^ @@ -2800,9 +2832,9 @@ sourceFile:file1.ts 1->, 2 > b 3 > -1->Emitted(47, 9) Source(26, 45) + SourceIndex(1) -2 >Emitted(47, 10) Source(26, 46) + SourceIndex(1) -3 >Emitted(47, 14) Source(26, 46) + SourceIndex(1) +1->Emitted(48, 9) Source(26, 45) + SourceIndex(1) +2 >Emitted(48, 10) Source(26, 46) + SourceIndex(1) +3 >Emitted(48, 14) Source(26, 46) + SourceIndex(1) --- >>> c = 2 1->^^^^^^^^ @@ -2811,14 +2843,14 @@ sourceFile:file1.ts 1->, 2 > c 3 > -1->Emitted(48, 9) Source(26, 48) + SourceIndex(1) -2 >Emitted(48, 10) Source(26, 49) + SourceIndex(1) -3 >Emitted(48, 14) Source(26, 49) + SourceIndex(1) +1->Emitted(49, 9) Source(26, 48) + SourceIndex(1) +2 >Emitted(49, 10) Source(26, 49) + SourceIndex(1) +3 >Emitted(49, 14) Source(26, 49) + SourceIndex(1) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(49, 6) Source(26, 51) + SourceIndex(1) +1 >Emitted(50, 6) Source(26, 51) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/lib/module.d.ts @@ -2841,13 +2873,13 @@ sourceFile:file2.ts 5 > y 6 > = 20 7 > ; -1 >Emitted(52, 5) Source(1, 1) + SourceIndex(2) -2 >Emitted(52, 11) Source(1, 7) + SourceIndex(2) -3 >Emitted(52, 12) Source(1, 8) + SourceIndex(2) -4 >Emitted(52, 18) Source(1, 14) + SourceIndex(2) -5 >Emitted(52, 19) Source(1, 15) + SourceIndex(2) -6 >Emitted(52, 24) Source(1, 20) + SourceIndex(2) -7 >Emitted(52, 25) Source(1, 21) + SourceIndex(2) +1 >Emitted(53, 5) Source(1, 1) + SourceIndex(2) +2 >Emitted(53, 11) Source(1, 7) + SourceIndex(2) +3 >Emitted(53, 12) Source(1, 8) + SourceIndex(2) +4 >Emitted(53, 18) Source(1, 14) + SourceIndex(2) +5 >Emitted(53, 19) Source(1, 15) + SourceIndex(2) +6 >Emitted(53, 24) Source(1, 20) + SourceIndex(2) +7 >Emitted(53, 25) Source(1, 21) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/lib/module.d.ts @@ -2868,12 +2900,12 @@ sourceFile:global.ts 4 > globalConst 5 > = 10 6 > ; -1 >Emitted(54, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(54, 9) Source(1, 1) + SourceIndex(3) -3 >Emitted(54, 15) Source(1, 7) + SourceIndex(3) -4 >Emitted(54, 26) Source(1, 18) + SourceIndex(3) -5 >Emitted(54, 31) Source(1, 23) + SourceIndex(3) -6 >Emitted(54, 32) Source(1, 24) + SourceIndex(3) +1 >Emitted(55, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(55, 9) Source(1, 1) + SourceIndex(3) +3 >Emitted(55, 15) Source(1, 7) + SourceIndex(3) +4 >Emitted(55, 26) Source(1, 18) + SourceIndex(3) +5 >Emitted(55, 31) Source(1, 23) + SourceIndex(3) +6 >Emitted(55, 32) Source(1, 24) + SourceIndex(3) --- >>>//# sourceMappingURL=module.d.ts.map @@ -4487,32 +4519,32 @@ sourceFile:global.ts }, { "pos": 108, - "end": 212, + "end": 233, "kind": "internal" }, { - "pos": 214, - "end": 253, + "pos": 235, + "end": 274, "kind": "text" }, { - "pos": 253, - "end": 721, + "pos": 274, + "end": 742, "kind": "internal" }, { - "pos": 723, - "end": 730, + "pos": 744, + "end": 751, "kind": "text" }, { - "pos": 730, - "end": 1219, + "pos": 751, + "end": 1240, "kind": "internal" }, { - "pos": 1221, - "end": 1312, + "pos": 1242, + "end": 1333, "kind": "text" } ] @@ -4642,18 +4674,19 @@ declare module "file1" { export class normalC { ---------------------------------------------------------------------- -internal: (108-212) +internal: (108-233) constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (214-253) +text: (235-274) } export namespace normalN { ---------------------------------------------------------------------- -internal: (253-721) +internal: (274-742) class C { } function foo(): void; @@ -4674,11 +4707,11 @@ internal: (253-721) c = 2 } ---------------------------------------------------------------------- -text: (723-730) +text: (744-751) } ---------------------------------------------------------------------- -internal: (730-1219) +internal: (751-1240) export class internalC { } export function internalfoo(): void; @@ -4699,7 +4732,7 @@ internal: (730-1219) c = 2 } ---------------------------------------------------------------------- -text: (1221-1312) +text: (1242-1333) } declare module "file2" { export const y = 20; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js index 0b7ac11a1009b..1c2a86364ce2b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -15,7 +15,8 @@ declare class normalC { constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); } declare namespace normalN { class C { @@ -63,7 +64,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -283,35 +284,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(16, 5) Source(16, 19) + SourceIndex(2) 2 >Emitted(16, 11) Source(16, 25) + SourceIndex(2) --- ->>> c: number; +>>> get c(): number; 1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(17, 5) Source(17, 23) + SourceIndex(2) -2 >Emitted(17, 6) Source(17, 24) + SourceIndex(2) -3 >Emitted(17, 8) Source(18, 30) + SourceIndex(2) -4 >Emitted(17, 14) Source(18, 36) + SourceIndex(2) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(17, 5) Source(17, 19) + SourceIndex(2) +2 >Emitted(17, 9) Source(17, 23) + SourceIndex(2) +3 >Emitted(17, 10) Source(17, 24) + SourceIndex(2) +4 >Emitted(17, 14) Source(18, 30) + SourceIndex(2) +5 >Emitted(17, 20) Source(18, 36) + SourceIndex(2) +6 >Emitted(17, 21) Source(17, 41) + SourceIndex(2) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(18, 5) Source(18, 19) + SourceIndex(2) +2 >Emitted(18, 9) Source(18, 23) + SourceIndex(2) +3 >Emitted(18, 10) Source(18, 24) + SourceIndex(2) +4 >Emitted(18, 11) Source(18, 25) + SourceIndex(2) +5 >Emitted(18, 16) Source(18, 30) + SourceIndex(2) +6 >Emitted(18, 22) Source(18, 36) + SourceIndex(2) +7 >Emitted(18, 24) Source(18, 41) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(18, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(19, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -323,10 +355,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(19, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(19, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(19, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(19, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(20, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(20, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(20, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(20, 27) Source(20, 19) + SourceIndex(2) --- >>> class C { 1 >^^^^ @@ -336,15 +368,15 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(20, 5) Source(21, 19) + SourceIndex(2) -2 >Emitted(20, 11) Source(21, 32) + SourceIndex(2) -3 >Emitted(20, 12) Source(21, 33) + SourceIndex(2) +1 >Emitted(21, 5) Source(21, 19) + SourceIndex(2) +2 >Emitted(21, 11) Source(21, 32) + SourceIndex(2) +3 >Emitted(21, 12) Source(21, 33) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(21, 6) Source(21, 37) + SourceIndex(2) +1 >Emitted(22, 6) Source(21, 37) + SourceIndex(2) --- >>> function foo(): void; 1->^^^^ @@ -357,10 +389,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(22, 5) Source(22, 19) + SourceIndex(2) -2 >Emitted(22, 14) Source(22, 35) + SourceIndex(2) -3 >Emitted(22, 17) Source(22, 38) + SourceIndex(2) -4 >Emitted(22, 26) Source(22, 43) + SourceIndex(2) +1->Emitted(23, 5) Source(22, 19) + SourceIndex(2) +2 >Emitted(23, 14) Source(22, 35) + SourceIndex(2) +3 >Emitted(23, 17) Source(22, 38) + SourceIndex(2) +4 >Emitted(23, 26) Source(22, 43) + SourceIndex(2) --- >>> namespace someNamespace { 1->^^^^ @@ -372,10 +404,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(23, 5) Source(23, 19) + SourceIndex(2) -2 >Emitted(23, 15) Source(23, 36) + SourceIndex(2) -3 >Emitted(23, 28) Source(23, 49) + SourceIndex(2) -4 >Emitted(23, 29) Source(23, 50) + SourceIndex(2) +1->Emitted(24, 5) Source(23, 19) + SourceIndex(2) +2 >Emitted(24, 15) Source(23, 36) + SourceIndex(2) +3 >Emitted(24, 28) Source(23, 49) + SourceIndex(2) +4 >Emitted(24, 29) Source(23, 50) + SourceIndex(2) --- >>> class C { 1 >^^^^^^^^ @@ -384,20 +416,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(24, 9) Source(23, 52) + SourceIndex(2) -2 >Emitted(24, 15) Source(23, 65) + SourceIndex(2) -3 >Emitted(24, 16) Source(23, 66) + SourceIndex(2) +1 >Emitted(25, 9) Source(23, 52) + SourceIndex(2) +2 >Emitted(25, 15) Source(23, 65) + SourceIndex(2) +3 >Emitted(25, 16) Source(23, 66) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(25, 10) Source(23, 69) + SourceIndex(2) +1 >Emitted(26, 10) Source(23, 69) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(26, 6) Source(23, 71) + SourceIndex(2) +1 >Emitted(27, 6) Source(23, 71) + SourceIndex(2) --- >>> namespace someOther.something { 1->^^^^ @@ -413,12 +445,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(27, 5) Source(24, 19) + SourceIndex(2) -2 >Emitted(27, 15) Source(24, 36) + SourceIndex(2) -3 >Emitted(27, 24) Source(24, 45) + SourceIndex(2) -4 >Emitted(27, 25) Source(24, 46) + SourceIndex(2) -5 >Emitted(27, 34) Source(24, 55) + SourceIndex(2) -6 >Emitted(27, 35) Source(24, 56) + SourceIndex(2) +1->Emitted(28, 5) Source(24, 19) + SourceIndex(2) +2 >Emitted(28, 15) Source(24, 36) + SourceIndex(2) +3 >Emitted(28, 24) Source(24, 45) + SourceIndex(2) +4 >Emitted(28, 25) Source(24, 46) + SourceIndex(2) +5 >Emitted(28, 34) Source(24, 55) + SourceIndex(2) +6 >Emitted(28, 35) Source(24, 56) + SourceIndex(2) --- >>> class someClass { 1 >^^^^^^^^ @@ -427,20 +459,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(28, 9) Source(24, 58) + SourceIndex(2) -2 >Emitted(28, 15) Source(24, 71) + SourceIndex(2) -3 >Emitted(28, 24) Source(24, 80) + SourceIndex(2) +1 >Emitted(29, 9) Source(24, 58) + SourceIndex(2) +2 >Emitted(29, 15) Source(24, 71) + SourceIndex(2) +3 >Emitted(29, 24) Source(24, 80) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(29, 10) Source(24, 83) + SourceIndex(2) +1 >Emitted(30, 10) Source(24, 83) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(30, 6) Source(24, 85) + SourceIndex(2) +1 >Emitted(31, 6) Source(24, 85) + SourceIndex(2) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -462,15 +494,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(31, 5) Source(25, 19) + SourceIndex(2) -2 >Emitted(31, 11) Source(25, 25) + SourceIndex(2) -3 >Emitted(31, 19) Source(25, 33) + SourceIndex(2) -4 >Emitted(31, 29) Source(25, 43) + SourceIndex(2) -5 >Emitted(31, 32) Source(25, 46) + SourceIndex(2) -6 >Emitted(31, 45) Source(25, 59) + SourceIndex(2) -7 >Emitted(31, 46) Source(25, 60) + SourceIndex(2) -8 >Emitted(31, 47) Source(25, 61) + SourceIndex(2) -9 >Emitted(31, 48) Source(25, 62) + SourceIndex(2) +1->Emitted(32, 5) Source(25, 19) + SourceIndex(2) +2 >Emitted(32, 11) Source(25, 25) + SourceIndex(2) +3 >Emitted(32, 19) Source(25, 33) + SourceIndex(2) +4 >Emitted(32, 29) Source(25, 43) + SourceIndex(2) +5 >Emitted(32, 32) Source(25, 46) + SourceIndex(2) +6 >Emitted(32, 45) Source(25, 59) + SourceIndex(2) +7 >Emitted(32, 46) Source(25, 60) + SourceIndex(2) +8 >Emitted(32, 47) Source(25, 61) + SourceIndex(2) +9 >Emitted(32, 48) Source(25, 62) + SourceIndex(2) --- >>> type internalType = internalC; 1 >^^^^ @@ -486,12 +518,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(32, 5) Source(26, 19) + SourceIndex(2) -2 >Emitted(32, 10) Source(26, 31) + SourceIndex(2) -3 >Emitted(32, 22) Source(26, 43) + SourceIndex(2) -4 >Emitted(32, 25) Source(26, 46) + SourceIndex(2) -5 >Emitted(32, 34) Source(26, 55) + SourceIndex(2) -6 >Emitted(32, 35) Source(26, 56) + SourceIndex(2) +1 >Emitted(33, 5) Source(26, 19) + SourceIndex(2) +2 >Emitted(33, 10) Source(26, 31) + SourceIndex(2) +3 >Emitted(33, 22) Source(26, 43) + SourceIndex(2) +4 >Emitted(33, 25) Source(26, 46) + SourceIndex(2) +5 >Emitted(33, 34) Source(26, 55) + SourceIndex(2) +6 >Emitted(33, 35) Source(26, 56) + SourceIndex(2) --- >>> const internalConst = 10; 1 >^^^^ @@ -505,11 +537,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(33, 5) Source(27, 26) + SourceIndex(2) -2 >Emitted(33, 11) Source(27, 32) + SourceIndex(2) -3 >Emitted(33, 24) Source(27, 45) + SourceIndex(2) -4 >Emitted(33, 29) Source(27, 50) + SourceIndex(2) -5 >Emitted(33, 30) Source(27, 51) + SourceIndex(2) +1 >Emitted(34, 5) Source(27, 26) + SourceIndex(2) +2 >Emitted(34, 11) Source(27, 32) + SourceIndex(2) +3 >Emitted(34, 24) Source(27, 45) + SourceIndex(2) +4 >Emitted(34, 29) Source(27, 50) + SourceIndex(2) +5 >Emitted(34, 30) Source(27, 51) + SourceIndex(2) --- >>> enum internalEnum { 1 >^^^^ @@ -519,9 +551,9 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(34, 5) Source(28, 19) + SourceIndex(2) -2 >Emitted(34, 10) Source(28, 31) + SourceIndex(2) -3 >Emitted(34, 22) Source(28, 43) + SourceIndex(2) +1 >Emitted(35, 5) Source(28, 19) + SourceIndex(2) +2 >Emitted(35, 10) Source(28, 31) + SourceIndex(2) +3 >Emitted(35, 22) Source(28, 43) + SourceIndex(2) --- >>> a = 0, 1 >^^^^^^^^ @@ -531,9 +563,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(35, 9) Source(28, 46) + SourceIndex(2) -2 >Emitted(35, 10) Source(28, 47) + SourceIndex(2) -3 >Emitted(35, 14) Source(28, 47) + SourceIndex(2) +1 >Emitted(36, 9) Source(28, 46) + SourceIndex(2) +2 >Emitted(36, 10) Source(28, 47) + SourceIndex(2) +3 >Emitted(36, 14) Source(28, 47) + SourceIndex(2) --- >>> b = 1, 1->^^^^^^^^ @@ -543,9 +575,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(36, 9) Source(28, 49) + SourceIndex(2) -2 >Emitted(36, 10) Source(28, 50) + SourceIndex(2) -3 >Emitted(36, 14) Source(28, 50) + SourceIndex(2) +1->Emitted(37, 9) Source(28, 49) + SourceIndex(2) +2 >Emitted(37, 10) Source(28, 50) + SourceIndex(2) +3 >Emitted(37, 14) Source(28, 50) + SourceIndex(2) --- >>> c = 2 1->^^^^^^^^ @@ -554,21 +586,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(37, 9) Source(28, 52) + SourceIndex(2) -2 >Emitted(37, 10) Source(28, 53) + SourceIndex(2) -3 >Emitted(37, 14) Source(28, 53) + SourceIndex(2) +1->Emitted(38, 9) Source(28, 52) + SourceIndex(2) +2 >Emitted(38, 10) Source(28, 53) + SourceIndex(2) +3 >Emitted(38, 14) Source(28, 53) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(38, 6) Source(28, 55) + SourceIndex(2) +1 >Emitted(39, 6) Source(28, 55) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(39, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(40, 2) Source(29, 2) + SourceIndex(2) --- >>>declare class internalC { 1-> @@ -578,15 +610,15 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >class 3 > internalC -1->Emitted(40, 1) Source(30, 15) + SourceIndex(2) -2 >Emitted(40, 15) Source(30, 21) + SourceIndex(2) -3 >Emitted(40, 24) Source(30, 30) + SourceIndex(2) +1->Emitted(41, 1) Source(30, 15) + SourceIndex(2) +2 >Emitted(41, 15) Source(30, 21) + SourceIndex(2) +3 >Emitted(41, 24) Source(30, 30) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(41, 2) Source(30, 33) + SourceIndex(2) +1 >Emitted(42, 2) Source(30, 33) + SourceIndex(2) --- >>>declare function internalfoo(): void; 1-> @@ -599,10 +631,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(42, 1) Source(31, 15) + SourceIndex(2) -2 >Emitted(42, 18) Source(31, 24) + SourceIndex(2) -3 >Emitted(42, 29) Source(31, 35) + SourceIndex(2) -4 >Emitted(42, 38) Source(31, 40) + SourceIndex(2) +1->Emitted(43, 1) Source(31, 15) + SourceIndex(2) +2 >Emitted(43, 18) Source(31, 24) + SourceIndex(2) +3 >Emitted(43, 29) Source(31, 35) + SourceIndex(2) +4 >Emitted(43, 38) Source(31, 40) + SourceIndex(2) --- >>>declare namespace internalNamespace { 1-> @@ -614,10 +646,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(43, 1) Source(32, 15) + SourceIndex(2) -2 >Emitted(43, 19) Source(32, 25) + SourceIndex(2) -3 >Emitted(43, 36) Source(32, 42) + SourceIndex(2) -4 >Emitted(43, 37) Source(32, 43) + SourceIndex(2) +1->Emitted(44, 1) Source(32, 15) + SourceIndex(2) +2 >Emitted(44, 19) Source(32, 25) + SourceIndex(2) +3 >Emitted(44, 36) Source(32, 42) + SourceIndex(2) +4 >Emitted(44, 37) Source(32, 43) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -626,20 +658,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(44, 5) Source(32, 45) + SourceIndex(2) -2 >Emitted(44, 11) Source(32, 58) + SourceIndex(2) -3 >Emitted(44, 20) Source(32, 67) + SourceIndex(2) +1 >Emitted(45, 5) Source(32, 45) + SourceIndex(2) +2 >Emitted(45, 11) Source(32, 58) + SourceIndex(2) +3 >Emitted(45, 20) Source(32, 67) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(45, 6) Source(32, 70) + SourceIndex(2) +1 >Emitted(46, 6) Source(32, 70) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(46, 2) Source(32, 72) + SourceIndex(2) +1 >Emitted(47, 2) Source(32, 72) + SourceIndex(2) --- >>>declare namespace internalOther.something { 1-> @@ -655,12 +687,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(47, 1) Source(33, 15) + SourceIndex(2) -2 >Emitted(47, 19) Source(33, 25) + SourceIndex(2) -3 >Emitted(47, 32) Source(33, 38) + SourceIndex(2) -4 >Emitted(47, 33) Source(33, 39) + SourceIndex(2) -5 >Emitted(47, 42) Source(33, 48) + SourceIndex(2) -6 >Emitted(47, 43) Source(33, 49) + SourceIndex(2) +1->Emitted(48, 1) Source(33, 15) + SourceIndex(2) +2 >Emitted(48, 19) Source(33, 25) + SourceIndex(2) +3 >Emitted(48, 32) Source(33, 38) + SourceIndex(2) +4 >Emitted(48, 33) Source(33, 39) + SourceIndex(2) +5 >Emitted(48, 42) Source(33, 48) + SourceIndex(2) +6 >Emitted(48, 43) Source(33, 49) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -669,20 +701,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(48, 5) Source(33, 51) + SourceIndex(2) -2 >Emitted(48, 11) Source(33, 64) + SourceIndex(2) -3 >Emitted(48, 20) Source(33, 73) + SourceIndex(2) +1 >Emitted(49, 5) Source(33, 51) + SourceIndex(2) +2 >Emitted(49, 11) Source(33, 64) + SourceIndex(2) +3 >Emitted(49, 20) Source(33, 73) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(49, 6) Source(33, 76) + SourceIndex(2) +1 >Emitted(50, 6) Source(33, 76) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(33, 78) + SourceIndex(2) +1 >Emitted(51, 2) Source(33, 78) + SourceIndex(2) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -702,14 +734,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(51, 1) Source(34, 15) + SourceIndex(2) -2 >Emitted(51, 8) Source(34, 22) + SourceIndex(2) -3 >Emitted(51, 22) Source(34, 36) + SourceIndex(2) -4 >Emitted(51, 25) Source(34, 39) + SourceIndex(2) -5 >Emitted(51, 42) Source(34, 56) + SourceIndex(2) -6 >Emitted(51, 43) Source(34, 57) + SourceIndex(2) -7 >Emitted(51, 52) Source(34, 66) + SourceIndex(2) -8 >Emitted(51, 53) Source(34, 67) + SourceIndex(2) +1->Emitted(52, 1) Source(34, 15) + SourceIndex(2) +2 >Emitted(52, 8) Source(34, 22) + SourceIndex(2) +3 >Emitted(52, 22) Source(34, 36) + SourceIndex(2) +4 >Emitted(52, 25) Source(34, 39) + SourceIndex(2) +5 >Emitted(52, 42) Source(34, 56) + SourceIndex(2) +6 >Emitted(52, 43) Source(34, 57) + SourceIndex(2) +7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2) +8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2) --- >>>declare type internalType = internalC; 1 > @@ -725,12 +757,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(52, 1) Source(35, 15) + SourceIndex(2) -2 >Emitted(52, 14) Source(35, 20) + SourceIndex(2) -3 >Emitted(52, 26) Source(35, 32) + SourceIndex(2) -4 >Emitted(52, 29) Source(35, 35) + SourceIndex(2) -5 >Emitted(52, 38) Source(35, 44) + SourceIndex(2) -6 >Emitted(52, 39) Source(35, 45) + SourceIndex(2) +1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2) +2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2) +3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2) +4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2) +5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2) +6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2) --- >>>declare const internalConst = 10; 1 > @@ -746,12 +778,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(53, 1) Source(36, 15) + SourceIndex(2) -2 >Emitted(53, 9) Source(36, 15) + SourceIndex(2) -3 >Emitted(53, 15) Source(36, 21) + SourceIndex(2) -4 >Emitted(53, 28) Source(36, 34) + SourceIndex(2) -5 >Emitted(53, 33) Source(36, 39) + SourceIndex(2) -6 >Emitted(53, 34) Source(36, 40) + SourceIndex(2) +1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2) +2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2) +3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2) +4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2) +5 >Emitted(54, 33) Source(36, 39) + SourceIndex(2) +6 >Emitted(54, 34) Source(36, 40) + SourceIndex(2) --- >>>declare enum internalEnum { 1 > @@ -761,9 +793,9 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(54, 1) Source(37, 15) + SourceIndex(2) -2 >Emitted(54, 14) Source(37, 20) + SourceIndex(2) -3 >Emitted(54, 26) Source(37, 32) + SourceIndex(2) +1 >Emitted(55, 1) Source(37, 15) + SourceIndex(2) +2 >Emitted(55, 14) Source(37, 20) + SourceIndex(2) +3 >Emitted(55, 26) Source(37, 32) + SourceIndex(2) --- >>> a = 0, 1 >^^^^ @@ -773,9 +805,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(55, 5) Source(37, 35) + SourceIndex(2) -2 >Emitted(55, 6) Source(37, 36) + SourceIndex(2) -3 >Emitted(55, 10) Source(37, 36) + SourceIndex(2) +1 >Emitted(56, 5) Source(37, 35) + SourceIndex(2) +2 >Emitted(56, 6) Source(37, 36) + SourceIndex(2) +3 >Emitted(56, 10) Source(37, 36) + SourceIndex(2) --- >>> b = 1, 1->^^^^ @@ -785,9 +817,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(56, 5) Source(37, 38) + SourceIndex(2) -2 >Emitted(56, 6) Source(37, 39) + SourceIndex(2) -3 >Emitted(56, 10) Source(37, 39) + SourceIndex(2) +1->Emitted(57, 5) Source(37, 38) + SourceIndex(2) +2 >Emitted(57, 6) Source(37, 39) + SourceIndex(2) +3 >Emitted(57, 10) Source(37, 39) + SourceIndex(2) --- >>> c = 2 1->^^^^ @@ -796,15 +828,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(57, 5) Source(37, 41) + SourceIndex(2) -2 >Emitted(57, 6) Source(37, 42) + SourceIndex(2) -3 >Emitted(57, 10) Source(37, 42) + SourceIndex(2) +1->Emitted(58, 5) Source(37, 41) + SourceIndex(2) +2 >Emitted(58, 6) Source(37, 42) + SourceIndex(2) +3 >Emitted(58, 10) Source(37, 42) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(58, 2) Source(37, 44) + SourceIndex(2) +1 >Emitted(59, 2) Source(37, 44) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -818,9 +850,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(59, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(59, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(59, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(60, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(60, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(60, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -828,8 +860,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(60, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(60, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(61, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(61, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -838,7 +870,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(61, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(62, 2) Source(5, 2) + SourceIndex(3) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2594,32 +2626,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 233, - "end": 307, + "end": 338, "kind": "internal" }, { - "pos": 309, - "end": 341, + "pos": 340, + "end": 372, "kind": "text" }, { - "pos": 341, - "end": 733, + "pos": 372, + "end": 764, "kind": "internal" }, { - "pos": 735, - "end": 738, + "pos": 766, + "end": 769, "kind": "text" }, { - "pos": 738, - "end": 1151, + "pos": 769, + "end": 1182, "kind": "internal" }, { - "pos": 1153, - "end": 1201, + "pos": 1184, + "end": 1232, "kind": "text" } ] @@ -2774,18 +2806,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (233-307) +internal: (233-338) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (309-341) +text: (340-372) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (341-733) +internal: (372-764) class C { } function foo(): void; @@ -2806,11 +2839,11 @@ internal: (341-733) c = 2 } ---------------------------------------------------------------------- -text: (735-738) +text: (766-769) } ---------------------------------------------------------------------- -internal: (738-1151) +internal: (769-1182) declare class internalC { } declare function internalfoo(): void; @@ -2831,7 +2864,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1153-1201) +text: (1184-1232) declare class C { doSomething(): void; } 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 6ec1100b4bd03..a7fbe3e9d156e 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 @@ -1779,32 +1779,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 308, + "end": 339, "kind": "internal" }, { - "pos": 310, - "end": 342, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 342, - "end": 734, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 736, - "end": 739, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 739, - "end": 1152, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1154, - "end": 1202, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -1960,18 +1960,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-308) +internal: (234-339) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (310-342) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (342-734) +internal: (373-765) class C { } function foo(): void; @@ -1992,11 +1993,11 @@ internal: (342-734) c = 2 } ---------------------------------------------------------------------- -text: (736-739) +text: (767-770) } ---------------------------------------------------------------------- -internal: (739-1152) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -2017,7 +2018,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1154-1202) +text: (1185-1233) declare class C { doSomething(): void; } 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 d68b80c42a4e4..136200af1da65 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 @@ -1879,32 +1879,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 249, - "end": 398, + "end": 429, "kind": "internal" }, { - "pos": 400, - "end": 432, + "pos": 431, + "end": 463, "kind": "text" }, { - "pos": 432, - "end": 944, + "pos": 463, + "end": 975, "kind": "internal" }, { - "pos": 946, - "end": 949, + "pos": 977, + "end": 980, "kind": "text" }, { - "pos": 949, - "end": 1482, + "pos": 980, + "end": 1513, "kind": "internal" }, { - "pos": 1484, - "end": 1532, + "pos": 1515, + "end": 1563, "kind": "text" } ] @@ -2060,18 +2060,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (249-398) +internal: (249-429) /**@internal*/ constructor(); /**@internal*/ prop: string; /**@internal*/ method(): void; - /**@internal*/ /**@internal*/ c: number; + /**@internal*/ get c(): number; + /**@internal*/ set c(val: number); ---------------------------------------------------------------------- -text: (400-432) +text: (431-463) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (432-944) +internal: (463-975) /**@internal*/ class C { } /**@internal*/ function foo(): void; @@ -2092,11 +2093,11 @@ internal: (432-944) c = 2 } ---------------------------------------------------------------------- -text: (946-949) +text: (977-980) } ---------------------------------------------------------------------- -internal: (949-1482) +internal: (980-1513) /**@internal*/ declare class internalC { } /**@internal*/ declare function internalfoo(): void; @@ -2117,7 +2118,7 @@ internal: (949-1482) c = 2 } ---------------------------------------------------------------------- -text: (1484-1532) +text: (1515-1563) declare class C { doSomething(): void; } 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 f312697a7264c..4569a944bd610 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 @@ -1779,32 +1779,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 308, + "end": 339, "kind": "internal" }, { - "pos": 310, - "end": 342, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 342, - "end": 734, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 736, - "end": 739, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 739, - "end": 1152, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1154, - "end": 1202, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -1960,18 +1960,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-308) +internal: (234-339) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (310-342) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (342-734) +internal: (373-765) class C { } function foo(): void; @@ -1992,11 +1993,11 @@ internal: (342-734) c = 2 } ---------------------------------------------------------------------- -text: (736-739) +text: (767-770) } ---------------------------------------------------------------------- -internal: (739-1152) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -2017,7 +2018,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1154-1202) +text: (1185-1233) declare class C { doSomething(): void; } 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 4ccb69a5a8d12..505e12c4d28cf 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 @@ -1879,32 +1879,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 322, + "end": 339, "kind": "internal" }, { - "pos": 324, - "end": 356, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 356, - "end": 748, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 750, - "end": 753, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 753, - "end": 1166, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1168, - "end": 1216, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -2060,18 +2060,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-322) +internal: (234-339) constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (324-356) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (356-748) +internal: (373-765) class C { } function foo(): void; @@ -2092,11 +2093,11 @@ internal: (356-748) c = 2 } ---------------------------------------------------------------------- -text: (750-753) +text: (767-770) } ---------------------------------------------------------------------- -internal: (753-1166) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -2117,7 +2118,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1168-1216) +text: (1185-1233) declare class C { doSomething(): void; } 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 887c845e48b84..11620e047da3b 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 @@ -1,5 +1,5 @@ //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.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;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CACnC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.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;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -219,35 +219,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /**@internal*/ 2 > method 1->Emitted(16, 5) Source(16, 20) + SourceIndex(2) 2 >Emitted(16, 11) Source(16, 26) + SourceIndex(2) --- ->>> c: number; +>>> get c(): number; 1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /**@internal*/ get -2 > c -3 > () { return 10; } - > /**@internal*/ set c(val: -4 > number -1->Emitted(17, 5) Source(17, 24) + SourceIndex(2) -2 >Emitted(17, 6) Source(17, 25) + SourceIndex(2) -3 >Emitted(17, 8) Source(18, 31) + SourceIndex(2) -4 >Emitted(17, 14) Source(18, 37) + SourceIndex(2) + > /**@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /**@internal*/ set c(val: +5 > number +6 > +1->Emitted(17, 5) Source(17, 20) + SourceIndex(2) +2 >Emitted(17, 9) Source(17, 24) + SourceIndex(2) +3 >Emitted(17, 10) Source(17, 25) + SourceIndex(2) +4 >Emitted(17, 14) Source(18, 31) + SourceIndex(2) +5 >Emitted(17, 20) Source(18, 37) + SourceIndex(2) +6 >Emitted(17, 21) Source(17, 42) + SourceIndex(2) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /**@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(18, 5) Source(18, 20) + SourceIndex(2) +2 >Emitted(18, 9) Source(18, 24) + SourceIndex(2) +3 >Emitted(18, 10) Source(18, 25) + SourceIndex(2) +4 >Emitted(18, 11) Source(18, 26) + SourceIndex(2) +5 >Emitted(18, 16) Source(18, 31) + SourceIndex(2) +6 >Emitted(18, 22) Source(18, 37) + SourceIndex(2) +7 >Emitted(18, 24) Source(18, 42) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(18, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(19, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -259,10 +290,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(19, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(19, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(19, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(19, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(20, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(20, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(20, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(20, 27) Source(20, 19) + SourceIndex(2) --- >>> class C { 1 >^^^^ @@ -272,15 +303,15 @@ sourceFile:../second/second_part1.ts > /**@internal*/ 2 > export class 3 > C -1 >Emitted(20, 5) Source(21, 20) + SourceIndex(2) -2 >Emitted(20, 11) Source(21, 33) + SourceIndex(2) -3 >Emitted(20, 12) Source(21, 34) + SourceIndex(2) +1 >Emitted(21, 5) Source(21, 20) + SourceIndex(2) +2 >Emitted(21, 11) Source(21, 33) + SourceIndex(2) +3 >Emitted(21, 12) Source(21, 34) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(21, 6) Source(21, 38) + SourceIndex(2) +1 >Emitted(22, 6) Source(21, 38) + SourceIndex(2) --- >>> function foo(): void; 1->^^^^ @@ -293,10 +324,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(22, 5) Source(22, 20) + SourceIndex(2) -2 >Emitted(22, 14) Source(22, 36) + SourceIndex(2) -3 >Emitted(22, 17) Source(22, 39) + SourceIndex(2) -4 >Emitted(22, 26) Source(22, 44) + SourceIndex(2) +1->Emitted(23, 5) Source(22, 20) + SourceIndex(2) +2 >Emitted(23, 14) Source(22, 36) + SourceIndex(2) +3 >Emitted(23, 17) Source(22, 39) + SourceIndex(2) +4 >Emitted(23, 26) Source(22, 44) + SourceIndex(2) --- >>> namespace someNamespace { 1->^^^^ @@ -308,10 +339,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(23, 5) Source(23, 20) + SourceIndex(2) -2 >Emitted(23, 15) Source(23, 37) + SourceIndex(2) -3 >Emitted(23, 28) Source(23, 50) + SourceIndex(2) -4 >Emitted(23, 29) Source(23, 51) + SourceIndex(2) +1->Emitted(24, 5) Source(23, 20) + SourceIndex(2) +2 >Emitted(24, 15) Source(23, 37) + SourceIndex(2) +3 >Emitted(24, 28) Source(23, 50) + SourceIndex(2) +4 >Emitted(24, 29) Source(23, 51) + SourceIndex(2) --- >>> class C { 1 >^^^^^^^^ @@ -320,20 +351,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(24, 9) Source(23, 53) + SourceIndex(2) -2 >Emitted(24, 15) Source(23, 66) + SourceIndex(2) -3 >Emitted(24, 16) Source(23, 67) + SourceIndex(2) +1 >Emitted(25, 9) Source(23, 53) + SourceIndex(2) +2 >Emitted(25, 15) Source(23, 66) + SourceIndex(2) +3 >Emitted(25, 16) Source(23, 67) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(25, 10) Source(23, 70) + SourceIndex(2) +1 >Emitted(26, 10) Source(23, 70) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(26, 6) Source(23, 72) + SourceIndex(2) +1 >Emitted(27, 6) Source(23, 72) + SourceIndex(2) --- >>> namespace someOther.something { 1->^^^^ @@ -349,12 +380,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(27, 5) Source(24, 20) + SourceIndex(2) -2 >Emitted(27, 15) Source(24, 37) + SourceIndex(2) -3 >Emitted(27, 24) Source(24, 46) + SourceIndex(2) -4 >Emitted(27, 25) Source(24, 47) + SourceIndex(2) -5 >Emitted(27, 34) Source(24, 56) + SourceIndex(2) -6 >Emitted(27, 35) Source(24, 57) + SourceIndex(2) +1->Emitted(28, 5) Source(24, 20) + SourceIndex(2) +2 >Emitted(28, 15) Source(24, 37) + SourceIndex(2) +3 >Emitted(28, 24) Source(24, 46) + SourceIndex(2) +4 >Emitted(28, 25) Source(24, 47) + SourceIndex(2) +5 >Emitted(28, 34) Source(24, 56) + SourceIndex(2) +6 >Emitted(28, 35) Source(24, 57) + SourceIndex(2) --- >>> class someClass { 1 >^^^^^^^^ @@ -363,20 +394,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(28, 9) Source(24, 59) + SourceIndex(2) -2 >Emitted(28, 15) Source(24, 72) + SourceIndex(2) -3 >Emitted(28, 24) Source(24, 81) + SourceIndex(2) +1 >Emitted(29, 9) Source(24, 59) + SourceIndex(2) +2 >Emitted(29, 15) Source(24, 72) + SourceIndex(2) +3 >Emitted(29, 24) Source(24, 81) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(29, 10) Source(24, 84) + SourceIndex(2) +1 >Emitted(30, 10) Source(24, 84) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(30, 6) Source(24, 86) + SourceIndex(2) +1 >Emitted(31, 6) Source(24, 86) + SourceIndex(2) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -398,15 +429,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(31, 5) Source(25, 20) + SourceIndex(2) -2 >Emitted(31, 11) Source(25, 26) + SourceIndex(2) -3 >Emitted(31, 19) Source(25, 34) + SourceIndex(2) -4 >Emitted(31, 29) Source(25, 44) + SourceIndex(2) -5 >Emitted(31, 32) Source(25, 47) + SourceIndex(2) -6 >Emitted(31, 45) Source(25, 60) + SourceIndex(2) -7 >Emitted(31, 46) Source(25, 61) + SourceIndex(2) -8 >Emitted(31, 47) Source(25, 62) + SourceIndex(2) -9 >Emitted(31, 48) Source(25, 63) + SourceIndex(2) +1->Emitted(32, 5) Source(25, 20) + SourceIndex(2) +2 >Emitted(32, 11) Source(25, 26) + SourceIndex(2) +3 >Emitted(32, 19) Source(25, 34) + SourceIndex(2) +4 >Emitted(32, 29) Source(25, 44) + SourceIndex(2) +5 >Emitted(32, 32) Source(25, 47) + SourceIndex(2) +6 >Emitted(32, 45) Source(25, 60) + SourceIndex(2) +7 >Emitted(32, 46) Source(25, 61) + SourceIndex(2) +8 >Emitted(32, 47) Source(25, 62) + SourceIndex(2) +9 >Emitted(32, 48) Source(25, 63) + SourceIndex(2) --- >>> type internalType = internalC; 1 >^^^^ @@ -422,12 +453,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(32, 5) Source(26, 20) + SourceIndex(2) -2 >Emitted(32, 10) Source(26, 32) + SourceIndex(2) -3 >Emitted(32, 22) Source(26, 44) + SourceIndex(2) -4 >Emitted(32, 25) Source(26, 47) + SourceIndex(2) -5 >Emitted(32, 34) Source(26, 56) + SourceIndex(2) -6 >Emitted(32, 35) Source(26, 57) + SourceIndex(2) +1 >Emitted(33, 5) Source(26, 20) + SourceIndex(2) +2 >Emitted(33, 10) Source(26, 32) + SourceIndex(2) +3 >Emitted(33, 22) Source(26, 44) + SourceIndex(2) +4 >Emitted(33, 25) Source(26, 47) + SourceIndex(2) +5 >Emitted(33, 34) Source(26, 56) + SourceIndex(2) +6 >Emitted(33, 35) Source(26, 57) + SourceIndex(2) --- >>> const internalConst = 10; 1 >^^^^ @@ -441,11 +472,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(33, 5) Source(27, 27) + SourceIndex(2) -2 >Emitted(33, 11) Source(27, 33) + SourceIndex(2) -3 >Emitted(33, 24) Source(27, 46) + SourceIndex(2) -4 >Emitted(33, 29) Source(27, 51) + SourceIndex(2) -5 >Emitted(33, 30) Source(27, 52) + SourceIndex(2) +1 >Emitted(34, 5) Source(27, 27) + SourceIndex(2) +2 >Emitted(34, 11) Source(27, 33) + SourceIndex(2) +3 >Emitted(34, 24) Source(27, 46) + SourceIndex(2) +4 >Emitted(34, 29) Source(27, 51) + SourceIndex(2) +5 >Emitted(34, 30) Source(27, 52) + SourceIndex(2) --- >>> enum internalEnum { 1 >^^^^ @@ -455,9 +486,9 @@ sourceFile:../second/second_part1.ts > /**@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(34, 5) Source(28, 20) + SourceIndex(2) -2 >Emitted(34, 10) Source(28, 32) + SourceIndex(2) -3 >Emitted(34, 22) Source(28, 44) + SourceIndex(2) +1 >Emitted(35, 5) Source(28, 20) + SourceIndex(2) +2 >Emitted(35, 10) Source(28, 32) + SourceIndex(2) +3 >Emitted(35, 22) Source(28, 44) + SourceIndex(2) --- >>> a = 0, 1 >^^^^^^^^ @@ -467,9 +498,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(35, 9) Source(28, 47) + SourceIndex(2) -2 >Emitted(35, 10) Source(28, 48) + SourceIndex(2) -3 >Emitted(35, 14) Source(28, 48) + SourceIndex(2) +1 >Emitted(36, 9) Source(28, 47) + SourceIndex(2) +2 >Emitted(36, 10) Source(28, 48) + SourceIndex(2) +3 >Emitted(36, 14) Source(28, 48) + SourceIndex(2) --- >>> b = 1, 1->^^^^^^^^ @@ -479,9 +510,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(36, 9) Source(28, 50) + SourceIndex(2) -2 >Emitted(36, 10) Source(28, 51) + SourceIndex(2) -3 >Emitted(36, 14) Source(28, 51) + SourceIndex(2) +1->Emitted(37, 9) Source(28, 50) + SourceIndex(2) +2 >Emitted(37, 10) Source(28, 51) + SourceIndex(2) +3 >Emitted(37, 14) Source(28, 51) + SourceIndex(2) --- >>> c = 2 1->^^^^^^^^ @@ -490,21 +521,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(37, 9) Source(28, 53) + SourceIndex(2) -2 >Emitted(37, 10) Source(28, 54) + SourceIndex(2) -3 >Emitted(37, 14) Source(28, 54) + SourceIndex(2) +1->Emitted(38, 9) Source(28, 53) + SourceIndex(2) +2 >Emitted(38, 10) Source(28, 54) + SourceIndex(2) +3 >Emitted(38, 14) Source(28, 54) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(38, 6) Source(28, 56) + SourceIndex(2) +1 >Emitted(39, 6) Source(28, 56) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(39, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(40, 2) Source(29, 2) + SourceIndex(2) --- >>>declare class internalC { 1-> @@ -514,15 +545,15 @@ sourceFile:../second/second_part1.ts >/**@internal*/ 2 >class 3 > internalC -1->Emitted(40, 1) Source(30, 16) + SourceIndex(2) -2 >Emitted(40, 15) Source(30, 22) + SourceIndex(2) -3 >Emitted(40, 24) Source(30, 31) + SourceIndex(2) +1->Emitted(41, 1) Source(30, 16) + SourceIndex(2) +2 >Emitted(41, 15) Source(30, 22) + SourceIndex(2) +3 >Emitted(41, 24) Source(30, 31) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(41, 2) Source(30, 34) + SourceIndex(2) +1 >Emitted(42, 2) Source(30, 34) + SourceIndex(2) --- >>>declare function internalfoo(): void; 1-> @@ -535,10 +566,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(42, 1) Source(31, 16) + SourceIndex(2) -2 >Emitted(42, 18) Source(31, 25) + SourceIndex(2) -3 >Emitted(42, 29) Source(31, 36) + SourceIndex(2) -4 >Emitted(42, 38) Source(31, 41) + SourceIndex(2) +1->Emitted(43, 1) Source(31, 16) + SourceIndex(2) +2 >Emitted(43, 18) Source(31, 25) + SourceIndex(2) +3 >Emitted(43, 29) Source(31, 36) + SourceIndex(2) +4 >Emitted(43, 38) Source(31, 41) + SourceIndex(2) --- >>>declare namespace internalNamespace { 1-> @@ -550,10 +581,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(43, 1) Source(32, 16) + SourceIndex(2) -2 >Emitted(43, 19) Source(32, 26) + SourceIndex(2) -3 >Emitted(43, 36) Source(32, 43) + SourceIndex(2) -4 >Emitted(43, 37) Source(32, 44) + SourceIndex(2) +1->Emitted(44, 1) Source(32, 16) + SourceIndex(2) +2 >Emitted(44, 19) Source(32, 26) + SourceIndex(2) +3 >Emitted(44, 36) Source(32, 43) + SourceIndex(2) +4 >Emitted(44, 37) Source(32, 44) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -562,20 +593,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(44, 5) Source(32, 46) + SourceIndex(2) -2 >Emitted(44, 11) Source(32, 59) + SourceIndex(2) -3 >Emitted(44, 20) Source(32, 68) + SourceIndex(2) +1 >Emitted(45, 5) Source(32, 46) + SourceIndex(2) +2 >Emitted(45, 11) Source(32, 59) + SourceIndex(2) +3 >Emitted(45, 20) Source(32, 68) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(45, 6) Source(32, 71) + SourceIndex(2) +1 >Emitted(46, 6) Source(32, 71) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(46, 2) Source(32, 73) + SourceIndex(2) +1 >Emitted(47, 2) Source(32, 73) + SourceIndex(2) --- >>>declare namespace internalOther.something { 1-> @@ -591,12 +622,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(47, 1) Source(33, 16) + SourceIndex(2) -2 >Emitted(47, 19) Source(33, 26) + SourceIndex(2) -3 >Emitted(47, 32) Source(33, 39) + SourceIndex(2) -4 >Emitted(47, 33) Source(33, 40) + SourceIndex(2) -5 >Emitted(47, 42) Source(33, 49) + SourceIndex(2) -6 >Emitted(47, 43) Source(33, 50) + SourceIndex(2) +1->Emitted(48, 1) Source(33, 16) + SourceIndex(2) +2 >Emitted(48, 19) Source(33, 26) + SourceIndex(2) +3 >Emitted(48, 32) Source(33, 39) + SourceIndex(2) +4 >Emitted(48, 33) Source(33, 40) + SourceIndex(2) +5 >Emitted(48, 42) Source(33, 49) + SourceIndex(2) +6 >Emitted(48, 43) Source(33, 50) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -605,20 +636,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(48, 5) Source(33, 52) + SourceIndex(2) -2 >Emitted(48, 11) Source(33, 65) + SourceIndex(2) -3 >Emitted(48, 20) Source(33, 74) + SourceIndex(2) +1 >Emitted(49, 5) Source(33, 52) + SourceIndex(2) +2 >Emitted(49, 11) Source(33, 65) + SourceIndex(2) +3 >Emitted(49, 20) Source(33, 74) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(49, 6) Source(33, 77) + SourceIndex(2) +1 >Emitted(50, 6) Source(33, 77) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(33, 79) + SourceIndex(2) +1 >Emitted(51, 2) Source(33, 79) + SourceIndex(2) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -638,14 +669,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(51, 1) Source(34, 16) + SourceIndex(2) -2 >Emitted(51, 8) Source(34, 23) + SourceIndex(2) -3 >Emitted(51, 22) Source(34, 37) + SourceIndex(2) -4 >Emitted(51, 25) Source(34, 40) + SourceIndex(2) -5 >Emitted(51, 42) Source(34, 57) + SourceIndex(2) -6 >Emitted(51, 43) Source(34, 58) + SourceIndex(2) -7 >Emitted(51, 52) Source(34, 67) + SourceIndex(2) -8 >Emitted(51, 53) Source(34, 68) + SourceIndex(2) +1->Emitted(52, 1) Source(34, 16) + SourceIndex(2) +2 >Emitted(52, 8) Source(34, 23) + SourceIndex(2) +3 >Emitted(52, 22) Source(34, 37) + SourceIndex(2) +4 >Emitted(52, 25) Source(34, 40) + SourceIndex(2) +5 >Emitted(52, 42) Source(34, 57) + SourceIndex(2) +6 >Emitted(52, 43) Source(34, 58) + SourceIndex(2) +7 >Emitted(52, 52) Source(34, 67) + SourceIndex(2) +8 >Emitted(52, 53) Source(34, 68) + SourceIndex(2) --- >>>declare type internalType = internalC; 1 > @@ -661,12 +692,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(52, 1) Source(35, 16) + SourceIndex(2) -2 >Emitted(52, 14) Source(35, 21) + SourceIndex(2) -3 >Emitted(52, 26) Source(35, 33) + SourceIndex(2) -4 >Emitted(52, 29) Source(35, 36) + SourceIndex(2) -5 >Emitted(52, 38) Source(35, 45) + SourceIndex(2) -6 >Emitted(52, 39) Source(35, 46) + SourceIndex(2) +1 >Emitted(53, 1) Source(35, 16) + SourceIndex(2) +2 >Emitted(53, 14) Source(35, 21) + SourceIndex(2) +3 >Emitted(53, 26) Source(35, 33) + SourceIndex(2) +4 >Emitted(53, 29) Source(35, 36) + SourceIndex(2) +5 >Emitted(53, 38) Source(35, 45) + SourceIndex(2) +6 >Emitted(53, 39) Source(35, 46) + SourceIndex(2) --- >>>declare const internalConst = 10; 1 > @@ -682,12 +713,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(53, 1) Source(36, 16) + SourceIndex(2) -2 >Emitted(53, 9) Source(36, 16) + SourceIndex(2) -3 >Emitted(53, 15) Source(36, 22) + SourceIndex(2) -4 >Emitted(53, 28) Source(36, 35) + SourceIndex(2) -5 >Emitted(53, 33) Source(36, 40) + SourceIndex(2) -6 >Emitted(53, 34) Source(36, 41) + SourceIndex(2) +1 >Emitted(54, 1) Source(36, 16) + SourceIndex(2) +2 >Emitted(54, 9) Source(36, 16) + SourceIndex(2) +3 >Emitted(54, 15) Source(36, 22) + SourceIndex(2) +4 >Emitted(54, 28) Source(36, 35) + SourceIndex(2) +5 >Emitted(54, 33) Source(36, 40) + SourceIndex(2) +6 >Emitted(54, 34) Source(36, 41) + SourceIndex(2) --- >>>declare enum internalEnum { 1 > @@ -697,9 +728,9 @@ sourceFile:../second/second_part1.ts >/**@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(54, 1) Source(37, 16) + SourceIndex(2) -2 >Emitted(54, 14) Source(37, 21) + SourceIndex(2) -3 >Emitted(54, 26) Source(37, 33) + SourceIndex(2) +1 >Emitted(55, 1) Source(37, 16) + SourceIndex(2) +2 >Emitted(55, 14) Source(37, 21) + SourceIndex(2) +3 >Emitted(55, 26) Source(37, 33) + SourceIndex(2) --- >>> a = 0, 1 >^^^^ @@ -709,9 +740,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(55, 5) Source(37, 36) + SourceIndex(2) -2 >Emitted(55, 6) Source(37, 37) + SourceIndex(2) -3 >Emitted(55, 10) Source(37, 37) + SourceIndex(2) +1 >Emitted(56, 5) Source(37, 36) + SourceIndex(2) +2 >Emitted(56, 6) Source(37, 37) + SourceIndex(2) +3 >Emitted(56, 10) Source(37, 37) + SourceIndex(2) --- >>> b = 1, 1->^^^^ @@ -721,9 +752,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(56, 5) Source(37, 39) + SourceIndex(2) -2 >Emitted(56, 6) Source(37, 40) + SourceIndex(2) -3 >Emitted(56, 10) Source(37, 40) + SourceIndex(2) +1->Emitted(57, 5) Source(37, 39) + SourceIndex(2) +2 >Emitted(57, 6) Source(37, 40) + SourceIndex(2) +3 >Emitted(57, 10) Source(37, 40) + SourceIndex(2) --- >>> c = 2 1->^^^^ @@ -732,15 +763,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(57, 5) Source(37, 42) + SourceIndex(2) -2 >Emitted(57, 6) Source(37, 43) + SourceIndex(2) -3 >Emitted(57, 10) Source(37, 43) + SourceIndex(2) +1->Emitted(58, 5) Source(37, 42) + SourceIndex(2) +2 >Emitted(58, 6) Source(37, 43) + SourceIndex(2) +3 >Emitted(58, 10) Source(37, 43) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(58, 2) Source(37, 45) + SourceIndex(2) +1 >Emitted(59, 2) Source(37, 45) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -754,9 +785,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(59, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(59, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(59, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(60, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(60, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(60, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -764,8 +795,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(60, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(60, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(61, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(61, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -774,7 +805,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(61, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(62, 2) Source(5, 2) + SourceIndex(3) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -830,32 +861,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 308, + "end": 339, "kind": "internal" }, { - "pos": 310, - "end": 342, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 342, - "end": 734, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 736, - "end": 739, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 739, - "end": 1152, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1154, - "end": 1202, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -1008,18 +1039,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-308) +internal: (234-339) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (310-342) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (342-734) +internal: (373-765) class C { } function foo(): void; @@ -1040,11 +1072,11 @@ internal: (342-734) c = 2 } ---------------------------------------------------------------------- -text: (736-739) +text: (767-770) } ---------------------------------------------------------------------- -internal: (739-1152) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -1065,7 +1097,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1154-1202) +text: (1185-1233) declare class C { doSomething(): void; } 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 5f9b856f99c4e..3d71e41c0df1e 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 @@ -1,5 +1,5 @@ //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.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;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.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;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -219,35 +219,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(16, 5) Source(16, 19) + SourceIndex(2) 2 >Emitted(16, 11) Source(16, 25) + SourceIndex(2) --- ->>> c: number; +>>> get c(): number; 1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(17, 5) Source(17, 23) + SourceIndex(2) -2 >Emitted(17, 6) Source(17, 24) + SourceIndex(2) -3 >Emitted(17, 8) Source(18, 30) + SourceIndex(2) -4 >Emitted(17, 14) Source(18, 36) + SourceIndex(2) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(17, 5) Source(17, 19) + SourceIndex(2) +2 >Emitted(17, 9) Source(17, 23) + SourceIndex(2) +3 >Emitted(17, 10) Source(17, 24) + SourceIndex(2) +4 >Emitted(17, 14) Source(18, 30) + SourceIndex(2) +5 >Emitted(17, 20) Source(18, 36) + SourceIndex(2) +6 >Emitted(17, 21) Source(17, 41) + SourceIndex(2) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(18, 5) Source(18, 19) + SourceIndex(2) +2 >Emitted(18, 9) Source(18, 23) + SourceIndex(2) +3 >Emitted(18, 10) Source(18, 24) + SourceIndex(2) +4 >Emitted(18, 11) Source(18, 25) + SourceIndex(2) +5 >Emitted(18, 16) Source(18, 30) + SourceIndex(2) +6 >Emitted(18, 22) Source(18, 36) + SourceIndex(2) +7 >Emitted(18, 24) Source(18, 41) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(18, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(19, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -259,10 +290,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(19, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(19, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(19, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(19, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(20, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(20, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(20, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(20, 27) Source(20, 19) + SourceIndex(2) --- >>> class C { 1 >^^^^ @@ -272,15 +303,15 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(20, 5) Source(21, 19) + SourceIndex(2) -2 >Emitted(20, 11) Source(21, 32) + SourceIndex(2) -3 >Emitted(20, 12) Source(21, 33) + SourceIndex(2) +1 >Emitted(21, 5) Source(21, 19) + SourceIndex(2) +2 >Emitted(21, 11) Source(21, 32) + SourceIndex(2) +3 >Emitted(21, 12) Source(21, 33) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(21, 6) Source(21, 37) + SourceIndex(2) +1 >Emitted(22, 6) Source(21, 37) + SourceIndex(2) --- >>> function foo(): void; 1->^^^^ @@ -293,10 +324,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(22, 5) Source(22, 19) + SourceIndex(2) -2 >Emitted(22, 14) Source(22, 35) + SourceIndex(2) -3 >Emitted(22, 17) Source(22, 38) + SourceIndex(2) -4 >Emitted(22, 26) Source(22, 43) + SourceIndex(2) +1->Emitted(23, 5) Source(22, 19) + SourceIndex(2) +2 >Emitted(23, 14) Source(22, 35) + SourceIndex(2) +3 >Emitted(23, 17) Source(22, 38) + SourceIndex(2) +4 >Emitted(23, 26) Source(22, 43) + SourceIndex(2) --- >>> namespace someNamespace { 1->^^^^ @@ -308,10 +339,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(23, 5) Source(23, 19) + SourceIndex(2) -2 >Emitted(23, 15) Source(23, 36) + SourceIndex(2) -3 >Emitted(23, 28) Source(23, 49) + SourceIndex(2) -4 >Emitted(23, 29) Source(23, 50) + SourceIndex(2) +1->Emitted(24, 5) Source(23, 19) + SourceIndex(2) +2 >Emitted(24, 15) Source(23, 36) + SourceIndex(2) +3 >Emitted(24, 28) Source(23, 49) + SourceIndex(2) +4 >Emitted(24, 29) Source(23, 50) + SourceIndex(2) --- >>> class C { 1 >^^^^^^^^ @@ -320,20 +351,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(24, 9) Source(23, 52) + SourceIndex(2) -2 >Emitted(24, 15) Source(23, 65) + SourceIndex(2) -3 >Emitted(24, 16) Source(23, 66) + SourceIndex(2) +1 >Emitted(25, 9) Source(23, 52) + SourceIndex(2) +2 >Emitted(25, 15) Source(23, 65) + SourceIndex(2) +3 >Emitted(25, 16) Source(23, 66) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(25, 10) Source(23, 69) + SourceIndex(2) +1 >Emitted(26, 10) Source(23, 69) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(26, 6) Source(23, 71) + SourceIndex(2) +1 >Emitted(27, 6) Source(23, 71) + SourceIndex(2) --- >>> namespace someOther.something { 1->^^^^ @@ -349,12 +380,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(27, 5) Source(24, 19) + SourceIndex(2) -2 >Emitted(27, 15) Source(24, 36) + SourceIndex(2) -3 >Emitted(27, 24) Source(24, 45) + SourceIndex(2) -4 >Emitted(27, 25) Source(24, 46) + SourceIndex(2) -5 >Emitted(27, 34) Source(24, 55) + SourceIndex(2) -6 >Emitted(27, 35) Source(24, 56) + SourceIndex(2) +1->Emitted(28, 5) Source(24, 19) + SourceIndex(2) +2 >Emitted(28, 15) Source(24, 36) + SourceIndex(2) +3 >Emitted(28, 24) Source(24, 45) + SourceIndex(2) +4 >Emitted(28, 25) Source(24, 46) + SourceIndex(2) +5 >Emitted(28, 34) Source(24, 55) + SourceIndex(2) +6 >Emitted(28, 35) Source(24, 56) + SourceIndex(2) --- >>> class someClass { 1 >^^^^^^^^ @@ -363,20 +394,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(28, 9) Source(24, 58) + SourceIndex(2) -2 >Emitted(28, 15) Source(24, 71) + SourceIndex(2) -3 >Emitted(28, 24) Source(24, 80) + SourceIndex(2) +1 >Emitted(29, 9) Source(24, 58) + SourceIndex(2) +2 >Emitted(29, 15) Source(24, 71) + SourceIndex(2) +3 >Emitted(29, 24) Source(24, 80) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(29, 10) Source(24, 83) + SourceIndex(2) +1 >Emitted(30, 10) Source(24, 83) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(30, 6) Source(24, 85) + SourceIndex(2) +1 >Emitted(31, 6) Source(24, 85) + SourceIndex(2) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -398,15 +429,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(31, 5) Source(25, 19) + SourceIndex(2) -2 >Emitted(31, 11) Source(25, 25) + SourceIndex(2) -3 >Emitted(31, 19) Source(25, 33) + SourceIndex(2) -4 >Emitted(31, 29) Source(25, 43) + SourceIndex(2) -5 >Emitted(31, 32) Source(25, 46) + SourceIndex(2) -6 >Emitted(31, 45) Source(25, 59) + SourceIndex(2) -7 >Emitted(31, 46) Source(25, 60) + SourceIndex(2) -8 >Emitted(31, 47) Source(25, 61) + SourceIndex(2) -9 >Emitted(31, 48) Source(25, 62) + SourceIndex(2) +1->Emitted(32, 5) Source(25, 19) + SourceIndex(2) +2 >Emitted(32, 11) Source(25, 25) + SourceIndex(2) +3 >Emitted(32, 19) Source(25, 33) + SourceIndex(2) +4 >Emitted(32, 29) Source(25, 43) + SourceIndex(2) +5 >Emitted(32, 32) Source(25, 46) + SourceIndex(2) +6 >Emitted(32, 45) Source(25, 59) + SourceIndex(2) +7 >Emitted(32, 46) Source(25, 60) + SourceIndex(2) +8 >Emitted(32, 47) Source(25, 61) + SourceIndex(2) +9 >Emitted(32, 48) Source(25, 62) + SourceIndex(2) --- >>> type internalType = internalC; 1 >^^^^ @@ -422,12 +453,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(32, 5) Source(26, 19) + SourceIndex(2) -2 >Emitted(32, 10) Source(26, 31) + SourceIndex(2) -3 >Emitted(32, 22) Source(26, 43) + SourceIndex(2) -4 >Emitted(32, 25) Source(26, 46) + SourceIndex(2) -5 >Emitted(32, 34) Source(26, 55) + SourceIndex(2) -6 >Emitted(32, 35) Source(26, 56) + SourceIndex(2) +1 >Emitted(33, 5) Source(26, 19) + SourceIndex(2) +2 >Emitted(33, 10) Source(26, 31) + SourceIndex(2) +3 >Emitted(33, 22) Source(26, 43) + SourceIndex(2) +4 >Emitted(33, 25) Source(26, 46) + SourceIndex(2) +5 >Emitted(33, 34) Source(26, 55) + SourceIndex(2) +6 >Emitted(33, 35) Source(26, 56) + SourceIndex(2) --- >>> const internalConst = 10; 1 >^^^^ @@ -441,11 +472,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(33, 5) Source(27, 26) + SourceIndex(2) -2 >Emitted(33, 11) Source(27, 32) + SourceIndex(2) -3 >Emitted(33, 24) Source(27, 45) + SourceIndex(2) -4 >Emitted(33, 29) Source(27, 50) + SourceIndex(2) -5 >Emitted(33, 30) Source(27, 51) + SourceIndex(2) +1 >Emitted(34, 5) Source(27, 26) + SourceIndex(2) +2 >Emitted(34, 11) Source(27, 32) + SourceIndex(2) +3 >Emitted(34, 24) Source(27, 45) + SourceIndex(2) +4 >Emitted(34, 29) Source(27, 50) + SourceIndex(2) +5 >Emitted(34, 30) Source(27, 51) + SourceIndex(2) --- >>> enum internalEnum { 1 >^^^^ @@ -455,9 +486,9 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(34, 5) Source(28, 19) + SourceIndex(2) -2 >Emitted(34, 10) Source(28, 31) + SourceIndex(2) -3 >Emitted(34, 22) Source(28, 43) + SourceIndex(2) +1 >Emitted(35, 5) Source(28, 19) + SourceIndex(2) +2 >Emitted(35, 10) Source(28, 31) + SourceIndex(2) +3 >Emitted(35, 22) Source(28, 43) + SourceIndex(2) --- >>> a = 0, 1 >^^^^^^^^ @@ -467,9 +498,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(35, 9) Source(28, 46) + SourceIndex(2) -2 >Emitted(35, 10) Source(28, 47) + SourceIndex(2) -3 >Emitted(35, 14) Source(28, 47) + SourceIndex(2) +1 >Emitted(36, 9) Source(28, 46) + SourceIndex(2) +2 >Emitted(36, 10) Source(28, 47) + SourceIndex(2) +3 >Emitted(36, 14) Source(28, 47) + SourceIndex(2) --- >>> b = 1, 1->^^^^^^^^ @@ -479,9 +510,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(36, 9) Source(28, 49) + SourceIndex(2) -2 >Emitted(36, 10) Source(28, 50) + SourceIndex(2) -3 >Emitted(36, 14) Source(28, 50) + SourceIndex(2) +1->Emitted(37, 9) Source(28, 49) + SourceIndex(2) +2 >Emitted(37, 10) Source(28, 50) + SourceIndex(2) +3 >Emitted(37, 14) Source(28, 50) + SourceIndex(2) --- >>> c = 2 1->^^^^^^^^ @@ -490,21 +521,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(37, 9) Source(28, 52) + SourceIndex(2) -2 >Emitted(37, 10) Source(28, 53) + SourceIndex(2) -3 >Emitted(37, 14) Source(28, 53) + SourceIndex(2) +1->Emitted(38, 9) Source(28, 52) + SourceIndex(2) +2 >Emitted(38, 10) Source(28, 53) + SourceIndex(2) +3 >Emitted(38, 14) Source(28, 53) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(38, 6) Source(28, 55) + SourceIndex(2) +1 >Emitted(39, 6) Source(28, 55) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(39, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(40, 2) Source(29, 2) + SourceIndex(2) --- >>>declare class internalC { 1-> @@ -514,15 +545,15 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >class 3 > internalC -1->Emitted(40, 1) Source(30, 15) + SourceIndex(2) -2 >Emitted(40, 15) Source(30, 21) + SourceIndex(2) -3 >Emitted(40, 24) Source(30, 30) + SourceIndex(2) +1->Emitted(41, 1) Source(30, 15) + SourceIndex(2) +2 >Emitted(41, 15) Source(30, 21) + SourceIndex(2) +3 >Emitted(41, 24) Source(30, 30) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(41, 2) Source(30, 33) + SourceIndex(2) +1 >Emitted(42, 2) Source(30, 33) + SourceIndex(2) --- >>>declare function internalfoo(): void; 1-> @@ -535,10 +566,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(42, 1) Source(31, 15) + SourceIndex(2) -2 >Emitted(42, 18) Source(31, 24) + SourceIndex(2) -3 >Emitted(42, 29) Source(31, 35) + SourceIndex(2) -4 >Emitted(42, 38) Source(31, 40) + SourceIndex(2) +1->Emitted(43, 1) Source(31, 15) + SourceIndex(2) +2 >Emitted(43, 18) Source(31, 24) + SourceIndex(2) +3 >Emitted(43, 29) Source(31, 35) + SourceIndex(2) +4 >Emitted(43, 38) Source(31, 40) + SourceIndex(2) --- >>>declare namespace internalNamespace { 1-> @@ -550,10 +581,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(43, 1) Source(32, 15) + SourceIndex(2) -2 >Emitted(43, 19) Source(32, 25) + SourceIndex(2) -3 >Emitted(43, 36) Source(32, 42) + SourceIndex(2) -4 >Emitted(43, 37) Source(32, 43) + SourceIndex(2) +1->Emitted(44, 1) Source(32, 15) + SourceIndex(2) +2 >Emitted(44, 19) Source(32, 25) + SourceIndex(2) +3 >Emitted(44, 36) Source(32, 42) + SourceIndex(2) +4 >Emitted(44, 37) Source(32, 43) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -562,20 +593,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(44, 5) Source(32, 45) + SourceIndex(2) -2 >Emitted(44, 11) Source(32, 58) + SourceIndex(2) -3 >Emitted(44, 20) Source(32, 67) + SourceIndex(2) +1 >Emitted(45, 5) Source(32, 45) + SourceIndex(2) +2 >Emitted(45, 11) Source(32, 58) + SourceIndex(2) +3 >Emitted(45, 20) Source(32, 67) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(45, 6) Source(32, 70) + SourceIndex(2) +1 >Emitted(46, 6) Source(32, 70) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(46, 2) Source(32, 72) + SourceIndex(2) +1 >Emitted(47, 2) Source(32, 72) + SourceIndex(2) --- >>>declare namespace internalOther.something { 1-> @@ -591,12 +622,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(47, 1) Source(33, 15) + SourceIndex(2) -2 >Emitted(47, 19) Source(33, 25) + SourceIndex(2) -3 >Emitted(47, 32) Source(33, 38) + SourceIndex(2) -4 >Emitted(47, 33) Source(33, 39) + SourceIndex(2) -5 >Emitted(47, 42) Source(33, 48) + SourceIndex(2) -6 >Emitted(47, 43) Source(33, 49) + SourceIndex(2) +1->Emitted(48, 1) Source(33, 15) + SourceIndex(2) +2 >Emitted(48, 19) Source(33, 25) + SourceIndex(2) +3 >Emitted(48, 32) Source(33, 38) + SourceIndex(2) +4 >Emitted(48, 33) Source(33, 39) + SourceIndex(2) +5 >Emitted(48, 42) Source(33, 48) + SourceIndex(2) +6 >Emitted(48, 43) Source(33, 49) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -605,20 +636,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(48, 5) Source(33, 51) + SourceIndex(2) -2 >Emitted(48, 11) Source(33, 64) + SourceIndex(2) -3 >Emitted(48, 20) Source(33, 73) + SourceIndex(2) +1 >Emitted(49, 5) Source(33, 51) + SourceIndex(2) +2 >Emitted(49, 11) Source(33, 64) + SourceIndex(2) +3 >Emitted(49, 20) Source(33, 73) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(49, 6) Source(33, 76) + SourceIndex(2) +1 >Emitted(50, 6) Source(33, 76) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(33, 78) + SourceIndex(2) +1 >Emitted(51, 2) Source(33, 78) + SourceIndex(2) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -638,14 +669,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(51, 1) Source(34, 15) + SourceIndex(2) -2 >Emitted(51, 8) Source(34, 22) + SourceIndex(2) -3 >Emitted(51, 22) Source(34, 36) + SourceIndex(2) -4 >Emitted(51, 25) Source(34, 39) + SourceIndex(2) -5 >Emitted(51, 42) Source(34, 56) + SourceIndex(2) -6 >Emitted(51, 43) Source(34, 57) + SourceIndex(2) -7 >Emitted(51, 52) Source(34, 66) + SourceIndex(2) -8 >Emitted(51, 53) Source(34, 67) + SourceIndex(2) +1->Emitted(52, 1) Source(34, 15) + SourceIndex(2) +2 >Emitted(52, 8) Source(34, 22) + SourceIndex(2) +3 >Emitted(52, 22) Source(34, 36) + SourceIndex(2) +4 >Emitted(52, 25) Source(34, 39) + SourceIndex(2) +5 >Emitted(52, 42) Source(34, 56) + SourceIndex(2) +6 >Emitted(52, 43) Source(34, 57) + SourceIndex(2) +7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2) +8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2) --- >>>declare type internalType = internalC; 1 > @@ -661,12 +692,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(52, 1) Source(35, 15) + SourceIndex(2) -2 >Emitted(52, 14) Source(35, 20) + SourceIndex(2) -3 >Emitted(52, 26) Source(35, 32) + SourceIndex(2) -4 >Emitted(52, 29) Source(35, 35) + SourceIndex(2) -5 >Emitted(52, 38) Source(35, 44) + SourceIndex(2) -6 >Emitted(52, 39) Source(35, 45) + SourceIndex(2) +1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2) +2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2) +3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2) +4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2) +5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2) +6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2) --- >>>declare const internalConst = 10; 1 > @@ -682,12 +713,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(53, 1) Source(36, 15) + SourceIndex(2) -2 >Emitted(53, 9) Source(36, 15) + SourceIndex(2) -3 >Emitted(53, 15) Source(36, 21) + SourceIndex(2) -4 >Emitted(53, 28) Source(36, 34) + SourceIndex(2) -5 >Emitted(53, 33) Source(36, 39) + SourceIndex(2) -6 >Emitted(53, 34) Source(36, 40) + SourceIndex(2) +1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2) +2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2) +3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2) +4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2) +5 >Emitted(54, 33) Source(36, 39) + SourceIndex(2) +6 >Emitted(54, 34) Source(36, 40) + SourceIndex(2) --- >>>declare enum internalEnum { 1 > @@ -697,9 +728,9 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(54, 1) Source(37, 15) + SourceIndex(2) -2 >Emitted(54, 14) Source(37, 20) + SourceIndex(2) -3 >Emitted(54, 26) Source(37, 32) + SourceIndex(2) +1 >Emitted(55, 1) Source(37, 15) + SourceIndex(2) +2 >Emitted(55, 14) Source(37, 20) + SourceIndex(2) +3 >Emitted(55, 26) Source(37, 32) + SourceIndex(2) --- >>> a = 0, 1 >^^^^ @@ -709,9 +740,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(55, 5) Source(37, 35) + SourceIndex(2) -2 >Emitted(55, 6) Source(37, 36) + SourceIndex(2) -3 >Emitted(55, 10) Source(37, 36) + SourceIndex(2) +1 >Emitted(56, 5) Source(37, 35) + SourceIndex(2) +2 >Emitted(56, 6) Source(37, 36) + SourceIndex(2) +3 >Emitted(56, 10) Source(37, 36) + SourceIndex(2) --- >>> b = 1, 1->^^^^ @@ -721,9 +752,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(56, 5) Source(37, 38) + SourceIndex(2) -2 >Emitted(56, 6) Source(37, 39) + SourceIndex(2) -3 >Emitted(56, 10) Source(37, 39) + SourceIndex(2) +1->Emitted(57, 5) Source(37, 38) + SourceIndex(2) +2 >Emitted(57, 6) Source(37, 39) + SourceIndex(2) +3 >Emitted(57, 10) Source(37, 39) + SourceIndex(2) --- >>> c = 2 1->^^^^ @@ -732,15 +763,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(57, 5) Source(37, 41) + SourceIndex(2) -2 >Emitted(57, 6) Source(37, 42) + SourceIndex(2) -3 >Emitted(57, 10) Source(37, 42) + SourceIndex(2) +1->Emitted(58, 5) Source(37, 41) + SourceIndex(2) +2 >Emitted(58, 6) Source(37, 42) + SourceIndex(2) +3 >Emitted(58, 10) Source(37, 42) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(58, 2) Source(37, 44) + SourceIndex(2) +1 >Emitted(59, 2) Source(37, 44) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -754,9 +785,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(59, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(59, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(59, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(60, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(60, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(60, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -764,8 +795,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(60, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(60, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(61, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(61, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -774,7 +805,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(61, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(62, 2) Source(5, 2) + SourceIndex(3) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -830,32 +861,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 308, + "end": 339, "kind": "internal" }, { - "pos": 310, - "end": 342, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 342, - "end": 734, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 736, - "end": 739, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 739, - "end": 1152, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1154, - "end": 1202, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -1008,18 +1039,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-308) +internal: (234-339) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (310-342) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (342-734) +internal: (373-765) class C { } function foo(): void; @@ -1040,11 +1072,11 @@ internal: (342-734) c = 2 } ---------------------------------------------------------------------- -text: (736-739) +text: (767-770) } ---------------------------------------------------------------------- -internal: (739-1152) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -1065,7 +1097,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1154-1202) +text: (1185-1233) declare class C { doSomething(): void; } 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 dcaa317a0d208..2fb042f17fa62 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 @@ -1,5 +1,5 @@ //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.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;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;kBACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.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;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -219,35 +219,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(16, 5) Source(16, 19) + SourceIndex(2) 2 >Emitted(16, 11) Source(16, 25) + SourceIndex(2) --- ->>> /*@internal*/ c: number; -1->^^^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +>>> get c(): number; +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(17, 19) Source(17, 23) + SourceIndex(2) -2 >Emitted(17, 20) Source(17, 24) + SourceIndex(2) -3 >Emitted(17, 22) Source(18, 30) + SourceIndex(2) -4 >Emitted(17, 28) Source(18, 36) + SourceIndex(2) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(17, 5) Source(17, 19) + SourceIndex(2) +2 >Emitted(17, 9) Source(17, 23) + SourceIndex(2) +3 >Emitted(17, 10) Source(17, 24) + SourceIndex(2) +4 >Emitted(17, 14) Source(18, 30) + SourceIndex(2) +5 >Emitted(17, 20) Source(18, 36) + SourceIndex(2) +6 >Emitted(17, 21) Source(17, 41) + SourceIndex(2) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(18, 5) Source(18, 19) + SourceIndex(2) +2 >Emitted(18, 9) Source(18, 23) + SourceIndex(2) +3 >Emitted(18, 10) Source(18, 24) + SourceIndex(2) +4 >Emitted(18, 11) Source(18, 25) + SourceIndex(2) +5 >Emitted(18, 16) Source(18, 30) + SourceIndex(2) +6 >Emitted(18, 22) Source(18, 36) + SourceIndex(2) +7 >Emitted(18, 24) Source(18, 41) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(18, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(19, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -259,10 +290,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(19, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(19, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(19, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(19, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(20, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(20, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(20, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(20, 27) Source(20, 19) + SourceIndex(2) --- >>> class C { 1 >^^^^ @@ -272,15 +303,15 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(20, 5) Source(21, 19) + SourceIndex(2) -2 >Emitted(20, 11) Source(21, 32) + SourceIndex(2) -3 >Emitted(20, 12) Source(21, 33) + SourceIndex(2) +1 >Emitted(21, 5) Source(21, 19) + SourceIndex(2) +2 >Emitted(21, 11) Source(21, 32) + SourceIndex(2) +3 >Emitted(21, 12) Source(21, 33) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(21, 6) Source(21, 37) + SourceIndex(2) +1 >Emitted(22, 6) Source(21, 37) + SourceIndex(2) --- >>> function foo(): void; 1->^^^^ @@ -293,10 +324,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(22, 5) Source(22, 19) + SourceIndex(2) -2 >Emitted(22, 14) Source(22, 35) + SourceIndex(2) -3 >Emitted(22, 17) Source(22, 38) + SourceIndex(2) -4 >Emitted(22, 26) Source(22, 43) + SourceIndex(2) +1->Emitted(23, 5) Source(22, 19) + SourceIndex(2) +2 >Emitted(23, 14) Source(22, 35) + SourceIndex(2) +3 >Emitted(23, 17) Source(22, 38) + SourceIndex(2) +4 >Emitted(23, 26) Source(22, 43) + SourceIndex(2) --- >>> namespace someNamespace { 1->^^^^ @@ -308,10 +339,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(23, 5) Source(23, 19) + SourceIndex(2) -2 >Emitted(23, 15) Source(23, 36) + SourceIndex(2) -3 >Emitted(23, 28) Source(23, 49) + SourceIndex(2) -4 >Emitted(23, 29) Source(23, 50) + SourceIndex(2) +1->Emitted(24, 5) Source(23, 19) + SourceIndex(2) +2 >Emitted(24, 15) Source(23, 36) + SourceIndex(2) +3 >Emitted(24, 28) Source(23, 49) + SourceIndex(2) +4 >Emitted(24, 29) Source(23, 50) + SourceIndex(2) --- >>> class C { 1 >^^^^^^^^ @@ -320,20 +351,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(24, 9) Source(23, 52) + SourceIndex(2) -2 >Emitted(24, 15) Source(23, 65) + SourceIndex(2) -3 >Emitted(24, 16) Source(23, 66) + SourceIndex(2) +1 >Emitted(25, 9) Source(23, 52) + SourceIndex(2) +2 >Emitted(25, 15) Source(23, 65) + SourceIndex(2) +3 >Emitted(25, 16) Source(23, 66) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(25, 10) Source(23, 69) + SourceIndex(2) +1 >Emitted(26, 10) Source(23, 69) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(26, 6) Source(23, 71) + SourceIndex(2) +1 >Emitted(27, 6) Source(23, 71) + SourceIndex(2) --- >>> namespace someOther.something { 1->^^^^ @@ -349,12 +380,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(27, 5) Source(24, 19) + SourceIndex(2) -2 >Emitted(27, 15) Source(24, 36) + SourceIndex(2) -3 >Emitted(27, 24) Source(24, 45) + SourceIndex(2) -4 >Emitted(27, 25) Source(24, 46) + SourceIndex(2) -5 >Emitted(27, 34) Source(24, 55) + SourceIndex(2) -6 >Emitted(27, 35) Source(24, 56) + SourceIndex(2) +1->Emitted(28, 5) Source(24, 19) + SourceIndex(2) +2 >Emitted(28, 15) Source(24, 36) + SourceIndex(2) +3 >Emitted(28, 24) Source(24, 45) + SourceIndex(2) +4 >Emitted(28, 25) Source(24, 46) + SourceIndex(2) +5 >Emitted(28, 34) Source(24, 55) + SourceIndex(2) +6 >Emitted(28, 35) Source(24, 56) + SourceIndex(2) --- >>> class someClass { 1 >^^^^^^^^ @@ -363,20 +394,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(28, 9) Source(24, 58) + SourceIndex(2) -2 >Emitted(28, 15) Source(24, 71) + SourceIndex(2) -3 >Emitted(28, 24) Source(24, 80) + SourceIndex(2) +1 >Emitted(29, 9) Source(24, 58) + SourceIndex(2) +2 >Emitted(29, 15) Source(24, 71) + SourceIndex(2) +3 >Emitted(29, 24) Source(24, 80) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(29, 10) Source(24, 83) + SourceIndex(2) +1 >Emitted(30, 10) Source(24, 83) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(30, 6) Source(24, 85) + SourceIndex(2) +1 >Emitted(31, 6) Source(24, 85) + SourceIndex(2) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -398,15 +429,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(31, 5) Source(25, 19) + SourceIndex(2) -2 >Emitted(31, 11) Source(25, 25) + SourceIndex(2) -3 >Emitted(31, 19) Source(25, 33) + SourceIndex(2) -4 >Emitted(31, 29) Source(25, 43) + SourceIndex(2) -5 >Emitted(31, 32) Source(25, 46) + SourceIndex(2) -6 >Emitted(31, 45) Source(25, 59) + SourceIndex(2) -7 >Emitted(31, 46) Source(25, 60) + SourceIndex(2) -8 >Emitted(31, 47) Source(25, 61) + SourceIndex(2) -9 >Emitted(31, 48) Source(25, 62) + SourceIndex(2) +1->Emitted(32, 5) Source(25, 19) + SourceIndex(2) +2 >Emitted(32, 11) Source(25, 25) + SourceIndex(2) +3 >Emitted(32, 19) Source(25, 33) + SourceIndex(2) +4 >Emitted(32, 29) Source(25, 43) + SourceIndex(2) +5 >Emitted(32, 32) Source(25, 46) + SourceIndex(2) +6 >Emitted(32, 45) Source(25, 59) + SourceIndex(2) +7 >Emitted(32, 46) Source(25, 60) + SourceIndex(2) +8 >Emitted(32, 47) Source(25, 61) + SourceIndex(2) +9 >Emitted(32, 48) Source(25, 62) + SourceIndex(2) --- >>> type internalType = internalC; 1 >^^^^ @@ -422,12 +453,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(32, 5) Source(26, 19) + SourceIndex(2) -2 >Emitted(32, 10) Source(26, 31) + SourceIndex(2) -3 >Emitted(32, 22) Source(26, 43) + SourceIndex(2) -4 >Emitted(32, 25) Source(26, 46) + SourceIndex(2) -5 >Emitted(32, 34) Source(26, 55) + SourceIndex(2) -6 >Emitted(32, 35) Source(26, 56) + SourceIndex(2) +1 >Emitted(33, 5) Source(26, 19) + SourceIndex(2) +2 >Emitted(33, 10) Source(26, 31) + SourceIndex(2) +3 >Emitted(33, 22) Source(26, 43) + SourceIndex(2) +4 >Emitted(33, 25) Source(26, 46) + SourceIndex(2) +5 >Emitted(33, 34) Source(26, 55) + SourceIndex(2) +6 >Emitted(33, 35) Source(26, 56) + SourceIndex(2) --- >>> const internalConst = 10; 1 >^^^^ @@ -441,11 +472,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(33, 5) Source(27, 26) + SourceIndex(2) -2 >Emitted(33, 11) Source(27, 32) + SourceIndex(2) -3 >Emitted(33, 24) Source(27, 45) + SourceIndex(2) -4 >Emitted(33, 29) Source(27, 50) + SourceIndex(2) -5 >Emitted(33, 30) Source(27, 51) + SourceIndex(2) +1 >Emitted(34, 5) Source(27, 26) + SourceIndex(2) +2 >Emitted(34, 11) Source(27, 32) + SourceIndex(2) +3 >Emitted(34, 24) Source(27, 45) + SourceIndex(2) +4 >Emitted(34, 29) Source(27, 50) + SourceIndex(2) +5 >Emitted(34, 30) Source(27, 51) + SourceIndex(2) --- >>> enum internalEnum { 1 >^^^^ @@ -455,9 +486,9 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(34, 5) Source(28, 19) + SourceIndex(2) -2 >Emitted(34, 10) Source(28, 31) + SourceIndex(2) -3 >Emitted(34, 22) Source(28, 43) + SourceIndex(2) +1 >Emitted(35, 5) Source(28, 19) + SourceIndex(2) +2 >Emitted(35, 10) Source(28, 31) + SourceIndex(2) +3 >Emitted(35, 22) Source(28, 43) + SourceIndex(2) --- >>> a = 0, 1 >^^^^^^^^ @@ -467,9 +498,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(35, 9) Source(28, 46) + SourceIndex(2) -2 >Emitted(35, 10) Source(28, 47) + SourceIndex(2) -3 >Emitted(35, 14) Source(28, 47) + SourceIndex(2) +1 >Emitted(36, 9) Source(28, 46) + SourceIndex(2) +2 >Emitted(36, 10) Source(28, 47) + SourceIndex(2) +3 >Emitted(36, 14) Source(28, 47) + SourceIndex(2) --- >>> b = 1, 1->^^^^^^^^ @@ -479,9 +510,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(36, 9) Source(28, 49) + SourceIndex(2) -2 >Emitted(36, 10) Source(28, 50) + SourceIndex(2) -3 >Emitted(36, 14) Source(28, 50) + SourceIndex(2) +1->Emitted(37, 9) Source(28, 49) + SourceIndex(2) +2 >Emitted(37, 10) Source(28, 50) + SourceIndex(2) +3 >Emitted(37, 14) Source(28, 50) + SourceIndex(2) --- >>> c = 2 1->^^^^^^^^ @@ -490,21 +521,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(37, 9) Source(28, 52) + SourceIndex(2) -2 >Emitted(37, 10) Source(28, 53) + SourceIndex(2) -3 >Emitted(37, 14) Source(28, 53) + SourceIndex(2) +1->Emitted(38, 9) Source(28, 52) + SourceIndex(2) +2 >Emitted(38, 10) Source(28, 53) + SourceIndex(2) +3 >Emitted(38, 14) Source(28, 53) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(38, 6) Source(28, 55) + SourceIndex(2) +1 >Emitted(39, 6) Source(28, 55) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(39, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(40, 2) Source(29, 2) + SourceIndex(2) --- >>>declare class internalC { 1-> @@ -514,15 +545,15 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >class 3 > internalC -1->Emitted(40, 1) Source(30, 15) + SourceIndex(2) -2 >Emitted(40, 15) Source(30, 21) + SourceIndex(2) -3 >Emitted(40, 24) Source(30, 30) + SourceIndex(2) +1->Emitted(41, 1) Source(30, 15) + SourceIndex(2) +2 >Emitted(41, 15) Source(30, 21) + SourceIndex(2) +3 >Emitted(41, 24) Source(30, 30) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(41, 2) Source(30, 33) + SourceIndex(2) +1 >Emitted(42, 2) Source(30, 33) + SourceIndex(2) --- >>>declare function internalfoo(): void; 1-> @@ -535,10 +566,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(42, 1) Source(31, 15) + SourceIndex(2) -2 >Emitted(42, 18) Source(31, 24) + SourceIndex(2) -3 >Emitted(42, 29) Source(31, 35) + SourceIndex(2) -4 >Emitted(42, 38) Source(31, 40) + SourceIndex(2) +1->Emitted(43, 1) Source(31, 15) + SourceIndex(2) +2 >Emitted(43, 18) Source(31, 24) + SourceIndex(2) +3 >Emitted(43, 29) Source(31, 35) + SourceIndex(2) +4 >Emitted(43, 38) Source(31, 40) + SourceIndex(2) --- >>>declare namespace internalNamespace { 1-> @@ -550,10 +581,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(43, 1) Source(32, 15) + SourceIndex(2) -2 >Emitted(43, 19) Source(32, 25) + SourceIndex(2) -3 >Emitted(43, 36) Source(32, 42) + SourceIndex(2) -4 >Emitted(43, 37) Source(32, 43) + SourceIndex(2) +1->Emitted(44, 1) Source(32, 15) + SourceIndex(2) +2 >Emitted(44, 19) Source(32, 25) + SourceIndex(2) +3 >Emitted(44, 36) Source(32, 42) + SourceIndex(2) +4 >Emitted(44, 37) Source(32, 43) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -562,20 +593,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(44, 5) Source(32, 45) + SourceIndex(2) -2 >Emitted(44, 11) Source(32, 58) + SourceIndex(2) -3 >Emitted(44, 20) Source(32, 67) + SourceIndex(2) +1 >Emitted(45, 5) Source(32, 45) + SourceIndex(2) +2 >Emitted(45, 11) Source(32, 58) + SourceIndex(2) +3 >Emitted(45, 20) Source(32, 67) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(45, 6) Source(32, 70) + SourceIndex(2) +1 >Emitted(46, 6) Source(32, 70) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(46, 2) Source(32, 72) + SourceIndex(2) +1 >Emitted(47, 2) Source(32, 72) + SourceIndex(2) --- >>>declare namespace internalOther.something { 1-> @@ -591,12 +622,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(47, 1) Source(33, 15) + SourceIndex(2) -2 >Emitted(47, 19) Source(33, 25) + SourceIndex(2) -3 >Emitted(47, 32) Source(33, 38) + SourceIndex(2) -4 >Emitted(47, 33) Source(33, 39) + SourceIndex(2) -5 >Emitted(47, 42) Source(33, 48) + SourceIndex(2) -6 >Emitted(47, 43) Source(33, 49) + SourceIndex(2) +1->Emitted(48, 1) Source(33, 15) + SourceIndex(2) +2 >Emitted(48, 19) Source(33, 25) + SourceIndex(2) +3 >Emitted(48, 32) Source(33, 38) + SourceIndex(2) +4 >Emitted(48, 33) Source(33, 39) + SourceIndex(2) +5 >Emitted(48, 42) Source(33, 48) + SourceIndex(2) +6 >Emitted(48, 43) Source(33, 49) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -605,20 +636,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(48, 5) Source(33, 51) + SourceIndex(2) -2 >Emitted(48, 11) Source(33, 64) + SourceIndex(2) -3 >Emitted(48, 20) Source(33, 73) + SourceIndex(2) +1 >Emitted(49, 5) Source(33, 51) + SourceIndex(2) +2 >Emitted(49, 11) Source(33, 64) + SourceIndex(2) +3 >Emitted(49, 20) Source(33, 73) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(49, 6) Source(33, 76) + SourceIndex(2) +1 >Emitted(50, 6) Source(33, 76) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(33, 78) + SourceIndex(2) +1 >Emitted(51, 2) Source(33, 78) + SourceIndex(2) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -638,14 +669,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(51, 1) Source(34, 15) + SourceIndex(2) -2 >Emitted(51, 8) Source(34, 22) + SourceIndex(2) -3 >Emitted(51, 22) Source(34, 36) + SourceIndex(2) -4 >Emitted(51, 25) Source(34, 39) + SourceIndex(2) -5 >Emitted(51, 42) Source(34, 56) + SourceIndex(2) -6 >Emitted(51, 43) Source(34, 57) + SourceIndex(2) -7 >Emitted(51, 52) Source(34, 66) + SourceIndex(2) -8 >Emitted(51, 53) Source(34, 67) + SourceIndex(2) +1->Emitted(52, 1) Source(34, 15) + SourceIndex(2) +2 >Emitted(52, 8) Source(34, 22) + SourceIndex(2) +3 >Emitted(52, 22) Source(34, 36) + SourceIndex(2) +4 >Emitted(52, 25) Source(34, 39) + SourceIndex(2) +5 >Emitted(52, 42) Source(34, 56) + SourceIndex(2) +6 >Emitted(52, 43) Source(34, 57) + SourceIndex(2) +7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2) +8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2) --- >>>declare type internalType = internalC; 1 > @@ -661,12 +692,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(52, 1) Source(35, 15) + SourceIndex(2) -2 >Emitted(52, 14) Source(35, 20) + SourceIndex(2) -3 >Emitted(52, 26) Source(35, 32) + SourceIndex(2) -4 >Emitted(52, 29) Source(35, 35) + SourceIndex(2) -5 >Emitted(52, 38) Source(35, 44) + SourceIndex(2) -6 >Emitted(52, 39) Source(35, 45) + SourceIndex(2) +1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2) +2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2) +3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2) +4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2) +5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2) +6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2) --- >>>declare const internalConst = 10; 1 > @@ -682,12 +713,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(53, 1) Source(36, 15) + SourceIndex(2) -2 >Emitted(53, 9) Source(36, 15) + SourceIndex(2) -3 >Emitted(53, 15) Source(36, 21) + SourceIndex(2) -4 >Emitted(53, 28) Source(36, 34) + SourceIndex(2) -5 >Emitted(53, 33) Source(36, 39) + SourceIndex(2) -6 >Emitted(53, 34) Source(36, 40) + SourceIndex(2) +1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2) +2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2) +3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2) +4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2) +5 >Emitted(54, 33) Source(36, 39) + SourceIndex(2) +6 >Emitted(54, 34) Source(36, 40) + SourceIndex(2) --- >>>declare enum internalEnum { 1 > @@ -697,9 +728,9 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(54, 1) Source(37, 15) + SourceIndex(2) -2 >Emitted(54, 14) Source(37, 20) + SourceIndex(2) -3 >Emitted(54, 26) Source(37, 32) + SourceIndex(2) +1 >Emitted(55, 1) Source(37, 15) + SourceIndex(2) +2 >Emitted(55, 14) Source(37, 20) + SourceIndex(2) +3 >Emitted(55, 26) Source(37, 32) + SourceIndex(2) --- >>> a = 0, 1 >^^^^ @@ -709,9 +740,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(55, 5) Source(37, 35) + SourceIndex(2) -2 >Emitted(55, 6) Source(37, 36) + SourceIndex(2) -3 >Emitted(55, 10) Source(37, 36) + SourceIndex(2) +1 >Emitted(56, 5) Source(37, 35) + SourceIndex(2) +2 >Emitted(56, 6) Source(37, 36) + SourceIndex(2) +3 >Emitted(56, 10) Source(37, 36) + SourceIndex(2) --- >>> b = 1, 1->^^^^ @@ -721,9 +752,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(56, 5) Source(37, 38) + SourceIndex(2) -2 >Emitted(56, 6) Source(37, 39) + SourceIndex(2) -3 >Emitted(56, 10) Source(37, 39) + SourceIndex(2) +1->Emitted(57, 5) Source(37, 38) + SourceIndex(2) +2 >Emitted(57, 6) Source(37, 39) + SourceIndex(2) +3 >Emitted(57, 10) Source(37, 39) + SourceIndex(2) --- >>> c = 2 1->^^^^ @@ -732,15 +763,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(57, 5) Source(37, 41) + SourceIndex(2) -2 >Emitted(57, 6) Source(37, 42) + SourceIndex(2) -3 >Emitted(57, 10) Source(37, 42) + SourceIndex(2) +1->Emitted(58, 5) Source(37, 41) + SourceIndex(2) +2 >Emitted(58, 6) Source(37, 42) + SourceIndex(2) +3 >Emitted(58, 10) Source(37, 42) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(58, 2) Source(37, 44) + SourceIndex(2) +1 >Emitted(59, 2) Source(37, 44) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -754,9 +785,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(59, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(59, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(59, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(60, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(60, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(60, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -764,8 +795,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(60, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(60, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(61, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(61, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -774,7 +805,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(61, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(62, 2) Source(5, 2) + SourceIndex(3) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -830,32 +861,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 322, + "end": 339, "kind": "internal" }, { - "pos": 324, - "end": 356, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 356, - "end": 748, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 750, - "end": 753, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 753, - "end": 1166, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1168, - "end": 1216, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -1008,18 +1039,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-322) +internal: (234-339) constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (324-356) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (356-748) +internal: (373-765) class C { } function foo(): void; @@ -1040,11 +1072,11 @@ internal: (356-748) c = 2 } ---------------------------------------------------------------------- -text: (750-753) +text: (767-770) } ---------------------------------------------------------------------- -internal: (753-1166) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -1065,7 +1097,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1168-1216) +text: (1185-1233) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index 7a5d6f628edcd..fbbe3730e5074 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -15,7 +15,8 @@ declare class normalC { constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); } declare namespace normalN { class C { @@ -63,7 +64,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CACnC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -283,35 +284,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /**@internal*/ 2 > method 1->Emitted(16, 5) Source(16, 20) + SourceIndex(2) 2 >Emitted(16, 11) Source(16, 26) + SourceIndex(2) --- ->>> c: number; +>>> get c(): number; 1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /**@internal*/ get -2 > c -3 > () { return 10; } - > /**@internal*/ set c(val: -4 > number -1->Emitted(17, 5) Source(17, 24) + SourceIndex(2) -2 >Emitted(17, 6) Source(17, 25) + SourceIndex(2) -3 >Emitted(17, 8) Source(18, 31) + SourceIndex(2) -4 >Emitted(17, 14) Source(18, 37) + SourceIndex(2) + > /**@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /**@internal*/ set c(val: +5 > number +6 > +1->Emitted(17, 5) Source(17, 20) + SourceIndex(2) +2 >Emitted(17, 9) Source(17, 24) + SourceIndex(2) +3 >Emitted(17, 10) Source(17, 25) + SourceIndex(2) +4 >Emitted(17, 14) Source(18, 31) + SourceIndex(2) +5 >Emitted(17, 20) Source(18, 37) + SourceIndex(2) +6 >Emitted(17, 21) Source(17, 42) + SourceIndex(2) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /**@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(18, 5) Source(18, 20) + SourceIndex(2) +2 >Emitted(18, 9) Source(18, 24) + SourceIndex(2) +3 >Emitted(18, 10) Source(18, 25) + SourceIndex(2) +4 >Emitted(18, 11) Source(18, 26) + SourceIndex(2) +5 >Emitted(18, 16) Source(18, 31) + SourceIndex(2) +6 >Emitted(18, 22) Source(18, 37) + SourceIndex(2) +7 >Emitted(18, 24) Source(18, 42) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(18, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(19, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -323,10 +355,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(19, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(19, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(19, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(19, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(20, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(20, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(20, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(20, 27) Source(20, 19) + SourceIndex(2) --- >>> class C { 1 >^^^^ @@ -336,15 +368,15 @@ sourceFile:../second/second_part1.ts > /**@internal*/ 2 > export class 3 > C -1 >Emitted(20, 5) Source(21, 20) + SourceIndex(2) -2 >Emitted(20, 11) Source(21, 33) + SourceIndex(2) -3 >Emitted(20, 12) Source(21, 34) + SourceIndex(2) +1 >Emitted(21, 5) Source(21, 20) + SourceIndex(2) +2 >Emitted(21, 11) Source(21, 33) + SourceIndex(2) +3 >Emitted(21, 12) Source(21, 34) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(21, 6) Source(21, 38) + SourceIndex(2) +1 >Emitted(22, 6) Source(21, 38) + SourceIndex(2) --- >>> function foo(): void; 1->^^^^ @@ -357,10 +389,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(22, 5) Source(22, 20) + SourceIndex(2) -2 >Emitted(22, 14) Source(22, 36) + SourceIndex(2) -3 >Emitted(22, 17) Source(22, 39) + SourceIndex(2) -4 >Emitted(22, 26) Source(22, 44) + SourceIndex(2) +1->Emitted(23, 5) Source(22, 20) + SourceIndex(2) +2 >Emitted(23, 14) Source(22, 36) + SourceIndex(2) +3 >Emitted(23, 17) Source(22, 39) + SourceIndex(2) +4 >Emitted(23, 26) Source(22, 44) + SourceIndex(2) --- >>> namespace someNamespace { 1->^^^^ @@ -372,10 +404,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(23, 5) Source(23, 20) + SourceIndex(2) -2 >Emitted(23, 15) Source(23, 37) + SourceIndex(2) -3 >Emitted(23, 28) Source(23, 50) + SourceIndex(2) -4 >Emitted(23, 29) Source(23, 51) + SourceIndex(2) +1->Emitted(24, 5) Source(23, 20) + SourceIndex(2) +2 >Emitted(24, 15) Source(23, 37) + SourceIndex(2) +3 >Emitted(24, 28) Source(23, 50) + SourceIndex(2) +4 >Emitted(24, 29) Source(23, 51) + SourceIndex(2) --- >>> class C { 1 >^^^^^^^^ @@ -384,20 +416,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(24, 9) Source(23, 53) + SourceIndex(2) -2 >Emitted(24, 15) Source(23, 66) + SourceIndex(2) -3 >Emitted(24, 16) Source(23, 67) + SourceIndex(2) +1 >Emitted(25, 9) Source(23, 53) + SourceIndex(2) +2 >Emitted(25, 15) Source(23, 66) + SourceIndex(2) +3 >Emitted(25, 16) Source(23, 67) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(25, 10) Source(23, 70) + SourceIndex(2) +1 >Emitted(26, 10) Source(23, 70) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(26, 6) Source(23, 72) + SourceIndex(2) +1 >Emitted(27, 6) Source(23, 72) + SourceIndex(2) --- >>> namespace someOther.something { 1->^^^^ @@ -413,12 +445,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(27, 5) Source(24, 20) + SourceIndex(2) -2 >Emitted(27, 15) Source(24, 37) + SourceIndex(2) -3 >Emitted(27, 24) Source(24, 46) + SourceIndex(2) -4 >Emitted(27, 25) Source(24, 47) + SourceIndex(2) -5 >Emitted(27, 34) Source(24, 56) + SourceIndex(2) -6 >Emitted(27, 35) Source(24, 57) + SourceIndex(2) +1->Emitted(28, 5) Source(24, 20) + SourceIndex(2) +2 >Emitted(28, 15) Source(24, 37) + SourceIndex(2) +3 >Emitted(28, 24) Source(24, 46) + SourceIndex(2) +4 >Emitted(28, 25) Source(24, 47) + SourceIndex(2) +5 >Emitted(28, 34) Source(24, 56) + SourceIndex(2) +6 >Emitted(28, 35) Source(24, 57) + SourceIndex(2) --- >>> class someClass { 1 >^^^^^^^^ @@ -427,20 +459,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(28, 9) Source(24, 59) + SourceIndex(2) -2 >Emitted(28, 15) Source(24, 72) + SourceIndex(2) -3 >Emitted(28, 24) Source(24, 81) + SourceIndex(2) +1 >Emitted(29, 9) Source(24, 59) + SourceIndex(2) +2 >Emitted(29, 15) Source(24, 72) + SourceIndex(2) +3 >Emitted(29, 24) Source(24, 81) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(29, 10) Source(24, 84) + SourceIndex(2) +1 >Emitted(30, 10) Source(24, 84) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(30, 6) Source(24, 86) + SourceIndex(2) +1 >Emitted(31, 6) Source(24, 86) + SourceIndex(2) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -462,15 +494,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(31, 5) Source(25, 20) + SourceIndex(2) -2 >Emitted(31, 11) Source(25, 26) + SourceIndex(2) -3 >Emitted(31, 19) Source(25, 34) + SourceIndex(2) -4 >Emitted(31, 29) Source(25, 44) + SourceIndex(2) -5 >Emitted(31, 32) Source(25, 47) + SourceIndex(2) -6 >Emitted(31, 45) Source(25, 60) + SourceIndex(2) -7 >Emitted(31, 46) Source(25, 61) + SourceIndex(2) -8 >Emitted(31, 47) Source(25, 62) + SourceIndex(2) -9 >Emitted(31, 48) Source(25, 63) + SourceIndex(2) +1->Emitted(32, 5) Source(25, 20) + SourceIndex(2) +2 >Emitted(32, 11) Source(25, 26) + SourceIndex(2) +3 >Emitted(32, 19) Source(25, 34) + SourceIndex(2) +4 >Emitted(32, 29) Source(25, 44) + SourceIndex(2) +5 >Emitted(32, 32) Source(25, 47) + SourceIndex(2) +6 >Emitted(32, 45) Source(25, 60) + SourceIndex(2) +7 >Emitted(32, 46) Source(25, 61) + SourceIndex(2) +8 >Emitted(32, 47) Source(25, 62) + SourceIndex(2) +9 >Emitted(32, 48) Source(25, 63) + SourceIndex(2) --- >>> type internalType = internalC; 1 >^^^^ @@ -486,12 +518,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(32, 5) Source(26, 20) + SourceIndex(2) -2 >Emitted(32, 10) Source(26, 32) + SourceIndex(2) -3 >Emitted(32, 22) Source(26, 44) + SourceIndex(2) -4 >Emitted(32, 25) Source(26, 47) + SourceIndex(2) -5 >Emitted(32, 34) Source(26, 56) + SourceIndex(2) -6 >Emitted(32, 35) Source(26, 57) + SourceIndex(2) +1 >Emitted(33, 5) Source(26, 20) + SourceIndex(2) +2 >Emitted(33, 10) Source(26, 32) + SourceIndex(2) +3 >Emitted(33, 22) Source(26, 44) + SourceIndex(2) +4 >Emitted(33, 25) Source(26, 47) + SourceIndex(2) +5 >Emitted(33, 34) Source(26, 56) + SourceIndex(2) +6 >Emitted(33, 35) Source(26, 57) + SourceIndex(2) --- >>> const internalConst = 10; 1 >^^^^ @@ -505,11 +537,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(33, 5) Source(27, 27) + SourceIndex(2) -2 >Emitted(33, 11) Source(27, 33) + SourceIndex(2) -3 >Emitted(33, 24) Source(27, 46) + SourceIndex(2) -4 >Emitted(33, 29) Source(27, 51) + SourceIndex(2) -5 >Emitted(33, 30) Source(27, 52) + SourceIndex(2) +1 >Emitted(34, 5) Source(27, 27) + SourceIndex(2) +2 >Emitted(34, 11) Source(27, 33) + SourceIndex(2) +3 >Emitted(34, 24) Source(27, 46) + SourceIndex(2) +4 >Emitted(34, 29) Source(27, 51) + SourceIndex(2) +5 >Emitted(34, 30) Source(27, 52) + SourceIndex(2) --- >>> enum internalEnum { 1 >^^^^ @@ -519,9 +551,9 @@ sourceFile:../second/second_part1.ts > /**@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(34, 5) Source(28, 20) + SourceIndex(2) -2 >Emitted(34, 10) Source(28, 32) + SourceIndex(2) -3 >Emitted(34, 22) Source(28, 44) + SourceIndex(2) +1 >Emitted(35, 5) Source(28, 20) + SourceIndex(2) +2 >Emitted(35, 10) Source(28, 32) + SourceIndex(2) +3 >Emitted(35, 22) Source(28, 44) + SourceIndex(2) --- >>> a = 0, 1 >^^^^^^^^ @@ -531,9 +563,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(35, 9) Source(28, 47) + SourceIndex(2) -2 >Emitted(35, 10) Source(28, 48) + SourceIndex(2) -3 >Emitted(35, 14) Source(28, 48) + SourceIndex(2) +1 >Emitted(36, 9) Source(28, 47) + SourceIndex(2) +2 >Emitted(36, 10) Source(28, 48) + SourceIndex(2) +3 >Emitted(36, 14) Source(28, 48) + SourceIndex(2) --- >>> b = 1, 1->^^^^^^^^ @@ -543,9 +575,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(36, 9) Source(28, 50) + SourceIndex(2) -2 >Emitted(36, 10) Source(28, 51) + SourceIndex(2) -3 >Emitted(36, 14) Source(28, 51) + SourceIndex(2) +1->Emitted(37, 9) Source(28, 50) + SourceIndex(2) +2 >Emitted(37, 10) Source(28, 51) + SourceIndex(2) +3 >Emitted(37, 14) Source(28, 51) + SourceIndex(2) --- >>> c = 2 1->^^^^^^^^ @@ -554,21 +586,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(37, 9) Source(28, 53) + SourceIndex(2) -2 >Emitted(37, 10) Source(28, 54) + SourceIndex(2) -3 >Emitted(37, 14) Source(28, 54) + SourceIndex(2) +1->Emitted(38, 9) Source(28, 53) + SourceIndex(2) +2 >Emitted(38, 10) Source(28, 54) + SourceIndex(2) +3 >Emitted(38, 14) Source(28, 54) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(38, 6) Source(28, 56) + SourceIndex(2) +1 >Emitted(39, 6) Source(28, 56) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(39, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(40, 2) Source(29, 2) + SourceIndex(2) --- >>>declare class internalC { 1-> @@ -578,15 +610,15 @@ sourceFile:../second/second_part1.ts >/**@internal*/ 2 >class 3 > internalC -1->Emitted(40, 1) Source(30, 16) + SourceIndex(2) -2 >Emitted(40, 15) Source(30, 22) + SourceIndex(2) -3 >Emitted(40, 24) Source(30, 31) + SourceIndex(2) +1->Emitted(41, 1) Source(30, 16) + SourceIndex(2) +2 >Emitted(41, 15) Source(30, 22) + SourceIndex(2) +3 >Emitted(41, 24) Source(30, 31) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(41, 2) Source(30, 34) + SourceIndex(2) +1 >Emitted(42, 2) Source(30, 34) + SourceIndex(2) --- >>>declare function internalfoo(): void; 1-> @@ -599,10 +631,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(42, 1) Source(31, 16) + SourceIndex(2) -2 >Emitted(42, 18) Source(31, 25) + SourceIndex(2) -3 >Emitted(42, 29) Source(31, 36) + SourceIndex(2) -4 >Emitted(42, 38) Source(31, 41) + SourceIndex(2) +1->Emitted(43, 1) Source(31, 16) + SourceIndex(2) +2 >Emitted(43, 18) Source(31, 25) + SourceIndex(2) +3 >Emitted(43, 29) Source(31, 36) + SourceIndex(2) +4 >Emitted(43, 38) Source(31, 41) + SourceIndex(2) --- >>>declare namespace internalNamespace { 1-> @@ -614,10 +646,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(43, 1) Source(32, 16) + SourceIndex(2) -2 >Emitted(43, 19) Source(32, 26) + SourceIndex(2) -3 >Emitted(43, 36) Source(32, 43) + SourceIndex(2) -4 >Emitted(43, 37) Source(32, 44) + SourceIndex(2) +1->Emitted(44, 1) Source(32, 16) + SourceIndex(2) +2 >Emitted(44, 19) Source(32, 26) + SourceIndex(2) +3 >Emitted(44, 36) Source(32, 43) + SourceIndex(2) +4 >Emitted(44, 37) Source(32, 44) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -626,20 +658,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(44, 5) Source(32, 46) + SourceIndex(2) -2 >Emitted(44, 11) Source(32, 59) + SourceIndex(2) -3 >Emitted(44, 20) Source(32, 68) + SourceIndex(2) +1 >Emitted(45, 5) Source(32, 46) + SourceIndex(2) +2 >Emitted(45, 11) Source(32, 59) + SourceIndex(2) +3 >Emitted(45, 20) Source(32, 68) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(45, 6) Source(32, 71) + SourceIndex(2) +1 >Emitted(46, 6) Source(32, 71) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(46, 2) Source(32, 73) + SourceIndex(2) +1 >Emitted(47, 2) Source(32, 73) + SourceIndex(2) --- >>>declare namespace internalOther.something { 1-> @@ -655,12 +687,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(47, 1) Source(33, 16) + SourceIndex(2) -2 >Emitted(47, 19) Source(33, 26) + SourceIndex(2) -3 >Emitted(47, 32) Source(33, 39) + SourceIndex(2) -4 >Emitted(47, 33) Source(33, 40) + SourceIndex(2) -5 >Emitted(47, 42) Source(33, 49) + SourceIndex(2) -6 >Emitted(47, 43) Source(33, 50) + SourceIndex(2) +1->Emitted(48, 1) Source(33, 16) + SourceIndex(2) +2 >Emitted(48, 19) Source(33, 26) + SourceIndex(2) +3 >Emitted(48, 32) Source(33, 39) + SourceIndex(2) +4 >Emitted(48, 33) Source(33, 40) + SourceIndex(2) +5 >Emitted(48, 42) Source(33, 49) + SourceIndex(2) +6 >Emitted(48, 43) Source(33, 50) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -669,20 +701,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(48, 5) Source(33, 52) + SourceIndex(2) -2 >Emitted(48, 11) Source(33, 65) + SourceIndex(2) -3 >Emitted(48, 20) Source(33, 74) + SourceIndex(2) +1 >Emitted(49, 5) Source(33, 52) + SourceIndex(2) +2 >Emitted(49, 11) Source(33, 65) + SourceIndex(2) +3 >Emitted(49, 20) Source(33, 74) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(49, 6) Source(33, 77) + SourceIndex(2) +1 >Emitted(50, 6) Source(33, 77) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(33, 79) + SourceIndex(2) +1 >Emitted(51, 2) Source(33, 79) + SourceIndex(2) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -702,14 +734,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(51, 1) Source(34, 16) + SourceIndex(2) -2 >Emitted(51, 8) Source(34, 23) + SourceIndex(2) -3 >Emitted(51, 22) Source(34, 37) + SourceIndex(2) -4 >Emitted(51, 25) Source(34, 40) + SourceIndex(2) -5 >Emitted(51, 42) Source(34, 57) + SourceIndex(2) -6 >Emitted(51, 43) Source(34, 58) + SourceIndex(2) -7 >Emitted(51, 52) Source(34, 67) + SourceIndex(2) -8 >Emitted(51, 53) Source(34, 68) + SourceIndex(2) +1->Emitted(52, 1) Source(34, 16) + SourceIndex(2) +2 >Emitted(52, 8) Source(34, 23) + SourceIndex(2) +3 >Emitted(52, 22) Source(34, 37) + SourceIndex(2) +4 >Emitted(52, 25) Source(34, 40) + SourceIndex(2) +5 >Emitted(52, 42) Source(34, 57) + SourceIndex(2) +6 >Emitted(52, 43) Source(34, 58) + SourceIndex(2) +7 >Emitted(52, 52) Source(34, 67) + SourceIndex(2) +8 >Emitted(52, 53) Source(34, 68) + SourceIndex(2) --- >>>declare type internalType = internalC; 1 > @@ -725,12 +757,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(52, 1) Source(35, 16) + SourceIndex(2) -2 >Emitted(52, 14) Source(35, 21) + SourceIndex(2) -3 >Emitted(52, 26) Source(35, 33) + SourceIndex(2) -4 >Emitted(52, 29) Source(35, 36) + SourceIndex(2) -5 >Emitted(52, 38) Source(35, 45) + SourceIndex(2) -6 >Emitted(52, 39) Source(35, 46) + SourceIndex(2) +1 >Emitted(53, 1) Source(35, 16) + SourceIndex(2) +2 >Emitted(53, 14) Source(35, 21) + SourceIndex(2) +3 >Emitted(53, 26) Source(35, 33) + SourceIndex(2) +4 >Emitted(53, 29) Source(35, 36) + SourceIndex(2) +5 >Emitted(53, 38) Source(35, 45) + SourceIndex(2) +6 >Emitted(53, 39) Source(35, 46) + SourceIndex(2) --- >>>declare const internalConst = 10; 1 > @@ -746,12 +778,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(53, 1) Source(36, 16) + SourceIndex(2) -2 >Emitted(53, 9) Source(36, 16) + SourceIndex(2) -3 >Emitted(53, 15) Source(36, 22) + SourceIndex(2) -4 >Emitted(53, 28) Source(36, 35) + SourceIndex(2) -5 >Emitted(53, 33) Source(36, 40) + SourceIndex(2) -6 >Emitted(53, 34) Source(36, 41) + SourceIndex(2) +1 >Emitted(54, 1) Source(36, 16) + SourceIndex(2) +2 >Emitted(54, 9) Source(36, 16) + SourceIndex(2) +3 >Emitted(54, 15) Source(36, 22) + SourceIndex(2) +4 >Emitted(54, 28) Source(36, 35) + SourceIndex(2) +5 >Emitted(54, 33) Source(36, 40) + SourceIndex(2) +6 >Emitted(54, 34) Source(36, 41) + SourceIndex(2) --- >>>declare enum internalEnum { 1 > @@ -761,9 +793,9 @@ sourceFile:../second/second_part1.ts >/**@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(54, 1) Source(37, 16) + SourceIndex(2) -2 >Emitted(54, 14) Source(37, 21) + SourceIndex(2) -3 >Emitted(54, 26) Source(37, 33) + SourceIndex(2) +1 >Emitted(55, 1) Source(37, 16) + SourceIndex(2) +2 >Emitted(55, 14) Source(37, 21) + SourceIndex(2) +3 >Emitted(55, 26) Source(37, 33) + SourceIndex(2) --- >>> a = 0, 1 >^^^^ @@ -773,9 +805,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(55, 5) Source(37, 36) + SourceIndex(2) -2 >Emitted(55, 6) Source(37, 37) + SourceIndex(2) -3 >Emitted(55, 10) Source(37, 37) + SourceIndex(2) +1 >Emitted(56, 5) Source(37, 36) + SourceIndex(2) +2 >Emitted(56, 6) Source(37, 37) + SourceIndex(2) +3 >Emitted(56, 10) Source(37, 37) + SourceIndex(2) --- >>> b = 1, 1->^^^^ @@ -785,9 +817,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(56, 5) Source(37, 39) + SourceIndex(2) -2 >Emitted(56, 6) Source(37, 40) + SourceIndex(2) -3 >Emitted(56, 10) Source(37, 40) + SourceIndex(2) +1->Emitted(57, 5) Source(37, 39) + SourceIndex(2) +2 >Emitted(57, 6) Source(37, 40) + SourceIndex(2) +3 >Emitted(57, 10) Source(37, 40) + SourceIndex(2) --- >>> c = 2 1->^^^^ @@ -796,15 +828,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(57, 5) Source(37, 42) + SourceIndex(2) -2 >Emitted(57, 6) Source(37, 43) + SourceIndex(2) -3 >Emitted(57, 10) Source(37, 43) + SourceIndex(2) +1->Emitted(58, 5) Source(37, 42) + SourceIndex(2) +2 >Emitted(58, 6) Source(37, 43) + SourceIndex(2) +3 >Emitted(58, 10) Source(37, 43) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(58, 2) Source(37, 45) + SourceIndex(2) +1 >Emitted(59, 2) Source(37, 45) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -818,9 +850,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(59, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(59, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(59, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(60, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(60, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(60, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -828,8 +860,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(60, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(60, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(61, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(61, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -838,7 +870,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(61, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(62, 2) Source(5, 2) + SourceIndex(3) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2594,32 +2626,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 308, + "end": 339, "kind": "internal" }, { - "pos": 310, - "end": 342, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 342, - "end": 734, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 736, - "end": 739, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 739, - "end": 1152, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1154, - "end": 1202, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -2774,18 +2806,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-308) +internal: (234-339) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (310-342) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (342-734) +internal: (373-765) class C { } function foo(): void; @@ -2806,11 +2839,11 @@ internal: (342-734) c = 2 } ---------------------------------------------------------------------- -text: (736-739) +text: (767-770) } ---------------------------------------------------------------------- -internal: (739-1152) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -2831,7 +2864,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1154-1202) +text: (1185-1233) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js index 6e4cd6c0d2641..36f65b47c6232 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js @@ -7,7 +7,8 @@ declare class normalC { constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); } declare namespace normalN { class C { @@ -55,7 +56,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CACnC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -155,35 +156,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /**@internal*/ 2 > method 1->Emitted(8, 5) Source(16, 20) + SourceIndex(0) 2 >Emitted(8, 11) Source(16, 26) + SourceIndex(0) --- ->>> c: number; +>>> get c(): number; 1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /**@internal*/ get -2 > c -3 > () { return 10; } - > /**@internal*/ set c(val: -4 > number -1->Emitted(9, 5) Source(17, 24) + SourceIndex(0) -2 >Emitted(9, 6) Source(17, 25) + SourceIndex(0) -3 >Emitted(9, 8) Source(18, 31) + SourceIndex(0) -4 >Emitted(9, 14) Source(18, 37) + SourceIndex(0) + > /**@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /**@internal*/ set c(val: +5 > number +6 > +1->Emitted(9, 5) Source(17, 20) + SourceIndex(0) +2 >Emitted(9, 9) Source(17, 24) + SourceIndex(0) +3 >Emitted(9, 10) Source(17, 25) + SourceIndex(0) +4 >Emitted(9, 14) Source(18, 31) + SourceIndex(0) +5 >Emitted(9, 20) Source(18, 37) + SourceIndex(0) +6 >Emitted(9, 21) Source(17, 42) + SourceIndex(0) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /**@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(10, 5) Source(18, 20) + SourceIndex(0) +2 >Emitted(10, 9) Source(18, 24) + SourceIndex(0) +3 >Emitted(10, 10) Source(18, 25) + SourceIndex(0) +4 >Emitted(10, 11) Source(18, 26) + SourceIndex(0) +5 >Emitted(10, 16) Source(18, 31) + SourceIndex(0) +6 >Emitted(10, 22) Source(18, 37) + SourceIndex(0) +7 >Emitted(10, 24) Source(18, 42) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(10, 2) Source(19, 2) + SourceIndex(0) +1 >Emitted(11, 2) Source(19, 2) + SourceIndex(0) --- >>>declare namespace normalN { 1-> @@ -195,10 +227,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(11, 1) Source(20, 1) + SourceIndex(0) -2 >Emitted(11, 19) Source(20, 11) + SourceIndex(0) -3 >Emitted(11, 26) Source(20, 18) + SourceIndex(0) -4 >Emitted(11, 27) Source(20, 19) + SourceIndex(0) +1->Emitted(12, 1) Source(20, 1) + SourceIndex(0) +2 >Emitted(12, 19) Source(20, 11) + SourceIndex(0) +3 >Emitted(12, 26) Source(20, 18) + SourceIndex(0) +4 >Emitted(12, 27) Source(20, 19) + SourceIndex(0) --- >>> class C { 1 >^^^^ @@ -208,15 +240,15 @@ sourceFile:../second/second_part1.ts > /**@internal*/ 2 > export class 3 > C -1 >Emitted(12, 5) Source(21, 20) + SourceIndex(0) -2 >Emitted(12, 11) Source(21, 33) + SourceIndex(0) -3 >Emitted(12, 12) Source(21, 34) + SourceIndex(0) +1 >Emitted(13, 5) Source(21, 20) + SourceIndex(0) +2 >Emitted(13, 11) Source(21, 33) + SourceIndex(0) +3 >Emitted(13, 12) Source(21, 34) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(13, 6) Source(21, 38) + SourceIndex(0) +1 >Emitted(14, 6) Source(21, 38) + SourceIndex(0) --- >>> function foo(): void; 1->^^^^ @@ -229,10 +261,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(14, 5) Source(22, 20) + SourceIndex(0) -2 >Emitted(14, 14) Source(22, 36) + SourceIndex(0) -3 >Emitted(14, 17) Source(22, 39) + SourceIndex(0) -4 >Emitted(14, 26) Source(22, 44) + SourceIndex(0) +1->Emitted(15, 5) Source(22, 20) + SourceIndex(0) +2 >Emitted(15, 14) Source(22, 36) + SourceIndex(0) +3 >Emitted(15, 17) Source(22, 39) + SourceIndex(0) +4 >Emitted(15, 26) Source(22, 44) + SourceIndex(0) --- >>> namespace someNamespace { 1->^^^^ @@ -244,10 +276,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(15, 5) Source(23, 20) + SourceIndex(0) -2 >Emitted(15, 15) Source(23, 37) + SourceIndex(0) -3 >Emitted(15, 28) Source(23, 50) + SourceIndex(0) -4 >Emitted(15, 29) Source(23, 51) + SourceIndex(0) +1->Emitted(16, 5) Source(23, 20) + SourceIndex(0) +2 >Emitted(16, 15) Source(23, 37) + SourceIndex(0) +3 >Emitted(16, 28) Source(23, 50) + SourceIndex(0) +4 >Emitted(16, 29) Source(23, 51) + SourceIndex(0) --- >>> class C { 1 >^^^^^^^^ @@ -256,20 +288,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(16, 9) Source(23, 53) + SourceIndex(0) -2 >Emitted(16, 15) Source(23, 66) + SourceIndex(0) -3 >Emitted(16, 16) Source(23, 67) + SourceIndex(0) +1 >Emitted(17, 9) Source(23, 53) + SourceIndex(0) +2 >Emitted(17, 15) Source(23, 66) + SourceIndex(0) +3 >Emitted(17, 16) Source(23, 67) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(17, 10) Source(23, 70) + SourceIndex(0) +1 >Emitted(18, 10) Source(23, 70) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(18, 6) Source(23, 72) + SourceIndex(0) +1 >Emitted(19, 6) Source(23, 72) + SourceIndex(0) --- >>> namespace someOther.something { 1->^^^^ @@ -285,12 +317,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(19, 5) Source(24, 20) + SourceIndex(0) -2 >Emitted(19, 15) Source(24, 37) + SourceIndex(0) -3 >Emitted(19, 24) Source(24, 46) + SourceIndex(0) -4 >Emitted(19, 25) Source(24, 47) + SourceIndex(0) -5 >Emitted(19, 34) Source(24, 56) + SourceIndex(0) -6 >Emitted(19, 35) Source(24, 57) + SourceIndex(0) +1->Emitted(20, 5) Source(24, 20) + SourceIndex(0) +2 >Emitted(20, 15) Source(24, 37) + SourceIndex(0) +3 >Emitted(20, 24) Source(24, 46) + SourceIndex(0) +4 >Emitted(20, 25) Source(24, 47) + SourceIndex(0) +5 >Emitted(20, 34) Source(24, 56) + SourceIndex(0) +6 >Emitted(20, 35) Source(24, 57) + SourceIndex(0) --- >>> class someClass { 1 >^^^^^^^^ @@ -299,20 +331,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(20, 9) Source(24, 59) + SourceIndex(0) -2 >Emitted(20, 15) Source(24, 72) + SourceIndex(0) -3 >Emitted(20, 24) Source(24, 81) + SourceIndex(0) +1 >Emitted(21, 9) Source(24, 59) + SourceIndex(0) +2 >Emitted(21, 15) Source(24, 72) + SourceIndex(0) +3 >Emitted(21, 24) Source(24, 81) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(21, 10) Source(24, 84) + SourceIndex(0) +1 >Emitted(22, 10) Source(24, 84) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(22, 6) Source(24, 86) + SourceIndex(0) +1 >Emitted(23, 6) Source(24, 86) + SourceIndex(0) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -334,15 +366,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(23, 5) Source(25, 20) + SourceIndex(0) -2 >Emitted(23, 11) Source(25, 26) + SourceIndex(0) -3 >Emitted(23, 19) Source(25, 34) + SourceIndex(0) -4 >Emitted(23, 29) Source(25, 44) + SourceIndex(0) -5 >Emitted(23, 32) Source(25, 47) + SourceIndex(0) -6 >Emitted(23, 45) Source(25, 60) + SourceIndex(0) -7 >Emitted(23, 46) Source(25, 61) + SourceIndex(0) -8 >Emitted(23, 47) Source(25, 62) + SourceIndex(0) -9 >Emitted(23, 48) Source(25, 63) + SourceIndex(0) +1->Emitted(24, 5) Source(25, 20) + SourceIndex(0) +2 >Emitted(24, 11) Source(25, 26) + SourceIndex(0) +3 >Emitted(24, 19) Source(25, 34) + SourceIndex(0) +4 >Emitted(24, 29) Source(25, 44) + SourceIndex(0) +5 >Emitted(24, 32) Source(25, 47) + SourceIndex(0) +6 >Emitted(24, 45) Source(25, 60) + SourceIndex(0) +7 >Emitted(24, 46) Source(25, 61) + SourceIndex(0) +8 >Emitted(24, 47) Source(25, 62) + SourceIndex(0) +9 >Emitted(24, 48) Source(25, 63) + SourceIndex(0) --- >>> type internalType = internalC; 1 >^^^^ @@ -358,12 +390,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(24, 5) Source(26, 20) + SourceIndex(0) -2 >Emitted(24, 10) Source(26, 32) + SourceIndex(0) -3 >Emitted(24, 22) Source(26, 44) + SourceIndex(0) -4 >Emitted(24, 25) Source(26, 47) + SourceIndex(0) -5 >Emitted(24, 34) Source(26, 56) + SourceIndex(0) -6 >Emitted(24, 35) Source(26, 57) + SourceIndex(0) +1 >Emitted(25, 5) Source(26, 20) + SourceIndex(0) +2 >Emitted(25, 10) Source(26, 32) + SourceIndex(0) +3 >Emitted(25, 22) Source(26, 44) + SourceIndex(0) +4 >Emitted(25, 25) Source(26, 47) + SourceIndex(0) +5 >Emitted(25, 34) Source(26, 56) + SourceIndex(0) +6 >Emitted(25, 35) Source(26, 57) + SourceIndex(0) --- >>> const internalConst = 10; 1 >^^^^ @@ -377,11 +409,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(25, 5) Source(27, 27) + SourceIndex(0) -2 >Emitted(25, 11) Source(27, 33) + SourceIndex(0) -3 >Emitted(25, 24) Source(27, 46) + SourceIndex(0) -4 >Emitted(25, 29) Source(27, 51) + SourceIndex(0) -5 >Emitted(25, 30) Source(27, 52) + SourceIndex(0) +1 >Emitted(26, 5) Source(27, 27) + SourceIndex(0) +2 >Emitted(26, 11) Source(27, 33) + SourceIndex(0) +3 >Emitted(26, 24) Source(27, 46) + SourceIndex(0) +4 >Emitted(26, 29) Source(27, 51) + SourceIndex(0) +5 >Emitted(26, 30) Source(27, 52) + SourceIndex(0) --- >>> enum internalEnum { 1 >^^^^ @@ -391,9 +423,9 @@ sourceFile:../second/second_part1.ts > /**@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(26, 5) Source(28, 20) + SourceIndex(0) -2 >Emitted(26, 10) Source(28, 32) + SourceIndex(0) -3 >Emitted(26, 22) Source(28, 44) + SourceIndex(0) +1 >Emitted(27, 5) Source(28, 20) + SourceIndex(0) +2 >Emitted(27, 10) Source(28, 32) + SourceIndex(0) +3 >Emitted(27, 22) Source(28, 44) + SourceIndex(0) --- >>> a = 0, 1 >^^^^^^^^ @@ -403,9 +435,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(27, 9) Source(28, 47) + SourceIndex(0) -2 >Emitted(27, 10) Source(28, 48) + SourceIndex(0) -3 >Emitted(27, 14) Source(28, 48) + SourceIndex(0) +1 >Emitted(28, 9) Source(28, 47) + SourceIndex(0) +2 >Emitted(28, 10) Source(28, 48) + SourceIndex(0) +3 >Emitted(28, 14) Source(28, 48) + SourceIndex(0) --- >>> b = 1, 1->^^^^^^^^ @@ -415,9 +447,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(28, 9) Source(28, 50) + SourceIndex(0) -2 >Emitted(28, 10) Source(28, 51) + SourceIndex(0) -3 >Emitted(28, 14) Source(28, 51) + SourceIndex(0) +1->Emitted(29, 9) Source(28, 50) + SourceIndex(0) +2 >Emitted(29, 10) Source(28, 51) + SourceIndex(0) +3 >Emitted(29, 14) Source(28, 51) + SourceIndex(0) --- >>> c = 2 1->^^^^^^^^ @@ -426,21 +458,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(29, 9) Source(28, 53) + SourceIndex(0) -2 >Emitted(29, 10) Source(28, 54) + SourceIndex(0) -3 >Emitted(29, 14) Source(28, 54) + SourceIndex(0) +1->Emitted(30, 9) Source(28, 53) + SourceIndex(0) +2 >Emitted(30, 10) Source(28, 54) + SourceIndex(0) +3 >Emitted(30, 14) Source(28, 54) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(30, 6) Source(28, 56) + SourceIndex(0) +1 >Emitted(31, 6) Source(28, 56) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(31, 2) Source(29, 2) + SourceIndex(0) +1 >Emitted(32, 2) Source(29, 2) + SourceIndex(0) --- >>>declare class internalC { 1-> @@ -450,15 +482,15 @@ sourceFile:../second/second_part1.ts >/**@internal*/ 2 >class 3 > internalC -1->Emitted(32, 1) Source(30, 16) + SourceIndex(0) -2 >Emitted(32, 15) Source(30, 22) + SourceIndex(0) -3 >Emitted(32, 24) Source(30, 31) + SourceIndex(0) +1->Emitted(33, 1) Source(30, 16) + SourceIndex(0) +2 >Emitted(33, 15) Source(30, 22) + SourceIndex(0) +3 >Emitted(33, 24) Source(30, 31) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(33, 2) Source(30, 34) + SourceIndex(0) +1 >Emitted(34, 2) Source(30, 34) + SourceIndex(0) --- >>>declare function internalfoo(): void; 1-> @@ -471,10 +503,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(34, 1) Source(31, 16) + SourceIndex(0) -2 >Emitted(34, 18) Source(31, 25) + SourceIndex(0) -3 >Emitted(34, 29) Source(31, 36) + SourceIndex(0) -4 >Emitted(34, 38) Source(31, 41) + SourceIndex(0) +1->Emitted(35, 1) Source(31, 16) + SourceIndex(0) +2 >Emitted(35, 18) Source(31, 25) + SourceIndex(0) +3 >Emitted(35, 29) Source(31, 36) + SourceIndex(0) +4 >Emitted(35, 38) Source(31, 41) + SourceIndex(0) --- >>>declare namespace internalNamespace { 1-> @@ -486,10 +518,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(35, 1) Source(32, 16) + SourceIndex(0) -2 >Emitted(35, 19) Source(32, 26) + SourceIndex(0) -3 >Emitted(35, 36) Source(32, 43) + SourceIndex(0) -4 >Emitted(35, 37) Source(32, 44) + SourceIndex(0) +1->Emitted(36, 1) Source(32, 16) + SourceIndex(0) +2 >Emitted(36, 19) Source(32, 26) + SourceIndex(0) +3 >Emitted(36, 36) Source(32, 43) + SourceIndex(0) +4 >Emitted(36, 37) Source(32, 44) + SourceIndex(0) --- >>> class someClass { 1 >^^^^ @@ -498,20 +530,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(36, 5) Source(32, 46) + SourceIndex(0) -2 >Emitted(36, 11) Source(32, 59) + SourceIndex(0) -3 >Emitted(36, 20) Source(32, 68) + SourceIndex(0) +1 >Emitted(37, 5) Source(32, 46) + SourceIndex(0) +2 >Emitted(37, 11) Source(32, 59) + SourceIndex(0) +3 >Emitted(37, 20) Source(32, 68) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(37, 6) Source(32, 71) + SourceIndex(0) +1 >Emitted(38, 6) Source(32, 71) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(38, 2) Source(32, 73) + SourceIndex(0) +1 >Emitted(39, 2) Source(32, 73) + SourceIndex(0) --- >>>declare namespace internalOther.something { 1-> @@ -527,12 +559,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(39, 1) Source(33, 16) + SourceIndex(0) -2 >Emitted(39, 19) Source(33, 26) + SourceIndex(0) -3 >Emitted(39, 32) Source(33, 39) + SourceIndex(0) -4 >Emitted(39, 33) Source(33, 40) + SourceIndex(0) -5 >Emitted(39, 42) Source(33, 49) + SourceIndex(0) -6 >Emitted(39, 43) Source(33, 50) + SourceIndex(0) +1->Emitted(40, 1) Source(33, 16) + SourceIndex(0) +2 >Emitted(40, 19) Source(33, 26) + SourceIndex(0) +3 >Emitted(40, 32) Source(33, 39) + SourceIndex(0) +4 >Emitted(40, 33) Source(33, 40) + SourceIndex(0) +5 >Emitted(40, 42) Source(33, 49) + SourceIndex(0) +6 >Emitted(40, 43) Source(33, 50) + SourceIndex(0) --- >>> class someClass { 1 >^^^^ @@ -541,20 +573,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(40, 5) Source(33, 52) + SourceIndex(0) -2 >Emitted(40, 11) Source(33, 65) + SourceIndex(0) -3 >Emitted(40, 20) Source(33, 74) + SourceIndex(0) +1 >Emitted(41, 5) Source(33, 52) + SourceIndex(0) +2 >Emitted(41, 11) Source(33, 65) + SourceIndex(0) +3 >Emitted(41, 20) Source(33, 74) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(41, 6) Source(33, 77) + SourceIndex(0) +1 >Emitted(42, 6) Source(33, 77) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(42, 2) Source(33, 79) + SourceIndex(0) +1 >Emitted(43, 2) Source(33, 79) + SourceIndex(0) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -574,14 +606,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(43, 1) Source(34, 16) + SourceIndex(0) -2 >Emitted(43, 8) Source(34, 23) + SourceIndex(0) -3 >Emitted(43, 22) Source(34, 37) + SourceIndex(0) -4 >Emitted(43, 25) Source(34, 40) + SourceIndex(0) -5 >Emitted(43, 42) Source(34, 57) + SourceIndex(0) -6 >Emitted(43, 43) Source(34, 58) + SourceIndex(0) -7 >Emitted(43, 52) Source(34, 67) + SourceIndex(0) -8 >Emitted(43, 53) Source(34, 68) + SourceIndex(0) +1->Emitted(44, 1) Source(34, 16) + SourceIndex(0) +2 >Emitted(44, 8) Source(34, 23) + SourceIndex(0) +3 >Emitted(44, 22) Source(34, 37) + SourceIndex(0) +4 >Emitted(44, 25) Source(34, 40) + SourceIndex(0) +5 >Emitted(44, 42) Source(34, 57) + SourceIndex(0) +6 >Emitted(44, 43) Source(34, 58) + SourceIndex(0) +7 >Emitted(44, 52) Source(34, 67) + SourceIndex(0) +8 >Emitted(44, 53) Source(34, 68) + SourceIndex(0) --- >>>declare type internalType = internalC; 1 > @@ -597,12 +629,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(44, 1) Source(35, 16) + SourceIndex(0) -2 >Emitted(44, 14) Source(35, 21) + SourceIndex(0) -3 >Emitted(44, 26) Source(35, 33) + SourceIndex(0) -4 >Emitted(44, 29) Source(35, 36) + SourceIndex(0) -5 >Emitted(44, 38) Source(35, 45) + SourceIndex(0) -6 >Emitted(44, 39) Source(35, 46) + SourceIndex(0) +1 >Emitted(45, 1) Source(35, 16) + SourceIndex(0) +2 >Emitted(45, 14) Source(35, 21) + SourceIndex(0) +3 >Emitted(45, 26) Source(35, 33) + SourceIndex(0) +4 >Emitted(45, 29) Source(35, 36) + SourceIndex(0) +5 >Emitted(45, 38) Source(35, 45) + SourceIndex(0) +6 >Emitted(45, 39) Source(35, 46) + SourceIndex(0) --- >>>declare const internalConst = 10; 1 > @@ -618,12 +650,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(45, 1) Source(36, 16) + SourceIndex(0) -2 >Emitted(45, 9) Source(36, 16) + SourceIndex(0) -3 >Emitted(45, 15) Source(36, 22) + SourceIndex(0) -4 >Emitted(45, 28) Source(36, 35) + SourceIndex(0) -5 >Emitted(45, 33) Source(36, 40) + SourceIndex(0) -6 >Emitted(45, 34) Source(36, 41) + SourceIndex(0) +1 >Emitted(46, 1) Source(36, 16) + SourceIndex(0) +2 >Emitted(46, 9) Source(36, 16) + SourceIndex(0) +3 >Emitted(46, 15) Source(36, 22) + SourceIndex(0) +4 >Emitted(46, 28) Source(36, 35) + SourceIndex(0) +5 >Emitted(46, 33) Source(36, 40) + SourceIndex(0) +6 >Emitted(46, 34) Source(36, 41) + SourceIndex(0) --- >>>declare enum internalEnum { 1 > @@ -633,9 +665,9 @@ sourceFile:../second/second_part1.ts >/**@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(46, 1) Source(37, 16) + SourceIndex(0) -2 >Emitted(46, 14) Source(37, 21) + SourceIndex(0) -3 >Emitted(46, 26) Source(37, 33) + SourceIndex(0) +1 >Emitted(47, 1) Source(37, 16) + SourceIndex(0) +2 >Emitted(47, 14) Source(37, 21) + SourceIndex(0) +3 >Emitted(47, 26) Source(37, 33) + SourceIndex(0) --- >>> a = 0, 1 >^^^^ @@ -645,9 +677,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(47, 5) Source(37, 36) + SourceIndex(0) -2 >Emitted(47, 6) Source(37, 37) + SourceIndex(0) -3 >Emitted(47, 10) Source(37, 37) + SourceIndex(0) +1 >Emitted(48, 5) Source(37, 36) + SourceIndex(0) +2 >Emitted(48, 6) Source(37, 37) + SourceIndex(0) +3 >Emitted(48, 10) Source(37, 37) + SourceIndex(0) --- >>> b = 1, 1->^^^^ @@ -657,9 +689,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(48, 5) Source(37, 39) + SourceIndex(0) -2 >Emitted(48, 6) Source(37, 40) + SourceIndex(0) -3 >Emitted(48, 10) Source(37, 40) + SourceIndex(0) +1->Emitted(49, 5) Source(37, 39) + SourceIndex(0) +2 >Emitted(49, 6) Source(37, 40) + SourceIndex(0) +3 >Emitted(49, 10) Source(37, 40) + SourceIndex(0) --- >>> c = 2 1->^^^^ @@ -668,15 +700,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(49, 5) Source(37, 42) + SourceIndex(0) -2 >Emitted(49, 6) Source(37, 43) + SourceIndex(0) -3 >Emitted(49, 10) Source(37, 43) + SourceIndex(0) +1->Emitted(50, 5) Source(37, 42) + SourceIndex(0) +2 >Emitted(50, 6) Source(37, 43) + SourceIndex(0) +3 >Emitted(50, 10) Source(37, 43) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(37, 45) + SourceIndex(0) +1 >Emitted(51, 2) Source(37, 45) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -690,9 +722,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(51, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(51, 15) Source(1, 7) + SourceIndex(1) -3 >Emitted(51, 16) Source(1, 8) + SourceIndex(1) +1->Emitted(52, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(52, 15) Source(1, 7) + SourceIndex(1) +3 >Emitted(52, 16) Source(1, 8) + SourceIndex(1) --- >>> doSomething(): void; 1->^^^^ @@ -700,8 +732,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(52, 5) Source(2, 5) + SourceIndex(1) -2 >Emitted(52, 16) Source(2, 16) + SourceIndex(1) +1->Emitted(53, 5) Source(2, 5) + SourceIndex(1) +2 >Emitted(53, 16) Source(2, 16) + SourceIndex(1) --- >>>} 1 >^ @@ -710,7 +742,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(53, 2) Source(5, 2) + SourceIndex(1) +1 >Emitted(54, 2) Source(5, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2294,32 +2326,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 77, - "end": 151, + "end": 182, "kind": "internal" }, { - "pos": 153, - "end": 185, + "pos": 184, + "end": 216, "kind": "text" }, { - "pos": 185, - "end": 577, + "pos": 216, + "end": 608, "kind": "internal" }, { - "pos": 579, - "end": 582, + "pos": 610, + "end": 613, "kind": "text" }, { - "pos": 582, - "end": 995, + "pos": 613, + "end": 1026, "kind": "internal" }, { - "pos": 997, - "end": 1045, + "pos": 1028, + "end": 1076, "kind": "text" } ] @@ -2448,18 +2480,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (77-151) +internal: (77-182) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (153-185) +text: (184-216) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (185-577) +internal: (216-608) class C { } function foo(): void; @@ -2480,11 +2513,11 @@ internal: (185-577) c = 2 } ---------------------------------------------------------------------- -text: (579-582) +text: (610-613) } ---------------------------------------------------------------------- -internal: (582-995) +internal: (613-1026) declare class internalC { } declare function internalfoo(): void; @@ -2505,7 +2538,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (997-1045) +text: (1028-1076) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 0890b8d81889c..b2be036365b5d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -15,7 +15,8 @@ declare class normalC { /**@internal*/ constructor(); /**@internal*/ prop: string; /**@internal*/ method(): void; - /**@internal*/ /**@internal*/ c: number; + /**@internal*/ get c(): number; + /**@internal*/ set c(val: number); } declare namespace normalN { /**@internal*/ class C { @@ -63,7 +64,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,gBAAK,CAAC,EACM,MAAM;CACnC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -306,7 +307,7 @@ sourceFile:../second/second_part1.ts 2 > ^^^^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^-> +5 > ^^^^^^^^^^^-> 1-> > 2 > /**@internal*/ @@ -317,34 +318,71 @@ sourceFile:../second/second_part1.ts 3 >Emitted(16, 20) Source(16, 20) + SourceIndex(2) 4 >Emitted(16, 26) Source(16, 26) + SourceIndex(2) --- ->>> /**@internal*/ /**@internal*/ c: number; +>>> /**@internal*/ get c(): number; 1->^^^^ 2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^ -6 > ^^^^^^ +3 > ^ +4 > ^^^^ +5 > ^ +6 > ^^^^ +7 > ^^^^^^ +8 > ^ +9 > ^^^^-> 1->() { } > 2 > /**@internal*/ -3 > get -4 > c -5 > () { return 10; } - > /**@internal*/ set c(val: -6 > number +3 > +4 > get +5 > c +6 > () { return 10; } + > /**@internal*/ set c(val: +7 > number +8 > 1->Emitted(17, 5) Source(17, 5) + SourceIndex(2) 2 >Emitted(17, 19) Source(17, 19) + SourceIndex(2) -3 >Emitted(17, 35) Source(17, 24) + SourceIndex(2) -4 >Emitted(17, 36) Source(17, 25) + SourceIndex(2) -5 >Emitted(17, 38) Source(18, 31) + SourceIndex(2) -6 >Emitted(17, 44) Source(18, 37) + SourceIndex(2) +3 >Emitted(17, 20) Source(17, 20) + SourceIndex(2) +4 >Emitted(17, 24) Source(17, 24) + SourceIndex(2) +5 >Emitted(17, 25) Source(17, 25) + SourceIndex(2) +6 >Emitted(17, 29) Source(18, 31) + SourceIndex(2) +7 >Emitted(17, 35) Source(18, 37) + SourceIndex(2) +8 >Emitted(17, 36) Source(17, 42) + SourceIndex(2) +--- +>>> /**@internal*/ set c(val: number); +1->^^^^ +2 > ^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^ +5 > ^ +6 > ^ +7 > ^^^^^ +8 > ^^^^^^ +9 > ^^ +1-> + > +2 > /**@internal*/ +3 > +4 > set +5 > c +6 > ( +7 > val: +8 > number +9 > ) { } +1->Emitted(18, 5) Source(18, 5) + SourceIndex(2) +2 >Emitted(18, 19) Source(18, 19) + SourceIndex(2) +3 >Emitted(18, 20) Source(18, 20) + SourceIndex(2) +4 >Emitted(18, 24) Source(18, 24) + SourceIndex(2) +5 >Emitted(18, 25) Source(18, 25) + SourceIndex(2) +6 >Emitted(18, 26) Source(18, 26) + SourceIndex(2) +7 >Emitted(18, 31) Source(18, 31) + SourceIndex(2) +8 >Emitted(18, 37) Source(18, 37) + SourceIndex(2) +9 >Emitted(18, 39) Source(18, 42) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(18, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(19, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -357,10 +395,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(19, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(19, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(19, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(19, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(20, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(20, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(20, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(20, 27) Source(20, 19) + SourceIndex(2) --- >>> /**@internal*/ class C { 1->^^^^ @@ -374,17 +412,17 @@ sourceFile:../second/second_part1.ts 3 > 4 > export class 5 > C -1->Emitted(20, 5) Source(21, 5) + SourceIndex(2) -2 >Emitted(20, 19) Source(21, 19) + SourceIndex(2) -3 >Emitted(20, 20) Source(21, 20) + SourceIndex(2) -4 >Emitted(20, 26) Source(21, 33) + SourceIndex(2) -5 >Emitted(20, 27) Source(21, 34) + SourceIndex(2) +1->Emitted(21, 5) Source(21, 5) + SourceIndex(2) +2 >Emitted(21, 19) Source(21, 19) + SourceIndex(2) +3 >Emitted(21, 20) Source(21, 20) + SourceIndex(2) +4 >Emitted(21, 26) Source(21, 33) + SourceIndex(2) +5 >Emitted(21, 27) Source(21, 34) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(21, 6) Source(21, 38) + SourceIndex(2) +1 >Emitted(22, 6) Source(21, 38) + SourceIndex(2) --- >>> /**@internal*/ function foo(): void; 1->^^^^ @@ -401,12 +439,12 @@ sourceFile:../second/second_part1.ts 4 > export function 5 > foo 6 > () {} -1->Emitted(22, 5) Source(22, 5) + SourceIndex(2) -2 >Emitted(22, 19) Source(22, 19) + SourceIndex(2) -3 >Emitted(22, 20) Source(22, 20) + SourceIndex(2) -4 >Emitted(22, 29) Source(22, 36) + SourceIndex(2) -5 >Emitted(22, 32) Source(22, 39) + SourceIndex(2) -6 >Emitted(22, 41) Source(22, 44) + SourceIndex(2) +1->Emitted(23, 5) Source(22, 5) + SourceIndex(2) +2 >Emitted(23, 19) Source(22, 19) + SourceIndex(2) +3 >Emitted(23, 20) Source(22, 20) + SourceIndex(2) +4 >Emitted(23, 29) Source(22, 36) + SourceIndex(2) +5 >Emitted(23, 32) Source(22, 39) + SourceIndex(2) +6 >Emitted(23, 41) Source(22, 44) + SourceIndex(2) --- >>> /**@internal*/ namespace someNamespace { 1->^^^^ @@ -422,12 +460,12 @@ sourceFile:../second/second_part1.ts 4 > export namespace 5 > someNamespace 6 > -1->Emitted(23, 5) Source(23, 5) + SourceIndex(2) -2 >Emitted(23, 19) Source(23, 19) + SourceIndex(2) -3 >Emitted(23, 20) Source(23, 20) + SourceIndex(2) -4 >Emitted(23, 30) Source(23, 37) + SourceIndex(2) -5 >Emitted(23, 43) Source(23, 50) + SourceIndex(2) -6 >Emitted(23, 44) Source(23, 51) + SourceIndex(2) +1->Emitted(24, 5) Source(23, 5) + SourceIndex(2) +2 >Emitted(24, 19) Source(23, 19) + SourceIndex(2) +3 >Emitted(24, 20) Source(23, 20) + SourceIndex(2) +4 >Emitted(24, 30) Source(23, 37) + SourceIndex(2) +5 >Emitted(24, 43) Source(23, 50) + SourceIndex(2) +6 >Emitted(24, 44) Source(23, 51) + SourceIndex(2) --- >>> class C { 1 >^^^^^^^^ @@ -436,20 +474,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(24, 9) Source(23, 53) + SourceIndex(2) -2 >Emitted(24, 15) Source(23, 66) + SourceIndex(2) -3 >Emitted(24, 16) Source(23, 67) + SourceIndex(2) +1 >Emitted(25, 9) Source(23, 53) + SourceIndex(2) +2 >Emitted(25, 15) Source(23, 66) + SourceIndex(2) +3 >Emitted(25, 16) Source(23, 67) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(25, 10) Source(23, 70) + SourceIndex(2) +1 >Emitted(26, 10) Source(23, 70) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(26, 6) Source(23, 72) + SourceIndex(2) +1 >Emitted(27, 6) Source(23, 72) + SourceIndex(2) --- >>> /**@internal*/ namespace someOther.something { 1->^^^^ @@ -469,14 +507,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > something 8 > -1->Emitted(27, 5) Source(24, 5) + SourceIndex(2) -2 >Emitted(27, 19) Source(24, 19) + SourceIndex(2) -3 >Emitted(27, 20) Source(24, 20) + SourceIndex(2) -4 >Emitted(27, 30) Source(24, 37) + SourceIndex(2) -5 >Emitted(27, 39) Source(24, 46) + SourceIndex(2) -6 >Emitted(27, 40) Source(24, 47) + SourceIndex(2) -7 >Emitted(27, 49) Source(24, 56) + SourceIndex(2) -8 >Emitted(27, 50) Source(24, 57) + SourceIndex(2) +1->Emitted(28, 5) Source(24, 5) + SourceIndex(2) +2 >Emitted(28, 19) Source(24, 19) + SourceIndex(2) +3 >Emitted(28, 20) Source(24, 20) + SourceIndex(2) +4 >Emitted(28, 30) Source(24, 37) + SourceIndex(2) +5 >Emitted(28, 39) Source(24, 46) + SourceIndex(2) +6 >Emitted(28, 40) Source(24, 47) + SourceIndex(2) +7 >Emitted(28, 49) Source(24, 56) + SourceIndex(2) +8 >Emitted(28, 50) Source(24, 57) + SourceIndex(2) --- >>> class someClass { 1 >^^^^^^^^ @@ -485,20 +523,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(28, 9) Source(24, 59) + SourceIndex(2) -2 >Emitted(28, 15) Source(24, 72) + SourceIndex(2) -3 >Emitted(28, 24) Source(24, 81) + SourceIndex(2) +1 >Emitted(29, 9) Source(24, 59) + SourceIndex(2) +2 >Emitted(29, 15) Source(24, 72) + SourceIndex(2) +3 >Emitted(29, 24) Source(24, 81) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(29, 10) Source(24, 84) + SourceIndex(2) +1 >Emitted(30, 10) Source(24, 84) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(30, 6) Source(24, 86) + SourceIndex(2) +1 >Emitted(31, 6) Source(24, 86) + SourceIndex(2) --- >>> /**@internal*/ export import someImport = someNamespace.C; 1->^^^^ @@ -524,17 +562,17 @@ sourceFile:../second/second_part1.ts 9 > . 10> C 11> ; -1->Emitted(31, 5) Source(25, 5) + SourceIndex(2) -2 >Emitted(31, 19) Source(25, 19) + SourceIndex(2) -3 >Emitted(31, 20) Source(25, 20) + SourceIndex(2) -4 >Emitted(31, 26) Source(25, 26) + SourceIndex(2) -5 >Emitted(31, 34) Source(25, 34) + SourceIndex(2) -6 >Emitted(31, 44) Source(25, 44) + SourceIndex(2) -7 >Emitted(31, 47) Source(25, 47) + SourceIndex(2) -8 >Emitted(31, 60) Source(25, 60) + SourceIndex(2) -9 >Emitted(31, 61) Source(25, 61) + SourceIndex(2) -10>Emitted(31, 62) Source(25, 62) + SourceIndex(2) -11>Emitted(31, 63) Source(25, 63) + SourceIndex(2) +1->Emitted(32, 5) Source(25, 5) + SourceIndex(2) +2 >Emitted(32, 19) Source(25, 19) + SourceIndex(2) +3 >Emitted(32, 20) Source(25, 20) + SourceIndex(2) +4 >Emitted(32, 26) Source(25, 26) + SourceIndex(2) +5 >Emitted(32, 34) Source(25, 34) + SourceIndex(2) +6 >Emitted(32, 44) Source(25, 44) + SourceIndex(2) +7 >Emitted(32, 47) Source(25, 47) + SourceIndex(2) +8 >Emitted(32, 60) Source(25, 60) + SourceIndex(2) +9 >Emitted(32, 61) Source(25, 61) + SourceIndex(2) +10>Emitted(32, 62) Source(25, 62) + SourceIndex(2) +11>Emitted(32, 63) Source(25, 63) + SourceIndex(2) --- >>> /**@internal*/ type internalType = internalC; 1 >^^^^ @@ -554,14 +592,14 @@ sourceFile:../second/second_part1.ts 6 > = 7 > internalC 8 > ; -1 >Emitted(32, 5) Source(26, 5) + SourceIndex(2) -2 >Emitted(32, 19) Source(26, 19) + SourceIndex(2) -3 >Emitted(32, 20) Source(26, 20) + SourceIndex(2) -4 >Emitted(32, 25) Source(26, 32) + SourceIndex(2) -5 >Emitted(32, 37) Source(26, 44) + SourceIndex(2) -6 >Emitted(32, 40) Source(26, 47) + SourceIndex(2) -7 >Emitted(32, 49) Source(26, 56) + SourceIndex(2) -8 >Emitted(32, 50) Source(26, 57) + SourceIndex(2) +1 >Emitted(33, 5) Source(26, 5) + SourceIndex(2) +2 >Emitted(33, 19) Source(26, 19) + SourceIndex(2) +3 >Emitted(33, 20) Source(26, 20) + SourceIndex(2) +4 >Emitted(33, 25) Source(26, 32) + SourceIndex(2) +5 >Emitted(33, 37) Source(26, 44) + SourceIndex(2) +6 >Emitted(33, 40) Source(26, 47) + SourceIndex(2) +7 >Emitted(33, 49) Source(26, 56) + SourceIndex(2) +8 >Emitted(33, 50) Source(26, 57) + SourceIndex(2) --- >>> /**@internal*/ const internalConst = 10; 1 >^^^^ @@ -579,13 +617,13 @@ sourceFile:../second/second_part1.ts 5 > internalConst 6 > = 10 7 > ; -1 >Emitted(33, 5) Source(27, 5) + SourceIndex(2) -2 >Emitted(33, 19) Source(27, 19) + SourceIndex(2) -3 >Emitted(33, 20) Source(27, 27) + SourceIndex(2) -4 >Emitted(33, 26) Source(27, 33) + SourceIndex(2) -5 >Emitted(33, 39) Source(27, 46) + SourceIndex(2) -6 >Emitted(33, 44) Source(27, 51) + SourceIndex(2) -7 >Emitted(33, 45) Source(27, 52) + SourceIndex(2) +1 >Emitted(34, 5) Source(27, 5) + SourceIndex(2) +2 >Emitted(34, 19) Source(27, 19) + SourceIndex(2) +3 >Emitted(34, 20) Source(27, 27) + SourceIndex(2) +4 >Emitted(34, 26) Source(27, 33) + SourceIndex(2) +5 >Emitted(34, 39) Source(27, 46) + SourceIndex(2) +6 >Emitted(34, 44) Source(27, 51) + SourceIndex(2) +7 >Emitted(34, 45) Source(27, 52) + SourceIndex(2) --- >>> /**@internal*/ enum internalEnum { 1 >^^^^ @@ -599,11 +637,11 @@ sourceFile:../second/second_part1.ts 3 > 4 > export enum 5 > internalEnum -1 >Emitted(34, 5) Source(28, 5) + SourceIndex(2) -2 >Emitted(34, 19) Source(28, 19) + SourceIndex(2) -3 >Emitted(34, 20) Source(28, 20) + SourceIndex(2) -4 >Emitted(34, 25) Source(28, 32) + SourceIndex(2) -5 >Emitted(34, 37) Source(28, 44) + SourceIndex(2) +1 >Emitted(35, 5) Source(28, 5) + SourceIndex(2) +2 >Emitted(35, 19) Source(28, 19) + SourceIndex(2) +3 >Emitted(35, 20) Source(28, 20) + SourceIndex(2) +4 >Emitted(35, 25) Source(28, 32) + SourceIndex(2) +5 >Emitted(35, 37) Source(28, 44) + SourceIndex(2) --- >>> a = 0, 1 >^^^^^^^^ @@ -613,9 +651,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(35, 9) Source(28, 47) + SourceIndex(2) -2 >Emitted(35, 10) Source(28, 48) + SourceIndex(2) -3 >Emitted(35, 14) Source(28, 48) + SourceIndex(2) +1 >Emitted(36, 9) Source(28, 47) + SourceIndex(2) +2 >Emitted(36, 10) Source(28, 48) + SourceIndex(2) +3 >Emitted(36, 14) Source(28, 48) + SourceIndex(2) --- >>> b = 1, 1->^^^^^^^^ @@ -625,9 +663,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(36, 9) Source(28, 50) + SourceIndex(2) -2 >Emitted(36, 10) Source(28, 51) + SourceIndex(2) -3 >Emitted(36, 14) Source(28, 51) + SourceIndex(2) +1->Emitted(37, 9) Source(28, 50) + SourceIndex(2) +2 >Emitted(37, 10) Source(28, 51) + SourceIndex(2) +3 >Emitted(37, 14) Source(28, 51) + SourceIndex(2) --- >>> c = 2 1->^^^^^^^^ @@ -636,21 +674,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(37, 9) Source(28, 53) + SourceIndex(2) -2 >Emitted(37, 10) Source(28, 54) + SourceIndex(2) -3 >Emitted(37, 14) Source(28, 54) + SourceIndex(2) +1->Emitted(38, 9) Source(28, 53) + SourceIndex(2) +2 >Emitted(38, 10) Source(28, 54) + SourceIndex(2) +3 >Emitted(38, 14) Source(28, 54) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(38, 6) Source(28, 56) + SourceIndex(2) +1 >Emitted(39, 6) Source(28, 56) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(39, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(40, 2) Source(29, 2) + SourceIndex(2) --- >>>/**@internal*/ declare class internalC { 1-> @@ -664,17 +702,17 @@ sourceFile:../second/second_part1.ts 3 > 4 > class 5 > internalC -1->Emitted(40, 1) Source(30, 1) + SourceIndex(2) -2 >Emitted(40, 15) Source(30, 15) + SourceIndex(2) -3 >Emitted(40, 16) Source(30, 16) + SourceIndex(2) -4 >Emitted(40, 30) Source(30, 22) + SourceIndex(2) -5 >Emitted(40, 39) Source(30, 31) + SourceIndex(2) +1->Emitted(41, 1) Source(30, 1) + SourceIndex(2) +2 >Emitted(41, 15) Source(30, 15) + SourceIndex(2) +3 >Emitted(41, 16) Source(30, 16) + SourceIndex(2) +4 >Emitted(41, 30) Source(30, 22) + SourceIndex(2) +5 >Emitted(41, 39) Source(30, 31) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(41, 2) Source(30, 34) + SourceIndex(2) +1 >Emitted(42, 2) Source(30, 34) + SourceIndex(2) --- >>>/**@internal*/ declare function internalfoo(): void; 1-> @@ -691,12 +729,12 @@ sourceFile:../second/second_part1.ts 4 > function 5 > internalfoo 6 > () {} -1->Emitted(42, 1) Source(31, 1) + SourceIndex(2) -2 >Emitted(42, 15) Source(31, 15) + SourceIndex(2) -3 >Emitted(42, 16) Source(31, 16) + SourceIndex(2) -4 >Emitted(42, 33) Source(31, 25) + SourceIndex(2) -5 >Emitted(42, 44) Source(31, 36) + SourceIndex(2) -6 >Emitted(42, 53) Source(31, 41) + SourceIndex(2) +1->Emitted(43, 1) Source(31, 1) + SourceIndex(2) +2 >Emitted(43, 15) Source(31, 15) + SourceIndex(2) +3 >Emitted(43, 16) Source(31, 16) + SourceIndex(2) +4 >Emitted(43, 33) Source(31, 25) + SourceIndex(2) +5 >Emitted(43, 44) Source(31, 36) + SourceIndex(2) +6 >Emitted(43, 53) Source(31, 41) + SourceIndex(2) --- >>>/**@internal*/ declare namespace internalNamespace { 1-> @@ -712,12 +750,12 @@ sourceFile:../second/second_part1.ts 4 > namespace 5 > internalNamespace 6 > -1->Emitted(43, 1) Source(32, 1) + SourceIndex(2) -2 >Emitted(43, 15) Source(32, 15) + SourceIndex(2) -3 >Emitted(43, 16) Source(32, 16) + SourceIndex(2) -4 >Emitted(43, 34) Source(32, 26) + SourceIndex(2) -5 >Emitted(43, 51) Source(32, 43) + SourceIndex(2) -6 >Emitted(43, 52) Source(32, 44) + SourceIndex(2) +1->Emitted(44, 1) Source(32, 1) + SourceIndex(2) +2 >Emitted(44, 15) Source(32, 15) + SourceIndex(2) +3 >Emitted(44, 16) Source(32, 16) + SourceIndex(2) +4 >Emitted(44, 34) Source(32, 26) + SourceIndex(2) +5 >Emitted(44, 51) Source(32, 43) + SourceIndex(2) +6 >Emitted(44, 52) Source(32, 44) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -726,20 +764,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(44, 5) Source(32, 46) + SourceIndex(2) -2 >Emitted(44, 11) Source(32, 59) + SourceIndex(2) -3 >Emitted(44, 20) Source(32, 68) + SourceIndex(2) +1 >Emitted(45, 5) Source(32, 46) + SourceIndex(2) +2 >Emitted(45, 11) Source(32, 59) + SourceIndex(2) +3 >Emitted(45, 20) Source(32, 68) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(45, 6) Source(32, 71) + SourceIndex(2) +1 >Emitted(46, 6) Source(32, 71) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(46, 2) Source(32, 73) + SourceIndex(2) +1 >Emitted(47, 2) Source(32, 73) + SourceIndex(2) --- >>>/**@internal*/ declare namespace internalOther.something { 1-> @@ -759,14 +797,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > something 8 > -1->Emitted(47, 1) Source(33, 1) + SourceIndex(2) -2 >Emitted(47, 15) Source(33, 15) + SourceIndex(2) -3 >Emitted(47, 16) Source(33, 16) + SourceIndex(2) -4 >Emitted(47, 34) Source(33, 26) + SourceIndex(2) -5 >Emitted(47, 47) Source(33, 39) + SourceIndex(2) -6 >Emitted(47, 48) Source(33, 40) + SourceIndex(2) -7 >Emitted(47, 57) Source(33, 49) + SourceIndex(2) -8 >Emitted(47, 58) Source(33, 50) + SourceIndex(2) +1->Emitted(48, 1) Source(33, 1) + SourceIndex(2) +2 >Emitted(48, 15) Source(33, 15) + SourceIndex(2) +3 >Emitted(48, 16) Source(33, 16) + SourceIndex(2) +4 >Emitted(48, 34) Source(33, 26) + SourceIndex(2) +5 >Emitted(48, 47) Source(33, 39) + SourceIndex(2) +6 >Emitted(48, 48) Source(33, 40) + SourceIndex(2) +7 >Emitted(48, 57) Source(33, 49) + SourceIndex(2) +8 >Emitted(48, 58) Source(33, 50) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -775,20 +813,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(48, 5) Source(33, 52) + SourceIndex(2) -2 >Emitted(48, 11) Source(33, 65) + SourceIndex(2) -3 >Emitted(48, 20) Source(33, 74) + SourceIndex(2) +1 >Emitted(49, 5) Source(33, 52) + SourceIndex(2) +2 >Emitted(49, 11) Source(33, 65) + SourceIndex(2) +3 >Emitted(49, 20) Source(33, 74) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(49, 6) Source(33, 77) + SourceIndex(2) +1 >Emitted(50, 6) Source(33, 77) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(33, 79) + SourceIndex(2) +1 >Emitted(51, 2) Source(33, 79) + SourceIndex(2) --- >>>/**@internal*/ import internalImport = internalNamespace.someClass; 1-> @@ -812,16 +850,16 @@ sourceFile:../second/second_part1.ts 8 > . 9 > someClass 10> ; -1->Emitted(51, 1) Source(34, 1) + SourceIndex(2) -2 >Emitted(51, 15) Source(34, 15) + SourceIndex(2) -3 >Emitted(51, 16) Source(34, 16) + SourceIndex(2) -4 >Emitted(51, 23) Source(34, 23) + SourceIndex(2) -5 >Emitted(51, 37) Source(34, 37) + SourceIndex(2) -6 >Emitted(51, 40) Source(34, 40) + SourceIndex(2) -7 >Emitted(51, 57) Source(34, 57) + SourceIndex(2) -8 >Emitted(51, 58) Source(34, 58) + SourceIndex(2) -9 >Emitted(51, 67) Source(34, 67) + SourceIndex(2) -10>Emitted(51, 68) Source(34, 68) + SourceIndex(2) +1->Emitted(52, 1) Source(34, 1) + SourceIndex(2) +2 >Emitted(52, 15) Source(34, 15) + SourceIndex(2) +3 >Emitted(52, 16) Source(34, 16) + SourceIndex(2) +4 >Emitted(52, 23) Source(34, 23) + SourceIndex(2) +5 >Emitted(52, 37) Source(34, 37) + SourceIndex(2) +6 >Emitted(52, 40) Source(34, 40) + SourceIndex(2) +7 >Emitted(52, 57) Source(34, 57) + SourceIndex(2) +8 >Emitted(52, 58) Source(34, 58) + SourceIndex(2) +9 >Emitted(52, 67) Source(34, 67) + SourceIndex(2) +10>Emitted(52, 68) Source(34, 68) + SourceIndex(2) --- >>>/**@internal*/ declare type internalType = internalC; 1 > @@ -841,14 +879,14 @@ sourceFile:../second/second_part1.ts 6 > = 7 > internalC 8 > ; -1 >Emitted(52, 1) Source(35, 1) + SourceIndex(2) -2 >Emitted(52, 15) Source(35, 15) + SourceIndex(2) -3 >Emitted(52, 16) Source(35, 16) + SourceIndex(2) -4 >Emitted(52, 29) Source(35, 21) + SourceIndex(2) -5 >Emitted(52, 41) Source(35, 33) + SourceIndex(2) -6 >Emitted(52, 44) Source(35, 36) + SourceIndex(2) -7 >Emitted(52, 53) Source(35, 45) + SourceIndex(2) -8 >Emitted(52, 54) Source(35, 46) + SourceIndex(2) +1 >Emitted(53, 1) Source(35, 1) + SourceIndex(2) +2 >Emitted(53, 15) Source(35, 15) + SourceIndex(2) +3 >Emitted(53, 16) Source(35, 16) + SourceIndex(2) +4 >Emitted(53, 29) Source(35, 21) + SourceIndex(2) +5 >Emitted(53, 41) Source(35, 33) + SourceIndex(2) +6 >Emitted(53, 44) Source(35, 36) + SourceIndex(2) +7 >Emitted(53, 53) Source(35, 45) + SourceIndex(2) +8 >Emitted(53, 54) Source(35, 46) + SourceIndex(2) --- >>>/**@internal*/ declare const internalConst = 10; 1 > @@ -868,14 +906,14 @@ sourceFile:../second/second_part1.ts 6 > internalConst 7 > = 10 8 > ; -1 >Emitted(53, 1) Source(36, 1) + SourceIndex(2) -2 >Emitted(53, 15) Source(36, 15) + SourceIndex(2) -3 >Emitted(53, 16) Source(36, 16) + SourceIndex(2) -4 >Emitted(53, 24) Source(36, 16) + SourceIndex(2) -5 >Emitted(53, 30) Source(36, 22) + SourceIndex(2) -6 >Emitted(53, 43) Source(36, 35) + SourceIndex(2) -7 >Emitted(53, 48) Source(36, 40) + SourceIndex(2) -8 >Emitted(53, 49) Source(36, 41) + SourceIndex(2) +1 >Emitted(54, 1) Source(36, 1) + SourceIndex(2) +2 >Emitted(54, 15) Source(36, 15) + SourceIndex(2) +3 >Emitted(54, 16) Source(36, 16) + SourceIndex(2) +4 >Emitted(54, 24) Source(36, 16) + SourceIndex(2) +5 >Emitted(54, 30) Source(36, 22) + SourceIndex(2) +6 >Emitted(54, 43) Source(36, 35) + SourceIndex(2) +7 >Emitted(54, 48) Source(36, 40) + SourceIndex(2) +8 >Emitted(54, 49) Source(36, 41) + SourceIndex(2) --- >>>/**@internal*/ declare enum internalEnum { 1 > @@ -889,11 +927,11 @@ sourceFile:../second/second_part1.ts 3 > 4 > enum 5 > internalEnum -1 >Emitted(54, 1) Source(37, 1) + SourceIndex(2) -2 >Emitted(54, 15) Source(37, 15) + SourceIndex(2) -3 >Emitted(54, 16) Source(37, 16) + SourceIndex(2) -4 >Emitted(54, 29) Source(37, 21) + SourceIndex(2) -5 >Emitted(54, 41) Source(37, 33) + SourceIndex(2) +1 >Emitted(55, 1) Source(37, 1) + SourceIndex(2) +2 >Emitted(55, 15) Source(37, 15) + SourceIndex(2) +3 >Emitted(55, 16) Source(37, 16) + SourceIndex(2) +4 >Emitted(55, 29) Source(37, 21) + SourceIndex(2) +5 >Emitted(55, 41) Source(37, 33) + SourceIndex(2) --- >>> a = 0, 1 >^^^^ @@ -903,9 +941,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(55, 5) Source(37, 36) + SourceIndex(2) -2 >Emitted(55, 6) Source(37, 37) + SourceIndex(2) -3 >Emitted(55, 10) Source(37, 37) + SourceIndex(2) +1 >Emitted(56, 5) Source(37, 36) + SourceIndex(2) +2 >Emitted(56, 6) Source(37, 37) + SourceIndex(2) +3 >Emitted(56, 10) Source(37, 37) + SourceIndex(2) --- >>> b = 1, 1->^^^^ @@ -915,9 +953,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(56, 5) Source(37, 39) + SourceIndex(2) -2 >Emitted(56, 6) Source(37, 40) + SourceIndex(2) -3 >Emitted(56, 10) Source(37, 40) + SourceIndex(2) +1->Emitted(57, 5) Source(37, 39) + SourceIndex(2) +2 >Emitted(57, 6) Source(37, 40) + SourceIndex(2) +3 >Emitted(57, 10) Source(37, 40) + SourceIndex(2) --- >>> c = 2 1->^^^^ @@ -926,15 +964,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(57, 5) Source(37, 42) + SourceIndex(2) -2 >Emitted(57, 6) Source(37, 43) + SourceIndex(2) -3 >Emitted(57, 10) Source(37, 43) + SourceIndex(2) +1->Emitted(58, 5) Source(37, 42) + SourceIndex(2) +2 >Emitted(58, 6) Source(37, 43) + SourceIndex(2) +3 >Emitted(58, 10) Source(37, 43) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(58, 2) Source(37, 45) + SourceIndex(2) +1 >Emitted(59, 2) Source(37, 45) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -948,9 +986,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(59, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(59, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(59, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(60, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(60, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(60, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -958,8 +996,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(60, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(60, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(61, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(61, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -968,7 +1006,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(61, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(62, 2) Source(5, 2) + SourceIndex(3) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2824,32 +2862,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 249, - "end": 398, + "end": 429, "kind": "internal" }, { - "pos": 400, - "end": 432, + "pos": 431, + "end": 463, "kind": "text" }, { - "pos": 432, - "end": 944, + "pos": 463, + "end": 975, "kind": "internal" }, { - "pos": 946, - "end": 949, + "pos": 977, + "end": 980, "kind": "text" }, { - "pos": 949, - "end": 1482, + "pos": 980, + "end": 1513, "kind": "internal" }, { - "pos": 1484, - "end": 1532, + "pos": 1515, + "end": 1563, "kind": "text" } ] @@ -3004,18 +3042,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (249-398) +internal: (249-429) /**@internal*/ constructor(); /**@internal*/ prop: string; /**@internal*/ method(): void; - /**@internal*/ /**@internal*/ c: number; + /**@internal*/ get c(): number; + /**@internal*/ set c(val: number); ---------------------------------------------------------------------- -text: (400-432) +text: (431-463) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (432-944) +internal: (463-975) /**@internal*/ class C { } /**@internal*/ function foo(): void; @@ -3036,11 +3075,11 @@ internal: (432-944) c = 2 } ---------------------------------------------------------------------- -text: (946-949) +text: (977-980) } ---------------------------------------------------------------------- -internal: (949-1482) +internal: (980-1513) /**@internal*/ declare class internalC { } /**@internal*/ declare function internalfoo(): void; @@ -3061,7 +3100,7 @@ internal: (949-1482) c = 2 } ---------------------------------------------------------------------- -text: (1484-1532) +text: (1515-1563) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js index 87badd920395e..bba9f604bcf1c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js @@ -7,7 +7,8 @@ declare class normalC { /**@internal*/ constructor(); /**@internal*/ prop: string; /**@internal*/ method(): void; - /**@internal*/ /**@internal*/ c: number; + /**@internal*/ get c(): number; + /**@internal*/ set c(val: number); } declare namespace normalN { /**@internal*/ class C { @@ -55,7 +56,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,gBAAK,CAAC,EACM,MAAM;CACnC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;IACT,cAAc;IACd,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,MAAM;IACrB,cAAc,CAAC,IAAI,CAAC,IACM,MAAM,CADK;IACrC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACxC;AACD,kBAAU,OAAO,CAAC;IACd,cAAc,CAAC,MAAa,CAAC;KAAI;IACjC,cAAc,CAAC,SAAgB,GAAG,SAAK;IACvC,cAAc,CAAC,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACnE,cAAc,CAAC,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IACjF,cAAc,CAAC,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC1D,cAAc,CAAC,KAAY,YAAY,GAAG,SAAS,CAAC;IACpD,cAAc,CAAQ,MAAM,aAAa,KAAK,CAAC;IAC/C,cAAc,CAAC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACD,cAAc,CAAC,cAAM,SAAS;CAAG;AACjC,cAAc,CAAC,iBAAS,WAAW,SAAK;AACxC,cAAc,CAAC,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACxE,cAAc,CAAC,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC9E,cAAc,CAAC,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACnE,cAAc,CAAC,aAAK,YAAY,GAAG,SAAS,CAAC;AAC7C,cAAc,CAAC,QAAA,MAAM,aAAa,KAAK,CAAC;AACxC,cAAc,CAAC,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -172,7 +173,7 @@ sourceFile:../second/second_part1.ts 2 > ^^^^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^-> +5 > ^^^^^^^^^^^-> 1-> > 2 > /**@internal*/ @@ -183,34 +184,71 @@ sourceFile:../second/second_part1.ts 3 >Emitted(8, 20) Source(16, 20) + SourceIndex(0) 4 >Emitted(8, 26) Source(16, 26) + SourceIndex(0) --- ->>> /**@internal*/ /**@internal*/ c: number; +>>> /**@internal*/ get c(): number; 1->^^^^ 2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^ -6 > ^^^^^^ +3 > ^ +4 > ^^^^ +5 > ^ +6 > ^^^^ +7 > ^^^^^^ +8 > ^ +9 > ^^^^-> 1->() { } > 2 > /**@internal*/ -3 > get -4 > c -5 > () { return 10; } - > /**@internal*/ set c(val: -6 > number +3 > +4 > get +5 > c +6 > () { return 10; } + > /**@internal*/ set c(val: +7 > number +8 > 1->Emitted(9, 5) Source(17, 5) + SourceIndex(0) 2 >Emitted(9, 19) Source(17, 19) + SourceIndex(0) -3 >Emitted(9, 35) Source(17, 24) + SourceIndex(0) -4 >Emitted(9, 36) Source(17, 25) + SourceIndex(0) -5 >Emitted(9, 38) Source(18, 31) + SourceIndex(0) -6 >Emitted(9, 44) Source(18, 37) + SourceIndex(0) +3 >Emitted(9, 20) Source(17, 20) + SourceIndex(0) +4 >Emitted(9, 24) Source(17, 24) + SourceIndex(0) +5 >Emitted(9, 25) Source(17, 25) + SourceIndex(0) +6 >Emitted(9, 29) Source(18, 31) + SourceIndex(0) +7 >Emitted(9, 35) Source(18, 37) + SourceIndex(0) +8 >Emitted(9, 36) Source(17, 42) + SourceIndex(0) +--- +>>> /**@internal*/ set c(val: number); +1->^^^^ +2 > ^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^ +5 > ^ +6 > ^ +7 > ^^^^^ +8 > ^^^^^^ +9 > ^^ +1-> + > +2 > /**@internal*/ +3 > +4 > set +5 > c +6 > ( +7 > val: +8 > number +9 > ) { } +1->Emitted(10, 5) Source(18, 5) + SourceIndex(0) +2 >Emitted(10, 19) Source(18, 19) + SourceIndex(0) +3 >Emitted(10, 20) Source(18, 20) + SourceIndex(0) +4 >Emitted(10, 24) Source(18, 24) + SourceIndex(0) +5 >Emitted(10, 25) Source(18, 25) + SourceIndex(0) +6 >Emitted(10, 26) Source(18, 26) + SourceIndex(0) +7 >Emitted(10, 31) Source(18, 31) + SourceIndex(0) +8 >Emitted(10, 37) Source(18, 37) + SourceIndex(0) +9 >Emitted(10, 39) Source(18, 42) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(10, 2) Source(19, 2) + SourceIndex(0) +1 >Emitted(11, 2) Source(19, 2) + SourceIndex(0) --- >>>declare namespace normalN { 1-> @@ -223,10 +261,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(11, 1) Source(20, 1) + SourceIndex(0) -2 >Emitted(11, 19) Source(20, 11) + SourceIndex(0) -3 >Emitted(11, 26) Source(20, 18) + SourceIndex(0) -4 >Emitted(11, 27) Source(20, 19) + SourceIndex(0) +1->Emitted(12, 1) Source(20, 1) + SourceIndex(0) +2 >Emitted(12, 19) Source(20, 11) + SourceIndex(0) +3 >Emitted(12, 26) Source(20, 18) + SourceIndex(0) +4 >Emitted(12, 27) Source(20, 19) + SourceIndex(0) --- >>> /**@internal*/ class C { 1->^^^^ @@ -240,17 +278,17 @@ sourceFile:../second/second_part1.ts 3 > 4 > export class 5 > C -1->Emitted(12, 5) Source(21, 5) + SourceIndex(0) -2 >Emitted(12, 19) Source(21, 19) + SourceIndex(0) -3 >Emitted(12, 20) Source(21, 20) + SourceIndex(0) -4 >Emitted(12, 26) Source(21, 33) + SourceIndex(0) -5 >Emitted(12, 27) Source(21, 34) + SourceIndex(0) +1->Emitted(13, 5) Source(21, 5) + SourceIndex(0) +2 >Emitted(13, 19) Source(21, 19) + SourceIndex(0) +3 >Emitted(13, 20) Source(21, 20) + SourceIndex(0) +4 >Emitted(13, 26) Source(21, 33) + SourceIndex(0) +5 >Emitted(13, 27) Source(21, 34) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(13, 6) Source(21, 38) + SourceIndex(0) +1 >Emitted(14, 6) Source(21, 38) + SourceIndex(0) --- >>> /**@internal*/ function foo(): void; 1->^^^^ @@ -267,12 +305,12 @@ sourceFile:../second/second_part1.ts 4 > export function 5 > foo 6 > () {} -1->Emitted(14, 5) Source(22, 5) + SourceIndex(0) -2 >Emitted(14, 19) Source(22, 19) + SourceIndex(0) -3 >Emitted(14, 20) Source(22, 20) + SourceIndex(0) -4 >Emitted(14, 29) Source(22, 36) + SourceIndex(0) -5 >Emitted(14, 32) Source(22, 39) + SourceIndex(0) -6 >Emitted(14, 41) Source(22, 44) + SourceIndex(0) +1->Emitted(15, 5) Source(22, 5) + SourceIndex(0) +2 >Emitted(15, 19) Source(22, 19) + SourceIndex(0) +3 >Emitted(15, 20) Source(22, 20) + SourceIndex(0) +4 >Emitted(15, 29) Source(22, 36) + SourceIndex(0) +5 >Emitted(15, 32) Source(22, 39) + SourceIndex(0) +6 >Emitted(15, 41) Source(22, 44) + SourceIndex(0) --- >>> /**@internal*/ namespace someNamespace { 1->^^^^ @@ -288,12 +326,12 @@ sourceFile:../second/second_part1.ts 4 > export namespace 5 > someNamespace 6 > -1->Emitted(15, 5) Source(23, 5) + SourceIndex(0) -2 >Emitted(15, 19) Source(23, 19) + SourceIndex(0) -3 >Emitted(15, 20) Source(23, 20) + SourceIndex(0) -4 >Emitted(15, 30) Source(23, 37) + SourceIndex(0) -5 >Emitted(15, 43) Source(23, 50) + SourceIndex(0) -6 >Emitted(15, 44) Source(23, 51) + SourceIndex(0) +1->Emitted(16, 5) Source(23, 5) + SourceIndex(0) +2 >Emitted(16, 19) Source(23, 19) + SourceIndex(0) +3 >Emitted(16, 20) Source(23, 20) + SourceIndex(0) +4 >Emitted(16, 30) Source(23, 37) + SourceIndex(0) +5 >Emitted(16, 43) Source(23, 50) + SourceIndex(0) +6 >Emitted(16, 44) Source(23, 51) + SourceIndex(0) --- >>> class C { 1 >^^^^^^^^ @@ -302,20 +340,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(16, 9) Source(23, 53) + SourceIndex(0) -2 >Emitted(16, 15) Source(23, 66) + SourceIndex(0) -3 >Emitted(16, 16) Source(23, 67) + SourceIndex(0) +1 >Emitted(17, 9) Source(23, 53) + SourceIndex(0) +2 >Emitted(17, 15) Source(23, 66) + SourceIndex(0) +3 >Emitted(17, 16) Source(23, 67) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(17, 10) Source(23, 70) + SourceIndex(0) +1 >Emitted(18, 10) Source(23, 70) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(18, 6) Source(23, 72) + SourceIndex(0) +1 >Emitted(19, 6) Source(23, 72) + SourceIndex(0) --- >>> /**@internal*/ namespace someOther.something { 1->^^^^ @@ -335,14 +373,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > something 8 > -1->Emitted(19, 5) Source(24, 5) + SourceIndex(0) -2 >Emitted(19, 19) Source(24, 19) + SourceIndex(0) -3 >Emitted(19, 20) Source(24, 20) + SourceIndex(0) -4 >Emitted(19, 30) Source(24, 37) + SourceIndex(0) -5 >Emitted(19, 39) Source(24, 46) + SourceIndex(0) -6 >Emitted(19, 40) Source(24, 47) + SourceIndex(0) -7 >Emitted(19, 49) Source(24, 56) + SourceIndex(0) -8 >Emitted(19, 50) Source(24, 57) + SourceIndex(0) +1->Emitted(20, 5) Source(24, 5) + SourceIndex(0) +2 >Emitted(20, 19) Source(24, 19) + SourceIndex(0) +3 >Emitted(20, 20) Source(24, 20) + SourceIndex(0) +4 >Emitted(20, 30) Source(24, 37) + SourceIndex(0) +5 >Emitted(20, 39) Source(24, 46) + SourceIndex(0) +6 >Emitted(20, 40) Source(24, 47) + SourceIndex(0) +7 >Emitted(20, 49) Source(24, 56) + SourceIndex(0) +8 >Emitted(20, 50) Source(24, 57) + SourceIndex(0) --- >>> class someClass { 1 >^^^^^^^^ @@ -351,20 +389,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(20, 9) Source(24, 59) + SourceIndex(0) -2 >Emitted(20, 15) Source(24, 72) + SourceIndex(0) -3 >Emitted(20, 24) Source(24, 81) + SourceIndex(0) +1 >Emitted(21, 9) Source(24, 59) + SourceIndex(0) +2 >Emitted(21, 15) Source(24, 72) + SourceIndex(0) +3 >Emitted(21, 24) Source(24, 81) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(21, 10) Source(24, 84) + SourceIndex(0) +1 >Emitted(22, 10) Source(24, 84) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(22, 6) Source(24, 86) + SourceIndex(0) +1 >Emitted(23, 6) Source(24, 86) + SourceIndex(0) --- >>> /**@internal*/ export import someImport = someNamespace.C; 1->^^^^ @@ -390,17 +428,17 @@ sourceFile:../second/second_part1.ts 9 > . 10> C 11> ; -1->Emitted(23, 5) Source(25, 5) + SourceIndex(0) -2 >Emitted(23, 19) Source(25, 19) + SourceIndex(0) -3 >Emitted(23, 20) Source(25, 20) + SourceIndex(0) -4 >Emitted(23, 26) Source(25, 26) + SourceIndex(0) -5 >Emitted(23, 34) Source(25, 34) + SourceIndex(0) -6 >Emitted(23, 44) Source(25, 44) + SourceIndex(0) -7 >Emitted(23, 47) Source(25, 47) + SourceIndex(0) -8 >Emitted(23, 60) Source(25, 60) + SourceIndex(0) -9 >Emitted(23, 61) Source(25, 61) + SourceIndex(0) -10>Emitted(23, 62) Source(25, 62) + SourceIndex(0) -11>Emitted(23, 63) Source(25, 63) + SourceIndex(0) +1->Emitted(24, 5) Source(25, 5) + SourceIndex(0) +2 >Emitted(24, 19) Source(25, 19) + SourceIndex(0) +3 >Emitted(24, 20) Source(25, 20) + SourceIndex(0) +4 >Emitted(24, 26) Source(25, 26) + SourceIndex(0) +5 >Emitted(24, 34) Source(25, 34) + SourceIndex(0) +6 >Emitted(24, 44) Source(25, 44) + SourceIndex(0) +7 >Emitted(24, 47) Source(25, 47) + SourceIndex(0) +8 >Emitted(24, 60) Source(25, 60) + SourceIndex(0) +9 >Emitted(24, 61) Source(25, 61) + SourceIndex(0) +10>Emitted(24, 62) Source(25, 62) + SourceIndex(0) +11>Emitted(24, 63) Source(25, 63) + SourceIndex(0) --- >>> /**@internal*/ type internalType = internalC; 1 >^^^^ @@ -420,14 +458,14 @@ sourceFile:../second/second_part1.ts 6 > = 7 > internalC 8 > ; -1 >Emitted(24, 5) Source(26, 5) + SourceIndex(0) -2 >Emitted(24, 19) Source(26, 19) + SourceIndex(0) -3 >Emitted(24, 20) Source(26, 20) + SourceIndex(0) -4 >Emitted(24, 25) Source(26, 32) + SourceIndex(0) -5 >Emitted(24, 37) Source(26, 44) + SourceIndex(0) -6 >Emitted(24, 40) Source(26, 47) + SourceIndex(0) -7 >Emitted(24, 49) Source(26, 56) + SourceIndex(0) -8 >Emitted(24, 50) Source(26, 57) + SourceIndex(0) +1 >Emitted(25, 5) Source(26, 5) + SourceIndex(0) +2 >Emitted(25, 19) Source(26, 19) + SourceIndex(0) +3 >Emitted(25, 20) Source(26, 20) + SourceIndex(0) +4 >Emitted(25, 25) Source(26, 32) + SourceIndex(0) +5 >Emitted(25, 37) Source(26, 44) + SourceIndex(0) +6 >Emitted(25, 40) Source(26, 47) + SourceIndex(0) +7 >Emitted(25, 49) Source(26, 56) + SourceIndex(0) +8 >Emitted(25, 50) Source(26, 57) + SourceIndex(0) --- >>> /**@internal*/ const internalConst = 10; 1 >^^^^ @@ -445,13 +483,13 @@ sourceFile:../second/second_part1.ts 5 > internalConst 6 > = 10 7 > ; -1 >Emitted(25, 5) Source(27, 5) + SourceIndex(0) -2 >Emitted(25, 19) Source(27, 19) + SourceIndex(0) -3 >Emitted(25, 20) Source(27, 27) + SourceIndex(0) -4 >Emitted(25, 26) Source(27, 33) + SourceIndex(0) -5 >Emitted(25, 39) Source(27, 46) + SourceIndex(0) -6 >Emitted(25, 44) Source(27, 51) + SourceIndex(0) -7 >Emitted(25, 45) Source(27, 52) + SourceIndex(0) +1 >Emitted(26, 5) Source(27, 5) + SourceIndex(0) +2 >Emitted(26, 19) Source(27, 19) + SourceIndex(0) +3 >Emitted(26, 20) Source(27, 27) + SourceIndex(0) +4 >Emitted(26, 26) Source(27, 33) + SourceIndex(0) +5 >Emitted(26, 39) Source(27, 46) + SourceIndex(0) +6 >Emitted(26, 44) Source(27, 51) + SourceIndex(0) +7 >Emitted(26, 45) Source(27, 52) + SourceIndex(0) --- >>> /**@internal*/ enum internalEnum { 1 >^^^^ @@ -465,11 +503,11 @@ sourceFile:../second/second_part1.ts 3 > 4 > export enum 5 > internalEnum -1 >Emitted(26, 5) Source(28, 5) + SourceIndex(0) -2 >Emitted(26, 19) Source(28, 19) + SourceIndex(0) -3 >Emitted(26, 20) Source(28, 20) + SourceIndex(0) -4 >Emitted(26, 25) Source(28, 32) + SourceIndex(0) -5 >Emitted(26, 37) Source(28, 44) + SourceIndex(0) +1 >Emitted(27, 5) Source(28, 5) + SourceIndex(0) +2 >Emitted(27, 19) Source(28, 19) + SourceIndex(0) +3 >Emitted(27, 20) Source(28, 20) + SourceIndex(0) +4 >Emitted(27, 25) Source(28, 32) + SourceIndex(0) +5 >Emitted(27, 37) Source(28, 44) + SourceIndex(0) --- >>> a = 0, 1 >^^^^^^^^ @@ -479,9 +517,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(27, 9) Source(28, 47) + SourceIndex(0) -2 >Emitted(27, 10) Source(28, 48) + SourceIndex(0) -3 >Emitted(27, 14) Source(28, 48) + SourceIndex(0) +1 >Emitted(28, 9) Source(28, 47) + SourceIndex(0) +2 >Emitted(28, 10) Source(28, 48) + SourceIndex(0) +3 >Emitted(28, 14) Source(28, 48) + SourceIndex(0) --- >>> b = 1, 1->^^^^^^^^ @@ -491,9 +529,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(28, 9) Source(28, 50) + SourceIndex(0) -2 >Emitted(28, 10) Source(28, 51) + SourceIndex(0) -3 >Emitted(28, 14) Source(28, 51) + SourceIndex(0) +1->Emitted(29, 9) Source(28, 50) + SourceIndex(0) +2 >Emitted(29, 10) Source(28, 51) + SourceIndex(0) +3 >Emitted(29, 14) Source(28, 51) + SourceIndex(0) --- >>> c = 2 1->^^^^^^^^ @@ -502,21 +540,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(29, 9) Source(28, 53) + SourceIndex(0) -2 >Emitted(29, 10) Source(28, 54) + SourceIndex(0) -3 >Emitted(29, 14) Source(28, 54) + SourceIndex(0) +1->Emitted(30, 9) Source(28, 53) + SourceIndex(0) +2 >Emitted(30, 10) Source(28, 54) + SourceIndex(0) +3 >Emitted(30, 14) Source(28, 54) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(30, 6) Source(28, 56) + SourceIndex(0) +1 >Emitted(31, 6) Source(28, 56) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(31, 2) Source(29, 2) + SourceIndex(0) +1 >Emitted(32, 2) Source(29, 2) + SourceIndex(0) --- >>>/**@internal*/ declare class internalC { 1-> @@ -530,17 +568,17 @@ sourceFile:../second/second_part1.ts 3 > 4 > class 5 > internalC -1->Emitted(32, 1) Source(30, 1) + SourceIndex(0) -2 >Emitted(32, 15) Source(30, 15) + SourceIndex(0) -3 >Emitted(32, 16) Source(30, 16) + SourceIndex(0) -4 >Emitted(32, 30) Source(30, 22) + SourceIndex(0) -5 >Emitted(32, 39) Source(30, 31) + SourceIndex(0) +1->Emitted(33, 1) Source(30, 1) + SourceIndex(0) +2 >Emitted(33, 15) Source(30, 15) + SourceIndex(0) +3 >Emitted(33, 16) Source(30, 16) + SourceIndex(0) +4 >Emitted(33, 30) Source(30, 22) + SourceIndex(0) +5 >Emitted(33, 39) Source(30, 31) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(33, 2) Source(30, 34) + SourceIndex(0) +1 >Emitted(34, 2) Source(30, 34) + SourceIndex(0) --- >>>/**@internal*/ declare function internalfoo(): void; 1-> @@ -557,12 +595,12 @@ sourceFile:../second/second_part1.ts 4 > function 5 > internalfoo 6 > () {} -1->Emitted(34, 1) Source(31, 1) + SourceIndex(0) -2 >Emitted(34, 15) Source(31, 15) + SourceIndex(0) -3 >Emitted(34, 16) Source(31, 16) + SourceIndex(0) -4 >Emitted(34, 33) Source(31, 25) + SourceIndex(0) -5 >Emitted(34, 44) Source(31, 36) + SourceIndex(0) -6 >Emitted(34, 53) Source(31, 41) + SourceIndex(0) +1->Emitted(35, 1) Source(31, 1) + SourceIndex(0) +2 >Emitted(35, 15) Source(31, 15) + SourceIndex(0) +3 >Emitted(35, 16) Source(31, 16) + SourceIndex(0) +4 >Emitted(35, 33) Source(31, 25) + SourceIndex(0) +5 >Emitted(35, 44) Source(31, 36) + SourceIndex(0) +6 >Emitted(35, 53) Source(31, 41) + SourceIndex(0) --- >>>/**@internal*/ declare namespace internalNamespace { 1-> @@ -578,12 +616,12 @@ sourceFile:../second/second_part1.ts 4 > namespace 5 > internalNamespace 6 > -1->Emitted(35, 1) Source(32, 1) + SourceIndex(0) -2 >Emitted(35, 15) Source(32, 15) + SourceIndex(0) -3 >Emitted(35, 16) Source(32, 16) + SourceIndex(0) -4 >Emitted(35, 34) Source(32, 26) + SourceIndex(0) -5 >Emitted(35, 51) Source(32, 43) + SourceIndex(0) -6 >Emitted(35, 52) Source(32, 44) + SourceIndex(0) +1->Emitted(36, 1) Source(32, 1) + SourceIndex(0) +2 >Emitted(36, 15) Source(32, 15) + SourceIndex(0) +3 >Emitted(36, 16) Source(32, 16) + SourceIndex(0) +4 >Emitted(36, 34) Source(32, 26) + SourceIndex(0) +5 >Emitted(36, 51) Source(32, 43) + SourceIndex(0) +6 >Emitted(36, 52) Source(32, 44) + SourceIndex(0) --- >>> class someClass { 1 >^^^^ @@ -592,20 +630,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(36, 5) Source(32, 46) + SourceIndex(0) -2 >Emitted(36, 11) Source(32, 59) + SourceIndex(0) -3 >Emitted(36, 20) Source(32, 68) + SourceIndex(0) +1 >Emitted(37, 5) Source(32, 46) + SourceIndex(0) +2 >Emitted(37, 11) Source(32, 59) + SourceIndex(0) +3 >Emitted(37, 20) Source(32, 68) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(37, 6) Source(32, 71) + SourceIndex(0) +1 >Emitted(38, 6) Source(32, 71) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(38, 2) Source(32, 73) + SourceIndex(0) +1 >Emitted(39, 2) Source(32, 73) + SourceIndex(0) --- >>>/**@internal*/ declare namespace internalOther.something { 1-> @@ -625,14 +663,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > something 8 > -1->Emitted(39, 1) Source(33, 1) + SourceIndex(0) -2 >Emitted(39, 15) Source(33, 15) + SourceIndex(0) -3 >Emitted(39, 16) Source(33, 16) + SourceIndex(0) -4 >Emitted(39, 34) Source(33, 26) + SourceIndex(0) -5 >Emitted(39, 47) Source(33, 39) + SourceIndex(0) -6 >Emitted(39, 48) Source(33, 40) + SourceIndex(0) -7 >Emitted(39, 57) Source(33, 49) + SourceIndex(0) -8 >Emitted(39, 58) Source(33, 50) + SourceIndex(0) +1->Emitted(40, 1) Source(33, 1) + SourceIndex(0) +2 >Emitted(40, 15) Source(33, 15) + SourceIndex(0) +3 >Emitted(40, 16) Source(33, 16) + SourceIndex(0) +4 >Emitted(40, 34) Source(33, 26) + SourceIndex(0) +5 >Emitted(40, 47) Source(33, 39) + SourceIndex(0) +6 >Emitted(40, 48) Source(33, 40) + SourceIndex(0) +7 >Emitted(40, 57) Source(33, 49) + SourceIndex(0) +8 >Emitted(40, 58) Source(33, 50) + SourceIndex(0) --- >>> class someClass { 1 >^^^^ @@ -641,20 +679,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(40, 5) Source(33, 52) + SourceIndex(0) -2 >Emitted(40, 11) Source(33, 65) + SourceIndex(0) -3 >Emitted(40, 20) Source(33, 74) + SourceIndex(0) +1 >Emitted(41, 5) Source(33, 52) + SourceIndex(0) +2 >Emitted(41, 11) Source(33, 65) + SourceIndex(0) +3 >Emitted(41, 20) Source(33, 74) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(41, 6) Source(33, 77) + SourceIndex(0) +1 >Emitted(42, 6) Source(33, 77) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(42, 2) Source(33, 79) + SourceIndex(0) +1 >Emitted(43, 2) Source(33, 79) + SourceIndex(0) --- >>>/**@internal*/ import internalImport = internalNamespace.someClass; 1-> @@ -678,16 +716,16 @@ sourceFile:../second/second_part1.ts 8 > . 9 > someClass 10> ; -1->Emitted(43, 1) Source(34, 1) + SourceIndex(0) -2 >Emitted(43, 15) Source(34, 15) + SourceIndex(0) -3 >Emitted(43, 16) Source(34, 16) + SourceIndex(0) -4 >Emitted(43, 23) Source(34, 23) + SourceIndex(0) -5 >Emitted(43, 37) Source(34, 37) + SourceIndex(0) -6 >Emitted(43, 40) Source(34, 40) + SourceIndex(0) -7 >Emitted(43, 57) Source(34, 57) + SourceIndex(0) -8 >Emitted(43, 58) Source(34, 58) + SourceIndex(0) -9 >Emitted(43, 67) Source(34, 67) + SourceIndex(0) -10>Emitted(43, 68) Source(34, 68) + SourceIndex(0) +1->Emitted(44, 1) Source(34, 1) + SourceIndex(0) +2 >Emitted(44, 15) Source(34, 15) + SourceIndex(0) +3 >Emitted(44, 16) Source(34, 16) + SourceIndex(0) +4 >Emitted(44, 23) Source(34, 23) + SourceIndex(0) +5 >Emitted(44, 37) Source(34, 37) + SourceIndex(0) +6 >Emitted(44, 40) Source(34, 40) + SourceIndex(0) +7 >Emitted(44, 57) Source(34, 57) + SourceIndex(0) +8 >Emitted(44, 58) Source(34, 58) + SourceIndex(0) +9 >Emitted(44, 67) Source(34, 67) + SourceIndex(0) +10>Emitted(44, 68) Source(34, 68) + SourceIndex(0) --- >>>/**@internal*/ declare type internalType = internalC; 1 > @@ -707,14 +745,14 @@ sourceFile:../second/second_part1.ts 6 > = 7 > internalC 8 > ; -1 >Emitted(44, 1) Source(35, 1) + SourceIndex(0) -2 >Emitted(44, 15) Source(35, 15) + SourceIndex(0) -3 >Emitted(44, 16) Source(35, 16) + SourceIndex(0) -4 >Emitted(44, 29) Source(35, 21) + SourceIndex(0) -5 >Emitted(44, 41) Source(35, 33) + SourceIndex(0) -6 >Emitted(44, 44) Source(35, 36) + SourceIndex(0) -7 >Emitted(44, 53) Source(35, 45) + SourceIndex(0) -8 >Emitted(44, 54) Source(35, 46) + SourceIndex(0) +1 >Emitted(45, 1) Source(35, 1) + SourceIndex(0) +2 >Emitted(45, 15) Source(35, 15) + SourceIndex(0) +3 >Emitted(45, 16) Source(35, 16) + SourceIndex(0) +4 >Emitted(45, 29) Source(35, 21) + SourceIndex(0) +5 >Emitted(45, 41) Source(35, 33) + SourceIndex(0) +6 >Emitted(45, 44) Source(35, 36) + SourceIndex(0) +7 >Emitted(45, 53) Source(35, 45) + SourceIndex(0) +8 >Emitted(45, 54) Source(35, 46) + SourceIndex(0) --- >>>/**@internal*/ declare const internalConst = 10; 1 > @@ -734,14 +772,14 @@ sourceFile:../second/second_part1.ts 6 > internalConst 7 > = 10 8 > ; -1 >Emitted(45, 1) Source(36, 1) + SourceIndex(0) -2 >Emitted(45, 15) Source(36, 15) + SourceIndex(0) -3 >Emitted(45, 16) Source(36, 16) + SourceIndex(0) -4 >Emitted(45, 24) Source(36, 16) + SourceIndex(0) -5 >Emitted(45, 30) Source(36, 22) + SourceIndex(0) -6 >Emitted(45, 43) Source(36, 35) + SourceIndex(0) -7 >Emitted(45, 48) Source(36, 40) + SourceIndex(0) -8 >Emitted(45, 49) Source(36, 41) + SourceIndex(0) +1 >Emitted(46, 1) Source(36, 1) + SourceIndex(0) +2 >Emitted(46, 15) Source(36, 15) + SourceIndex(0) +3 >Emitted(46, 16) Source(36, 16) + SourceIndex(0) +4 >Emitted(46, 24) Source(36, 16) + SourceIndex(0) +5 >Emitted(46, 30) Source(36, 22) + SourceIndex(0) +6 >Emitted(46, 43) Source(36, 35) + SourceIndex(0) +7 >Emitted(46, 48) Source(36, 40) + SourceIndex(0) +8 >Emitted(46, 49) Source(36, 41) + SourceIndex(0) --- >>>/**@internal*/ declare enum internalEnum { 1 > @@ -755,11 +793,11 @@ sourceFile:../second/second_part1.ts 3 > 4 > enum 5 > internalEnum -1 >Emitted(46, 1) Source(37, 1) + SourceIndex(0) -2 >Emitted(46, 15) Source(37, 15) + SourceIndex(0) -3 >Emitted(46, 16) Source(37, 16) + SourceIndex(0) -4 >Emitted(46, 29) Source(37, 21) + SourceIndex(0) -5 >Emitted(46, 41) Source(37, 33) + SourceIndex(0) +1 >Emitted(47, 1) Source(37, 1) + SourceIndex(0) +2 >Emitted(47, 15) Source(37, 15) + SourceIndex(0) +3 >Emitted(47, 16) Source(37, 16) + SourceIndex(0) +4 >Emitted(47, 29) Source(37, 21) + SourceIndex(0) +5 >Emitted(47, 41) Source(37, 33) + SourceIndex(0) --- >>> a = 0, 1 >^^^^ @@ -769,9 +807,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(47, 5) Source(37, 36) + SourceIndex(0) -2 >Emitted(47, 6) Source(37, 37) + SourceIndex(0) -3 >Emitted(47, 10) Source(37, 37) + SourceIndex(0) +1 >Emitted(48, 5) Source(37, 36) + SourceIndex(0) +2 >Emitted(48, 6) Source(37, 37) + SourceIndex(0) +3 >Emitted(48, 10) Source(37, 37) + SourceIndex(0) --- >>> b = 1, 1->^^^^ @@ -781,9 +819,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(48, 5) Source(37, 39) + SourceIndex(0) -2 >Emitted(48, 6) Source(37, 40) + SourceIndex(0) -3 >Emitted(48, 10) Source(37, 40) + SourceIndex(0) +1->Emitted(49, 5) Source(37, 39) + SourceIndex(0) +2 >Emitted(49, 6) Source(37, 40) + SourceIndex(0) +3 >Emitted(49, 10) Source(37, 40) + SourceIndex(0) --- >>> c = 2 1->^^^^ @@ -792,15 +830,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(49, 5) Source(37, 42) + SourceIndex(0) -2 >Emitted(49, 6) Source(37, 43) + SourceIndex(0) -3 >Emitted(49, 10) Source(37, 43) + SourceIndex(0) +1->Emitted(50, 5) Source(37, 42) + SourceIndex(0) +2 >Emitted(50, 6) Source(37, 43) + SourceIndex(0) +3 >Emitted(50, 10) Source(37, 43) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(37, 45) + SourceIndex(0) +1 >Emitted(51, 2) Source(37, 45) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -814,9 +852,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(51, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(51, 15) Source(1, 7) + SourceIndex(1) -3 >Emitted(51, 16) Source(1, 8) + SourceIndex(1) +1->Emitted(52, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(52, 15) Source(1, 7) + SourceIndex(1) +3 >Emitted(52, 16) Source(1, 8) + SourceIndex(1) --- >>> doSomething(): void; 1->^^^^ @@ -824,8 +862,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(52, 5) Source(2, 5) + SourceIndex(1) -2 >Emitted(52, 16) Source(2, 16) + SourceIndex(1) +1->Emitted(53, 5) Source(2, 5) + SourceIndex(1) +2 >Emitted(53, 16) Source(2, 16) + SourceIndex(1) --- >>>} 1 >^ @@ -834,7 +872,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(53, 2) Source(5, 2) + SourceIndex(1) +1 >Emitted(54, 2) Source(5, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2518,32 +2556,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 77, - "end": 226, + "end": 257, "kind": "internal" }, { - "pos": 228, - "end": 260, + "pos": 259, + "end": 291, "kind": "text" }, { - "pos": 260, - "end": 772, + "pos": 291, + "end": 803, "kind": "internal" }, { - "pos": 774, - "end": 777, + "pos": 805, + "end": 808, "kind": "text" }, { - "pos": 777, - "end": 1310, + "pos": 808, + "end": 1341, "kind": "internal" }, { - "pos": 1312, - "end": 1360, + "pos": 1343, + "end": 1391, "kind": "text" } ] @@ -2672,18 +2710,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (77-226) +internal: (77-257) /**@internal*/ constructor(); /**@internal*/ prop: string; /**@internal*/ method(): void; - /**@internal*/ /**@internal*/ c: number; + /**@internal*/ get c(): number; + /**@internal*/ set c(val: number); ---------------------------------------------------------------------- -text: (228-260) +text: (259-291) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (260-772) +internal: (291-803) /**@internal*/ class C { } /**@internal*/ function foo(): void; @@ -2704,11 +2743,11 @@ internal: (260-772) c = 2 } ---------------------------------------------------------------------- -text: (774-777) +text: (805-808) } ---------------------------------------------------------------------- -internal: (777-1310) +internal: (808-1341) /**@internal*/ declare class internalC { } /**@internal*/ declare function internalfoo(): void; @@ -2729,7 +2768,7 @@ internal: (777-1310) c = 2 } ---------------------------------------------------------------------- -text: (1312-1360) +text: (1343-1391) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js index 8986286317040..04743ac6f97dd 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -15,7 +15,8 @@ declare class normalC { constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); } declare namespace normalN { class C { @@ -63,7 +64,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -283,35 +284,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(16, 5) Source(16, 19) + SourceIndex(2) 2 >Emitted(16, 11) Source(16, 25) + SourceIndex(2) --- ->>> c: number; +>>> get c(): number; 1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(17, 5) Source(17, 23) + SourceIndex(2) -2 >Emitted(17, 6) Source(17, 24) + SourceIndex(2) -3 >Emitted(17, 8) Source(18, 30) + SourceIndex(2) -4 >Emitted(17, 14) Source(18, 36) + SourceIndex(2) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(17, 5) Source(17, 19) + SourceIndex(2) +2 >Emitted(17, 9) Source(17, 23) + SourceIndex(2) +3 >Emitted(17, 10) Source(17, 24) + SourceIndex(2) +4 >Emitted(17, 14) Source(18, 30) + SourceIndex(2) +5 >Emitted(17, 20) Source(18, 36) + SourceIndex(2) +6 >Emitted(17, 21) Source(17, 41) + SourceIndex(2) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(18, 5) Source(18, 19) + SourceIndex(2) +2 >Emitted(18, 9) Source(18, 23) + SourceIndex(2) +3 >Emitted(18, 10) Source(18, 24) + SourceIndex(2) +4 >Emitted(18, 11) Source(18, 25) + SourceIndex(2) +5 >Emitted(18, 16) Source(18, 30) + SourceIndex(2) +6 >Emitted(18, 22) Source(18, 36) + SourceIndex(2) +7 >Emitted(18, 24) Source(18, 41) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(18, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(19, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -323,10 +355,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(19, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(19, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(19, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(19, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(20, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(20, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(20, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(20, 27) Source(20, 19) + SourceIndex(2) --- >>> class C { 1 >^^^^ @@ -336,15 +368,15 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(20, 5) Source(21, 19) + SourceIndex(2) -2 >Emitted(20, 11) Source(21, 32) + SourceIndex(2) -3 >Emitted(20, 12) Source(21, 33) + SourceIndex(2) +1 >Emitted(21, 5) Source(21, 19) + SourceIndex(2) +2 >Emitted(21, 11) Source(21, 32) + SourceIndex(2) +3 >Emitted(21, 12) Source(21, 33) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(21, 6) Source(21, 37) + SourceIndex(2) +1 >Emitted(22, 6) Source(21, 37) + SourceIndex(2) --- >>> function foo(): void; 1->^^^^ @@ -357,10 +389,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(22, 5) Source(22, 19) + SourceIndex(2) -2 >Emitted(22, 14) Source(22, 35) + SourceIndex(2) -3 >Emitted(22, 17) Source(22, 38) + SourceIndex(2) -4 >Emitted(22, 26) Source(22, 43) + SourceIndex(2) +1->Emitted(23, 5) Source(22, 19) + SourceIndex(2) +2 >Emitted(23, 14) Source(22, 35) + SourceIndex(2) +3 >Emitted(23, 17) Source(22, 38) + SourceIndex(2) +4 >Emitted(23, 26) Source(22, 43) + SourceIndex(2) --- >>> namespace someNamespace { 1->^^^^ @@ -372,10 +404,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(23, 5) Source(23, 19) + SourceIndex(2) -2 >Emitted(23, 15) Source(23, 36) + SourceIndex(2) -3 >Emitted(23, 28) Source(23, 49) + SourceIndex(2) -4 >Emitted(23, 29) Source(23, 50) + SourceIndex(2) +1->Emitted(24, 5) Source(23, 19) + SourceIndex(2) +2 >Emitted(24, 15) Source(23, 36) + SourceIndex(2) +3 >Emitted(24, 28) Source(23, 49) + SourceIndex(2) +4 >Emitted(24, 29) Source(23, 50) + SourceIndex(2) --- >>> class C { 1 >^^^^^^^^ @@ -384,20 +416,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(24, 9) Source(23, 52) + SourceIndex(2) -2 >Emitted(24, 15) Source(23, 65) + SourceIndex(2) -3 >Emitted(24, 16) Source(23, 66) + SourceIndex(2) +1 >Emitted(25, 9) Source(23, 52) + SourceIndex(2) +2 >Emitted(25, 15) Source(23, 65) + SourceIndex(2) +3 >Emitted(25, 16) Source(23, 66) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(25, 10) Source(23, 69) + SourceIndex(2) +1 >Emitted(26, 10) Source(23, 69) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(26, 6) Source(23, 71) + SourceIndex(2) +1 >Emitted(27, 6) Source(23, 71) + SourceIndex(2) --- >>> namespace someOther.something { 1->^^^^ @@ -413,12 +445,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(27, 5) Source(24, 19) + SourceIndex(2) -2 >Emitted(27, 15) Source(24, 36) + SourceIndex(2) -3 >Emitted(27, 24) Source(24, 45) + SourceIndex(2) -4 >Emitted(27, 25) Source(24, 46) + SourceIndex(2) -5 >Emitted(27, 34) Source(24, 55) + SourceIndex(2) -6 >Emitted(27, 35) Source(24, 56) + SourceIndex(2) +1->Emitted(28, 5) Source(24, 19) + SourceIndex(2) +2 >Emitted(28, 15) Source(24, 36) + SourceIndex(2) +3 >Emitted(28, 24) Source(24, 45) + SourceIndex(2) +4 >Emitted(28, 25) Source(24, 46) + SourceIndex(2) +5 >Emitted(28, 34) Source(24, 55) + SourceIndex(2) +6 >Emitted(28, 35) Source(24, 56) + SourceIndex(2) --- >>> class someClass { 1 >^^^^^^^^ @@ -427,20 +459,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(28, 9) Source(24, 58) + SourceIndex(2) -2 >Emitted(28, 15) Source(24, 71) + SourceIndex(2) -3 >Emitted(28, 24) Source(24, 80) + SourceIndex(2) +1 >Emitted(29, 9) Source(24, 58) + SourceIndex(2) +2 >Emitted(29, 15) Source(24, 71) + SourceIndex(2) +3 >Emitted(29, 24) Source(24, 80) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(29, 10) Source(24, 83) + SourceIndex(2) +1 >Emitted(30, 10) Source(24, 83) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(30, 6) Source(24, 85) + SourceIndex(2) +1 >Emitted(31, 6) Source(24, 85) + SourceIndex(2) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -462,15 +494,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(31, 5) Source(25, 19) + SourceIndex(2) -2 >Emitted(31, 11) Source(25, 25) + SourceIndex(2) -3 >Emitted(31, 19) Source(25, 33) + SourceIndex(2) -4 >Emitted(31, 29) Source(25, 43) + SourceIndex(2) -5 >Emitted(31, 32) Source(25, 46) + SourceIndex(2) -6 >Emitted(31, 45) Source(25, 59) + SourceIndex(2) -7 >Emitted(31, 46) Source(25, 60) + SourceIndex(2) -8 >Emitted(31, 47) Source(25, 61) + SourceIndex(2) -9 >Emitted(31, 48) Source(25, 62) + SourceIndex(2) +1->Emitted(32, 5) Source(25, 19) + SourceIndex(2) +2 >Emitted(32, 11) Source(25, 25) + SourceIndex(2) +3 >Emitted(32, 19) Source(25, 33) + SourceIndex(2) +4 >Emitted(32, 29) Source(25, 43) + SourceIndex(2) +5 >Emitted(32, 32) Source(25, 46) + SourceIndex(2) +6 >Emitted(32, 45) Source(25, 59) + SourceIndex(2) +7 >Emitted(32, 46) Source(25, 60) + SourceIndex(2) +8 >Emitted(32, 47) Source(25, 61) + SourceIndex(2) +9 >Emitted(32, 48) Source(25, 62) + SourceIndex(2) --- >>> type internalType = internalC; 1 >^^^^ @@ -486,12 +518,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(32, 5) Source(26, 19) + SourceIndex(2) -2 >Emitted(32, 10) Source(26, 31) + SourceIndex(2) -3 >Emitted(32, 22) Source(26, 43) + SourceIndex(2) -4 >Emitted(32, 25) Source(26, 46) + SourceIndex(2) -5 >Emitted(32, 34) Source(26, 55) + SourceIndex(2) -6 >Emitted(32, 35) Source(26, 56) + SourceIndex(2) +1 >Emitted(33, 5) Source(26, 19) + SourceIndex(2) +2 >Emitted(33, 10) Source(26, 31) + SourceIndex(2) +3 >Emitted(33, 22) Source(26, 43) + SourceIndex(2) +4 >Emitted(33, 25) Source(26, 46) + SourceIndex(2) +5 >Emitted(33, 34) Source(26, 55) + SourceIndex(2) +6 >Emitted(33, 35) Source(26, 56) + SourceIndex(2) --- >>> const internalConst = 10; 1 >^^^^ @@ -505,11 +537,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(33, 5) Source(27, 26) + SourceIndex(2) -2 >Emitted(33, 11) Source(27, 32) + SourceIndex(2) -3 >Emitted(33, 24) Source(27, 45) + SourceIndex(2) -4 >Emitted(33, 29) Source(27, 50) + SourceIndex(2) -5 >Emitted(33, 30) Source(27, 51) + SourceIndex(2) +1 >Emitted(34, 5) Source(27, 26) + SourceIndex(2) +2 >Emitted(34, 11) Source(27, 32) + SourceIndex(2) +3 >Emitted(34, 24) Source(27, 45) + SourceIndex(2) +4 >Emitted(34, 29) Source(27, 50) + SourceIndex(2) +5 >Emitted(34, 30) Source(27, 51) + SourceIndex(2) --- >>> enum internalEnum { 1 >^^^^ @@ -519,9 +551,9 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(34, 5) Source(28, 19) + SourceIndex(2) -2 >Emitted(34, 10) Source(28, 31) + SourceIndex(2) -3 >Emitted(34, 22) Source(28, 43) + SourceIndex(2) +1 >Emitted(35, 5) Source(28, 19) + SourceIndex(2) +2 >Emitted(35, 10) Source(28, 31) + SourceIndex(2) +3 >Emitted(35, 22) Source(28, 43) + SourceIndex(2) --- >>> a = 0, 1 >^^^^^^^^ @@ -531,9 +563,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(35, 9) Source(28, 46) + SourceIndex(2) -2 >Emitted(35, 10) Source(28, 47) + SourceIndex(2) -3 >Emitted(35, 14) Source(28, 47) + SourceIndex(2) +1 >Emitted(36, 9) Source(28, 46) + SourceIndex(2) +2 >Emitted(36, 10) Source(28, 47) + SourceIndex(2) +3 >Emitted(36, 14) Source(28, 47) + SourceIndex(2) --- >>> b = 1, 1->^^^^^^^^ @@ -543,9 +575,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(36, 9) Source(28, 49) + SourceIndex(2) -2 >Emitted(36, 10) Source(28, 50) + SourceIndex(2) -3 >Emitted(36, 14) Source(28, 50) + SourceIndex(2) +1->Emitted(37, 9) Source(28, 49) + SourceIndex(2) +2 >Emitted(37, 10) Source(28, 50) + SourceIndex(2) +3 >Emitted(37, 14) Source(28, 50) + SourceIndex(2) --- >>> c = 2 1->^^^^^^^^ @@ -554,21 +586,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(37, 9) Source(28, 52) + SourceIndex(2) -2 >Emitted(37, 10) Source(28, 53) + SourceIndex(2) -3 >Emitted(37, 14) Source(28, 53) + SourceIndex(2) +1->Emitted(38, 9) Source(28, 52) + SourceIndex(2) +2 >Emitted(38, 10) Source(28, 53) + SourceIndex(2) +3 >Emitted(38, 14) Source(28, 53) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(38, 6) Source(28, 55) + SourceIndex(2) +1 >Emitted(39, 6) Source(28, 55) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(39, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(40, 2) Source(29, 2) + SourceIndex(2) --- >>>declare class internalC { 1-> @@ -578,15 +610,15 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >class 3 > internalC -1->Emitted(40, 1) Source(30, 15) + SourceIndex(2) -2 >Emitted(40, 15) Source(30, 21) + SourceIndex(2) -3 >Emitted(40, 24) Source(30, 30) + SourceIndex(2) +1->Emitted(41, 1) Source(30, 15) + SourceIndex(2) +2 >Emitted(41, 15) Source(30, 21) + SourceIndex(2) +3 >Emitted(41, 24) Source(30, 30) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(41, 2) Source(30, 33) + SourceIndex(2) +1 >Emitted(42, 2) Source(30, 33) + SourceIndex(2) --- >>>declare function internalfoo(): void; 1-> @@ -599,10 +631,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(42, 1) Source(31, 15) + SourceIndex(2) -2 >Emitted(42, 18) Source(31, 24) + SourceIndex(2) -3 >Emitted(42, 29) Source(31, 35) + SourceIndex(2) -4 >Emitted(42, 38) Source(31, 40) + SourceIndex(2) +1->Emitted(43, 1) Source(31, 15) + SourceIndex(2) +2 >Emitted(43, 18) Source(31, 24) + SourceIndex(2) +3 >Emitted(43, 29) Source(31, 35) + SourceIndex(2) +4 >Emitted(43, 38) Source(31, 40) + SourceIndex(2) --- >>>declare namespace internalNamespace { 1-> @@ -614,10 +646,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(43, 1) Source(32, 15) + SourceIndex(2) -2 >Emitted(43, 19) Source(32, 25) + SourceIndex(2) -3 >Emitted(43, 36) Source(32, 42) + SourceIndex(2) -4 >Emitted(43, 37) Source(32, 43) + SourceIndex(2) +1->Emitted(44, 1) Source(32, 15) + SourceIndex(2) +2 >Emitted(44, 19) Source(32, 25) + SourceIndex(2) +3 >Emitted(44, 36) Source(32, 42) + SourceIndex(2) +4 >Emitted(44, 37) Source(32, 43) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -626,20 +658,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(44, 5) Source(32, 45) + SourceIndex(2) -2 >Emitted(44, 11) Source(32, 58) + SourceIndex(2) -3 >Emitted(44, 20) Source(32, 67) + SourceIndex(2) +1 >Emitted(45, 5) Source(32, 45) + SourceIndex(2) +2 >Emitted(45, 11) Source(32, 58) + SourceIndex(2) +3 >Emitted(45, 20) Source(32, 67) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(45, 6) Source(32, 70) + SourceIndex(2) +1 >Emitted(46, 6) Source(32, 70) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(46, 2) Source(32, 72) + SourceIndex(2) +1 >Emitted(47, 2) Source(32, 72) + SourceIndex(2) --- >>>declare namespace internalOther.something { 1-> @@ -655,12 +687,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(47, 1) Source(33, 15) + SourceIndex(2) -2 >Emitted(47, 19) Source(33, 25) + SourceIndex(2) -3 >Emitted(47, 32) Source(33, 38) + SourceIndex(2) -4 >Emitted(47, 33) Source(33, 39) + SourceIndex(2) -5 >Emitted(47, 42) Source(33, 48) + SourceIndex(2) -6 >Emitted(47, 43) Source(33, 49) + SourceIndex(2) +1->Emitted(48, 1) Source(33, 15) + SourceIndex(2) +2 >Emitted(48, 19) Source(33, 25) + SourceIndex(2) +3 >Emitted(48, 32) Source(33, 38) + SourceIndex(2) +4 >Emitted(48, 33) Source(33, 39) + SourceIndex(2) +5 >Emitted(48, 42) Source(33, 48) + SourceIndex(2) +6 >Emitted(48, 43) Source(33, 49) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -669,20 +701,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(48, 5) Source(33, 51) + SourceIndex(2) -2 >Emitted(48, 11) Source(33, 64) + SourceIndex(2) -3 >Emitted(48, 20) Source(33, 73) + SourceIndex(2) +1 >Emitted(49, 5) Source(33, 51) + SourceIndex(2) +2 >Emitted(49, 11) Source(33, 64) + SourceIndex(2) +3 >Emitted(49, 20) Source(33, 73) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(49, 6) Source(33, 76) + SourceIndex(2) +1 >Emitted(50, 6) Source(33, 76) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(33, 78) + SourceIndex(2) +1 >Emitted(51, 2) Source(33, 78) + SourceIndex(2) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -702,14 +734,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(51, 1) Source(34, 15) + SourceIndex(2) -2 >Emitted(51, 8) Source(34, 22) + SourceIndex(2) -3 >Emitted(51, 22) Source(34, 36) + SourceIndex(2) -4 >Emitted(51, 25) Source(34, 39) + SourceIndex(2) -5 >Emitted(51, 42) Source(34, 56) + SourceIndex(2) -6 >Emitted(51, 43) Source(34, 57) + SourceIndex(2) -7 >Emitted(51, 52) Source(34, 66) + SourceIndex(2) -8 >Emitted(51, 53) Source(34, 67) + SourceIndex(2) +1->Emitted(52, 1) Source(34, 15) + SourceIndex(2) +2 >Emitted(52, 8) Source(34, 22) + SourceIndex(2) +3 >Emitted(52, 22) Source(34, 36) + SourceIndex(2) +4 >Emitted(52, 25) Source(34, 39) + SourceIndex(2) +5 >Emitted(52, 42) Source(34, 56) + SourceIndex(2) +6 >Emitted(52, 43) Source(34, 57) + SourceIndex(2) +7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2) +8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2) --- >>>declare type internalType = internalC; 1 > @@ -725,12 +757,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(52, 1) Source(35, 15) + SourceIndex(2) -2 >Emitted(52, 14) Source(35, 20) + SourceIndex(2) -3 >Emitted(52, 26) Source(35, 32) + SourceIndex(2) -4 >Emitted(52, 29) Source(35, 35) + SourceIndex(2) -5 >Emitted(52, 38) Source(35, 44) + SourceIndex(2) -6 >Emitted(52, 39) Source(35, 45) + SourceIndex(2) +1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2) +2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2) +3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2) +4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2) +5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2) +6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2) --- >>>declare const internalConst = 10; 1 > @@ -746,12 +778,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(53, 1) Source(36, 15) + SourceIndex(2) -2 >Emitted(53, 9) Source(36, 15) + SourceIndex(2) -3 >Emitted(53, 15) Source(36, 21) + SourceIndex(2) -4 >Emitted(53, 28) Source(36, 34) + SourceIndex(2) -5 >Emitted(53, 33) Source(36, 39) + SourceIndex(2) -6 >Emitted(53, 34) Source(36, 40) + SourceIndex(2) +1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2) +2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2) +3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2) +4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2) +5 >Emitted(54, 33) Source(36, 39) + SourceIndex(2) +6 >Emitted(54, 34) Source(36, 40) + SourceIndex(2) --- >>>declare enum internalEnum { 1 > @@ -761,9 +793,9 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(54, 1) Source(37, 15) + SourceIndex(2) -2 >Emitted(54, 14) Source(37, 20) + SourceIndex(2) -3 >Emitted(54, 26) Source(37, 32) + SourceIndex(2) +1 >Emitted(55, 1) Source(37, 15) + SourceIndex(2) +2 >Emitted(55, 14) Source(37, 20) + SourceIndex(2) +3 >Emitted(55, 26) Source(37, 32) + SourceIndex(2) --- >>> a = 0, 1 >^^^^ @@ -773,9 +805,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(55, 5) Source(37, 35) + SourceIndex(2) -2 >Emitted(55, 6) Source(37, 36) + SourceIndex(2) -3 >Emitted(55, 10) Source(37, 36) + SourceIndex(2) +1 >Emitted(56, 5) Source(37, 35) + SourceIndex(2) +2 >Emitted(56, 6) Source(37, 36) + SourceIndex(2) +3 >Emitted(56, 10) Source(37, 36) + SourceIndex(2) --- >>> b = 1, 1->^^^^ @@ -785,9 +817,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(56, 5) Source(37, 38) + SourceIndex(2) -2 >Emitted(56, 6) Source(37, 39) + SourceIndex(2) -3 >Emitted(56, 10) Source(37, 39) + SourceIndex(2) +1->Emitted(57, 5) Source(37, 38) + SourceIndex(2) +2 >Emitted(57, 6) Source(37, 39) + SourceIndex(2) +3 >Emitted(57, 10) Source(37, 39) + SourceIndex(2) --- >>> c = 2 1->^^^^ @@ -796,15 +828,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(57, 5) Source(37, 41) + SourceIndex(2) -2 >Emitted(57, 6) Source(37, 42) + SourceIndex(2) -3 >Emitted(57, 10) Source(37, 42) + SourceIndex(2) +1->Emitted(58, 5) Source(37, 41) + SourceIndex(2) +2 >Emitted(58, 6) Source(37, 42) + SourceIndex(2) +3 >Emitted(58, 10) Source(37, 42) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(58, 2) Source(37, 44) + SourceIndex(2) +1 >Emitted(59, 2) Source(37, 44) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -818,9 +850,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(59, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(59, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(59, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(60, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(60, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(60, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -828,8 +860,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(60, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(60, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(61, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(61, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -838,7 +870,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(61, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(62, 2) Source(5, 2) + SourceIndex(3) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2594,32 +2626,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 308, + "end": 339, "kind": "internal" }, { - "pos": 310, - "end": 342, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 342, - "end": 734, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 736, - "end": 739, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 739, - "end": 1152, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1154, - "end": 1202, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -2774,18 +2806,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-308) +internal: (234-339) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (310-342) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (342-734) +internal: (373-765) class C { } function foo(): void; @@ -2806,11 +2839,11 @@ internal: (342-734) c = 2 } ---------------------------------------------------------------------- -text: (736-739) +text: (767-770) } ---------------------------------------------------------------------- -internal: (739-1152) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -2831,7 +2864,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1154-1202) +text: (1185-1233) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 5d2941abca299..c8f5cd986136c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -15,7 +15,8 @@ declare class normalC { constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); } declare namespace normalN { class C { @@ -63,7 +64,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;kBACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -283,35 +284,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(16, 5) Source(16, 19) + SourceIndex(2) 2 >Emitted(16, 11) Source(16, 25) + SourceIndex(2) --- ->>> /*@internal*/ c: number; -1->^^^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +>>> get c(): number; +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(17, 19) Source(17, 23) + SourceIndex(2) -2 >Emitted(17, 20) Source(17, 24) + SourceIndex(2) -3 >Emitted(17, 22) Source(18, 30) + SourceIndex(2) -4 >Emitted(17, 28) Source(18, 36) + SourceIndex(2) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(17, 5) Source(17, 19) + SourceIndex(2) +2 >Emitted(17, 9) Source(17, 23) + SourceIndex(2) +3 >Emitted(17, 10) Source(17, 24) + SourceIndex(2) +4 >Emitted(17, 14) Source(18, 30) + SourceIndex(2) +5 >Emitted(17, 20) Source(18, 36) + SourceIndex(2) +6 >Emitted(17, 21) Source(17, 41) + SourceIndex(2) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(18, 5) Source(18, 19) + SourceIndex(2) +2 >Emitted(18, 9) Source(18, 23) + SourceIndex(2) +3 >Emitted(18, 10) Source(18, 24) + SourceIndex(2) +4 >Emitted(18, 11) Source(18, 25) + SourceIndex(2) +5 >Emitted(18, 16) Source(18, 30) + SourceIndex(2) +6 >Emitted(18, 22) Source(18, 36) + SourceIndex(2) +7 >Emitted(18, 24) Source(18, 41) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(18, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(19, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -323,10 +355,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(19, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(19, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(19, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(19, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(20, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(20, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(20, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(20, 27) Source(20, 19) + SourceIndex(2) --- >>> class C { 1 >^^^^ @@ -336,15 +368,15 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(20, 5) Source(21, 19) + SourceIndex(2) -2 >Emitted(20, 11) Source(21, 32) + SourceIndex(2) -3 >Emitted(20, 12) Source(21, 33) + SourceIndex(2) +1 >Emitted(21, 5) Source(21, 19) + SourceIndex(2) +2 >Emitted(21, 11) Source(21, 32) + SourceIndex(2) +3 >Emitted(21, 12) Source(21, 33) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(21, 6) Source(21, 37) + SourceIndex(2) +1 >Emitted(22, 6) Source(21, 37) + SourceIndex(2) --- >>> function foo(): void; 1->^^^^ @@ -357,10 +389,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(22, 5) Source(22, 19) + SourceIndex(2) -2 >Emitted(22, 14) Source(22, 35) + SourceIndex(2) -3 >Emitted(22, 17) Source(22, 38) + SourceIndex(2) -4 >Emitted(22, 26) Source(22, 43) + SourceIndex(2) +1->Emitted(23, 5) Source(22, 19) + SourceIndex(2) +2 >Emitted(23, 14) Source(22, 35) + SourceIndex(2) +3 >Emitted(23, 17) Source(22, 38) + SourceIndex(2) +4 >Emitted(23, 26) Source(22, 43) + SourceIndex(2) --- >>> namespace someNamespace { 1->^^^^ @@ -372,10 +404,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(23, 5) Source(23, 19) + SourceIndex(2) -2 >Emitted(23, 15) Source(23, 36) + SourceIndex(2) -3 >Emitted(23, 28) Source(23, 49) + SourceIndex(2) -4 >Emitted(23, 29) Source(23, 50) + SourceIndex(2) +1->Emitted(24, 5) Source(23, 19) + SourceIndex(2) +2 >Emitted(24, 15) Source(23, 36) + SourceIndex(2) +3 >Emitted(24, 28) Source(23, 49) + SourceIndex(2) +4 >Emitted(24, 29) Source(23, 50) + SourceIndex(2) --- >>> class C { 1 >^^^^^^^^ @@ -384,20 +416,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(24, 9) Source(23, 52) + SourceIndex(2) -2 >Emitted(24, 15) Source(23, 65) + SourceIndex(2) -3 >Emitted(24, 16) Source(23, 66) + SourceIndex(2) +1 >Emitted(25, 9) Source(23, 52) + SourceIndex(2) +2 >Emitted(25, 15) Source(23, 65) + SourceIndex(2) +3 >Emitted(25, 16) Source(23, 66) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(25, 10) Source(23, 69) + SourceIndex(2) +1 >Emitted(26, 10) Source(23, 69) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(26, 6) Source(23, 71) + SourceIndex(2) +1 >Emitted(27, 6) Source(23, 71) + SourceIndex(2) --- >>> namespace someOther.something { 1->^^^^ @@ -413,12 +445,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(27, 5) Source(24, 19) + SourceIndex(2) -2 >Emitted(27, 15) Source(24, 36) + SourceIndex(2) -3 >Emitted(27, 24) Source(24, 45) + SourceIndex(2) -4 >Emitted(27, 25) Source(24, 46) + SourceIndex(2) -5 >Emitted(27, 34) Source(24, 55) + SourceIndex(2) -6 >Emitted(27, 35) Source(24, 56) + SourceIndex(2) +1->Emitted(28, 5) Source(24, 19) + SourceIndex(2) +2 >Emitted(28, 15) Source(24, 36) + SourceIndex(2) +3 >Emitted(28, 24) Source(24, 45) + SourceIndex(2) +4 >Emitted(28, 25) Source(24, 46) + SourceIndex(2) +5 >Emitted(28, 34) Source(24, 55) + SourceIndex(2) +6 >Emitted(28, 35) Source(24, 56) + SourceIndex(2) --- >>> class someClass { 1 >^^^^^^^^ @@ -427,20 +459,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(28, 9) Source(24, 58) + SourceIndex(2) -2 >Emitted(28, 15) Source(24, 71) + SourceIndex(2) -3 >Emitted(28, 24) Source(24, 80) + SourceIndex(2) +1 >Emitted(29, 9) Source(24, 58) + SourceIndex(2) +2 >Emitted(29, 15) Source(24, 71) + SourceIndex(2) +3 >Emitted(29, 24) Source(24, 80) + SourceIndex(2) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(29, 10) Source(24, 83) + SourceIndex(2) +1 >Emitted(30, 10) Source(24, 83) + SourceIndex(2) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(30, 6) Source(24, 85) + SourceIndex(2) +1 >Emitted(31, 6) Source(24, 85) + SourceIndex(2) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -462,15 +494,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(31, 5) Source(25, 19) + SourceIndex(2) -2 >Emitted(31, 11) Source(25, 25) + SourceIndex(2) -3 >Emitted(31, 19) Source(25, 33) + SourceIndex(2) -4 >Emitted(31, 29) Source(25, 43) + SourceIndex(2) -5 >Emitted(31, 32) Source(25, 46) + SourceIndex(2) -6 >Emitted(31, 45) Source(25, 59) + SourceIndex(2) -7 >Emitted(31, 46) Source(25, 60) + SourceIndex(2) -8 >Emitted(31, 47) Source(25, 61) + SourceIndex(2) -9 >Emitted(31, 48) Source(25, 62) + SourceIndex(2) +1->Emitted(32, 5) Source(25, 19) + SourceIndex(2) +2 >Emitted(32, 11) Source(25, 25) + SourceIndex(2) +3 >Emitted(32, 19) Source(25, 33) + SourceIndex(2) +4 >Emitted(32, 29) Source(25, 43) + SourceIndex(2) +5 >Emitted(32, 32) Source(25, 46) + SourceIndex(2) +6 >Emitted(32, 45) Source(25, 59) + SourceIndex(2) +7 >Emitted(32, 46) Source(25, 60) + SourceIndex(2) +8 >Emitted(32, 47) Source(25, 61) + SourceIndex(2) +9 >Emitted(32, 48) Source(25, 62) + SourceIndex(2) --- >>> type internalType = internalC; 1 >^^^^ @@ -486,12 +518,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(32, 5) Source(26, 19) + SourceIndex(2) -2 >Emitted(32, 10) Source(26, 31) + SourceIndex(2) -3 >Emitted(32, 22) Source(26, 43) + SourceIndex(2) -4 >Emitted(32, 25) Source(26, 46) + SourceIndex(2) -5 >Emitted(32, 34) Source(26, 55) + SourceIndex(2) -6 >Emitted(32, 35) Source(26, 56) + SourceIndex(2) +1 >Emitted(33, 5) Source(26, 19) + SourceIndex(2) +2 >Emitted(33, 10) Source(26, 31) + SourceIndex(2) +3 >Emitted(33, 22) Source(26, 43) + SourceIndex(2) +4 >Emitted(33, 25) Source(26, 46) + SourceIndex(2) +5 >Emitted(33, 34) Source(26, 55) + SourceIndex(2) +6 >Emitted(33, 35) Source(26, 56) + SourceIndex(2) --- >>> const internalConst = 10; 1 >^^^^ @@ -505,11 +537,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(33, 5) Source(27, 26) + SourceIndex(2) -2 >Emitted(33, 11) Source(27, 32) + SourceIndex(2) -3 >Emitted(33, 24) Source(27, 45) + SourceIndex(2) -4 >Emitted(33, 29) Source(27, 50) + SourceIndex(2) -5 >Emitted(33, 30) Source(27, 51) + SourceIndex(2) +1 >Emitted(34, 5) Source(27, 26) + SourceIndex(2) +2 >Emitted(34, 11) Source(27, 32) + SourceIndex(2) +3 >Emitted(34, 24) Source(27, 45) + SourceIndex(2) +4 >Emitted(34, 29) Source(27, 50) + SourceIndex(2) +5 >Emitted(34, 30) Source(27, 51) + SourceIndex(2) --- >>> enum internalEnum { 1 >^^^^ @@ -519,9 +551,9 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(34, 5) Source(28, 19) + SourceIndex(2) -2 >Emitted(34, 10) Source(28, 31) + SourceIndex(2) -3 >Emitted(34, 22) Source(28, 43) + SourceIndex(2) +1 >Emitted(35, 5) Source(28, 19) + SourceIndex(2) +2 >Emitted(35, 10) Source(28, 31) + SourceIndex(2) +3 >Emitted(35, 22) Source(28, 43) + SourceIndex(2) --- >>> a = 0, 1 >^^^^^^^^ @@ -531,9 +563,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(35, 9) Source(28, 46) + SourceIndex(2) -2 >Emitted(35, 10) Source(28, 47) + SourceIndex(2) -3 >Emitted(35, 14) Source(28, 47) + SourceIndex(2) +1 >Emitted(36, 9) Source(28, 46) + SourceIndex(2) +2 >Emitted(36, 10) Source(28, 47) + SourceIndex(2) +3 >Emitted(36, 14) Source(28, 47) + SourceIndex(2) --- >>> b = 1, 1->^^^^^^^^ @@ -543,9 +575,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(36, 9) Source(28, 49) + SourceIndex(2) -2 >Emitted(36, 10) Source(28, 50) + SourceIndex(2) -3 >Emitted(36, 14) Source(28, 50) + SourceIndex(2) +1->Emitted(37, 9) Source(28, 49) + SourceIndex(2) +2 >Emitted(37, 10) Source(28, 50) + SourceIndex(2) +3 >Emitted(37, 14) Source(28, 50) + SourceIndex(2) --- >>> c = 2 1->^^^^^^^^ @@ -554,21 +586,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(37, 9) Source(28, 52) + SourceIndex(2) -2 >Emitted(37, 10) Source(28, 53) + SourceIndex(2) -3 >Emitted(37, 14) Source(28, 53) + SourceIndex(2) +1->Emitted(38, 9) Source(28, 52) + SourceIndex(2) +2 >Emitted(38, 10) Source(28, 53) + SourceIndex(2) +3 >Emitted(38, 14) Source(28, 53) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(38, 6) Source(28, 55) + SourceIndex(2) +1 >Emitted(39, 6) Source(28, 55) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(39, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(40, 2) Source(29, 2) + SourceIndex(2) --- >>>declare class internalC { 1-> @@ -578,15 +610,15 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >class 3 > internalC -1->Emitted(40, 1) Source(30, 15) + SourceIndex(2) -2 >Emitted(40, 15) Source(30, 21) + SourceIndex(2) -3 >Emitted(40, 24) Source(30, 30) + SourceIndex(2) +1->Emitted(41, 1) Source(30, 15) + SourceIndex(2) +2 >Emitted(41, 15) Source(30, 21) + SourceIndex(2) +3 >Emitted(41, 24) Source(30, 30) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(41, 2) Source(30, 33) + SourceIndex(2) +1 >Emitted(42, 2) Source(30, 33) + SourceIndex(2) --- >>>declare function internalfoo(): void; 1-> @@ -599,10 +631,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(42, 1) Source(31, 15) + SourceIndex(2) -2 >Emitted(42, 18) Source(31, 24) + SourceIndex(2) -3 >Emitted(42, 29) Source(31, 35) + SourceIndex(2) -4 >Emitted(42, 38) Source(31, 40) + SourceIndex(2) +1->Emitted(43, 1) Source(31, 15) + SourceIndex(2) +2 >Emitted(43, 18) Source(31, 24) + SourceIndex(2) +3 >Emitted(43, 29) Source(31, 35) + SourceIndex(2) +4 >Emitted(43, 38) Source(31, 40) + SourceIndex(2) --- >>>declare namespace internalNamespace { 1-> @@ -614,10 +646,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(43, 1) Source(32, 15) + SourceIndex(2) -2 >Emitted(43, 19) Source(32, 25) + SourceIndex(2) -3 >Emitted(43, 36) Source(32, 42) + SourceIndex(2) -4 >Emitted(43, 37) Source(32, 43) + SourceIndex(2) +1->Emitted(44, 1) Source(32, 15) + SourceIndex(2) +2 >Emitted(44, 19) Source(32, 25) + SourceIndex(2) +3 >Emitted(44, 36) Source(32, 42) + SourceIndex(2) +4 >Emitted(44, 37) Source(32, 43) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -626,20 +658,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(44, 5) Source(32, 45) + SourceIndex(2) -2 >Emitted(44, 11) Source(32, 58) + SourceIndex(2) -3 >Emitted(44, 20) Source(32, 67) + SourceIndex(2) +1 >Emitted(45, 5) Source(32, 45) + SourceIndex(2) +2 >Emitted(45, 11) Source(32, 58) + SourceIndex(2) +3 >Emitted(45, 20) Source(32, 67) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(45, 6) Source(32, 70) + SourceIndex(2) +1 >Emitted(46, 6) Source(32, 70) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(46, 2) Source(32, 72) + SourceIndex(2) +1 >Emitted(47, 2) Source(32, 72) + SourceIndex(2) --- >>>declare namespace internalOther.something { 1-> @@ -655,12 +687,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(47, 1) Source(33, 15) + SourceIndex(2) -2 >Emitted(47, 19) Source(33, 25) + SourceIndex(2) -3 >Emitted(47, 32) Source(33, 38) + SourceIndex(2) -4 >Emitted(47, 33) Source(33, 39) + SourceIndex(2) -5 >Emitted(47, 42) Source(33, 48) + SourceIndex(2) -6 >Emitted(47, 43) Source(33, 49) + SourceIndex(2) +1->Emitted(48, 1) Source(33, 15) + SourceIndex(2) +2 >Emitted(48, 19) Source(33, 25) + SourceIndex(2) +3 >Emitted(48, 32) Source(33, 38) + SourceIndex(2) +4 >Emitted(48, 33) Source(33, 39) + SourceIndex(2) +5 >Emitted(48, 42) Source(33, 48) + SourceIndex(2) +6 >Emitted(48, 43) Source(33, 49) + SourceIndex(2) --- >>> class someClass { 1 >^^^^ @@ -669,20 +701,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(48, 5) Source(33, 51) + SourceIndex(2) -2 >Emitted(48, 11) Source(33, 64) + SourceIndex(2) -3 >Emitted(48, 20) Source(33, 73) + SourceIndex(2) +1 >Emitted(49, 5) Source(33, 51) + SourceIndex(2) +2 >Emitted(49, 11) Source(33, 64) + SourceIndex(2) +3 >Emitted(49, 20) Source(33, 73) + SourceIndex(2) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(49, 6) Source(33, 76) + SourceIndex(2) +1 >Emitted(50, 6) Source(33, 76) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(33, 78) + SourceIndex(2) +1 >Emitted(51, 2) Source(33, 78) + SourceIndex(2) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -702,14 +734,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(51, 1) Source(34, 15) + SourceIndex(2) -2 >Emitted(51, 8) Source(34, 22) + SourceIndex(2) -3 >Emitted(51, 22) Source(34, 36) + SourceIndex(2) -4 >Emitted(51, 25) Source(34, 39) + SourceIndex(2) -5 >Emitted(51, 42) Source(34, 56) + SourceIndex(2) -6 >Emitted(51, 43) Source(34, 57) + SourceIndex(2) -7 >Emitted(51, 52) Source(34, 66) + SourceIndex(2) -8 >Emitted(51, 53) Source(34, 67) + SourceIndex(2) +1->Emitted(52, 1) Source(34, 15) + SourceIndex(2) +2 >Emitted(52, 8) Source(34, 22) + SourceIndex(2) +3 >Emitted(52, 22) Source(34, 36) + SourceIndex(2) +4 >Emitted(52, 25) Source(34, 39) + SourceIndex(2) +5 >Emitted(52, 42) Source(34, 56) + SourceIndex(2) +6 >Emitted(52, 43) Source(34, 57) + SourceIndex(2) +7 >Emitted(52, 52) Source(34, 66) + SourceIndex(2) +8 >Emitted(52, 53) Source(34, 67) + SourceIndex(2) --- >>>declare type internalType = internalC; 1 > @@ -725,12 +757,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(52, 1) Source(35, 15) + SourceIndex(2) -2 >Emitted(52, 14) Source(35, 20) + SourceIndex(2) -3 >Emitted(52, 26) Source(35, 32) + SourceIndex(2) -4 >Emitted(52, 29) Source(35, 35) + SourceIndex(2) -5 >Emitted(52, 38) Source(35, 44) + SourceIndex(2) -6 >Emitted(52, 39) Source(35, 45) + SourceIndex(2) +1 >Emitted(53, 1) Source(35, 15) + SourceIndex(2) +2 >Emitted(53, 14) Source(35, 20) + SourceIndex(2) +3 >Emitted(53, 26) Source(35, 32) + SourceIndex(2) +4 >Emitted(53, 29) Source(35, 35) + SourceIndex(2) +5 >Emitted(53, 38) Source(35, 44) + SourceIndex(2) +6 >Emitted(53, 39) Source(35, 45) + SourceIndex(2) --- >>>declare const internalConst = 10; 1 > @@ -746,12 +778,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(53, 1) Source(36, 15) + SourceIndex(2) -2 >Emitted(53, 9) Source(36, 15) + SourceIndex(2) -3 >Emitted(53, 15) Source(36, 21) + SourceIndex(2) -4 >Emitted(53, 28) Source(36, 34) + SourceIndex(2) -5 >Emitted(53, 33) Source(36, 39) + SourceIndex(2) -6 >Emitted(53, 34) Source(36, 40) + SourceIndex(2) +1 >Emitted(54, 1) Source(36, 15) + SourceIndex(2) +2 >Emitted(54, 9) Source(36, 15) + SourceIndex(2) +3 >Emitted(54, 15) Source(36, 21) + SourceIndex(2) +4 >Emitted(54, 28) Source(36, 34) + SourceIndex(2) +5 >Emitted(54, 33) Source(36, 39) + SourceIndex(2) +6 >Emitted(54, 34) Source(36, 40) + SourceIndex(2) --- >>>declare enum internalEnum { 1 > @@ -761,9 +793,9 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(54, 1) Source(37, 15) + SourceIndex(2) -2 >Emitted(54, 14) Source(37, 20) + SourceIndex(2) -3 >Emitted(54, 26) Source(37, 32) + SourceIndex(2) +1 >Emitted(55, 1) Source(37, 15) + SourceIndex(2) +2 >Emitted(55, 14) Source(37, 20) + SourceIndex(2) +3 >Emitted(55, 26) Source(37, 32) + SourceIndex(2) --- >>> a = 0, 1 >^^^^ @@ -773,9 +805,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(55, 5) Source(37, 35) + SourceIndex(2) -2 >Emitted(55, 6) Source(37, 36) + SourceIndex(2) -3 >Emitted(55, 10) Source(37, 36) + SourceIndex(2) +1 >Emitted(56, 5) Source(37, 35) + SourceIndex(2) +2 >Emitted(56, 6) Source(37, 36) + SourceIndex(2) +3 >Emitted(56, 10) Source(37, 36) + SourceIndex(2) --- >>> b = 1, 1->^^^^ @@ -785,9 +817,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(56, 5) Source(37, 38) + SourceIndex(2) -2 >Emitted(56, 6) Source(37, 39) + SourceIndex(2) -3 >Emitted(56, 10) Source(37, 39) + SourceIndex(2) +1->Emitted(57, 5) Source(37, 38) + SourceIndex(2) +2 >Emitted(57, 6) Source(37, 39) + SourceIndex(2) +3 >Emitted(57, 10) Source(37, 39) + SourceIndex(2) --- >>> c = 2 1->^^^^ @@ -796,15 +828,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(57, 5) Source(37, 41) + SourceIndex(2) -2 >Emitted(57, 6) Source(37, 42) + SourceIndex(2) -3 >Emitted(57, 10) Source(37, 42) + SourceIndex(2) +1->Emitted(58, 5) Source(37, 41) + SourceIndex(2) +2 >Emitted(58, 6) Source(37, 42) + SourceIndex(2) +3 >Emitted(58, 10) Source(37, 42) + SourceIndex(2) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(58, 2) Source(37, 44) + SourceIndex(2) +1 >Emitted(59, 2) Source(37, 44) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -818,9 +850,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(59, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(59, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(59, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(60, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(60, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(60, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -828,8 +860,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(60, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(60, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(61, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(61, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -838,7 +870,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(61, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(62, 2) Source(5, 2) + SourceIndex(3) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2694,32 +2726,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 234, - "end": 322, + "end": 339, "kind": "internal" }, { - "pos": 324, - "end": 356, + "pos": 341, + "end": 373, "kind": "text" }, { - "pos": 356, - "end": 748, + "pos": 373, + "end": 765, "kind": "internal" }, { - "pos": 750, - "end": 753, + "pos": 767, + "end": 770, "kind": "text" }, { - "pos": 753, - "end": 1166, + "pos": 770, + "end": 1183, "kind": "internal" }, { - "pos": 1168, - "end": 1216, + "pos": 1185, + "end": 1233, "kind": "text" } ] @@ -2874,18 +2906,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (234-322) +internal: (234-339) constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (324-356) +text: (341-373) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (356-748) +internal: (373-765) class C { } function foo(): void; @@ -2906,11 +2939,11 @@ internal: (356-748) c = 2 } ---------------------------------------------------------------------- -text: (750-753) +text: (767-770) } ---------------------------------------------------------------------- -internal: (753-1166) +internal: (770-1183) declare class internalC { } declare function internalfoo(): void; @@ -2931,7 +2964,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1168-1216) +text: (1185-1233) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js index 2475d4e4eda78..a54c5109af8b6 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js @@ -7,7 +7,8 @@ declare class normalC { constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); } declare namespace normalN { class C { @@ -55,7 +56,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;kBACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -155,35 +156,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(8, 5) Source(16, 19) + SourceIndex(0) 2 >Emitted(8, 11) Source(16, 25) + SourceIndex(0) --- ->>> /*@internal*/ c: number; -1->^^^^^^^^^^^^^^^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +>>> get c(): number; +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(9, 19) Source(17, 23) + SourceIndex(0) -2 >Emitted(9, 20) Source(17, 24) + SourceIndex(0) -3 >Emitted(9, 22) Source(18, 30) + SourceIndex(0) -4 >Emitted(9, 28) Source(18, 36) + SourceIndex(0) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(9, 5) Source(17, 19) + SourceIndex(0) +2 >Emitted(9, 9) Source(17, 23) + SourceIndex(0) +3 >Emitted(9, 10) Source(17, 24) + SourceIndex(0) +4 >Emitted(9, 14) Source(18, 30) + SourceIndex(0) +5 >Emitted(9, 20) Source(18, 36) + SourceIndex(0) +6 >Emitted(9, 21) Source(17, 41) + SourceIndex(0) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(10, 5) Source(18, 19) + SourceIndex(0) +2 >Emitted(10, 9) Source(18, 23) + SourceIndex(0) +3 >Emitted(10, 10) Source(18, 24) + SourceIndex(0) +4 >Emitted(10, 11) Source(18, 25) + SourceIndex(0) +5 >Emitted(10, 16) Source(18, 30) + SourceIndex(0) +6 >Emitted(10, 22) Source(18, 36) + SourceIndex(0) +7 >Emitted(10, 24) Source(18, 41) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(10, 2) Source(19, 2) + SourceIndex(0) +1 >Emitted(11, 2) Source(19, 2) + SourceIndex(0) --- >>>declare namespace normalN { 1-> @@ -195,10 +227,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(11, 1) Source(20, 1) + SourceIndex(0) -2 >Emitted(11, 19) Source(20, 11) + SourceIndex(0) -3 >Emitted(11, 26) Source(20, 18) + SourceIndex(0) -4 >Emitted(11, 27) Source(20, 19) + SourceIndex(0) +1->Emitted(12, 1) Source(20, 1) + SourceIndex(0) +2 >Emitted(12, 19) Source(20, 11) + SourceIndex(0) +3 >Emitted(12, 26) Source(20, 18) + SourceIndex(0) +4 >Emitted(12, 27) Source(20, 19) + SourceIndex(0) --- >>> class C { 1 >^^^^ @@ -208,15 +240,15 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(12, 5) Source(21, 19) + SourceIndex(0) -2 >Emitted(12, 11) Source(21, 32) + SourceIndex(0) -3 >Emitted(12, 12) Source(21, 33) + SourceIndex(0) +1 >Emitted(13, 5) Source(21, 19) + SourceIndex(0) +2 >Emitted(13, 11) Source(21, 32) + SourceIndex(0) +3 >Emitted(13, 12) Source(21, 33) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(13, 6) Source(21, 37) + SourceIndex(0) +1 >Emitted(14, 6) Source(21, 37) + SourceIndex(0) --- >>> function foo(): void; 1->^^^^ @@ -229,10 +261,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(14, 5) Source(22, 19) + SourceIndex(0) -2 >Emitted(14, 14) Source(22, 35) + SourceIndex(0) -3 >Emitted(14, 17) Source(22, 38) + SourceIndex(0) -4 >Emitted(14, 26) Source(22, 43) + SourceIndex(0) +1->Emitted(15, 5) Source(22, 19) + SourceIndex(0) +2 >Emitted(15, 14) Source(22, 35) + SourceIndex(0) +3 >Emitted(15, 17) Source(22, 38) + SourceIndex(0) +4 >Emitted(15, 26) Source(22, 43) + SourceIndex(0) --- >>> namespace someNamespace { 1->^^^^ @@ -244,10 +276,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(15, 5) Source(23, 19) + SourceIndex(0) -2 >Emitted(15, 15) Source(23, 36) + SourceIndex(0) -3 >Emitted(15, 28) Source(23, 49) + SourceIndex(0) -4 >Emitted(15, 29) Source(23, 50) + SourceIndex(0) +1->Emitted(16, 5) Source(23, 19) + SourceIndex(0) +2 >Emitted(16, 15) Source(23, 36) + SourceIndex(0) +3 >Emitted(16, 28) Source(23, 49) + SourceIndex(0) +4 >Emitted(16, 29) Source(23, 50) + SourceIndex(0) --- >>> class C { 1 >^^^^^^^^ @@ -256,20 +288,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(16, 9) Source(23, 52) + SourceIndex(0) -2 >Emitted(16, 15) Source(23, 65) + SourceIndex(0) -3 >Emitted(16, 16) Source(23, 66) + SourceIndex(0) +1 >Emitted(17, 9) Source(23, 52) + SourceIndex(0) +2 >Emitted(17, 15) Source(23, 65) + SourceIndex(0) +3 >Emitted(17, 16) Source(23, 66) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(17, 10) Source(23, 69) + SourceIndex(0) +1 >Emitted(18, 10) Source(23, 69) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(18, 6) Source(23, 71) + SourceIndex(0) +1 >Emitted(19, 6) Source(23, 71) + SourceIndex(0) --- >>> namespace someOther.something { 1->^^^^ @@ -285,12 +317,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(19, 5) Source(24, 19) + SourceIndex(0) -2 >Emitted(19, 15) Source(24, 36) + SourceIndex(0) -3 >Emitted(19, 24) Source(24, 45) + SourceIndex(0) -4 >Emitted(19, 25) Source(24, 46) + SourceIndex(0) -5 >Emitted(19, 34) Source(24, 55) + SourceIndex(0) -6 >Emitted(19, 35) Source(24, 56) + SourceIndex(0) +1->Emitted(20, 5) Source(24, 19) + SourceIndex(0) +2 >Emitted(20, 15) Source(24, 36) + SourceIndex(0) +3 >Emitted(20, 24) Source(24, 45) + SourceIndex(0) +4 >Emitted(20, 25) Source(24, 46) + SourceIndex(0) +5 >Emitted(20, 34) Source(24, 55) + SourceIndex(0) +6 >Emitted(20, 35) Source(24, 56) + SourceIndex(0) --- >>> class someClass { 1 >^^^^^^^^ @@ -299,20 +331,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(20, 9) Source(24, 58) + SourceIndex(0) -2 >Emitted(20, 15) Source(24, 71) + SourceIndex(0) -3 >Emitted(20, 24) Source(24, 80) + SourceIndex(0) +1 >Emitted(21, 9) Source(24, 58) + SourceIndex(0) +2 >Emitted(21, 15) Source(24, 71) + SourceIndex(0) +3 >Emitted(21, 24) Source(24, 80) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(21, 10) Source(24, 83) + SourceIndex(0) +1 >Emitted(22, 10) Source(24, 83) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(22, 6) Source(24, 85) + SourceIndex(0) +1 >Emitted(23, 6) Source(24, 85) + SourceIndex(0) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -334,15 +366,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(23, 5) Source(25, 19) + SourceIndex(0) -2 >Emitted(23, 11) Source(25, 25) + SourceIndex(0) -3 >Emitted(23, 19) Source(25, 33) + SourceIndex(0) -4 >Emitted(23, 29) Source(25, 43) + SourceIndex(0) -5 >Emitted(23, 32) Source(25, 46) + SourceIndex(0) -6 >Emitted(23, 45) Source(25, 59) + SourceIndex(0) -7 >Emitted(23, 46) Source(25, 60) + SourceIndex(0) -8 >Emitted(23, 47) Source(25, 61) + SourceIndex(0) -9 >Emitted(23, 48) Source(25, 62) + SourceIndex(0) +1->Emitted(24, 5) Source(25, 19) + SourceIndex(0) +2 >Emitted(24, 11) Source(25, 25) + SourceIndex(0) +3 >Emitted(24, 19) Source(25, 33) + SourceIndex(0) +4 >Emitted(24, 29) Source(25, 43) + SourceIndex(0) +5 >Emitted(24, 32) Source(25, 46) + SourceIndex(0) +6 >Emitted(24, 45) Source(25, 59) + SourceIndex(0) +7 >Emitted(24, 46) Source(25, 60) + SourceIndex(0) +8 >Emitted(24, 47) Source(25, 61) + SourceIndex(0) +9 >Emitted(24, 48) Source(25, 62) + SourceIndex(0) --- >>> type internalType = internalC; 1 >^^^^ @@ -358,12 +390,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(24, 5) Source(26, 19) + SourceIndex(0) -2 >Emitted(24, 10) Source(26, 31) + SourceIndex(0) -3 >Emitted(24, 22) Source(26, 43) + SourceIndex(0) -4 >Emitted(24, 25) Source(26, 46) + SourceIndex(0) -5 >Emitted(24, 34) Source(26, 55) + SourceIndex(0) -6 >Emitted(24, 35) Source(26, 56) + SourceIndex(0) +1 >Emitted(25, 5) Source(26, 19) + SourceIndex(0) +2 >Emitted(25, 10) Source(26, 31) + SourceIndex(0) +3 >Emitted(25, 22) Source(26, 43) + SourceIndex(0) +4 >Emitted(25, 25) Source(26, 46) + SourceIndex(0) +5 >Emitted(25, 34) Source(26, 55) + SourceIndex(0) +6 >Emitted(25, 35) Source(26, 56) + SourceIndex(0) --- >>> const internalConst = 10; 1 >^^^^ @@ -377,11 +409,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(25, 5) Source(27, 26) + SourceIndex(0) -2 >Emitted(25, 11) Source(27, 32) + SourceIndex(0) -3 >Emitted(25, 24) Source(27, 45) + SourceIndex(0) -4 >Emitted(25, 29) Source(27, 50) + SourceIndex(0) -5 >Emitted(25, 30) Source(27, 51) + SourceIndex(0) +1 >Emitted(26, 5) Source(27, 26) + SourceIndex(0) +2 >Emitted(26, 11) Source(27, 32) + SourceIndex(0) +3 >Emitted(26, 24) Source(27, 45) + SourceIndex(0) +4 >Emitted(26, 29) Source(27, 50) + SourceIndex(0) +5 >Emitted(26, 30) Source(27, 51) + SourceIndex(0) --- >>> enum internalEnum { 1 >^^^^ @@ -391,9 +423,9 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(26, 5) Source(28, 19) + SourceIndex(0) -2 >Emitted(26, 10) Source(28, 31) + SourceIndex(0) -3 >Emitted(26, 22) Source(28, 43) + SourceIndex(0) +1 >Emitted(27, 5) Source(28, 19) + SourceIndex(0) +2 >Emitted(27, 10) Source(28, 31) + SourceIndex(0) +3 >Emitted(27, 22) Source(28, 43) + SourceIndex(0) --- >>> a = 0, 1 >^^^^^^^^ @@ -403,9 +435,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(27, 9) Source(28, 46) + SourceIndex(0) -2 >Emitted(27, 10) Source(28, 47) + SourceIndex(0) -3 >Emitted(27, 14) Source(28, 47) + SourceIndex(0) +1 >Emitted(28, 9) Source(28, 46) + SourceIndex(0) +2 >Emitted(28, 10) Source(28, 47) + SourceIndex(0) +3 >Emitted(28, 14) Source(28, 47) + SourceIndex(0) --- >>> b = 1, 1->^^^^^^^^ @@ -415,9 +447,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(28, 9) Source(28, 49) + SourceIndex(0) -2 >Emitted(28, 10) Source(28, 50) + SourceIndex(0) -3 >Emitted(28, 14) Source(28, 50) + SourceIndex(0) +1->Emitted(29, 9) Source(28, 49) + SourceIndex(0) +2 >Emitted(29, 10) Source(28, 50) + SourceIndex(0) +3 >Emitted(29, 14) Source(28, 50) + SourceIndex(0) --- >>> c = 2 1->^^^^^^^^ @@ -426,21 +458,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(29, 9) Source(28, 52) + SourceIndex(0) -2 >Emitted(29, 10) Source(28, 53) + SourceIndex(0) -3 >Emitted(29, 14) Source(28, 53) + SourceIndex(0) +1->Emitted(30, 9) Source(28, 52) + SourceIndex(0) +2 >Emitted(30, 10) Source(28, 53) + SourceIndex(0) +3 >Emitted(30, 14) Source(28, 53) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(30, 6) Source(28, 55) + SourceIndex(0) +1 >Emitted(31, 6) Source(28, 55) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(31, 2) Source(29, 2) + SourceIndex(0) +1 >Emitted(32, 2) Source(29, 2) + SourceIndex(0) --- >>>declare class internalC { 1-> @@ -450,15 +482,15 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >class 3 > internalC -1->Emitted(32, 1) Source(30, 15) + SourceIndex(0) -2 >Emitted(32, 15) Source(30, 21) + SourceIndex(0) -3 >Emitted(32, 24) Source(30, 30) + SourceIndex(0) +1->Emitted(33, 1) Source(30, 15) + SourceIndex(0) +2 >Emitted(33, 15) Source(30, 21) + SourceIndex(0) +3 >Emitted(33, 24) Source(30, 30) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(33, 2) Source(30, 33) + SourceIndex(0) +1 >Emitted(34, 2) Source(30, 33) + SourceIndex(0) --- >>>declare function internalfoo(): void; 1-> @@ -471,10 +503,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(34, 1) Source(31, 15) + SourceIndex(0) -2 >Emitted(34, 18) Source(31, 24) + SourceIndex(0) -3 >Emitted(34, 29) Source(31, 35) + SourceIndex(0) -4 >Emitted(34, 38) Source(31, 40) + SourceIndex(0) +1->Emitted(35, 1) Source(31, 15) + SourceIndex(0) +2 >Emitted(35, 18) Source(31, 24) + SourceIndex(0) +3 >Emitted(35, 29) Source(31, 35) + SourceIndex(0) +4 >Emitted(35, 38) Source(31, 40) + SourceIndex(0) --- >>>declare namespace internalNamespace { 1-> @@ -486,10 +518,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(35, 1) Source(32, 15) + SourceIndex(0) -2 >Emitted(35, 19) Source(32, 25) + SourceIndex(0) -3 >Emitted(35, 36) Source(32, 42) + SourceIndex(0) -4 >Emitted(35, 37) Source(32, 43) + SourceIndex(0) +1->Emitted(36, 1) Source(32, 15) + SourceIndex(0) +2 >Emitted(36, 19) Source(32, 25) + SourceIndex(0) +3 >Emitted(36, 36) Source(32, 42) + SourceIndex(0) +4 >Emitted(36, 37) Source(32, 43) + SourceIndex(0) --- >>> class someClass { 1 >^^^^ @@ -498,20 +530,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(36, 5) Source(32, 45) + SourceIndex(0) -2 >Emitted(36, 11) Source(32, 58) + SourceIndex(0) -3 >Emitted(36, 20) Source(32, 67) + SourceIndex(0) +1 >Emitted(37, 5) Source(32, 45) + SourceIndex(0) +2 >Emitted(37, 11) Source(32, 58) + SourceIndex(0) +3 >Emitted(37, 20) Source(32, 67) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(37, 6) Source(32, 70) + SourceIndex(0) +1 >Emitted(38, 6) Source(32, 70) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(38, 2) Source(32, 72) + SourceIndex(0) +1 >Emitted(39, 2) Source(32, 72) + SourceIndex(0) --- >>>declare namespace internalOther.something { 1-> @@ -527,12 +559,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(39, 1) Source(33, 15) + SourceIndex(0) -2 >Emitted(39, 19) Source(33, 25) + SourceIndex(0) -3 >Emitted(39, 32) Source(33, 38) + SourceIndex(0) -4 >Emitted(39, 33) Source(33, 39) + SourceIndex(0) -5 >Emitted(39, 42) Source(33, 48) + SourceIndex(0) -6 >Emitted(39, 43) Source(33, 49) + SourceIndex(0) +1->Emitted(40, 1) Source(33, 15) + SourceIndex(0) +2 >Emitted(40, 19) Source(33, 25) + SourceIndex(0) +3 >Emitted(40, 32) Source(33, 38) + SourceIndex(0) +4 >Emitted(40, 33) Source(33, 39) + SourceIndex(0) +5 >Emitted(40, 42) Source(33, 48) + SourceIndex(0) +6 >Emitted(40, 43) Source(33, 49) + SourceIndex(0) --- >>> class someClass { 1 >^^^^ @@ -541,20 +573,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(40, 5) Source(33, 51) + SourceIndex(0) -2 >Emitted(40, 11) Source(33, 64) + SourceIndex(0) -3 >Emitted(40, 20) Source(33, 73) + SourceIndex(0) +1 >Emitted(41, 5) Source(33, 51) + SourceIndex(0) +2 >Emitted(41, 11) Source(33, 64) + SourceIndex(0) +3 >Emitted(41, 20) Source(33, 73) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(41, 6) Source(33, 76) + SourceIndex(0) +1 >Emitted(42, 6) Source(33, 76) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(42, 2) Source(33, 78) + SourceIndex(0) +1 >Emitted(43, 2) Source(33, 78) + SourceIndex(0) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -574,14 +606,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(43, 1) Source(34, 15) + SourceIndex(0) -2 >Emitted(43, 8) Source(34, 22) + SourceIndex(0) -3 >Emitted(43, 22) Source(34, 36) + SourceIndex(0) -4 >Emitted(43, 25) Source(34, 39) + SourceIndex(0) -5 >Emitted(43, 42) Source(34, 56) + SourceIndex(0) -6 >Emitted(43, 43) Source(34, 57) + SourceIndex(0) -7 >Emitted(43, 52) Source(34, 66) + SourceIndex(0) -8 >Emitted(43, 53) Source(34, 67) + SourceIndex(0) +1->Emitted(44, 1) Source(34, 15) + SourceIndex(0) +2 >Emitted(44, 8) Source(34, 22) + SourceIndex(0) +3 >Emitted(44, 22) Source(34, 36) + SourceIndex(0) +4 >Emitted(44, 25) Source(34, 39) + SourceIndex(0) +5 >Emitted(44, 42) Source(34, 56) + SourceIndex(0) +6 >Emitted(44, 43) Source(34, 57) + SourceIndex(0) +7 >Emitted(44, 52) Source(34, 66) + SourceIndex(0) +8 >Emitted(44, 53) Source(34, 67) + SourceIndex(0) --- >>>declare type internalType = internalC; 1 > @@ -597,12 +629,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(44, 1) Source(35, 15) + SourceIndex(0) -2 >Emitted(44, 14) Source(35, 20) + SourceIndex(0) -3 >Emitted(44, 26) Source(35, 32) + SourceIndex(0) -4 >Emitted(44, 29) Source(35, 35) + SourceIndex(0) -5 >Emitted(44, 38) Source(35, 44) + SourceIndex(0) -6 >Emitted(44, 39) Source(35, 45) + SourceIndex(0) +1 >Emitted(45, 1) Source(35, 15) + SourceIndex(0) +2 >Emitted(45, 14) Source(35, 20) + SourceIndex(0) +3 >Emitted(45, 26) Source(35, 32) + SourceIndex(0) +4 >Emitted(45, 29) Source(35, 35) + SourceIndex(0) +5 >Emitted(45, 38) Source(35, 44) + SourceIndex(0) +6 >Emitted(45, 39) Source(35, 45) + SourceIndex(0) --- >>>declare const internalConst = 10; 1 > @@ -618,12 +650,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(45, 1) Source(36, 15) + SourceIndex(0) -2 >Emitted(45, 9) Source(36, 15) + SourceIndex(0) -3 >Emitted(45, 15) Source(36, 21) + SourceIndex(0) -4 >Emitted(45, 28) Source(36, 34) + SourceIndex(0) -5 >Emitted(45, 33) Source(36, 39) + SourceIndex(0) -6 >Emitted(45, 34) Source(36, 40) + SourceIndex(0) +1 >Emitted(46, 1) Source(36, 15) + SourceIndex(0) +2 >Emitted(46, 9) Source(36, 15) + SourceIndex(0) +3 >Emitted(46, 15) Source(36, 21) + SourceIndex(0) +4 >Emitted(46, 28) Source(36, 34) + SourceIndex(0) +5 >Emitted(46, 33) Source(36, 39) + SourceIndex(0) +6 >Emitted(46, 34) Source(36, 40) + SourceIndex(0) --- >>>declare enum internalEnum { 1 > @@ -633,9 +665,9 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(46, 1) Source(37, 15) + SourceIndex(0) -2 >Emitted(46, 14) Source(37, 20) + SourceIndex(0) -3 >Emitted(46, 26) Source(37, 32) + SourceIndex(0) +1 >Emitted(47, 1) Source(37, 15) + SourceIndex(0) +2 >Emitted(47, 14) Source(37, 20) + SourceIndex(0) +3 >Emitted(47, 26) Source(37, 32) + SourceIndex(0) --- >>> a = 0, 1 >^^^^ @@ -645,9 +677,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(47, 5) Source(37, 35) + SourceIndex(0) -2 >Emitted(47, 6) Source(37, 36) + SourceIndex(0) -3 >Emitted(47, 10) Source(37, 36) + SourceIndex(0) +1 >Emitted(48, 5) Source(37, 35) + SourceIndex(0) +2 >Emitted(48, 6) Source(37, 36) + SourceIndex(0) +3 >Emitted(48, 10) Source(37, 36) + SourceIndex(0) --- >>> b = 1, 1->^^^^ @@ -657,9 +689,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(48, 5) Source(37, 38) + SourceIndex(0) -2 >Emitted(48, 6) Source(37, 39) + SourceIndex(0) -3 >Emitted(48, 10) Source(37, 39) + SourceIndex(0) +1->Emitted(49, 5) Source(37, 38) + SourceIndex(0) +2 >Emitted(49, 6) Source(37, 39) + SourceIndex(0) +3 >Emitted(49, 10) Source(37, 39) + SourceIndex(0) --- >>> c = 2 1->^^^^ @@ -668,15 +700,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(49, 5) Source(37, 41) + SourceIndex(0) -2 >Emitted(49, 6) Source(37, 42) + SourceIndex(0) -3 >Emitted(49, 10) Source(37, 42) + SourceIndex(0) +1->Emitted(50, 5) Source(37, 41) + SourceIndex(0) +2 >Emitted(50, 6) Source(37, 42) + SourceIndex(0) +3 >Emitted(50, 10) Source(37, 42) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(37, 44) + SourceIndex(0) +1 >Emitted(51, 2) Source(37, 44) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -690,9 +722,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(51, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(51, 15) Source(1, 7) + SourceIndex(1) -3 >Emitted(51, 16) Source(1, 8) + SourceIndex(1) +1->Emitted(52, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(52, 15) Source(1, 7) + SourceIndex(1) +3 >Emitted(52, 16) Source(1, 8) + SourceIndex(1) --- >>> doSomething(): void; 1->^^^^ @@ -700,8 +732,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(52, 5) Source(2, 5) + SourceIndex(1) -2 >Emitted(52, 16) Source(2, 16) + SourceIndex(1) +1->Emitted(53, 5) Source(2, 5) + SourceIndex(1) +2 >Emitted(53, 16) Source(2, 16) + SourceIndex(1) --- >>>} 1 >^ @@ -710,7 +742,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(53, 2) Source(5, 2) + SourceIndex(1) +1 >Emitted(54, 2) Source(5, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2394,32 +2426,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 77, - "end": 165, + "end": 182, "kind": "internal" }, { - "pos": 167, - "end": 199, + "pos": 184, + "end": 216, "kind": "text" }, { - "pos": 199, - "end": 591, + "pos": 216, + "end": 608, "kind": "internal" }, { - "pos": 593, - "end": 596, + "pos": 610, + "end": 613, "kind": "text" }, { - "pos": 596, - "end": 1009, + "pos": 613, + "end": 1026, "kind": "internal" }, { - "pos": 1011, - "end": 1059, + "pos": 1028, + "end": 1076, "kind": "text" } ] @@ -2548,18 +2580,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (77-165) +internal: (77-182) constructor(); prop: string; method(): void; - /*@internal*/ c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (167-199) +text: (184-216) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (199-591) +internal: (216-608) class C { } function foo(): void; @@ -2580,11 +2613,11 @@ internal: (199-591) c = 2 } ---------------------------------------------------------------------- -text: (593-596) +text: (610-613) } ---------------------------------------------------------------------- -internal: (596-1009) +internal: (613-1026) declare class internalC { } declare function internalfoo(): void; @@ -2605,7 +2638,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (1011-1059) +text: (1028-1076) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js index 7ac42063f7d1a..6dfe54632feff 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js @@ -7,7 +7,8 @@ declare class normalC { constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); } declare namespace normalN { class C { @@ -55,7 +56,7 @@ declare class C { //# sourceMappingURL=second-output.d.ts.map //// [/src/2/second-output.d.ts.map] -{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} +{"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACN,IAAI,CAAC,IACM,MAAM,CADK;IACtB,IAAI,CAAC,CAAC,KAAK,MAAM,EAAK;CACvC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.d.ts.map.baseline.txt] =================================================================== @@ -155,35 +156,66 @@ sourceFile:../second/second_part1.ts >>> method(): void; 1->^^^^ 2 > ^^^^^^ -3 > ^^^^^-> +3 > ^^^^^^^^^^^-> 1-> > /*@internal*/ 2 > method 1->Emitted(8, 5) Source(16, 19) + SourceIndex(0) 2 >Emitted(8, 11) Source(16, 25) + SourceIndex(0) --- ->>> c: number; +>>> get c(): number; 1->^^^^ -2 > ^ -3 > ^^ -4 > ^^^^^^ +2 > ^^^^ +3 > ^ +4 > ^^^^ +5 > ^^^^^^ +6 > ^ +7 > ^^^^-> 1->() { } - > /*@internal*/ get -2 > c -3 > () { return 10; } - > /*@internal*/ set c(val: -4 > number -1->Emitted(9, 5) Source(17, 23) + SourceIndex(0) -2 >Emitted(9, 6) Source(17, 24) + SourceIndex(0) -3 >Emitted(9, 8) Source(18, 30) + SourceIndex(0) -4 >Emitted(9, 14) Source(18, 36) + SourceIndex(0) + > /*@internal*/ +2 > get +3 > c +4 > () { return 10; } + > /*@internal*/ set c(val: +5 > number +6 > +1->Emitted(9, 5) Source(17, 19) + SourceIndex(0) +2 >Emitted(9, 9) Source(17, 23) + SourceIndex(0) +3 >Emitted(9, 10) Source(17, 24) + SourceIndex(0) +4 >Emitted(9, 14) Source(18, 30) + SourceIndex(0) +5 >Emitted(9, 20) Source(18, 36) + SourceIndex(0) +6 >Emitted(9, 21) Source(17, 41) + SourceIndex(0) +--- +>>> set c(val: number); +1->^^^^ +2 > ^^^^ +3 > ^ +4 > ^ +5 > ^^^^^ +6 > ^^^^^^ +7 > ^^ +1-> + > /*@internal*/ +2 > set +3 > c +4 > ( +5 > val: +6 > number +7 > ) { } +1->Emitted(10, 5) Source(18, 19) + SourceIndex(0) +2 >Emitted(10, 9) Source(18, 23) + SourceIndex(0) +3 >Emitted(10, 10) Source(18, 24) + SourceIndex(0) +4 >Emitted(10, 11) Source(18, 25) + SourceIndex(0) +5 >Emitted(10, 16) Source(18, 30) + SourceIndex(0) +6 >Emitted(10, 22) Source(18, 36) + SourceIndex(0) +7 >Emitted(10, 24) Source(18, 41) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >) { } +1 > >} -1 >Emitted(10, 2) Source(19, 2) + SourceIndex(0) +1 >Emitted(11, 2) Source(19, 2) + SourceIndex(0) --- >>>declare namespace normalN { 1-> @@ -195,10 +227,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(11, 1) Source(20, 1) + SourceIndex(0) -2 >Emitted(11, 19) Source(20, 11) + SourceIndex(0) -3 >Emitted(11, 26) Source(20, 18) + SourceIndex(0) -4 >Emitted(11, 27) Source(20, 19) + SourceIndex(0) +1->Emitted(12, 1) Source(20, 1) + SourceIndex(0) +2 >Emitted(12, 19) Source(20, 11) + SourceIndex(0) +3 >Emitted(12, 26) Source(20, 18) + SourceIndex(0) +4 >Emitted(12, 27) Source(20, 19) + SourceIndex(0) --- >>> class C { 1 >^^^^ @@ -208,15 +240,15 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export class 3 > C -1 >Emitted(12, 5) Source(21, 19) + SourceIndex(0) -2 >Emitted(12, 11) Source(21, 32) + SourceIndex(0) -3 >Emitted(12, 12) Source(21, 33) + SourceIndex(0) +1 >Emitted(13, 5) Source(21, 19) + SourceIndex(0) +2 >Emitted(13, 11) Source(21, 32) + SourceIndex(0) +3 >Emitted(13, 12) Source(21, 33) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > { } -1 >Emitted(13, 6) Source(21, 37) + SourceIndex(0) +1 >Emitted(14, 6) Source(21, 37) + SourceIndex(0) --- >>> function foo(): void; 1->^^^^ @@ -229,10 +261,10 @@ sourceFile:../second/second_part1.ts 2 > export function 3 > foo 4 > () {} -1->Emitted(14, 5) Source(22, 19) + SourceIndex(0) -2 >Emitted(14, 14) Source(22, 35) + SourceIndex(0) -3 >Emitted(14, 17) Source(22, 38) + SourceIndex(0) -4 >Emitted(14, 26) Source(22, 43) + SourceIndex(0) +1->Emitted(15, 5) Source(22, 19) + SourceIndex(0) +2 >Emitted(15, 14) Source(22, 35) + SourceIndex(0) +3 >Emitted(15, 17) Source(22, 38) + SourceIndex(0) +4 >Emitted(15, 26) Source(22, 43) + SourceIndex(0) --- >>> namespace someNamespace { 1->^^^^ @@ -244,10 +276,10 @@ sourceFile:../second/second_part1.ts 2 > export namespace 3 > someNamespace 4 > -1->Emitted(15, 5) Source(23, 19) + SourceIndex(0) -2 >Emitted(15, 15) Source(23, 36) + SourceIndex(0) -3 >Emitted(15, 28) Source(23, 49) + SourceIndex(0) -4 >Emitted(15, 29) Source(23, 50) + SourceIndex(0) +1->Emitted(16, 5) Source(23, 19) + SourceIndex(0) +2 >Emitted(16, 15) Source(23, 36) + SourceIndex(0) +3 >Emitted(16, 28) Source(23, 49) + SourceIndex(0) +4 >Emitted(16, 29) Source(23, 50) + SourceIndex(0) --- >>> class C { 1 >^^^^^^^^ @@ -256,20 +288,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > C -1 >Emitted(16, 9) Source(23, 52) + SourceIndex(0) -2 >Emitted(16, 15) Source(23, 65) + SourceIndex(0) -3 >Emitted(16, 16) Source(23, 66) + SourceIndex(0) +1 >Emitted(17, 9) Source(23, 52) + SourceIndex(0) +2 >Emitted(17, 15) Source(23, 65) + SourceIndex(0) +3 >Emitted(17, 16) Source(23, 66) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(17, 10) Source(23, 69) + SourceIndex(0) +1 >Emitted(18, 10) Source(23, 69) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(18, 6) Source(23, 71) + SourceIndex(0) +1 >Emitted(19, 6) Source(23, 71) + SourceIndex(0) --- >>> namespace someOther.something { 1->^^^^ @@ -285,12 +317,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(19, 5) Source(24, 19) + SourceIndex(0) -2 >Emitted(19, 15) Source(24, 36) + SourceIndex(0) -3 >Emitted(19, 24) Source(24, 45) + SourceIndex(0) -4 >Emitted(19, 25) Source(24, 46) + SourceIndex(0) -5 >Emitted(19, 34) Source(24, 55) + SourceIndex(0) -6 >Emitted(19, 35) Source(24, 56) + SourceIndex(0) +1->Emitted(20, 5) Source(24, 19) + SourceIndex(0) +2 >Emitted(20, 15) Source(24, 36) + SourceIndex(0) +3 >Emitted(20, 24) Source(24, 45) + SourceIndex(0) +4 >Emitted(20, 25) Source(24, 46) + SourceIndex(0) +5 >Emitted(20, 34) Source(24, 55) + SourceIndex(0) +6 >Emitted(20, 35) Source(24, 56) + SourceIndex(0) --- >>> class someClass { 1 >^^^^^^^^ @@ -299,20 +331,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(20, 9) Source(24, 58) + SourceIndex(0) -2 >Emitted(20, 15) Source(24, 71) + SourceIndex(0) -3 >Emitted(20, 24) Source(24, 80) + SourceIndex(0) +1 >Emitted(21, 9) Source(24, 58) + SourceIndex(0) +2 >Emitted(21, 15) Source(24, 71) + SourceIndex(0) +3 >Emitted(21, 24) Source(24, 80) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^ 1 > {} -1 >Emitted(21, 10) Source(24, 83) + SourceIndex(0) +1 >Emitted(22, 10) Source(24, 83) + SourceIndex(0) --- >>> } 1 >^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(22, 6) Source(24, 85) + SourceIndex(0) +1 >Emitted(23, 6) Source(24, 85) + SourceIndex(0) --- >>> export import someImport = someNamespace.C; 1->^^^^ @@ -334,15 +366,15 @@ sourceFile:../second/second_part1.ts 7 > . 8 > C 9 > ; -1->Emitted(23, 5) Source(25, 19) + SourceIndex(0) -2 >Emitted(23, 11) Source(25, 25) + SourceIndex(0) -3 >Emitted(23, 19) Source(25, 33) + SourceIndex(0) -4 >Emitted(23, 29) Source(25, 43) + SourceIndex(0) -5 >Emitted(23, 32) Source(25, 46) + SourceIndex(0) -6 >Emitted(23, 45) Source(25, 59) + SourceIndex(0) -7 >Emitted(23, 46) Source(25, 60) + SourceIndex(0) -8 >Emitted(23, 47) Source(25, 61) + SourceIndex(0) -9 >Emitted(23, 48) Source(25, 62) + SourceIndex(0) +1->Emitted(24, 5) Source(25, 19) + SourceIndex(0) +2 >Emitted(24, 11) Source(25, 25) + SourceIndex(0) +3 >Emitted(24, 19) Source(25, 33) + SourceIndex(0) +4 >Emitted(24, 29) Source(25, 43) + SourceIndex(0) +5 >Emitted(24, 32) Source(25, 46) + SourceIndex(0) +6 >Emitted(24, 45) Source(25, 59) + SourceIndex(0) +7 >Emitted(24, 46) Source(25, 60) + SourceIndex(0) +8 >Emitted(24, 47) Source(25, 61) + SourceIndex(0) +9 >Emitted(24, 48) Source(25, 62) + SourceIndex(0) --- >>> type internalType = internalC; 1 >^^^^ @@ -358,12 +390,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(24, 5) Source(26, 19) + SourceIndex(0) -2 >Emitted(24, 10) Source(26, 31) + SourceIndex(0) -3 >Emitted(24, 22) Source(26, 43) + SourceIndex(0) -4 >Emitted(24, 25) Source(26, 46) + SourceIndex(0) -5 >Emitted(24, 34) Source(26, 55) + SourceIndex(0) -6 >Emitted(24, 35) Source(26, 56) + SourceIndex(0) +1 >Emitted(25, 5) Source(26, 19) + SourceIndex(0) +2 >Emitted(25, 10) Source(26, 31) + SourceIndex(0) +3 >Emitted(25, 22) Source(26, 43) + SourceIndex(0) +4 >Emitted(25, 25) Source(26, 46) + SourceIndex(0) +5 >Emitted(25, 34) Source(26, 55) + SourceIndex(0) +6 >Emitted(25, 35) Source(26, 56) + SourceIndex(0) --- >>> const internalConst = 10; 1 >^^^^ @@ -377,11 +409,11 @@ sourceFile:../second/second_part1.ts 3 > internalConst 4 > = 10 5 > ; -1 >Emitted(25, 5) Source(27, 26) + SourceIndex(0) -2 >Emitted(25, 11) Source(27, 32) + SourceIndex(0) -3 >Emitted(25, 24) Source(27, 45) + SourceIndex(0) -4 >Emitted(25, 29) Source(27, 50) + SourceIndex(0) -5 >Emitted(25, 30) Source(27, 51) + SourceIndex(0) +1 >Emitted(26, 5) Source(27, 26) + SourceIndex(0) +2 >Emitted(26, 11) Source(27, 32) + SourceIndex(0) +3 >Emitted(26, 24) Source(27, 45) + SourceIndex(0) +4 >Emitted(26, 29) Source(27, 50) + SourceIndex(0) +5 >Emitted(26, 30) Source(27, 51) + SourceIndex(0) --- >>> enum internalEnum { 1 >^^^^ @@ -391,9 +423,9 @@ sourceFile:../second/second_part1.ts > /*@internal*/ 2 > export enum 3 > internalEnum -1 >Emitted(26, 5) Source(28, 19) + SourceIndex(0) -2 >Emitted(26, 10) Source(28, 31) + SourceIndex(0) -3 >Emitted(26, 22) Source(28, 43) + SourceIndex(0) +1 >Emitted(27, 5) Source(28, 19) + SourceIndex(0) +2 >Emitted(27, 10) Source(28, 31) + SourceIndex(0) +3 >Emitted(27, 22) Source(28, 43) + SourceIndex(0) --- >>> a = 0, 1 >^^^^^^^^ @@ -403,9 +435,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(27, 9) Source(28, 46) + SourceIndex(0) -2 >Emitted(27, 10) Source(28, 47) + SourceIndex(0) -3 >Emitted(27, 14) Source(28, 47) + SourceIndex(0) +1 >Emitted(28, 9) Source(28, 46) + SourceIndex(0) +2 >Emitted(28, 10) Source(28, 47) + SourceIndex(0) +3 >Emitted(28, 14) Source(28, 47) + SourceIndex(0) --- >>> b = 1, 1->^^^^^^^^ @@ -415,9 +447,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(28, 9) Source(28, 49) + SourceIndex(0) -2 >Emitted(28, 10) Source(28, 50) + SourceIndex(0) -3 >Emitted(28, 14) Source(28, 50) + SourceIndex(0) +1->Emitted(29, 9) Source(28, 49) + SourceIndex(0) +2 >Emitted(29, 10) Source(28, 50) + SourceIndex(0) +3 >Emitted(29, 14) Source(28, 50) + SourceIndex(0) --- >>> c = 2 1->^^^^^^^^ @@ -426,21 +458,21 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(29, 9) Source(28, 52) + SourceIndex(0) -2 >Emitted(29, 10) Source(28, 53) + SourceIndex(0) -3 >Emitted(29, 14) Source(28, 53) + SourceIndex(0) +1->Emitted(30, 9) Source(28, 52) + SourceIndex(0) +2 >Emitted(30, 10) Source(28, 53) + SourceIndex(0) +3 >Emitted(30, 14) Source(28, 53) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > } -1 >Emitted(30, 6) Source(28, 55) + SourceIndex(0) +1 >Emitted(31, 6) Source(28, 55) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(31, 2) Source(29, 2) + SourceIndex(0) +1 >Emitted(32, 2) Source(29, 2) + SourceIndex(0) --- >>>declare class internalC { 1-> @@ -450,15 +482,15 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >class 3 > internalC -1->Emitted(32, 1) Source(30, 15) + SourceIndex(0) -2 >Emitted(32, 15) Source(30, 21) + SourceIndex(0) -3 >Emitted(32, 24) Source(30, 30) + SourceIndex(0) +1->Emitted(33, 1) Source(30, 15) + SourceIndex(0) +2 >Emitted(33, 15) Source(30, 21) + SourceIndex(0) +3 >Emitted(33, 24) Source(30, 30) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > {} -1 >Emitted(33, 2) Source(30, 33) + SourceIndex(0) +1 >Emitted(34, 2) Source(30, 33) + SourceIndex(0) --- >>>declare function internalfoo(): void; 1-> @@ -471,10 +503,10 @@ sourceFile:../second/second_part1.ts 2 >function 3 > internalfoo 4 > () {} -1->Emitted(34, 1) Source(31, 15) + SourceIndex(0) -2 >Emitted(34, 18) Source(31, 24) + SourceIndex(0) -3 >Emitted(34, 29) Source(31, 35) + SourceIndex(0) -4 >Emitted(34, 38) Source(31, 40) + SourceIndex(0) +1->Emitted(35, 1) Source(31, 15) + SourceIndex(0) +2 >Emitted(35, 18) Source(31, 24) + SourceIndex(0) +3 >Emitted(35, 29) Source(31, 35) + SourceIndex(0) +4 >Emitted(35, 38) Source(31, 40) + SourceIndex(0) --- >>>declare namespace internalNamespace { 1-> @@ -486,10 +518,10 @@ sourceFile:../second/second_part1.ts 2 >namespace 3 > internalNamespace 4 > -1->Emitted(35, 1) Source(32, 15) + SourceIndex(0) -2 >Emitted(35, 19) Source(32, 25) + SourceIndex(0) -3 >Emitted(35, 36) Source(32, 42) + SourceIndex(0) -4 >Emitted(35, 37) Source(32, 43) + SourceIndex(0) +1->Emitted(36, 1) Source(32, 15) + SourceIndex(0) +2 >Emitted(36, 19) Source(32, 25) + SourceIndex(0) +3 >Emitted(36, 36) Source(32, 42) + SourceIndex(0) +4 >Emitted(36, 37) Source(32, 43) + SourceIndex(0) --- >>> class someClass { 1 >^^^^ @@ -498,20 +530,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(36, 5) Source(32, 45) + SourceIndex(0) -2 >Emitted(36, 11) Source(32, 58) + SourceIndex(0) -3 >Emitted(36, 20) Source(32, 67) + SourceIndex(0) +1 >Emitted(37, 5) Source(32, 45) + SourceIndex(0) +2 >Emitted(37, 11) Source(32, 58) + SourceIndex(0) +3 >Emitted(37, 20) Source(32, 67) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(37, 6) Source(32, 70) + SourceIndex(0) +1 >Emitted(38, 6) Source(32, 70) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(38, 2) Source(32, 72) + SourceIndex(0) +1 >Emitted(39, 2) Source(32, 72) + SourceIndex(0) --- >>>declare namespace internalOther.something { 1-> @@ -527,12 +559,12 @@ sourceFile:../second/second_part1.ts 4 > . 5 > something 6 > -1->Emitted(39, 1) Source(33, 15) + SourceIndex(0) -2 >Emitted(39, 19) Source(33, 25) + SourceIndex(0) -3 >Emitted(39, 32) Source(33, 38) + SourceIndex(0) -4 >Emitted(39, 33) Source(33, 39) + SourceIndex(0) -5 >Emitted(39, 42) Source(33, 48) + SourceIndex(0) -6 >Emitted(39, 43) Source(33, 49) + SourceIndex(0) +1->Emitted(40, 1) Source(33, 15) + SourceIndex(0) +2 >Emitted(40, 19) Source(33, 25) + SourceIndex(0) +3 >Emitted(40, 32) Source(33, 38) + SourceIndex(0) +4 >Emitted(40, 33) Source(33, 39) + SourceIndex(0) +5 >Emitted(40, 42) Source(33, 48) + SourceIndex(0) +6 >Emitted(40, 43) Source(33, 49) + SourceIndex(0) --- >>> class someClass { 1 >^^^^ @@ -541,20 +573,20 @@ sourceFile:../second/second_part1.ts 1 >{ 2 > export class 3 > someClass -1 >Emitted(40, 5) Source(33, 51) + SourceIndex(0) -2 >Emitted(40, 11) Source(33, 64) + SourceIndex(0) -3 >Emitted(40, 20) Source(33, 73) + SourceIndex(0) +1 >Emitted(41, 5) Source(33, 51) + SourceIndex(0) +2 >Emitted(41, 11) Source(33, 64) + SourceIndex(0) +3 >Emitted(41, 20) Source(33, 73) + SourceIndex(0) --- >>> } 1 >^^^^^ 1 > {} -1 >Emitted(41, 6) Source(33, 76) + SourceIndex(0) +1 >Emitted(42, 6) Source(33, 76) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(42, 2) Source(33, 78) + SourceIndex(0) +1 >Emitted(43, 2) Source(33, 78) + SourceIndex(0) --- >>>import internalImport = internalNamespace.someClass; 1-> @@ -574,14 +606,14 @@ sourceFile:../second/second_part1.ts 6 > . 7 > someClass 8 > ; -1->Emitted(43, 1) Source(34, 15) + SourceIndex(0) -2 >Emitted(43, 8) Source(34, 22) + SourceIndex(0) -3 >Emitted(43, 22) Source(34, 36) + SourceIndex(0) -4 >Emitted(43, 25) Source(34, 39) + SourceIndex(0) -5 >Emitted(43, 42) Source(34, 56) + SourceIndex(0) -6 >Emitted(43, 43) Source(34, 57) + SourceIndex(0) -7 >Emitted(43, 52) Source(34, 66) + SourceIndex(0) -8 >Emitted(43, 53) Source(34, 67) + SourceIndex(0) +1->Emitted(44, 1) Source(34, 15) + SourceIndex(0) +2 >Emitted(44, 8) Source(34, 22) + SourceIndex(0) +3 >Emitted(44, 22) Source(34, 36) + SourceIndex(0) +4 >Emitted(44, 25) Source(34, 39) + SourceIndex(0) +5 >Emitted(44, 42) Source(34, 56) + SourceIndex(0) +6 >Emitted(44, 43) Source(34, 57) + SourceIndex(0) +7 >Emitted(44, 52) Source(34, 66) + SourceIndex(0) +8 >Emitted(44, 53) Source(34, 67) + SourceIndex(0) --- >>>declare type internalType = internalC; 1 > @@ -597,12 +629,12 @@ sourceFile:../second/second_part1.ts 4 > = 5 > internalC 6 > ; -1 >Emitted(44, 1) Source(35, 15) + SourceIndex(0) -2 >Emitted(44, 14) Source(35, 20) + SourceIndex(0) -3 >Emitted(44, 26) Source(35, 32) + SourceIndex(0) -4 >Emitted(44, 29) Source(35, 35) + SourceIndex(0) -5 >Emitted(44, 38) Source(35, 44) + SourceIndex(0) -6 >Emitted(44, 39) Source(35, 45) + SourceIndex(0) +1 >Emitted(45, 1) Source(35, 15) + SourceIndex(0) +2 >Emitted(45, 14) Source(35, 20) + SourceIndex(0) +3 >Emitted(45, 26) Source(35, 32) + SourceIndex(0) +4 >Emitted(45, 29) Source(35, 35) + SourceIndex(0) +5 >Emitted(45, 38) Source(35, 44) + SourceIndex(0) +6 >Emitted(45, 39) Source(35, 45) + SourceIndex(0) --- >>>declare const internalConst = 10; 1 > @@ -618,12 +650,12 @@ sourceFile:../second/second_part1.ts 4 > internalConst 5 > = 10 6 > ; -1 >Emitted(45, 1) Source(36, 15) + SourceIndex(0) -2 >Emitted(45, 9) Source(36, 15) + SourceIndex(0) -3 >Emitted(45, 15) Source(36, 21) + SourceIndex(0) -4 >Emitted(45, 28) Source(36, 34) + SourceIndex(0) -5 >Emitted(45, 33) Source(36, 39) + SourceIndex(0) -6 >Emitted(45, 34) Source(36, 40) + SourceIndex(0) +1 >Emitted(46, 1) Source(36, 15) + SourceIndex(0) +2 >Emitted(46, 9) Source(36, 15) + SourceIndex(0) +3 >Emitted(46, 15) Source(36, 21) + SourceIndex(0) +4 >Emitted(46, 28) Source(36, 34) + SourceIndex(0) +5 >Emitted(46, 33) Source(36, 39) + SourceIndex(0) +6 >Emitted(46, 34) Source(36, 40) + SourceIndex(0) --- >>>declare enum internalEnum { 1 > @@ -633,9 +665,9 @@ sourceFile:../second/second_part1.ts >/*@internal*/ 2 >enum 3 > internalEnum -1 >Emitted(46, 1) Source(37, 15) + SourceIndex(0) -2 >Emitted(46, 14) Source(37, 20) + SourceIndex(0) -3 >Emitted(46, 26) Source(37, 32) + SourceIndex(0) +1 >Emitted(47, 1) Source(37, 15) + SourceIndex(0) +2 >Emitted(47, 14) Source(37, 20) + SourceIndex(0) +3 >Emitted(47, 26) Source(37, 32) + SourceIndex(0) --- >>> a = 0, 1 >^^^^ @@ -645,9 +677,9 @@ sourceFile:../second/second_part1.ts 1 > { 2 > a 3 > -1 >Emitted(47, 5) Source(37, 35) + SourceIndex(0) -2 >Emitted(47, 6) Source(37, 36) + SourceIndex(0) -3 >Emitted(47, 10) Source(37, 36) + SourceIndex(0) +1 >Emitted(48, 5) Source(37, 35) + SourceIndex(0) +2 >Emitted(48, 6) Source(37, 36) + SourceIndex(0) +3 >Emitted(48, 10) Source(37, 36) + SourceIndex(0) --- >>> b = 1, 1->^^^^ @@ -657,9 +689,9 @@ sourceFile:../second/second_part1.ts 1->, 2 > b 3 > -1->Emitted(48, 5) Source(37, 38) + SourceIndex(0) -2 >Emitted(48, 6) Source(37, 39) + SourceIndex(0) -3 >Emitted(48, 10) Source(37, 39) + SourceIndex(0) +1->Emitted(49, 5) Source(37, 38) + SourceIndex(0) +2 >Emitted(49, 6) Source(37, 39) + SourceIndex(0) +3 >Emitted(49, 10) Source(37, 39) + SourceIndex(0) --- >>> c = 2 1->^^^^ @@ -668,15 +700,15 @@ sourceFile:../second/second_part1.ts 1->, 2 > c 3 > -1->Emitted(49, 5) Source(37, 41) + SourceIndex(0) -2 >Emitted(49, 6) Source(37, 42) + SourceIndex(0) -3 >Emitted(49, 10) Source(37, 42) + SourceIndex(0) +1->Emitted(50, 5) Source(37, 41) + SourceIndex(0) +2 >Emitted(50, 6) Source(37, 42) + SourceIndex(0) +3 >Emitted(50, 10) Source(37, 42) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^-> 1 > } -1 >Emitted(50, 2) Source(37, 44) + SourceIndex(0) +1 >Emitted(51, 2) Source(37, 44) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/2/second-output.d.ts @@ -690,9 +722,9 @@ sourceFile:../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(51, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(51, 15) Source(1, 7) + SourceIndex(1) -3 >Emitted(51, 16) Source(1, 8) + SourceIndex(1) +1->Emitted(52, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(52, 15) Source(1, 7) + SourceIndex(1) +3 >Emitted(52, 16) Source(1, 8) + SourceIndex(1) --- >>> doSomething(): void; 1->^^^^ @@ -700,8 +732,8 @@ sourceFile:../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(52, 5) Source(2, 5) + SourceIndex(1) -2 >Emitted(52, 16) Source(2, 16) + SourceIndex(1) +1->Emitted(53, 5) Source(2, 5) + SourceIndex(1) +2 >Emitted(53, 16) Source(2, 16) + SourceIndex(1) --- >>>} 1 >^ @@ -710,7 +742,7 @@ sourceFile:../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(53, 2) Source(5, 2) + SourceIndex(1) +1 >Emitted(54, 2) Source(5, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=second-output.d.ts.map @@ -2294,32 +2326,32 @@ sourceFile:../second/second_part2.ts }, { "pos": 77, - "end": 151, + "end": 182, "kind": "internal" }, { - "pos": 153, - "end": 185, + "pos": 184, + "end": 216, "kind": "text" }, { - "pos": 185, - "end": 577, + "pos": 216, + "end": 608, "kind": "internal" }, { - "pos": 579, - "end": 582, + "pos": 610, + "end": 613, "kind": "text" }, { - "pos": 582, - "end": 995, + "pos": 613, + "end": 1026, "kind": "internal" }, { - "pos": 997, - "end": 1045, + "pos": 1028, + "end": 1076, "kind": "text" } ] @@ -2448,18 +2480,19 @@ declare namespace N { declare class normalC { ---------------------------------------------------------------------- -internal: (77-151) +internal: (77-182) constructor(); prop: string; method(): void; - c: number; + get c(): number; + set c(val: number); ---------------------------------------------------------------------- -text: (153-185) +text: (184-216) } declare namespace normalN { ---------------------------------------------------------------------- -internal: (185-577) +internal: (216-608) class C { } function foo(): void; @@ -2480,11 +2513,11 @@ internal: (185-577) c = 2 } ---------------------------------------------------------------------- -text: (579-582) +text: (610-613) } ---------------------------------------------------------------------- -internal: (582-995) +internal: (613-1026) declare class internalC { } declare function internalfoo(): void; @@ -2505,7 +2538,7 @@ declare enum internalEnum { c = 2 } ---------------------------------------------------------------------- -text: (997-1045) +text: (1028-1076) declare class C { doSomething(): void; } diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js index 1d4d9df79e22d..50c8ff0f7890a 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.js +++ b/tests/baselines/reference/typeGuardOfFormThisMember.js @@ -178,8 +178,9 @@ declare namespace Test { class FileSystemObject { path: string; isFSO: this is FileSystemObject; - isFile: this is File; - readonly isDirectory: this is Directory; + get isFile(): this is File; + set isFile(param: this is File); + get isDirectory(): this is Directory; isNetworked: this is (Networked & this); constructor(path: string); } diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js index 1992c339b328d..8456dc1797ee8 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js +++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js @@ -103,8 +103,9 @@ declare namespace Test { class FileSystemObject { path: string; isFSO: this is FileSystemObject; - isFile: this is File; - readonly isDirectory: this is Directory; + get isFile(): this is File; + set isFile(param: this is File); + get isDirectory(): this is Directory; isNetworked: this is (Networked & this); constructor(path: string); } diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js index 871d8977a9de2..723ec89c0a65d 100644 --- a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js +++ b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.js @@ -141,7 +141,9 @@ export declare class ClassWithPrivateNamedMethods { static [s](): void; } export declare class ClassWithPrivateNamedAccessors { - [s]: any; - static [s]: any; + get [s](): any; + set [s](v: any); + static get [s](): any; + static set [s](v: any); } export {};