@antelopejs/core 1.13.3 → 1.13.5
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/core/cli/command.d.ts +2 -1
- package/dist/core/cli/command.js +36 -22
- package/dist/core/cli/command.js.map +1 -1
- package/dist/core/cli/commands/shared/project-command.js +12 -7
- package/dist/core/cli/commands/shared/project-command.js.map +1 -1
- package/dist/core/cli/common.d.ts +0 -1
- package/dist/core/cli/common.js +0 -8
- package/dist/core/cli/common.js.map +1 -1
- package/dist/core/cli/options.js +2 -1
- package/dist/core/cli/options.js.map +1 -1
- package/dist/core/cli/output/interface-conflicts.d.ts +3 -0
- package/dist/core/cli/output/interface-conflicts.js +61 -0
- package/dist/core/cli/output/interface-conflicts.js.map +1 -0
- package/dist/core/cli/output/translations.js +5 -0
- package/dist/core/cli/output/translations.js.map +1 -1
- package/dist/core/cli/production-start.js +1 -1
- package/dist/core/cli/production-start.js.map +1 -1
- package/dist/core/config/config-loader.d.ts +1 -2
- package/dist/core/config/config-loader.js +0 -1
- package/dist/core/config/config-loader.js.map +1 -1
- package/dist/core/config/config-paths.d.ts +2 -0
- package/dist/core/config/config-paths.js +4 -2
- package/dist/core/config/config-paths.js.map +1 -1
- package/dist/core/module-manager.d.ts +2 -2
- package/dist/core/module-manager.js +26 -17
- package/dist/core/module-manager.js.map +1 -1
- package/dist/core/resolution/interface-resolution-error.d.ts +24 -0
- package/dist/core/resolution/interface-resolution-error.js +30 -0
- package/dist/core/resolution/interface-resolution-error.js.map +1 -0
- package/dist/core/runtime/launch-sequence.js +62 -24
- package/dist/core/runtime/launch-sequence.js.map +1 -1
- package/dist/core/runtime/launch-steps.d.ts +5 -0
- package/dist/core/runtime/launch-steps.js +26 -0
- package/dist/core/runtime/launch-steps.js.map +1 -0
- package/dist/core/runtime/module-loading.d.ts +1 -0
- package/dist/core/runtime/module-loading.js +5 -1
- package/dist/core/runtime/module-loading.js.map +1 -1
- package/dist/core/runtime/project-launch.js +33 -12
- package/dist/core/runtime/project-launch.js.map +1 -1
- package/dist/core/runtime/runtime-bootstrap.js +0 -3
- package/dist/core/runtime/runtime-bootstrap.js.map +1 -1
- package/dist/core/runtime/runtime-policy.js.map +1 -1
- package/dist/core/runtime/runtime-types.d.ts +1 -1
- package/dist/core/shutdown/shutdown-manager.d.ts +2 -0
- package/dist/core/shutdown/shutdown-manager.js +11 -2
- package/dist/core/shutdown/shutdown-manager.js.map +1 -1
- package/dist/core/version-checker.d.ts +2 -2
- package/dist/core/version-checker.js +49 -31
- package/dist/core/version-checker.js.map +1 -1
- package/dist/core/watch/file-watcher.d.ts +7 -0
- package/dist/core/watch/file-watcher.js +70 -14
- package/dist/core/watch/file-watcher.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type ChildProcess, type ExecOptions } from "node:child_process";
|
|
1
|
+
import { type ChildProcess, type ExecFileOptions, type ExecOptions } from "node:child_process";
|
|
2
2
|
export interface CommandResult {
|
|
3
3
|
stdout: string;
|
|
4
4
|
stderr: string;
|
|
@@ -18,3 +18,4 @@ export declare class ExecError extends Error {
|
|
|
18
18
|
export declare function nonInteractiveOptions(options: ExecOptions): ExecOptions;
|
|
19
19
|
export declare function closeStdin(child: ChildProcess): void;
|
|
20
20
|
export declare function ExecuteCMD(command: string, options: ExecOptions): Promise<CommandResult>;
|
|
21
|
+
export declare function ExecuteFile(executable: string, args: string[], options: ExecFileOptions): Promise<CommandResult>;
|
package/dist/core/cli/command.js
CHANGED
|
@@ -4,9 +4,11 @@ exports.ExecError = void 0;
|
|
|
4
4
|
exports.nonInteractiveOptions = nonInteractiveOptions;
|
|
5
5
|
exports.closeStdin = closeStdin;
|
|
6
6
|
exports.ExecuteCMD = ExecuteCMD;
|
|
7
|
+
exports.ExecuteFile = ExecuteFile;
|
|
7
8
|
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
8
9
|
const node_child_process_1 = require("node:child_process");
|
|
9
10
|
const exit_codes_1 = require("./exit-codes");
|
|
11
|
+
const windows_command_line_1 = require("./windows-command-line");
|
|
10
12
|
const Logger = new logging_1.Logging.Channel("cli.command");
|
|
11
13
|
const NON_INTERACTIVE_ENV = {
|
|
12
14
|
CI: "1",
|
|
@@ -32,37 +34,49 @@ class ExecError extends Error {
|
|
|
32
34
|
}
|
|
33
35
|
exports.ExecError = ExecError;
|
|
34
36
|
function nonInteractiveOptions(options) {
|
|
35
|
-
return {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
...NON_INTERACTIVE_ENV,
|
|
40
|
-
},
|
|
41
|
-
};
|
|
37
|
+
return { ...options, env: nonInteractiveEnv(options.env) };
|
|
38
|
+
}
|
|
39
|
+
function nonInteractiveEnv(env = process.env) {
|
|
40
|
+
return { ...env, ...NON_INTERACTIVE_ENV };
|
|
42
41
|
}
|
|
43
42
|
function closeStdin(child) {
|
|
44
43
|
child.stdin?.end();
|
|
45
44
|
}
|
|
46
45
|
function exitCodeOf(err) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
46
|
+
const code = "code" in err ? err.code : undefined;
|
|
47
|
+
return typeof code === "number" && code !== 0 ? code : exit_codes_1.FAILURE_EXIT_CODE;
|
|
48
|
+
}
|
|
49
|
+
function settleCommand(command, resolve, reject) {
|
|
50
|
+
return (err, stdout, stderr) => {
|
|
51
|
+
const result = {
|
|
52
|
+
stdout: stdout?.toString() ?? "",
|
|
53
|
+
stderr: stderr?.toString() ?? "",
|
|
54
|
+
code: err ? exitCodeOf(err) : 0,
|
|
55
|
+
};
|
|
56
|
+
if (err) {
|
|
57
|
+
Logger.Debug(`Command failed with code ${result.code}: ${command}`);
|
|
58
|
+
return reject(new ExecError({ ...result, command }));
|
|
59
|
+
}
|
|
60
|
+
resolve(result);
|
|
61
|
+
};
|
|
50
62
|
}
|
|
51
63
|
function ExecuteCMD(command, options) {
|
|
52
64
|
return new Promise((resolve, reject) => {
|
|
53
65
|
Logger.Trace(`Executing command: ${command}`);
|
|
54
|
-
const child = (0, node_child_process_1.exec)(command, nonInteractiveOptions(options), (
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
+
const child = (0, node_child_process_1.exec)(command, nonInteractiveOptions(options), settleCommand(command, resolve, reject));
|
|
67
|
+
closeStdin(child);
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
function ExecuteFile(executable, args, options) {
|
|
71
|
+
const command = [executable, ...args].join(" ");
|
|
72
|
+
const invocation = (0, windows_command_line_1.buildProcessInvocation)(executable, args);
|
|
73
|
+
return new Promise((resolve, reject) => {
|
|
74
|
+
Logger.Trace(`Executing command: ${command}`);
|
|
75
|
+
const child = (0, node_child_process_1.execFile)(invocation.executable, invocation.args, {
|
|
76
|
+
...options,
|
|
77
|
+
env: nonInteractiveEnv(options.env),
|
|
78
|
+
windowsVerbatimArguments: invocation.windowsVerbatimArguments,
|
|
79
|
+
}, settleCommand(command, resolve, reject));
|
|
66
80
|
closeStdin(child);
|
|
67
81
|
});
|
|
68
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/core/cli/command.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/core/cli/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,12 +30,20 @@ function projectNotFoundError(projectFolder) {
|
|
|
30
30
|
],
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
|
+
function isSetByLaunchVariable(environment) {
|
|
34
|
+
return process.env[config_paths_1.LAUNCH_ENVIRONMENT_VARIABLE] === environment;
|
|
35
|
+
}
|
|
36
|
+
function selectEnvironmentFix(environment) {
|
|
37
|
+
return isSetByLaunchVariable(environment)
|
|
38
|
+
? `'${environment}' is set by ${config_paths_1.LAUNCH_ENVIRONMENT_VARIABLE}: change it (or pass --env) to one of them`
|
|
39
|
+
: "Pass one of them with --env";
|
|
40
|
+
}
|
|
33
41
|
function unknownEnvironmentError(config, environment) {
|
|
34
42
|
return new output_1.CliError({
|
|
35
43
|
title: `Unknown environment '${environment}'`,
|
|
36
44
|
reason: `Known environments: ${listKnownEnvironments(config).join(", ")}`,
|
|
37
45
|
fixes: [
|
|
38
|
-
|
|
46
|
+
`${selectEnvironmentFix(environment)}, or add an "environments.${environment}" entry to the project configuration`,
|
|
39
47
|
],
|
|
40
48
|
exitCode: exit_codes_1.USAGE_EXIT_CODE,
|
|
41
49
|
});
|
|
@@ -45,15 +53,12 @@ function findEnvironmentConfig(config, environment) {
|
|
|
45
53
|
? config
|
|
46
54
|
: config.environments?.[environment];
|
|
47
55
|
}
|
|
48
|
-
|
|
49
|
-
return !config.environments && (await (0, common_1.isDynamicConfig)(projectFolder));
|
|
50
|
-
}
|
|
51
|
-
async function resolveEnvironmentConfig(projectFolder, config, environment) {
|
|
56
|
+
function resolveEnvironmentConfig(config, environment) {
|
|
52
57
|
const environmentConfig = findEnvironmentConfig(config, environment);
|
|
53
58
|
if (environmentConfig) {
|
|
54
59
|
return environmentConfig;
|
|
55
60
|
}
|
|
56
|
-
if (
|
|
61
|
+
if (!config.environments) {
|
|
57
62
|
return config;
|
|
58
63
|
}
|
|
59
64
|
throw unknownEnvironmentError(config, environment);
|
|
@@ -64,7 +69,7 @@ async function resolveProjectContext(projectFolder, requestedEnvironment) {
|
|
|
64
69
|
if (!config) {
|
|
65
70
|
throw projectNotFoundError(projectFolder);
|
|
66
71
|
}
|
|
67
|
-
const environmentConfig =
|
|
72
|
+
const environmentConfig = resolveEnvironmentConfig(config, environment);
|
|
68
73
|
return { config, environment, environmentConfig };
|
|
69
74
|
}
|
|
70
75
|
async function findProject(projectFolder, environment) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-command.js","sourceRoot":"","sources":["../../../../../src/core/cli/commands/shared/project-command.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"project-command.js","sourceRoot":"","sources":["../../../../../src/core/cli/commands/shared/project-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ export declare const DEFAULT_GIT_REPO = "https://github.com/AntelopeJS/interface
|
|
|
6
6
|
export declare function displayNonDefaultGitWarning(gitUrl: string): void;
|
|
7
7
|
export declare function writeConfig(project: string, data: Partial<AntelopeConfig>, fileSystem?: IFileSystem): Promise<void>;
|
|
8
8
|
export declare function readConfig(project: string, fileSystem?: IFileSystem, environment?: string): Promise<AntelopeConfig | undefined>;
|
|
9
|
-
export declare function isDynamicConfig(project: string, fileSystem?: IFileSystem): Promise<boolean>;
|
|
10
9
|
export declare function writeModuleManifest(module: string, data: ModulePackageJson, fileSystem?: IFileSystem): Promise<void>;
|
|
11
10
|
export declare function readModuleManifest(module: string, fileSystem?: IFileSystem): Promise<ModulePackageJson | undefined>;
|
|
12
11
|
export interface UserConfig {
|
package/dist/core/cli/common.js
CHANGED
|
@@ -41,7 +41,6 @@ exports.detectIndentation = detectIndentation;
|
|
|
41
41
|
exports.displayNonDefaultGitWarning = displayNonDefaultGitWarning;
|
|
42
42
|
exports.writeConfig = writeConfig;
|
|
43
43
|
exports.readConfig = readConfig;
|
|
44
|
-
exports.isDynamicConfig = isDynamicConfig;
|
|
45
44
|
exports.writeModuleManifest = writeModuleManifest;
|
|
46
45
|
exports.readModuleManifest = readModuleManifest;
|
|
47
46
|
exports.getDefaultUserConfig = getDefaultUserConfig;
|
|
@@ -184,13 +183,6 @@ async function readConfig(project, fileSystem = new filesystem_1.NodeFileSystem(
|
|
|
184
183
|
}
|
|
185
184
|
return (0, config_loader_1.loadTsConfigFile)(configPath, environment);
|
|
186
185
|
}
|
|
187
|
-
async function isDynamicConfig(project, fileSystem = new filesystem_1.NodeFileSystem()) {
|
|
188
|
-
const configPath = await (0, config_paths_1.tryFindConfigPath)(project, fileSystem);
|
|
189
|
-
if (!configPath) {
|
|
190
|
-
return false;
|
|
191
|
-
}
|
|
192
|
-
return typeof (await (0, config_loader_1.importConfigInput)(configPath)) === "function";
|
|
193
|
-
}
|
|
194
186
|
async function writeModuleManifest(module, data, fileSystem = new filesystem_1.NodeFileSystem()) {
|
|
195
187
|
await writeJsonFile(node_path_1.default.join(module, "package.json"), data, fileSystem);
|
|
196
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/core/cli/common.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BA,8CAgBC;AAMD,kEAOC;AA6JD,kCAWC;AAED,gCAWC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/core/cli/common.ts"],"names":[],"mappings":"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"}
|
package/dist/core/cli/options.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.addRenamedOption = addRenamedOption;
|
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
9
|
const commander_1 = require("commander");
|
|
10
10
|
const cli_ui_1 = require("./cli-ui");
|
|
11
|
+
const config_paths_1 = require("../config/config-paths");
|
|
11
12
|
const verbosity_1 = require("./output/verbosity");
|
|
12
13
|
const package_manager_name_1 = require("./package-manager-name");
|
|
13
14
|
const LIST_SEPARATOR = ",";
|
|
@@ -25,7 +26,7 @@ var Options;
|
|
|
25
26
|
.default(node_path_1.default.resolve(process.cwd()), CURRENT_DIRECTORY)
|
|
26
27
|
.env("ANTELOPEJS_PROJECT")
|
|
27
28
|
.argParser((val) => node_path_1.default.resolve(val));
|
|
28
|
-
Options.env = new commander_1.Option("-e, --env <environment>", "Environment of antelope.config.ts to use instead of the base configuration").env(
|
|
29
|
+
Options.env = new commander_1.Option("-e, --env <environment>", "Environment of antelope.config.ts to use instead of the base configuration").env(config_paths_1.LAUNCH_ENVIRONMENT_VARIABLE);
|
|
29
30
|
Options.git = new commander_1.Option("-g, --git <url>", "Interface repository URL, overriding the git CLI setting").env("ANTELOPEJS_GIT");
|
|
30
31
|
Options.verbose = new commander_1.Option("--verbose [=channels]", "Print TRACE logs and full error details, optionally for some log channels only (comma-separated)")
|
|
31
32
|
.env("ANTELOPEJS_VERBOSE")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/core/cli/options.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/core/cli/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.describeInterfaceConflicts = describeInterfaceConflicts;
|
|
4
|
+
const format_1 = require("./format");
|
|
5
|
+
const INTERFACE_CONFLICT_TITLE = "Incompatible interface package resolution";
|
|
6
|
+
const INTERFACE_CONFLICT_REASON = "Modules share one copy of each interface package, and that copy does not work for these modules:";
|
|
7
|
+
const NESTED_DETAIL_INDENT = " ";
|
|
8
|
+
const COMPATIBLE_RANGE_PREFIX = "^";
|
|
9
|
+
const MISSING_COPY = "not installed";
|
|
10
|
+
function sharedCopyDetail(canonical) {
|
|
11
|
+
return `${NESTED_DETAIL_INDENT}shared copy: ${(0, format_1.displayPath)(canonical.root)}`;
|
|
12
|
+
}
|
|
13
|
+
function rangeConflictDetails(conflict) {
|
|
14
|
+
const { moduleId, packageName, consumerCopy } = conflict;
|
|
15
|
+
const ownCopy = consumerCopy
|
|
16
|
+
? `${consumerCopy.version} at ${(0, format_1.displayPath)(consumerCopy.root)}`
|
|
17
|
+
: MISSING_COPY;
|
|
18
|
+
return [
|
|
19
|
+
`${moduleId} requires ${packageName}@${conflict.range}, but the shared copy is ${conflict.canonical.version}`,
|
|
20
|
+
sharedCopyDetail(conflict.canonical),
|
|
21
|
+
`${NESTED_DETAIL_INDENT}copy of ${moduleId}: ${ownCopy}`,
|
|
22
|
+
];
|
|
23
|
+
}
|
|
24
|
+
function rangeConflictFixes(conflict) {
|
|
25
|
+
const { moduleId, packageName } = conflict;
|
|
26
|
+
const version = conflict.canonical.version;
|
|
27
|
+
return [
|
|
28
|
+
`Update ${moduleId} to a release that supports ${packageName} ${version}`,
|
|
29
|
+
`Or depend on "${packageName}": "${COMPATIBLE_RANGE_PREFIX}${version}" in the package.json of ${moduleId}, then reinstall its dependencies`,
|
|
30
|
+
];
|
|
31
|
+
}
|
|
32
|
+
function preloadedCopyDetails(preloaded) {
|
|
33
|
+
const { moduleId, packageName, copy, canonical } = preloaded;
|
|
34
|
+
return [
|
|
35
|
+
`The copy of ${packageName} installed by ${moduleId} (${copy.version}) was loaded before the shared copy (${canonical.version}) and cannot be redirected`,
|
|
36
|
+
`${NESTED_DETAIL_INDENT}loaded first: ${(0, format_1.displayPath)(preloaded.loadedFile)}`,
|
|
37
|
+
sharedCopyDetail(canonical),
|
|
38
|
+
];
|
|
39
|
+
}
|
|
40
|
+
function preloadedCopyFixes(preloaded) {
|
|
41
|
+
return [
|
|
42
|
+
`Make sure nothing loads ${preloaded.packageName} from ${preloaded.moduleId} before AntelopeJS loads the modules`,
|
|
43
|
+
];
|
|
44
|
+
}
|
|
45
|
+
function describeInterfaceConflicts(error) {
|
|
46
|
+
const { rangeConflicts, preloadedCopies } = error.conflicts;
|
|
47
|
+
const fixes = [
|
|
48
|
+
...rangeConflicts.flatMap(rangeConflictFixes),
|
|
49
|
+
...preloadedCopies.flatMap(preloadedCopyFixes),
|
|
50
|
+
];
|
|
51
|
+
return {
|
|
52
|
+
title: INTERFACE_CONFLICT_TITLE,
|
|
53
|
+
reason: INTERFACE_CONFLICT_REASON,
|
|
54
|
+
details: [
|
|
55
|
+
...rangeConflicts.flatMap(rangeConflictDetails),
|
|
56
|
+
...preloadedCopies.flatMap(preloadedCopyDetails),
|
|
57
|
+
],
|
|
58
|
+
fixes: [...new Set(fixes)],
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=interface-conflicts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interface-conflicts.js","sourceRoot":"","sources":["../../../../src/core/cli/output/interface-conflicts.ts"],"names":[],"mappings":";;AA6DA,gEAiBC;AAxED,qCAAuC;AAGvC,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,EAAE;QAC7G,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"}
|
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.translateExecError = translateExecError;
|
|
4
4
|
exports.translateFailure = translateFailure;
|
|
5
5
|
const command_1 = require("../command");
|
|
6
|
+
const interface_resolution_error_1 = require("../../resolution/interface-resolution-error");
|
|
7
|
+
const interface_conflicts_1 = require("./interface-conflicts");
|
|
6
8
|
const logging_utils_1 = require("../logging-utils");
|
|
7
9
|
const REMOTE_URL = String.raw `((?:[\w+.-]+:\/\/|[\w.-]+@)\S+)`;
|
|
8
10
|
const MISSING_EXECUTABLE = /([^\s:]+): (?:command )?not found|'([^']+)' is not recognized as an internal/;
|
|
@@ -101,6 +103,9 @@ function translateFailure(error) {
|
|
|
101
103
|
if (error instanceof command_1.ExecError) {
|
|
102
104
|
return translateExecError(error);
|
|
103
105
|
}
|
|
106
|
+
if (error instanceof interface_resolution_error_1.InterfaceResolutionError) {
|
|
107
|
+
return (0, interface_conflicts_1.describeInterfaceConflicts)(error);
|
|
108
|
+
}
|
|
104
109
|
if (isSystemError(error)) {
|
|
105
110
|
return SYSTEM_ERROR_TRANSLATIONS[error.code ?? ""]?.(error);
|
|
106
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translations.js","sourceRoot":"","sources":["../../../../src/core/cli/output/translations.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"translations.js","sourceRoot":"","sources":["../../../../src/core/cli/output/translations.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ function parseProductionStartArgs(args) {
|
|
|
43
43
|
});
|
|
44
44
|
return {
|
|
45
45
|
project: node_path_1.default.resolve(values.project ?? process.env.ANTELOPEJS_PROJECT ?? process.cwd()),
|
|
46
|
-
env: values.env ?? process.env.
|
|
46
|
+
env: values.env ?? process.env[config_paths_1.LAUNCH_ENVIRONMENT_VARIABLE] ?? config_paths_1.DEFAULT_ENV,
|
|
47
47
|
concurrency: parseConcurrency(values.concurrency),
|
|
48
48
|
verbose: parseVerbose(values.verbose ?? process.env.ANTELOPEJS_VERBOSE),
|
|
49
49
|
refreshConfig: values["refresh-config"] ?? false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"production-start.js","sourceRoot":"","sources":["../../../src/core/cli/production-start.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"production-start.js","sourceRoot":"","sources":["../../../src/core/cli/production-start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AntelopeConfig, AntelopeLogging, AntelopeTestConfig
|
|
1
|
+
import type { AntelopeConfig, AntelopeLogging, AntelopeTestConfig } from "@antelopejs/interface-core/config";
|
|
2
2
|
import type { IFileSystem } from "../../types";
|
|
3
3
|
import { type ExpandedModuleConfig } from "./config-parser";
|
|
4
4
|
export interface LoadedConfig {
|
|
@@ -9,7 +9,6 @@ export interface LoadedConfig {
|
|
|
9
9
|
envOverrides: Record<string, string | string[]>;
|
|
10
10
|
test?: AntelopeTestConfig;
|
|
11
11
|
}
|
|
12
|
-
export declare function importConfigInput(configPath: string): Promise<ConfigInput>;
|
|
13
12
|
export declare function loadTsConfigFile(configPath: string, environment?: string): Promise<AntelopeConfig>;
|
|
14
13
|
export declare class ConfigLoader {
|
|
15
14
|
private fs;
|
|
@@ -34,7 +34,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.ConfigLoader = void 0;
|
|
37
|
-
exports.importConfigInput = importConfigInput;
|
|
38
37
|
exports.loadTsConfigFile = loadTsConfigFile;
|
|
39
38
|
const jiti_1 = require("jiti");
|
|
40
39
|
const self = __importStar(require("./config-loader"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../../src/core/config/config-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../../src/core/config/config-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { IFileSystem } from "../../types";
|
|
2
2
|
export declare const TS_CONFIG_FILE = "antelope.config.ts";
|
|
3
3
|
export declare const DEFAULT_ENV = "default";
|
|
4
|
+
export declare const LAUNCH_ENVIRONMENT_VARIABLE = "ANTELOPEJS_LAUNCH_ENV";
|
|
5
|
+
export declare const PROJECT_STATE_DIR = ".antelope";
|
|
4
6
|
export declare const DEFAULT_CACHE_DIR = ".antelope/cache";
|
|
5
7
|
export declare function tryFindConfigPath(projectFolder: string, fs: IFileSystem): Promise<string | undefined>;
|
|
6
8
|
export declare function findConfigPath(projectFolder: string, fs: IFileSystem): Promise<string>;
|
|
@@ -3,14 +3,16 @@ 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.DEFAULT_CACHE_DIR = exports.DEFAULT_ENV = exports.TS_CONFIG_FILE = void 0;
|
|
6
|
+
exports.DEFAULT_CACHE_DIR = exports.PROJECT_STATE_DIR = exports.LAUNCH_ENVIRONMENT_VARIABLE = exports.DEFAULT_ENV = exports.TS_CONFIG_FILE = void 0;
|
|
7
7
|
exports.tryFindConfigPath = tryFindConfigPath;
|
|
8
8
|
exports.findConfigPath = findConfigPath;
|
|
9
9
|
exports.getModuleConfigPath = getModuleConfigPath;
|
|
10
10
|
const node_path_1 = __importDefault(require("node:path"));
|
|
11
11
|
exports.TS_CONFIG_FILE = "antelope.config.ts";
|
|
12
12
|
exports.DEFAULT_ENV = "default";
|
|
13
|
-
exports.
|
|
13
|
+
exports.LAUNCH_ENVIRONMENT_VARIABLE = "ANTELOPEJS_LAUNCH_ENV";
|
|
14
|
+
exports.PROJECT_STATE_DIR = ".antelope";
|
|
15
|
+
exports.DEFAULT_CACHE_DIR = `${exports.PROJECT_STATE_DIR}/cache`;
|
|
14
16
|
async function tryFindConfigPath(projectFolder, fs) {
|
|
15
17
|
const resolved = node_path_1.default.resolve(projectFolder);
|
|
16
18
|
const tsPath = node_path_1.default.join(resolved, exports.TS_CONFIG_FILE);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-paths.js","sourceRoot":"","sources":["../../../src/core/config/config-paths.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"config-paths.js","sourceRoot":"","sources":["../../../src/core/config/config-paths.ts"],"names":[],"mappings":";;;;;;AAUA,8CAYC;AAED,wCAaC;AAED,kDAKC;AA5CD,0DAA6B;AAIhB,QAAA,cAAc,GAAG,oBAAoB,CAAC;AACtC,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,2BAA2B,GAAG,uBAAuB,CAAC;AACtD,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAChC,QAAA,iBAAiB,GAAG,GAAG,yBAAiB,QAAQ,CAAC;AAEvD,KAAK,UAAU,iBAAiB,CACrC,aAAqB,EACrB,EAAe;IAEf,MAAM,QAAQ,GAAG,mBAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,mBAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,sBAAc,CAAC,CAAC;IAEnD,IAAI,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,aAAqB,EACrB,EAAe;IAEf,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAE9D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACb,yCAAyC,sBAAc,OAAO,aAAa,GAAG,CAC/E,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAgB,mBAAmB,CACjC,aAAqB,EACrB,UAAkB;IAElB,OAAO,mBAAI,CAAC,IAAI,CAAC,mBAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,YAAY,UAAU,OAAO,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -92,8 +92,8 @@ export declare class ModuleManager {
|
|
|
92
92
|
private collectInterfacePackageConsumers;
|
|
93
93
|
private registerInterfacePackage;
|
|
94
94
|
private validateInterfacePackages;
|
|
95
|
-
private
|
|
96
|
-
private
|
|
95
|
+
private findRangeConflicts;
|
|
96
|
+
private findPreloadedCopies;
|
|
97
97
|
private buildModuleAssociations;
|
|
98
98
|
private addDefaultAssociations;
|
|
99
99
|
private applyImportOverrides;
|
|
@@ -51,6 +51,7 @@ const config_var_graph_1 = require("./config/config-var-graph");
|
|
|
51
51
|
const interface_registry_1 = require("./interface-registry");
|
|
52
52
|
const stub_interface_runtime_1 = require("./resolution/stub-interface-runtime");
|
|
53
53
|
const package_resolution_1 = require("./resolution/package-resolution");
|
|
54
|
+
const interface_resolution_error_1 = require("./resolution/interface-resolution-error");
|
|
54
55
|
const Logger = new logging_1.Logging.Channel("loader");
|
|
55
56
|
function compareModuleIds(left, right) {
|
|
56
57
|
return left.localeCompare(right);
|
|
@@ -652,41 +653,49 @@ class ModuleManager {
|
|
|
652
653
|
this.resolver.lifecycleInterfacePackages.delete(packageName);
|
|
653
654
|
}
|
|
654
655
|
validateInterfacePackages() {
|
|
655
|
-
const
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
if (errors.length === 0) {
|
|
656
|
+
const plans = [...this.interfacePackagePlans];
|
|
657
|
+
const rangeConflicts = plans.flatMap(([name, plan]) => this.findRangeConflicts(name, plan));
|
|
658
|
+
const preloadedCopies = plans.flatMap(([name, plan]) => this.findPreloadedCopies(name, plan));
|
|
659
|
+
if (rangeConflicts.length === 0 && preloadedCopies.length === 0) {
|
|
660
660
|
return;
|
|
661
661
|
}
|
|
662
|
-
throw new
|
|
662
|
+
throw new interface_resolution_error_1.InterfaceResolutionError({ rangeConflicts, preloadedCopies });
|
|
663
663
|
}
|
|
664
|
-
|
|
664
|
+
findRangeConflicts(packageName, plan) {
|
|
665
665
|
return plan.consumers.flatMap((consumer) => {
|
|
666
666
|
const range = (0, semver_1.validRange)(consumer.range);
|
|
667
667
|
if (!range || (0, semver_1.satisfies)(plan.canonicalPackage.version, range)) {
|
|
668
668
|
return [];
|
|
669
669
|
}
|
|
670
|
-
const installed = consumer.resolvedPackage
|
|
671
|
-
? `${consumer.resolvedPackage.version} at ${consumer.resolvedPackage.root}`
|
|
672
|
-
: "not installed from the consumer";
|
|
673
670
|
return [
|
|
674
|
-
|
|
671
|
+
{
|
|
672
|
+
moduleId: consumer.moduleId,
|
|
673
|
+
packageName,
|
|
674
|
+
range: consumer.range,
|
|
675
|
+
canonical: plan.canonicalPackage,
|
|
676
|
+
consumerCopy: consumer.resolvedPackage,
|
|
677
|
+
},
|
|
675
678
|
];
|
|
676
679
|
});
|
|
677
680
|
}
|
|
678
|
-
|
|
681
|
+
findPreloadedCopies(packageName, plan) {
|
|
679
682
|
const canonicalRoot = plan.canonicalPackage.realRoot;
|
|
680
|
-
const copies = plan.consumers
|
|
681
|
-
.map((consumer) => consumer.resolvedPackage)
|
|
682
|
-
.filter((resolvedPackage) => Boolean(resolvedPackage && resolvedPackage.realRoot !== canonicalRoot));
|
|
683
683
|
const loadedFiles = Object.keys(require.cache);
|
|
684
|
-
return
|
|
684
|
+
return plan.consumers.flatMap(({ moduleId, resolvedPackage: copy }) => {
|
|
685
|
+
if (!copy || copy.realRoot === canonicalRoot) {
|
|
686
|
+
return [];
|
|
687
|
+
}
|
|
685
688
|
const isInCopy = (0, package_resolution_1.createPathWithinMatcher)(copy.root);
|
|
686
689
|
const loadedFile = loadedFiles.find((filePath) => isInCopy(filePath));
|
|
687
690
|
return loadedFile
|
|
688
691
|
? [
|
|
689
|
-
|
|
692
|
+
{
|
|
693
|
+
moduleId,
|
|
694
|
+
packageName,
|
|
695
|
+
copy,
|
|
696
|
+
canonical: plan.canonicalPackage,
|
|
697
|
+
loadedFile,
|
|
698
|
+
},
|
|
690
699
|
]
|
|
691
700
|
: [];
|
|
692
701
|
});
|