@antelopejs/core 1.10.2 → 1.11.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 +1 -1
- package/dist/core/cli/cancellation.d.ts +4 -0
- package/dist/core/cli/cancellation.js +19 -0
- package/dist/core/cli/cancellation.js.map +1 -0
- package/dist/core/cli/cli-ui.d.ts +8 -13
- package/dist/core/cli/cli-ui.js +36 -116
- package/dist/core/cli/cli-ui.js.map +1 -1
- package/dist/core/cli/command.d.ts +11 -0
- package/dist/core/cli/command.js +30 -4
- package/dist/core/cli/command.js.map +1 -1
- package/dist/core/cli/commands/config/get-action.d.ts +6 -0
- package/dist/core/cli/commands/config/get-action.js +39 -0
- package/dist/core/cli/commands/config/get-action.js.map +1 -0
- package/dist/core/cli/commands/config/get.d.ts +2 -1
- package/dist/core/cli/commands/config/get.js +50 -33
- package/dist/core/cli/commands/config/get.js.map +1 -1
- package/dist/core/cli/commands/config/index.js +2 -2
- package/dist/core/cli/commands/config/index.js.map +1 -1
- package/dist/core/cli/commands/config/keys.d.ts +3 -0
- package/dist/core/cli/commands/config/keys.js +13 -0
- package/dist/core/cli/commands/config/keys.js.map +1 -0
- package/dist/core/cli/commands/config/reset-action.d.ts +5 -0
- package/dist/core/cli/commands/config/reset-action.js +45 -0
- package/dist/core/cli/commands/config/reset-action.js.map +1 -0
- package/dist/core/cli/commands/config/reset.js +13 -49
- package/dist/core/cli/commands/config/reset.js.map +1 -1
- package/dist/core/cli/commands/config/set-action.d.ts +1 -0
- package/dist/core/cli/commands/config/set-action.js +24 -0
- package/dist/core/cli/commands/config/set-action.js.map +1 -0
- package/dist/core/cli/commands/config/set.js +48 -34
- package/dist/core/cli/commands/config/set.js.map +1 -1
- package/dist/core/cli/commands/config/show-action.d.ts +6 -0
- package/dist/core/cli/commands/config/show-action.js +38 -0
- package/dist/core/cli/commands/config/show-action.js.map +1 -0
- package/dist/core/cli/commands/config/show.d.ts +2 -1
- package/dist/core/cli/commands/config/show.js +45 -23
- package/dist/core/cli/commands/config/show.js.map +1 -1
- package/dist/core/cli/commands/module/index.js +2 -1
- package/dist/core/cli/commands/module/index.js.map +1 -1
- package/dist/core/cli/commands/module/init-action.d.ts +20 -0
- package/dist/core/cli/commands/module/init-action.js +311 -0
- package/dist/core/cli/commands/module/init-action.js.map +1 -0
- package/dist/core/cli/commands/module/init.d.ts +0 -5
- package/dist/core/cli/commands/module/init.js +29 -168
- package/dist/core/cli/commands/module/init.js.map +1 -1
- package/dist/core/cli/commands/module/test-action.d.ts +5 -0
- package/dist/core/cli/commands/module/test-action.js +45 -0
- package/dist/core/cli/commands/module/test-action.js.map +1 -0
- package/dist/core/cli/commands/module/test.d.ts +0 -5
- package/dist/core/cli/commands/module/test.js +51 -30
- package/dist/core/cli/commands/module/test.js.map +1 -1
- package/dist/core/cli/commands/plugins-action.d.ts +7 -0
- package/dist/core/cli/commands/plugins-action.js +17 -0
- package/dist/core/cli/commands/plugins-action.js.map +1 -0
- package/dist/core/cli/commands/plugins.d.ts +2 -1
- package/dist/core/cli/commands/plugins.js +58 -25
- package/dist/core/cli/commands/plugins.js.map +1 -1
- package/dist/core/cli/commands/project/build-action.d.ts +7 -0
- package/dist/core/cli/commands/project/build-action.js +54 -0
- package/dist/core/cli/commands/project/build-action.js.map +1 -0
- package/dist/core/cli/commands/project/build.js +48 -64
- package/dist/core/cli/commands/project/build.js.map +1 -1
- package/dist/core/cli/commands/project/dev-action.d.ts +13 -0
- package/dist/core/cli/commands/project/dev-action.js +231 -0
- package/dist/core/cli/commands/project/dev-action.js.map +1 -0
- package/dist/core/cli/commands/project/dev.d.ts +1 -2
- package/dist/core/cli/commands/project/dev.js +28 -206
- package/dist/core/cli/commands/project/dev.js.map +1 -1
- package/dist/core/cli/commands/project/index.js +2 -2
- package/dist/core/cli/commands/project/index.js.map +1 -1
- package/dist/core/cli/commands/project/init-action.d.ts +10 -0
- package/dist/core/cli/commands/project/init-action.js +183 -0
- package/dist/core/cli/commands/project/init-action.js.map +1 -0
- package/dist/core/cli/commands/project/init.js +62 -111
- package/dist/core/cli/commands/project/init.js.map +1 -1
- package/dist/core/cli/commands/project/logging/index.js +2 -2
- package/dist/core/cli/commands/project/logging/index.js.map +1 -1
- package/dist/core/cli/commands/project/logging/logging-draft.d.ts +14 -0
- package/dist/core/cli/commands/project/logging/logging-draft.js +34 -0
- package/dist/core/cli/commands/project/logging/logging-draft.js.map +1 -0
- package/dist/core/cli/commands/project/logging/set-action.d.ts +2 -0
- package/dist/core/cli/commands/project/logging/set-action.js +217 -0
- package/dist/core/cli/commands/project/logging/set-action.js.map +1 -0
- package/dist/core/cli/commands/project/logging/set-operations.d.ts +24 -0
- package/dist/core/cli/commands/project/logging/set-operations.js +115 -0
- package/dist/core/cli/commands/project/logging/set-operations.js.map +1 -0
- package/dist/core/cli/commands/project/logging/set-usage.d.ts +8 -0
- package/dist/core/cli/commands/project/logging/set-usage.js +71 -0
- package/dist/core/cli/commands/project/logging/set-usage.js.map +1 -0
- package/dist/core/cli/commands/project/logging/set.js +98 -355
- package/dist/core/cli/commands/project/logging/set.js.map +1 -1
- package/dist/core/cli/commands/project/logging/show-action.d.ts +8 -0
- package/dist/core/cli/commands/project/logging/show-action.js +71 -0
- package/dist/core/cli/commands/project/logging/show-action.js.map +1 -0
- package/dist/core/cli/commands/project/logging/show.d.ts +2 -1
- package/dist/core/cli/commands/project/logging/show.js +54 -89
- package/dist/core/cli/commands/project/logging/show.js.map +1 -1
- package/dist/core/cli/commands/project/modules/add-action.d.ts +17 -0
- package/dist/core/cli/commands/project/modules/add-action.js +240 -0
- package/dist/core/cli/commands/project/modules/add-action.js.map +1 -0
- package/dist/core/cli/commands/project/modules/add.d.ts +1 -15
- package/dist/core/cli/commands/project/modules/add.js +56 -261
- package/dist/core/cli/commands/project/modules/add.js.map +1 -1
- package/dist/core/cli/commands/project/modules/index.js +2 -2
- package/dist/core/cli/commands/project/modules/index.js.map +1 -1
- package/dist/core/cli/commands/project/modules/install-action.d.ts +17 -0
- package/dist/core/cli/commands/project/modules/install-action.js +265 -0
- package/dist/core/cli/commands/project/modules/install-action.js.map +1 -0
- package/dist/core/cli/commands/project/modules/install.d.ts +0 -9
- package/dist/core/cli/commands/project/modules/install.js +54 -240
- package/dist/core/cli/commands/project/modules/install.js.map +1 -1
- package/dist/core/cli/commands/project/modules/list-action.d.ts +8 -0
- package/dist/core/cli/commands/project/modules/list-action.js +85 -0
- package/dist/core/cli/commands/project/modules/list-action.js.map +1 -0
- package/dist/core/cli/commands/project/modules/list.d.ts +2 -1
- package/dist/core/cli/commands/project/modules/list.js +54 -116
- package/dist/core/cli/commands/project/modules/list.js.map +1 -1
- package/dist/core/cli/commands/project/modules/remove-action.d.ts +7 -0
- package/dist/core/cli/commands/project/modules/remove-action.js +81 -0
- package/dist/core/cli/commands/project/modules/remove-action.js.map +1 -0
- package/dist/core/cli/commands/project/modules/remove.d.ts +0 -7
- package/dist/core/cli/commands/project/modules/remove.js +50 -100
- package/dist/core/cli/commands/project/modules/remove.js.map +1 -1
- package/dist/core/cli/commands/project/modules/update-action.d.ts +7 -0
- package/dist/core/cli/commands/project/modules/update-action.js +117 -0
- package/dist/core/cli/commands/project/modules/update-action.js.map +1 -0
- package/dist/core/cli/commands/project/modules/update.js +54 -86
- package/dist/core/cli/commands/project/modules/update.js.map +1 -1
- package/dist/core/cli/commands/project/run.js +2 -2
- package/dist/core/cli/commands/project/run.js.map +1 -1
- package/dist/core/cli/commands/project/start-action.d.ts +8 -0
- package/dist/core/cli/commands/project/start-action.js +47 -0
- package/dist/core/cli/commands/project/start-action.js.map +1 -0
- package/dist/core/cli/commands/project/start.js +53 -55
- package/dist/core/cli/commands/project/start.js.map +1 -1
- package/dist/core/cli/commands/shared/names.d.ts +1 -0
- package/dist/core/cli/commands/shared/names.js +10 -0
- package/dist/core/cli/commands/shared/names.js.map +1 -0
- package/dist/core/cli/commands/shared/next-steps.d.ts +5 -0
- package/dist/core/cli/commands/shared/next-steps.js +26 -0
- package/dist/core/cli/commands/shared/next-steps.js.map +1 -0
- package/dist/core/cli/commands/shared/project-command.d.ts +9 -0
- package/dist/core/cli/commands/shared/project-command.js +79 -14
- package/dist/core/cli/commands/shared/project-command.js.map +1 -1
- package/dist/core/cli/commands/update.js +47 -9
- package/dist/core/cli/commands/update.js.map +1 -1
- package/dist/core/cli/common.d.ts +3 -8
- package/dist/core/cli/common.js +26 -32
- package/dist/core/cli/common.js.map +1 -1
- package/dist/core/cli/exit-codes.d.ts +2 -0
- package/dist/core/cli/exit-codes.js +4 -1
- package/dist/core/cli/exit-codes.js.map +1 -1
- package/dist/core/cli/full-cli.js +62 -41
- package/dist/core/cli/full-cli.js.map +1 -1
- package/dist/core/cli/git-operations.js +10 -17
- package/dist/core/cli/git-operations.js.map +1 -1
- package/dist/core/cli/help.d.ts +8 -0
- package/dist/core/cli/help.js +34 -0
- package/dist/core/cli/help.js.map +1 -0
- package/dist/core/cli/index.js +7 -15
- package/dist/core/cli/index.js.map +1 -1
- package/dist/core/cli/lazy-action.d.ts +4 -0
- package/dist/core/cli/lazy-action.js +10 -0
- package/dist/core/cli/lazy-action.js.map +1 -0
- package/dist/core/cli/logging-utils.js +18 -14
- package/dist/core/cli/logging-utils.js.map +1 -1
- package/dist/core/cli/options.d.ts +20 -0
- package/dist/core/cli/options.js +51 -0
- package/dist/core/cli/options.js.map +1 -0
- package/dist/core/cli/output/boundary.d.ts +6 -0
- package/dist/core/cli/output/boundary.js +38 -0
- package/dist/core/cli/output/boundary.js.map +1 -0
- package/dist/core/cli/output/capabilities.d.ts +9 -0
- package/dist/core/cli/output/capabilities.js +113 -0
- package/dist/core/cli/output/capabilities.js.map +1 -0
- package/dist/core/cli/output/data.d.ts +7 -0
- package/dist/core/cli/output/data.js +11 -0
- package/dist/core/cli/output/data.js.map +1 -0
- package/dist/core/cli/output/errors.d.ts +14 -0
- package/dist/core/cli/output/errors.js +67 -0
- package/dist/core/cli/output/errors.js.map +1 -0
- package/dist/core/cli/output/failures.d.ts +3 -0
- package/dist/core/cli/output/failures.js +94 -0
- package/dist/core/cli/output/failures.js.map +1 -0
- package/dist/core/cli/output/format.d.ts +7 -0
- package/dist/core/cli/output/format.js +64 -0
- package/dist/core/cli/output/format.js.map +1 -0
- package/dist/core/cli/output/index.d.ts +13 -0
- package/dist/core/cli/output/index.js +30 -0
- package/dist/core/cli/output/index.js.map +1 -0
- package/dist/core/cli/output/prompt.d.ts +15 -0
- package/dist/core/cli/output/prompt.js +145 -0
- package/dist/core/cli/output/prompt.js.map +1 -0
- package/dist/core/cli/output/symbols.d.ts +4 -0
- package/dist/core/cli/output/symbols.js +44 -0
- package/dist/core/cli/output/symbols.js.map +1 -0
- package/dist/core/cli/output/tasks.d.ts +57 -0
- package/dist/core/cli/output/tasks.js +310 -0
- package/dist/core/cli/output/tasks.js.map +1 -0
- package/dist/core/cli/output/translations.d.ts +4 -0
- package/dist/core/cli/output/translations.js +109 -0
- package/dist/core/cli/output/translations.js.map +1 -0
- package/dist/core/cli/output/types.d.ts +139 -0
- package/dist/core/cli/output/types.js +3 -0
- package/dist/core/cli/output/types.js.map +1 -0
- package/dist/core/cli/output/ui.d.ts +2 -0
- package/dist/core/cli/output/ui.js +155 -0
- package/dist/core/cli/output/ui.js.map +1 -0
- package/dist/core/cli/output/verbosity.d.ts +5 -0
- package/dist/core/cli/output/verbosity.js +17 -0
- package/dist/core/cli/output/verbosity.js.map +1 -0
- package/dist/core/cli/package-manager.js +11 -4
- package/dist/core/cli/package-manager.js.map +1 -1
- package/dist/core/cli/plugin-compatibility.d.ts +5 -2
- package/dist/core/cli/plugin-compatibility.js +22 -15
- package/dist/core/cli/plugin-compatibility.js.map +1 -1
- package/dist/core/cli/plugin-management.d.ts +19 -1
- package/dist/core/cli/plugin-management.js +102 -48
- package/dist/core/cli/plugin-management.js.map +1 -1
- package/dist/core/cli/plugin-registry.d.ts +0 -1
- package/dist/core/cli/plugin-registry.js +2 -3
- package/dist/core/cli/plugin-registry.js.map +1 -1
- package/dist/core/cli/plugin.js +39 -53
- package/dist/core/cli/plugin.js.map +1 -1
- package/dist/core/cli/production-start.d.ts +0 -1
- package/dist/core/cli/production-start.js +12 -21
- package/dist/core/cli/production-start.js.map +1 -1
- package/dist/core/cli/usage-errors.d.ts +2 -0
- package/dist/core/cli/usage-errors.js +50 -0
- package/dist/core/cli/usage-errors.js.map +1 -0
- package/dist/core/cli/version-check.d.ts +22 -3
- package/dist/core/cli/version-check.js +140 -16
- package/dist/core/cli/version-check.js.map +1 -1
- package/dist/core/config/config-loader.d.ts +2 -1
- package/dist/core/config/config-loader.js +6 -2
- package/dist/core/config/config-loader.js.map +1 -1
- package/dist/core/downloaders/git.js +26 -20
- package/dist/core/downloaders/git.js.map +1 -1
- package/dist/core/downloaders/local.js +0 -1
- package/dist/core/downloaders/local.js.map +1 -1
- package/dist/core/downloaders/package.js +4 -5
- package/dist/core/downloaders/package.js.map +1 -1
- package/dist/core/downloaders/utils.d.ts +3 -1
- package/dist/core/downloaders/utils.js +39 -29
- package/dist/core/downloaders/utils.js.map +1 -1
- package/dist/core/runtime/launch-sequence.js +4 -4
- package/dist/core/runtime/launch-sequence.js.map +1 -1
- package/dist/core/runtime/module-loading.js +43 -36
- package/dist/core/runtime/module-loading.js.map +1 -1
- package/dist/core/version-checker.js +19 -13
- package/dist/core/version-checker.js.map +1 -1
- package/dist/logging/index.js +31 -7
- package/dist/logging/index.js.map +1 -1
- package/dist/logging/log-template.d.ts +8 -0
- package/dist/logging/log-template.js +45 -0
- package/dist/logging/log-template.js.map +1 -0
- package/dist/utils/object.d.ts +1 -0
- package/dist/utils/object.js +12 -0
- package/dist/utils/object.js.map +1 -1
- package/package.json +6 -5
- package/dist/core/cli/terminal-display.d.ts +0 -17
- package/dist/core/cli/terminal-display.js +0 -113
- package/dist/core/cli/terminal-display.js.map +0 -1
|
@@ -34,6 +34,7 @@ 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;
|
|
37
38
|
exports.loadTsConfigFile = loadTsConfigFile;
|
|
38
39
|
const jiti_1 = require("jiti");
|
|
39
40
|
const self = __importStar(require("./config-loader"));
|
|
@@ -42,12 +43,15 @@ const config_parser_1 = require("./config-parser");
|
|
|
42
43
|
const config_paths_1 = require("./config-paths");
|
|
43
44
|
const CORE_CONFIG_PACKAGE = "@antelopejs/interface-core/config";
|
|
44
45
|
const CORE_CONFIG_ENTRY = require.resolve(CORE_CONFIG_PACKAGE);
|
|
45
|
-
async function
|
|
46
|
+
async function importConfigInput(configPath) {
|
|
46
47
|
const jiti = (0, jiti_1.createJiti)(configPath, {
|
|
47
48
|
alias: { [CORE_CONFIG_PACKAGE]: CORE_CONFIG_ENTRY },
|
|
48
49
|
});
|
|
49
50
|
const loaded = await jiti.import(configPath);
|
|
50
|
-
|
|
51
|
+
return loaded.default ?? loaded;
|
|
52
|
+
}
|
|
53
|
+
async function loadTsConfigFile(configPath, environment) {
|
|
54
|
+
const configInput = await importConfigInput(configPath);
|
|
51
55
|
if (typeof configInput === "function") {
|
|
52
56
|
return await configInput({ env: environment ?? config_paths_1.DEFAULT_ENV });
|
|
53
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../../src/core/config/config-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmCA,
|
|
1
|
+
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../../src/core/config/config-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ const command_1 = require("../cli/command");
|
|
|
40
40
|
const utils_1 = require("./utils");
|
|
41
41
|
const filesystem_1 = require("../filesystem");
|
|
42
42
|
const module_manifest_1 = require("../module-manifest");
|
|
43
|
-
const
|
|
43
|
+
const tasks_1 = require("../cli/output/tasks");
|
|
44
44
|
const Logger = new logging_1.Logging.Channel("loader.git");
|
|
45
45
|
const GIT_DIR = ".git";
|
|
46
46
|
const SAFE_GIT_ARGUMENT = /^[A-Za-z0-9._:/@~-]+$/;
|
|
@@ -63,13 +63,15 @@ function validateSource(source) {
|
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
function toCommandResult(err) {
|
|
66
|
+
if (err instanceof command_1.ExecError) {
|
|
67
|
+
return { stdout: err.stdout, stderr: err.stderr, code: err.exitCode };
|
|
68
|
+
}
|
|
66
69
|
return { stdout: "", stderr: String(err), code: 1 };
|
|
67
70
|
}
|
|
68
71
|
async function runGitCommand(command, cwd, exec) {
|
|
69
72
|
const result = await exec(command, { cwd }).catch(toCommandResult);
|
|
70
73
|
if (result.code !== 0) {
|
|
71
|
-
|
|
72
|
-
throw new Error(`'${command}' failed: ${result.stderr}`);
|
|
74
|
+
throw new command_1.ExecError({ ...result, command });
|
|
73
75
|
}
|
|
74
76
|
return result;
|
|
75
77
|
}
|
|
@@ -79,11 +81,9 @@ async function commitAt(branch, cwd, exec) {
|
|
|
79
81
|
res = await exec(`git rev-parse ${branch}`, { cwd });
|
|
80
82
|
}
|
|
81
83
|
catch (err) {
|
|
82
|
-
await terminal_display_1.terminalDisplay.failSpinner(`Failed to get commit hash for ${branch}: ${String(err)}`);
|
|
83
84
|
throw new Error(`Failed to get commit hash for ${branch}: ${String(err)}`);
|
|
84
85
|
}
|
|
85
86
|
if (res.code !== 0) {
|
|
86
|
-
await terminal_display_1.terminalDisplay.failSpinner(`Failed to get commit hash for ${branch}: ${res.stderr}`);
|
|
87
87
|
throw new Error(`Failed to get commit hash for ${branch}: ${res.stderr}`);
|
|
88
88
|
}
|
|
89
89
|
return res.stdout.trim();
|
|
@@ -95,13 +95,13 @@ async function mainBranch(cwd, exec) {
|
|
|
95
95
|
}
|
|
96
96
|
async function cloneRepo(cache, source, exec, name, folder) {
|
|
97
97
|
const branch = source.commit || source.branch;
|
|
98
|
-
await
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
98
|
+
await (0, tasks_1.runTask)(`Cloning ${source.remote}`, async () => {
|
|
99
|
+
await cache.getFolder(name, false, true);
|
|
100
|
+
await runGitCommand(`git clone ${source.remote} ${name}`, cache.path, exec);
|
|
101
|
+
if (branch) {
|
|
102
|
+
await runGitCommand(`git checkout ${branch}`, folder, exec);
|
|
103
|
+
}
|
|
104
|
+
}, { done: `Cloned ${source.remote}` });
|
|
105
105
|
const newActiveCommit = await commitAt("HEAD", folder, exec);
|
|
106
106
|
const newBranch = branch ?? (await mainBranch(folder, exec));
|
|
107
107
|
return {
|
|
@@ -109,14 +109,18 @@ async function cloneRepo(cache, source, exec, name, folder) {
|
|
|
109
109
|
shouldInstallDependencies: true,
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
|
-
|
|
112
|
+
const UNCHANGED_REPO = {
|
|
113
|
+
newVersion: "",
|
|
114
|
+
shouldInstallDependencies: false,
|
|
115
|
+
};
|
|
116
|
+
async function syncRepo(request, task) {
|
|
117
|
+
const { source, exec, folder } = request;
|
|
113
118
|
const branch = source.commit || source.branch;
|
|
114
|
-
const [, prevBranch, prevCommit] = cacheVersion.split(":");
|
|
115
|
-
await terminal_display_1.terminalDisplay.startSpinner(`Updating ${source.remote}`);
|
|
119
|
+
const [, prevBranch, prevCommit] = request.cacheVersion.split(":");
|
|
116
120
|
const fetchResult = await exec("git fetch", { cwd: folder }).catch(toCommandResult);
|
|
117
121
|
if (fetchResult.code !== 0) {
|
|
118
|
-
|
|
119
|
-
return
|
|
122
|
+
task.warn(`Could not fetch ${source.remote}, using cached copy`);
|
|
123
|
+
return UNCHANGED_REPO;
|
|
120
124
|
}
|
|
121
125
|
const newBranch = branch ?? (await mainBranch(folder, exec));
|
|
122
126
|
if (prevBranch !== newBranch) {
|
|
@@ -129,22 +133,24 @@ async function updateRepo(source, exec, folder, cacheVersion) {
|
|
|
129
133
|
}
|
|
130
134
|
}
|
|
131
135
|
const newActiveCommit = await commitAt("HEAD", folder, exec);
|
|
132
|
-
await terminal_display_1.terminalDisplay.stopSpinner(`Updated ${source.remote}`);
|
|
133
136
|
if (newActiveCommit === prevCommit) {
|
|
134
|
-
return
|
|
137
|
+
return UNCHANGED_REPO;
|
|
135
138
|
}
|
|
136
139
|
return {
|
|
137
140
|
newVersion: `git:${newBranch}:${newActiveCommit}`,
|
|
138
141
|
shouldInstallDependencies: true,
|
|
139
142
|
};
|
|
140
143
|
}
|
|
144
|
+
function updateRepo(request) {
|
|
145
|
+
return (0, tasks_1.runTask)(`Updating ${request.source.remote}`, (task) => syncRepo(request, task), { done: `Updated ${request.source.remote}` });
|
|
146
|
+
}
|
|
141
147
|
async function cloneOrFetchRepo(cache, source, exec, fs, name, folder) {
|
|
142
148
|
const cacheVersion = cache.getVersion(name);
|
|
143
149
|
const repoPresent = await fs.exists(path.join(folder, GIT_DIR));
|
|
144
150
|
if (source.ignoreCache || !cacheVersion?.startsWith("git:") || !repoPresent) {
|
|
145
151
|
return cloneRepo(cache, source, exec, name, folder);
|
|
146
152
|
}
|
|
147
|
-
return updateRepo(source, exec, folder, cacheVersion);
|
|
153
|
+
return updateRepo({ source, exec, folder, cacheVersion });
|
|
148
154
|
}
|
|
149
155
|
function registerGitDownloader(registry, deps = {}) {
|
|
150
156
|
const fs = deps.fs ?? new filesystem_1.NodeFileSystem();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/core/downloaders/git.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/core/downloaders/git.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,6 @@ function registerLocalDownloader(registry, deps = {}) {
|
|
|
47
47
|
registry.register("local", "path", async (_cache, source, options) => {
|
|
48
48
|
const formattedPath = (0, utils_1.expandHome)(source.path);
|
|
49
49
|
if (!(await fs.exists(formattedPath))) {
|
|
50
|
-
Logger.Error(`Path does not exist or is not accessible: ${formattedPath}`);
|
|
51
50
|
throw new Error(`Path does not exist or is not accessible: ${formattedPath}`);
|
|
52
51
|
}
|
|
53
52
|
const installCommand = options?.reload
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/core/downloaders/local.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA,
|
|
1
|
+
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/core/downloaders/local.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA,0DA4CC;AAhED,gDAAkC;AAClC,gEAA6D;AAG7D,4CAA4C;AAG5C,8CAA+C;AAE/C,wDAAoD;AACpD,mCAAyD;AAGzD,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAOnD,SAAgB,uBAAuB,CACrC,QAA4B,EAC5B,OAA4B,EAAE;IAE9B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,2BAAc,EAAE,CAAC;IAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,oBAAU,CAAC;IAErC,QAAQ,CAAC,QAAQ,CACf,OAAO,EACP,MAAM,EACN,KAAK,EACH,MAAmB,EACnB,MAAyB,EACzB,OAAqB,EACrB,EAAE;QACF,MAAM,aAAa,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CACb,6CAA6C,aAAa,EAAE,CAC7D,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG,OAAO,EAAE,MAAM;YACpC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,cAAc,CAAC;YACjD,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;QAE1B,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEvD,MAAM,IAAA,0BAAkB,EACtB,IAAI,EACJ,MAAM,EACN,IAAI,EACJ,aAAa,EACb,cAAc,CACf,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,gCAAc,CAAC,MAAM,CAC1C,aAAa,EACb,MAAM,EACN,IAAI,EACJ,EAAE,CACH,CAAC;QACF,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -152,11 +152,10 @@ async function findCachedFolder(cache, pkg, fs) {
|
|
|
152
152
|
async function downloadPackage(cache, source, version, ctx) {
|
|
153
153
|
Logger.Trace(`Downloading package ${source.package}@${version}`);
|
|
154
154
|
const tmp = await ctx.getTemp();
|
|
155
|
-
const
|
|
156
|
-
|
|
157
|
-
});
|
|
155
|
+
const packCommand = `npm pack "${source.package}@${version}"`;
|
|
156
|
+
const result = await ctx.exec(packCommand, { cwd: tmp });
|
|
158
157
|
if (result.code !== 0) {
|
|
159
|
-
throw new
|
|
158
|
+
throw new command_1.ExecError({ ...result, command: packCommand });
|
|
160
159
|
}
|
|
161
160
|
const packOutput = result.stdout.trim().split("\n");
|
|
162
161
|
const filename = packOutput[packOutput.length - 1].trim();
|
|
@@ -171,7 +170,7 @@ async function downloadPackage(cache, source, version, ctx) {
|
|
|
171
170
|
const cmd = await ctx.getInstallCommand(folder);
|
|
172
171
|
const installResult = await ctx.exec(cmd, { cwd: folder });
|
|
173
172
|
if (installResult.code !== 0) {
|
|
174
|
-
throw
|
|
173
|
+
throw (0, utils_1.installFailure)(`${source.package}@${version}`, new command_1.ExecError({ ...installResult, command: cmd }));
|
|
175
174
|
}
|
|
176
175
|
await cache.commitVersion(source.package, manifest.version);
|
|
177
176
|
return folder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/core/downloaders/package.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/core/downloaders/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { ModuleInstallCommand } from "@antelopejs/interface-core/config";
|
|
2
|
+
import { ExecError } from "../cli/command";
|
|
3
|
+
import { CliError } from "../cli/output/errors";
|
|
2
4
|
import type { CommandRunner, DebugLogger } from "./types";
|
|
3
|
-
export declare function
|
|
5
|
+
export declare function installFailure(label: string, failure: ExecError): CliError;
|
|
4
6
|
export declare function runInstallCommands(exec: CommandRunner, logger: DebugLogger, label: string, folder: string, installCommand?: ModuleInstallCommand): Promise<void>;
|
|
5
7
|
export declare function expandHome(input: string): string;
|
|
@@ -33,34 +33,59 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.
|
|
36
|
+
exports.installFailure = installFailure;
|
|
37
37
|
exports.runInstallCommands = runInstallCommands;
|
|
38
38
|
exports.expandHome = expandHome;
|
|
39
39
|
const os = __importStar(require("node:os"));
|
|
40
|
-
const
|
|
41
|
-
const
|
|
40
|
+
const command_1 = require("../cli/command");
|
|
41
|
+
const errors_1 = require("../cli/output/errors");
|
|
42
|
+
const tasks_1 = require("../cli/output/tasks");
|
|
43
|
+
const exit_codes_1 = require("../cli/exit-codes");
|
|
42
44
|
function normalizeCommands(installCommand) {
|
|
43
45
|
if (!installCommand) {
|
|
44
46
|
return [];
|
|
45
47
|
}
|
|
46
48
|
return Array.isArray(installCommand) ? installCommand : [installCommand];
|
|
47
49
|
}
|
|
48
|
-
function
|
|
49
|
-
|
|
50
|
-
|
|
50
|
+
function toExecError(err, command) {
|
|
51
|
+
if (err instanceof command_1.ExecError) {
|
|
52
|
+
return err;
|
|
53
|
+
}
|
|
54
|
+
const stderr = err instanceof Error ? err.message : String(err);
|
|
55
|
+
return new command_1.ExecError({
|
|
56
|
+
command,
|
|
57
|
+
stdout: "",
|
|
58
|
+
stderr,
|
|
59
|
+
code: exit_codes_1.FAILURE_EXIT_CODE,
|
|
60
|
+
});
|
|
51
61
|
}
|
|
52
62
|
async function runInstallCommand(exec, folder, command) {
|
|
53
63
|
try {
|
|
54
64
|
const result = await exec(command, { cwd: folder });
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
return (result.stderr ||
|
|
59
|
-
result.stdout ||
|
|
60
|
-
`command exited with code ${result.code}`);
|
|
65
|
+
return result.code === 0
|
|
66
|
+
? undefined
|
|
67
|
+
: new command_1.ExecError({ ...result, command });
|
|
61
68
|
}
|
|
62
69
|
catch (err) {
|
|
63
|
-
return err
|
|
70
|
+
return toExecError(err, command);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
function installFailure(label, failure) {
|
|
74
|
+
return new errors_1.CliError({
|
|
75
|
+
title: `Install failed for ${label}`,
|
|
76
|
+
reason: `'${failure.command}' exited with code ${failure.exitCode}.`,
|
|
77
|
+
fixes: [
|
|
78
|
+
`Fix the command, or change the installCommand of ${label} in the project configuration`,
|
|
79
|
+
],
|
|
80
|
+
}, { cause: failure });
|
|
81
|
+
}
|
|
82
|
+
async function runCommandsInOrder(exec, logger, label, folder, commands) {
|
|
83
|
+
for (const command of commands) {
|
|
84
|
+
logger.Debug(`Executing command: ${command}`);
|
|
85
|
+
const failure = await runInstallCommand(exec, folder, command);
|
|
86
|
+
if (failure !== undefined) {
|
|
87
|
+
throw installFailure(label, failure);
|
|
88
|
+
}
|
|
64
89
|
}
|
|
65
90
|
}
|
|
66
91
|
async function runInstallCommands(exec, logger, label, folder, installCommand) {
|
|
@@ -68,22 +93,7 @@ async function runInstallCommands(exec, logger, label, folder, installCommand) {
|
|
|
68
93
|
if (commands.length === 0) {
|
|
69
94
|
return;
|
|
70
95
|
}
|
|
71
|
-
await
|
|
72
|
-
for (const command of commands) {
|
|
73
|
-
logger.Debug(`Executing command: ${command}`);
|
|
74
|
-
const details = await runInstallCommand(exec, folder, command);
|
|
75
|
-
if (details === undefined) {
|
|
76
|
-
continue;
|
|
77
|
-
}
|
|
78
|
-
const message = installFailureMessage(label, command, details);
|
|
79
|
-
const spinnerReportsFailure = terminal_display_1.terminalDisplay.isSpinnerActive();
|
|
80
|
-
await terminal_display_1.terminalDisplay.failSpinner(message);
|
|
81
|
-
if (!spinnerReportsFailure) {
|
|
82
|
-
(0, cli_ui_1.error)(message);
|
|
83
|
-
}
|
|
84
|
-
throw new Error(message);
|
|
85
|
-
}
|
|
86
|
-
await terminal_display_1.terminalDisplay.stopSpinner(`Dependencies installed for ${label}`);
|
|
96
|
+
await (0, tasks_1.runTask)(`Installing dependencies for ${label}`, () => runCommandsInOrder(exec, logger, label, folder, commands), { done: `Installed dependencies for ${label}` });
|
|
87
97
|
}
|
|
88
98
|
function expandHome(input) {
|
|
89
99
|
const homeDir = os.homedir();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/core/downloaders/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/core/downloaders/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
43
43
|
const shutdown_1 = require("../shutdown");
|
|
44
44
|
const filesystem_1 = require("../filesystem");
|
|
45
45
|
const module_manager_1 = require("../module-manager");
|
|
46
|
-
const
|
|
46
|
+
const tasks_1 = require("../cli/output/tasks");
|
|
47
47
|
const logging_1 = require("../../logging");
|
|
48
48
|
const build_refresh_1 = require("./build-refresh");
|
|
49
49
|
const dev_server_registry_1 = require("./dev-server-registry");
|
|
@@ -127,8 +127,8 @@ async function runLaunchSequence(prepare, projectFolder, env, options, policy =
|
|
|
127
127
|
if (policy.processHandlers) {
|
|
128
128
|
(0, runtime_bootstrap_1.setupProcessHandlers)(shutdownManager);
|
|
129
129
|
}
|
|
130
|
-
const previouslySilent =
|
|
131
|
-
|
|
130
|
+
const previouslySilent = tasks_1.terminalDisplay.isSilent();
|
|
131
|
+
tasks_1.terminalDisplay.setSilent(!policy.terminal);
|
|
132
132
|
try {
|
|
133
133
|
return await completeLaunchSequence(request, shutdownManager, manager);
|
|
134
134
|
}
|
|
@@ -141,7 +141,7 @@ async function runLaunchSequence(prepare, projectFolder, env, options, policy =
|
|
|
141
141
|
throw new AggregateError([...unpackErrors(error), ...cleanupErrors], "Failed to launch project");
|
|
142
142
|
}
|
|
143
143
|
finally {
|
|
144
|
-
|
|
144
|
+
tasks_1.terminalDisplay.setSilent(previouslySilent);
|
|
145
145
|
}
|
|
146
146
|
}
|
|
147
147
|
async function completeLaunchSequence(request, shutdownManager, manager) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-sequence.js","sourceRoot":"","sources":["../../../src/core/runtime/launch-sequence.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CA,oDAQC;AAwID,8CAqCC;AAhOD,0DAA6B;AAE7B,0CAA8C;AAC9C,8CAA+C;AAE/C,sDAAkD;AAClD
|
|
1
|
+
{"version":3,"file":"launch-sequence.js","sourceRoot":"","sources":["../../../src/core/runtime/launch-sequence.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,10 @@ const types_1 = require("../../types");
|
|
|
57
57
|
const module_cache_1 = require("../module-cache");
|
|
58
58
|
const filesystem_1 = require("../filesystem");
|
|
59
59
|
const module_manifest_1 = require("../module-manifest");
|
|
60
|
-
const
|
|
60
|
+
const format_1 = require("../cli/output/format");
|
|
61
|
+
const errors_1 = require("../cli/output/errors");
|
|
62
|
+
const failures_1 = require("../cli/output/failures");
|
|
63
|
+
const tasks_1 = require("../cli/output/tasks");
|
|
61
64
|
const interface_resolution_1 = require("../resolution/interface-resolution");
|
|
62
65
|
const Logger = new logging_1.Logging.Channel("loader");
|
|
63
66
|
const CORE_MODULE_ID = "antelopejs";
|
|
@@ -204,30 +207,41 @@ function buildManifestEntries(manifests, moduleConfig) {
|
|
|
204
207
|
const config = toModuleConfig(moduleConfig);
|
|
205
208
|
return manifests.map((manifest) => ({ manifest, config: { ...config } }));
|
|
206
209
|
}
|
|
207
|
-
async function
|
|
208
|
-
const
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
210
|
+
async function loadModuleEntry(id, moduleConfig, context) {
|
|
211
|
+
const source = { ...moduleConfig.source, id };
|
|
212
|
+
Logger.Debug(`Loading module ${id}`);
|
|
213
|
+
Logger.Trace(`Starting LoadModule for ${id}`);
|
|
214
|
+
const manifests = await context.registry.load(context.projectFolder, context.cache, source);
|
|
215
|
+
Logger.Trace(`Module manifest loaded for ${id}`);
|
|
216
|
+
return buildManifestEntries(manifests, moduleConfig);
|
|
217
|
+
}
|
|
218
|
+
function uniqueFixes(failures) {
|
|
219
|
+
const fixes = failures.flatMap((failure) => (0, failures_1.describeFailure)(failure, false).fixes ?? []);
|
|
220
|
+
return [...new Set(fixes)];
|
|
221
|
+
}
|
|
222
|
+
function moduleLoadFailure(failures, total) {
|
|
223
|
+
if (failures.length === 1) {
|
|
224
|
+
return failures[0];
|
|
225
|
+
}
|
|
226
|
+
const tasks = (0, tasks_1.getProcessTasks)();
|
|
227
|
+
failures.forEach((failure) => {
|
|
228
|
+
const problem = (0, failures_1.describeFailure)(failure, false);
|
|
229
|
+
tasks.message("error", problem.title, { detail: problem.reason });
|
|
224
230
|
});
|
|
225
|
-
return
|
|
231
|
+
return new errors_1.CliError({
|
|
232
|
+
title: `Could not load ${failures.length} of ${(0, format_1.pluralize)(total, "module")}`,
|
|
233
|
+
fixes: uniqueFixes(failures),
|
|
234
|
+
}, { cause: failures[0] });
|
|
226
235
|
}
|
|
227
|
-
async function
|
|
228
|
-
await
|
|
229
|
-
|
|
230
|
-
|
|
236
|
+
async function loadModuleEntries(modules, context) {
|
|
237
|
+
const results = await Promise.allSettled(Object.entries(modules).map(([id, moduleConfig]) => loadModuleEntry(id, moduleConfig, context)));
|
|
238
|
+
const failures = results
|
|
239
|
+
.filter((result) => result.status === "rejected")
|
|
240
|
+
.map((result) => result.reason);
|
|
241
|
+
if (failures.length > 0) {
|
|
242
|
+
throw moduleLoadFailure(failures, results.length);
|
|
243
|
+
}
|
|
244
|
+
return results.flatMap((result) => result.status === "fulfilled" ? result.value : []);
|
|
231
245
|
}
|
|
232
246
|
function validateModuleNameCollisions(entries) {
|
|
233
247
|
const seenNames = new Set();
|
|
@@ -240,10 +254,8 @@ function validateModuleNameCollisions(entries) {
|
|
|
240
254
|
});
|
|
241
255
|
}
|
|
242
256
|
async function buildModuleConfigs(config, loaderContext) {
|
|
243
|
-
|
|
244
|
-
const modules = await loadModuleEntries(config.modules, loaderContext);
|
|
245
|
-
await terminal_display_1.terminalDisplay.stopSpinner(`Modules loaded`);
|
|
246
|
-
await loadEntryExports();
|
|
257
|
+
const moduleCount = Object.keys(config.modules).length;
|
|
258
|
+
const modules = await (0, tasks_1.runTask)("Loading modules", () => loadModuleEntries(config.modules, loaderContext), { done: `Loaded ${(0, format_1.pluralize)(moduleCount, "module")}` });
|
|
247
259
|
validateModuleNameCollisions(modules);
|
|
248
260
|
return modules;
|
|
249
261
|
}
|
|
@@ -351,16 +363,11 @@ async function loadModuleEntriesForManager(manager, config, runtimeInterface, lo
|
|
|
351
363
|
return entries;
|
|
352
364
|
}
|
|
353
365
|
async function constructAndStartModules(manager) {
|
|
354
|
-
await terminal_display_1.terminalDisplay.startSpinner(`Constructing modules`);
|
|
355
366
|
Logger.Trace(`Constructing modules`);
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
await terminal_display_1.terminalDisplay.failSpinner(`Failed to construct modules`);
|
|
361
|
-
throw error;
|
|
362
|
-
}
|
|
363
|
-
await terminal_display_1.terminalDisplay.stopSpinner(`Done loading`);
|
|
367
|
+
await (0, tasks_1.runTask)("Constructing modules", () => manager.constructAll(), {
|
|
368
|
+
done: "Constructed modules",
|
|
369
|
+
failed: "Failed to construct modules",
|
|
370
|
+
});
|
|
364
371
|
await manager.startAll();
|
|
365
372
|
}
|
|
366
373
|
async function destroyModulesAfterFailure(manager, error) {
|