@antelopejs/core 1.18.2 → 1.19.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 -3
- package/dist/cli/commands/project/build-action.d.ts +1 -0
- package/dist/cli/commands/project/build-action.js +9 -0
- package/dist/cli/commands/project/build-action.js.map +1 -1
- package/dist/cli/commands/project/build.js +6 -1
- package/dist/cli/commands/project/build.js.map +1 -1
- package/dist/cli/commands/project/modules/add-action.d.ts +2 -1
- package/dist/cli/commands/project/modules/add-action.js +9 -20
- package/dist/cli/commands/project/modules/add-action.js.map +1 -1
- package/dist/cli/commands/project/modules/install-action.js +37 -17
- package/dist/cli/commands/project/modules/install-action.js.map +1 -1
- package/dist/cli/commands/project/modules/module-locks.d.ts +24 -0
- package/dist/cli/commands/project/modules/module-locks.js +117 -0
- package/dist/cli/commands/project/modules/module-locks.js.map +1 -0
- package/dist/cli/commands/project/modules/remove-action.js +2 -0
- package/dist/cli/commands/project/modules/remove-action.js.map +1 -1
- package/dist/cli/commands/project/modules/update-action.js +27 -4
- package/dist/cli/commands/project/modules/update-action.js.map +1 -1
- package/dist/cli/index.d.ts +1 -0
- package/dist/cli/index.js +2 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/core/build/index.d.ts +1 -0
- package/dist/core/build/index.js +37 -2
- package/dist/core/build/index.js.map +1 -1
- package/dist/core/build/interface-ranges.d.ts +2 -0
- package/dist/core/build/interface-ranges.js +19 -0
- package/dist/core/build/interface-ranges.js.map +1 -0
- package/dist/core/downloaders/index.d.ts +1 -0
- package/dist/core/downloaders/index.js +1 -0
- package/dist/core/downloaders/index.js.map +1 -1
- package/dist/core/downloaders/package-locks.d.ts +18 -0
- package/dist/core/downloaders/package-locks.js +106 -0
- package/dist/core/downloaders/package-locks.js.map +1 -0
- package/dist/core/downloaders/package.d.ts +2 -0
- package/dist/core/downloaders/package.js +18 -6
- package/dist/core/downloaders/package.js.map +1 -1
- package/dist/core/embedded/prepare-embedded.js +1 -1
- package/dist/core/embedded/prepare-embedded.js.map +1 -1
- package/dist/core/modules/index.d.ts +1 -0
- package/dist/core/modules/index.js +1 -0
- package/dist/core/modules/index.js.map +1 -1
- package/dist/core/modules/module-locks.d.ts +38 -0
- package/dist/core/modules/module-locks.js +205 -0
- package/dist/core/modules/module-locks.js.map +1 -0
- package/dist/core/modules/module-manager-context.d.ts +8 -2
- package/dist/core/modules/module-manager-context.js +1 -0
- package/dist/core/modules/module-manager-context.js.map +1 -1
- package/dist/core/modules/module-manager-lifecycle.js +16 -2
- package/dist/core/modules/module-manager-lifecycle.js.map +1 -1
- package/dist/core/modules/module-manager-packages.d.ts +1 -0
- package/dist/core/modules/module-manager-packages.js +21 -9
- package/dist/core/modules/module-manager-packages.js.map +1 -1
- package/dist/core/modules/module-manager.d.ts +2 -0
- package/dist/core/modules/module-manager.js +4 -0
- package/dist/core/modules/module-manager.js.map +1 -1
- package/dist/core/output/failures.js +24 -7
- package/dist/core/output/failures.js.map +1 -1
- package/dist/core/output/interface-conflicts.d.ts +1 -1
- package/dist/core/output/interface-conflicts.js +2 -1
- package/dist/core/output/interface-conflicts.js.map +1 -1
- package/dist/core/output/interface-resolution-error.d.ts +2 -0
- package/dist/core/output/interface-resolution-error.js +5 -1
- package/dist/core/output/interface-resolution-error.js.map +1 -1
- package/dist/core/output/package-manager.d.ts +2 -0
- package/dist/core/output/package-manager.js +17 -3
- package/dist/core/output/package-manager.js.map +1 -1
- package/dist/core/runtime/launch-sequence.js +5 -2
- package/dist/core/runtime/launch-sequence.js.map +1 -1
- package/dist/core/runtime/module-interfaces.d.ts +11 -0
- package/dist/core/runtime/module-interfaces.js +65 -5
- package/dist/core/runtime/module-interfaces.js.map +1 -1
- package/dist/core/runtime/module-loading.d.ts +5 -1
- package/dist/core/runtime/module-loading.js +31 -5
- package/dist/core/runtime/module-loading.js.map +1 -1
- package/dist/core/runtime/runtime-bootstrap.js +3 -0
- package/dist/core/runtime/runtime-bootstrap.js.map +1 -1
- package/dist/core/runtime/runtime-types.d.ts +5 -1
- package/package.json +1 -1
- package/skills/ajs-cli/SKILL.md +7 -3
- package/skills/ajs-cli/cases.json +15 -0
|
@@ -35,15 +35,28 @@ function genericProblem(error) {
|
|
|
35
35
|
}
|
|
36
36
|
return { title: String(error) };
|
|
37
37
|
}
|
|
38
|
-
function causeChain(error) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
38
|
+
function causeChain(error, chain = []) {
|
|
39
|
+
if (error === undefined || chain.includes(error)) {
|
|
40
|
+
return chain;
|
|
41
|
+
}
|
|
42
|
+
chain.push(error);
|
|
43
|
+
if (error instanceof AggregateError) {
|
|
44
|
+
for (const inner of error.errors) {
|
|
45
|
+
causeChain(inner, chain);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
if (error instanceof Error) {
|
|
49
|
+
causeChain(error.cause, chain);
|
|
44
50
|
}
|
|
45
51
|
return chain;
|
|
46
52
|
}
|
|
53
|
+
function aggregateDetails(chain) {
|
|
54
|
+
const titles = chain
|
|
55
|
+
.filter((error) => !(error instanceof AggregateError) &&
|
|
56
|
+
chain.some((parent) => parent instanceof AggregateError && parent.errors.includes(error)))
|
|
57
|
+
.map((error) => genericProblem(error).title);
|
|
58
|
+
return [...new Set(titles)];
|
|
59
|
+
}
|
|
47
60
|
function isTraceable(error) {
|
|
48
61
|
return (error instanceof Error &&
|
|
49
62
|
!(error instanceof errors_1.CliError) &&
|
|
@@ -93,7 +106,11 @@ function describeFailure(error, verbose = (0, verbosity_1.isVerboseRun)(), trans
|
|
|
93
106
|
const chain = causeChain(error);
|
|
94
107
|
const diagnostics = verbose
|
|
95
108
|
? verboseDetails(chain)
|
|
96
|
-
: [
|
|
109
|
+
: [
|
|
110
|
+
...aggregateDetails(chain),
|
|
111
|
+
...untranslatedOutputTail(chain),
|
|
112
|
+
...verboseHint(chain, translate),
|
|
113
|
+
];
|
|
97
114
|
return { ...problem, details: [...(problem.details ?? []), ...diagnostics] };
|
|
98
115
|
}
|
|
99
116
|
function reportFailure(error, ui = (0, tasks_1.getProcessUi)(), verbose = (0, verbosity_1.isVerboseRun)(), translate) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failures.js","sourceRoot":"","sources":["../../../src/core/output/failures.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"failures.js","sourceRoot":"","sources":["../../../src/core/output/failures.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type InterfaceResolutionError } from "./interface-resolution-error";
|
|
2
2
|
import type { CliProblem } from "./types";
|
|
3
3
|
export declare function describeInterfaceConflicts(error: InterfaceResolutionError): CliProblem;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.describeInterfaceConflicts = describeInterfaceConflicts;
|
|
4
4
|
const format_1 = require("./format");
|
|
5
|
+
const interface_resolution_error_1 = require("./interface-resolution-error");
|
|
5
6
|
const INTERFACE_CONFLICT_TITLE = "Incompatible interface package resolution";
|
|
6
7
|
const INTERFACE_CONFLICT_REASON = "Modules share one copy of each interface package, and that copy does not work for these modules:";
|
|
7
8
|
const NESTED_DETAIL_INDENT = " ";
|
|
@@ -16,7 +17,7 @@ function rangeConflictDetails(conflict) {
|
|
|
16
17
|
? `${consumerCopy.version} at ${(0, format_1.displayPath)(consumerCopy.root)}`
|
|
17
18
|
: MISSING_COPY;
|
|
18
19
|
return [
|
|
19
|
-
`${moduleId} requires ${packageName}@${conflict.range}, but the shared copy is ${conflict.canonical.version}`,
|
|
20
|
+
`${moduleId} requires ${packageName}@${conflict.range}, but the shared copy is ${conflict.canonical.version}${(0, interface_resolution_error_1.describeSharedCopyProvider)(conflict)}`,
|
|
20
21
|
sharedCopyDetail(conflict.canonical),
|
|
21
22
|
`${NESTED_DETAIL_INDENT}copy of ${moduleId}: ${ownCopy}`,
|
|
22
23
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface-conflicts.js","sourceRoot":"","sources":["../../../src/core/output/interface-conflicts.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"interface-conflicts.js","sourceRoot":"","sources":["../../../src/core/output/interface-conflicts.ts"],"names":[],"mappings":";;AA8DA,gEAiBC;AA/ED,qCAAuC;AACvC,6EAMsC;AAGtC,MAAM,wBAAwB,GAAG,2CAA2C,CAAC;AAC7E,MAAM,yBAAyB,GAC7B,kGAAkG,CAAC;AACrG,MAAM,oBAAoB,GAAG,IAAI,CAAC;AAClC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AACpC,MAAM,YAAY,GAAG,eAAe,CAAC;AAErC,SAAS,gBAAgB,CAAC,SAA+B;IACvD,OAAO,GAAG,oBAAoB,gBAAgB,IAAA,oBAAW,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;AAC9E,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgC;IAC5D,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACzD,MAAM,OAAO,GAAG,YAAY;QAC1B,CAAC,CAAC,GAAG,YAAY,CAAC,OAAO,OAAO,IAAA,oBAAW,EAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QAChE,CAAC,CAAC,YAAY,CAAC;IACjB,OAAO;QACL,GAAG,QAAQ,aAAa,WAAW,IAAI,QAAQ,CAAC,KAAK,4BAA4B,QAAQ,CAAC,SAAS,CAAC,OAAO,GAAG,IAAA,uDAA0B,EAAC,QAAQ,CAAC,EAAE;QACpJ,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;QACpC,GAAG,oBAAoB,WAAW,QAAQ,KAAK,OAAO,EAAE;KACzD,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,QAAgC;IAC1D,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;IAC3C,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;IAC3C,OAAO;QACL,UAAU,QAAQ,+BAA+B,WAAW,IAAI,OAAO,EAAE;QACzE,iBAAiB,WAAW,OAAO,uBAAuB,GAAG,OAAO,4BAA4B,QAAQ,mCAAmC;KAC5I,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,SAAiC;IAC7D,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;IAC7D,OAAO;QACL,eAAe,WAAW,iBAAiB,QAAQ,KAAK,IAAI,CAAC,OAAO,wCAAwC,SAAS,CAAC,OAAO,4BAA4B;QACzJ,GAAG,oBAAoB,iBAAiB,IAAA,oBAAW,EAAC,SAAS,CAAC,UAAU,CAAC,EAAE;QAC3E,gBAAgB,CAAC,SAAS,CAAC;KAC5B,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,SAAiC;IAC3D,OAAO;QACL,2BAA2B,SAAS,CAAC,WAAW,SAAS,SAAS,CAAC,QAAQ,sCAAsC;KAClH,CAAC;AACJ,CAAC;AAOD,SAAgB,0BAA0B,CACxC,KAA+B;IAE/B,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;IAC5D,MAAM,KAAK,GAAG;QACZ,GAAG,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAC7C,GAAG,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC;KAC/C,CAAC;IACF,OAAO;QACL,KAAK,EAAE,wBAAwB;QAC/B,MAAM,EAAE,yBAAyB;QACjC,OAAO,EAAE;YACP,GAAG,cAAc,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAC/C,GAAG,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC;SACjD;QACD,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;KAC3B,CAAC;AACJ,CAAC"}
|
|
@@ -5,8 +5,10 @@ export interface InterfaceRangeConflict {
|
|
|
5
5
|
packageName: string;
|
|
6
6
|
range: string;
|
|
7
7
|
canonical: InterfacePackageCopy;
|
|
8
|
+
provider?: string;
|
|
8
9
|
consumerCopy?: InterfacePackageCopy;
|
|
9
10
|
}
|
|
11
|
+
export declare function describeSharedCopyProvider(conflict: InterfaceRangeConflict): string;
|
|
10
12
|
export interface PreloadedInterfaceCopy {
|
|
11
13
|
moduleId: string;
|
|
12
14
|
packageName: string;
|
|
@@ -1,15 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InterfaceResolutionError = void 0;
|
|
4
|
+
exports.describeSharedCopyProvider = describeSharedCopyProvider;
|
|
4
5
|
const INTERFACE_RESOLUTION_ERROR_NAME = "InterfaceResolutionError";
|
|
5
6
|
const INTERFACE_RESOLUTION_HEADLINE = "Incompatible interface package resolution:";
|
|
6
7
|
const MISSING_CONSUMER_COPY = "not installed from the consumer";
|
|
8
|
+
function describeSharedCopyProvider(conflict) {
|
|
9
|
+
return conflict.provider ? ` (provided by ${conflict.provider})` : "";
|
|
10
|
+
}
|
|
7
11
|
function describeRangeConflict(conflict) {
|
|
8
12
|
const { canonical, consumerCopy } = conflict;
|
|
9
13
|
const installed = consumerCopy
|
|
10
14
|
? `${consumerCopy.version} at ${consumerCopy.root}`
|
|
11
15
|
: MISSING_CONSUMER_COPY;
|
|
12
|
-
return ` - ${conflict.moduleId} requires ${conflict.packageName}@${conflict.range}, but the canonical package is ${canonical.version} at ${canonical.root} (consumer copy: ${installed})`;
|
|
16
|
+
return ` - ${conflict.moduleId} requires ${conflict.packageName}@${conflict.range}, but the canonical package is ${canonical.version}${describeSharedCopyProvider(conflict)} at ${canonical.root} (consumer copy: ${installed})`;
|
|
13
17
|
}
|
|
14
18
|
function describePreloadedCopy(preloaded) {
|
|
15
19
|
return ` - ${preloaded.packageName}@${preloaded.copy.version} was loaded from ${preloaded.copy.root} before the canonical copy at ${preloaded.canonical.root}; preloaded interface copies cannot be redirected (${preloaded.loadedFile})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface-resolution-error.js","sourceRoot":"","sources":["../../../src/core/output/interface-resolution-error.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"interface-resolution-error.js","sourceRoot":"","sources":["../../../src/core/output/interface-resolution-error.ts"],"names":[],"mappings":";;;AA2BA,gEAIC;AA7BD,MAAM,+BAA+B,GAAG,0BAA0B,CAAC;AACnE,MAAM,6BAA6B,GACjC,4CAA4C,CAAC;AAC/C,MAAM,qBAAqB,GAAG,iCAAiC,CAAC;AAsBhE,SAAgB,0BAA0B,CACxC,QAAgC;IAEhC,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AACxE,CAAC;AAmBD,SAAS,qBAAqB,CAAC,QAAgC;IAC7D,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAC7C,MAAM,SAAS,GAAG,YAAY;QAC5B,CAAC,CAAC,GAAG,YAAY,CAAC,OAAO,OAAO,YAAY,CAAC,IAAI,EAAE;QACnD,CAAC,CAAC,qBAAqB,CAAC;IAC1B,OAAO,OAAO,QAAQ,CAAC,QAAQ,aAAa,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,KAAK,kCAAkC,SAAS,CAAC,OAAO,GAAG,0BAA0B,CAAC,QAAQ,CAAC,OAAO,SAAS,CAAC,IAAI,oBAAoB,SAAS,GAAG,CAAC;AACpO,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAiC;IAC9D,OAAO,OAAO,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,oBAAoB,SAAS,CAAC,IAAI,CAAC,IAAI,iCAAiC,SAAS,CAAC,SAAS,CAAC,IAAI,sDAAsD,SAAS,CAAC,UAAU,GAAG,CAAC;AAC7O,CAAC;AAOD,MAAa,wBAAyB,SAAQ,KAAK;IAC5B;IAArB,YAAqB,SAAuC;QAC1D,MAAM,KAAK,GAAG;YACZ,GAAG,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,qBAAqB,CAAC;YACtD,GAAG,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,qBAAqB,CAAC;SACxD,CAAC;QACF,KAAK,CAAC,GAAG,6BAA6B,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAL5C,cAAS,GAAT,SAAS,CAA8B;QAM1D,IAAI,CAAC,IAAI,GAAG,+BAA+B,CAAC;IAC9C,CAAC;CACF;AATD,4DASC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { IFileSystem } from "../../types";
|
|
2
|
+
export declare const MODULE_LOCKFILE_NAMES: readonly string[];
|
|
2
3
|
type LockfileMode = "frozen" | "update";
|
|
4
|
+
export declare function findModuleLockfile(directory: string, fileSystem?: IFileSystem): Promise<string | undefined>;
|
|
3
5
|
export declare function getModulePackageManager(directory?: string, fileSystem?: IFileSystem): Promise<string | undefined>;
|
|
4
6
|
export declare function getPackageManagerWithVersion(packageManager: string): string;
|
|
5
7
|
export declare function savePackageManagerToPackageJson(packageManager: string, directory?: string): void;
|
|
@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.MODULE_LOCKFILE_NAMES = void 0;
|
|
7
|
+
exports.findModuleLockfile = findModuleLockfile;
|
|
6
8
|
exports.getModulePackageManager = getModulePackageManager;
|
|
7
9
|
exports.getPackageManagerWithVersion = getPackageManagerWithVersion;
|
|
8
10
|
exports.savePackageManagerToPackageJson = savePackageManagerToPackageJson;
|
|
@@ -24,6 +26,7 @@ const LOCKFILES = {
|
|
|
24
26
|
yarn: ["yarn.lock"],
|
|
25
27
|
pnpm: ["pnpm-lock.yaml"],
|
|
26
28
|
};
|
|
29
|
+
exports.MODULE_LOCKFILE_NAMES = Object.values(LOCKFILES).flat();
|
|
27
30
|
const FALLBACK_VERSIONS = {
|
|
28
31
|
npm: "npm@10.2.4",
|
|
29
32
|
yarn: "yarn@1.22.21",
|
|
@@ -64,10 +67,16 @@ function hasCorepack() {
|
|
|
64
67
|
return false;
|
|
65
68
|
}
|
|
66
69
|
}
|
|
70
|
+
function packageManagerName(packageManager) {
|
|
71
|
+
return normalizePackageManager(packageManager?.match(PACKAGE_MANAGER_PATTERN)?.[1] ?? packageManager);
|
|
72
|
+
}
|
|
67
73
|
function resolvePackageManager(packageManager) {
|
|
68
|
-
const
|
|
69
|
-
const
|
|
70
|
-
|
|
74
|
+
const name = packageManagerName(packageManager);
|
|
75
|
+
const executable = packageManager !== undefined &&
|
|
76
|
+
PACKAGE_MANAGER_PATTERN.test(packageManager) &&
|
|
77
|
+
hasCorepack()
|
|
78
|
+
? `corepack ${packageManager}`
|
|
79
|
+
: name;
|
|
71
80
|
return { executable, name };
|
|
72
81
|
}
|
|
73
82
|
async function hasPackageManagerLockfile(directory, packageManager, fileSystem) {
|
|
@@ -75,6 +84,11 @@ async function hasPackageManagerLockfile(directory, packageManager, fileSystem)
|
|
|
75
84
|
const matches = await Promise.all(lockfiles.map((lockfile) => fileSystem.exists(node_path_1.default.join(directory, lockfile))));
|
|
76
85
|
return matches.includes(true);
|
|
77
86
|
}
|
|
87
|
+
async function findModuleLockfile(directory, fileSystem = new filesystem_1.NodeFileSystem()) {
|
|
88
|
+
const lockfiles = LOCKFILES[packageManagerName(await getModulePackageManager(directory, fileSystem))];
|
|
89
|
+
const matches = await Promise.all(lockfiles.map((lockfile) => fileSystem.exists(node_path_1.default.join(directory, lockfile))));
|
|
90
|
+
return lockfiles.find((_, index) => matches[index]);
|
|
91
|
+
}
|
|
78
92
|
async function getModulePackageManager(directory = ".", fileSystem = new filesystem_1.NodeFileSystem()) {
|
|
79
93
|
try {
|
|
80
94
|
const packageJsonPath = node_path_1.default.join(directory, "package.json");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../src/core/output/package-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../src/core/output/package-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,7 @@ const build_runtime_1 = require("./build-runtime");
|
|
|
51
51
|
const dev_server_registry_1 = require("./dev-server-registry");
|
|
52
52
|
const launch_steps_1 = require("./launch-steps");
|
|
53
53
|
const module_loading_1 = require("./module-loading");
|
|
54
|
+
const module_interfaces_1 = require("./module-interfaces");
|
|
54
55
|
const process_claim_1 = require("./process-claim");
|
|
55
56
|
const runtime_bootstrap_1 = require("./runtime-bootstrap");
|
|
56
57
|
const runtime_policy_1 = require("./runtime-policy");
|
|
@@ -73,6 +74,7 @@ function resolveRuntimeLoaderConfig(artifactConfig, projectFolder) {
|
|
|
73
74
|
cacheFolder: cacheIsInsideProject
|
|
74
75
|
? node_path_1.default.join(runtimeFolder, cacheRelativeToBuild)
|
|
75
76
|
: artifactConfig.cacheFolder,
|
|
77
|
+
moduleLocks: "replay",
|
|
76
78
|
};
|
|
77
79
|
}
|
|
78
80
|
const prepareFromConfig = async (projectFolder, env) => {
|
|
@@ -190,8 +192,9 @@ function addModules(launch) {
|
|
|
190
192
|
if (project.instanceRoot) {
|
|
191
193
|
manager.setInstanceRoot(project.instanceRoot);
|
|
192
194
|
}
|
|
193
|
-
|
|
194
|
-
|
|
195
|
+
const { required, optional } = (0, module_interfaces_1.partitionModuleEntries)(entries);
|
|
196
|
+
launch.optionalEntries = optional;
|
|
197
|
+
manager.addModules(required);
|
|
195
198
|
(0, module_loading_1.ensureGraphIsValid)(manager);
|
|
196
199
|
}
|
|
197
200
|
function constructProjectModules({ manager }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-sequence.js","sourceRoot":"","sources":["../../../src/core/runtime/launch-sequence.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"launch-sequence.js","sourceRoot":"","sources":["../../../src/core/runtime/launch-sequence.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsDA,oDAQC;AAkLD,8CAoCC;AApRD,gEAA6D;AAC7D,0DAA6B;AAE7B,2CAA4E;AAE5E,sCAA2C;AAC3C,8CAA+C;AAE/C,wCAA2E;AAC3E,sCAA4C;AAC5C,mDAA6D;AAC7D,mDAMyB;AACzB,+DAAqE;AACrE,iDAAiE;AACjE,qDAQ0B;AAC1B,2DAA6D;AAC7D,mDAIyB;AACzB,2DAM6B;AAC7B,qDAA8E;AAY9E,SAAgB,oBAAoB,CAClC,MAAoC;IAEpC,IAAI,OAA2C,CAAC;IAChD,OAAO,GAAG,EAAE;QACV,OAAO,KAAK,MAAM,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;AACJ,CAAC;AAUD,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAY7C,SAAS,0BAA0B,CACjC,cAA4B,EAC5B,aAAqB;IAErB,MAAM,aAAa,GAAG,mBAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAClD,MAAM,oBAAoB,GAAG,mBAAI,CAAC,QAAQ,CACxC,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,WAAW,CAC3B,CAAC;IACF,MAAM,oBAAoB,GACxB,oBAAoB,KAAK,EAAE;QAC3B,CAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC;QACtC,CAAC,mBAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAEzC,OAAO;QACL,aAAa,EAAE,aAAa;QAC5B,WAAW,EAAE,oBAAoB;YAC/B,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,oBAAoB,CAAC;YAChD,CAAC,CAAC,cAAc,CAAC,WAAW;QAC9B,WAAW,EAAE,QAAQ;KACtB,CAAC;AACJ,CAAC;AAQM,MAAM,iBAAiB,GAAoB,KAAK,EACrD,aAAa,EACb,GAAG,EACH,EAAE;IACF,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,qCAAiB,EAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IAC7E,MAAM,WAAW,GAAG,oBAAoB,CAAC,GAAG,EAAE,CAC5C,IAAA,oCAAmB,EAAC,gBAAgB,EAAE,EAAE,CAAC,CAC1C,CAAC;IAEF,OAAO;QACL,EAAE;QACF,GAAG,EAAE,IAAI;QACT,OAAO,EAAE,gBAAgB,CAAC,OAAO;QACjC,WAAW;QACX,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACzB,MAAM,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,GACjD,MAAM,kDAAO,YAAY,IAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACzE,mBAAmB,CACjB,MAAM,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAC/D,CAAC;QACJ,CAAC;QACD,aAAa,EAAE,KAAK,IAAI,EAAE,CACxB,IAAA,mCAAkB,EAAC,gBAAgB,EAAE,MAAM,WAAW,EAAE,CAAC;QAC3D,YAAY,EAAE,mBAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,0BAAgB,CAAC;KACxE,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,iBAAiB,qBAyB5B;AAEF,SAAS,wBAAwB,CAC/B,QAAuB,EACvB,aAAqB,EACrB,EAAkB,EAClB,MAA2B;IAE3B,MAAM,YAAY,GAAG,0BAA0B,CAC7C,QAAQ,CAAC,MAAM,EACf,aAAa,CACd,CAAC;IAEF,OAAO;QACL,EAAE;QACF,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO;QAChC,WAAW,EAAE,oBAAoB,CAAC,GAAG,EAAE,CACrC,IAAA,oCAAmB,EAAC,YAAY,EAAE,EAAE,CAAC,CACtC;QACD,MAAM;QACN,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC,IAAA,wCAAwB,EAAC,QAAQ,CAAC;QAC7D,YAAY,EAAE,mBAAI,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,0BAAgB,CAAC;KACpE,CAAC;AACJ,CAAC;AAQM,MAAM,mBAAmB,GAAoB,KAAK,EACvD,aAAa,EACb,GAAG,EACH,EAAE;IACF,MAAM,EAAE,GAAG,IAAI,2BAAc,EAAE,CAAC;IAChC,IAAA,uBAAc,EAAC,aAAa,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAwB,EAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAEnE,OAAO,wBAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE;QACtE,IAAA,sCAAsB,EAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC1C,MAAM,IAAA,kCAAkB,EAAC,aAAa,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACtD,MAAM,IAAA,uCAAuB,EAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAbW,QAAA,mBAAmB,uBAa9B;AASK,MAAM,4BAA4B,GAAoB,KAAK,EAChE,aAAa,EACb,GAAG,EACH,EAAE;IACF,MAAM,EAAE,GAAG,IAAI,2BAAc,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,MAAM,IAAA,0CAA0B,EAAC,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAE1E,OAAO,wBAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE,GAAG,EAAE,CAChE,IAAA,uCAAuB,EAAC,QAAQ,EAAE,EAAE,CAAC,CACtC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,4BAA4B,gCAUvC;AAQF,SAAS,WAAW,CAClB,eAAgC,EAChC,OAAsB,EACtB,MAAqB;IAErB,MAAM,cAAc,GAAG,IAAA,6CAA6B,EAClD,eAAe,EACf,OAAO,CACR,CAAC;IACF,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QAC3B,IAAA,wCAAoB,EAAC,eAAe,CAAC,CAAC;IACxC,CAAC;IACD,IAAA,4BAAY,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,cAAc,CAAC;AACxB,CAAC;AAgBM,KAAK,UAAU,iBAAiB,CACrC,OAAwB,EACxB,aAAqB,EACrB,GAAW,EACX,OAAsB,EACtB,SAAwB,uCAAsB;IAE9C,MAAM,eAAe,GAAG,IAAA,qCAAqB,EAAC,MAAM,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,IAAI,uBAAa,EAAE,CAAC;IACpC,MAAM,OAAO,GAAkB;QAC7B,OAAO;QACP,aAAa;QACb,GAAG;QACH,OAAO;QACP,MAAM;KACP,CAAC;IACF,MAAM,cAAc,GAAG,WAAW,CAAC,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAErE,MAAM,gBAAgB,GAAG,wBAAe,CAAC,QAAQ,EAAE,CAAC;IACpD,wBAAe,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,CAAC;QACH,OAAO,MAAM,sBAAsB,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC1E,IAAA,iDAA6B,EAAC,eAAe,CAAC,CAAC;QAC/C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,IAAI,cAAc,CACtB,CAAC,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,EAAE,GAAG,aAAa,CAAC,EAC1C,0BAA0B,CAC3B,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,wBAAe,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,EAAE,OAAO,EAAE,OAAO,EAAiB;IACvD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,IAAA,wBAAc,EAAC,KAAK,CAAC,CAAC;IACtB,IAAA,qCAA2B,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAA,wCAAoB,EAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,aAAa,CAAC,EACrB,OAAO,EACP,eAAe,GACD;IACd,OAAO,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,wBAAwB,CAAC,EAChC,OAAO,EACP,OAAO,EACP,eAAe,GACD;IACd,OAAO,IAAA,kDAA4B,EAAC;QAClC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW,EAAE,OAAO,CAAC,aAAa;QAClC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,eAAe;KAChB,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,EACtC,OAAO,EACP,OAAO,GACO;IACd,IAAA,4CAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1D,MAAM,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,MAAqB;IACtD,MAAM,CAAC,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,UAAU,CAAC,MAAqB;IACvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAC7C,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAA,0CAAsB,EAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,CAAC,eAAe,GAAG,QAAQ,CAAC;IAClC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC7B,IAAA,mCAAkB,EAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,uBAAuB,CAAC,EAAE,OAAO,EAAiB;IACzD,OAAO,IAAA,iCAAgB,EAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,YAAY,CAAC,EAAE,OAAO,EAAiB;IAC9C,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC;AAMD,KAAK,UAAU,mBAAmB,CAChC,OAAsB,EACtB,KAA0B;IAE1B,IAAI,CAAC;QACH,MAAM,IAAA,sCAAqB,EAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CACV,mBAAmB,KAAK,CAAC,QAAQ,CAAC,IAAI,sCAAsC,EAC5E,KAAK,CACN,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,EAClC,OAAO,EACP,eAAe,GACD;IACd,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;QACpC,MAAM,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,MAAM,YAAY,GAAyC;IACzD,wBAAwB;IACxB,mBAAmB;IACnB,UAAU;IACV,uBAAuB;IACvB,YAAY;IACZ,oBAAoB;CACrB,CAAC;AAEF,SAAS,kBAAkB,CAAC,MAAqB;IAC/C,OAAO,IAAA,0CAAsB,EAAC,GAAG,EAAE,CACjC,IAAA,6BAAc,EAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CACtE,CAAC;AACJ,CAAC;AAOD,MAAM,YAAY,GAAyC;IACzD,YAAY;IACZ,aAAa;IACb,wBAAwB;IACxB,kBAAkB;CACnB,CAAC;AAEF,KAAK,UAAU,sBAAsB,CACnC,OAAsB,EACtB,eAAgC,EAChC,OAAsB;IAEtB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAkB;QAC5B,OAAO;QACP,OAAO;QACP,eAAe;QACf,OAAO;QACP,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,EAAE;KACpB,CAAC;IACF,MAAM,IAAA,6BAAc,EAAC,YAAY,EAAE,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;IAErE,OAAO;QACL,OAAO;QACP,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,eAAe;QACf,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,OAAsB,EACtB,eAAgC;IAEhC,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,CAAC;QACH,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,3 +1,14 @@
|
|
|
1
1
|
import type { ManagedModule, ModuleManager } from "../modules";
|
|
2
|
+
import { type InterfaceRangeConflict } from "../output";
|
|
3
|
+
import type { ModuleManifestEntry } from "./runtime-types";
|
|
4
|
+
interface PartitionedModuleEntries {
|
|
5
|
+
required: ModuleManifestEntry[];
|
|
6
|
+
optional: ModuleManifestEntry[];
|
|
7
|
+
}
|
|
8
|
+
export declare function partitionModuleEntries(entries: ModuleManifestEntry[]): PartitionedModuleEntries;
|
|
2
9
|
export declare function activateLoadedModules(manager: ModuleManager, created: ManagedModule[], autostart: boolean): Promise<void>;
|
|
3
10
|
export declare function ensureGraphIsValid(manager: ModuleManager): void;
|
|
11
|
+
export declare function planInterfacePackages(manager: ModuleManager): void;
|
|
12
|
+
export declare function findEntryRangeConflicts(manager: ModuleManager, entries: ModuleManifestEntry[], planRequired: (manager: ModuleManager) => void): Promise<InterfaceRangeConflict[]>;
|
|
13
|
+
export declare function ensureNoRangeConflicts(rangeConflicts: InterfaceRangeConflict[]): void;
|
|
14
|
+
export {};
|
|
@@ -1,8 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.partitionModuleEntries = partitionModuleEntries;
|
|
3
4
|
exports.activateLoadedModules = activateLoadedModules;
|
|
4
5
|
exports.ensureGraphIsValid = ensureGraphIsValid;
|
|
6
|
+
exports.planInterfacePackages = planInterfacePackages;
|
|
7
|
+
exports.findEntryRangeConflicts = findEntryRangeConflicts;
|
|
8
|
+
exports.ensureNoRangeConflicts = ensureNoRangeConflicts;
|
|
9
|
+
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
10
|
+
const output_1 = require("../output");
|
|
5
11
|
const resolution_1 = require("../resolution");
|
|
12
|
+
const Logger = new logging_1.Logging.Channel("loader");
|
|
13
|
+
function partitionModuleEntries(entries) {
|
|
14
|
+
return {
|
|
15
|
+
required: entries.filter((entry) => !entry.config?.optional),
|
|
16
|
+
optional: entries.filter((entry) => entry.config?.optional),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
async function discardCreatedModules(manager, created) {
|
|
20
|
+
await Promise.allSettled(created.map(({ module }) => module.destroy()));
|
|
21
|
+
manager.discardModules(created.map(({ module }) => module.id));
|
|
22
|
+
}
|
|
6
23
|
async function activateLoadedModules(manager, created, autostart) {
|
|
7
24
|
try {
|
|
8
25
|
ensureInterfacesResolved(manager, created);
|
|
@@ -12,8 +29,7 @@ async function activateLoadedModules(manager, created, autostart) {
|
|
|
12
29
|
}
|
|
13
30
|
}
|
|
14
31
|
catch (error) {
|
|
15
|
-
await
|
|
16
|
-
manager.discardModules(created.map(({ module }) => module.id));
|
|
32
|
+
await discardCreatedModules(manager, created);
|
|
17
33
|
throw error;
|
|
18
34
|
}
|
|
19
35
|
}
|
|
@@ -48,8 +64,16 @@ function unresolvedInterfacesError(unresolved) {
|
|
|
48
64
|
.join("\n");
|
|
49
65
|
return new Error(`Unresolved interface dependencies:\n${details}\n\nRun 'ajs project modules install' to resolve missing dependencies.`);
|
|
50
66
|
}
|
|
67
|
+
function findInterfaces(manager, consumers) {
|
|
68
|
+
return (0, resolution_1.findUnresolvedInterfaces)(collectInterfaceProviders(manager), [...consumers].map(toInterfaceConsumer), collectStaticPackages(manager));
|
|
69
|
+
}
|
|
70
|
+
function registerStubs(manager, stubbed) {
|
|
71
|
+
if (stubbed.length > 0) {
|
|
72
|
+
manager.registerStubbedInterfaces(stubbed);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
51
75
|
function ensureInterfacesResolved(manager, consumers) {
|
|
52
|
-
const result = (
|
|
76
|
+
const result = findInterfaces(manager, consumers);
|
|
53
77
|
if (result.unresolved.length > 0) {
|
|
54
78
|
throw unresolvedInterfacesError(result.unresolved);
|
|
55
79
|
}
|
|
@@ -57,8 +81,44 @@ function ensureInterfacesResolved(manager, consumers) {
|
|
|
57
81
|
}
|
|
58
82
|
function ensureGraphIsValid(manager) {
|
|
59
83
|
const { stubbed } = ensureInterfacesResolved(manager, manager.getLoadedModules());
|
|
60
|
-
|
|
61
|
-
|
|
84
|
+
registerStubs(manager, stubbed);
|
|
85
|
+
}
|
|
86
|
+
function planInterfacePackages(manager) {
|
|
87
|
+
registerStubs(manager, findInterfaces(manager, manager.getLoadedModules()).stubbed);
|
|
88
|
+
}
|
|
89
|
+
function rangeConflictError(rangeConflicts) {
|
|
90
|
+
return new output_1.InterfaceResolutionError({ rangeConflicts, preloadedCopies: [] });
|
|
91
|
+
}
|
|
92
|
+
async function checkOptionalModule(manager, entry) {
|
|
93
|
+
const created = manager.addModules([entry]);
|
|
94
|
+
try {
|
|
95
|
+
ensureInterfacesResolved(manager, created);
|
|
96
|
+
const rangeConflicts = manager.findInterfaceRangeConflicts();
|
|
97
|
+
if (rangeConflicts.length > 0) {
|
|
98
|
+
throw rangeConflictError(rangeConflicts);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
await discardCreatedModules(manager, created);
|
|
103
|
+
Logger.Warn(`Optional module ${entry.manifest.name} would fail to start; a launch runs without it.`, error instanceof Error ? error.message : String(error));
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
async function findEntryRangeConflicts(manager, entries, planRequired) {
|
|
107
|
+
const { required, optional } = partitionModuleEntries(entries);
|
|
108
|
+
manager.addModules(required);
|
|
109
|
+
planRequired(manager);
|
|
110
|
+
const rangeConflicts = manager.findInterfaceRangeConflicts();
|
|
111
|
+
if (rangeConflicts.length > 0) {
|
|
112
|
+
return rangeConflicts;
|
|
113
|
+
}
|
|
114
|
+
for (const entry of optional) {
|
|
115
|
+
await checkOptionalModule(manager, entry);
|
|
116
|
+
}
|
|
117
|
+
return [];
|
|
118
|
+
}
|
|
119
|
+
function ensureNoRangeConflicts(rangeConflicts) {
|
|
120
|
+
if (rangeConflicts.length > 0) {
|
|
121
|
+
throw rangeConflictError(rangeConflicts);
|
|
62
122
|
}
|
|
63
123
|
}
|
|
64
124
|
//# sourceMappingURL=module-interfaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-interfaces.js","sourceRoot":"","sources":["../../../src/core/runtime/module-interfaces.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"module-interfaces.js","sourceRoot":"","sources":["../../../src/core/runtime/module-interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { NodeFileSystem } from "../filesystem";
|
|
|
4
4
|
import type { ManagedModule, ModuleConfig, ModuleManager } from "../modules";
|
|
5
5
|
import { ModuleManifest } from "../modules";
|
|
6
6
|
import type { LoaderConfig, LoaderContext, LoaderContextProvider, ModuleManifestEntry, ModuleOverrideMap, NormalizedLoadedConfig } from "./runtime-types";
|
|
7
|
-
import type { FailureTranslator } from "../output";
|
|
7
|
+
import type { FailureTranslator, InterfaceRangeConflict } from "../output";
|
|
8
8
|
export declare function createLoaderContext(config: LoaderConfig, fs?: NodeFileSystem): Promise<LoaderContext>;
|
|
9
9
|
export declare function activateLoadedModules(manager: ModuleManager, created: ManagedModule[], autostart: boolean): Promise<void>;
|
|
10
10
|
export declare function registerCoreModuleInterface(manager: ModuleManager, loadContext: LoaderContextProvider): void;
|
|
@@ -14,8 +14,12 @@ export declare function toModuleConfig(moduleConfig: ExpandedModuleConfig): Modu
|
|
|
14
14
|
export declare function buildModuleConfigs(config: NormalizedLoadedConfig, loaderContext: LoaderContext): Promise<ModuleManifestEntry[]>;
|
|
15
15
|
export declare function getWatchDirs(source: ModuleSource): string[];
|
|
16
16
|
export declare function reloadWatchedModule(manager: ModuleManager, moduleId: string, loaderContext: LoaderContext): Promise<void>;
|
|
17
|
+
export declare function createModuleEntriesForManager(manager: ModuleManager, config: NormalizedLoadedConfig, runtimeInterface: boolean, loaderContext?: LoaderContext): Promise<ModuleManifestEntry[]>;
|
|
17
18
|
export declare function loadModuleEntriesForManager(manager: ModuleManager, config: NormalizedLoadedConfig, runtimeInterface: boolean, loaderContext?: LoaderContext): Promise<ModuleManifestEntry[]>;
|
|
18
19
|
export declare function constructModules(manager: ModuleManager): Promise<void>;
|
|
19
20
|
export declare function constructAndStartModules(manager: ModuleManager): Promise<void>;
|
|
20
21
|
export declare function destroyModulesAfterFailure(manager: ModuleManager, error: Parameters<FailureTranslator>[0]): Promise<never>;
|
|
21
22
|
export declare function ensureGraphIsValid(manager: ModuleManager): void;
|
|
23
|
+
export declare function ensureNoRangeConflicts(rangeConflicts: InterfaceRangeConflict[]): void;
|
|
24
|
+
export declare function findEntryRangeConflicts(manager: ModuleManager, entries: ModuleManifestEntry[], planRequired: (manager: ModuleManager) => void): Promise<InterfaceRangeConflict[]>;
|
|
25
|
+
export declare function planInterfacePackages(manager: ModuleManager): void;
|
|
@@ -42,11 +42,15 @@ exports.toModuleConfig = toModuleConfig;
|
|
|
42
42
|
exports.buildModuleConfigs = buildModuleConfigs;
|
|
43
43
|
exports.getWatchDirs = getWatchDirs;
|
|
44
44
|
exports.reloadWatchedModule = reloadWatchedModule;
|
|
45
|
+
exports.createModuleEntriesForManager = createModuleEntriesForManager;
|
|
45
46
|
exports.loadModuleEntriesForManager = loadModuleEntriesForManager;
|
|
46
47
|
exports.constructModules = constructModules;
|
|
47
48
|
exports.constructAndStartModules = constructAndStartModules;
|
|
48
49
|
exports.destroyModulesAfterFailure = destroyModulesAfterFailure;
|
|
49
50
|
exports.ensureGraphIsValid = ensureGraphIsValid;
|
|
51
|
+
exports.ensureNoRangeConflicts = ensureNoRangeConflicts;
|
|
52
|
+
exports.findEntryRangeConflicts = findEntryRangeConflicts;
|
|
53
|
+
exports.planInterfacePackages = planInterfacePackages;
|
|
50
54
|
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
51
55
|
const filesystem_1 = require("../filesystem");
|
|
52
56
|
const modules_1 = require("../modules");
|
|
@@ -66,16 +70,21 @@ async function createLoaderContext(config, fs = new filesystem_1.NodeFileSystem(
|
|
|
66
70
|
]);
|
|
67
71
|
const cache = new modules_1.ModuleCache(config.cacheFolder, fs);
|
|
68
72
|
await cache.load();
|
|
73
|
+
const locks = new modules_1.ModuleLockStore(config.projectFolder, fs);
|
|
69
74
|
const registry = new DownloaderRegistry();
|
|
70
75
|
local.registerLocalDownloader(registry, { fs });
|
|
71
76
|
localFolder.registerLocalFolderDownloader(registry, { fs });
|
|
72
|
-
packageDownloader.registerPackageDownloader(registry, {
|
|
77
|
+
packageDownloader.registerPackageDownloader(registry, {
|
|
78
|
+
fs,
|
|
79
|
+
lock: { store: locks, mode: config.moduleLocks ?? "record" },
|
|
80
|
+
});
|
|
73
81
|
git.registerGitDownloader(registry, { fs });
|
|
74
82
|
return {
|
|
75
83
|
fs,
|
|
76
84
|
cache,
|
|
77
85
|
registry,
|
|
78
86
|
projectFolder: config.projectFolder,
|
|
87
|
+
locks,
|
|
79
88
|
};
|
|
80
89
|
}
|
|
81
90
|
async function activateLoadedModules(manager, created, autostart) {
|
|
@@ -131,7 +140,8 @@ async function loadModuleEntries(modules, context) {
|
|
|
131
140
|
if (result.status === "fulfilled")
|
|
132
141
|
return;
|
|
133
142
|
const [id, moduleConfig] = declared[index];
|
|
134
|
-
if (moduleConfig.optional
|
|
143
|
+
if (moduleConfig.optional &&
|
|
144
|
+
!(result.reason instanceof modules_1.MissingModuleLockError)) {
|
|
135
145
|
skipOptionalModule(id, result.reason);
|
|
136
146
|
return;
|
|
137
147
|
}
|
|
@@ -154,7 +164,11 @@ function validateModuleNameCollisions(entries) {
|
|
|
154
164
|
}
|
|
155
165
|
async function buildModuleConfigs(config, loaderContext) {
|
|
156
166
|
const moduleCount = Object.keys(config.modules).length;
|
|
157
|
-
const modules = await (0, output_1.runTask)("Loading modules", () => loadModuleEntries(config.modules, loaderContext), { done: `Loaded ${(0, output_1.pluralize)(moduleCount, "module")}` })
|
|
167
|
+
const modules = await (0, output_1.runTask)("Loading modules", () => loadModuleEntries(config.modules, loaderContext), { done: `Loaded ${(0, output_1.pluralize)(moduleCount, "module")}` }).finally(() => {
|
|
168
|
+
if (loaderContext.locks) {
|
|
169
|
+
(0, modules_1.reportRecordedLocks)(loaderContext.locks);
|
|
170
|
+
}
|
|
171
|
+
});
|
|
158
172
|
validateModuleNameCollisions(modules);
|
|
159
173
|
return modules;
|
|
160
174
|
}
|
|
@@ -171,13 +185,16 @@ function getWatchDirs(source) {
|
|
|
171
185
|
async function reloadWatchedModule(manager, moduleId, loaderContext) {
|
|
172
186
|
return (0, module_reloading_1.reloadWatchedModule)(manager, moduleId, loaderContext);
|
|
173
187
|
}
|
|
174
|
-
async function
|
|
188
|
+
async function createModuleEntriesForManager(manager, config, runtimeInterface, loaderContext) {
|
|
175
189
|
const resolvedLoaderContext = loaderContext ?? (await createLoaderContext(config));
|
|
176
190
|
if (runtimeInterface) {
|
|
177
191
|
registerCoreModuleInterface(manager, async () => resolvedLoaderContext);
|
|
178
192
|
}
|
|
179
193
|
await registerCoreInterfaces(manager);
|
|
180
|
-
|
|
194
|
+
return buildModuleConfigs(config, resolvedLoaderContext);
|
|
195
|
+
}
|
|
196
|
+
async function loadModuleEntriesForManager(manager, config, runtimeInterface, loaderContext) {
|
|
197
|
+
const entries = await createModuleEntriesForManager(manager, config, runtimeInterface, loaderContext);
|
|
181
198
|
manager.addModules(entries);
|
|
182
199
|
return entries;
|
|
183
200
|
}
|
|
@@ -205,4 +222,13 @@ async function destroyModulesAfterFailure(manager, error) {
|
|
|
205
222
|
function ensureGraphIsValid(manager) {
|
|
206
223
|
return (0, module_interfaces_1.ensureGraphIsValid)(manager);
|
|
207
224
|
}
|
|
225
|
+
function ensureNoRangeConflicts(rangeConflicts) {
|
|
226
|
+
return (0, module_interfaces_1.ensureNoRangeConflicts)(rangeConflicts);
|
|
227
|
+
}
|
|
228
|
+
function findEntryRangeConflicts(manager, entries, planRequired) {
|
|
229
|
+
return (0, module_interfaces_1.findEntryRangeConflicts)(manager, entries, planRequired);
|
|
230
|
+
}
|
|
231
|
+
function planInterfacePackages(manager) {
|
|
232
|
+
return (0, module_interfaces_1.planInterfacePackages)(manager);
|
|
233
|
+
}
|
|
208
234
|
//# sourceMappingURL=module-loading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-loading.js","sourceRoot":"","sources":["../../../src/core/runtime/module-loading.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"module-loading.js","sourceRoot":"","sources":["../../../src/core/runtime/module-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -126,6 +126,9 @@ async function loadProjectConfig(projectFolder, env) {
|
|
|
126
126
|
async function loadProjectRuntimeConfig(projectFolder, env, options, shutdownManager) {
|
|
127
127
|
setupProcessHandlers(shutdownManager);
|
|
128
128
|
const config = await loadProjectConfig(projectFolder, env);
|
|
129
|
+
if ("frozenModules" in options && options.frozenModules) {
|
|
130
|
+
config.normalizedConfig.moduleLocks = "frozen";
|
|
131
|
+
}
|
|
129
132
|
(0, logging_2.setupAntelopeProjectLogging)(config.normalizedConfig.logging);
|
|
130
133
|
applyVerboseChannels(options.verbose);
|
|
131
134
|
return config;
|