@antelopejs/core 1.7.2 → 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/commands/plugins.js +5 -2
- package/dist/core/cli/commands/plugins.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/package.json +1 -1
|
@@ -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"}
|
|
@@ -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":";;;AAwHA,wCAQC;AAMD,8CAaC;AAnJD,yCAAqD;AACrD,+CAAqD;AAErD,iEAA0D;AAE1D,MAAM,6BAA6B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAC/D,MAAM,gBAAgB,GAAG,IAAA,gBAAI,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AAEzC,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,sBAAsB,GAAG,MAAM,CAAC;AA6B7C,MAAM,gBAAgB,GAAwB,KAAK,EAAE,MAAM,EAAE,EAAE;IAC7D,IAAI,CAAC;QACH,MAAM,IAAA,iBAAM,EAAC,MAAM,EAAE,oBAAS,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,SAAS,oBAAoB,CAC3B,IAAY,EACZ,QAAyB;IAEzB,IAAI,QAAQ,KAAK,uCAAgB,EAAE,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IACD,OAAO;QACL,IAAI;QACJ,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAAE,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,KAAK,CAAC,qBAAS,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW;IACtC,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,IAAI,OAAO,GAAG,GAAG,CAAC;IAClB,IAAI,MAAM,GAAG,IAAA,mBAAO,EAAC,OAAO,CAAC,CAAC;IAE9B,OAAO,MAAM,KAAK,OAAO,EAAE,CAAC;QAC1B,WAAW,CAAC,IAAI,CAAC,IAAA,gBAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAClD,OAAO,GAAG,MAAM,CAAC;QACjB,MAAM,GAAG,IAAA,mBAAO,EAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,WAAW,CAAC,IAAI,CAAC,IAAA,gBAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAClD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,WAAqB,EACrB,MAA8B;IAE9B,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;QACpC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAG,IAAA,gBAAI,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAC9C,IAAI,MAAM,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,OAAO,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,YAAY,CACnB,IAAY,EACZ,OAAgC;IAEhC,OAAO;QACL,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,gBAAgB;QACtD,UAAU,EAAE,oBAAoB,CAC9B,IAAI,EACJ,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CACrC;KACF,CAAC;AACJ,CAAC;AAMD,KAAK,UAAU,mBAAmB,CAChC,IAAY,EACZ,UAAmC,EAAE;IAErC,OAAO,iBAAiB,CACtB,mBAAmB,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,EACjD,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,IAAY,EACZ,UAAmC,EAAE;IAErC,OAAO,iBAAiB,CACtB,iBAAiB,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EACzD,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC;AAMM,KAAK,UAAU,iBAAiB,CACrC,IAAY,EACZ,UAAmC,EAAE;IAErC,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,+BAAuB,EAAE,CAAC;IAC1D,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,8BAAsB,EAAE,CAAC;AAC5D,CAAC"}
|
|
@@ -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":";;;;;;AAqBA,8BA4BC;AAED,4CAUC;AA7DD,kDAA0B;AAC1B,yCAAoC;AAEpC,qCAAmC;AACnC,qCAAyC;AACzC,+DAA0C;AAC1C,+DAA0C;AAC1C,+DAA0C;AAC1C,iEAA4C;AAC5C,iEAA4C;AAC5C,iDAAgD;AAChD,mDAAiD;AACjD,uDAA8D;AAC9D,2CAIuB;AAEvB,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEjC,SAAgB,SAAS,CAAC,OAAe;IACvC,OAAO,IAAI,mBAAO,EAAE;SACjB,IAAI,CAAC,KAAK,CAAC;SACX,WAAW,CACV,eAAK,CAAC,IAAI,CAAA,oBAAoB,OAAO,KAAK;QACxC,oFAAoF;QACpF,eAAK,CAAC,MAAM,CAAA,aAAa;QACzB,sDAAsD;QACtD,kEAAkE;QAClE,uCAAuC;QACvC,wDAAwD;QACxD,wCAAwC;QACxC,eAAK,CAAC,MAAM,CAAA,YAAY;QACxB,GAAG,IAAA,2CAAyB,GAAE,IAAI;QAClC,oEAAoE;QACpE,eAAK,CAAC,MAAM,CAAA,aAAa;QACzB,4DAA4D;QAC5D,2DAA2D;QAC3D,0DAA0D,CAC7D;SACA,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,4BAA4B,CAAC;SAC/D,SAAS,CAAC,gBAAO,CAAC,OAAO,CAAC;SAC1B,UAAU,CAAC,IAAA,iBAAU,GAAE,CAAC;SACxB,UAAU,CAAC,IAAA,gBAAS,GAAE,CAAC;SACvB,UAAU,CAAC,IAAA,gBAAS,GAAE,CAAC;SACvB,UAAU,CAAC,IAAA,gBAAS,GAAE,CAAC;SACvB,UAAU,CAAC,IAAA,iBAAU,GAAE,CAAC;SACxB,WAAW,CAAC,GAAG,iBAAiB,YAAY,EAAE,0BAA0B,CAAC,CAAC;AAC/E,CAAC;AAED,SAAgB,gBAAgB,CAC9B,UAAmB,SAAS,CAAC,IAAA,6BAAc,GAAE,CAAC;IAE9C,OAAO;QACL,iBAAiB;QACjB,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,EAAE;YACd,GAAG,OAAO,CAAC,OAAO,EAAE;SACrB,CAAC;KACH,CAAC;AACJ,CAAC;AAGM,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;IAC/B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAA,6BAAc,GAAE,CAAC;QAGjC,IAAA,qCAA2B,EAAC,8BAAoB,CAAC,CAAC;QAGlD,MAAM,IAAA,8BAAc,EAAC,OAAO,CAAC,CAAC;QAG9B,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC7B,IAAA,sBAAa,EAAC,YAAY,CAAC,CAAC;QAC9B,CAAC;QAED,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAGnC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAE3B,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,MAAM,OAAO,IAAI,OAAmB,EAAE,CAAC;gBAC1C,IAAA,0BAAgB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEf,IACE,KAAK;YACL,OAAO,KAAK,KAAK,QAAQ;YACzB,MAAM,IAAI,KAAK;YACf,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAChC,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAGD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAxCW,QAAA,MAAM,UAwCjB"}
|
|
@@ -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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"}
|
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",
|