@typespec/compiler 1.5.0-dev.2 → 1.5.0-dev.22
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/generated-defs/TypeSpec.d.ts +2 -2
- package/dist/generated-defs/TypeSpec.d.ts.map +1 -1
- package/dist/manifest.js +2 -2
- package/dist/src/ast/index.d.ts +1 -0
- package/dist/src/ast/index.d.ts.map +1 -1
- package/dist/src/ast/index.js +1 -0
- package/dist/src/ast/index.js.map +1 -1
- package/dist/src/core/code-fixes.d.ts +4 -1
- package/dist/src/core/code-fixes.d.ts.map +1 -1
- package/dist/src/core/code-fixes.js +9 -3
- package/dist/src/core/code-fixes.js.map +1 -1
- package/dist/src/core/compiler-code-fixes/suppress.codefix.d.ts +2 -2
- package/dist/src/core/compiler-code-fixes/suppress.codefix.d.ts.map +1 -1
- package/dist/src/core/compiler-code-fixes/suppress.codefix.js +30 -4
- package/dist/src/core/compiler-code-fixes/suppress.codefix.js.map +1 -1
- package/dist/src/core/diagnostics.d.ts +16 -1
- package/dist/src/core/diagnostics.d.ts.map +1 -1
- package/dist/src/core/diagnostics.js +29 -18
- package/dist/src/core/diagnostics.js.map +1 -1
- package/dist/src/core/helpers/index.d.ts +1 -0
- package/dist/src/core/helpers/index.d.ts.map +1 -1
- package/dist/src/core/helpers/index.js +1 -0
- package/dist/src/core/helpers/index.js.map +1 -1
- package/dist/src/core/helpers/raw-text-cache.d.ts +5 -0
- package/dist/src/core/helpers/raw-text-cache.d.ts.map +1 -0
- package/dist/src/core/helpers/raw-text-cache.js +34 -0
- package/dist/src/core/helpers/raw-text-cache.js.map +1 -0
- package/dist/src/core/helpers/type-name-utils.d.ts.map +1 -1
- package/dist/src/core/helpers/type-name-utils.js +14 -3
- package/dist/src/core/helpers/type-name-utils.js.map +1 -1
- package/dist/src/core/inspector/node.js +8 -2
- package/dist/src/core/inspector/node.js.map +1 -1
- package/dist/src/core/linter-rules/unused-using.rule.d.ts.map +1 -1
- package/dist/src/core/linter-rules/unused-using.rule.js +4 -4
- package/dist/src/core/linter-rules/unused-using.rule.js.map +1 -1
- package/dist/src/core/linter.d.ts +1 -2
- package/dist/src/core/linter.d.ts.map +1 -1
- package/dist/src/core/linter.js +4 -4
- package/dist/src/core/linter.js.map +1 -1
- package/dist/src/core/program.d.ts.map +1 -1
- package/dist/src/core/program.js +4 -3
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/schema-validator.d.ts.map +1 -1
- package/dist/src/core/schema-validator.js +1 -0
- package/dist/src/core/schema-validator.js.map +1 -1
- package/dist/src/core/source-loader.d.ts +1 -1
- package/dist/src/core/source-loader.d.ts.map +1 -1
- package/dist/src/core/source-loader.js +6 -2
- package/dist/src/core/source-loader.js.map +1 -1
- package/dist/src/core/types.d.ts +1 -1
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/index.d.ts +3 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/internals/index.d.ts +1 -0
- package/dist/src/internals/index.d.ts.map +1 -1
- package/dist/src/internals/index.js +1 -0
- package/dist/src/internals/index.js.map +1 -1
- package/dist/src/lib/decorators.d.ts +3 -3
- package/dist/src/lib/decorators.d.ts.map +1 -1
- package/dist/src/lib/decorators.js +5 -6
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/module-resolver/index.d.ts +3 -0
- package/dist/src/module-resolver/index.d.ts.map +1 -0
- package/dist/src/module-resolver/index.js +2 -0
- package/dist/src/module-resolver/index.js.map +1 -0
- package/dist/src/module-resolver/module-resolver.d.ts +3 -46
- package/dist/src/module-resolver/module-resolver.d.ts.map +1 -1
- package/dist/src/module-resolver/module-resolver.js +25 -94
- package/dist/src/module-resolver/module-resolver.js.map +1 -1
- package/dist/src/module-resolver/node-package-resolver.d.ts +24 -0
- package/dist/src/module-resolver/node-package-resolver.d.ts.map +1 -0
- package/dist/src/module-resolver/node-package-resolver.js +56 -0
- package/dist/src/module-resolver/node-package-resolver.js.map +1 -0
- package/dist/src/module-resolver/types.d.ts +47 -0
- package/dist/src/module-resolver/types.d.ts.map +1 -0
- package/dist/src/module-resolver/types.js +2 -0
- package/dist/src/module-resolver/types.js.map +1 -0
- package/dist/src/module-resolver/utils.d.ts +9 -0
- package/dist/src/module-resolver/utils.d.ts.map +1 -1
- package/dist/src/module-resolver/utils.js +53 -0
- package/dist/src/module-resolver/utils.js.map +1 -1
- package/dist/src/runner.js +1 -1
- package/dist/src/runner.js.map +1 -1
- package/dist/src/server/client-config-provider.d.ts +1 -0
- package/dist/src/server/client-config-provider.d.ts.map +1 -1
- package/dist/src/server/client-config-provider.js +3 -10
- package/dist/src/server/client-config-provider.js.map +1 -1
- package/dist/src/server/compile-service.d.ts +1 -1
- package/dist/src/server/compile-service.d.ts.map +1 -1
- package/dist/src/server/compile-service.js +12 -51
- package/dist/src/server/compile-service.js.map +1 -1
- package/dist/src/server/completion.js +6 -6
- package/dist/src/server/completion.js.map +1 -1
- package/dist/src/server/entrypoint-resolver.d.ts +5 -0
- package/dist/src/server/entrypoint-resolver.d.ts.map +1 -0
- package/dist/src/server/entrypoint-resolver.js +67 -0
- package/dist/src/server/entrypoint-resolver.js.map +1 -0
- package/dist/src/server/lib-provider.d.ts.map +1 -1
- package/dist/src/server/lib-provider.js +4 -1
- package/dist/src/server/lib-provider.js.map +1 -1
- package/dist/src/server/serverlib.d.ts.map +1 -1
- package/dist/src/server/serverlib.js +10 -6
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/type-details.js +3 -3
- package/dist/src/server/type-details.js.map +1 -1
- package/dist/src/server/type-signature.js +29 -6
- package/dist/src/server/type-signature.js.map +1 -1
- package/dist/src/testing/rule-tester.d.ts +6 -5
- package/dist/src/testing/rule-tester.d.ts.map +1 -1
- package/dist/src/testing/rule-tester.js +32 -7
- package/dist/src/testing/rule-tester.js.map +1 -1
- package/dist/src/testing/test-compiler-host.d.ts.map +1 -1
- package/dist/src/testing/test-compiler-host.js +16 -7
- package/dist/src/testing/test-compiler-host.js.map +1 -1
- package/dist/src/testing/tester.d.ts.map +1 -1
- package/dist/src/testing/tester.js +47 -18
- package/dist/src/testing/tester.js.map +1 -1
- package/dist/src/testing/types.d.ts +7 -0
- package/dist/src/testing/types.d.ts.map +1 -1
- package/dist/src/testing/types.js.map +1 -1
- package/dist/src/utils/io.d.ts +2 -2
- package/dist/src/utils/io.d.ts.map +1 -1
- package/dist/src/utils/io.js +1 -1
- package/dist/src/utils/io.js.map +1 -1
- package/dist/src/utils/misc.d.ts.map +1 -1
- package/dist/src/utils/misc.js +3 -0
- package/dist/src/utils/misc.js.map +1 -1
- package/lib/std/decorators.tsp +8 -3
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-service.d.ts","sourceRoot":"","sources":["../../../src/server/compile-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"compile-service.d.ts","sourceRoot":"","sources":["../../../src/server/compile-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAYlE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAGL,oBAAoB,EACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;;;OAQG;IACH,OAAO,CACL,QAAQ,EAAE,YAAY,GAAG,sBAAsB,EAC/C,iBAAiB,EAAE,eAAe,GAAG,SAAS,EAC9C,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;IAEtC;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,sBAAsB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAExF;;;;OAIG;IACH,YAAY,CAAC,QAAQ,EAAE,YAAY,GAAG,sBAAsB,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAE5F,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,GAAG,IAAI,CAAC;IAEzE,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACnE;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,aAAa,EAAE,YAAY,CAAC;IACrC,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,oBAAoB,CAAC;CACvD;AAED,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,UAAU,EACV,WAAW,EACX,eAAe,EACf,aAAa,EACb,GAAG,EACH,qBAAqB,GACtB,EAAE,qBAAqB,GAAG,cAAc,CAgQxC"}
|
|
@@ -4,14 +4,13 @@ import { resolveOptionsFromConfig } from "../config/config-to-options.js";
|
|
|
4
4
|
import { builtInLinterRule_UnusedTemplateParameter } from "../core/linter-rules/unused-template-parameter.rule.js";
|
|
5
5
|
import { builtInLinterRule_UnusedUsing } from "../core/linter-rules/unused-using.rule.js";
|
|
6
6
|
import { builtInLinterLibraryName } from "../core/linter.js";
|
|
7
|
-
import { formatDiagnostic } from "../core/logger/console-sink.js";
|
|
8
7
|
import { parse } from "../core/parser.js";
|
|
9
|
-
import { getBaseFileName, getDirectoryPath
|
|
10
|
-
import {
|
|
11
|
-
import { distinctArray, resolveTspMain } from "../utils/misc.js";
|
|
8
|
+
import { getBaseFileName, getDirectoryPath } from "../core/path-utils.js";
|
|
9
|
+
import { distinctArray } from "../utils/misc.js";
|
|
12
10
|
import { getLocationInYamlScript } from "../yaml/diagnostics.js";
|
|
13
11
|
import { parseYaml } from "../yaml/parser.js";
|
|
14
12
|
import { serverOptions } from "./constants.js";
|
|
13
|
+
import { resolveEntrypointFile } from "./entrypoint-resolver.js";
|
|
15
14
|
import { ServerCompileManager, } from "./server-compile-manager.js";
|
|
16
15
|
export function createCompileService({ compilerHost, serverHost, fileService, fileSystemCache, updateManager, log, clientConfigsProvider, }) {
|
|
17
16
|
const eventListeners = new Map();
|
|
@@ -46,6 +45,10 @@ export function createCompileService({ compilerHost, serverHost, fileService, fi
|
|
|
46
45
|
return undefined;
|
|
47
46
|
}
|
|
48
47
|
const mainFile = await getMainFileForDocument(path);
|
|
48
|
+
if (mainFile === undefined) {
|
|
49
|
+
log({ level: "debug", message: `failed to resolve main file for ${path}` });
|
|
50
|
+
return undefined;
|
|
51
|
+
}
|
|
49
52
|
if (!mainFile.endsWith(".tsp")) {
|
|
50
53
|
return undefined;
|
|
51
54
|
}
|
|
@@ -204,6 +207,9 @@ export function createCompileService({ compilerHost, serverHost, fileService, fi
|
|
|
204
207
|
* results can be obtained from compiling the same file with different entry
|
|
205
208
|
* points.
|
|
206
209
|
*
|
|
210
|
+
* Priority is given to processing user-defined files as the entry point,
|
|
211
|
+
* and it has the highest priority.
|
|
212
|
+
*
|
|
207
213
|
* Walk directory structure upwards looking for package.json with tspMain or
|
|
208
214
|
* main.tsp file. Stop search when reaching a workspace root. If a root is
|
|
209
215
|
* reached without finding an entry point, use the given path as its own
|
|
@@ -218,53 +224,8 @@ export function createCompileService({ compilerHost, serverHost, fileService, fi
|
|
|
218
224
|
log({ level: "debug", message: `untitled document treated as its own main file: ${path}` });
|
|
219
225
|
return path;
|
|
220
226
|
}
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
while (true) {
|
|
224
|
-
let mainFile = "main.tsp";
|
|
225
|
-
let pkg;
|
|
226
|
-
const pkgPath = joinPaths(dir, "package.json");
|
|
227
|
-
const cached = await fileSystemCache.get(pkgPath);
|
|
228
|
-
if (cached?.data) {
|
|
229
|
-
pkg = cached.data;
|
|
230
|
-
}
|
|
231
|
-
else {
|
|
232
|
-
[pkg] = await loadFile(compilerHost, pkgPath, JSON.parse, logMainFileSearchDiagnostic, options);
|
|
233
|
-
await fileSystemCache.setData(pkgPath, pkg ?? {});
|
|
234
|
-
}
|
|
235
|
-
const tspMain = resolveTspMain(pkg);
|
|
236
|
-
if (typeof tspMain === "string") {
|
|
237
|
-
log({
|
|
238
|
-
level: "debug",
|
|
239
|
-
message: `tspMain resolved from package.json (${pkgPath}) as ${tspMain}`,
|
|
240
|
-
});
|
|
241
|
-
mainFile = tspMain;
|
|
242
|
-
}
|
|
243
|
-
const candidate = joinPaths(dir, mainFile);
|
|
244
|
-
const stat = await doIO(() => compilerHost.stat(candidate), candidate, logMainFileSearchDiagnostic, options);
|
|
245
|
-
if (stat?.isFile()) {
|
|
246
|
-
log({ level: "debug", message: `main file found as ${candidate}` });
|
|
247
|
-
return candidate;
|
|
248
|
-
}
|
|
249
|
-
const parentDir = getDirectoryPath(dir);
|
|
250
|
-
if (parentDir === dir) {
|
|
251
|
-
break;
|
|
252
|
-
}
|
|
253
|
-
log({
|
|
254
|
-
level: "debug",
|
|
255
|
-
message: `main file not found in ${dir}, search in parent directory ${parentDir}`,
|
|
256
|
-
});
|
|
257
|
-
dir = parentDir;
|
|
258
|
-
}
|
|
259
|
-
log({ level: "debug", message: `reached directory root, using ${path} as main file` });
|
|
260
|
-
return path;
|
|
261
|
-
function logMainFileSearchDiagnostic(diagnostic) {
|
|
262
|
-
log({
|
|
263
|
-
level: `error`,
|
|
264
|
-
message: `Unexpected diagnostic while looking for main file of ${path}`,
|
|
265
|
-
detail: formatDiagnostic(diagnostic),
|
|
266
|
-
});
|
|
267
|
-
}
|
|
227
|
+
const entrypoints = clientConfigsProvider?.config?.entrypoint;
|
|
228
|
+
return resolveEntrypointFile(compilerHost, entrypoints, path, fileSystemCache, log);
|
|
268
229
|
}
|
|
269
230
|
}
|
|
270
231
|
//# sourceMappingURL=compile-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-service.js","sourceRoot":"","sources":["../../../src/server/compile-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAA0B,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAE,yCAAyC,EAAE,MAAM,wDAAwD,CAAC;AACnH,OAAO,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"compile-service.js","sourceRoot":"","sources":["../../../src/server/compile-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAA0B,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAE,yCAAyC,EAAE,MAAM,wDAAwD,CAAC;AACnH,OAAO,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE1E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGjE,OAAO,EAEL,oBAAoB,GAErB,MAAM,6BAA6B,CAAC;AAmDrC,MAAM,UAAU,oBAAoB,CAAC,EACnC,YAAY,EACZ,UAAU,EACV,WAAW,EACX,eAAe,EACf,aAAa,EACb,GAAG,EACH,qBAAqB,GACC;IACtB,MAAM,cAAc,GAAG,IAAI,GAAG,EAAwD,CAAC;IACvF,MAAM,cAAc,GAAG,IAAI,oBAAoB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IAClF,IAAI,cAAkC,CAAC;IAEvC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,YAAY,EAAE,sBAAsB,EAAE,CAAC;IAExE,SAAS,EAAE,CAAC,KAAa,EAAE,QAAkC;QAC3D,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,SAAS,MAAM,CAAC,KAAa,EAAE,GAAG,IAAe;QAC/C,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,SAAS,YAAY,CAAC,QAA+C,EAAE,UAAsB;QAC3F,aAAa,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,UAAU,OAAO,CACpB,QAA+C,EAC/C,iBAA8C,EAC9C,oBAA0C;QAE1C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,YAAY,KAAK,sBAAsB,EAAE,CAAC;YACtE,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,mCAAmC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5E,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;QACzC,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC;QACjC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACpE,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,GAAG,wBAAwB,CAAC,MAAM,EAAE;YAC9D,GAAG,EAAE,gBAAgB,CAAC,IAAI,CAAC;SAC5B,CAAC,CAAC;QACH,MAAM,OAAO,GAAoB;YAC/B,GAAG,iBAAiB;YACpB,GAAG,aAAa;YAChB,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC;SAC7B,CAAC;QAEF,8DAA8D;QAC9D,qFAAqF;QACrF,IAAI,iBAAiB,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,qBAAqB,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC;YAC7D,MAAM,eAAe,GAAG,mBAAmB,CAAC;YAC5C,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,eAAe,CAAC,EAAE,CAAC;oBACnD,sIAAsI;oBACtI,OAAO,CAAC,IAAI,GAAG,aAAa,CAC1B,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,eAAe,CAAC,CAAC,EAC9E,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACT,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,8DAA8D;oBAC9D,OAAO,CAAC,IAAI,GAAG,WAAW,CAAC;gBAC7B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,oGAAoG;gBACpG,+CAA+C;gBAC/C,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;QAED,0EAA0E;QAC1E,MAAM,eAAe,GAAG,GAAG,wBAAwB,IAAI,6BAA6B,EAAE,CAAC;QACvF,IACE,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,eAAe,CAAC,KAAK,SAAS;YAC9D,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,CAAC,eAAe,CAAC,KAAK,SAAS,EAC/D,CAAC;YACD,OAAO,CAAC,aAAa,KAAK,EAAE,CAAC;YAC7B,OAAO,CAAC,aAAa,CAAC,MAAM,KAAK,EAAE,CAAC;YACpC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;QACvD,CAAC;QAED,uFAAuF;QACvF,MAAM,2BAA2B,GAAG,GAAG,wBAAwB,IAAI,yCAAyC,EAAE,CAAC;QAC/G,IACE,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,2BAA2B,CAAC,KAAK,SAAS;YAC1E,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,CAAC,2BAA2B,CAAC,KAAK,SAAS,EAC3E,CAAC;YACD,OAAO,CAAC,aAAa,KAAK,EAAE,CAAC;YAC7B,OAAO,CAAC,aAAa,CAAC,MAAM,KAAK,EAAE,CAAC;YACpC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC;QACnE,CAAC;QAED,MAAM,sBAAsB,GAAG,GAAG,EAAE;YAClC,OAAO,oBAAoB,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACjF,CAAC,CAAC;QAEF,IAAI,sBAAsB,EAAE,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,OAAuB,CAAC;QAC5B,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;YAChF,IAAI,OAAO,GAAG,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC/C,IAAI,sBAAsB,EAAE,EAAE,CAAC;gBAC7B,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,IACE,QAAQ,KAAK,IAAI;gBACjB,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC;gBAC9B,YAAY,KAAK,sBAAsB,EACvC,CAAC;gBACD,qEAAqE;gBACrE,sDAAsD;gBACtD,GAAG,CAAC;oBACF,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,6DAA6D,IAAI,wBAAwB;iBACnG,CAAC,CAAC;gBACH,OAAO,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBAC5E,OAAO,GAAG,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC7C,CAAC;YACD,IAAI,sBAAsB,EAAE,EAAE,CAAC;gBAC7B,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,MAAM,GAAG,GAAG,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC7F,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAE7C,MAAM,MAAM,GAAkB,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC;YAC7F,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC7B,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,UAAU,CAAC,mBAAmB,EAAE,CAAC;gBACnC,MAAM,GAAG,CAAC;YACZ,CAAC;YAED,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;YACvB,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACrC,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,cAAc,EAAE,CAAC;gBAClF,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC3C,MAAM,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,MAAM,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;gBACvF,MAAM,MAAM,GAAG,uBAAuB,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC;gBACjF,IAAI,MAAM,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;oBACrB,GAAG,CAAC;wBACF,KAAK,EAAE,OAAO;wBACd,OAAO,EAAE,6CAA6C,WAAW,qBAAqB,cAAc,GAAG;qBACxG,CAAC,CAAC;gBACL,CAAC;gBACD,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBACzC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC1E,KAAK,GAAG,KAAK,CAAC,MAAM,CAClB,WAAW,CAAC,IAAI,EAChB,WAAW,CAAC,SAAS,EACrB,WAAW,CAAC,IAAI,EAChB,WAAW,CAAC,SAAS,GAAG,WAAW,CAAC,MAAM,CAC3C,CAAC;YACJ,CAAC;YAED,UAAU,CAAC,eAAe,CAAC;gBACzB,GAAG;gBACH,WAAW,EAAE;oBACX;wBACE,QAAQ,EAAE,kBAAkB,CAAC,KAAK;wBAClC,KAAK;wBACL,OAAO,EACL,CAAC,GAAG,CAAC,IAAI,KAAK,eAAe;4BAC3B,CAAC,CAAC,4BAA4B;4BAC9B,CAAC,CAAC,mFAAmF,CAAC;4BACxF,GAAG,CAAC,KAAK;qBACZ;iBACF;aACF,CAAC,CAAC;YAEH,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,KAAK,UAAU,SAAS,CAAC,QAAgB;QACvC,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvF,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAC/E,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,GAAG,CAAC;gBACF,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,6DAA6D;aACvE,CAAC,CAAC;YACH,OAAO,EAAE,GAAG,aAAa,EAAE,WAAW,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvE,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/D,IAAI,MAAM,EAAE,IAAI,EAAE,CAAC;YACjB,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACtE,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,UAAU,SAAS,CACtB,QAA+C;QAE/C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,MAAM,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9E,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC3C,OAAO,MAAM,CAAC;QAChB,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,KAAK,UAAU,sBAAsB,CAAC,IAAY;QAChD,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,mDAAmD,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5F,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,WAAW,GAAG,qBAAqB,EAAE,MAAM,EAAE,UAAU,CAAC;QAC9D,OAAO,qBAAqB,CAAC,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;IACtF,CAAC;AACH,CAAC"}
|
|
@@ -112,7 +112,7 @@ async function AddCompletionNonTrivia(node, context, posDetail, lookBackward = t
|
|
|
112
112
|
break;
|
|
113
113
|
case SyntaxKind.Identifier:
|
|
114
114
|
addDirectiveCompletion(context, node);
|
|
115
|
-
addIdentifierCompletion(context, node);
|
|
115
|
+
await addIdentifierCompletion(context, node);
|
|
116
116
|
break;
|
|
117
117
|
case SyntaxKind.StringLiteral:
|
|
118
118
|
if (node.parent && node.parent.kind === SyntaxKind.ImportStatement) {
|
|
@@ -122,7 +122,7 @@ async function AddCompletionNonTrivia(node, context, posDetail, lookBackward = t
|
|
|
122
122
|
case SyntaxKind.ModelStatement:
|
|
123
123
|
case SyntaxKind.ObjectLiteral:
|
|
124
124
|
case SyntaxKind.ModelExpression:
|
|
125
|
-
addModelCompletion(context, posDetail);
|
|
125
|
+
await addModelCompletion(context, posDetail);
|
|
126
126
|
break;
|
|
127
127
|
}
|
|
128
128
|
}
|
|
@@ -262,7 +262,7 @@ async function addRelativePathCompletion({ program, completions, file }, node) {
|
|
|
262
262
|
}
|
|
263
263
|
}
|
|
264
264
|
}
|
|
265
|
-
function addModelCompletion(context, posDetail) {
|
|
265
|
+
async function addModelCompletion(context, posDetail) {
|
|
266
266
|
const node = posDetail.node;
|
|
267
267
|
if (!node ||
|
|
268
268
|
(node.kind !== SyntaxKind.ModelStatement &&
|
|
@@ -291,13 +291,13 @@ function addModelCompletion(context, posDetail) {
|
|
|
291
291
|
flags: 0 /* NodeFlags.None */,
|
|
292
292
|
parent: fakeProp,
|
|
293
293
|
};
|
|
294
|
-
addIdentifierCompletion(context, fakeId);
|
|
294
|
+
await addIdentifierCompletion(context, fakeId);
|
|
295
295
|
}
|
|
296
296
|
}
|
|
297
297
|
/**
|
|
298
298
|
* Add completion options for an identifier.
|
|
299
299
|
*/
|
|
300
|
-
function addIdentifierCompletion({ program, completions }, node) {
|
|
300
|
+
async function addIdentifierCompletion({ program, completions }, node) {
|
|
301
301
|
const result = program.checker.resolveCompletions(node);
|
|
302
302
|
if (result.size === 0) {
|
|
303
303
|
return;
|
|
@@ -322,7 +322,7 @@ function addIdentifierCompletion({ program, completions }, node) {
|
|
|
322
322
|
kind = getCompletionItemKind(program, type);
|
|
323
323
|
deprecated = getDeprecationDetails(program, type) !== undefined;
|
|
324
324
|
}
|
|
325
|
-
const documentation = getSymbolDetails(program, sym);
|
|
325
|
+
const documentation = await getSymbolDetails(program, sym);
|
|
326
326
|
const item = {
|
|
327
327
|
label: label ?? key,
|
|
328
328
|
documentation: documentation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/server/completion.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/server/completion.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { SystemHost } from "../core/types.js";
|
|
2
|
+
import { FileSystemCache } from "./file-system-cache.js";
|
|
3
|
+
import { ServerLog } from "./types.js";
|
|
4
|
+
export declare function resolveEntrypointFile(host: SystemHost, entrypoints: string[] | undefined | null, path: string, fileSystemCache: FileSystemCache | undefined, log: (log: ServerLog) => void): Promise<string | undefined>;
|
|
5
|
+
//# sourceMappingURL=entrypoint-resolver.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entrypoint-resolver.d.ts","sourceRoot":"","sources":["../../../src/server/entrypoint-resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAoC,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,UAAU,EAChB,WAAW,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI,EACxC,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,eAAe,GAAG,SAAS,EAC5C,GAAG,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,GAC5B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA6E7B"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { formatDiagnostic } from "../core/logger/console-sink.js";
|
|
2
|
+
import { getDirectoryPath, joinPaths } from "../core/path-utils.js";
|
|
3
|
+
import { doIO, loadFile } from "../utils/io.js";
|
|
4
|
+
import { resolveTspMain } from "../utils/misc.js";
|
|
5
|
+
export async function resolveEntrypointFile(host, entrypoints, path, fileSystemCache, log) {
|
|
6
|
+
const options = { allowFileNotFound: true };
|
|
7
|
+
const pathStat = await doIO(() => host.stat(path), path, logMainFileSearchDiagnostic, options);
|
|
8
|
+
const isFilePath = pathStat?.isFile() ?? false;
|
|
9
|
+
let dir = isFilePath ? getDirectoryPath(path) : path;
|
|
10
|
+
if (!entrypoints) {
|
|
11
|
+
entrypoints = ["main.tsp"];
|
|
12
|
+
}
|
|
13
|
+
while (true) {
|
|
14
|
+
let pkg;
|
|
15
|
+
const pkgPath = joinPaths(dir, "package.json");
|
|
16
|
+
const cached = await fileSystemCache?.get(pkgPath);
|
|
17
|
+
if (cached?.data) {
|
|
18
|
+
pkg = cached.data;
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
[pkg] = await loadFile(host, pkgPath, JSON.parse, logMainFileSearchDiagnostic, options);
|
|
22
|
+
await fileSystemCache?.setData(pkgPath, pkg ?? {});
|
|
23
|
+
}
|
|
24
|
+
const tspMain = resolveTspMain(pkg);
|
|
25
|
+
if (typeof tspMain === "string") {
|
|
26
|
+
log({
|
|
27
|
+
level: "debug",
|
|
28
|
+
message: `tspMain resolved from package.json (${pkgPath}) as ${tspMain}`,
|
|
29
|
+
});
|
|
30
|
+
const packageJsonEntrypoint = await existingFile(dir, tspMain);
|
|
31
|
+
if (packageJsonEntrypoint) {
|
|
32
|
+
log({ level: "debug", message: `entrypoint file found as ${packageJsonEntrypoint}` });
|
|
33
|
+
return packageJsonEntrypoint;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
for (const entrypoint of entrypoints) {
|
|
37
|
+
const candidate = await existingFile(dir, entrypoint);
|
|
38
|
+
if (candidate) {
|
|
39
|
+
log({
|
|
40
|
+
level: "debug",
|
|
41
|
+
message: `main file found using client provided entrypoint: ${candidate}`,
|
|
42
|
+
});
|
|
43
|
+
return candidate;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const parentDir = getDirectoryPath(dir);
|
|
47
|
+
if (parentDir === dir) {
|
|
48
|
+
break;
|
|
49
|
+
}
|
|
50
|
+
dir = parentDir;
|
|
51
|
+
}
|
|
52
|
+
log({ level: "debug", message: `reached directory root, using '${path}' as main file` });
|
|
53
|
+
return isFilePath ? path : undefined;
|
|
54
|
+
function logMainFileSearchDiagnostic(diagnostic) {
|
|
55
|
+
log({
|
|
56
|
+
level: `error`,
|
|
57
|
+
message: `Unexpected diagnostic while looking for main file of ${path}`,
|
|
58
|
+
detail: formatDiagnostic(diagnostic),
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
async function existingFile(dir, file) {
|
|
62
|
+
const candidate = joinPaths(dir, file);
|
|
63
|
+
const stat = await doIO(() => host.stat(candidate), candidate, logMainFileSearchDiagnostic, options);
|
|
64
|
+
return stat?.isFile() ? candidate : undefined;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=entrypoint-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entrypoint-resolver.js","sourceRoot":"","sources":["../../../src/server/entrypoint-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib-provider.d.ts","sourceRoot":"","sources":["../../../src/server/lib-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE3E,qBAAa,eAAe;IAGxB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,MAAM;IAHhB,OAAO,CAAC,2BAA2B,CAA8B;gBAEvD,kBAAkB,EAAE,kBAAkB,EACtC,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO;IAG9D;;;;OAIG;IACG,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAsB7E;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;YAQzE,kBAAkB;
|
|
1
|
+
{"version":3,"file":"lib-provider.d.ts","sourceRoot":"","sources":["../../../src/server/lib-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE3E,qBAAa,eAAe;IAGxB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,MAAM;IAHhB,OAAO,CAAC,2BAA2B,CAA8B;gBAEvD,kBAAkB,EAAE,kBAAkB,EACtC,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO;IAG9D;;;;OAIG;IACG,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAsB7E;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;YAQzE,kBAAkB;YA4BlB,iBAAiB;CAQhC"}
|
|
@@ -54,7 +54,10 @@ export class LibraryProvider {
|
|
|
54
54
|
// don't add to cache when failing to load package.json which is unexpected
|
|
55
55
|
if (!data)
|
|
56
56
|
return false;
|
|
57
|
-
|
|
57
|
+
// Only check dependencies and peerDependencies for @typespec/compiler and exclude devDependencies
|
|
58
|
+
// to further limit the libraries to load and avoid potential issues cause by loading random libraries.
|
|
59
|
+
// TODO: add more filter condition when needed
|
|
60
|
+
if ((data.peerDependencies && data.peerDependencies["@typespec/compiler"]) ||
|
|
58
61
|
(data.dependencies && data.dependencies["@typespec/compiler"])) {
|
|
59
62
|
const exports = await pkg.getModuleExports();
|
|
60
63
|
// don't add to cache when failing to load exports which is unexpected
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib-provider.js","sourceRoot":"","sources":["../../../src/server/lib-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,OAAO,eAAe;IAGhB;IACA;IAHF,2BAA2B,GAAG,IAAI,GAAG,EAAmB,CAAC;IACjE,YACU,kBAAsC,EACtC,MAAoD;QADpD,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,WAAM,GAAN,MAAM,CAA8C;IAC3D,CAAC;IAEJ;;;;OAIG;IACH,KAAK,CAAC,aAAa,CAAC,WAAmB;QACrC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC1F,IAAI,CAAC,iBAAiB;YAAE,OAAO,EAAE,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,GAAG,EAAE,kBAAkB,EAAE,CAAC;QAC7C,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,MAAM,IAAI,GAA+B,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG;YACb,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;YAC5B,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;SAChC,CAAC;QACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;YACpE,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;YACrB,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,WAAmB,EAAE,OAAe;QACnD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC1F,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,OAAe,EAAE,GAAe;QAC/D,IAAI,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAClD,OAAO,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC;QAC5C,2EAA2E;QAC3E,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,IACE,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"lib-provider.js","sourceRoot":"","sources":["../../../src/server/lib-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverlib.d.ts","sourceRoot":"","sources":["../../../src/server/serverlib.ts"],"names":[],"mappings":"AAuGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAkBnE,OAAO,EAML,MAAM,EAGN,UAAU,EAKX,MAAM,YAAY,CAAC;AAGpB,wBAAgB,YAAY,CAC1B,IAAI,EAAE,UAAU,EAChB,qBAAqB,CAAC,EAAE,oBAAoB,GAC3C,MAAM,
|
|
1
|
+
{"version":3,"file":"serverlib.d.ts","sourceRoot":"","sources":["../../../src/server/serverlib.ts"],"names":[],"mappings":"AAuGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAkBnE,OAAO,EAML,MAAM,EAGN,UAAU,EAKX,MAAM,YAAY,CAAC;AAGpB,wBAAgB,YAAY,CAC1B,IAAI,EAAE,UAAU,EAChB,qBAAqB,CAAC,EAAE,oBAAoB,GAC3C,MAAM,CA4zCR"}
|
|
@@ -18,7 +18,7 @@ import { getTypeSpecCoreTemplates } from "../init/core-templates.js";
|
|
|
18
18
|
import { validateTemplateDefinitions } from "../init/init-template-validate.js";
|
|
19
19
|
import { scaffoldNewProject } from "../init/scaffold.js";
|
|
20
20
|
import { typespecVersion } from "../manifest.js";
|
|
21
|
-
import { resolveModule } from "../module-resolver/
|
|
21
|
+
import { resolveModule } from "../module-resolver/index.js";
|
|
22
22
|
import { listAllFilesInDir } from "../utils/fs-utils.js";
|
|
23
23
|
import { getNormalizedRealPath, resolveTspMain } from "../utils/misc.js";
|
|
24
24
|
import { getSemanticTokens } from "./classify.js";
|
|
@@ -362,6 +362,10 @@ export function createServer(host, clientConfigsProvider) {
|
|
|
362
362
|
}
|
|
363
363
|
}
|
|
364
364
|
const mainFile = await compileService.getMainFileForDocument(await fileService.getPath({ uri: firstFilePath.newUri }));
|
|
365
|
+
if (mainFile === undefined) {
|
|
366
|
+
log({ level: "debug", message: `failed to resolve main file for ${firstFilePath.newUri}` });
|
|
367
|
+
return;
|
|
368
|
+
}
|
|
365
369
|
// There will be no event triggered if the renamed file is not opened in vscode, also even when it's opened
|
|
366
370
|
// there will be only closed and opened event triggered for the old and new file url, so send fire the update
|
|
367
371
|
// explicitly here to make sure the change is not missed.
|
|
@@ -645,7 +649,7 @@ export function createServer(host, clientConfigsProvider) {
|
|
|
645
649
|
const markdown = {
|
|
646
650
|
kind: MarkupKind.Markdown,
|
|
647
651
|
value: sym && sym.length > 0
|
|
648
|
-
? getSymbolDetails(program, sym[0], {
|
|
652
|
+
? await getSymbolDetails(program, sym[0], {
|
|
649
653
|
includeSignature: true,
|
|
650
654
|
includeParameterTags: true,
|
|
651
655
|
includeExpandedDefinition,
|
|
@@ -684,7 +688,7 @@ export function createServer(host, clientConfigsProvider) {
|
|
|
684
688
|
compilerAssert(false, "Unreachable");
|
|
685
689
|
}
|
|
686
690
|
}
|
|
687
|
-
function getSignatureHelpForTemplate(program, node, argumentIndex) {
|
|
691
|
+
async function getSignatureHelpForTemplate(program, node, argumentIndex) {
|
|
688
692
|
const sym = program.checker.resolveRelatedSymbols(node.target.kind === SyntaxKind.MemberExpression ? node.target.id : node.target);
|
|
689
693
|
if (!sym || sym.length <= 0) {
|
|
690
694
|
return undefined;
|
|
@@ -715,7 +719,7 @@ export function createServer(host, clientConfigsProvider) {
|
|
|
715
719
|
activeSignature: 0,
|
|
716
720
|
activeParameter: 0,
|
|
717
721
|
};
|
|
718
|
-
const doc = getSymbolDetails(program, sym[0], {
|
|
722
|
+
const doc = await getSymbolDetails(program, sym[0], {
|
|
719
723
|
includeSignature: false,
|
|
720
724
|
includeParameterTags: false,
|
|
721
725
|
});
|
|
@@ -724,7 +728,7 @@ export function createServer(host, clientConfigsProvider) {
|
|
|
724
728
|
}
|
|
725
729
|
return help;
|
|
726
730
|
}
|
|
727
|
-
function getSignatureHelpForDecorator(program, node, argumentIndex) {
|
|
731
|
+
async function getSignatureHelpForDecorator(program, node, argumentIndex) {
|
|
728
732
|
const sym = program.checker.resolveRelatedSymbols(node.target.kind === SyntaxKind.MemberExpression ? node.target.id : node.target);
|
|
729
733
|
if (!sym || sym.length <= 0) {
|
|
730
734
|
return undefined;
|
|
@@ -769,7 +773,7 @@ export function createServer(host, clientConfigsProvider) {
|
|
|
769
773
|
activeSignature: 0,
|
|
770
774
|
activeParameter: 0,
|
|
771
775
|
};
|
|
772
|
-
const doc = getSymbolDetails(program, sym[0], {
|
|
776
|
+
const doc = await getSymbolDetails(program, sym[0], {
|
|
773
777
|
includeSignature: false,
|
|
774
778
|
includeParameterTags: false,
|
|
775
779
|
});
|