@typespec/compiler 0.56.0-dev.2 → 0.56.0-dev.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/manifest.js +2 -2
- package/dist/src/config/config-interpolation.js +4 -7
- package/dist/src/config/config-interpolation.js.map +1 -1
- package/dist/src/config/config-loader.js +5 -7
- package/dist/src/config/config-loader.js.map +1 -1
- package/dist/src/config/config-to-options.js +8 -10
- package/dist/src/config/config-to-options.js.map +1 -1
- package/dist/src/core/binder.js +8 -8
- package/dist/src/core/binder.js.map +1 -1
- package/dist/src/core/checker.js +79 -134
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/cli/actions/compile/args.js +3 -6
- package/dist/src/core/cli/actions/compile/args.js.map +1 -1
- package/dist/src/core/cli/actions/compile/compile.js +2 -2
- package/dist/src/core/cli/actions/compile/compile.js.map +1 -1
- package/dist/src/core/cli/actions/compile/watch.js +1 -2
- package/dist/src/core/cli/actions/compile/watch.js.map +1 -1
- package/dist/src/core/cli/actions/info.js +1 -2
- package/dist/src/core/cli/actions/info.js.map +1 -1
- package/dist/src/core/cli/actions/vs.js +1 -2
- package/dist/src/core/cli/actions/vs.js.map +1 -1
- package/dist/src/core/cli/install-vsix.js +1 -2
- package/dist/src/core/cli/install-vsix.js.map +1 -1
- package/dist/src/core/cli/utils.js +7 -9
- package/dist/src/core/cli/utils.js.map +1 -1
- package/dist/src/core/decorator-utils.js +6 -12
- package/dist/src/core/decorator-utils.js.map +1 -1
- package/dist/src/core/deprecation.js +2 -3
- package/dist/src/core/deprecation.js.map +1 -1
- package/dist/src/core/diagnostic-creator.js +1 -2
- package/dist/src/core/diagnostic-creator.js.map +1 -1
- package/dist/src/core/entrypoint-resolution.js +1 -1
- package/dist/src/core/entrypoint-resolution.js.map +1 -1
- package/dist/src/core/external-error.js +4 -5
- package/dist/src/core/external-error.js.map +1 -1
- package/dist/src/core/formatter-fs.js +2 -2
- package/dist/src/core/formatter-fs.js.map +1 -1
- package/dist/src/core/helpers/discriminator-utils.js +2 -4
- package/dist/src/core/helpers/discriminator-utils.js.map +1 -1
- package/dist/src/core/helpers/operation-utils.js +1 -2
- package/dist/src/core/helpers/operation-utils.js.map +1 -1
- package/dist/src/core/helpers/type-name-utils.js +8 -11
- package/dist/src/core/helpers/type-name-utils.js.map +1 -1
- package/dist/src/core/helpers/usage-resolver.js +2 -4
- package/dist/src/core/helpers/usage-resolver.js.map +1 -1
- package/dist/src/core/install.js +1 -1
- package/dist/src/core/install.js.map +1 -1
- package/dist/src/core/library.js +2 -3
- package/dist/src/core/library.js.map +1 -1
- package/dist/src/core/linter.js +4 -7
- package/dist/src/core/linter.js.map +1 -1
- package/dist/src/core/logger/console-sink.js +2 -3
- package/dist/src/core/logger/console-sink.js.map +1 -1
- package/dist/src/core/logger/tracer.js +1 -1
- package/dist/src/core/logger/tracer.js.map +1 -1
- package/dist/src/core/module-resolver.js +3 -4
- package/dist/src/core/module-resolver.js.map +1 -1
- package/dist/src/core/numeric.d.ts +22 -0
- package/dist/src/core/numeric.d.ts.map +1 -0
- package/dist/src/core/numeric.js +162 -0
- package/dist/src/core/numeric.js.map +1 -0
- package/dist/src/core/parser.js +8 -11
- package/dist/src/core/parser.js.map +1 -1
- package/dist/src/core/program.js +28 -37
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/projection-members.js +2 -2
- package/dist/src/core/projection-members.js.map +1 -1
- package/dist/src/core/projector.js +3 -8
- package/dist/src/core/projector.js.map +1 -1
- package/dist/src/core/scanner.js +1 -1
- package/dist/src/core/scanner.js.map +1 -1
- package/dist/src/core/schema-validator.js +1 -2
- package/dist/src/core/schema-validator.js.map +1 -1
- package/dist/src/core/semantic-walker.js +2 -4
- package/dist/src/core/semantic-walker.js.map +1 -1
- package/dist/src/core/source-file.js +1 -1
- package/dist/src/core/source-file.js.map +1 -1
- package/dist/src/core/type-utils.js +2 -2
- package/dist/src/core/type-utils.js.map +1 -1
- package/dist/src/emitter-framework/asset-emitter.js +10 -14
- package/dist/src/emitter-framework/asset-emitter.js.map +1 -1
- package/dist/src/emitter-framework/builders/array-builder.js +7 -17
- package/dist/src/emitter-framework/builders/array-builder.js.map +1 -1
- package/dist/src/emitter-framework/builders/object-builder.js +1 -0
- package/dist/src/emitter-framework/builders/object-builder.js.map +1 -1
- package/dist/src/emitter-framework/builders/string-builder.js +23 -31
- package/dist/src/emitter-framework/builders/string-builder.js.map +1 -1
- package/dist/src/emitter-framework/custom-key-map.js +6 -19
- package/dist/src/emitter-framework/custom-key-map.js.map +1 -1
- package/dist/src/emitter-framework/placeholder.js +3 -12
- package/dist/src/emitter-framework/placeholder.js.map +1 -1
- package/dist/src/emitter-framework/ref-scope.js +1 -2
- package/dist/src/emitter-framework/ref-scope.js.map +1 -1
- package/dist/src/emitter-framework/reference-cycle.js +11 -19
- package/dist/src/emitter-framework/reference-cycle.js.map +1 -1
- package/dist/src/emitter-framework/type-emitter.js +1 -0
- package/dist/src/emitter-framework/type-emitter.js.map +1 -1
- package/dist/src/emitter-framework/types.js +10 -8
- package/dist/src/emitter-framework/types.js.map +1 -1
- package/dist/src/formatter/parser.js +4 -3
- package/dist/src/formatter/parser.js.map +1 -1
- package/dist/src/formatter/print/comment-handler.js +3 -4
- package/dist/src/formatter/print/comment-handler.js.map +1 -1
- package/dist/src/formatter/print/printer.js +5 -8
- package/dist/src/formatter/print/printer.js.map +1 -1
- package/dist/src/init/init.js +2 -2
- package/dist/src/init/init.js.map +1 -1
- package/dist/src/init/scaffold.js +11 -17
- package/dist/src/init/scaffold.js.map +1 -1
- package/dist/src/lib/decorators.js +19 -35
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/lib/encoded-names.js +3 -5
- package/dist/src/lib/encoded-names.js.map +1 -1
- package/dist/src/lib/service.js +3 -5
- package/dist/src/lib/service.js.map +1 -1
- package/dist/src/server/compile-service.js +6 -7
- package/dist/src/server/compile-service.js.map +1 -1
- package/dist/src/server/completion.js +7 -10
- package/dist/src/server/completion.js.map +1 -1
- package/dist/src/server/file-service.js +2 -4
- package/dist/src/server/file-service.js.map +1 -1
- package/dist/src/server/server.js +2 -4
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/server/serverlib.js +24 -33
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/symbol-structure.js +2 -4
- package/dist/src/server/symbol-structure.js.map +1 -1
- package/dist/src/server/type-details.js +5 -9
- package/dist/src/server/type-details.js.map +1 -1
- package/dist/src/server/type-signature.js +3 -4
- package/dist/src/server/type-signature.js.map +1 -1
- package/dist/src/server/update-manager.js +15 -28
- package/dist/src/server/update-manager.js.map +1 -1
- package/dist/src/testing/rule-tester.js +2 -3
- package/dist/src/testing/rule-tester.js.map +1 -1
- package/dist/src/testing/test-host.js +6 -6
- package/dist/src/testing/test-host.js.map +1 -1
- package/dist/src/testing/test-server-host.js +7 -11
- package/dist/src/testing/test-server-host.js.map +1 -1
- package/dist/src/testing/test-utils.js +5 -5
- package/dist/src/testing/test-utils.js.map +1 -1
- package/dist/src/testing/types.js +1 -0
- package/dist/src/testing/types.js.map +1 -1
- package/dist/src/utils/duplicate-tracker.js +4 -13
- package/dist/src/utils/duplicate-tracker.js.map +1 -1
- package/dist/src/utils/misc.js +53 -75
- package/dist/src/utils/misc.js.map +1 -1
- package/dist/src/yaml/diagnostics.js +4 -5
- package/dist/src/yaml/diagnostics.js.map +1 -1
- package/package.json +1 -1
|
@@ -26,9 +26,8 @@ export function createLinterRuleTester(runner, ruleDef, libraryName) {
|
|
|
26
26
|
function applyCodeFix(fixId) {
|
|
27
27
|
return { toEqual };
|
|
28
28
|
async function toEqual(expectedCode) {
|
|
29
|
-
var _a, _b;
|
|
30
29
|
const diagnostics = await diagnose(code);
|
|
31
|
-
const codefix =
|
|
30
|
+
const codefix = diagnostics[0].codefixes?.find((x) => x.id === fixId);
|
|
32
31
|
ok(codefix, `Codefix with id "${fixId}" not found.`);
|
|
33
32
|
let content;
|
|
34
33
|
const host = {
|
|
@@ -40,7 +39,7 @@ export function createLinterRuleTester(runner, ruleDef, libraryName) {
|
|
|
40
39
|
};
|
|
41
40
|
await applyCodeFixReal(host, codefix);
|
|
42
41
|
ok(content, "No content was written to the host.");
|
|
43
|
-
const offset =
|
|
42
|
+
const offset = runner.fs.get(resolveVirtualPath("./main.tsp"))?.indexOf(code);
|
|
44
43
|
strictEqual(trimBlankLines(content.slice(offset)), trimBlankLines(expectedCode));
|
|
45
44
|
}
|
|
46
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule-tester.js","sourceRoot":"","sources":["../../../src/testing/rule-tester.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAKL,yBAAyB,EACzB,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAmB,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAiBjD,MAAM,UAAU,sBAAsB,CACpC,MAAuB,EACvB,OAAyD,EACzD,WAAmB;IAEnB,OAAO;QACL,MAAM;KACP,CAAC;IAEF,SAAS,MAAM,CAAC,IAAY;QAC1B,OAAO;YACL,SAAS;YACT,iBAAiB;YACjB,YAAY;SACb,CAAC;QAEF,KAAK,UAAU,SAAS;YACtB,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzC,qBAAqB,CAAC,WAAW,CAAC,CAAC;QACrC,CAAC;QAED,KAAK,UAAU,iBAAiB,CAAC,KAA0C;YACzE,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACxC,CAAC;QAED,SAAS,YAAY,CAAC,KAAa;YACjC,OAAO,EAAE,OAAO,EAAE,CAAC;YAEnB,KAAK,UAAU,OAAO,CAAC,YAAoB
|
|
1
|
+
{"version":3,"file":"rule-tester.js","sourceRoot":"","sources":["../../../src/testing/rule-tester.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export function resolveVirtualPath(path, ...paths) {
|
|
|
21
21
|
}
|
|
22
22
|
function createTestCompilerHost(virtualFs, jsImports, options) {
|
|
23
23
|
const libDirs = [resolveVirtualPath(".tsp/lib")];
|
|
24
|
-
if (!
|
|
24
|
+
if (!options?.excludeTestLib) {
|
|
25
25
|
libDirs.push(resolveVirtualPath(".tsp/test-lib"));
|
|
26
26
|
}
|
|
27
27
|
return {
|
|
@@ -119,12 +119,12 @@ function createTestCompilerHost(virtualFs, jsImports, options) {
|
|
|
119
119
|
pathToFileURL(path) {
|
|
120
120
|
return pathToFileURL(path).href;
|
|
121
121
|
},
|
|
122
|
-
...options
|
|
122
|
+
...options?.compilerHostOverrides,
|
|
123
123
|
};
|
|
124
124
|
}
|
|
125
125
|
export async function createTestFileSystem(options) {
|
|
126
|
-
const virtualFs = createStringMap(!!
|
|
127
|
-
const jsImports = createStringMap(!!
|
|
126
|
+
const virtualFs = createStringMap(!!options?.caseInsensitiveFileSystem);
|
|
127
|
+
const jsImports = createStringMap(!!options?.caseInsensitiveFileSystem);
|
|
128
128
|
const compilerHost = createTestCompilerHost(virtualFs, jsImports, options);
|
|
129
129
|
return {
|
|
130
130
|
addTypeSpecFile,
|
|
@@ -193,7 +193,7 @@ export async function createTestHost(config = {}) {
|
|
|
193
193
|
return testHost;
|
|
194
194
|
}
|
|
195
195
|
export async function createTestRunner(host) {
|
|
196
|
-
const testHost = host
|
|
196
|
+
const testHost = host ?? (await createTestHost());
|
|
197
197
|
return createTestWrapper(testHost);
|
|
198
198
|
}
|
|
199
199
|
async function createTestHostInternal() {
|
|
@@ -206,7 +206,7 @@ async function createTestHostInternal() {
|
|
|
206
206
|
fileSystem.addJsFile(".tsp/test-lib/test.js", {
|
|
207
207
|
namespace: "TypeSpec",
|
|
208
208
|
$test(_, target, nameLiteral) {
|
|
209
|
-
let name = nameLiteral
|
|
209
|
+
let name = nameLiteral?.value;
|
|
210
210
|
if (!name) {
|
|
211
211
|
if (target.kind === "Model" ||
|
|
212
212
|
target.kind === "Scalar" ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-host.js","sourceRoot":"","sources":["../../../src/testing/test-host.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAW,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAKL,aAAa,GAEd,MAAM,YAAY,CAAC;AAQpB,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,GAAG,KAAe;IACjE,0EAA0E;IAC1E,0EAA0E;IAC1E,+BAA+B;IAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;IACnE,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,sBAAsB,CAC7B,SAA8B,EAC9B,SAA2C,EAC3C,OAAyB;IAEzB,MAAM,OAAO,GAAG,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACjD,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"test-host.js","sourceRoot":"","sources":["../../../src/testing/test-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,9 @@ import { createServer } from "../server/index.js";
|
|
|
7
7
|
import { createStringMap } from "../utils/misc.js";
|
|
8
8
|
import { StandardTestLibrary, createTestFileSystem, resolveVirtualPath, } from "./test-host.js";
|
|
9
9
|
export async function createTestServerHost(options) {
|
|
10
|
-
var _a;
|
|
11
10
|
const logMessages = [];
|
|
12
|
-
const documents = createStringMap(!!
|
|
13
|
-
const diagnostics = createStringMap(!!
|
|
11
|
+
const documents = createStringMap(!!options?.caseInsensitiveFileSystem);
|
|
12
|
+
const diagnostics = createStringMap(!!options?.caseInsensitiveFileSystem);
|
|
14
13
|
const fileSystem = await createTestFileSystem({ ...options, excludeTestLib: true });
|
|
15
14
|
await fileSystem.addTypeSpecLibrary(StandardTestLibrary);
|
|
16
15
|
const serverHost = {
|
|
@@ -40,17 +39,14 @@ export async function createTestServerHost(options) {
|
|
|
40
39
|
return document;
|
|
41
40
|
},
|
|
42
41
|
openDocument(path) {
|
|
43
|
-
|
|
44
|
-
const content = (_a = fileSystem.fs.get(resolveVirtualPath(path))) !== null && _a !== void 0 ? _a : "";
|
|
42
|
+
const content = fileSystem.fs.get(resolveVirtualPath(path)) ?? "";
|
|
45
43
|
return this.addOrUpdateDocument(path, content);
|
|
46
44
|
},
|
|
47
45
|
getDiagnostics(path) {
|
|
48
|
-
|
|
49
|
-
return (_a = diagnostics.get(this.getURL(path))) !== null && _a !== void 0 ? _a : [];
|
|
46
|
+
return diagnostics.get(this.getURL(path)) ?? [];
|
|
50
47
|
},
|
|
51
48
|
sendDiagnostics(params) {
|
|
52
|
-
|
|
53
|
-
if (params.version && ((_a = documents.get(params.uri)) === null || _a === void 0 ? void 0 : _a.version) !== params.version) {
|
|
49
|
+
if (params.version && documents.get(params.uri)?.version !== params.version) {
|
|
54
50
|
return;
|
|
55
51
|
}
|
|
56
52
|
diagnostics.set(params.uri, params.diagnostics);
|
|
@@ -68,11 +64,11 @@ export async function createTestServerHost(options) {
|
|
|
68
64
|
return Promise.resolve({ applied: false });
|
|
69
65
|
},
|
|
70
66
|
};
|
|
71
|
-
const workspaceDir =
|
|
67
|
+
const workspaceDir = options?.workspaceDir ?? "./";
|
|
72
68
|
const rootUri = serverHost.getURL(workspaceDir);
|
|
73
69
|
const server = createServer(serverHost);
|
|
74
70
|
await server.initialize({
|
|
75
|
-
rootUri:
|
|
71
|
+
rootUri: options?.caseInsensitiveFileSystem ? rootUri.toUpperCase() : rootUri,
|
|
76
72
|
capabilities: {},
|
|
77
73
|
processId: null,
|
|
78
74
|
workspaceFolders: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-server-host.js","sourceRoot":"","sources":["../../../src/testing/test-server-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAkB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAsB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACL,mBAAmB,EAEnB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AAaxB,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAqD
|
|
1
|
+
{"version":3,"file":"test-server-host.js","sourceRoot":"","sources":["../../../src/testing/test-server-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,9 @@ export function findTestPackageRoot(fileUrl) {
|
|
|
11
11
|
* @returns TypeSpec Test library.
|
|
12
12
|
*/
|
|
13
13
|
export function createTestLibrary(init) {
|
|
14
|
-
var _a, _b;
|
|
15
14
|
const { name } = init;
|
|
16
|
-
const typespecFileFolder =
|
|
17
|
-
const jsFileFolder =
|
|
15
|
+
const typespecFileFolder = init.typespecFileFolder ?? "lib";
|
|
16
|
+
const jsFileFolder = init.jsFileFolder ?? "dist/src";
|
|
18
17
|
return {
|
|
19
18
|
name,
|
|
20
19
|
packageRoot: init.packageRoot,
|
|
@@ -36,8 +35,9 @@ export function createTestLibrary(init) {
|
|
|
36
35
|
export function createTestWrapper(host, testWrapperOptions = {}) {
|
|
37
36
|
const { autoImports, autoUsings, wrapper, compilerOptions: defaultCompilerOptions, } = testWrapperOptions;
|
|
38
37
|
const autoCode = [
|
|
39
|
-
...(autoImports
|
|
40
|
-
|
|
38
|
+
...(autoImports ??
|
|
39
|
+
host.libraries.filter((x) => x.name !== "@typespec/compiler").map((x) => x.name)).map((x) => `import "${x}";`),
|
|
40
|
+
...(autoUsings ?? []).map((x) => `using ${x};`),
|
|
41
41
|
].join("\n");
|
|
42
42
|
const wrap = (code) => {
|
|
43
43
|
return `${autoCode}${wrapper ? wrapper(code) : code}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../../src/testing/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQnD,mDAAmD;AACnD,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAoB,CAAC;AACnF,CAAC;AACD;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAA6B
|
|
1
|
+
{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../../src/testing/test-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/testing/types.ts"],"names":[],"mappings":"AAyDA,MAAM,OAAO,aAAc,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/testing/types.ts"],"names":[],"mappings":"AAyDA,MAAM,OAAO,aAAc,SAAQ,KAAK;IAG7B;IAFT,YACE,OAAe,EACR,IAAuC;QAE9C,KAAK,CAAC,OAAO,CAAC,CAAC;QAFR,SAAI,GAAJ,IAAI,CAAmC;IAGhD,CAAC;CACF"}
|
|
@@ -1,25 +1,17 @@
|
|
|
1
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
2
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
3
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
4
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
5
|
-
};
|
|
6
|
-
var _DuplicateTracker_entries;
|
|
7
1
|
/**
|
|
8
2
|
* Helper class to track duplicate instance
|
|
9
3
|
*/
|
|
10
4
|
export class DuplicateTracker {
|
|
11
|
-
|
|
12
|
-
_DuplicateTracker_entries.set(this, new Map());
|
|
13
|
-
}
|
|
5
|
+
#entries = new Map();
|
|
14
6
|
/**
|
|
15
7
|
* Track usage of K.
|
|
16
8
|
* @param k key that is being checked for duplicate.
|
|
17
9
|
* @param v value that map to the key
|
|
18
10
|
*/
|
|
19
11
|
track(k, v) {
|
|
20
|
-
const existing =
|
|
12
|
+
const existing = this.#entries.get(k);
|
|
21
13
|
if (existing === undefined) {
|
|
22
|
-
|
|
14
|
+
this.#entries.set(k, [v]);
|
|
23
15
|
}
|
|
24
16
|
else {
|
|
25
17
|
existing.push(v);
|
|
@@ -29,12 +21,11 @@ export class DuplicateTracker {
|
|
|
29
21
|
* Return iterator of all the duplicate entries.
|
|
30
22
|
*/
|
|
31
23
|
*entries() {
|
|
32
|
-
for (const [k, v] of
|
|
24
|
+
for (const [k, v] of this.#entries.entries()) {
|
|
33
25
|
if (v.length > 1) {
|
|
34
26
|
yield [k, v];
|
|
35
27
|
}
|
|
36
28
|
}
|
|
37
29
|
}
|
|
38
30
|
}
|
|
39
|
-
_DuplicateTracker_entries = new WeakMap();
|
|
40
31
|
//# sourceMappingURL=duplicate-tracker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"duplicate-tracker.js","sourceRoot":"","sources":["../../../src/utils/duplicate-tracker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"duplicate-tracker.js","sourceRoot":"","sources":["../../../src/utils/duplicate-tracker.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC3B,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAE7B;;;;OAIG;IACH,KAAK,CAAC,CAAI,EAAE,CAAI;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,CAAC,OAAO;QACN,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAC7C,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACf,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
package/dist/src/utils/misc.js
CHANGED
|
@@ -1,15 +1,3 @@
|
|
|
1
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
2
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
3
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
4
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
5
|
-
};
|
|
6
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
7
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
8
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
9
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
10
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
11
|
-
};
|
|
12
|
-
var _MultiKeyMap_currentId, _MultiKeyMap_idMap, _MultiKeyMap_items, _Queue_elements, _Queue_headIndex, _RekeyableMapImpl_keys, _RekeyableMapImpl_values, _a;
|
|
13
1
|
import { createDiagnostic } from "../core/messages.js";
|
|
14
2
|
import { getDirectoryPath, isPathAbsolute, isUrl, joinPaths, normalizePath, resolvePath, } from "../core/path-utils.js";
|
|
15
3
|
import { createSourceFile } from "../core/source-file.js";
|
|
@@ -123,21 +111,20 @@ export async function getNormalizedRealPath(host, path) {
|
|
|
123
111
|
}
|
|
124
112
|
}
|
|
125
113
|
export async function doIO(action, path, reportDiagnostic, options) {
|
|
126
|
-
var _b;
|
|
127
114
|
let result;
|
|
128
115
|
try {
|
|
129
116
|
result = await action(path);
|
|
130
117
|
}
|
|
131
118
|
catch (e) {
|
|
132
119
|
let diagnostic;
|
|
133
|
-
let target =
|
|
120
|
+
let target = options?.diagnosticTarget ?? NoTarget;
|
|
134
121
|
// blame the JS file, not the TypeSpec import statement for JS syntax errors.
|
|
135
|
-
if (e instanceof SyntaxError &&
|
|
122
|
+
if (e instanceof SyntaxError && options?.jsDiagnosticTarget) {
|
|
136
123
|
target = options.jsDiagnosticTarget;
|
|
137
124
|
}
|
|
138
125
|
switch (e.code) {
|
|
139
126
|
case "ENOENT":
|
|
140
|
-
if (options
|
|
127
|
+
if (options?.allowFileNotFound) {
|
|
141
128
|
return undefined;
|
|
142
129
|
}
|
|
143
130
|
diagnostic = createDiagnostic({ code: "file-not-found", target, format: { path } });
|
|
@@ -225,7 +212,7 @@ export async function findProjectRoot(statFn, path) {
|
|
|
225
212
|
while (true) {
|
|
226
213
|
const pkgPath = joinPaths(current, "package.json");
|
|
227
214
|
const stat = await doIO(() => statFn(pkgPath), pkgPath, () => { });
|
|
228
|
-
if (stat
|
|
215
|
+
if (stat?.isFile()) {
|
|
229
216
|
return current;
|
|
230
217
|
}
|
|
231
218
|
const parent = getDirectoryPath(current);
|
|
@@ -242,10 +229,10 @@ export async function findProjectRoot(statFn, path) {
|
|
|
242
229
|
* @param reportDiagnostic optional diagnostic handler.
|
|
243
230
|
*/
|
|
244
231
|
export function resolveTspMain(packageJson) {
|
|
245
|
-
if (
|
|
232
|
+
if (packageJson?.tspMain !== undefined) {
|
|
246
233
|
return packageJson.tspMain;
|
|
247
234
|
}
|
|
248
|
-
if (
|
|
235
|
+
if (packageJson?.cadlMain !== undefined) {
|
|
249
236
|
return packageJson.cadlMain;
|
|
250
237
|
}
|
|
251
238
|
return undefined;
|
|
@@ -256,32 +243,28 @@ export function resolveTspMain(packageJson) {
|
|
|
256
243
|
* This is likely non-optimal.
|
|
257
244
|
*/
|
|
258
245
|
export class MultiKeyMap {
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
_MultiKeyMap_items.set(this, new Map());
|
|
263
|
-
}
|
|
246
|
+
#currentId = 0;
|
|
247
|
+
#idMap = new WeakMap();
|
|
248
|
+
#items = new Map();
|
|
264
249
|
get(items) {
|
|
265
|
-
return
|
|
250
|
+
return this.#items.get(this.compositeKeyFor(items));
|
|
266
251
|
}
|
|
267
252
|
set(items, value) {
|
|
268
253
|
const key = this.compositeKeyFor(items);
|
|
269
|
-
|
|
254
|
+
this.#items.set(key, value);
|
|
270
255
|
}
|
|
271
256
|
compositeKeyFor(items) {
|
|
272
257
|
return items.map((i) => this.keyFor(i)).join(",");
|
|
273
258
|
}
|
|
274
259
|
keyFor(item) {
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
return __classPrivateFieldGet(this, _MultiKeyMap_idMap, "f").get(item);
|
|
260
|
+
if (this.#idMap.has(item)) {
|
|
261
|
+
return this.#idMap.get(item);
|
|
278
262
|
}
|
|
279
|
-
const id =
|
|
280
|
-
|
|
263
|
+
const id = this.#currentId++;
|
|
264
|
+
this.#idMap.set(item, id);
|
|
281
265
|
return id;
|
|
282
266
|
}
|
|
283
267
|
}
|
|
284
|
-
_MultiKeyMap_currentId = new WeakMap(), _MultiKeyMap_idMap = new WeakMap(), _MultiKeyMap_items = new WeakMap();
|
|
285
268
|
/**
|
|
286
269
|
* A map with exactly two keys per value.
|
|
287
270
|
*
|
|
@@ -317,39 +300,35 @@ export class TwoLevelMap extends Map {
|
|
|
317
300
|
}
|
|
318
301
|
// Adapted from https://github.com/microsoft/TypeScript/blob/bc52ff6f4be9347981de415a35da90497eae84ac/src/compiler/core.ts#L1507
|
|
319
302
|
export class Queue {
|
|
303
|
+
#elements;
|
|
304
|
+
#headIndex = 0;
|
|
320
305
|
constructor(elements) {
|
|
321
|
-
|
|
322
|
-
_Queue_elements.set(this, void 0);
|
|
323
|
-
_Queue_headIndex.set(this, 0);
|
|
324
|
-
__classPrivateFieldSet(this, _Queue_elements, (_b = elements === null || elements === void 0 ? void 0 : elements.slice()) !== null && _b !== void 0 ? _b : [], "f");
|
|
306
|
+
this.#elements = elements?.slice() ?? [];
|
|
325
307
|
}
|
|
326
308
|
isEmpty() {
|
|
327
|
-
return
|
|
309
|
+
return this.#headIndex === this.#elements.length;
|
|
328
310
|
}
|
|
329
311
|
enqueue(...items) {
|
|
330
|
-
|
|
312
|
+
this.#elements.push(...items);
|
|
331
313
|
}
|
|
332
314
|
dequeue() {
|
|
333
|
-
var _b;
|
|
334
315
|
if (this.isEmpty()) {
|
|
335
316
|
throw new Error("Queue is empty.");
|
|
336
317
|
}
|
|
337
|
-
const result =
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
(_b = __classPrivateFieldGet(this, _Queue_headIndex, "f"), _b++, _b), "f");
|
|
318
|
+
const result = this.#elements[this.#headIndex];
|
|
319
|
+
this.#elements[this.#headIndex] = undefined; // Don't keep referencing dequeued item
|
|
320
|
+
this.#headIndex++;
|
|
341
321
|
// If more than half of the queue is empty, copy the remaining elements to the
|
|
342
322
|
// front and shrink the array (unless we'd be saving fewer than 100 slots)
|
|
343
|
-
if (
|
|
344
|
-
const newLength =
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
323
|
+
if (this.#headIndex > 100 && this.#headIndex > this.#elements.length >> 1) {
|
|
324
|
+
const newLength = this.#elements.length - this.#headIndex;
|
|
325
|
+
this.#elements.copyWithin(0, this.#headIndex);
|
|
326
|
+
this.#elements.length = newLength;
|
|
327
|
+
this.#headIndex = 0;
|
|
348
328
|
}
|
|
349
329
|
return result;
|
|
350
330
|
}
|
|
351
331
|
}
|
|
352
|
-
_Queue_elements = new WeakMap(), _Queue_headIndex = new WeakMap();
|
|
353
332
|
/**
|
|
354
333
|
* Casts away readonly typing.
|
|
355
334
|
*
|
|
@@ -380,10 +359,9 @@ export function createRekeyableMap(entries) {
|
|
|
380
359
|
return new RekeyableMapImpl(entries);
|
|
381
360
|
}
|
|
382
361
|
class RekeyableMapImpl {
|
|
362
|
+
#keys = new Map();
|
|
363
|
+
#values = new Map();
|
|
383
364
|
constructor(entries) {
|
|
384
|
-
_RekeyableMapImpl_keys.set(this, new Map());
|
|
385
|
-
_RekeyableMapImpl_values.set(this, new Map());
|
|
386
|
-
this[_a] = "RekeyableMap";
|
|
387
365
|
if (entries) {
|
|
388
366
|
for (const [key, value] of entries) {
|
|
389
367
|
this.set(key, value);
|
|
@@ -391,71 +369,71 @@ class RekeyableMapImpl {
|
|
|
391
369
|
}
|
|
392
370
|
}
|
|
393
371
|
clear() {
|
|
394
|
-
|
|
395
|
-
|
|
372
|
+
this.#keys.clear();
|
|
373
|
+
this.#values.clear();
|
|
396
374
|
}
|
|
397
375
|
delete(key) {
|
|
398
|
-
const keyItem =
|
|
376
|
+
const keyItem = this.#keys.get(key);
|
|
399
377
|
if (keyItem) {
|
|
400
|
-
|
|
401
|
-
return
|
|
378
|
+
this.#keys.delete(key);
|
|
379
|
+
return this.#values.delete(keyItem);
|
|
402
380
|
}
|
|
403
381
|
return false;
|
|
404
382
|
}
|
|
405
383
|
forEach(callbackfn, thisArg) {
|
|
406
|
-
|
|
384
|
+
this.#values.forEach((value, keyItem) => {
|
|
407
385
|
callbackfn(value, keyItem.key, this);
|
|
408
386
|
}, thisArg);
|
|
409
387
|
}
|
|
410
388
|
get(key) {
|
|
411
|
-
const keyItem =
|
|
412
|
-
return keyItem ?
|
|
389
|
+
const keyItem = this.#keys.get(key);
|
|
390
|
+
return keyItem ? this.#values.get(keyItem) : undefined;
|
|
413
391
|
}
|
|
414
392
|
has(key) {
|
|
415
|
-
return
|
|
393
|
+
return this.#keys.has(key);
|
|
416
394
|
}
|
|
417
395
|
set(key, value) {
|
|
418
|
-
let keyItem =
|
|
396
|
+
let keyItem = this.#keys.get(key);
|
|
419
397
|
if (!keyItem) {
|
|
420
398
|
keyItem = { key };
|
|
421
|
-
|
|
399
|
+
this.#keys.set(key, keyItem);
|
|
422
400
|
}
|
|
423
|
-
|
|
401
|
+
this.#values.set(keyItem, value);
|
|
424
402
|
return this;
|
|
425
403
|
}
|
|
426
404
|
get size() {
|
|
427
|
-
return
|
|
405
|
+
return this.#values.size;
|
|
428
406
|
}
|
|
429
407
|
*entries() {
|
|
430
|
-
for (const [k, v] of
|
|
408
|
+
for (const [k, v] of this.#values) {
|
|
431
409
|
yield [k.key, v];
|
|
432
410
|
}
|
|
433
411
|
}
|
|
434
412
|
*keys() {
|
|
435
|
-
for (const k of
|
|
413
|
+
for (const k of this.#values.keys()) {
|
|
436
414
|
yield k.key;
|
|
437
415
|
}
|
|
438
416
|
}
|
|
439
417
|
values() {
|
|
440
|
-
return
|
|
418
|
+
return this.#values.values();
|
|
441
419
|
}
|
|
442
|
-
[
|
|
420
|
+
[Symbol.iterator]() {
|
|
443
421
|
return this.entries();
|
|
444
422
|
}
|
|
423
|
+
[Symbol.toStringTag] = "RekeyableMap";
|
|
445
424
|
rekey(existingKey, newKey) {
|
|
446
|
-
const keyItem =
|
|
425
|
+
const keyItem = this.#keys.get(existingKey);
|
|
447
426
|
if (!keyItem) {
|
|
448
427
|
return false;
|
|
449
428
|
}
|
|
450
|
-
|
|
451
|
-
const newKeyItem =
|
|
429
|
+
this.#keys.delete(existingKey);
|
|
430
|
+
const newKeyItem = this.#keys.get(newKey);
|
|
452
431
|
if (newKeyItem) {
|
|
453
|
-
|
|
432
|
+
this.#values.delete(newKeyItem);
|
|
454
433
|
}
|
|
455
434
|
keyItem.key = newKey;
|
|
456
|
-
|
|
435
|
+
this.#keys.set(newKey, keyItem);
|
|
457
436
|
return true;
|
|
458
437
|
}
|
|
459
438
|
}
|
|
460
|
-
_a = Symbol.toStringTag;
|
|
461
439
|
//# sourceMappingURL=misc.js.map
|