@amaster.ai/cli 1.1.37 → 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/dist/cli.js CHANGED
@@ -12,6 +12,7 @@ import { createServer } from 'http';
12
12
  import { execFile, spawn, spawnSync } from 'child_process';
13
13
  import YAML2, { parse as parse$1 } from 'yaml';
14
14
  import { promisify } from 'util';
15
+ import { validRange, intersects, minVersion, gte } from 'semver';
15
16
  import ts from 'typescript';
16
17
 
17
18
  var EXCLUDED_NAMES = /* @__PURE__ */ new Set([".git", "node_modules", ".DS_Store", "PROMPT.md"]);
@@ -1243,6 +1244,25 @@ function findPackageDependency(packageJson, packageName) {
1243
1244
  function buildNpmDependencyMap(npm) {
1244
1245
  return new Map(listNpmDependencies(npm).map((item) => [item.packageName, item]));
1245
1246
  }
1247
+ function isExistingNpmDependencyCompatible(existingVersion, requestedVersion) {
1248
+ if (existingVersion === requestedVersion) {
1249
+ return true;
1250
+ }
1251
+ const existingRange = validRange(existingVersion, { includePrerelease: true });
1252
+ const requestedRange = validRange(requestedVersion, { includePrerelease: true });
1253
+ if (!existingRange || !requestedRange) {
1254
+ return false;
1255
+ }
1256
+ if (intersects(existingRange, requestedRange, { includePrerelease: true })) {
1257
+ return true;
1258
+ }
1259
+ const existingMinimum = minVersion(existingRange);
1260
+ const requestedMinimum = minVersion(requestedRange);
1261
+ if (!existingMinimum || !requestedMinimum) {
1262
+ return false;
1263
+ }
1264
+ return gte(existingMinimum, requestedMinimum);
1265
+ }
1246
1266
  async function collectDirectoryFiles(sourceDir) {
1247
1267
  const entries = await readdir(sourceDir, { withFileTypes: true });
1248
1268
  const files = [];
@@ -1629,6 +1649,10 @@ async function applyNpmDependencies(targetDir, npm) {
1629
1649
  const packageJson = await readPackageJson(targetDir);
1630
1650
  let changed = false;
1631
1651
  for (const dependency of dependencies) {
1652
+ const existing = findPackageDependency(packageJson, dependency.packageName);
1653
+ if (existing && isExistingNpmDependencyCompatible(existing, dependency.version)) {
1654
+ continue;
1655
+ }
1632
1656
  const section = packageJson.dependencies;
1633
1657
  const nextSection = isPlainObject(section) ? section : {};
1634
1658
  if (!isPlainObject(section)) {
@@ -1680,7 +1704,7 @@ async function validateInstallConflicts(targetDir, plan, existingMetas) {
1680
1704
  const packageJson = await readPackageJson(targetDir);
1681
1705
  for (const dependency of listNpmDependencies(resolveInstallNpm(plan.manifest))) {
1682
1706
  const existing = findPackageDependency(packageJson, dependency.packageName);
1683
- if (existing && existing !== dependency.version) {
1707
+ if (existing && !isExistingNpmDependencyCompatible(existing, dependency.version)) {
1684
1708
  conflicts.push({
1685
1709
  kind: "package_dependency_conflict",
1686
1710
  path: `package.json#dependencies.${dependency.packageName}`,
@@ -1773,7 +1797,7 @@ async function validateUpgradeConflicts(targetDir, plan, existingMetas, previous
1773
1797
  continue;
1774
1798
  }
1775
1799
  const canUpdateManagedVersion = previous && existing === previous.version;
1776
- if (existing !== dependency.version && !canUpdateManagedVersion) {
1800
+ if (existing !== dependency.version && !canUpdateManagedVersion && !isExistingNpmDependencyCompatible(existing, dependency.version)) {
1777
1801
  conflicts.push({
1778
1802
  kind: "package_dependency_conflict",
1779
1803
  path: `package.json#dependencies.${dependency.packageName}`,