@amaster.ai/cli 1.1.29 → 1.1.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -0
- package/dist/cli.cjs +178 -4
- package/dist/cli.cjs.map +1 -1
- package/dist/cli.js +179 -5
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -9,7 +9,8 @@ import { randomBytes, createHash, randomUUID } from 'crypto';
|
|
|
9
9
|
import { tmpdir, homedir } from 'os';
|
|
10
10
|
import * as tar from 'tar';
|
|
11
11
|
import { createServer } from 'http';
|
|
12
|
-
import { spawn, spawnSync } from 'child_process';
|
|
12
|
+
import { execFile, spawn, spawnSync } from 'child_process';
|
|
13
|
+
import { promisify } from 'util';
|
|
13
14
|
import YAML2 from 'yaml';
|
|
14
15
|
import ts from 'typescript';
|
|
15
16
|
|
|
@@ -555,6 +556,7 @@ function validateAddonManifest(manifest) {
|
|
|
555
556
|
throw new Error("addon.json missing members");
|
|
556
557
|
}
|
|
557
558
|
validateInstallRequirements(manifest);
|
|
559
|
+
validateInstallNpm(manifest);
|
|
558
560
|
}
|
|
559
561
|
function validateInstallRequirements(manifest) {
|
|
560
562
|
const requirements = manifest.install?.requirements;
|
|
@@ -595,6 +597,30 @@ function validateRequirementItem(item, kind) {
|
|
|
595
597
|
throw new Error(`addon.json install.requirements.${kind}s item defaultValue must be string`);
|
|
596
598
|
}
|
|
597
599
|
}
|
|
600
|
+
function validateInstallNpm(manifest) {
|
|
601
|
+
const npm = manifest.install?.npm;
|
|
602
|
+
if (npm === void 0) {
|
|
603
|
+
return;
|
|
604
|
+
}
|
|
605
|
+
if (!npm || typeof npm !== "object" || Array.isArray(npm)) {
|
|
606
|
+
throw new Error("addon.json install.npm must be an object");
|
|
607
|
+
}
|
|
608
|
+
const dependencies = npm.dependencies;
|
|
609
|
+
if (dependencies === void 0) {
|
|
610
|
+
return;
|
|
611
|
+
}
|
|
612
|
+
if (!dependencies || typeof dependencies !== "object" || Array.isArray(dependencies)) {
|
|
613
|
+
throw new Error("addon.json install.npm.dependencies must be an object");
|
|
614
|
+
}
|
|
615
|
+
for (const [name, version] of Object.entries(dependencies)) {
|
|
616
|
+
if (!name.trim()) {
|
|
617
|
+
throw new Error("addon.json install.npm.dependencies contains an empty package name");
|
|
618
|
+
}
|
|
619
|
+
if (typeof version !== "string" || !version.trim()) {
|
|
620
|
+
throw new Error(`addon.json install.npm.dependencies.${name} must be a string`);
|
|
621
|
+
}
|
|
622
|
+
}
|
|
623
|
+
}
|
|
598
624
|
function resolveMemberSourcePath(member) {
|
|
599
625
|
const sourcePath = member.source?.path;
|
|
600
626
|
if (typeof sourcePath === "string" && sourcePath.trim()) {
|
|
@@ -679,6 +705,7 @@ async function tryDetectNearestApplicationType(startDir = process.cwd()) {
|
|
|
679
705
|
}
|
|
680
706
|
|
|
681
707
|
// src/marketplace/install.ts
|
|
708
|
+
var execFileAsync = promisify(execFile);
|
|
682
709
|
var AddonInstallConflictError = class extends Error {
|
|
683
710
|
constructor(input) {
|
|
684
711
|
super(`Addon ${input.operation} has ${input.conflicts.length} conflict(s)`);
|
|
@@ -807,6 +834,18 @@ function resolveInstallRequirements(manifest) {
|
|
|
807
834
|
secrets: requirements.secrets?.map((item) => ({ ...item }))
|
|
808
835
|
};
|
|
809
836
|
}
|
|
837
|
+
function resolveInstallNpm(manifest) {
|
|
838
|
+
const npm = manifest.install?.npm ?? {};
|
|
839
|
+
return {
|
|
840
|
+
dependencies: npm.dependencies ? { ...npm.dependencies } : void 0
|
|
841
|
+
};
|
|
842
|
+
}
|
|
843
|
+
function listNpmDependencies(npm) {
|
|
844
|
+
return Object.entries(npm.dependencies ?? {}).map(([packageName, version]) => ({
|
|
845
|
+
packageName,
|
|
846
|
+
version
|
|
847
|
+
}));
|
|
848
|
+
}
|
|
810
849
|
function buildMissingRequirements(requirements) {
|
|
811
850
|
return {
|
|
812
851
|
envs: requirements.envs?.filter((item) => item.required !== false).map((item) => ({ ...item })),
|
|
@@ -857,6 +896,36 @@ function buildOwnershipMap(metas, excludeAddonName) {
|
|
|
857
896
|
}
|
|
858
897
|
return ownership;
|
|
859
898
|
}
|
|
899
|
+
async function readPackageJson(targetDir) {
|
|
900
|
+
const packageJsonPath = ensurePathInsideTarget(targetDir, "package.json");
|
|
901
|
+
const parsed = JSON.parse(await readFile(packageJsonPath, "utf8"));
|
|
902
|
+
if (!isPlainObject(parsed)) {
|
|
903
|
+
throw new Error("package.json must contain a JSON object");
|
|
904
|
+
}
|
|
905
|
+
return parsed;
|
|
906
|
+
}
|
|
907
|
+
function readDependencies(packageJson) {
|
|
908
|
+
const value = packageJson.dependencies;
|
|
909
|
+
if (value === void 0) {
|
|
910
|
+
return {};
|
|
911
|
+
}
|
|
912
|
+
if (!isPlainObject(value)) {
|
|
913
|
+
throw new Error("package.json dependencies must be an object");
|
|
914
|
+
}
|
|
915
|
+
const dependencies = {};
|
|
916
|
+
for (const [name, version] of Object.entries(value)) {
|
|
917
|
+
if (typeof version === "string") {
|
|
918
|
+
dependencies[name] = version;
|
|
919
|
+
}
|
|
920
|
+
}
|
|
921
|
+
return dependencies;
|
|
922
|
+
}
|
|
923
|
+
function findPackageDependency(packageJson, packageName) {
|
|
924
|
+
return readDependencies(packageJson)[packageName] ?? null;
|
|
925
|
+
}
|
|
926
|
+
function buildNpmDependencyMap(npm) {
|
|
927
|
+
return new Map(listNpmDependencies(npm).map((item) => [item.packageName, item]));
|
|
928
|
+
}
|
|
860
929
|
async function collectDirectoryFiles(sourceDir) {
|
|
861
930
|
const entries = await readdir(sourceDir, { withFileTypes: true });
|
|
862
931
|
const files = [];
|
|
@@ -1052,6 +1121,7 @@ function buildInstalledAddonMeta(options) {
|
|
|
1052
1121
|
},
|
|
1053
1122
|
installParameters: options.installParameters,
|
|
1054
1123
|
requirements: resolveInstallRequirements(options.manifest),
|
|
1124
|
+
npm: resolveInstallNpm(options.manifest),
|
|
1055
1125
|
members: options.members,
|
|
1056
1126
|
files: options.files
|
|
1057
1127
|
};
|
|
@@ -1235,10 +1305,77 @@ async function removeObsoleteFiles(targetDir, previousMeta, nextPaths) {
|
|
|
1235
1305
|
}
|
|
1236
1306
|
return removed;
|
|
1237
1307
|
}
|
|
1308
|
+
async function applyNpmDependencies(targetDir, npm) {
|
|
1309
|
+
const dependencies = listNpmDependencies(npm);
|
|
1310
|
+
if (!dependencies.length) {
|
|
1311
|
+
return [];
|
|
1312
|
+
}
|
|
1313
|
+
const packageJsonPath = ensurePathInsideTarget(targetDir, "package.json");
|
|
1314
|
+
const packageJson = await readPackageJson(targetDir);
|
|
1315
|
+
let changed = false;
|
|
1316
|
+
for (const dependency of dependencies) {
|
|
1317
|
+
const section = packageJson.dependencies;
|
|
1318
|
+
const nextSection = isPlainObject(section) ? section : {};
|
|
1319
|
+
if (!isPlainObject(section)) {
|
|
1320
|
+
packageJson.dependencies = nextSection;
|
|
1321
|
+
changed = true;
|
|
1322
|
+
}
|
|
1323
|
+
if (nextSection[dependency.packageName] !== dependency.version) {
|
|
1324
|
+
nextSection[dependency.packageName] = dependency.version;
|
|
1325
|
+
changed = true;
|
|
1326
|
+
}
|
|
1327
|
+
}
|
|
1328
|
+
if (!changed) {
|
|
1329
|
+
return [];
|
|
1330
|
+
}
|
|
1331
|
+
await writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}
|
|
1332
|
+
`);
|
|
1333
|
+
return ["package.json"];
|
|
1334
|
+
}
|
|
1335
|
+
function resolvePackageManagerCommand(targetDir, packageJson) {
|
|
1336
|
+
const packageManager = typeof packageJson.packageManager === "string" ? packageJson.packageManager : "";
|
|
1337
|
+
if (existsSync(join(targetDir, "bun.lockb")) || existsSync(join(targetDir, "bun.lock")) || packageManager.startsWith("bun@")) {
|
|
1338
|
+
return { command: "bun", args: ["install"] };
|
|
1339
|
+
}
|
|
1340
|
+
if (existsSync(join(targetDir, "pnpm-lock.yaml")) || packageManager.startsWith("pnpm@")) {
|
|
1341
|
+
return { command: "pnpm", args: ["install"] };
|
|
1342
|
+
}
|
|
1343
|
+
if (existsSync(join(targetDir, "yarn.lock")) || packageManager.startsWith("yarn@")) {
|
|
1344
|
+
return { command: "yarn", args: ["install"] };
|
|
1345
|
+
}
|
|
1346
|
+
return { command: "npm", args: ["install"] };
|
|
1347
|
+
}
|
|
1348
|
+
async function installPackageDependencies(targetDir) {
|
|
1349
|
+
const packageJson = await readPackageJson(targetDir);
|
|
1350
|
+
const { command, args } = resolvePackageManagerCommand(targetDir, packageJson);
|
|
1351
|
+
try {
|
|
1352
|
+
await execFileAsync(command, args, {
|
|
1353
|
+
cwd: targetDir,
|
|
1354
|
+
maxBuffer: 1024 * 1024 * 10
|
|
1355
|
+
});
|
|
1356
|
+
} catch (error) {
|
|
1357
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
1358
|
+
throw new Error(`Failed to install addon npm dependencies with ${command} ${args.join(" ")}: ${message}`);
|
|
1359
|
+
}
|
|
1360
|
+
}
|
|
1238
1361
|
async function validateInstallConflicts(targetDir, plan, existingMetas) {
|
|
1239
1362
|
const ownership = buildOwnershipMap(existingMetas);
|
|
1240
1363
|
const settingsOwnership = buildSettingsOwnershipMap(existingMetas);
|
|
1241
1364
|
const conflicts = [];
|
|
1365
|
+
const packageJson = await readPackageJson(targetDir);
|
|
1366
|
+
for (const dependency of listNpmDependencies(resolveInstallNpm(plan.manifest))) {
|
|
1367
|
+
const existing = findPackageDependency(packageJson, dependency.packageName);
|
|
1368
|
+
if (existing && existing !== dependency.version) {
|
|
1369
|
+
conflicts.push({
|
|
1370
|
+
kind: "package_dependency_conflict",
|
|
1371
|
+
path: `package.json#dependencies.${dependency.packageName}`,
|
|
1372
|
+
packageName: dependency.packageName,
|
|
1373
|
+
requestedVersion: dependency.version,
|
|
1374
|
+
existingVersion: existing,
|
|
1375
|
+
message: `${dependency.packageName} is already declared as ${existing} in package.json`
|
|
1376
|
+
});
|
|
1377
|
+
}
|
|
1378
|
+
}
|
|
1242
1379
|
for (const file of plan.files) {
|
|
1243
1380
|
const owner = ownership.get(file.targetPath);
|
|
1244
1381
|
if (owner && owner !== plan.manifest.name) {
|
|
@@ -1303,6 +1440,35 @@ async function validateUpgradeConflicts(targetDir, plan, existingMetas, previous
|
|
|
1303
1440
|
const nextSettingKeys = new Set(plannedSettings.map((item) => `${item.targetPath}#${item.path}`));
|
|
1304
1441
|
const plannedSettingsByKey = new Map(plannedSettings.map((item) => [`${item.targetPath}#${item.path}`, item]));
|
|
1305
1442
|
const conflicts = [];
|
|
1443
|
+
const packageJson = await readPackageJson(targetDir);
|
|
1444
|
+
const previousNpmByName = buildNpmDependencyMap(previousMeta.npm ?? {});
|
|
1445
|
+
for (const dependency of listNpmDependencies(resolveInstallNpm(plan.manifest))) {
|
|
1446
|
+
const existing = findPackageDependency(packageJson, dependency.packageName);
|
|
1447
|
+
const previous = previousNpmByName.get(dependency.packageName);
|
|
1448
|
+
if (!existing) {
|
|
1449
|
+
if (previous) {
|
|
1450
|
+
conflicts.push({
|
|
1451
|
+
kind: "package_dependency_conflict",
|
|
1452
|
+
path: `package.json#dependencies.${dependency.packageName}`,
|
|
1453
|
+
packageName: dependency.packageName,
|
|
1454
|
+
requestedVersion: dependency.version,
|
|
1455
|
+
message: `managed npm package missing from package.json: ${dependency.packageName}`
|
|
1456
|
+
});
|
|
1457
|
+
}
|
|
1458
|
+
continue;
|
|
1459
|
+
}
|
|
1460
|
+
const canUpdateManagedVersion = previous && existing === previous.version;
|
|
1461
|
+
if (existing !== dependency.version && !canUpdateManagedVersion) {
|
|
1462
|
+
conflicts.push({
|
|
1463
|
+
kind: "package_dependency_conflict",
|
|
1464
|
+
path: `package.json#dependencies.${dependency.packageName}`,
|
|
1465
|
+
packageName: dependency.packageName,
|
|
1466
|
+
requestedVersion: dependency.version,
|
|
1467
|
+
existingVersion: existing,
|
|
1468
|
+
message: `${dependency.packageName} is already declared as ${existing} in package.json`
|
|
1469
|
+
});
|
|
1470
|
+
}
|
|
1471
|
+
}
|
|
1306
1472
|
for (const managedFile of previousMeta.files) {
|
|
1307
1473
|
const absolutePath = ensurePathInsideTarget(targetDir, managedFile.path);
|
|
1308
1474
|
if (!existsSync(absolutePath)) {
|
|
@@ -1578,6 +1744,8 @@ async function materializeAddon(options) {
|
|
|
1578
1744
|
}
|
|
1579
1745
|
const removedFiles = previousMeta ? await removeObsoleteFiles(targetDir, previousMeta, new Set(plan.files.map((file) => file.targetPath))) : [];
|
|
1580
1746
|
const restoredSettingsFiles = await restoreObsoleteSettings(targetDir, previousMeta, plan.settings);
|
|
1747
|
+
const npm = resolveInstallNpm(plan.manifest);
|
|
1748
|
+
const packageJsonFiles = await applyNpmDependencies(targetDir, npm);
|
|
1581
1749
|
await writePlannedFiles(targetDir, plan.files);
|
|
1582
1750
|
const settingsResult = await applyPlannedSettings(targetDir, plan.settings);
|
|
1583
1751
|
const installedFiles = [];
|
|
@@ -1600,13 +1768,17 @@ async function materializeAddon(options) {
|
|
|
1600
1768
|
await writeFile(plan.metaPath, JSON.stringify(meta, null, 2));
|
|
1601
1769
|
const nextMetas = existingMetas.filter((item) => item.name !== meta.name).concat(meta);
|
|
1602
1770
|
await rebuildRegistryFiles(targetDir, plan.applicationType, nextMetas.filter((item) => item.applicationType === plan.applicationType));
|
|
1771
|
+
if (options.installPackageDependencies && packageJsonFiles.length) {
|
|
1772
|
+
await installPackageDependencies(targetDir);
|
|
1773
|
+
}
|
|
1603
1774
|
const requirements = resolveInstallRequirements(plan.manifest);
|
|
1604
1775
|
return {
|
|
1605
1776
|
meta,
|
|
1606
|
-
writtenFiles: installedFiles.map((file) => file.path).concat(restoredSettingsFiles, settingsResult.writtenFiles),
|
|
1777
|
+
writtenFiles: installedFiles.map((file) => file.path).concat(packageJsonFiles, restoredSettingsFiles, settingsResult.writtenFiles),
|
|
1607
1778
|
removedFiles,
|
|
1608
1779
|
requirements,
|
|
1609
|
-
missingRequirements: buildMissingRequirements(requirements)
|
|
1780
|
+
missingRequirements: buildMissingRequirements(requirements),
|
|
1781
|
+
npm
|
|
1610
1782
|
};
|
|
1611
1783
|
}
|
|
1612
1784
|
async function installAddonFromExtractedDirectory(options) {
|
|
@@ -1862,7 +2034,8 @@ async function installAddonFromRegistry(options) {
|
|
|
1862
2034
|
extractedDir,
|
|
1863
2035
|
applicationType: options.applicationType,
|
|
1864
2036
|
organizationCode: options.organizationCode,
|
|
1865
|
-
installParameters: options.installParameters
|
|
2037
|
+
installParameters: options.installParameters,
|
|
2038
|
+
installPackageDependencies: true
|
|
1866
2039
|
});
|
|
1867
2040
|
} finally {
|
|
1868
2041
|
await removeTempDirectory(extractedDir).catch(() => void 0);
|
|
@@ -1880,7 +2053,8 @@ async function upgradeAddonFromRegistry(options) {
|
|
|
1880
2053
|
extractedDir,
|
|
1881
2054
|
applicationType: options.applicationType,
|
|
1882
2055
|
organizationCode: options.organizationCode,
|
|
1883
|
-
installParameters: options.installParameters
|
|
2056
|
+
installParameters: options.installParameters,
|
|
2057
|
+
installPackageDependencies: true
|
|
1884
2058
|
});
|
|
1885
2059
|
} finally {
|
|
1886
2060
|
await removeTempDirectory(extractedDir).catch(() => void 0);
|