@nifrajs/cli 4.0.2 → 5.0.0
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/README.md +3 -0
- package/dist/agent-files.d.ts +107 -0
- package/dist/agent-files.d.ts.map +1 -0
- package/dist/agent-files.js +162 -0
- package/dist/agent-files.js.map +1 -0
- package/dist/app-files.d.ts +6 -0
- package/dist/app-files.d.ts.map +1 -1
- package/dist/app-files.js +27 -2
- package/dist/app-files.js.map +1 -1
- package/dist/assure-hydration.d.ts.map +1 -1
- package/dist/assure-hydration.js +7 -2
- package/dist/assure-hydration.js.map +1 -1
- package/dist/capabilities-tool.d.ts.map +1 -1
- package/dist/capabilities-tool.js +13 -3
- package/dist/capabilities-tool.js.map +1 -1
- package/dist/check-diagnostics.d.ts +20 -2
- package/dist/check-diagnostics.d.ts.map +1 -1
- package/dist/check-diagnostics.js +54 -7
- package/dist/check-diagnostics.js.map +1 -1
- package/dist/check-scan.d.ts +75 -22
- package/dist/check-scan.d.ts.map +1 -1
- package/dist/check-scan.js +1475 -310
- package/dist/check-scan.js.map +1 -1
- package/dist/check.d.ts +2 -2
- package/dist/check.d.ts.map +1 -1
- package/dist/check.js +192 -65
- package/dist/check.js.map +1 -1
- package/dist/cli.d.ts +7 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +112 -5
- package/dist/cli.js.map +1 -1
- package/dist/client-module.d.ts +18 -0
- package/dist/client-module.d.ts.map +1 -0
- package/dist/client-module.js +49 -0
- package/dist/client-module.js.map +1 -0
- package/dist/command-catalog.d.ts +16 -5
- package/dist/command-catalog.d.ts.map +1 -1
- package/dist/command-catalog.js +133 -29
- package/dist/command-catalog.js.map +1 -1
- package/dist/component-check.d.ts +13 -0
- package/dist/component-check.d.ts.map +1 -0
- package/dist/component-check.js +59 -0
- package/dist/component-check.js.map +1 -0
- package/dist/contract-proof.d.ts +1 -1
- package/dist/contract-proof.d.ts.map +1 -1
- package/dist/contract-proof.js +2 -24
- package/dist/contract-proof.js.map +1 -1
- package/dist/contracts.d.ts +19 -0
- package/dist/contracts.d.ts.map +1 -1
- package/dist/contracts.js +50 -3
- package/dist/contracts.js.map +1 -1
- package/dist/db-tool.d.ts.map +1 -1
- package/dist/db-tool.js +4 -3
- package/dist/db-tool.js.map +1 -1
- package/dist/dev-bun-config.d.ts +5 -1
- package/dist/dev-bun-config.d.ts.map +1 -1
- package/dist/dev-bun-config.js +44 -11
- package/dist/dev-bun-config.js.map +1 -1
- package/dist/diagnostics.d.ts +3 -0
- package/dist/diagnostics.d.ts.map +1 -1
- package/dist/diagnostics.js.map +1 -1
- package/dist/diff-tool.d.ts +9 -8
- package/dist/diff-tool.d.ts.map +1 -1
- package/dist/diff-tool.js +28 -24
- package/dist/diff-tool.js.map +1 -1
- package/dist/doctor.d.ts +13 -0
- package/dist/doctor.d.ts.map +1 -1
- package/dist/doctor.js +23 -15
- package/dist/doctor.js.map +1 -1
- package/dist/env-file.d.ts +6 -0
- package/dist/env-file.d.ts.map +1 -1
- package/dist/env-file.js +6 -0
- package/dist/env-file.js.map +1 -1
- package/dist/fix-recipes.d.ts.map +1 -1
- package/dist/fix-recipes.js +21 -2
- package/dist/fix-recipes.js.map +1 -1
- package/dist/hand-built-manifest.d.ts +27 -0
- package/dist/hand-built-manifest.d.ts.map +1 -0
- package/dist/hand-built-manifest.js +124 -0
- package/dist/hand-built-manifest.js.map +1 -0
- package/dist/hooks-report.d.ts +23 -0
- package/dist/hooks-report.d.ts.map +1 -0
- package/dist/hooks-report.js +104 -0
- package/dist/hooks-report.js.map +1 -0
- package/dist/init-agents.d.ts +2 -2
- package/dist/init-agents.d.ts.map +1 -1
- package/dist/init-agents.js +17 -11
- package/dist/init-agents.js.map +1 -1
- package/dist/internal/nifra-project.d.ts +41 -0
- package/dist/internal/nifra-project.d.ts.map +1 -0
- package/dist/internal/nifra-project.js +183 -0
- package/dist/internal/nifra-project.js.map +1 -0
- package/dist/internal/project-specifiers.d.ts +16 -0
- package/dist/internal/project-specifiers.d.ts.map +1 -0
- package/dist/internal/project-specifiers.js +396 -0
- package/dist/internal/project-specifiers.js.map +1 -0
- package/dist/internal/script-kind.d.ts.map +1 -1
- package/dist/internal/script-kind.js +2 -1
- package/dist/internal/script-kind.js.map +1 -1
- package/dist/internal/source-facts.d.ts +2 -0
- package/dist/internal/source-facts.d.ts.map +1 -1
- package/dist/internal/source-facts.js +11 -0
- package/dist/internal/source-facts.js.map +1 -1
- package/dist/internal/typescript-import.d.ts +1 -1
- package/dist/internal/typescript-import.d.ts.map +1 -1
- package/dist/internal/typescript-import.js +5 -3
- package/dist/internal/typescript-import.js.map +1 -1
- package/dist/introspect.d.ts +6 -6
- package/dist/introspect.d.ts.map +1 -1
- package/dist/introspect.js +55 -24
- package/dist/introspect.js.map +1 -1
- package/dist/levels-tool.d.ts.map +1 -1
- package/dist/levels-tool.js +93 -15
- package/dist/levels-tool.js.map +1 -1
- package/dist/load.d.ts +31 -8
- package/dist/load.d.ts.map +1 -1
- package/dist/load.js +37 -7
- package/dist/load.js.map +1 -1
- package/dist/mcp-context.d.ts +5 -5
- package/dist/mcp-context.d.ts.map +1 -1
- package/dist/mcp-context.js +2 -2
- package/dist/mcp-context.js.map +1 -1
- package/dist/mcp-exec.d.ts +12 -4
- package/dist/mcp-exec.d.ts.map +1 -1
- package/dist/mcp-exec.js +50 -13
- package/dist/mcp-exec.js.map +1 -1
- package/dist/mcp-http.js +1 -1
- package/dist/mcp-io.d.ts +17 -0
- package/dist/mcp-io.d.ts.map +1 -1
- package/dist/mcp-io.js +40 -0
- package/dist/mcp-io.js.map +1 -1
- package/dist/mcp-isolate.d.ts.map +1 -1
- package/dist/mcp-isolate.js +3 -2
- package/dist/mcp-isolate.js.map +1 -1
- package/dist/mcp-project-child.js +1 -1
- package/dist/mcp-project-child.js.map +1 -1
- package/dist/mcp-root.d.ts.map +1 -1
- package/dist/mcp-root.js +50 -10
- package/dist/mcp-root.js.map +1 -1
- package/dist/mcp-ws.d.ts.map +1 -1
- package/dist/mcp-ws.js +3 -1
- package/dist/mcp-ws.js.map +1 -1
- package/dist/mcp.d.ts.map +1 -1
- package/dist/mcp.js +8 -2
- package/dist/mcp.js.map +1 -1
- package/dist/migrate-layout.d.ts +7 -0
- package/dist/migrate-layout.d.ts.map +1 -1
- package/dist/migrate-layout.js +778 -64
- package/dist/migrate-layout.js.map +1 -1
- package/dist/output-schemas.d.ts +94 -0
- package/dist/output-schemas.d.ts.map +1 -0
- package/dist/output-schemas.js +864 -0
- package/dist/output-schemas.js.map +1 -0
- package/dist/port.d.ts.map +1 -1
- package/dist/port.js +3 -2
- package/dist/port.js.map +1 -1
- package/dist/project-facts.d.ts +15 -4
- package/dist/project-facts.d.ts.map +1 -1
- package/dist/project-facts.js +1 -0
- package/dist/project-facts.js.map +1 -1
- package/dist/recipes/5.0.0.d.ts +11 -0
- package/dist/recipes/5.0.0.d.ts.map +1 -0
- package/dist/recipes/5.0.0.js +34 -0
- package/dist/recipes/5.0.0.js.map +1 -0
- package/dist/recipes/index.d.ts +7 -0
- package/dist/recipes/index.d.ts.map +1 -1
- package/dist/recipes/index.js +2 -0
- package/dist/recipes/index.js.map +1 -1
- package/dist/replay.d.ts.map +1 -1
- package/dist/replay.js +12 -3
- package/dist/replay.js.map +1 -1
- package/dist/review.d.ts +3 -1
- package/dist/review.d.ts.map +1 -1
- package/dist/review.js +38 -7
- package/dist/review.js.map +1 -1
- package/dist/rules/codes.d.ts +10 -0
- package/dist/rules/codes.d.ts.map +1 -1
- package/dist/rules/codes.js +10 -0
- package/dist/rules/codes.js.map +1 -1
- package/dist/rules/comment-markers.d.ts +16 -7
- package/dist/rules/comment-markers.d.ts.map +1 -1
- package/dist/rules/comment-markers.js +58 -19
- package/dist/rules/comment-markers.js.map +1 -1
- package/dist/rules/contract-visibility.d.ts +3 -0
- package/dist/rules/contract-visibility.d.ts.map +1 -0
- package/dist/rules/contract-visibility.js +337 -0
- package/dist/rules/contract-visibility.js.map +1 -0
- package/dist/rules/data-guard.d.ts +7 -0
- package/dist/rules/data-guard.d.ts.map +1 -1
- package/dist/rules/data-guard.js +319 -37
- package/dist/rules/data-guard.js.map +1 -1
- package/dist/rules/layout.d.ts +4 -0
- package/dist/rules/layout.d.ts.map +1 -0
- package/dist/rules/layout.js +19 -0
- package/dist/rules/layout.js.map +1 -0
- package/dist/rules/legacy.d.ts.map +1 -1
- package/dist/rules/legacy.js +158 -43
- package/dist/rules/legacy.js.map +1 -1
- package/dist/rules/pages.d.ts +24 -0
- package/dist/rules/pages.d.ts.map +1 -1
- package/dist/rules/pages.js +221 -3
- package/dist/rules/pages.js.map +1 -1
- package/dist/rules/routes.d.ts +6 -0
- package/dist/rules/routes.d.ts.map +1 -1
- package/dist/rules/routes.js +111 -16
- package/dist/rules/routes.js.map +1 -1
- package/dist/rules/secrets.js +2 -2
- package/dist/rules/secrets.js.map +1 -1
- package/dist/rules/security.d.ts +12 -1
- package/dist/rules/security.d.ts.map +1 -1
- package/dist/rules/security.js +281 -68
- package/dist/rules/security.js.map +1 -1
- package/dist/rules/zones.d.ts +13 -0
- package/dist/rules/zones.d.ts.map +1 -1
- package/dist/rules/zones.js +192 -40
- package/dist/rules/zones.js.map +1 -1
- package/dist/scaffold.d.ts.map +1 -1
- package/dist/scaffold.js +6 -4
- package/dist/scaffold.js.map +1 -1
- package/dist/sdk.d.ts.map +1 -1
- package/dist/sdk.js +14 -5
- package/dist/sdk.js.map +1 -1
- package/dist/stylex-migrate.d.ts.map +1 -1
- package/dist/stylex-migrate.js +163 -7
- package/dist/stylex-migrate.js.map +1 -1
- package/dist/test-tool.d.ts.map +1 -1
- package/dist/test-tool.js +12 -3
- package/dist/test-tool.js.map +1 -1
- package/dist/typecheck-coverage.d.ts +20 -0
- package/dist/typecheck-coverage.d.ts.map +1 -0
- package/dist/typecheck-coverage.js +129 -0
- package/dist/typecheck-coverage.js.map +1 -0
- package/dist/upgrade.d.ts +69 -0
- package/dist/upgrade.d.ts.map +1 -1
- package/dist/upgrade.js +420 -77
- package/dist/upgrade.js.map +1 -1
- package/dist/verification-plan.d.ts.map +1 -1
- package/dist/verification-plan.js +11 -0
- package/dist/verification-plan.js.map +1 -1
- package/dist/version-drift.d.ts +22 -0
- package/dist/version-drift.d.ts.map +1 -0
- package/dist/version-drift.js +42 -0
- package/dist/version-drift.js.map +1 -0
- package/dist/web-app-options.d.ts +1 -1
- package/dist/web-app-options.d.ts.map +1 -1
- package/dist/web-app-options.js +1 -1
- package/dist/web-app-options.js.map +1 -1
- package/dist/work-graph.d.ts.map +1 -1
- package/dist/work-graph.js +20 -8
- package/dist/work-graph.js.map +1 -1
- package/docs/examples.json +54 -6
- package/docs/llms-full.txt +1539 -138
- package/docs/types.json +1456 -206
- package/package.json +11 -12
- package/src/agent-files.ts +203 -0
- package/src/app-files.ts +34 -4
- package/src/assure-hydration.ts +15 -2
- package/src/capabilities-tool.ts +15 -3
- package/src/check-diagnostics.ts +73 -9
- package/src/check-scan.ts +1773 -381
- package/src/check.ts +237 -76
- package/src/cli.ts +141 -5
- package/src/client-module.ts +61 -0
- package/src/command-catalog.ts +166 -37
- package/src/component-check.ts +79 -0
- package/src/contract-proof.ts +3 -25
- package/src/contracts.ts +60 -3
- package/src/db-tool.ts +5 -2
- package/src/dev-bun-config.ts +51 -10
- package/src/diagnostics.ts +3 -0
- package/src/diff-tool.ts +33 -26
- package/src/doctor.ts +43 -21
- package/src/env-file.ts +7 -0
- package/src/fix-recipes.ts +25 -2
- package/src/hand-built-manifest.ts +144 -0
- package/src/hooks-report.ts +135 -0
- package/src/init-agents.ts +17 -11
- package/src/internal/nifra-project.ts +191 -0
- package/src/internal/project-specifiers.ts +424 -0
- package/src/internal/script-kind.ts +2 -1
- package/src/internal/source-facts.ts +25 -0
- package/src/internal/typescript-import.ts +10 -3
- package/src/introspect.ts +65 -27
- package/src/levels-tool.ts +117 -20
- package/src/load.ts +78 -14
- package/src/mcp-context.ts +7 -7
- package/src/mcp-exec.ts +60 -17
- package/src/mcp-http.ts +1 -1
- package/src/mcp-io.ts +41 -0
- package/src/mcp-isolate.ts +9 -2
- package/src/mcp-project-child.ts +1 -1
- package/src/mcp-root.ts +58 -8
- package/src/mcp-ws.ts +4 -2
- package/src/mcp.ts +8 -3
- package/src/migrate-layout.ts +885 -63
- package/src/output-schemas.ts +1084 -0
- package/src/port.ts +3 -2
- package/src/project-facts.ts +17 -3
- package/src/recipes/5.0.0.ts +35 -0
- package/src/recipes/index.ts +10 -0
- package/src/replay.ts +14 -3
- package/src/review.ts +39 -10
- package/src/rules/codes.ts +10 -0
- package/src/rules/comment-markers.ts +57 -21
- package/src/rules/contract-visibility.ts +383 -0
- package/src/rules/data-guard.ts +351 -42
- package/src/rules/layout.ts +22 -0
- package/src/rules/legacy.ts +184 -51
- package/src/rules/pages.ts +238 -3
- package/src/rules/routes.ts +124 -16
- package/src/rules/secrets.ts +2 -2
- package/src/rules/security.ts +352 -71
- package/src/rules/zones.ts +205 -38
- package/src/scaffold.ts +6 -4
- package/src/sdk.ts +14 -5
- package/src/stylex-migrate.ts +134 -7
- package/src/test-tool.ts +18 -3
- package/src/typecheck-coverage.ts +134 -0
- package/src/upgrade.ts +487 -71
- package/src/verification-plan.ts +24 -0
- package/src/version-drift.ts +67 -0
- package/src/web-app-options.ts +2 -2
- package/src/work-graph.ts +17 -12
|
@@ -0,0 +1,396 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The first-party file an import specifier names, found the way a bundler finds it: a relative or
|
|
3
|
+
* absolute path, a tsconfig `paths` alias or `baseUrl` name (following `extends`), or a package.json
|
|
4
|
+
* `imports` entry (`#x`). A bare package specifier, a file under `node_modules` and a name that matches
|
|
5
|
+
* nothing resolve to `undefined`, so a check never mistakes a dependency for project code.
|
|
6
|
+
*
|
|
7
|
+
* Never `Bun.resolveSync`: it can install a missing package and remembers answers for the life of the
|
|
8
|
+
* process, and the MCP server is long-lived. A resolver caches what it reads for one check run only.
|
|
9
|
+
*/
|
|
10
|
+
import { readFileSync, realpathSync, statSync } from "node:fs";
|
|
11
|
+
import { basename, dirname, extname, isAbsolute, join } from "node:path";
|
|
12
|
+
const STAR = "\u0000";
|
|
13
|
+
const EXTENSIONS = [".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs", ".json"];
|
|
14
|
+
// TypeScript's ESM convention: `./x.js` names `x.ts` when only the source exists.
|
|
15
|
+
const SOURCE_FOR = {
|
|
16
|
+
".js": [".ts", ".tsx"],
|
|
17
|
+
".jsx": [".tsx"],
|
|
18
|
+
".mjs": [".mts"],
|
|
19
|
+
".cjs": [".cts"],
|
|
20
|
+
};
|
|
21
|
+
// The package.json `imports` conditions a server-side bundle of this project matches, in no order:
|
|
22
|
+
// the target object's own key order decides, as in Node.
|
|
23
|
+
const CONDITIONS = new Set(["bun", "import", "default"]);
|
|
24
|
+
const MAX_EXTENDS = 16;
|
|
25
|
+
/** JSON with comments and trailing commas, as tsconfig files are written. Throws on anything else. */
|
|
26
|
+
export function parseJsonc(text) {
|
|
27
|
+
let code = "";
|
|
28
|
+
for (let i = 0; i < text.length;) {
|
|
29
|
+
const ch = text[i];
|
|
30
|
+
if (ch === '"') {
|
|
31
|
+
let end = i + 1;
|
|
32
|
+
while (end < text.length && text[end] !== '"')
|
|
33
|
+
end += text[end] === "\\" ? 2 : 1;
|
|
34
|
+
code += text.slice(i, end + 1);
|
|
35
|
+
i = end + 1;
|
|
36
|
+
}
|
|
37
|
+
else if (ch === "/" && text[i + 1] === "/") {
|
|
38
|
+
const newline = text.indexOf("\n", i);
|
|
39
|
+
i = newline === -1 ? text.length : newline;
|
|
40
|
+
}
|
|
41
|
+
else if (ch === "/" && text[i + 1] === "*") {
|
|
42
|
+
const close = text.indexOf("*/", i + 2);
|
|
43
|
+
i = close === -1 ? text.length : close + 2;
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
code += ch;
|
|
47
|
+
i += 1;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
let json = "";
|
|
51
|
+
for (let i = 0; i < code.length; i += 1) {
|
|
52
|
+
const ch = code[i];
|
|
53
|
+
if (ch === '"') {
|
|
54
|
+
let end = i + 1;
|
|
55
|
+
while (end < code.length && code[end] !== '"')
|
|
56
|
+
end += code[end] === "\\" ? 2 : 1;
|
|
57
|
+
json += code.slice(i, end + 1);
|
|
58
|
+
i = end;
|
|
59
|
+
}
|
|
60
|
+
else if (ch === "," && /^\s*[}\]]/.test(code.slice(i + 1))) {
|
|
61
|
+
}
|
|
62
|
+
else
|
|
63
|
+
json += ch;
|
|
64
|
+
}
|
|
65
|
+
return JSON.parse(json.replace(/^\uFEFF/, ""));
|
|
66
|
+
}
|
|
67
|
+
const record = (value) => typeof value === "object" && value !== null && !Array.isArray(value)
|
|
68
|
+
? Object.fromEntries(Object.entries(value))
|
|
69
|
+
: undefined;
|
|
70
|
+
const isFile = (path) => statSync(path, { throwIfNoEntry: false })?.isFile() ?? false;
|
|
71
|
+
const real = (path) => {
|
|
72
|
+
try {
|
|
73
|
+
return realpathSync(path);
|
|
74
|
+
}
|
|
75
|
+
catch {
|
|
76
|
+
return path;
|
|
77
|
+
}
|
|
78
|
+
};
|
|
79
|
+
/** The file a path names: as written, its source for a `.js` name, with an extension, or an index. */
|
|
80
|
+
function probe(base) {
|
|
81
|
+
if (isFile(base))
|
|
82
|
+
return base;
|
|
83
|
+
const ext = extname(base);
|
|
84
|
+
for (const source of SOURCE_FOR[ext] ?? []) {
|
|
85
|
+
const candidate = `${base.slice(0, -ext.length)}${source}`;
|
|
86
|
+
if (isFile(candidate))
|
|
87
|
+
return candidate;
|
|
88
|
+
}
|
|
89
|
+
for (const extension of EXTENSIONS)
|
|
90
|
+
if (isFile(`${base}${extension}`))
|
|
91
|
+
return `${base}${extension}`;
|
|
92
|
+
for (const extension of EXTENSIONS) {
|
|
93
|
+
const index = join(base, `index${extension}`);
|
|
94
|
+
if (isFile(index))
|
|
95
|
+
return index;
|
|
96
|
+
}
|
|
97
|
+
return undefined;
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* `file` written the way `written` names `found`: as is, without its extension, as its folder when
|
|
101
|
+
* `found` is an index, or with the `.js` name of a `.ts` source.
|
|
102
|
+
*/
|
|
103
|
+
function sameStyle(written, found, file) {
|
|
104
|
+
if (written === found)
|
|
105
|
+
return file;
|
|
106
|
+
const ext = extname(file);
|
|
107
|
+
const bare = file.slice(0, file.length - ext.length);
|
|
108
|
+
if (found.startsWith(`${written}/index.`) || found.startsWith(`${written}\\index.`))
|
|
109
|
+
return basename(file).startsWith("index.") ? dirname(file) : bare;
|
|
110
|
+
if (found.startsWith(written))
|
|
111
|
+
return bare;
|
|
112
|
+
const writtenExt = extname(written);
|
|
113
|
+
return SOURCE_FOR[writtenExt] === undefined ? file : `${bare}${writtenExt}`;
|
|
114
|
+
}
|
|
115
|
+
/** Longest-prefix `*` match, TypeScript's rule for `paths` and Node's for `imports`. */
|
|
116
|
+
function matchPattern(patterns, specifier) {
|
|
117
|
+
if (patterns.includes(specifier))
|
|
118
|
+
return { pattern: specifier, star: undefined };
|
|
119
|
+
let best;
|
|
120
|
+
for (const pattern of patterns) {
|
|
121
|
+
const at = pattern.indexOf("*");
|
|
122
|
+
if (at === -1 || pattern.indexOf("*", at + 1) !== -1)
|
|
123
|
+
continue;
|
|
124
|
+
const prefix = pattern.slice(0, at);
|
|
125
|
+
const suffix = pattern.slice(at + 1);
|
|
126
|
+
if (specifier.length < prefix.length + suffix.length)
|
|
127
|
+
continue;
|
|
128
|
+
if (!specifier.startsWith(prefix) || !specifier.endsWith(suffix))
|
|
129
|
+
continue;
|
|
130
|
+
if (best !== undefined && prefix.length <= best.pattern.indexOf("*"))
|
|
131
|
+
continue;
|
|
132
|
+
best = { pattern, star: specifier.slice(prefix.length, specifier.length - suffix.length) };
|
|
133
|
+
}
|
|
134
|
+
return best;
|
|
135
|
+
}
|
|
136
|
+
export function createSpecifierResolver() {
|
|
137
|
+
const configs = new Map();
|
|
138
|
+
const tsconfigByDir = new Map();
|
|
139
|
+
const manifests = new Map();
|
|
140
|
+
const packageByDir = new Map();
|
|
141
|
+
const readJsonc = (path) => {
|
|
142
|
+
try {
|
|
143
|
+
return record(parseJsonc(readFileSync(path, "utf8")));
|
|
144
|
+
}
|
|
145
|
+
catch {
|
|
146
|
+
return undefined;
|
|
147
|
+
}
|
|
148
|
+
};
|
|
149
|
+
/** The nearest `tsconfig.json` (or `jsconfig.json`) at or above `dir`, as Bun's resolver picks it. */
|
|
150
|
+
const tsconfigFor = (dir) => {
|
|
151
|
+
if (tsconfigByDir.has(dir))
|
|
152
|
+
return tsconfigByDir.get(dir);
|
|
153
|
+
const own = ["tsconfig.json", "jsconfig.json"].map((name) => join(dir, name)).find(isFile);
|
|
154
|
+
const parent = dirname(dir);
|
|
155
|
+
const found = own ?? (parent === dir ? undefined : tsconfigFor(parent));
|
|
156
|
+
tsconfigByDir.set(dir, found);
|
|
157
|
+
return found;
|
|
158
|
+
};
|
|
159
|
+
/** An `extends` entry's file: a path relative to the config, or a package found in `node_modules`. */
|
|
160
|
+
const extendedConfig = (from, name) => {
|
|
161
|
+
const withJson = (path) => isFile(path) ? path : isFile(`${path}.json`) ? `${path}.json` : undefined;
|
|
162
|
+
if (name.startsWith("./") || name.startsWith("../") || isAbsolute(name))
|
|
163
|
+
return withJson(join(dirname(from), name));
|
|
164
|
+
for (let dir = dirname(from);; dir = dirname(dir)) {
|
|
165
|
+
const target = join(dir, "node_modules", name);
|
|
166
|
+
const direct = withJson(target);
|
|
167
|
+
if (direct !== undefined)
|
|
168
|
+
return direct;
|
|
169
|
+
const manifest = readJsonc(join(target, "package.json"));
|
|
170
|
+
const field = manifest?.tsconfig;
|
|
171
|
+
const nested = typeof field === "string"
|
|
172
|
+
? withJson(join(target, field))
|
|
173
|
+
: withJson(join(target, "tsconfig"));
|
|
174
|
+
if (nested !== undefined)
|
|
175
|
+
return nested;
|
|
176
|
+
if (dirname(dir) === dir)
|
|
177
|
+
return undefined;
|
|
178
|
+
}
|
|
179
|
+
};
|
|
180
|
+
/** The `paths` and `baseUrl` a config ends up with after its `extends` chain. */
|
|
181
|
+
const pathsConfig = (file, seen = new Set()) => {
|
|
182
|
+
if (configs.has(file))
|
|
183
|
+
return configs.get(file);
|
|
184
|
+
if (seen.has(file) || seen.size >= MAX_EXTENDS)
|
|
185
|
+
return undefined;
|
|
186
|
+
const config = readJsonc(file);
|
|
187
|
+
let inherited;
|
|
188
|
+
const extended = config?.extends;
|
|
189
|
+
for (const name of typeof extended === "string"
|
|
190
|
+
? [extended]
|
|
191
|
+
: Array.isArray(extended)
|
|
192
|
+
? extended
|
|
193
|
+
: []) {
|
|
194
|
+
if (typeof name !== "string")
|
|
195
|
+
continue;
|
|
196
|
+
const base = extendedConfig(file, name);
|
|
197
|
+
const parent = base === undefined ? undefined : pathsConfig(base, new Set([...seen, file]));
|
|
198
|
+
if (parent === undefined)
|
|
199
|
+
continue;
|
|
200
|
+
inherited = {
|
|
201
|
+
paths: parent.paths.length > 0 ? parent.paths : (inherited?.paths ?? []),
|
|
202
|
+
baseUrl: parent.baseUrl ?? inherited?.baseUrl,
|
|
203
|
+
pathsBase: parent.paths.length > 0 ? parent.pathsBase : (inherited?.pathsBase ?? parent.pathsBase),
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
const options = record(config?.compilerOptions);
|
|
207
|
+
const baseUrl = typeof options?.baseUrl === "string"
|
|
208
|
+
? join(dirname(file), options.baseUrl)
|
|
209
|
+
: inherited?.baseUrl;
|
|
210
|
+
const ownPaths = record(options?.paths);
|
|
211
|
+
const paths = ownPaths === undefined
|
|
212
|
+
? (inherited?.paths ?? [])
|
|
213
|
+
: Object.entries(ownPaths).map(([pattern, targets]) => [
|
|
214
|
+
pattern,
|
|
215
|
+
Array.isArray(targets)
|
|
216
|
+
? targets.filter((t) => typeof t === "string")
|
|
217
|
+
: [],
|
|
218
|
+
]);
|
|
219
|
+
const pathsBase = baseUrl ?? (ownPaths === undefined ? (inherited?.pathsBase ?? dirname(file)) : dirname(file));
|
|
220
|
+
const resolved = config === undefined ? undefined : { paths, baseUrl, pathsBase };
|
|
221
|
+
configs.set(file, resolved);
|
|
222
|
+
return resolved;
|
|
223
|
+
};
|
|
224
|
+
// Keyed by config, not directory: every package name reaches here, from every folder of the project.
|
|
225
|
+
const aliases = new Map();
|
|
226
|
+
const viaTsconfig = (fromFile, specifier) => {
|
|
227
|
+
const tsconfig = tsconfigFor(dirname(fromFile));
|
|
228
|
+
if (tsconfig === undefined)
|
|
229
|
+
return undefined;
|
|
230
|
+
const key = `${tsconfig}\0${specifier}`;
|
|
231
|
+
if (aliases.has(key))
|
|
232
|
+
return aliases.get(key);
|
|
233
|
+
const found = aliasTarget(tsconfig, specifier);
|
|
234
|
+
aliases.set(key, found);
|
|
235
|
+
return found;
|
|
236
|
+
};
|
|
237
|
+
const aliasTarget = (tsconfig, specifier) => pathsRule(tsconfig, specifier)?.found;
|
|
238
|
+
/** The nearest package.json at or above `dir`: the package scope Node reads `imports` from. */
|
|
239
|
+
const packageFor = (dir) => {
|
|
240
|
+
if (packageByDir.has(dir))
|
|
241
|
+
return packageByDir.get(dir);
|
|
242
|
+
const own = join(dir, "package.json");
|
|
243
|
+
const parent = dirname(dir);
|
|
244
|
+
const found = isFile(own) ? own : parent === dir ? undefined : packageFor(parent);
|
|
245
|
+
packageByDir.set(dir, found);
|
|
246
|
+
return found;
|
|
247
|
+
};
|
|
248
|
+
const importTarget = (target, star) => {
|
|
249
|
+
if (typeof target === "string")
|
|
250
|
+
return target.startsWith("./") ? target.replaceAll("*", star ?? "") : undefined;
|
|
251
|
+
if (Array.isArray(target)) {
|
|
252
|
+
for (const entry of target) {
|
|
253
|
+
const found = importTarget(entry, star);
|
|
254
|
+
if (found !== undefined)
|
|
255
|
+
return found;
|
|
256
|
+
}
|
|
257
|
+
return undefined;
|
|
258
|
+
}
|
|
259
|
+
const conditions = record(target);
|
|
260
|
+
if (conditions === undefined)
|
|
261
|
+
return undefined;
|
|
262
|
+
for (const [condition, value] of Object.entries(conditions)) {
|
|
263
|
+
if (CONDITIONS.has(condition))
|
|
264
|
+
return importTarget(value, star);
|
|
265
|
+
}
|
|
266
|
+
return undefined;
|
|
267
|
+
};
|
|
268
|
+
const importsRule = (fromFile, specifier) => {
|
|
269
|
+
const manifestPath = packageFor(dirname(fromFile));
|
|
270
|
+
if (manifestPath === undefined)
|
|
271
|
+
return undefined;
|
|
272
|
+
if (!manifests.has(manifestPath))
|
|
273
|
+
manifests.set(manifestPath, readJsonc(manifestPath));
|
|
274
|
+
const imports = record(manifests.get(manifestPath)?.imports);
|
|
275
|
+
if (imports === undefined)
|
|
276
|
+
return undefined;
|
|
277
|
+
const keys = Object.keys(imports);
|
|
278
|
+
const match = matchPattern(keys, specifier);
|
|
279
|
+
if (match === undefined)
|
|
280
|
+
return undefined;
|
|
281
|
+
const template = importTarget(imports[match.pattern], STAR);
|
|
282
|
+
if (template === undefined)
|
|
283
|
+
return undefined;
|
|
284
|
+
const base = dirname(manifestPath);
|
|
285
|
+
const written = join(base, template.replaceAll(STAR, match.star ?? ""));
|
|
286
|
+
const found = probe(written);
|
|
287
|
+
return found === undefined
|
|
288
|
+
? undefined
|
|
289
|
+
: { key: match.pattern, keys, base, templates: [template], written, found };
|
|
290
|
+
};
|
|
291
|
+
const viaImports = (fromFile, specifier) => importsRule(fromFile, specifier)?.found;
|
|
292
|
+
const tsconfigRule = (fromFile, specifier) => {
|
|
293
|
+
const tsconfig = tsconfigFor(dirname(fromFile));
|
|
294
|
+
return tsconfig === undefined ? undefined : pathsRule(tsconfig, specifier);
|
|
295
|
+
};
|
|
296
|
+
const pathsRule = (tsconfig, specifier) => {
|
|
297
|
+
const config = pathsConfig(tsconfig);
|
|
298
|
+
if (config === undefined)
|
|
299
|
+
return undefined;
|
|
300
|
+
const keys = config.paths.map(([pattern]) => pattern);
|
|
301
|
+
const match = matchPattern(keys, specifier);
|
|
302
|
+
if (match === undefined) {
|
|
303
|
+
if (config.baseUrl === undefined)
|
|
304
|
+
return undefined;
|
|
305
|
+
const written = join(config.baseUrl, specifier);
|
|
306
|
+
const found = probe(written);
|
|
307
|
+
return found === undefined
|
|
308
|
+
? undefined
|
|
309
|
+
: { key: undefined, keys, base: config.baseUrl, templates: [STAR], written, found };
|
|
310
|
+
}
|
|
311
|
+
// TypeScript permits at most one wildcard in each substitution, as in the alias key.
|
|
312
|
+
const targets = (config.paths.find(([pattern]) => pattern === match.pattern)?.[1] ?? []).filter((target) => target.indexOf("*") === target.lastIndexOf("*"));
|
|
313
|
+
for (const target of targets) {
|
|
314
|
+
const written = join(config.pathsBase, target.replaceAll("*", match.star ?? ""));
|
|
315
|
+
const found = probe(written);
|
|
316
|
+
if (found === undefined)
|
|
317
|
+
continue;
|
|
318
|
+
const templates = targets.map((t) => t.replaceAll("*", STAR));
|
|
319
|
+
return { key: match.pattern, keys, base: config.pathsBase, templates, written, found };
|
|
320
|
+
}
|
|
321
|
+
return undefined;
|
|
322
|
+
};
|
|
323
|
+
const respell = (fromFile, specifier, file) => {
|
|
324
|
+
if (/^\.\.?(?:\/|$)/.test(specifier) || isAbsolute(specifier))
|
|
325
|
+
return undefined;
|
|
326
|
+
const rule = (specifier.startsWith("#") ? importsRule(fromFile, specifier) : undefined) ??
|
|
327
|
+
tsconfigRule(fromFile, specifier);
|
|
328
|
+
if (rule === undefined)
|
|
329
|
+
return undefined;
|
|
330
|
+
const spelled = sameStyle(rule.written, rule.found, file);
|
|
331
|
+
for (const template of rule.templates) {
|
|
332
|
+
const at = template.indexOf(STAR);
|
|
333
|
+
if (at === -1)
|
|
334
|
+
continue;
|
|
335
|
+
// An empty head still ends at a folder boundary: `src2/x` is not under a `baseUrl` of `src`.
|
|
336
|
+
const prefix = join(rule.base, template.slice(0, at) || "./");
|
|
337
|
+
const suffix = template.slice(at + STAR.length);
|
|
338
|
+
if (!spelled.startsWith(prefix) || !spelled.endsWith(suffix))
|
|
339
|
+
continue;
|
|
340
|
+
if (spelled.length < prefix.length + suffix.length)
|
|
341
|
+
continue;
|
|
342
|
+
const star = spelled
|
|
343
|
+
.slice(prefix.length, spelled.length - suffix.length)
|
|
344
|
+
.replaceAll("\\", "/");
|
|
345
|
+
if (star === "" || star.startsWith("/"))
|
|
346
|
+
continue;
|
|
347
|
+
const keyAt = rule.key?.indexOf("*") ?? 0;
|
|
348
|
+
if (keyAt === -1)
|
|
349
|
+
continue;
|
|
350
|
+
const next = rule.key === undefined
|
|
351
|
+
? star
|
|
352
|
+
: `${rule.key.slice(0, keyAt)}${star}${rule.key.slice(keyAt + 1)}`;
|
|
353
|
+
// The rewritten name must take the same route: another, longer pattern would claim it.
|
|
354
|
+
if (matchPattern(rule.keys, next)?.pattern !== rule.key)
|
|
355
|
+
continue;
|
|
356
|
+
return next;
|
|
357
|
+
}
|
|
358
|
+
return undefined;
|
|
359
|
+
};
|
|
360
|
+
const resolved = new Map();
|
|
361
|
+
const resolve = (fromFile, specifier) => {
|
|
362
|
+
// Every rule below reads only the importing file's directory, so the answer is the directory's.
|
|
363
|
+
const key = `${dirname(fromFile)}\0${specifier}`;
|
|
364
|
+
if (resolved.has(key))
|
|
365
|
+
return resolved.get(key);
|
|
366
|
+
const path = resolveFrom(fromFile, specifier);
|
|
367
|
+
resolved.set(key, path);
|
|
368
|
+
return path;
|
|
369
|
+
};
|
|
370
|
+
const pathPatterns = (dir) => {
|
|
371
|
+
const tsconfig = tsconfigFor(dir);
|
|
372
|
+
const config = tsconfig === undefined ? undefined : pathsConfig(tsconfig);
|
|
373
|
+
return (config?.paths ?? []).map(([pattern]) => pattern);
|
|
374
|
+
};
|
|
375
|
+
return Object.assign(resolve, { respell, pathPatterns });
|
|
376
|
+
function resolveFrom(fromFile, specifier) {
|
|
377
|
+
let found;
|
|
378
|
+
if (specifier.startsWith("./") ||
|
|
379
|
+
specifier.startsWith("../") ||
|
|
380
|
+
specifier === "." ||
|
|
381
|
+
specifier === "..")
|
|
382
|
+
found = probe(join(dirname(fromFile), specifier));
|
|
383
|
+
else if (isAbsolute(specifier))
|
|
384
|
+
found = probe(specifier);
|
|
385
|
+
// A `#` name is a package.json import first; a tsconfig may still map it.
|
|
386
|
+
else if (specifier.startsWith("#"))
|
|
387
|
+
found = viaImports(fromFile, specifier) ?? viaTsconfig(fromFile, specifier);
|
|
388
|
+
else
|
|
389
|
+
found = viaTsconfig(fromFile, specifier);
|
|
390
|
+
if (found === undefined)
|
|
391
|
+
return undefined;
|
|
392
|
+
const path = real(found);
|
|
393
|
+
return /[\\/]node_modules[\\/]/.test(path) ? undefined : path;
|
|
394
|
+
}
|
|
395
|
+
}
|
|
396
|
+
//# sourceMappingURL=project-specifiers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project-specifiers.js","sourceRoot":"","sources":["../../src/internal/project-specifiers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-kind.d.ts","sourceRoot":"","sources":["../../src/internal/script-kind.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAA;AAExC;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"script-kind.d.ts","sourceRoot":"","sources":["../../src/internal/script-kind.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAA;AAExC;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,UAAU,CAK7E"}
|
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
export function scriptKindOf(ts, file) {
|
|
6
6
|
if (file.endsWith(".tsx"))
|
|
7
7
|
return ts.ScriptKind.TSX;
|
|
8
|
-
|
|
8
|
+
// A `.svelte`/`.vue` file is scanned as its script blocks, which may be TypeScript.
|
|
9
|
+
if (/\.(?:[cm]?ts|svelte|vue)$/.test(file))
|
|
9
10
|
return ts.ScriptKind.TS;
|
|
10
11
|
return file.endsWith(".jsx") ? ts.ScriptKind.JSX : ts.ScriptKind.JS;
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-kind.js","sourceRoot":"","sources":["../../src/internal/script-kind.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,EAAgB,EAAE,IAAY;IACzD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,CAAA;IACnD,IAAI,
|
|
1
|
+
{"version":3,"file":"script-kind.js","sourceRoot":"","sources":["../../src/internal/script-kind.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,EAAgB,EAAE,IAAY;IACzD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,CAAA;IACnD,oFAAoF;IACpF,IAAI,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,CAAA;IACnE,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAA;AACrE,CAAC"}
|
|
@@ -9,6 +9,8 @@ export interface SourceFacts {
|
|
|
9
9
|
parse(file: string, content: string): TSApi.SourceFile | undefined;
|
|
10
10
|
isValueImportAt(source: TSApi.SourceFile, position: number, specifier: string): boolean | undefined;
|
|
11
11
|
isRouteRegistrationAt(source: TSApi.SourceFile, position: number, method: string, path: string): boolean | undefined;
|
|
12
|
+
/** A `.method(argument, …)` member call whose first argument is written exactly as `argument`. */
|
|
13
|
+
isRouteArgumentAt(source: TSApi.SourceFile, position: number, method: string, argument: string): boolean | undefined;
|
|
12
14
|
/** A call to the free function `callee` whose argument at `pathIndex` is the literal `path`. */
|
|
13
15
|
isFunctionRouteCallAt(source: TSApi.SourceFile, position: number, callee: string, pathIndex: number, path: string): boolean | undefined;
|
|
14
16
|
isResponseSyntaxAt(source: TSApi.SourceFile, position: number): boolean | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-facts.d.ts","sourceRoot":"","sources":["../../src/internal/source-facts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAA;AAExC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE3D;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,UAAU,GAAG,SAAS,CAAA;IAClE,eAAe,CACb,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,GAAG,SAAS,CAAA;IACtB,qBAAqB,CACnB,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACX,OAAO,GAAG,SAAS,CAAA;IACtB,gGAAgG;IAChG,qBAAqB,CACnB,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,GAAG,SAAS,CAAA;IACtB,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACnF;mGAC+F;IAC/F,iBAAiB,CACf,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,GAAG,SAAS,CAAA;CACvB;AAuCD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,aAAa,GAAG,WAAW,
|
|
1
|
+
{"version":3,"file":"source-facts.d.ts","sourceRoot":"","sources":["../../src/internal/source-facts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAA;AAExC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE3D;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,UAAU,GAAG,SAAS,CAAA;IAClE,eAAe,CACb,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,GAAG,SAAS,CAAA;IACtB,qBAAqB,CACnB,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACX,OAAO,GAAG,SAAS,CAAA;IACtB,kGAAkG;IAClG,iBAAiB,CACf,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,GAAG,SAAS,CAAA;IACtB,gGAAgG;IAChG,qBAAqB,CACnB,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,GAAG,SAAS,CAAA;IACtB,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;IACnF;mGAC+F;IAC/F,iBAAiB,CACf,MAAM,EAAE,KAAK,CAAC,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,GAAG,SAAS,CAAA;CACvB;AAuCD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,aAAa,GAAG,WAAW,CAmJhE"}
|
|
@@ -87,6 +87,16 @@ export function createSourceFacts(ts) {
|
|
|
87
87
|
const first = call.arguments[0];
|
|
88
88
|
return (name === method && first !== undefined && ts.isStringLiteralLike(first) && first.text === path);
|
|
89
89
|
};
|
|
90
|
+
const isRouteArgumentAt = (source, position, method, argument) => {
|
|
91
|
+
const call = ancestorAt(ts, source, position, ts.isCallExpression);
|
|
92
|
+
if (call === undefined || !ts.isPropertyAccessExpression(call.expression))
|
|
93
|
+
return false;
|
|
94
|
+
const first = call.arguments[0];
|
|
95
|
+
return (call.expression.name.text.toUpperCase() === method &&
|
|
96
|
+
call.arguments.length > 1 &&
|
|
97
|
+
first !== undefined &&
|
|
98
|
+
first.getText(source) === argument);
|
|
99
|
+
};
|
|
90
100
|
const isFunctionRouteCallAt = (source, position, callee, pathIndex, path) => {
|
|
91
101
|
const call = ancestorAt(ts, source, position, ts.isCallExpression);
|
|
92
102
|
if (call === undefined || !ts.isIdentifier(call.expression))
|
|
@@ -130,6 +140,7 @@ export function createSourceFacts(ts) {
|
|
|
130
140
|
parse,
|
|
131
141
|
isValueImportAt,
|
|
132
142
|
isRouteRegistrationAt,
|
|
143
|
+
isRouteArgumentAt,
|
|
133
144
|
isFunctionRouteCallAt,
|
|
134
145
|
isResponseSyntaxAt,
|
|
135
146
|
isDynamicImportAt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-facts.js","sourceRoot":"","sources":["../../src/internal/source-facts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"source-facts.js","sourceRoot":"","sources":["../../src/internal/source-facts.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export declare class UnsupportedTypeScriptError extends Error {
|
|
|
18
18
|
}
|
|
19
19
|
export declare function isUnsupportedTypeScriptError(error: unknown): error is UnsupportedTypeScriptError;
|
|
20
20
|
export declare function unsupportedTypeScriptMessage(version: string): string;
|
|
21
|
-
export declare function unsupportedTypeScriptDiagnostic(version: string): Diagnostic;
|
|
21
|
+
export declare function unsupportedTypeScriptDiagnostic(version: string, message?: string): Diagnostic;
|
|
22
22
|
/** Source files supplied to the TypeScript 7 virtual file system. */
|
|
23
23
|
export interface TypeScriptSourceIndex {
|
|
24
24
|
readonly files: readonly string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-import.d.ts","sourceRoot":"","sources":["../../src/internal/typescript-import.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,EAAE,KAAK,UAAU,EAAc,MAAM,mBAAmB,CAAA;AAE/D,6FAA6F;AAC7F,MAAM,MAAM,aAAa,GAAG,cAAc,YAAY,CAAC,CAAA;AAEvD,eAAO,MAAM,oBAAoB,EAAG,sBAA+B,CAAA;AAEnE,kGAAkG;AAClG,qBAAa,0BAA2B,SAAQ,KAAK;IACnD,QAAQ,CAAC,IAAI,yBAAuB;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEZ,OAAO,EAAE,MAAM;CAK5B;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,0BAA0B,CAahG;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,+BAA+B,
|
|
1
|
+
{"version":3,"file":"typescript-import.d.ts","sourceRoot":"","sources":["../../src/internal/typescript-import.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,EAAE,KAAK,UAAU,EAAc,MAAM,mBAAmB,CAAA;AAE/D,6FAA6F;AAC7F,MAAM,MAAM,aAAa,GAAG,cAAc,YAAY,CAAC,CAAA;AAEvD,eAAO,MAAM,oBAAoB,EAAG,sBAA+B,CAAA;AAEnE,kGAAkG;AAClG,qBAAa,0BAA2B,SAAQ,KAAK;IACnD,QAAQ,CAAC,IAAI,yBAAuB;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;gBAEZ,OAAO,EAAE,MAAM;CAK5B;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,0BAA0B,CAahG;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,SAAwC,GAC9C,UAAU,CAWZ;AAED,qEAAqE;AACrE,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;IACtC,gGAAgG;IAChG,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,wDAAwD;AACxD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAA;IAChC,2FAA2F;IAC3F,QAAQ,CAAC,QAAQ,CAAC,EAAE,yBAAyB,CAAA;IAC7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;IAC1E,QAAQ,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;IACtE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACrD,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACvD,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAC1D;AAgED,oGAAoG;AACpG,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAO3E;AA2fD;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,qBAAqB,GAClC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAGpC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS,CAAA;IAC/C,QAAQ,CAAC,WAAW,EAAE,0BAA0B,GAAG,SAAS,CAAA;CAC7D;AAED,uGAAuG;AACvG,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,EAC/C,WAAW,CAAC,EAAE,qBAAqB,GAClC,OAAO,CAAC,qBAAqB,CAAC,CAsBhC"}
|
|
@@ -42,11 +42,11 @@ export function isUnsupportedTypeScriptError(error) {
|
|
|
42
42
|
export function unsupportedTypeScriptMessage(version) {
|
|
43
43
|
return `${NIFRA_TS_UNSUPPORTED}: TypeScript ${version} is outside the compiler API versions supported by Nifra scanners. Use TypeScript 5, 6, or 7, or pin the project to TypeScript 6 (for example, \`bun add -d typescript@^6\`).`;
|
|
44
44
|
}
|
|
45
|
-
export function unsupportedTypeScriptDiagnostic(version) {
|
|
45
|
+
export function unsupportedTypeScriptDiagnostic(version, message = unsupportedTypeScriptMessage(version)) {
|
|
46
46
|
return diagnostic({
|
|
47
47
|
code: NIFRA_TS_UNSUPPORTED,
|
|
48
48
|
severity: "error",
|
|
49
|
-
message
|
|
49
|
+
message,
|
|
50
50
|
fix: {
|
|
51
51
|
recipe: "toolchain.install-typescript",
|
|
52
52
|
command: "bun add -d typescript@^6",
|
|
@@ -307,7 +307,9 @@ function sourceEntries(root, sourceIndex) {
|
|
|
307
307
|
if (content === undefined)
|
|
308
308
|
continue;
|
|
309
309
|
const absolute = isAbsolute(file) ? file : resolve(root, file);
|
|
310
|
-
|
|
310
|
+
// The session opens script extensions only; a component's script blocks are opened as TypeScript
|
|
311
|
+
// beside it, and `createSourceFile` finds them by their text.
|
|
312
|
+
const normalized = normalizedPath(/\.(?:svelte|vue)$/.test(absolute) ? `${absolute}.ts` : absolute);
|
|
311
313
|
paths.push(normalized);
|
|
312
314
|
for (const variant of pathVariants(normalized))
|
|
313
315
|
files.set(variant, content);
|