@antelopejs/core 1.4.3 → 1.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/cli/commands/project/modules/add.d.ts +6 -1
- package/dist/core/cli/commands/project/modules/add.js +97 -60
- package/dist/core/cli/commands/project/modules/add.js.map +1 -1
- package/dist/core/cli/commands/project/modules/install.d.ts +2 -0
- package/dist/core/cli/commands/project/modules/install.js +22 -3
- package/dist/core/cli/commands/project/modules/install.js.map +1 -1
- package/dist/core/cli/commands/project/modules/update.js +2 -2
- package/dist/core/cli/commands/project/modules/update.js.map +1 -1
- package/dist/core/downloaders/git.js +99 -23
- package/dist/core/downloaders/git.js.map +1 -1
- package/dist/core/downloaders/package.js +146 -35
- package/dist/core/downloaders/package.js.map +1 -1
- package/dist/core/module-cache.d.ts +4 -3
- package/dist/core/module-cache.js +20 -21
- package/dist/core/module-cache.js.map +1 -1
- package/dist/core/version-checker.d.ts +5 -0
- package/dist/core/version-checker.js +47 -1
- package/dist/core/version-checker.js.map +1 -1
- package/dist/core/watch/file-watcher.d.ts +11 -0
- package/dist/core/watch/file-watcher.js +124 -5
- package/dist/core/watch/file-watcher.js.map +1 -1
- package/dist/index.js +10 -1
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,11 @@ interface AddOptions {
|
|
|
7
7
|
ignoreCache?: boolean;
|
|
8
8
|
}
|
|
9
9
|
export declare const handlers: Map<string, (module: string, options: AddOptions) => Promise<[string, AntelopeModuleConfig | string]>>;
|
|
10
|
-
export
|
|
10
|
+
export interface AddCommandResult {
|
|
11
|
+
added: string[];
|
|
12
|
+
skipped: string[];
|
|
13
|
+
failed: string[];
|
|
14
|
+
}
|
|
15
|
+
export declare function projectModulesAddCommand(modules: string[], options: AddOptions): Promise<AddCommandResult | undefined>;
|
|
11
16
|
export default function (): Command;
|
|
12
17
|
export {};
|
|
@@ -19,11 +19,71 @@ const package_1 = require("../../../../downloaders/package");
|
|
|
19
19
|
const registry_1 = require("../../../../downloaders/registry");
|
|
20
20
|
const filesystem_1 = require("../../../../filesystem");
|
|
21
21
|
const module_cache_1 = require("../../../../module-cache");
|
|
22
|
+
const version_checker_1 = require("../../../../version-checker");
|
|
22
23
|
const cli_ui_1 = require("../../../cli-ui");
|
|
23
24
|
const command_1 = require("../../../command");
|
|
24
25
|
const common_1 = require("../../../common");
|
|
25
|
-
const
|
|
26
|
+
const LOCAL_MODULE_WATCH_DIRS = ["src"];
|
|
27
|
+
const LOCAL_MODULE_BUILD_COMMAND = ["npx tsc"];
|
|
26
28
|
exports.handlers = new Map();
|
|
29
|
+
async function downloadModuleToCache(registry, cache, projectPath, moduleName, moduleConfig) {
|
|
30
|
+
const loaderIdentifier = registry.getLoaderIdentifier(moduleConfig.source);
|
|
31
|
+
if (!loaderIdentifier) {
|
|
32
|
+
return true;
|
|
33
|
+
}
|
|
34
|
+
(0, cli_ui_1.info)(`Downloading module ${chalk_1.default.bold(moduleName)} to cache...`);
|
|
35
|
+
try {
|
|
36
|
+
const moduleManifests = await registry.load(projectPath, cache, {
|
|
37
|
+
...moduleConfig.source,
|
|
38
|
+
id: moduleName,
|
|
39
|
+
});
|
|
40
|
+
if (moduleManifests.length > 0) {
|
|
41
|
+
const manifest = moduleManifests[0];
|
|
42
|
+
if (manifest.manifest.antelopeJs?.defaultConfig) {
|
|
43
|
+
moduleConfig.config = manifest.manifest.antelopeJs.defaultConfig;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
(0, cli_ui_1.success)(`Successfully downloaded module ${chalk_1.default.bold(moduleName)} to cache`);
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
catch (err) {
|
|
50
|
+
const errorMessage = err instanceof Error ? err.message : String(err);
|
|
51
|
+
(0, cli_ui_1.error)(`Failed to download module ${chalk_1.default.bold(moduleName)}: ${errorMessage}`);
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
async function displayAddResults(added, skipped, failed) {
|
|
56
|
+
let resultContent = "";
|
|
57
|
+
if (added.length > 0) {
|
|
58
|
+
resultContent += `${chalk_1.default.green.bold("Successfully added:")}\n`;
|
|
59
|
+
added.forEach((name) => {
|
|
60
|
+
resultContent += ` • ${chalk_1.default.bold(name)}\n`;
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
if (skipped.length > 0) {
|
|
64
|
+
if (resultContent)
|
|
65
|
+
resultContent += "\n";
|
|
66
|
+
resultContent += `${chalk_1.default.yellow.bold("Skipped:")}\n`;
|
|
67
|
+
skipped.forEach((name) => {
|
|
68
|
+
resultContent += ` • ${chalk_1.default.dim(name)}\n`;
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
if (failed.length > 0) {
|
|
72
|
+
if (resultContent)
|
|
73
|
+
resultContent += "\n";
|
|
74
|
+
resultContent += `${chalk_1.default.red.bold("Failed:")}\n`;
|
|
75
|
+
failed.forEach((name) => {
|
|
76
|
+
resultContent += ` • ${chalk_1.default.bold(name)}\n`;
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
if (resultContent) {
|
|
80
|
+
const borderColor = added.length > 0 ? "green" : failed.length > 0 ? "red" : "yellow";
|
|
81
|
+
await (0, cli_ui_1.displayBox)(resultContent, "📦 Module Addition Results", {
|
|
82
|
+
padding: 1,
|
|
83
|
+
borderColor,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
27
87
|
async function projectModulesAddCommand(modules, options) {
|
|
28
88
|
console.log("");
|
|
29
89
|
(0, cli_ui_1.info)(`Adding modules to your project...`);
|
|
@@ -44,6 +104,7 @@ async function projectModulesAddCommand(modules, options) {
|
|
|
44
104
|
(0, local_folder_1.registerLocalFolderDownloader)(registry, { fs });
|
|
45
105
|
(0, package_1.registerPackageDownloader)(registry, { fs, exec: command_1.ExecuteCMD });
|
|
46
106
|
(0, git_1.registerGitDownloader)(registry, { fs, exec: command_1.ExecuteCMD });
|
|
107
|
+
const failed = [];
|
|
47
108
|
let sources = await Promise.all(modules.map((module) => {
|
|
48
109
|
const modulePath = options.mode === "local" || options.mode === "dir"
|
|
49
110
|
? node_path_1.default.isAbsolute(module)
|
|
@@ -60,6 +121,7 @@ async function projectModulesAddCommand(modules, options) {
|
|
|
60
121
|
(0, cli_ui_1.error)(err instanceof Error
|
|
61
122
|
? err
|
|
62
123
|
: `Failed to add module "${module}": ${String(err)}`);
|
|
124
|
+
failed.push(module);
|
|
63
125
|
return null;
|
|
64
126
|
});
|
|
65
127
|
}));
|
|
@@ -88,41 +150,25 @@ async function projectModulesAddCommand(modules, options) {
|
|
|
88
150
|
return null;
|
|
89
151
|
const [moduleName, moduleConfig] = source;
|
|
90
152
|
if (antelopeConfig.modules[moduleName]) {
|
|
91
|
-
return { moduleName, moduleConfig, skipped: true };
|
|
153
|
+
return { moduleName, moduleConfig, skipped: true, failed: false };
|
|
92
154
|
}
|
|
93
|
-
|
|
155
|
+
const downloadable = typeof moduleConfig === "object" &&
|
|
94
156
|
moduleConfig !== null &&
|
|
95
|
-
"source" in moduleConfig
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
const moduleManifests = await registry.load(resolvedProjectPath, cache, {
|
|
101
|
-
...moduleConfig.source,
|
|
102
|
-
id: moduleName,
|
|
103
|
-
});
|
|
104
|
-
if (moduleManifests.length > 0) {
|
|
105
|
-
const manifest = moduleManifests[0];
|
|
106
|
-
if (manifest.manifest.antelopeJs?.defaultConfig) {
|
|
107
|
-
moduleConfig.config = manifest.manifest.antelopeJs.defaultConfig;
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
(0, cli_ui_1.success)(`Successfully downloaded module ${chalk_1.default.bold(moduleName)} to cache`);
|
|
111
|
-
}
|
|
112
|
-
catch (error) {
|
|
113
|
-
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
114
|
-
(0, cli_ui_1.warning)(`Failed to download module ${chalk_1.default.bold(moduleName)} to cache: ${errorMessage}`);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
return { moduleName, moduleConfig, skipped: false };
|
|
157
|
+
"source" in moduleConfig;
|
|
158
|
+
const downloaded = downloadable
|
|
159
|
+
? await downloadModuleToCache(registry, cache, resolvedProjectPath, moduleName, moduleConfig)
|
|
160
|
+
: true;
|
|
161
|
+
return { moduleName, moduleConfig, skipped: false, failed: !downloaded };
|
|
119
162
|
});
|
|
120
163
|
const moduleResults = await Promise.all(moduleLoadingTasks);
|
|
121
164
|
for (const result of moduleResults) {
|
|
122
165
|
if (!result)
|
|
123
166
|
continue;
|
|
124
|
-
const { moduleName, moduleConfig, skipped: wasSkipped } = result;
|
|
125
|
-
if (
|
|
167
|
+
const { moduleName, moduleConfig, skipped: wasSkipped, failed: hasFailed, } = result;
|
|
168
|
+
if (hasFailed) {
|
|
169
|
+
failed.push(moduleName);
|
|
170
|
+
}
|
|
171
|
+
else if (wasSkipped) {
|
|
126
172
|
skipped.push(moduleName);
|
|
127
173
|
}
|
|
128
174
|
else {
|
|
@@ -130,28 +176,14 @@ async function projectModulesAddCommand(modules, options) {
|
|
|
130
176
|
added.push(moduleName);
|
|
131
177
|
}
|
|
132
178
|
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
if (added.length > 0) {
|
|
136
|
-
resultContent += `${chalk_1.default.green.bold("Successfully added:")}\n`;
|
|
137
|
-
added.forEach((name) => {
|
|
138
|
-
resultContent += ` • ${chalk_1.default.bold(name)}\n`;
|
|
139
|
-
});
|
|
140
|
-
}
|
|
141
|
-
if (skipped.length > 0) {
|
|
142
|
-
if (resultContent)
|
|
143
|
-
resultContent += "\n";
|
|
144
|
-
resultContent += `${chalk_1.default.yellow.bold("Skipped:")}\n`;
|
|
145
|
-
skipped.forEach((name) => {
|
|
146
|
-
resultContent += ` • ${chalk_1.default.dim(name)}\n`;
|
|
147
|
-
});
|
|
179
|
+
if (failed.length > 0) {
|
|
180
|
+
process.exitCode = 1;
|
|
148
181
|
}
|
|
149
|
-
if (
|
|
150
|
-
await (0,
|
|
151
|
-
padding: 1,
|
|
152
|
-
borderColor: added.length > 0 ? "green" : "yellow",
|
|
153
|
-
});
|
|
182
|
+
if (added.length > 0) {
|
|
183
|
+
await (0, common_1.writeConfig)(resolvedProjectPath, config);
|
|
154
184
|
}
|
|
185
|
+
await displayAddResults(added, skipped, failed);
|
|
186
|
+
return { added, skipped, failed };
|
|
155
187
|
}
|
|
156
188
|
function default_1() {
|
|
157
189
|
return new commander_1.Command("add")
|
|
@@ -163,26 +195,27 @@ function default_1() {
|
|
|
163
195
|
.default("package"))
|
|
164
196
|
.addOption(common_1.Options.project)
|
|
165
197
|
.addOption(new commander_1.Option("-e, --env <environment>", "Environment to add modules to").env("ANTELOPEJS_LAUNCH_ENV"))
|
|
166
|
-
.action(
|
|
198
|
+
.action(async (modules, options) => {
|
|
199
|
+
await projectModulesAddCommand(modules, options);
|
|
200
|
+
});
|
|
167
201
|
}
|
|
168
202
|
exports.handlers.set("package", async (module) => {
|
|
169
203
|
const m = module.match(/^(.+?)(?:@(.*))?$/);
|
|
170
204
|
(0, node_assert_1.default)(m, `Invalid npm module format: '${module}'. Use <name>@<version>, <name>version or <name>`);
|
|
171
|
-
|
|
172
|
-
if (
|
|
173
|
-
|
|
174
|
-
if (result.code !== 0) {
|
|
175
|
-
throw new Error(`Failed to fetch version: ${result.stderr}`);
|
|
176
|
-
}
|
|
177
|
-
version = (0, package_manager_1.parsePackageInfoOutput)(result.stdout);
|
|
205
|
+
const [, name, version] = m;
|
|
206
|
+
if (version) {
|
|
207
|
+
await (0, version_checker_1.validateVersionSpec)(name, version);
|
|
178
208
|
}
|
|
209
|
+
const resolvedVersion = version
|
|
210
|
+
? version
|
|
211
|
+
: (0, version_checker_1.toFloatingSpec)(await (0, version_checker_1.fetchLatestVersion)(name));
|
|
179
212
|
return [
|
|
180
213
|
name,
|
|
181
214
|
{
|
|
182
215
|
source: {
|
|
183
216
|
type: "package",
|
|
184
217
|
package: name,
|
|
185
|
-
version:
|
|
218
|
+
version: resolvedVersion,
|
|
186
219
|
},
|
|
187
220
|
},
|
|
188
221
|
];
|
|
@@ -213,7 +246,9 @@ exports.handlers.set("local", async (module, options) => {
|
|
|
213
246
|
source: {
|
|
214
247
|
type: "local",
|
|
215
248
|
path: node_path_1.default.relative(options.project, resolvedModulePath) || ".",
|
|
216
|
-
|
|
249
|
+
watchDir: LOCAL_MODULE_WATCH_DIRS,
|
|
250
|
+
installCommand: LOCAL_MODULE_BUILD_COMMAND,
|
|
251
|
+
reloadCommand: LOCAL_MODULE_BUILD_COMMAND,
|
|
217
252
|
},
|
|
218
253
|
},
|
|
219
254
|
];
|
|
@@ -229,7 +264,9 @@ exports.handlers.set("dir", async (module, options) => {
|
|
|
229
264
|
source: {
|
|
230
265
|
type: "local-folder",
|
|
231
266
|
path: node_path_1.default.relative(options.project, resolvedFolderPath) || ".",
|
|
232
|
-
|
|
267
|
+
watchDir: LOCAL_MODULE_WATCH_DIRS,
|
|
268
|
+
installCommand: LOCAL_MODULE_BUILD_COMMAND,
|
|
269
|
+
reloadCommand: LOCAL_MODULE_BUILD_COMMAND,
|
|
233
270
|
},
|
|
234
271
|
},
|
|
235
272
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../../src/core/cli/commands/project/modules/add.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../../src/core/cli/commands/project/modules/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ 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.resolveInstallIdentifier = resolveInstallIdentifier;
|
|
6
7
|
exports.default = default_1;
|
|
7
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
8
9
|
const chalk_1 = __importDefault(require("chalk"));
|
|
@@ -24,6 +25,14 @@ const common_1 = require("../../../common");
|
|
|
24
25
|
const git_operations_1 = require("../../../git-operations");
|
|
25
26
|
const terminal_display_1 = require("../../../terminal-display");
|
|
26
27
|
const add_1 = require("./add");
|
|
28
|
+
const PACKAGE_SOURCE_TYPE = "package";
|
|
29
|
+
function resolveInstallIdentifier(source, identifier) {
|
|
30
|
+
if (source.type !== PACKAGE_SOURCE_TYPE) {
|
|
31
|
+
return identifier;
|
|
32
|
+
}
|
|
33
|
+
const version = source.version;
|
|
34
|
+
return version ? `${identifier}@${version}` : identifier;
|
|
35
|
+
}
|
|
27
36
|
async function analyzeConfig(projectFolder, cache, config, registry, fs) {
|
|
28
37
|
const manifests = (await Promise.all(Object.entries(config.modules).map(([name, module]) => registry
|
|
29
38
|
.load(projectFolder, cache, { ...module.source, id: name })
|
|
@@ -138,7 +147,7 @@ function default_1() {
|
|
|
138
147
|
if (loaderIdentifier) {
|
|
139
148
|
(0, cli_ui_1.success)(` ${chalk_1.default.green("↳")} Selected module: ${chalk_1.default.bold(moduleName)} for ${imp}`);
|
|
140
149
|
modulesToInstall.push({
|
|
141
|
-
loaderIdentifier,
|
|
150
|
+
loaderIdentifier: resolveInstallIdentifier(source, loaderIdentifier),
|
|
142
151
|
mode,
|
|
143
152
|
moduleName,
|
|
144
153
|
imports: [imp],
|
|
@@ -180,15 +189,25 @@ function default_1() {
|
|
|
180
189
|
const loaderIdentifiers = modules.map((m) => m.loaderIdentifier);
|
|
181
190
|
(0, cli_ui_1.info)(chalk_1.default.blue `Installing ${modules.length} module${modules.length === 1 ? "" : "s"} for environment ${env} (mode: ${mode})...`);
|
|
182
191
|
try {
|
|
183
|
-
await (0, add_1.projectModulesAddCommand)(loaderIdentifiers, {
|
|
192
|
+
const result = await (0, add_1.projectModulesAddCommand)(loaderIdentifiers, {
|
|
184
193
|
mode,
|
|
185
194
|
project: options.project,
|
|
186
195
|
env,
|
|
187
196
|
});
|
|
188
|
-
|
|
197
|
+
const failedCount = result
|
|
198
|
+
? result.failed.length
|
|
199
|
+
: loaderIdentifiers.length;
|
|
200
|
+
if (failedCount > 0) {
|
|
201
|
+
(0, cli_ui_1.error)(chalk_1.default.red `Failed to install ${failedCount} module(s) for environment ${env} (mode: ${mode})`);
|
|
202
|
+
process.exitCode = 1;
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
(0, cli_ui_1.success)(chalk_1.default.green `Successfully installed modules for environment ${env} (mode: ${mode})`);
|
|
206
|
+
}
|
|
189
207
|
}
|
|
190
208
|
catch (err) {
|
|
191
209
|
(0, cli_ui_1.error)(chalk_1.default.red `Failed to install modules for environment ${env} (mode: ${mode}): ${err}`);
|
|
210
|
+
process.exitCode = 1;
|
|
192
211
|
}
|
|
193
212
|
}
|
|
194
213
|
await terminal_display_1.terminalDisplay.stopSpinner(`Installed ${modulesToInstall.length} module${modulesToInstall.length === 1 ? "" : "s"}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../../src/core/cli/commands/project/modules/install.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../../src/core/cli/commands/project/modules/install.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ function applyUpdates(env, outdated, antelopeModules) {
|
|
|
18
18
|
...antelopeModules[entry.name],
|
|
19
19
|
source: {
|
|
20
20
|
...antelopeModules[entry.name].source,
|
|
21
|
-
version: entry.latest,
|
|
21
|
+
version: (0, version_checker_1.bumpVersionSpec)(entry.current, entry.latest),
|
|
22
22
|
},
|
|
23
23
|
};
|
|
24
24
|
}
|
|
@@ -31,7 +31,7 @@ function displayResults(outdated, options, notFound) {
|
|
|
31
31
|
const label = options.dryRun ? "Would update" : "Updated";
|
|
32
32
|
(0, cli_ui_1.success)(chalk_1.default.green `${label} ${outdated.length} module(s):`);
|
|
33
33
|
for (const entry of outdated) {
|
|
34
|
-
(0, cli_ui_1.info)(` ${chalk_1.default.green("•")} ${entry.name}: ${chalk_1.default.dim(entry.current)} → ${entry.latest}`);
|
|
34
|
+
(0, cli_ui_1.info)(` ${chalk_1.default.green("•")} ${entry.name}: ${chalk_1.default.dim(entry.current)} → ${(0, version_checker_1.bumpVersionSpec)(entry.current, entry.latest)}`);
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../../src/core/cli/commands/project/modules/update.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../../src/core/cli/commands/project/modules/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,40 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
exports.registerGitDownloader = registerGitDownloader;
|
|
37
|
+
const path = __importStar(require("node:path"));
|
|
4
38
|
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
5
39
|
const command_1 = require("../cli/command");
|
|
6
40
|
const terminal_display_1 = require("../cli/terminal-display");
|
|
@@ -8,9 +42,37 @@ const filesystem_1 = require("../filesystem");
|
|
|
8
42
|
const module_manifest_1 = require("../module-manifest");
|
|
9
43
|
const utils_1 = require("./utils");
|
|
10
44
|
const Logger = new logging_1.Logging.Channel("loader.git");
|
|
45
|
+
const GIT_DIR = ".git";
|
|
46
|
+
const SAFE_GIT_ARGUMENT = /^[A-Za-z0-9._:/@~-]+$/;
|
|
11
47
|
function urlToFile(url) {
|
|
12
48
|
return url.replace(/[^a-zA-Z0-9_]/g, "_");
|
|
13
49
|
}
|
|
50
|
+
function assertSafeGitArgument(value, label) {
|
|
51
|
+
if (!SAFE_GIT_ARGUMENT.test(value)) {
|
|
52
|
+
throw new Error(`Unsafe characters in git ${label} '${value}'; only letters, digits and ._:/@~- are allowed`);
|
|
53
|
+
}
|
|
54
|
+
return value;
|
|
55
|
+
}
|
|
56
|
+
function validateSource(source) {
|
|
57
|
+
assertSafeGitArgument(source.remote, "remote");
|
|
58
|
+
if (source.branch) {
|
|
59
|
+
assertSafeGitArgument(source.branch, "branch");
|
|
60
|
+
}
|
|
61
|
+
if (source.commit) {
|
|
62
|
+
assertSafeGitArgument(source.commit, "commit");
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
function toCommandResult(err) {
|
|
66
|
+
return { stdout: "", stderr: String(err), code: 1 };
|
|
67
|
+
}
|
|
68
|
+
async function runGitCommand(command, cwd, exec) {
|
|
69
|
+
const result = await exec(command, { cwd }).catch(toCommandResult);
|
|
70
|
+
if (result.code !== 0) {
|
|
71
|
+
await terminal_display_1.terminalDisplay.failSpinner(`'${command}' failed: ${result.stderr}`);
|
|
72
|
+
throw new Error(`'${command}' failed: ${result.stderr}`);
|
|
73
|
+
}
|
|
74
|
+
return result;
|
|
75
|
+
}
|
|
14
76
|
async function commitAt(branch, cwd, exec) {
|
|
15
77
|
let res;
|
|
16
78
|
try {
|
|
@@ -27,38 +89,43 @@ async function commitAt(branch, cwd, exec) {
|
|
|
27
89
|
return res.stdout.trim();
|
|
28
90
|
}
|
|
29
91
|
async function mainBranch(cwd, exec) {
|
|
30
|
-
const res = await
|
|
31
|
-
|
|
92
|
+
const res = await runGitCommand("git symbolic-ref refs/remotes/origin/HEAD", cwd, exec);
|
|
93
|
+
const branch = res.stdout.trim().split("/").slice(3).join("/");
|
|
94
|
+
return assertSafeGitArgument(branch, "branch");
|
|
32
95
|
}
|
|
33
|
-
async function
|
|
34
|
-
const cacheVersion = cache.getVersion(name);
|
|
96
|
+
async function cloneRepo(cache, source, exec, name, folder) {
|
|
35
97
|
const branch = source.commit || source.branch;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
await exec(`git checkout ${branch}`, { cwd: folder });
|
|
42
|
-
}
|
|
43
|
-
await terminal_display_1.terminalDisplay.stopSpinner(`Cloned ${source.remote}`);
|
|
44
|
-
const newActiveCommit = await commitAt("HEAD", folder, exec);
|
|
45
|
-
const newBranch = branch ?? (await mainBranch(folder, exec));
|
|
46
|
-
return {
|
|
47
|
-
newVersion: `git:${newBranch}:${newActiveCommit}`,
|
|
48
|
-
shouldInstallDependencies: true,
|
|
49
|
-
};
|
|
98
|
+
await terminal_display_1.terminalDisplay.startSpinner(`Cloning ${source.remote}`);
|
|
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);
|
|
50
103
|
}
|
|
104
|
+
await terminal_display_1.terminalDisplay.stopSpinner(`Cloned ${source.remote}`);
|
|
105
|
+
const newActiveCommit = await commitAt("HEAD", folder, exec);
|
|
106
|
+
const newBranch = branch ?? (await mainBranch(folder, exec));
|
|
107
|
+
return {
|
|
108
|
+
newVersion: `git:${newBranch}:${newActiveCommit}`,
|
|
109
|
+
shouldInstallDependencies: true,
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
async function updateRepo(source, exec, folder, cacheVersion) {
|
|
113
|
+
const branch = source.commit || source.branch;
|
|
51
114
|
const [, prevBranch, prevCommit] = cacheVersion.split(":");
|
|
52
115
|
await terminal_display_1.terminalDisplay.startSpinner(`Updating ${source.remote}`);
|
|
53
|
-
await exec("git fetch", { cwd: folder });
|
|
116
|
+
const fetchResult = await exec("git fetch", { cwd: folder }).catch(toCommandResult);
|
|
117
|
+
if (fetchResult.code !== 0) {
|
|
118
|
+
await terminal_display_1.terminalDisplay.stopSpinner(`Could not fetch ${source.remote}, using cached copy`);
|
|
119
|
+
return { newVersion: "", shouldInstallDependencies: false };
|
|
120
|
+
}
|
|
54
121
|
const newBranch = branch ?? (await mainBranch(folder, exec));
|
|
55
122
|
if (prevBranch !== newBranch) {
|
|
56
|
-
await
|
|
123
|
+
await runGitCommand(`git checkout ${newBranch}`, folder, exec);
|
|
57
124
|
}
|
|
58
125
|
if (!source.commit) {
|
|
59
126
|
const originCommit = await commitAt(`origin/${newBranch}`, folder, exec);
|
|
60
127
|
if (originCommit !== prevCommit) {
|
|
61
|
-
await
|
|
128
|
+
await runGitCommand(`git reset --hard origin/${newBranch}`, folder, exec);
|
|
62
129
|
}
|
|
63
130
|
}
|
|
64
131
|
const newActiveCommit = await commitAt("HEAD", folder, exec);
|
|
@@ -71,22 +138,31 @@ async function cloneOrFetchRepo(cache, source, exec, name, folder) {
|
|
|
71
138
|
shouldInstallDependencies: true,
|
|
72
139
|
};
|
|
73
140
|
}
|
|
141
|
+
async function cloneOrFetchRepo(cache, source, exec, fs, name, folder) {
|
|
142
|
+
const cacheVersion = cache.getVersion(name);
|
|
143
|
+
const repoPresent = await fs.exists(path.join(folder, GIT_DIR));
|
|
144
|
+
if (source.ignoreCache || !cacheVersion?.startsWith("git:") || !repoPresent) {
|
|
145
|
+
return cloneRepo(cache, source, exec, name, folder);
|
|
146
|
+
}
|
|
147
|
+
return updateRepo(source, exec, folder, cacheVersion);
|
|
148
|
+
}
|
|
74
149
|
function registerGitDownloader(registry, deps = {}) {
|
|
75
150
|
const fs = deps.fs ?? new filesystem_1.NodeFileSystem();
|
|
76
151
|
const exec = deps.exec ?? command_1.ExecuteCMD;
|
|
77
152
|
registry.register("git", "remote", async (cache, source) => {
|
|
78
153
|
Logger.Debug(`Git loader called for ${source.remote}`);
|
|
154
|
+
validateSource(source);
|
|
79
155
|
const name = urlToFile(source.remote);
|
|
80
156
|
Logger.Trace(`Starting Git module load for ${name}`);
|
|
81
157
|
const folder = await cache.getFolder(name, true, true);
|
|
82
|
-
const updateResult = await cloneOrFetchRepo(cache, source, exec, name, folder);
|
|
158
|
+
const updateResult = await cloneOrFetchRepo(cache, source, exec, fs, name, folder);
|
|
83
159
|
if (updateResult.shouldInstallDependencies) {
|
|
84
160
|
Logger.Debug(`Running install commands for ${name}`);
|
|
85
161
|
await (0, utils_1.runInstallCommands)(exec, Logger, name, folder, source.installCommand);
|
|
86
162
|
}
|
|
87
163
|
Logger.Trace(`Git module load completed for ${name}`);
|
|
88
164
|
if (updateResult.newVersion) {
|
|
89
|
-
cache.
|
|
165
|
+
await cache.commitVersion(name, updateResult.newVersion);
|
|
90
166
|
}
|
|
91
167
|
const moduleName = source.id ?? name;
|
|
92
168
|
const manifest = await module_manifest_1.ModuleManifest.create(folder, source, moduleName, fs);
|