@amaster.ai/cli 1.1.38-beta.0 → 1.1.38

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
@@ -137,7 +137,7 @@ Addon 可在 `addon.json` 中声明安装后的运行配置要求:
137
137
  }
138
138
  ```
139
139
 
140
- `install.npm` 会写入应用根目录 `package.json`。如果目标应用已声明同名包且版本不一致,安装/升级会停止并返回 `package_dependency_conflict`。
140
+ `install.npm` 会写入应用根目录 `package.json`。如果目标应用已声明同名包,CLI 会按 semver 判断是否可保留现有版本:版本范围相交,或现有版本下限高于 Addon 请求下限时,保留应用现有版本;旧版本或无法按 semver 判断的差异会停止并返回 `package_dependency_conflict`。
141
141
  通过 registry 执行 `addon install` / `addon upgrade` 时,如果 `package.json` 有变更,CLI 会按当前应用自动执行 `bun install`、`pnpm install`、`npm install` 或 `yarn install`。
142
142
 
143
143
  `install.requirements` 会写入 `meta.json`,并在安装/升级结果中返回 `requirements` 和 `missingRequirements`。`secrets` 只保存键名和说明,不保存密钥值。
package/dist/cli.cjs CHANGED
@@ -14,6 +14,7 @@ var http = require('http');
14
14
  var child_process = require('child_process');
15
15
  var YAML2 = require('yaml');
16
16
  var util = require('util');
17
+ var semver = require('semver');
17
18
  var ts = require('typescript');
18
19
 
19
20
  var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -1270,6 +1271,25 @@ function findPackageDependency(packageJson, packageName) {
1270
1271
  function buildNpmDependencyMap(npm) {
1271
1272
  return new Map(listNpmDependencies(npm).map((item) => [item.packageName, item]));
1272
1273
  }
1274
+ function isExistingNpmDependencyCompatible(existingVersion, requestedVersion) {
1275
+ if (existingVersion === requestedVersion) {
1276
+ return true;
1277
+ }
1278
+ const existingRange = semver.validRange(existingVersion, { includePrerelease: true });
1279
+ const requestedRange = semver.validRange(requestedVersion, { includePrerelease: true });
1280
+ if (!existingRange || !requestedRange) {
1281
+ return false;
1282
+ }
1283
+ if (semver.intersects(existingRange, requestedRange, { includePrerelease: true })) {
1284
+ return true;
1285
+ }
1286
+ const existingMinimum = semver.minVersion(existingRange);
1287
+ const requestedMinimum = semver.minVersion(requestedRange);
1288
+ if (!existingMinimum || !requestedMinimum) {
1289
+ return false;
1290
+ }
1291
+ return semver.gte(existingMinimum, requestedMinimum);
1292
+ }
1273
1293
  async function collectDirectoryFiles(sourceDir) {
1274
1294
  const entries = await promises$1.readdir(sourceDir, { withFileTypes: true });
1275
1295
  const files = [];
@@ -1656,6 +1676,10 @@ async function applyNpmDependencies(targetDir, npm) {
1656
1676
  const packageJson = await readPackageJson(targetDir);
1657
1677
  let changed = false;
1658
1678
  for (const dependency of dependencies) {
1679
+ const existing = findPackageDependency(packageJson, dependency.packageName);
1680
+ if (existing && isExistingNpmDependencyCompatible(existing, dependency.version)) {
1681
+ continue;
1682
+ }
1659
1683
  const section = packageJson.dependencies;
1660
1684
  const nextSection = isPlainObject(section) ? section : {};
1661
1685
  if (!isPlainObject(section)) {
@@ -1707,7 +1731,7 @@ async function validateInstallConflicts(targetDir, plan, existingMetas) {
1707
1731
  const packageJson = await readPackageJson(targetDir);
1708
1732
  for (const dependency of listNpmDependencies(resolveInstallNpm(plan.manifest))) {
1709
1733
  const existing = findPackageDependency(packageJson, dependency.packageName);
1710
- if (existing && existing !== dependency.version) {
1734
+ if (existing && !isExistingNpmDependencyCompatible(existing, dependency.version)) {
1711
1735
  conflicts.push({
1712
1736
  kind: "package_dependency_conflict",
1713
1737
  path: `package.json#dependencies.${dependency.packageName}`,
@@ -1800,7 +1824,7 @@ async function validateUpgradeConflicts(targetDir, plan, existingMetas, previous
1800
1824
  continue;
1801
1825
  }
1802
1826
  const canUpdateManagedVersion = previous && existing === previous.version;
1803
- if (existing !== dependency.version && !canUpdateManagedVersion) {
1827
+ if (existing !== dependency.version && !canUpdateManagedVersion && !isExistingNpmDependencyCompatible(existing, dependency.version)) {
1804
1828
  conflicts.push({
1805
1829
  kind: "package_dependency_conflict",
1806
1830
  path: `package.json#dependencies.${dependency.packageName}`,