@antelopejs/core 1.7.1 → 1.8.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/dist/core/cli/command.d.ts +3 -1
- package/dist/core/cli/command.js +20 -2
- package/dist/core/cli/command.js.map +1 -1
- package/dist/core/cli/commands/plugins.js +5 -2
- package/dist/core/cli/commands/plugins.js.map +1 -1
- package/dist/core/cli/commands/project/modules/install.d.ts +7 -0
- package/dist/core/cli/commands/project/modules/install.js +29 -11
- package/dist/core/cli/commands/project/modules/install.js.map +1 -1
- package/dist/core/cli/commands/update.js +2 -1
- package/dist/core/cli/commands/update.js.map +1 -1
- package/dist/core/cli/executable-lookup.d.ts +10 -1
- package/dist/core/cli/executable-lookup.js +43 -6
- package/dist/core/cli/executable-lookup.js.map +1 -1
- package/dist/core/cli/full-cli.js +2 -1
- package/dist/core/cli/full-cli.js.map +1 -1
- package/dist/core/cli/plugin-compatibility.d.ts +2 -1
- package/dist/core/cli/plugin-compatibility.js +2 -2
- package/dist/core/cli/plugin-compatibility.js.map +1 -1
- package/dist/core/cli/plugin-management.d.ts +2 -1
- package/dist/core/cli/plugin-management.js +24 -11
- package/dist/core/cli/plugin-management.js.map +1 -1
- package/dist/core/cli/plugin-package.d.ts +2 -1
- package/dist/core/cli/plugin-package.js +18 -5
- package/dist/core/cli/plugin-package.js.map +1 -1
- package/dist/core/cli/plugin.js +3 -3
- package/dist/core/cli/plugin.js.map +1 -1
- package/dist/core/downloaders/local.js +1 -1
- package/dist/core/downloaders/local.js.map +1 -1
- package/dist/core/downloaders/package.js +2 -1
- package/dist/core/downloaders/package.js.map +1 -1
- package/dist/core/downloaders/utils.d.ts +1 -0
- package/dist/core/downloaders/utils.js +30 -4
- package/dist/core/downloaders/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import { type ExecOptions } from "node:child_process";
|
|
1
|
+
import { type ChildProcess, type ExecOptions } from "node:child_process";
|
|
2
2
|
export interface CommandResult {
|
|
3
3
|
stdout: string;
|
|
4
4
|
stderr: string;
|
|
5
5
|
code: number;
|
|
6
6
|
}
|
|
7
|
+
export declare function nonInteractiveOptions(options: ExecOptions): ExecOptions;
|
|
8
|
+
export declare function closeStdin(child: ChildProcess): void;
|
|
7
9
|
export declare function ExecuteCMD(command: string, options: ExecOptions): Promise<CommandResult>;
|
package/dist/core/cli/command.js
CHANGED
|
@@ -1,13 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.nonInteractiveOptions = nonInteractiveOptions;
|
|
4
|
+
exports.closeStdin = closeStdin;
|
|
3
5
|
exports.ExecuteCMD = ExecuteCMD;
|
|
4
|
-
const node_child_process_1 = require("node:child_process");
|
|
5
6
|
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
7
|
+
const node_child_process_1 = require("node:child_process");
|
|
6
8
|
const Logger = new logging_1.Logging.Channel("cli.command");
|
|
9
|
+
const NON_INTERACTIVE_ENV = {
|
|
10
|
+
CI: "1",
|
|
11
|
+
};
|
|
12
|
+
function nonInteractiveOptions(options) {
|
|
13
|
+
return {
|
|
14
|
+
...options,
|
|
15
|
+
env: {
|
|
16
|
+
...(options.env ?? process.env),
|
|
17
|
+
...NON_INTERACTIVE_ENV,
|
|
18
|
+
},
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
function closeStdin(child) {
|
|
22
|
+
child.stdin?.end();
|
|
23
|
+
}
|
|
7
24
|
function ExecuteCMD(command, options) {
|
|
8
25
|
return new Promise((resolve, reject) => {
|
|
9
26
|
Logger.Trace(`Executing command: ${command}`);
|
|
10
|
-
(0, node_child_process_1.exec)(command, options, (err, stdout, stderr) => {
|
|
27
|
+
const child = (0, node_child_process_1.exec)(command, nonInteractiveOptions(options), (err, stdout, stderr) => {
|
|
11
28
|
const result = {
|
|
12
29
|
stdout: stdout?.toString() ?? "",
|
|
13
30
|
stderr: stderr?.toString() ?? "",
|
|
@@ -20,6 +37,7 @@ function ExecuteCMD(command, options) {
|
|
|
20
37
|
}
|
|
21
38
|
resolve(result);
|
|
22
39
|
});
|
|
40
|
+
closeStdin(child);
|
|
23
41
|
});
|
|
24
42
|
}
|
|
25
43
|
//# sourceMappingURL=command.js.map
|
|
@@ -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":";;AAmBA,sDAQC;AAMD,gCAEC;AAUD,gCA0BC;AAvED,gEAA6D;AAC7D,2DAA+E;AAE/E,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;AAElD,MAAM,mBAAmB,GAA2B;IAClD,EAAE,EAAE,GAAG;CACR,CAAC;AAYF,SAAgB,qBAAqB,CAAC,OAAoB;IACxD,OAAO;QACL,GAAG,OAAO;QACV,GAAG,EAAE;YACH,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YAC/B,GAAG,mBAAmB;SACvB;KACF,CAAC;AACJ,CAAC;AAMD,SAAgB,UAAU,CAAC,KAAmB;IAC5C,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;AACrB,CAAC;AAUD,SAAgB,UAAU,CACxB,OAAe,EACf,OAAoB;IAEpB,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpD,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,IAAA,yBAAI,EAChB,OAAO,EACP,qBAAqB,CAAC,OAAO,CAAC,EAC9B,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACtB,MAAM,MAAM,GAAkB;gBAC5B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBAChC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBAChC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aAC9B,CAAC;YAEF,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;gBACnD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC;gBAC9D,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC,CACF,CAAC;QACF,UAAU,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -15,13 +15,16 @@ async function listPlugins() {
|
|
|
15
15
|
console.log((0, plugin_management_1.formatPluginStatus)(status));
|
|
16
16
|
}
|
|
17
17
|
console.log("");
|
|
18
|
-
console.log(chalk_1.default.dim(`
|
|
18
|
+
console.log(chalk_1.default.dim(`Plugins resolve from the nearest node_modules/.bin, then from PATH.`));
|
|
19
|
+
console.log(chalk_1.default.dim(`Install or update a global plugin with: ${chalk_1.default.cyan("ajs update <plugin>")}`));
|
|
19
20
|
}
|
|
20
21
|
function default_1() {
|
|
21
22
|
return new commander_1.Command("plugins")
|
|
22
23
|
.alias("plugin")
|
|
23
24
|
.description(`List official AntelopeJS plugins\n` +
|
|
24
|
-
`Shows
|
|
25
|
+
`Shows where each plugin resolves from and its version.\n` +
|
|
26
|
+
`Resolution order: node_modules/.bin of the current directory or one of\n` +
|
|
27
|
+
`its parents ("local"), then PATH ("global").`)
|
|
25
28
|
.action(listPlugins)
|
|
26
29
|
.addCommand(new commander_1.Command("list")
|
|
27
30
|
.description(`List official AntelopeJS plugins`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../../src/core/cli/commands/plugins.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../../src/core/cli/commands/plugins.ts"],"names":[],"mappings":";;;;;AA0BA,4BAeC;AAzCD,kDAA0B;AAC1B,yCAAoC;AAEpC,sCAAmC;AACnC,4DAA6E;AAE7E,KAAK,UAAU,WAAW;IACxB,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAAiB,GAAE,CAAC;IAE3C,IAAA,eAAM,EAAC,6BAA6B,CAAC,CAAC;IACtC,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,IAAA,sCAAkB,EAAC,MAAM,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,GAAG,CACP,qEAAqE,CACtE,CACF,CAAC;IACF,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,GAAG,CACP,2CAA2C,eAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAC/E,CACF,CAAC;AACJ,CAAC;AAED;IACE,OAAO,IAAI,mBAAO,CAAC,SAAS,CAAC;SAC1B,KAAK,CAAC,QAAQ,CAAC;SACf,WAAW,CACV,oCAAoC;QAClC,0DAA0D;QAC1D,0EAA0E;QAC1E,8CAA8C,CACjD;SACA,MAAM,CAAC,WAAW,CAAC;SACnB,UAAU,CACT,IAAI,mBAAO,CAAC,MAAM,CAAC;SAChB,WAAW,CAAC,kCAAkC,CAAC;SAC/C,MAAM,CAAC,WAAW,CAAC,CACvB,CAAC;AACN,CAAC"}
|
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
2
|
import type { ModuleSource } from "@antelopejs/interface-core/config";
|
|
3
|
+
export interface UnresolvedImport {
|
|
4
|
+
interfacePackage: string;
|
|
5
|
+
moduleId: string;
|
|
6
|
+
version?: string;
|
|
7
|
+
}
|
|
8
|
+
export declare function describeUnresolvedImport(imp: UnresolvedImport): string;
|
|
9
|
+
export declare function unresolvedImportWarning(imp: UnresolvedImport, git: string): string;
|
|
3
10
|
export declare function resolveInstallIdentifier(source: ModuleSource, identifier: string): string;
|
|
4
11
|
export default function (): Command;
|
|
@@ -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.describeUnresolvedImport = describeUnresolvedImport;
|
|
7
|
+
exports.unresolvedImportWarning = unresolvedImportWarning;
|
|
6
8
|
exports.resolveInstallIdentifier = resolveInstallIdentifier;
|
|
7
9
|
exports.default = default_1;
|
|
8
10
|
const chalk_1 = __importDefault(require("chalk"));
|
|
@@ -25,6 +27,13 @@ const local_folder_1 = require("../../../../downloaders/local-folder");
|
|
|
25
27
|
const interface_resolution_1 = require("../../../../resolution/interface-resolution");
|
|
26
28
|
const git_operations_1 = require("../../../git-operations");
|
|
27
29
|
const common_1 = require("../../../common");
|
|
30
|
+
function describeUnresolvedImport(imp) {
|
|
31
|
+
const version = imp.version ? `@${imp.version}` : "";
|
|
32
|
+
return `${imp.interfacePackage}${version} (required by ${imp.moduleId})`;
|
|
33
|
+
}
|
|
34
|
+
function unresolvedImportWarning(imp, git) {
|
|
35
|
+
return `${describeUnresolvedImport(imp)}: no module found implementing it in repository ${git}`;
|
|
36
|
+
}
|
|
28
37
|
const PACKAGE_SOURCE_TYPE = "package";
|
|
29
38
|
function resolveInstallIdentifier(source, identifier) {
|
|
30
39
|
if (source.type !== PACKAGE_SOURCE_TYPE) {
|
|
@@ -56,9 +65,17 @@ async function analyzeConfig(projectFolder, cache, config, registry, fs) {
|
|
|
56
65
|
dependencies: m.manifest.dependencies ?? {},
|
|
57
66
|
optionalDependencies: m.manifest.optionalDependencies ?? {},
|
|
58
67
|
}));
|
|
68
|
+
const requiredVersions = new Map(consumers.map((consumer) => [
|
|
69
|
+
consumer.id,
|
|
70
|
+
{ ...consumer.dependencies, ...consumer.optionalDependencies },
|
|
71
|
+
]));
|
|
59
72
|
const { unresolved } = (0, interface_resolution_1.findUnresolvedInterfaces)(providers, consumers);
|
|
60
73
|
return {
|
|
61
|
-
unresolvedImports: unresolved.map((u) =>
|
|
74
|
+
unresolvedImports: unresolved.map((u) => ({
|
|
75
|
+
interfacePackage: u.interfacePackage,
|
|
76
|
+
moduleId: u.moduleId,
|
|
77
|
+
version: requiredVersions.get(u.moduleId)?.[u.interfacePackage],
|
|
78
|
+
})),
|
|
62
79
|
};
|
|
63
80
|
}
|
|
64
81
|
function default_1() {
|
|
@@ -118,7 +135,8 @@ function default_1() {
|
|
|
118
135
|
if (unresolvedImports.length > 0) {
|
|
119
136
|
(0, cli_ui_1.warning)(chalk_1.default.yellow `Found ${unresolvedImports.length} unresolved imports:`);
|
|
120
137
|
for (const imp of unresolvedImports) {
|
|
121
|
-
const
|
|
138
|
+
const interfaceName = imp.interfacePackage;
|
|
139
|
+
const interfaceDirName = gitManifest.interfaces[interfaceName];
|
|
122
140
|
const interfaceInfo = interfaceDirName
|
|
123
141
|
? await (0, git_operations_1.loadInterfaceFromGit)(git, interfaceDirName)
|
|
124
142
|
: undefined;
|
|
@@ -127,7 +145,7 @@ function default_1() {
|
|
|
127
145
|
];
|
|
128
146
|
const alreadySelectedModule = modulesToInstall.find((module) => choices.includes(module.moduleName));
|
|
129
147
|
if (interfaceInfo && choices.length > 0 && !alreadySelectedModule) {
|
|
130
|
-
(0, cli_ui_1.info)(` ${chalk_1.default.yellow("•")} ${chalk_1.default.bold(imp)}`);
|
|
148
|
+
(0, cli_ui_1.info)(` ${chalk_1.default.yellow("•")} ${chalk_1.default.bold(describeUnresolvedImport(imp))}`);
|
|
131
149
|
(0, cli_ui_1.info)(` ${chalk_1.default.blue("↳")} Available modules that implement this interface:`);
|
|
132
150
|
interfaceInfo.manifest.modules.forEach((mod, i) => {
|
|
133
151
|
(0, cli_ui_1.info)(` ${i + 1}. ${chalk_1.default.bold(mod.name)}`);
|
|
@@ -136,7 +154,7 @@ function default_1() {
|
|
|
136
154
|
{
|
|
137
155
|
type: "list",
|
|
138
156
|
name: "moduleName",
|
|
139
|
-
message: `Select a module to add for ${
|
|
157
|
+
message: `Select a module to add for ${interfaceName}:`,
|
|
140
158
|
choices,
|
|
141
159
|
},
|
|
142
160
|
]);
|
|
@@ -146,27 +164,27 @@ function default_1() {
|
|
|
146
164
|
const mode = source.type;
|
|
147
165
|
const loaderIdentifier = registry.getLoaderIdentifier(source);
|
|
148
166
|
if (loaderIdentifier) {
|
|
149
|
-
(0, cli_ui_1.success)(` ${chalk_1.default.green("↳")} Selected module: ${chalk_1.default.bold(moduleName)} for ${
|
|
167
|
+
(0, cli_ui_1.success)(` ${chalk_1.default.green("↳")} Selected module: ${chalk_1.default.bold(moduleName)} for ${interfaceName}`);
|
|
150
168
|
modulesToInstall.push({
|
|
151
169
|
loaderIdentifier: resolveInstallIdentifier(source, loaderIdentifier),
|
|
152
170
|
mode,
|
|
153
171
|
moduleName,
|
|
154
|
-
imports: [
|
|
172
|
+
imports: [interfaceName],
|
|
155
173
|
env,
|
|
156
174
|
});
|
|
157
|
-
addedModules[moduleName] = [
|
|
175
|
+
addedModules[moduleName] = [interfaceName];
|
|
158
176
|
}
|
|
159
177
|
}
|
|
160
178
|
else {
|
|
161
|
-
(0, cli_ui_1.warning)(`
|
|
179
|
+
(0, cli_ui_1.warning)(` ${chalk_1.default.yellow("-")} ${unresolvedImportWarning(imp, git)}`);
|
|
162
180
|
}
|
|
163
181
|
}
|
|
164
182
|
else if (alreadySelectedModule) {
|
|
165
|
-
alreadySelectedModule.imports.push(
|
|
166
|
-
addedModules[alreadySelectedModule.moduleName].push(
|
|
183
|
+
alreadySelectedModule.imports.push(interfaceName);
|
|
184
|
+
addedModules[alreadySelectedModule.moduleName].push(interfaceName);
|
|
167
185
|
}
|
|
168
186
|
else {
|
|
169
|
-
(0, cli_ui_1.warning)(`
|
|
187
|
+
(0, cli_ui_1.warning)(` ${chalk_1.default.yellow("-")} ${unresolvedImportWarning(imp, git)}`);
|
|
170
188
|
}
|
|
171
189
|
}
|
|
172
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../../src/core/cli/commands/project/modules/install.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../../src/core/cli/commands/project/modules/install.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,8 @@ const plugin_management_1 = require("../plugin-management");
|
|
|
6
6
|
function default_1() {
|
|
7
7
|
return new commander_1.Command("update")
|
|
8
8
|
.description(`Update the AntelopeJS CLI and its official plugins\n` +
|
|
9
|
-
`Without an argument, updates the CLI and every installed official plugin.\n` +
|
|
9
|
+
`Without an argument, updates the CLI and every globally installed official plugin.\n` +
|
|
10
|
+
`Plugins resolved from a project node_modules are left to the project package manager.\n` +
|
|
10
11
|
`Updates run one after another and stop at the first failure.\n` +
|
|
11
12
|
`Requires a global installation of the CLI.`)
|
|
12
13
|
.argument("[plugin]", "Name of the official plugin to update")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/core/cli/commands/update.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/core/cli/commands/update.ts"],"names":[],"mappings":";;AAIA,4BAaC;AAjBD,yCAAoC;AAEpC,4DAAiD;AAEjD;IACE,OAAO,IAAI,mBAAO,CAAC,QAAQ,CAAC;SACzB,WAAW,CACV,sDAAsD;QACpD,sFAAsF;QACtF,yFAAyF;QACzF,gEAAgE;QAChE,4CAA4C,CAC/C;SACA,QAAQ,CAAC,UAAU,EAAE,uCAAuC,CAAC;SAC7D,MAAM,CAAC,KAAK,EAAE,MAAe,EAAE,EAAE;QAChC,OAAO,CAAC,QAAQ,GAAG,MAAM,IAAA,6BAAS,EAAC,MAAM,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,9 +1,18 @@
|
|
|
1
|
-
export
|
|
1
|
+
export declare const LOCAL_EXECUTABLE_SOURCE = "local";
|
|
2
|
+
export declare const PATH_EXECUTABLE_SOURCE = "path";
|
|
3
|
+
export type ExecutableSource = typeof LOCAL_EXECUTABLE_SOURCE | typeof PATH_EXECUTABLE_SOURCE;
|
|
4
|
+
export interface ResolvedExecutable {
|
|
5
|
+
path: string;
|
|
6
|
+
source: ExecutableSource;
|
|
7
|
+
}
|
|
8
|
+
export type ExecutableLookup = (name: string) => Promise<ResolvedExecutable | undefined>;
|
|
2
9
|
type ExecutablePredicate = (target: string) => Promise<boolean>;
|
|
3
10
|
export interface ExecutableLookupOptions {
|
|
11
|
+
cwd?: string;
|
|
4
12
|
path?: string;
|
|
5
13
|
platform?: NodeJS.Platform;
|
|
6
14
|
isExecutable?: ExecutablePredicate;
|
|
7
15
|
}
|
|
8
16
|
export declare function findExecutable(name: string, options?: ExecutableLookupOptions): Promise<string | undefined>;
|
|
17
|
+
export declare function resolveExecutable(name: string, options?: ExecutableLookupOptions): Promise<ResolvedExecutable | undefined>;
|
|
9
18
|
export {};
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PATH_EXECUTABLE_SOURCE = exports.LOCAL_EXECUTABLE_SOURCE = void 0;
|
|
3
4
|
exports.findExecutable = findExecutable;
|
|
5
|
+
exports.resolveExecutable = resolveExecutable;
|
|
4
6
|
const node_path_1 = require("node:path");
|
|
5
7
|
const promises_1 = require("node:fs/promises");
|
|
6
8
|
const package_manager_name_1 = require("./package-manager-name");
|
|
7
9
|
const WINDOWS_EXECUTABLE_EXTENSIONS = [".cmd", ".exe", ".bat"];
|
|
10
|
+
const NODE_MODULES_BIN = (0, node_path_1.join)("node_modules", ".bin");
|
|
11
|
+
exports.LOCAL_EXECUTABLE_SOURCE = "local";
|
|
12
|
+
exports.PATH_EXECUTABLE_SOURCE = "path";
|
|
8
13
|
const nodeIsExecutable = async (target) => {
|
|
9
14
|
try {
|
|
10
15
|
await (0, promises_1.access)(target, promises_1.constants.X_OK);
|
|
@@ -26,18 +31,50 @@ function executableCandidates(name, platform) {
|
|
|
26
31
|
function searchDirectories(path) {
|
|
27
32
|
return path.split(node_path_1.delimiter).filter((directory) => directory.length > 0);
|
|
28
33
|
}
|
|
29
|
-
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
34
|
+
function localBinDirectories(cwd) {
|
|
35
|
+
const directories = [];
|
|
36
|
+
let current = cwd;
|
|
37
|
+
let parent = (0, node_path_1.dirname)(current);
|
|
38
|
+
while (parent !== current) {
|
|
39
|
+
directories.push((0, node_path_1.join)(current, NODE_MODULES_BIN));
|
|
40
|
+
current = parent;
|
|
41
|
+
parent = (0, node_path_1.dirname)(current);
|
|
42
|
+
}
|
|
43
|
+
directories.push((0, node_path_1.join)(current, NODE_MODULES_BIN));
|
|
44
|
+
return directories;
|
|
45
|
+
}
|
|
46
|
+
async function findInDirectories(directories, inputs) {
|
|
33
47
|
for (const directory of directories) {
|
|
34
|
-
for (const candidate of candidates) {
|
|
48
|
+
for (const candidate of inputs.candidates) {
|
|
35
49
|
const executable = (0, node_path_1.join)(directory, candidate);
|
|
36
|
-
if (await isExecutable(executable)) {
|
|
50
|
+
if (await inputs.isExecutable(executable)) {
|
|
37
51
|
return executable;
|
|
38
52
|
}
|
|
39
53
|
}
|
|
40
54
|
}
|
|
41
55
|
return undefined;
|
|
42
56
|
}
|
|
57
|
+
function lookupInputs(name, options) {
|
|
58
|
+
return {
|
|
59
|
+
isExecutable: options.isExecutable ?? nodeIsExecutable,
|
|
60
|
+
candidates: executableCandidates(name, options.platform ?? process.platform),
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
async function findLocalExecutable(name, options = {}) {
|
|
64
|
+
return findInDirectories(localBinDirectories(options.cwd ?? process.cwd()), lookupInputs(name, options));
|
|
65
|
+
}
|
|
66
|
+
async function findExecutable(name, options = {}) {
|
|
67
|
+
return findInDirectories(searchDirectories(options.path ?? process.env.PATH ?? ""), lookupInputs(name, options));
|
|
68
|
+
}
|
|
69
|
+
async function resolveExecutable(name, options = {}) {
|
|
70
|
+
const local = await findLocalExecutable(name, options);
|
|
71
|
+
if (local) {
|
|
72
|
+
return { path: local, source: exports.LOCAL_EXECUTABLE_SOURCE };
|
|
73
|
+
}
|
|
74
|
+
const fromPath = await findExecutable(name, options);
|
|
75
|
+
if (!fromPath) {
|
|
76
|
+
return undefined;
|
|
77
|
+
}
|
|
78
|
+
return { path: fromPath, source: exports.PATH_EXECUTABLE_SOURCE };
|
|
79
|
+
}
|
|
43
80
|
//# sourceMappingURL=executable-lookup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executable-lookup.js","sourceRoot":"","sources":["../../../src/core/cli/executable-lookup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executable-lookup.js","sourceRoot":"","sources":["../../../src/core/cli/executable-lookup.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,8 @@ function createCLI(version) {
|
|
|
32
32
|
` update Update the CLI and its official plugins\n` +
|
|
33
33
|
` plugins List official plugins\n\n` +
|
|
34
34
|
chalk_1.default.yellow `Plugins:\n` +
|
|
35
|
-
`${(0, plugin_registry_1.formatOfficialPluginsHelp)()}\n
|
|
35
|
+
`${(0, plugin_registry_1.formatOfficialPluginsHelp)()}\n` +
|
|
36
|
+
` Resolved from the nearest node_modules/.bin, then from PATH.\n\n` +
|
|
36
37
|
chalk_1.default.yellow `Examples:\n` +
|
|
37
38
|
` $ ajs project init my-app Create a new project\n` +
|
|
38
39
|
` $ ajs module init my-module Create a new module\n` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"full-cli.js","sourceRoot":"","sources":["../../../src/core/cli/full-cli.ts"],"names":[],"mappings":";;;;;;AAqBA,
|
|
1
|
+
{"version":3,"file":"full-cli.js","sourceRoot":"","sources":["../../../src/core/cli/full-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ResolvedExecutable } from "./executable-lookup";
|
|
1
2
|
import { type OfficialPlugin } from "./plugin-registry";
|
|
2
3
|
import { type PluginPackageLookup } from "./plugin-package";
|
|
3
4
|
interface CompatiblePluginResult {
|
|
@@ -12,7 +13,7 @@ interface IncompatiblePluginResult {
|
|
|
12
13
|
pluginVersion?: string;
|
|
13
14
|
}
|
|
14
15
|
export type PluginCompatibility = CompatiblePluginResult | UnknownPluginPackageResult | IncompatiblePluginResult;
|
|
15
|
-
export declare function checkPluginCompatibility(
|
|
16
|
+
export declare function checkPluginCompatibility(executable: ResolvedExecutable, coreVersion: string, plugin: OfficialPlugin, lookup?: PluginPackageLookup): Promise<PluginCompatibility>;
|
|
16
17
|
export interface CompatibilityReport {
|
|
17
18
|
canDelegate: boolean;
|
|
18
19
|
messages: string[];
|
|
@@ -10,8 +10,8 @@ const semver_1 = __importDefault(require("semver"));
|
|
|
10
10
|
const core_version_1 = require("./core-version");
|
|
11
11
|
const plugin_registry_1 = require("./plugin-registry");
|
|
12
12
|
const plugin_package_1 = require("./plugin-package");
|
|
13
|
-
async function checkPluginCompatibility(
|
|
14
|
-
const packageJson = await (0, plugin_package_1.resolvePluginPackage)(plugin.package,
|
|
13
|
+
async function checkPluginCompatibility(executable, coreVersion, plugin, lookup = {}) {
|
|
14
|
+
const packageJson = await (0, plugin_package_1.resolvePluginPackage)(plugin.package, executable, lookup);
|
|
15
15
|
if (!packageJson) {
|
|
16
16
|
return { status: "unknown" };
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-compatibility.js","sourceRoot":"","sources":["../../../src/core/cli/plugin-compatibility.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"plugin-compatibility.js","sourceRoot":"","sources":["../../../src/core/cli/plugin-compatibility.ts"],"names":[],"mappings":";;;;;AA8BA,4DA0BC;AAsDD,kDAUC;AAxHD,kDAA0B;AAC1B,oDAA4B;AAE5B,iDAAmD;AAEnD,uDAA6E;AAC7E,qDAG0B;AAqBnB,KAAK,UAAU,wBAAwB,CAC5C,UAA8B,EAC9B,WAAmB,EACnB,MAAsB,EACtB,SAA8B,EAAE;IAEhC,MAAM,WAAW,GAAG,MAAM,IAAA,qCAAoB,EAC5C,MAAM,CAAC,OAAO,EACd,UAAU,EACV,MAAM,CACP,CAAC;IACF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IACD,MAAM,aAAa,GAAG,WAAW,CAAC,gBAAgB,EAAE,CAAC,gCAAiB,CAAC,CAAC;IACxE,IACE,CAAC,aAAa;QACd,gBAAM,CAAC,SAAS,CAAC,WAAW,EAAE,aAAa,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,EACzE,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IAClC,CAAC;IACD,OAAO;QACL,MAAM,EAAE,cAAc;QACtB,aAAa;QACb,aAAa,EAAE,WAAW,CAAC,OAAO;KACnC,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,MAAsB;IACzD,OAAO,sCAAsC,MAAM,CAAC,OAAO,qCAAqC,CAAC;AACnG,CAAC;AAED,SAAS,6BAA6B,CACpC,MAAsB,EACtB,WAAmB,EACnB,aAAuC;IAEvC,MAAM,aAAa,GAAG,aAAa,CAAC,aAAa;QAC/C,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,aAAa,CAAC,aAAa,EAAE;QACpD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;IACnB,OAAO;QACL,OAAO,IAAA,qCAAmB,EAAC,MAAM,CAAC,0CAA0C;QAC5E,GAAG,aAAa,aAAa,gCAAiB,IAAI,aAAa,CAAC,aAAa,SAAS,gCAAiB,IAAI,WAAW,gBAAgB;QACtI,OAAO,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,uBAAuB,eAAK,CAAC,IAAI,CAAC,cAAc,MAAM,CAAC,IAAI,EAAE,CAAC,6BAA6B;KAC3H,CAAC;AACJ,CAAC;AAaD,MAAM,uBAAuB,GAGzB;IACF,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACvD,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACpB,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;KAChD,CAAC;IACF,YAAY,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,CACnD,aAAa,CAAC,MAAM,KAAK,cAAc;QACrC,CAAC,CAAC;YACE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,6BAA6B,CACrC,MAAM,EACN,WAAW,EACX,aAAa,CACd;SACF;QACH,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;CAC1C,CAAC;AAEF,SAAgB,mBAAmB,CACjC,MAAsB,EACtB,WAAmB,EACnB,aAAkC;IAElC,OAAO,uBAAuB,CAAC,aAAa,CAAC,MAAM,CAAC,CAClD,MAAM,EACN,WAAW,EACX,aAAa,CACd,CAAC;AACJ,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { type CommandOutput } from "./cli-ui";
|
|
2
2
|
import type { InheritedProcessOptions } from "./process-runner";
|
|
3
|
-
import { type ExecutableLookup } from "./executable-lookup";
|
|
4
3
|
import { type PluginPackageLookup } from "./plugin-package";
|
|
5
4
|
import { type OfficialPlugin } from "./plugin-registry";
|
|
6
5
|
import { type GlobalInstallationDetector } from "./global-package-manager";
|
|
6
|
+
import { type ExecutableLookup, type ExecutableSource } from "./executable-lookup";
|
|
7
7
|
export interface PluginStatus {
|
|
8
8
|
plugin: OfficialPlugin;
|
|
9
9
|
executablePath?: string;
|
|
10
|
+
source?: ExecutableSource;
|
|
10
11
|
version?: string;
|
|
11
12
|
}
|
|
12
13
|
export interface PluginStatusDependencies {
|
|
@@ -11,31 +11,44 @@ const core_version_1 = require("./core-version");
|
|
|
11
11
|
const command_runner_1 = require("./command-runner");
|
|
12
12
|
const cli_ui_1 = require("./cli-ui");
|
|
13
13
|
const exit_codes_1 = require("./exit-codes");
|
|
14
|
-
const executable_lookup_1 = require("./executable-lookup");
|
|
15
14
|
const plugin_package_1 = require("./plugin-package");
|
|
16
15
|
const plugin_registry_1 = require("./plugin-registry");
|
|
17
16
|
const global_package_manager_1 = require("./global-package-manager");
|
|
17
|
+
const executable_lookup_1 = require("./executable-lookup");
|
|
18
18
|
const NOT_GLOBAL_MESSAGES = [
|
|
19
19
|
"ajs is not installed globally; update it in the project instead.",
|
|
20
20
|
`Run your project package manager to update ${core_version_1.CORE_PACKAGE_NAME} in this project.`,
|
|
21
21
|
];
|
|
22
22
|
async function readPluginStatus(plugin, dependencies) {
|
|
23
|
-
const lookupExecutable = dependencies.lookupExecutable ?? executable_lookup_1.
|
|
24
|
-
const
|
|
25
|
-
if (!
|
|
23
|
+
const lookupExecutable = dependencies.lookupExecutable ?? executable_lookup_1.resolveExecutable;
|
|
24
|
+
const executable = await lookupExecutable(plugin.bin);
|
|
25
|
+
if (!executable) {
|
|
26
26
|
return { plugin };
|
|
27
27
|
}
|
|
28
|
-
const packageJson = await (0, plugin_package_1.resolvePluginPackage)(plugin.package,
|
|
29
|
-
return {
|
|
28
|
+
const packageJson = await (0, plugin_package_1.resolvePluginPackage)(plugin.package, executable, dependencies.packageLookup);
|
|
29
|
+
return {
|
|
30
|
+
plugin,
|
|
31
|
+
executablePath: executable.path,
|
|
32
|
+
source: executable.source,
|
|
33
|
+
version: packageJson?.version,
|
|
34
|
+
};
|
|
30
35
|
}
|
|
31
36
|
async function getPluginStatuses(dependencies = {}) {
|
|
32
37
|
return Promise.all((0, plugin_registry_1.listOfficialPlugins)().map((plugin) => readPluginStatus(plugin, dependencies)));
|
|
33
38
|
}
|
|
39
|
+
const RESOLUTION_LABELS = {
|
|
40
|
+
[executable_lookup_1.LOCAL_EXECUTABLE_SOURCE]: (path) => `local (${path})`,
|
|
41
|
+
[executable_lookup_1.PATH_EXECUTABLE_SOURCE]: () => "global",
|
|
42
|
+
};
|
|
43
|
+
function formatResolution(status) {
|
|
44
|
+
if (!status.executablePath || !status.source) {
|
|
45
|
+
return chalk_1.default.dim("not installed");
|
|
46
|
+
}
|
|
47
|
+
const version = status.version ? ` (${status.version})` : "";
|
|
48
|
+
return chalk_1.default.green(`${RESOLUTION_LABELS[status.source](status.executablePath)}${version}`);
|
|
49
|
+
}
|
|
34
50
|
function formatPluginStatus(status) {
|
|
35
|
-
|
|
36
|
-
? chalk_1.default.green(`installed${status.version ? ` (${status.version})` : ""}`)
|
|
37
|
-
: chalk_1.default.dim("not installed");
|
|
38
|
-
return ` ${chalk_1.default.cyan(status.plugin.name.padEnd(plugin_registry_1.PLUGIN_NAME_COLUMN_WIDTH))} ${status.plugin.package} - ${state}\n ${chalk_1.default.dim(status.plugin.description)}`;
|
|
51
|
+
return ` ${chalk_1.default.cyan(status.plugin.name.padEnd(plugin_registry_1.PLUGIN_NAME_COLUMN_WIDTH))} ${status.plugin.package} - ${formatResolution(status)}\n ${chalk_1.default.dim(status.plugin.description)}`;
|
|
39
52
|
}
|
|
40
53
|
async function updatePackage(packageName, installation, dependencies) {
|
|
41
54
|
const output = dependencies.output ?? cli_ui_1.consoleOutput;
|
|
@@ -56,7 +69,7 @@ async function resolveUpdateTargets(pluginName, dependencies) {
|
|
|
56
69
|
return [
|
|
57
70
|
core_version_1.CORE_PACKAGE_NAME,
|
|
58
71
|
...statuses
|
|
59
|
-
.filter((status) => status.
|
|
72
|
+
.filter((status) => status.source === executable_lookup_1.PATH_EXECUTABLE_SOURCE)
|
|
60
73
|
.map((status) => status.plugin.package),
|
|
61
74
|
];
|
|
62
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-management.js","sourceRoot":"","sources":["../../../src/core/cli/plugin-management.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"plugin-management.js","sourceRoot":"","sources":["../../../src/core/cli/plugin-management.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { PackageManagerName } from "./package-manager-name";
|
|
2
|
+
import { type ResolvedExecutable } from "./executable-lookup";
|
|
2
3
|
import { type GlobalRootResolver } from "./global-package-manager";
|
|
3
4
|
export interface PluginPackageReader {
|
|
4
5
|
realpath(target: string): Promise<string>;
|
|
@@ -14,4 +15,4 @@ export interface PluginPackageLookup {
|
|
|
14
15
|
packageManager?: PackageManagerName;
|
|
15
16
|
resolveGlobalRoot?: GlobalRootResolver;
|
|
16
17
|
}
|
|
17
|
-
export declare function resolvePluginPackage(packageName: string,
|
|
18
|
+
export declare function resolvePluginPackage(packageName: string, executable: ResolvedExecutable, lookup?: PluginPackageLookup): Promise<PluginPackage | undefined>;
|
|
@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.resolvePluginPackage = resolvePluginPackage;
|
|
4
4
|
const node_path_1 = require("node:path");
|
|
5
5
|
const promises_1 = require("node:fs/promises");
|
|
6
|
+
const executable_lookup_1 = require("./executable-lookup");
|
|
6
7
|
const global_package_manager_1 = require("./global-package-manager");
|
|
7
8
|
const PACKAGE_JSON = "package.json";
|
|
9
|
+
const NODE_MODULES = "node_modules";
|
|
8
10
|
const MAX_LOOKUP_DEPTH = 12;
|
|
9
11
|
const nodePluginPackageReader = {
|
|
10
12
|
realpath: (target) => (0, promises_1.realpath)(target),
|
|
@@ -26,11 +28,19 @@ async function resolveRealPath(target, reader) {
|
|
|
26
28
|
return target;
|
|
27
29
|
}
|
|
28
30
|
}
|
|
31
|
+
async function readPackageFromDirectory(packageName, directory, reader) {
|
|
32
|
+
const own = await readPackageJson(directory, reader);
|
|
33
|
+
if (own?.name === packageName) {
|
|
34
|
+
return own;
|
|
35
|
+
}
|
|
36
|
+
const installed = await readPackageJson((0, node_path_1.join)(directory, NODE_MODULES, packageName), reader);
|
|
37
|
+
return installed?.name === packageName ? installed : undefined;
|
|
38
|
+
}
|
|
29
39
|
async function readPackageFromBinary(packageName, executablePath, reader) {
|
|
30
40
|
let directory = (0, node_path_1.dirname)(await resolveRealPath(executablePath, reader));
|
|
31
41
|
for (let depth = 0; depth < MAX_LOOKUP_DEPTH; depth += 1) {
|
|
32
|
-
const packageJson = await
|
|
33
|
-
if (packageJson
|
|
42
|
+
const packageJson = await readPackageFromDirectory(packageName, directory, reader);
|
|
43
|
+
if (packageJson) {
|
|
34
44
|
return packageJson;
|
|
35
45
|
}
|
|
36
46
|
const parent = (0, node_path_1.dirname)(directory);
|
|
@@ -49,9 +59,12 @@ async function readPackageFromGlobalRoot(packageName, lookup, reader) {
|
|
|
49
59
|
}
|
|
50
60
|
return readPackageJson((0, node_path_1.join)(globalRoot, packageName), reader);
|
|
51
61
|
}
|
|
52
|
-
async function resolvePluginPackage(packageName,
|
|
62
|
+
async function resolvePluginPackage(packageName, executable, lookup = {}) {
|
|
53
63
|
const reader = lookup.reader ?? nodePluginPackageReader;
|
|
54
|
-
|
|
55
|
-
|
|
64
|
+
const fromBinary = await readPackageFromBinary(packageName, executable.path, reader);
|
|
65
|
+
if (fromBinary || executable.source !== executable_lookup_1.PATH_EXECUTABLE_SOURCE) {
|
|
66
|
+
return fromBinary;
|
|
67
|
+
}
|
|
68
|
+
return readPackageFromGlobalRoot(packageName, lookup, reader);
|
|
56
69
|
}
|
|
57
70
|
//# sourceMappingURL=plugin-package.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-package.js","sourceRoot":"","sources":["../../../src/core/cli/plugin-package.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"plugin-package.js","sourceRoot":"","sources":["../../../src/core/cli/plugin-package.ts"],"names":[],"mappings":"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"}
|
package/dist/core/cli/plugin.js
CHANGED
|
@@ -38,9 +38,9 @@ const core_version_1 = require("./core-version");
|
|
|
38
38
|
const cli_ui_1 = require("./cli-ui");
|
|
39
39
|
const command_runner_1 = require("./command-runner");
|
|
40
40
|
const exit_codes_1 = require("./exit-codes");
|
|
41
|
-
const executable_lookup_1 = require("./executable-lookup");
|
|
42
41
|
const plugin_compatibility_1 = require("./plugin-compatibility");
|
|
43
42
|
const plugin_registry_1 = require("./plugin-registry");
|
|
43
|
+
const executable_lookup_1 = require("./executable-lookup");
|
|
44
44
|
const global_package_manager_1 = require("./global-package-manager");
|
|
45
45
|
const PLUGIN_PREFIX = "ajs-";
|
|
46
46
|
const NOT_DELEGATED = { isDelegated: false };
|
|
@@ -61,7 +61,7 @@ function createContext(dependencies) {
|
|
|
61
61
|
const packageManager = dependencies.packageManager ?? (0, global_package_manager_1.detectGlobalPackageManager)();
|
|
62
62
|
return {
|
|
63
63
|
processOptions: dependencies.processOptions ?? {},
|
|
64
|
-
lookupExecutable: dependencies.lookupExecutable ?? executable_lookup_1.
|
|
64
|
+
lookupExecutable: dependencies.lookupExecutable ?? executable_lookup_1.resolveExecutable,
|
|
65
65
|
packageLookup: dependencies.packageLookup ?? { packageManager },
|
|
66
66
|
confirmInstall: dependencies.confirmInstall ?? promptForInstall,
|
|
67
67
|
isInteractive: dependencies.isInteractive ?? isInteractiveTerminal,
|
|
@@ -115,7 +115,7 @@ async function isCompatible(executable, plugin, context) {
|
|
|
115
115
|
return report.canDelegate;
|
|
116
116
|
}
|
|
117
117
|
async function runPlugin(executable, args, context) {
|
|
118
|
-
return delegated(await (0, command_runner_1.runCommand)(executable, args.slice(1), context.output, context.processOptions));
|
|
118
|
+
return delegated(await (0, command_runner_1.runCommand)(executable.path, args.slice(1), context.output, context.processOptions));
|
|
119
119
|
}
|
|
120
120
|
async function delegateToOfficialPlugin(plugin, executable, args, context) {
|
|
121
121
|
const resolved = executable ?? (await installAndLocate(plugin, context));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/core/cli/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/core/cli/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,8 +53,8 @@ function registerLocalDownloader(registry, deps = {}) {
|
|
|
53
53
|
const installCommand = options?.reload
|
|
54
54
|
? (source.reloadCommand ?? source.installCommand)
|
|
55
55
|
: source.installCommand;
|
|
56
|
-
await (0, utils_1.runInstallCommands)(exec, Logger, formattedPath, formattedPath, installCommand);
|
|
57
56
|
const name = source.id ?? path.basename(formattedPath);
|
|
57
|
+
await (0, utils_1.runInstallCommands)(exec, Logger, name, formattedPath, installCommand);
|
|
58
58
|
const manifest = await module_manifest_1.ModuleManifest.create(formattedPath, source, name, fs);
|
|
59
59
|
return [manifest];
|
|
60
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/core/downloaders/local.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA,0DA+CC;AAnED,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,CAAC,KAAK,CACV,6CAA6C,aAAa,EAAE,CAC7D,CAAC;YACF,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,
|
|
1
|
+
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/core/downloaders/local.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA,0DA+CC;AAnED,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,CAAC,KAAK,CACV,6CAA6C,aAAa,EAAE,CAC7D,CAAC;YACF,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"}
|
|
@@ -44,6 +44,7 @@ const semver_1 = require("semver");
|
|
|
44
44
|
const command_1 = require("../cli/command");
|
|
45
45
|
const module_cache_1 = require("../module-cache");
|
|
46
46
|
const filesystem_1 = require("../filesystem");
|
|
47
|
+
const utils_1 = require("./utils");
|
|
47
48
|
const package_manager_1 = require("../cli/package-manager");
|
|
48
49
|
const module_manifest_1 = require("../module-manifest");
|
|
49
50
|
const Logger = new logging_1.Logging.Channel("loader.package");
|
|
@@ -170,7 +171,7 @@ async function downloadPackage(cache, source, version, ctx) {
|
|
|
170
171
|
const cmd = await ctx.getInstallCommand(folder);
|
|
171
172
|
const installResult = await ctx.exec(cmd, { cwd: folder });
|
|
172
173
|
if (installResult.code !== 0) {
|
|
173
|
-
throw new Error(
|
|
174
|
+
throw new Error((0, utils_1.installFailureMessage)(`${source.package}@${version}`, cmd, installResult.stderr || installResult.stdout));
|
|
174
175
|
}
|
|
175
176
|
await cache.commitVersion(source.package, manifest.version);
|
|
176
177
|
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,4 +1,5 @@
|
|
|
1
1
|
import type { ModuleInstallCommand } from "@antelopejs/interface-core/config";
|
|
2
2
|
import type { CommandRunner, DebugLogger } from "./types";
|
|
3
|
+
export declare function installFailureMessage(label: string, command: string, details: string): string;
|
|
3
4
|
export declare function runInstallCommands(exec: CommandRunner, logger: DebugLogger, label: string, folder: string, installCommand?: ModuleInstallCommand): Promise<void>;
|
|
4
5
|
export declare function expandHome(input: string): string;
|
|
@@ -33,9 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.installFailureMessage = installFailureMessage;
|
|
36
37
|
exports.runInstallCommands = runInstallCommands;
|
|
37
38
|
exports.expandHome = expandHome;
|
|
38
39
|
const os = __importStar(require("node:os"));
|
|
40
|
+
const cli_ui_1 = require("../cli/cli-ui");
|
|
39
41
|
const terminal_display_1 = require("../cli/terminal-display");
|
|
40
42
|
function normalizeCommands(installCommand) {
|
|
41
43
|
if (!installCommand) {
|
|
@@ -43,6 +45,24 @@ function normalizeCommands(installCommand) {
|
|
|
43
45
|
}
|
|
44
46
|
return Array.isArray(installCommand) ? installCommand : [installCommand];
|
|
45
47
|
}
|
|
48
|
+
function installFailureMessage(label, command, details) {
|
|
49
|
+
const reason = details.trim();
|
|
50
|
+
return `Failed to install dependencies for ${label} (command: ${command})${reason ? `: ${reason}` : ""}`;
|
|
51
|
+
}
|
|
52
|
+
async function runInstallCommand(exec, folder, command) {
|
|
53
|
+
try {
|
|
54
|
+
const result = await exec(command, { cwd: folder });
|
|
55
|
+
if (result.code === 0) {
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
return (result.stderr ||
|
|
59
|
+
result.stdout ||
|
|
60
|
+
`command exited with code ${result.code}`);
|
|
61
|
+
}
|
|
62
|
+
catch (err) {
|
|
63
|
+
return err instanceof Error ? err.message : String(err);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
46
66
|
async function runInstallCommands(exec, logger, label, folder, installCommand) {
|
|
47
67
|
const commands = normalizeCommands(installCommand);
|
|
48
68
|
if (commands.length === 0) {
|
|
@@ -51,11 +71,17 @@ async function runInstallCommands(exec, logger, label, folder, installCommand) {
|
|
|
51
71
|
await terminal_display_1.terminalDisplay.startSpinner(`Installing dependencies for ${label}`);
|
|
52
72
|
for (const command of commands) {
|
|
53
73
|
logger.Debug(`Executing command: ${command}`);
|
|
54
|
-
const
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
-
|
|
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);
|
|
58
83
|
}
|
|
84
|
+
throw new Error(message);
|
|
59
85
|
}
|
|
60
86
|
await terminal_display_1.terminalDisplay.stopSpinner(`Dependencies installed for ${label}`);
|
|
61
87
|
}
|
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.8.0",
|
|
4
4
|
"description": "TypeScript framework extending hexagonal architecture across your application and its ecosystem through explicit contracts and replaceable modules.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"antelopejs",
|