@typespec/compiler 0.65.0-dev.21 → 0.65.0-dev.23
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/core/engine.d.ts +6 -0
- package/dist/src/core/engine.d.ts.map +1 -0
- package/dist/src/core/engine.js +7 -0
- package/dist/src/core/engine.js.map +1 -0
- package/dist/src/core/install.d.ts.map +1 -1
- package/dist/src/core/install.js +20 -0
- package/dist/src/core/install.js.map +1 -1
- package/dist/src/module-resolver/esm/resolve-package-exports.js +2 -2
- package/dist/src/module-resolver/esm/resolve-package-exports.js.map +1 -1
- package/dist/src/module-resolver/esm/resolve-package-imports.d.ts +5 -0
- package/dist/src/module-resolver/esm/resolve-package-imports.d.ts.map +1 -0
- package/dist/src/module-resolver/esm/resolve-package-imports.js +26 -0
- package/dist/src/module-resolver/esm/resolve-package-imports.js.map +1 -0
- package/dist/src/module-resolver/esm/utils.d.ts +4 -1
- package/dist/src/module-resolver/esm/utils.d.ts.map +1 -1
- package/dist/src/module-resolver/esm/utils.js +5 -0
- package/dist/src/module-resolver/esm/utils.js.map +1 -1
- package/dist/src/module-resolver/module-resolver.d.ts +2 -0
- package/dist/src/module-resolver/module-resolver.d.ts.map +1 -1
- package/dist/src/module-resolver/module-resolver.js +55 -3
- package/dist/src/module-resolver/module-resolver.js.map +1 -1
- package/dist/src/types/package-json.d.ts +19 -2
- package/dist/src/types/package-json.d.ts.map +1 -1
- package/package.json +3 -1
package/dist/manifest.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../src/core/engine.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC;AAE5C;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,cAAc,CAElD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../src/core/engine.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,iBAAiB;IAC/B,OAAQ,UAAkB,CAAC,eAAe,IAAI,MAAM,CAAC;AACvD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAWjD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAQf"}
|
package/dist/src/core/install.js
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
|
+
import Arborist from "@npmcli/arborist";
|
|
1
2
|
import { spawn } from "child_process";
|
|
3
|
+
import { getTypeSpecEngine } from "./engine.js";
|
|
2
4
|
export async function installTypeSpecDependencies(host, directory) {
|
|
5
|
+
// Only use the builtin npm when running in standalone tsp mode.
|
|
6
|
+
// TBD how we'll change this as we move to a more integrated setup and resolve the user package manager.
|
|
7
|
+
if (getTypeSpecEngine() === "tsp") {
|
|
8
|
+
await installWithBuiltinNpm(host, directory);
|
|
9
|
+
}
|
|
10
|
+
else {
|
|
11
|
+
await installWithNpmExe(host, directory);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
async function installWithBuiltinNpm(host, directory) {
|
|
15
|
+
const arb = new Arborist({
|
|
16
|
+
path: directory,
|
|
17
|
+
});
|
|
18
|
+
await arb.loadActual();
|
|
19
|
+
await arb.buildIdealTree({});
|
|
20
|
+
await arb.reify();
|
|
21
|
+
}
|
|
22
|
+
async function installWithNpmExe(host, directory) {
|
|
3
23
|
const child = spawn("npm", ["install"], {
|
|
4
24
|
shell: process.platform === "win32",
|
|
5
25
|
stdio: "inherit",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAUhD,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,IAAqB,EACrB,SAAiB;IAEjB,gEAAgE;IAChE,wGAAwG;IACxG,IAAI,iBAAiB,EAAE,KAAK,KAAK,EAAE,CAAC;QAClC,MAAM,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,MAAM,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,IAAqB,EAAE,SAAiB;IAC3E,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC;QACvB,IAAI,EAAE,SAAS;KAChB,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;IACvB,MAAM,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAC7B,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;AACpB,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAqB,EAAE,SAAiB;IACvE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE;QACtC,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;QACnC,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;KACjB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE;QACtB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAiB,EAAE,EAAE;YACtC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6EAA6E,CAC9E,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC5B,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { resolvePackageImportsExports } from "
|
|
2
|
-
import { resolvePackageTarget } from "
|
|
1
|
+
import { resolvePackageImportsExports } from "./resolve-package-imports-exports.js";
|
|
2
|
+
import { resolvePackageTarget } from "./resolve-package-target.js";
|
|
3
3
|
import { InvalidModuleSpecifierError, NoMatchingConditionsError, } from "./utils.js";
|
|
4
4
|
/** Implementation of PACKAGE_EXPORTS_RESOLVE https://github.com/nodejs/node/blob/main/doc/api/esm.md */
|
|
5
5
|
export async function resolvePackageExports(context, subpath, exports) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-package-exports.js","sourceRoot":"","sources":["../../../../src/module-resolver/esm/resolve-package-exports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"resolve-package-exports.js","sourceRoot":"","sources":["../../../../src/module-resolver/esm/resolve-package-exports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAEL,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,YAAY,CAAC;AAEpB,wGAAwG;AACxG,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAA6B,EAC7B,OAAe,EACf,OAAgB;IAEhB,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAEvC,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;QACpB,IAAI,UAA+B,CAAC;QACpC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YACnF,UAAU,GAAG,OAAO,CAAC;QACvB,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,OAAO,CAAC,sBAAsB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;gBACrE,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE;gBACnD,MAAM,EAAE,UAAU;gBAClB,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;YAEH,yDAAyD;YACzD,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,QAAQ,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,yBAAyB,CAAC,OAAO,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,gEAAgE;QAChE,MAAM,aAAa,GAAG,MAAM,4BAA4B,CAAC,OAAO,EAAE;YAChE,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,KAAK;SACjB,CAAC,CAAC;QAEH,yDAAyD;QACzD,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;IACH,CAAC;IAED,8CAA8C;IAC9C,MAAM,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC;AAED,kIAAkI;AAClI,SAAS,YAAY,CAAC,IAAa;IACjC,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AACxF,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,OAAgB;IACzC,OAAO,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;AAC/D,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Imports } from "../../types/package-json.js";
|
|
2
|
+
import { EsmResolutionContext } from "./utils.js";
|
|
3
|
+
/** Implementation of PACKAGE_IMPORTS_RESOLVE https://github.com/nodejs/node/blob/main/doc/api/esm.md */
|
|
4
|
+
export declare function resolvePackageImports(context: EsmResolutionContext, imports: Imports): Promise<string | null | undefined>;
|
|
5
|
+
//# sourceMappingURL=resolve-package-imports.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-package-imports.d.ts","sourceRoot":"","sources":["../../../../src/module-resolver/esm/resolve-package-imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EACL,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAEpB,wGAAwG;AACxG,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAwBpC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { resolvePackageImportsExports } from "./resolve-package-imports-exports.js";
|
|
2
|
+
import { InvalidModuleSpecifierError, PackageImportNotDefinedError, } from "./utils.js";
|
|
3
|
+
/** Implementation of PACKAGE_IMPORTS_RESOLVE https://github.com/nodejs/node/blob/main/doc/api/esm.md */
|
|
4
|
+
export async function resolvePackageImports(context, imports) {
|
|
5
|
+
// If specifier is exactly equal to "#" or starts with "#/", then
|
|
6
|
+
if (context.specifier === "#" || context.specifier.startsWith("#/")) {
|
|
7
|
+
// Throw an Invalid Module Specifier error.
|
|
8
|
+
throw new InvalidModuleSpecifierError(context);
|
|
9
|
+
}
|
|
10
|
+
// If packageJson.imports is a non-null Object, then
|
|
11
|
+
if (imports !== null) {
|
|
12
|
+
// Let resolved be the result of PACKAGE_IMPORTS_EXPORTS_RESOLVE.
|
|
13
|
+
const resolvedMatch = await resolvePackageImportsExports(context, {
|
|
14
|
+
matchKey: context.specifier,
|
|
15
|
+
matchObj: imports,
|
|
16
|
+
isImports: true,
|
|
17
|
+
});
|
|
18
|
+
// If resolved is not null or undefined, return resolved.
|
|
19
|
+
if (resolvedMatch) {
|
|
20
|
+
return resolvedMatch;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
// Throw a Package Import Not Defined error.
|
|
24
|
+
throw new PackageImportNotDefinedError(context);
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=resolve-package-imports.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-package-imports.js","sourceRoot":"","sources":["../../../../src/module-resolver/esm/resolve-package-imports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAEL,2BAA2B,EAC3B,4BAA4B,GAC7B,MAAM,YAAY,CAAC;AAEpB,wGAAwG;AACxG,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAA6B,EAC7B,OAAgB;IAEhB,iEAAiE;IACjE,IAAI,OAAO,CAAC,SAAS,KAAK,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACpE,2CAA2C;QAC3C,MAAM,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,oDAAoD;IACpD,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,iEAAiE;QACjE,MAAM,aAAa,GAAG,MAAM,4BAA4B,CAAC,OAAO,EAAE;YAChE,QAAQ,EAAE,OAAO,CAAC,SAAS;YAC3B,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,yDAAyD;QACzD,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;IACH,CAAC;IAED,4CAA4C;IAC5C,MAAM,IAAI,4BAA4B,CAAC,OAAO,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -13,7 +13,7 @@ export interface EsmResolutionContext {
|
|
|
13
13
|
* @example `["node_modules"]`
|
|
14
14
|
*/
|
|
15
15
|
readonly moduleDirs: readonly string[];
|
|
16
|
-
resolveId(id: string, baseDir: string | URL):
|
|
16
|
+
resolveId(id: string, baseDir: string | URL): Promise<string | undefined>;
|
|
17
17
|
/** Non standard option. Do not respect the default condition. */
|
|
18
18
|
readonly ignoreDefaultCondition?: boolean;
|
|
19
19
|
}
|
|
@@ -31,5 +31,8 @@ export declare class InvalidPackageTargetError extends EsmResolveError {
|
|
|
31
31
|
export declare class NoMatchingConditionsError extends InvalidPackageTargetError {
|
|
32
32
|
constructor(context: EsmResolutionContext);
|
|
33
33
|
}
|
|
34
|
+
export declare class PackageImportNotDefinedError extends EsmResolveError {
|
|
35
|
+
constructor(context: EsmResolutionContext);
|
|
36
|
+
}
|
|
34
37
|
export declare function isUrl(str: string): boolean;
|
|
35
38
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/module-resolver/esm/utils.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,gCAAgC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,iCAAiC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAEvC;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAEvC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/module-resolver/esm/utils.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,gCAAgC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,iCAAiC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAEvC;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAEvC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAE1E,iEAAiE;IACjE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAC3C;AAaD,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAE7C,qBAAa,yBAA0B,SAAQ,eAAe;gBAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,MAAM;CAG3D;AAED,qBAAa,2BAA4B,SAAQ,eAAe;gBAClD,OAAO,EAAE,oBAAoB,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;CAGhF;AAED,qBAAa,yBAA0B,SAAQ,eAAe;gBAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,MAAM;CAG3D;AAED,qBAAa,yBAA0B,SAAQ,yBAAyB;gBAC1D,OAAO,EAAE,oBAAoB;CAG1C;AAED,qBAAa,4BAA6B,SAAQ,eAAe;gBACnD,OAAO,EAAE,oBAAoB;CAG1C;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,WAMhC"}
|
|
@@ -29,6 +29,11 @@ export class NoMatchingConditionsError extends InvalidPackageTargetError {
|
|
|
29
29
|
super(context, `No conditions matched`);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
+
export class PackageImportNotDefinedError extends EsmResolveError {
|
|
33
|
+
constructor(context) {
|
|
34
|
+
super(createErrorMsg(context, undefined, true));
|
|
35
|
+
}
|
|
36
|
+
}
|
|
32
37
|
export function isUrl(str) {
|
|
33
38
|
try {
|
|
34
39
|
return !!new URL(str);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/module-resolver/esm/utils.ts"],"names":[],"mappings":"AAyBA,SAAS,kBAAkB,CAAC,eAAuB;IACjD,OAAO,6BAA6B,eAAe,IAAI,CAAC;AAC1D,CAAC;AAED,SAAS,cAAc,CAAC,OAA6B,EAAE,MAAe,EAAE,SAAmB;IACzF,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAChD,OAAO,GAAG,IAAI,UAAU,KAAK,eAAe,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AACzF,CAAC;AAED,MAAM,OAAO,eAAgB,SAAQ,KAAK;CAAG;AAE7C,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D,YAAY,OAA6B,EAAE,MAAe;QACxD,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,4BAA4B,MAAM,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,eAAe;IAC9D,YAAY,OAA6B,EAAE,SAAmB,EAAE,MAAe;QAC7E,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D,YAAY,OAA6B,EAAE,MAAe;QACxD,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACzC,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,yBAAyB;IACtE,YAAY,OAA6B;QACvC,KAAK,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;IAC1C,CAAC;CACF;AAED,MAAM,UAAU,KAAK,CAAC,GAAW;IAC/B,IAAI,CAAC;QACH,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/module-resolver/esm/utils.ts"],"names":[],"mappings":"AAyBA,SAAS,kBAAkB,CAAC,eAAuB;IACjD,OAAO,6BAA6B,eAAe,IAAI,CAAC;AAC1D,CAAC;AAED,SAAS,cAAc,CAAC,OAA6B,EAAE,MAAe,EAAE,SAAmB;IACzF,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAChD,OAAO,GAAG,IAAI,UAAU,KAAK,eAAe,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AACzF,CAAC;AAED,MAAM,OAAO,eAAgB,SAAQ,KAAK;CAAG;AAE7C,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D,YAAY,OAA6B,EAAE,MAAe;QACxD,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,4BAA4B,MAAM,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,eAAe;IAC9D,YAAY,OAA6B,EAAE,SAAmB,EAAE,MAAe;QAC7E,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D,YAAY,OAA6B,EAAE,MAAe;QACxD,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACzC,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,yBAAyB;IACtE,YAAY,OAA6B;QACvC,KAAK,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;IAC1C,CAAC;CACF;AAED,MAAM,OAAO,4BAA6B,SAAQ,eAAe;IAC/D,YAAY,OAA6B;QACvC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;CACF;AAED,MAAM,UAAU,KAAK,CAAC,GAAW;IAC/B,IAAI,CAAC;QACH,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
|
@@ -37,6 +37,8 @@ export interface ResolveModuleHost {
|
|
|
37
37
|
readFile(path: string): Promise<string>;
|
|
38
38
|
}
|
|
39
39
|
type ResolveModuleErrorCode = "MODULE_NOT_FOUND" | "INVALID_MAIN" | "INVALID_MODULE"
|
|
40
|
+
/** When an imports points to an invalid file. */
|
|
41
|
+
| "INVALID_MODULE_IMPORT_TARGET"
|
|
40
42
|
/** When an exports points to an invalid file. */
|
|
41
43
|
| "INVALID_MODULE_EXPORT_TARGET";
|
|
42
44
|
export declare class ResolveModuleError extends Error {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-resolver.d.ts","sourceRoot":"","sources":["../../../src/module-resolver/module-resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"module-resolver.d.ts","sourceRoot":"","sources":["../../../src/module-resolver/module-resolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAY5D,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IAEnC;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B,qDAAqD;IACrD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;OAGG;IACH,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC;CAC/C;AAED,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAExC;;OAEG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,IAAI,OAAO,CAAC;QAAC,MAAM,IAAI,OAAO,CAAA;KAAE,CAAC,CAAC;IAE3E;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACzC;AAED,KAAK,sBAAsB,GACvB,kBAAkB,GAClB,cAAc,GACd,gBAAgB;AAClB,iDAAiD;GAC/C,8BAA8B;AAChC,iDAAiD;GAC/C,8BAA8B,CAAC;AAEnC,qBAAa,kBAAmB,SAAQ,KAAK;IAElC,IAAI,EAAE,sBAAsB;gBAA5B,IAAI,EAAE,sBAAsB,EACnC,OAAO,EAAE,MAAM;CAIlB;AAID,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG,cAAc,CAAC;AAEnE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,QAAQ,EAAE,WAAW,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,iBAAiB,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,sBAAsB,CAAC,CAqSjC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getDirectoryPath, joinPaths, normalizePath, resolvePath } from "../core/path-utils.js";
|
|
2
2
|
import { resolvePackageExports } from "./esm/resolve-package-exports.js";
|
|
3
|
+
import { resolvePackageImports } from "./esm/resolve-package-imports.js";
|
|
3
4
|
import { EsmResolveError, InvalidPackageTargetError, NoMatchingConditionsError, } from "./esm/utils.js";
|
|
4
5
|
import { parseNodeModuleSpecifier } from "./utils.js";
|
|
5
6
|
export class ResolveModuleError extends Error {
|
|
@@ -33,6 +34,19 @@ export async function resolveModule(host, specifier, options) {
|
|
|
33
34
|
return m;
|
|
34
35
|
}
|
|
35
36
|
}
|
|
37
|
+
// If specifier starts with '#', resolve subpath imports.
|
|
38
|
+
if (specifier.startsWith("#")) {
|
|
39
|
+
const dirs = listDirHierarchy(baseDir);
|
|
40
|
+
for (const dir of dirs) {
|
|
41
|
+
const pkgFile = resolvePath(dir, "package.json");
|
|
42
|
+
if (!(await isFile(host, pkgFile)))
|
|
43
|
+
continue;
|
|
44
|
+
const pkg = await readPackage(host, pkgFile);
|
|
45
|
+
const module = await resolveNodePackageImports(pkg, dir);
|
|
46
|
+
if (module)
|
|
47
|
+
return module;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
36
50
|
// Try to resolve as a node_module package.
|
|
37
51
|
const module = await resolveAsNodeModule(specifier, absoluteStart);
|
|
38
52
|
if (module)
|
|
@@ -92,6 +106,44 @@ export async function resolveModule(host, specifier, options) {
|
|
|
92
106
|
return n;
|
|
93
107
|
return undefined;
|
|
94
108
|
}
|
|
109
|
+
async function resolveNodePackageImports(pkg, pkgDir) {
|
|
110
|
+
if (!pkg.imports)
|
|
111
|
+
return undefined;
|
|
112
|
+
let match;
|
|
113
|
+
try {
|
|
114
|
+
match = await resolvePackageImports({
|
|
115
|
+
packageUrl: pathToFileURL(pkgDir),
|
|
116
|
+
specifier,
|
|
117
|
+
moduleDirs: ["node_modules"],
|
|
118
|
+
conditions: options.conditions ?? [],
|
|
119
|
+
ignoreDefaultCondition: options.fallbackOnMissingCondition,
|
|
120
|
+
resolveId: async (id, baseDir) => {
|
|
121
|
+
const resolved = await resolveAsNodeModule(id, fileURLToPath(baseDir.toString()));
|
|
122
|
+
return resolved && pathToFileURL(resolved.mainFile);
|
|
123
|
+
},
|
|
124
|
+
}, pkg.imports);
|
|
125
|
+
}
|
|
126
|
+
catch (error) {
|
|
127
|
+
if (error instanceof InvalidPackageTargetError) {
|
|
128
|
+
throw new ResolveModuleError("INVALID_MODULE_IMPORT_TARGET", error.message);
|
|
129
|
+
}
|
|
130
|
+
else if (error instanceof EsmResolveError) {
|
|
131
|
+
throw new ResolveModuleError("INVALID_MODULE", error.message);
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
throw error;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
if (!match)
|
|
138
|
+
return undefined;
|
|
139
|
+
const resolved = await resolveEsmMatch(match, true);
|
|
140
|
+
return {
|
|
141
|
+
type: "module",
|
|
142
|
+
mainFile: resolved,
|
|
143
|
+
manifest: pkg,
|
|
144
|
+
path: pkgDir,
|
|
145
|
+
};
|
|
146
|
+
}
|
|
95
147
|
/**
|
|
96
148
|
* Try to load using package.json exports.
|
|
97
149
|
* @param importSpecifier A combination of the package name and exports entry.
|
|
@@ -135,7 +187,7 @@ export async function resolveModule(host, specifier, options) {
|
|
|
135
187
|
}
|
|
136
188
|
if (!match)
|
|
137
189
|
return undefined;
|
|
138
|
-
const resolved = await resolveEsmMatch(match);
|
|
190
|
+
const resolved = await resolveEsmMatch(match, false);
|
|
139
191
|
return {
|
|
140
192
|
type: "module",
|
|
141
193
|
mainFile: resolved,
|
|
@@ -143,12 +195,12 @@ export async function resolveModule(host, specifier, options) {
|
|
|
143
195
|
path: pkgDir,
|
|
144
196
|
};
|
|
145
197
|
}
|
|
146
|
-
async function resolveEsmMatch(match) {
|
|
198
|
+
async function resolveEsmMatch(match, isImports) {
|
|
147
199
|
const resolved = await realpath(fileURLToPath(match));
|
|
148
200
|
if (await isFile(host, resolved)) {
|
|
149
201
|
return resolved;
|
|
150
202
|
}
|
|
151
|
-
throw new ResolveModuleError("INVALID_MODULE_EXPORT_TARGET", `Import "${specifier}" resolving to "${resolved}" is not a file.`);
|
|
203
|
+
throw new ResolveModuleError(isImports ? "INVALID_MODULE_IMPORT_TARGET" : "INVALID_MODULE_EXPORT_TARGET", `Import "${specifier}" resolving to "${resolved}" is not a file.`);
|
|
152
204
|
}
|
|
153
205
|
async function loadAsDirectory(directory) {
|
|
154
206
|
const pkg = await loadPackageAtPath(directory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-resolver.js","sourceRoot":"","sources":["../../../src/module-resolver/module-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEhG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAuB,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAoD3E,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAElC;IADT,YACS,IAA4B,EACnC,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAHR,SAAI,GAAJ,IAAI,CAAwB;IAIrC,CAAC;CACF;AAED,MAAM,0BAA0B,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AA4B7D;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAuB,EACvB,SAAiB,EACjB,OAA6B;IAE7B,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAS,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5E,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAE3D,IAAI,CAAC,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,SAAS,CAAC,qBAAqB,OAAO,sBAAsB,CAAC,CAAC;IAC1E,CAAC;IAED,yEAAyE;IACzE,IAAI,yCAAyC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9D,MAAM,GAAG,GAAG,WAAW,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,EAAE,CAAC;YACN,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAED,2CAA2C;IAC3C,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACnE,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,MAAM,IAAI,kBAAkB,CAC1B,kBAAkB,EAClB,uBAAuB,SAAS,WAAW,OAAO,GAAG,CACtD,CAAC;IAEF;;OAEG;IACH,SAAS,gBAAgB,CAAC,OAAe;QACvC,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;QACxB,IAAI,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,OAAO,KAAK,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;YAC3C,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpB,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,KAAK,UAAU,WAAW,CACxB,EAAE,WAAW,EAAE,OAAO,EAAuB,EAC7C,GAAW;QAEX,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QACjD,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAAE,OAAO,SAAS,CAAC;QACrD,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,yHAAyH;QACzH,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,SAAS,CAAC;QAC/C,OAAO,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;OAGG;IACH,KAAK,UAAU,mBAAmB,CAChC,eAAuB,EACvB,OAAe;QAEf,MAAM,MAAM,GAAG,wBAAwB,CAAC,eAAe,CAAC,CAAC;QACzD,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QACtC,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEvC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC5C,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC;YACtB,MAAM,CAAC,GAAG,MAAM,iBAAiB,CAC/B,SAAS,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,EAClD,MAAM,CAAC,OAAO,CACf,CAAC;YACF,IAAI,CAAC;gBAAE,OAAO,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,UAAU,iBAAiB,CAC9B,IAAY,EACZ,OAAgB;QAEhB,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAClD,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAAE,OAAO,SAAS,CAAC;QAErD,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAChD,IAAI,CAAC;YAAE,OAAO,CAAC,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,KAAK,UAAU,yBAAyB,CACtC,OAAe,EACf,GAAgB,EAChB,MAAc;QAEd,IAAI,CAAC,GAAG,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAEnC,IAAI,KAAgC,CAAC;QACrC,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,qBAAqB,CACjC;gBACE,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC;gBACjC,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,CAAC,cAAc,CAAC;gBAC5B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,EAAE;gBACpC,sBAAsB,EAAE,OAAO,CAAC,0BAA0B;gBAC1D,SAAS,EAAE,CAAC,EAAU,EAAE,OAAe,EAAE,EAAE;oBACzC,MAAM,IAAI,kBAAkB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;gBAClE,CAAC;aACF,EACD,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,EACrC,GAAG,CAAC,OAAO,CACZ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,yBAAyB,EAAE,CAAC;gBAC/C,wEAAwE;gBACxE,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;oBACnB,OAAO;gBACT,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,kBAAkB,CAAC,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,YAAY,yBAAyB,EAAE,CAAC;gBACtD,MAAM,IAAI,kBAAkB,CAAC,8BAA8B,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAC9E,CAAC;iBAAM,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;gBAC5C,MAAM,IAAI,kBAAkB,CAAC,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAChE,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QACD,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QAC7B,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,CAAC;QAC9C,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,GAAG;YACb,IAAI,EAAE,MAAM;SACb,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,eAAe,CAAC,KAAa;QAC1C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QACtD,IAAI,MAAM,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;YACjC,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,IAAI,kBAAkB,CAC1B,8BAA8B,EAC9B,WAAW,SAAS,mBAAmB,QAAQ,kBAAkB,CAClE,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,eAAe,CAAC,SAAiB;QAC9C,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,GAAG,EAAE,CAAC;YACR,OAAO,GAAG,CAAC;QACb,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,mBAAmB,IAAI,0BAA0B,EAAE,CAAC;YAC7E,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;YAClE,IAAI,YAAY,EAAE,CAAC;gBACjB,OAAO,YAAY,CAAC;YACtB,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,UAAU,WAAW,CAAC,SAAiB,EAAE,GAAgB,EAAE,OAAgB;QAC9E,MAAM,CAAC,GAAG,MAAM,yBAAyB,CAAC,OAAO,IAAI,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QACzE,IAAI,CAAC;YAAE,OAAO,CAAC,CAAC;QAEhB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YAC5C,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,UAAU,iBAAiB,CAC9B,SAAiB,EACjB,GAAgB;QAEhB,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;QAC3E,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,MAAM,IAAI,SAAS,CAAC,YAAY,GAAG,CAAC,IAAI,oCAAoC,QAAQ,GAAG,CAAC,CAAC;QAC3F,CAAC;QAED,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACtD,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,MAAM,UAAU,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;QACrF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CACb,uBAAuB,YAAY,iEAAiE,CACrG,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC7B,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM,QAAQ,CAAC,SAAS,CAAC;gBAC/B,QAAQ,EAAE,MAAM,CAAC,IAAI;gBACrB,QAAQ,EAAE,GAAG;aACd,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,kBAAkB,CAC1B,cAAc,EACd,WAAW,GAAG,CAAC,IAAI,eAAe,QAAQ,iDAAiD,CAC5F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,UAAU,UAAU,CAAC,IAAY;QACpC,IAAI,MAAM,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACnC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAC7B,MAAM,iBAAiB,GAAG,IAAI,GAAG,GAAG,CAAC;YACrC,IAAI,MAAM,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,CAAC;gBAC1C,OAAO,YAAY,CAAC,iBAAiB,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,UAAU,YAAY,CAAC,IAAY;QACtC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IACtD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAuB,EAAE,OAAe;IACjE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAuB,EAAE,IAAY;IAC9D,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,IAAuB,EAAE,IAAY;IACzD,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;IACxB,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AACD,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,UAAU,IAAI,EAAE,CAAC;AAC1B,CAAC;AAED,SAAS,aAAa,CAAC,GAAW;IAChC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAExF,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAE7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAE,GAAG,IAAI,CAAC;YAElD,IAAI,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;gBAC7C,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAChF,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CAAC,QAAQ,CAAC,CAAC;AACtC,CAAC"}
|
|
1
|
+
{"version":3,"file":"module-resolver.js","sourceRoot":"","sources":["../../../src/module-resolver/module-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,11 @@ export interface PackageJson {
|
|
|
16
16
|
url?: string;
|
|
17
17
|
email?: string;
|
|
18
18
|
};
|
|
19
|
+
/**
|
|
20
|
+
* Subpath imports to define private mappings for imports within the package itself.
|
|
21
|
+
* [Read more.](https://nodejs.org/api/packages.html#subpath-imports)
|
|
22
|
+
*/
|
|
23
|
+
imports?: Imports | null;
|
|
19
24
|
/**
|
|
20
25
|
* Subpath exports to define entry points of the package.
|
|
21
26
|
* [Read more.](https://nodejs.org/api/packages.html#subpath-exports)
|
|
@@ -26,13 +31,25 @@ export interface PackageJson {
|
|
|
26
31
|
peerDependencies?: Record<string, string>;
|
|
27
32
|
devDependencies?: Record<string, string>;
|
|
28
33
|
}
|
|
34
|
+
/**
|
|
35
|
+
* Entry points of a module, optionally with conditions and subpath imports.
|
|
36
|
+
*/
|
|
37
|
+
export type Imports = {
|
|
38
|
+
[path: string]: string | ImportConditions;
|
|
39
|
+
};
|
|
40
|
+
/**
|
|
41
|
+
* A mapping of conditions and the paths to which they resolve.
|
|
42
|
+
*/
|
|
43
|
+
type ImportConditions = {
|
|
44
|
+
[condition: string]: string | ImportConditions;
|
|
45
|
+
};
|
|
29
46
|
/**
|
|
30
47
|
* Entry points of a module, optionally with conditions and subpath exports.
|
|
31
48
|
*/
|
|
32
49
|
export type Exports = string | Array<string | ExportConditions> | ExportConditions;
|
|
33
50
|
/**
|
|
34
|
-
|
|
35
|
-
|
|
51
|
+
* A mapping of conditions and the paths to which they resolve.
|
|
52
|
+
*/
|
|
36
53
|
type ExportConditions = {
|
|
37
54
|
[condition: string]: Exports;
|
|
38
55
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../src/types/package-json.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,gBAAgB,CAAC,GAAG,gBAAgB,CAAC;AAEnF;;
|
|
1
|
+
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../src/types/package-json.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG;IACpB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,KAAK,gBAAgB,GAAG;IACtB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAC;CAChD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,gBAAgB,CAAC,GAAG,gBAAgB,CAAC;AAEnF;;GAEG;AACH,KAAK,gBAAgB,GAAG;IACtB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;CAC9B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/compiler",
|
|
3
|
-
"version": "0.65.0-dev.
|
|
3
|
+
"version": "0.65.0-dev.23",
|
|
4
4
|
"description": "TypeSpec Compiler Preview",
|
|
5
5
|
"author": "Microsoft Corporation",
|
|
6
6
|
"license": "MIT",
|
|
@@ -71,6 +71,7 @@
|
|
|
71
71
|
],
|
|
72
72
|
"dependencies": {
|
|
73
73
|
"@babel/code-frame": "~7.26.2",
|
|
74
|
+
"@npmcli/arborist": "^9.0.0",
|
|
74
75
|
"ajv": "~8.17.1",
|
|
75
76
|
"change-case": "~5.4.4",
|
|
76
77
|
"globby": "~14.0.2",
|
|
@@ -89,6 +90,7 @@
|
|
|
89
90
|
"@types/babel__code-frame": "~7.0.6",
|
|
90
91
|
"@types/mustache": "~4.2.5",
|
|
91
92
|
"@types/node": "~22.10.10",
|
|
93
|
+
"@types/npmcli__arborist": "^6.3.0",
|
|
92
94
|
"@types/prompts": "~2.4.9",
|
|
93
95
|
"@types/semver": "^7.5.8",
|
|
94
96
|
"@types/yargs": "~17.0.33",
|