Skip to content

Commit b075332

Browse files
TypeScript Botsheetalkamat
TypeScript Bot
and
sheetalkamat
authored
🤖 Pick PR #59337 (Allow declarationMap to be emitted ...) into release-5.5 (#59344)
Co-authored-by: Sheetal Nandi <[email protected]>
1 parent 9dd6f91 commit b075332

16 files changed

+955
-4
lines changed

Diff for: ‎src/compiler/builderState.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
computeSignatureWithDiagnostics,
66
CustomTransformers,
77
Debug,
8+
EmitOnly,
89
EmitOutput,
910
emptyArray,
1011
GetCanonicalFileName,
@@ -418,7 +419,7 @@ export namespace BuilderState {
418419
);
419420
},
420421
cancellationToken,
421-
/*emitOnly*/ true,
422+
EmitOnly.BuilderSignature,
422423
/*customTransformers*/ undefined,
423424
/*forceDtsEmit*/ true,
424425
);

Diff for: ‎src/compiler/commandLineParser.ts

-1
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,6 @@ export const commonOptionsWithBuild: CommandLineOption[] = [
468468
affectsBuildInfo: true,
469469
showInSimplifiedHelpView: true,
470470
category: Diagnostics.Emit,
471-
transpileOptionValue: undefined,
472471
defaultValueDescription: false,
473472
description: Diagnostics.Create_sourcemaps_for_d_ts_files,
474473
},

Diff for: ‎src/compiler/emitter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFi
893893
noEmitHelpers: true,
894894
module: compilerOptions.module,
895895
target: compilerOptions.target,
896-
sourceMap: !forceDtsEmit && compilerOptions.declarationMap,
896+
sourceMap: emitOnly !== EmitOnly.BuilderSignature && compilerOptions.declarationMap,
897897
inlineSourceMap: compilerOptions.inlineSourceMap,
898898
extendedDiagnostics: compilerOptions.extendedDiagnostics,
899899
onlyPrintJsDocStyle: true,

Diff for: ‎src/compiler/types.ts

+1
Original file line numberDiff line numberDiff line change
@@ -4641,6 +4641,7 @@ export type FilePreprocessingDiagnostics = FilePreprocessingLibReferenceDiagnost
46414641
export const enum EmitOnly {
46424642
Js,
46434643
Dts,
4644+
BuilderSignature,
46444645
}
46454646

46464647
/** @internal */

Diff for: ‎src/testRunner/transpileRunner.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ enum TranspileKind {
4848
}
4949

5050
class TranspileTestCase {
51-
static varyBy = [];
51+
static varyBy = [
52+
"declarationMap",
53+
"sourceMap",
54+
"inlineSourceMap",
55+
];
5256

5357
static getConfigurations(file: string): TranspileTestCase[] {
5458
const ext = vpath.extname(file);
@@ -104,6 +108,13 @@ class TranspileTestCase {
104108
if (!result.outputText.endsWith("\n")) {
105109
baselineText += "\r\n";
106110
}
111+
if (result.sourceMapText) {
112+
baselineText += `//// [${ts.changeExtension(unit.name, kind === TranspileKind.Module ? this.getJsOutputExtension(unit.name) : ts.getDeclarationEmitExtensionForPath(unit.name))}.map] ////\r\n`;
113+
baselineText += result.sourceMapText;
114+
if (!result.outputText.endsWith("\n")) {
115+
baselineText += "\r\n";
116+
}
117+
}
107118
if (result.diagnostics && result.diagnostics.length) {
108119
baselineText += "\r\n\r\n//// [Diagnostics reported]\r\n";
109120
baselineText += Compiler.getErrorBaseline([{ content: unit.content, unitName: unit.name }], result.diagnostics, !!opts.pretty);

Diff for: ‎tests/baselines/reference/transpile/declarationBasicSyntax.d.ts renamed to ‎tests/baselines/reference/transpile/declarationBasicSyntax(declarationMap=false).d.ts

File renamed without changes.

Diff for: ‎tests/baselines/reference/transpile/declarationBasicSyntax.js renamed to ‎tests/baselines/reference/transpile/declarationBasicSyntax(declarationMap=false).js

File renamed without changes.

Diff for: ‎tests/baselines/reference/transpile/declarationBasicSyntax(declarationMap=true).d.ts

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
//// [variables.ts] ////
2+
export const a = 1;
3+
export let b = 2;
4+
export var c = 3;
5+
using d = undefined;
6+
export { d };
7+
await using e = undefined;
8+
export { e };
9+
//// [interface.ts] ////
10+
export interface Foo {
11+
a: string;
12+
readonly b: string;
13+
c?: string;
14+
}
15+
//// [class.ts] ////
16+
const i = Symbol();
17+
export class Bar {
18+
a: string;
19+
b?: string;
20+
declare c: string;
21+
#d: string;
22+
public e: string;
23+
protected f: string;
24+
private g: string;
25+
["h"]: string;
26+
[i]: string;
27+
}
28+
29+
export abstract class Baz {
30+
abstract a: string;
31+
abstract method(): void;
32+
}
33+
//// [namespace.ts] ////
34+
export namespace ns {
35+
namespace internal {
36+
export class Foo {}
37+
}
38+
export namespace nested {
39+
export import inner = internal;
40+
}
41+
}
42+
//// [alias.ts] ////
43+
export type A<T> = { x: T };
44+
//// [variables.d.ts] ////
45+
export declare const a = 1;
46+
export declare let b: number;
47+
export declare var c: number;
48+
declare const d: any;
49+
export { d };
50+
declare const e: any;
51+
export { e };
52+
//# sourceMappingURL=variables.d.ts.map
53+
//// [variables.d.ts.map] ////
54+
{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["variables.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,CAAC,IAAI,CAAC;AACnB,eAAO,IAAI,CAAC,QAAI,CAAC;AACjB,eAAO,IAAI,CAAC,QAAI,CAAC;AACjB,QAAA,MAAM,CAAC,KAAY,CAAC;AACpB,OAAO,EAAE,CAAC,EAAE,CAAC;AACb,QAAA,MAAY,CAAC,KAAY,CAAC;AAC1B,OAAO,EAAE,CAAC,EAAE,CAAC"}
55+
//// [interface.d.ts] ////
56+
export interface Foo {
57+
a: string;
58+
readonly b: string;
59+
c?: string;
60+
}
61+
//# sourceMappingURL=interface.d.ts.map
62+
//// [interface.d.ts.map] ////
63+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,GAAG;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,CAAC,EAAE,MAAM,CAAC;CACd"}
64+
//// [class.d.ts] ////
65+
export declare class Bar {
66+
#private;
67+
a: string;
68+
b?: string;
69+
c: string;
70+
e: string;
71+
protected f: string;
72+
private g;
73+
["h"]: string;
74+
}
75+
export declare abstract class Baz {
76+
abstract a: string;
77+
abstract method(): void;
78+
}
79+
//# sourceMappingURL=class.d.ts.map
80+
//// [class.d.ts.map] ////
81+
{"version":3,"file":"class.d.ts","sourceRoot":"","sources":["class.ts"],"names":[],"mappings":"AACA,qBAAa,GAAG;;IACZ,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,CAAC,EAAE,MAAM,CAAC;IACH,CAAC,EAAE,MAAM,CAAC;IAEX,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,CAAC,CAAS;IAClB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CAEjB;AAED,8BAAsB,GAAG;IACrB,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,MAAM,IAAI,IAAI;CAC1B"}
82+
83+
84+
//// [Diagnostics reported]
85+
class.ts(11,5): error TS9038: Computed property names on class or object literals cannot be inferred with --isolatedDeclarations.
86+
87+
88+
==== class.ts (1 errors) ====
89+
const i = Symbol();
90+
export class Bar {
91+
a: string;
92+
b?: string;
93+
declare c: string;
94+
#d: string;
95+
public e: string;
96+
protected f: string;
97+
private g: string;
98+
["h"]: string;
99+
[i]: string;
100+
~~~
101+
!!! error TS9038: Computed property names on class or object literals cannot be inferred with --isolatedDeclarations.
102+
}
103+
104+
export abstract class Baz {
105+
abstract a: string;
106+
abstract method(): void;
107+
}
108+
//// [namespace.d.ts] ////
109+
export declare namespace ns {
110+
namespace internal {
111+
class Foo {
112+
}
113+
}
114+
export namespace nested {
115+
export import inner = internal;
116+
}
117+
export {};
118+
}
119+
//# sourceMappingURL=namespace.d.ts.map
120+
//// [namespace.d.ts.map] ////
121+
{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["namespace.ts"],"names":[],"mappings":"AAAA,yBAAiB,EAAE,CAAC;IAChB,UAAU,QAAQ,CAAC;QACf,MAAa,GAAG;SAAG;KACtB;IACD,MAAM,WAAW,MAAM,CAAC;QACpB,MAAM,QAAQ,KAAK,GAAG,QAAQ,CAAC;KAClC;;CACJ"}
122+
//// [alias.d.ts] ////
123+
export type A<T> = {
124+
x: T;
125+
};
126+
//# sourceMappingURL=alias.d.ts.map
127+
//// [alias.d.ts.map] ////
128+
{"version":3,"file":"alias.d.ts","sourceRoot":"","sources":["alias.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,CAAC,CAAC,CAAC,IAAI;IAAE,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC"}

Diff for: ‎tests/baselines/reference/transpile/declarationBasicSyntax(declarationMap=true).js

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
//// [variables.ts] ////
2+
export const a = 1;
3+
export let b = 2;
4+
export var c = 3;
5+
using d = undefined;
6+
export { d };
7+
await using e = undefined;
8+
export { e };
9+
//// [interface.ts] ////
10+
export interface Foo {
11+
a: string;
12+
readonly b: string;
13+
c?: string;
14+
}
15+
//// [class.ts] ////
16+
const i = Symbol();
17+
export class Bar {
18+
a: string;
19+
b?: string;
20+
declare c: string;
21+
#d: string;
22+
public e: string;
23+
protected f: string;
24+
private g: string;
25+
["h"]: string;
26+
[i]: string;
27+
}
28+
29+
export abstract class Baz {
30+
abstract a: string;
31+
abstract method(): void;
32+
}
33+
//// [namespace.ts] ////
34+
export namespace ns {
35+
namespace internal {
36+
export class Foo {}
37+
}
38+
export namespace nested {
39+
export import inner = internal;
40+
}
41+
}
42+
//// [alias.ts] ////
43+
export type A<T> = { x: T };
44+
//// [variables.js] ////
45+
var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
46+
if (value !== null && value !== void 0) {
47+
if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
48+
var dispose, inner;
49+
if (async) {
50+
if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
51+
dispose = value[Symbol.asyncDispose];
52+
}
53+
if (dispose === void 0) {
54+
if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
55+
dispose = value[Symbol.dispose];
56+
if (async) inner = dispose;
57+
}
58+
if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
59+
if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
60+
env.stack.push({ value: value, dispose: dispose, async: async });
61+
}
62+
else if (async) {
63+
env.stack.push({ async: true });
64+
}
65+
return value;
66+
};
67+
var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
68+
return function (env) {
69+
function fail(e) {
70+
env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
71+
env.hasError = true;
72+
}
73+
function next() {
74+
while (env.stack.length) {
75+
var rec = env.stack.pop();
76+
try {
77+
var result = rec.dispose && rec.dispose.call(rec.value);
78+
if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
79+
}
80+
catch (e) {
81+
fail(e);
82+
}
83+
}
84+
if (env.hasError) throw env.error;
85+
}
86+
return next();
87+
};
88+
})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
89+
var e = new Error(message);
90+
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
91+
});
92+
export const a = 1;
93+
export let b = 2;
94+
export var c = 3;
95+
export { d };
96+
export { e };
97+
var d, e;
98+
const env_1 = { stack: [], error: void 0, hasError: false };
99+
try {
100+
d = __addDisposableResource(env_1, undefined, false);
101+
e = __addDisposableResource(env_1, undefined, true);
102+
}
103+
catch (e_1) {
104+
env_1.error = e_1;
105+
env_1.hasError = true;
106+
}
107+
finally {
108+
const result_1 = __disposeResources(env_1);
109+
if (result_1)
110+
await result_1;
111+
}
112+
//// [interface.js] ////
113+
export {};
114+
//// [class.js] ////
115+
var _Bar_d;
116+
const i = Symbol();
117+
export class Bar {
118+
constructor() {
119+
_Bar_d.set(this, void 0);
120+
}
121+
}
122+
_Bar_d = new WeakMap();
123+
export class Baz {
124+
}
125+
//// [namespace.js] ////
126+
export var ns;
127+
(function (ns) {
128+
let internal;
129+
(function (internal) {
130+
class Foo {
131+
}
132+
internal.Foo = Foo;
133+
})(internal || (internal = {}));
134+
let nested;
135+
(function (nested) {
136+
nested.inner = internal;
137+
})(nested = ns.nested || (ns.nested = {}));
138+
})(ns || (ns = {}));
139+
//// [alias.js] ////
140+
export {};

0 commit comments

Comments
 (0)