@bastani/atomic 0.8.29 → 0.8.30-alpha.1

package/dist/core/package-manager.js

@@ -24,6 +24,7 @@ import { basename, dirname, join, relative, resolve, sep } from "node:path";
 import { globSync } from "glob";
 import ignore from "ignore";
 import { minimatch } from "minimatch";
+import { maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
 import { APP_NAME, CONFIG_DIR_NAME, ENV_OFFLINE, getAgentDir, getAgentDirs, getEnvValue, getProjectConfigDirs } from "../config.js";
 import { spawnProcess, spawnProcessSync } from "../utils/child-process.js";
 import { createGitEnvironment } from "../utils/git-env.js";
@@ -39,6 +40,12 @@ function isOfflineModeEnabled() {
         return false;
     return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
 }
+function isExactNpmVersion(version) {
+    return valid(version ?? "") !== null;
+}
+function getNpmVersionRange(version) {
+    return version ? (validRange(version) ?? undefined) : undefined;
+}
 function isGitCommand(command) {
     const commandName = basename(command).toLowerCase();
     return commandName === "git" || commandName === "git.exe";
@@ -941,8 +948,8 @@ export class DefaultPackageManager {
             return true;
         }
         try {
-            const latestVersion = await this.getLatestNpmVersion(source.name);
-            return latestVersion !== installedVersion;
+            const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
+            return targetVersion !== installedVersion;
         }
         catch {
             // Preserve existing update behavior when version lookup fails.
@@ -955,7 +962,7 @@ export class DefaultPackageManager {
         }
         const sourceLabel = sources.length === 1 ? sources[0].source : `${scope} npm packages`;
         const message = sources.length === 1 ? `Updating ${sources[0].source}...` : `Updating ${scope} npm packages...`;
-        const specs = sources.map((entry) => `${entry.parsed.name}@latest`);
+        const specs = sources.map((entry) => (entry.parsed.version ? entry.parsed.spec : `${entry.parsed.name}@latest`));
         await this.withProgress("update", sourceLabel, message, async () => {
             await this.installNpmBatch(specs, scope);
         });
@@ -1053,14 +1060,15 @@ export class DefaultPackageManager {
             };
             if (parsed.type === "npm") {
                 let installedPath = this.getExistingNpmInstallPath(parsed, scope);
-                const needsInstall = !installedPath ||
-                    (parsed.pinned && !(await this.installedNpmMatchesPinnedVersion(parsed, installedPath)));
-                if (needsInstall)
-                    installedPath = this.getNpmInstallPath(parsed, scope);
+                const needsInstall = !installedPath || !(await this.installedNpmMatchesConfiguredVersion(parsed, installedPath));
                 if (needsInstall) {
                     const installed = await installMissing();
                     if (!installed)
                         continue;
+                    installedPath = this.getExistingNpmInstallPath(parsed, scope);
+                    if (!installedPath || !(await this.installedNpmMatchesConfiguredVersion(parsed, installedPath))) {
+                        continue;
+                    }
                 }
                 if (!installedPath)
                     continue;
@@ -1197,7 +1205,9 @@ export class DefaultPackageManager {
                 type: "npm",
                 spec,
                 name,
-                pinned: Boolean(version),
+                version,
+                range: getNpmVersionRange(version),
+                pinned: isExactNpmVersion(version),
             };
         }
         if (isLocalPath(source)) {
@@ -1210,16 +1220,30 @@ export class DefaultPackageManager {
         }
         return { type: "local", path: source };
     }
-    async installedNpmMatchesPinnedVersion(source, installedPath) {
+    async installedNpmMatchesConfiguredVersion(source, installedPath) {
         const installedVersion = this.getInstalledNpmVersion(installedPath);
         if (!installedVersion) {
             return false;
         }
-        const { version: pinnedVersion } = this.parseNpmSpec(source.spec);
-        if (!pinnedVersion) {
-            return true;
+        if (source.range) {
+            return satisfies(installedVersion, source.range);
+        }
+        if (source.version !== undefined) {
+            if (isOfflineModeEnabled()) {
+                // Non-semver selectors such as npm dist-tags are mutable, but offline mode cannot
+                // resolve the current registry target. Keep an already-installed copy usable;
+                // online resolution still verifies the exact tag target before accepting it.
+                return true;
+            }
+            try {
+                const targetVersion = await this.getLatestNpmVersion(source.spec);
+                return installedVersion === targetVersion;
+            }
+            catch {
+                return false;
+            }
         }
-        return installedVersion === pinnedVersion;
+        return true;
     }
     async npmHasAvailableUpdate(source, installedPath) {
         if (isOfflineModeEnabled()) {
@@ -1230,8 +1254,8 @@ export class DefaultPackageManager {
             return false;
         }
         try {
-            const latestVersion = await this.getLatestNpmVersion(source.name);
-            return latestVersion !== installedVersion;
+            const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
+            return targetVersion !== installedVersion;
         }
         catch {
             return false;
@@ -1250,13 +1274,23 @@ export class DefaultPackageManager {
             return undefined;
         }
     }
-    async getLatestNpmVersion(packageName) {
+    async getLatestNpmVersion(packageSpec, range) {
         const npmCommand = this.getNpmCommand();
-        const stdout = await this.runCommandCapture(npmCommand.command, [...npmCommand.args, "view", packageName, "version", "--json"], { cwd: this.cwd, timeoutMs: NETWORK_TIMEOUT_MS });
+        const stdout = await this.runCommandCapture(npmCommand.command, [...npmCommand.args, "view", packageSpec, "version", "--json"], { cwd: this.cwd, timeoutMs: NETWORK_TIMEOUT_MS });
         const raw = stdout.trim();
         if (!raw)
             throw new Error("Empty response from npm view");
-        return JSON.parse(raw);
+        const parsed = JSON.parse(raw);
+        if (typeof parsed === "string") {
+            return parsed;
+        }
+        if (Array.isArray(parsed)) {
+            const versions = parsed.filter((value) => typeof value === "string" && value.length > 0);
+            const latest = range ? maxSatisfying(versions, range) : [...versions].sort(rcompare)[0];
+            if (latest)
+                return latest;
+        }
+        throw new Error("Unexpected response from npm view");
     }
     async gitHasAvailableUpdate(installedPath) {
         if (isOfflineModeEnabled()) {