@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 CHANGED
@@ -88,6 +88,11 @@ Addon 可在 `addon.json` 中声明安装后的运行配置要求:
88
88
  ```json
89
89
  {
90
90
  "install": {
91
+ "npm": {
92
+ "dependencies": {
93
+ "@tanstack/react-query": "^5.66.0"
94
+ }
95
+ },
91
96
  "requirements": {
92
97
  "envs": [
93
98
  {
@@ -109,6 +114,9 @@ Addon 可在 `addon.json` 中声明安装后的运行配置要求:
109
114
  }
110
115
  ```
111
116
 
117
+ `install.npm` 会写入应用根目录 `package.json`。如果目标应用已声明同名包且版本不一致,安装/升级会停止并返回 `package_dependency_conflict`。
118
+ 通过 registry 执行 `addon install` / `addon upgrade` 时,如果 `package.json` 有变更,CLI 会按当前应用自动执行 `bun install`、`pnpm install`、`npm install` 或 `yarn install`。
119
+
112
120
  `install.requirements` 会写入 `meta.json`,并在安装/升级结果中返回 `requirements` 和 `missingRequirements`。`secrets` 只保存键名和说明,不保存密钥值。
113
121
 
114
122
  页面注册方式:
package/dist/cli.cjs CHANGED
@@ -12,6 +12,7 @@ var os = require('os');
12
12
  var tar = require('tar');
13
13
  var http = require('http');
14
14
  var child_process = require('child_process');
15
+ var util = require('util');
15
16
  var YAML2 = require('yaml');
16
17
  var ts = require('typescript');
17
18
 
@@ -582,6 +583,7 @@ function validateAddonManifest(manifest) {
582
583
  throw new Error("addon.json missing members");
583
584
  }
584
585
  validateInstallRequirements(manifest);
586
+ validateInstallNpm(manifest);
585
587
  }
586
588
  function validateInstallRequirements(manifest) {
587
589
  const requirements = manifest.install?.requirements;
@@ -622,6 +624,30 @@ function validateRequirementItem(item, kind) {
622
624
  throw new Error(`addon.json install.requirements.${kind}s item defaultValue must be string`);
623
625
  }
624
626
  }
627
+ function validateInstallNpm(manifest) {
628
+ const npm = manifest.install?.npm;
629
+ if (npm === void 0) {
630
+ return;
631
+ }
632
+ if (!npm || typeof npm !== "object" || Array.isArray(npm)) {
633
+ throw new Error("addon.json install.npm must be an object");
634
+ }
635
+ const dependencies = npm.dependencies;
636
+ if (dependencies === void 0) {
637
+ return;
638
+ }
639
+ if (!dependencies || typeof dependencies !== "object" || Array.isArray(dependencies)) {
640
+ throw new Error("addon.json install.npm.dependencies must be an object");
641
+ }
642
+ for (const [name, version] of Object.entries(dependencies)) {
643
+ if (!name.trim()) {
644
+ throw new Error("addon.json install.npm.dependencies contains an empty package name");
645
+ }
646
+ if (typeof version !== "string" || !version.trim()) {
647
+ throw new Error(`addon.json install.npm.dependencies.${name} must be a string`);
648
+ }
649
+ }
650
+ }
625
651
  function resolveMemberSourcePath(member) {
626
652
  const sourcePath = member.source?.path;
627
653
  if (typeof sourcePath === "string" && sourcePath.trim()) {
@@ -706,6 +732,7 @@ async function tryDetectNearestApplicationType(startDir = process.cwd()) {
706
732
  }
707
733
 
708
734
  // src/marketplace/install.ts
735
+ var execFileAsync = util.promisify(child_process.execFile);
709
736
  var AddonInstallConflictError = class extends Error {
710
737
  constructor(input) {
711
738
  super(`Addon ${input.operation} has ${input.conflicts.length} conflict(s)`);
@@ -834,6 +861,18 @@ function resolveInstallRequirements(manifest) {
834
861
  secrets: requirements.secrets?.map((item) => ({ ...item }))
835
862
  };
836
863
  }
864
+ function resolveInstallNpm(manifest) {
865
+ const npm = manifest.install?.npm ?? {};
866
+ return {
867
+ dependencies: npm.dependencies ? { ...npm.dependencies } : void 0
868
+ };
869
+ }
870
+ function listNpmDependencies(npm) {
871
+ return Object.entries(npm.dependencies ?? {}).map(([packageName, version]) => ({
872
+ packageName,
873
+ version
874
+ }));
875
+ }
837
876
  function buildMissingRequirements(requirements) {
838
877
  return {
839
878
  envs: requirements.envs?.filter((item) => item.required !== false).map((item) => ({ ...item })),
@@ -884,6 +923,36 @@ function buildOwnershipMap(metas, excludeAddonName) {
884
923
  }
885
924
  return ownership;
886
925
  }
926
+ async function readPackageJson(targetDir) {
927
+ const packageJsonPath = ensurePathInsideTarget(targetDir, "package.json");
928
+ const parsed = JSON.parse(await promises$1.readFile(packageJsonPath, "utf8"));
929
+ if (!isPlainObject(parsed)) {
930
+ throw new Error("package.json must contain a JSON object");
931
+ }
932
+ return parsed;
933
+ }
934
+ function readDependencies(packageJson) {
935
+ const value = packageJson.dependencies;
936
+ if (value === void 0) {
937
+ return {};
938
+ }
939
+ if (!isPlainObject(value)) {
940
+ throw new Error("package.json dependencies must be an object");
941
+ }
942
+ const dependencies = {};
943
+ for (const [name, version] of Object.entries(value)) {
944
+ if (typeof version === "string") {
945
+ dependencies[name] = version;
946
+ }
947
+ }
948
+ return dependencies;
949
+ }
950
+ function findPackageDependency(packageJson, packageName) {
951
+ return readDependencies(packageJson)[packageName] ?? null;
952
+ }
953
+ function buildNpmDependencyMap(npm) {
954
+ return new Map(listNpmDependencies(npm).map((item) => [item.packageName, item]));
955
+ }
887
956
  async function collectDirectoryFiles(sourceDir) {
888
957
  const entries = await promises$1.readdir(sourceDir, { withFileTypes: true });
889
958
  const files = [];
@@ -1079,6 +1148,7 @@ function buildInstalledAddonMeta(options) {
1079
1148
  },
1080
1149
  installParameters: options.installParameters,
1081
1150
  requirements: resolveInstallRequirements(options.manifest),
1151
+ npm: resolveInstallNpm(options.manifest),
1082
1152
  members: options.members,
1083
1153
  files: options.files
1084
1154
  };
@@ -1262,10 +1332,77 @@ async function removeObsoleteFiles(targetDir, previousMeta, nextPaths) {
1262
1332
  }
1263
1333
  return removed;
1264
1334
  }
1335
+ async function applyNpmDependencies(targetDir, npm) {
1336
+ const dependencies = listNpmDependencies(npm);
1337
+ if (!dependencies.length) {
1338
+ return [];
1339
+ }
1340
+ const packageJsonPath = ensurePathInsideTarget(targetDir, "package.json");
1341
+ const packageJson = await readPackageJson(targetDir);
1342
+ let changed = false;
1343
+ for (const dependency of dependencies) {
1344
+ const section = packageJson.dependencies;
1345
+ const nextSection = isPlainObject(section) ? section : {};
1346
+ if (!isPlainObject(section)) {
1347
+ packageJson.dependencies = nextSection;
1348
+ changed = true;
1349
+ }
1350
+ if (nextSection[dependency.packageName] !== dependency.version) {
1351
+ nextSection[dependency.packageName] = dependency.version;
1352
+ changed = true;
1353
+ }
1354
+ }
1355
+ if (!changed) {
1356
+ return [];
1357
+ }
1358
+ await promises$1.writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}
1359
+ `);
1360
+ return ["package.json"];
1361
+ }
1362
+ function resolvePackageManagerCommand(targetDir, packageJson) {
1363
+ const packageManager = typeof packageJson.packageManager === "string" ? packageJson.packageManager : "";
1364
+ if (fs.existsSync(path.join(targetDir, "bun.lockb")) || fs.existsSync(path.join(targetDir, "bun.lock")) || packageManager.startsWith("bun@")) {
1365
+ return { command: "bun", args: ["install"] };
1366
+ }
1367
+ if (fs.existsSync(path.join(targetDir, "pnpm-lock.yaml")) || packageManager.startsWith("pnpm@")) {
1368
+ return { command: "pnpm", args: ["install"] };
1369
+ }
1370
+ if (fs.existsSync(path.join(targetDir, "yarn.lock")) || packageManager.startsWith("yarn@")) {
1371
+ return { command: "yarn", args: ["install"] };
1372
+ }
1373
+ return { command: "npm", args: ["install"] };
1374
+ }
1375
+ async function installPackageDependencies(targetDir) {
1376
+ const packageJson = await readPackageJson(targetDir);
1377
+ const { command, args } = resolvePackageManagerCommand(targetDir, packageJson);
1378
+ try {
1379
+ await execFileAsync(command, args, {
1380
+ cwd: targetDir,
1381
+ maxBuffer: 1024 * 1024 * 10
1382
+ });
1383
+ } catch (error) {
1384
+ const message = error instanceof Error ? error.message : String(error);
1385
+ throw new Error(`Failed to install addon npm dependencies with ${command} ${args.join(" ")}: ${message}`);
1386
+ }
1387
+ }
1265
1388
  async function validateInstallConflicts(targetDir, plan, existingMetas) {
1266
1389
  const ownership = buildOwnershipMap(existingMetas);
1267
1390
  const settingsOwnership = buildSettingsOwnershipMap(existingMetas);
1268
1391
  const conflicts = [];
1392
+ const packageJson = await readPackageJson(targetDir);
1393
+ for (const dependency of listNpmDependencies(resolveInstallNpm(plan.manifest))) {
1394
+ const existing = findPackageDependency(packageJson, dependency.packageName);
1395
+ if (existing && existing !== dependency.version) {
1396
+ conflicts.push({
1397
+ kind: "package_dependency_conflict",
1398
+ path: `package.json#dependencies.${dependency.packageName}`,
1399
+ packageName: dependency.packageName,
1400
+ requestedVersion: dependency.version,
1401
+ existingVersion: existing,
1402
+ message: `${dependency.packageName} is already declared as ${existing} in package.json`
1403
+ });
1404
+ }
1405
+ }
1269
1406
  for (const file of plan.files) {
1270
1407
  const owner = ownership.get(file.targetPath);
1271
1408
  if (owner && owner !== plan.manifest.name) {
@@ -1330,6 +1467,35 @@ async function validateUpgradeConflicts(targetDir, plan, existingMetas, previous
1330
1467
  const nextSettingKeys = new Set(plannedSettings.map((item) => `${item.targetPath}#${item.path}`));
1331
1468
  const plannedSettingsByKey = new Map(plannedSettings.map((item) => [`${item.targetPath}#${item.path}`, item]));
1332
1469
  const conflicts = [];
1470
+ const packageJson = await readPackageJson(targetDir);
1471
+ const previousNpmByName = buildNpmDependencyMap(previousMeta.npm ?? {});
1472
+ for (const dependency of listNpmDependencies(resolveInstallNpm(plan.manifest))) {
1473
+ const existing = findPackageDependency(packageJson, dependency.packageName);
1474
+ const previous = previousNpmByName.get(dependency.packageName);
1475
+ if (!existing) {
1476
+ if (previous) {
1477
+ conflicts.push({
1478
+ kind: "package_dependency_conflict",
1479
+ path: `package.json#dependencies.${dependency.packageName}`,
1480
+ packageName: dependency.packageName,
1481
+ requestedVersion: dependency.version,
1482
+ message: `managed npm package missing from package.json: ${dependency.packageName}`
1483
+ });
1484
+ }
1485
+ continue;
1486
+ }
1487
+ const canUpdateManagedVersion = previous && existing === previous.version;
1488
+ if (existing !== dependency.version && !canUpdateManagedVersion) {
1489
+ conflicts.push({
1490
+ kind: "package_dependency_conflict",
1491
+ path: `package.json#dependencies.${dependency.packageName}`,
1492
+ packageName: dependency.packageName,
1493
+ requestedVersion: dependency.version,
1494
+ existingVersion: existing,
1495
+ message: `${dependency.packageName} is already declared as ${existing} in package.json`
1496
+ });
1497
+ }
1498
+ }
1333
1499
  for (const managedFile of previousMeta.files) {
1334
1500
  const absolutePath = ensurePathInsideTarget(targetDir, managedFile.path);
1335
1501
  if (!fs.existsSync(absolutePath)) {
@@ -1605,6 +1771,8 @@ async function materializeAddon(options) {
1605
1771
  }
1606
1772
  const removedFiles = previousMeta ? await removeObsoleteFiles(targetDir, previousMeta, new Set(plan.files.map((file) => file.targetPath))) : [];
1607
1773
  const restoredSettingsFiles = await restoreObsoleteSettings(targetDir, previousMeta, plan.settings);
1774
+ const npm = resolveInstallNpm(plan.manifest);
1775
+ const packageJsonFiles = await applyNpmDependencies(targetDir, npm);
1608
1776
  await writePlannedFiles(targetDir, plan.files);
1609
1777
  const settingsResult = await applyPlannedSettings(targetDir, plan.settings);
1610
1778
  const installedFiles = [];
@@ -1627,13 +1795,17 @@ async function materializeAddon(options) {
1627
1795
  await promises$1.writeFile(plan.metaPath, JSON.stringify(meta, null, 2));
1628
1796
  const nextMetas = existingMetas.filter((item) => item.name !== meta.name).concat(meta);
1629
1797
  await rebuildRegistryFiles(targetDir, plan.applicationType, nextMetas.filter((item) => item.applicationType === plan.applicationType));
1798
+ if (options.installPackageDependencies && packageJsonFiles.length) {
1799
+ await installPackageDependencies(targetDir);
1800
+ }
1630
1801
  const requirements = resolveInstallRequirements(plan.manifest);
1631
1802
  return {
1632
1803
  meta,
1633
- writtenFiles: installedFiles.map((file) => file.path).concat(restoredSettingsFiles, settingsResult.writtenFiles),
1804
+ writtenFiles: installedFiles.map((file) => file.path).concat(packageJsonFiles, restoredSettingsFiles, settingsResult.writtenFiles),
1634
1805
  removedFiles,
1635
1806
  requirements,
1636
- missingRequirements: buildMissingRequirements(requirements)
1807
+ missingRequirements: buildMissingRequirements(requirements),
1808
+ npm
1637
1809
  };
1638
1810
  }
1639
1811
  async function installAddonFromExtractedDirectory(options) {
@@ -1889,7 +2061,8 @@ async function installAddonFromRegistry(options) {
1889
2061
  extractedDir,
1890
2062
  applicationType: options.applicationType,
1891
2063
  organizationCode: options.organizationCode,
1892
- installParameters: options.installParameters
2064
+ installParameters: options.installParameters,
2065
+ installPackageDependencies: true
1893
2066
  });
1894
2067
  } finally {
1895
2068
  await removeTempDirectory(extractedDir).catch(() => void 0);
@@ -1907,7 +2080,8 @@ async function upgradeAddonFromRegistry(options) {
1907
2080
  extractedDir,
1908
2081
  applicationType: options.applicationType,
1909
2082
  organizationCode: options.organizationCode,
1910
- installParameters: options.installParameters
2083
+ installParameters: options.installParameters,
2084
+ installPackageDependencies: true
1911
2085
  });
1912
2086
  } finally {
1913
2087
  await removeTempDirectory(extractedDir).catch(() => void 0);