@pnpm/workspace.project-manifest-reader 1100.0.13 → 1100.0.14

package/lib/index.js

@@ -194,10 +194,11 @@ function convertManifestBeforeWrite(manifest) {
     return manifest;
 }
 function convertDependenciesToEnginesRuntime(manifest, dependenciesFieldName, enginesFieldName) {
+    const dependencies = readDependenciesField(manifest, dependenciesFieldName);
     for (const runtimeName of ['node', 'deno', 'bun']) {
-        const dep = manifest[dependenciesFieldName]?.[runtimeName];
-        if (typeof dep === 'string' && dep.startsWith('runtime:')) {
-            const version = dep.replace(/^runtime:/, '');
+        const dep = dependencies?.[runtimeName];
+        if (dependencies != null && typeof dep === 'string' && dep.startsWith('runtime:')) {
+            const version = dep.slice('runtime:'.length).trim();
             manifest[enginesFieldName] ??= {};
             const runtimeEntry = {
                 name: runtimeName,
@@ -226,11 +227,42 @@ function convertDependenciesToEnginesRuntime(manifest, dependenciesFieldName, en
                     runtimeEntry,
                 ];
             }
-            if (manifest[dependenciesFieldName]) {
-                delete manifest[dependenciesFieldName][runtimeName];
-            }
+            delete dependencies[runtimeName];
+        }
+        else {
+            removeManagedRuntimeEntry(manifest[enginesFieldName], runtimeName);
+        }
+    }
+}
+function readDependenciesField(manifest, dependenciesFieldName) {
+    const dependencies = manifest[dependenciesFieldName];
+    if (dependencies === undefined)
+        return undefined;
+    if (dependencies === null || typeof dependencies !== 'object' || Array.isArray(dependencies)) {
+        throw new PnpmError('INVALID_DEPENDENCIES_FIELD', `The "${dependenciesFieldName}" field must be an object.`);
+    }
+    return dependencies;
+}
+function removeManagedRuntimeEntry(enginesField, runtimeName) {
+    if (!enginesField?.runtime)
+        return;
+    if (Array.isArray(enginesField.runtime)) {
+        const runtimes = enginesField.runtime.filter((runtime) => !isManagedRuntimeEntry(runtime, runtimeName));
+        if (runtimes.length === 0) {
+            delete enginesField.runtime;
+        }
+        else {
+            enginesField.runtime = runtimes;
         }
     }
+    else if (isManagedRuntimeEntry(enginesField.runtime, runtimeName)) {
+        delete enginesField.runtime;
+    }
+}
+function isManagedRuntimeEntry(runtime, runtimeName) {
+    return runtime.name === runtimeName &&
+        runtime.onFail === 'download' &&
+        typeof runtime.version === 'string';
 }
 const dependencyKeys = new Set([
     'dependencies',
@@ -243,7 +275,10 @@ function normalize(manifest) {
     for (const key in manifest) {
         if (Object.hasOwn(manifest, key)) {
             const value = manifest[key];
-            if (typeof value !== 'object' || value === null || !dependencyKeys.has(key)) {
+            if (typeof value !== 'object' ||
+                value === null ||
+                !dependencyKeys.has(key) ||
+                Array.isArray(value)) {
                 result[key] = structuredClone(value);
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/workspace.project-manifest-reader",
-  "version": "1100.0.13",
+  "version": "1100.0.14",
   "description": "Read a project manifest (called package.json in most cases)",
   "keywords": [
     "pnpm",
@@ -10,9 +10,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/workspace/project-manifest-reader"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/workspace/project-manifest-reader"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/project-manifest-reader#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/workspace/project-manifest-reader#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -35,12 +35,12 @@
     "parse-json": "^8.3.0",
     "read-yaml-file": "^3.0.0",
     "strip-bom": "^5.0.0",
-    "@pnpm/error": "1100.0.0",
-    "@pnpm/pkg-manifest.utils": "1100.2.5",
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/fs.graceful-fs": "1100.1.0",
     "@pnpm/text.comments-parser": "1100.0.0",
     "@pnpm/types": "1101.3.2",
     "@pnpm/workspace.project-manifest-writer": "1100.0.8",
-    "@pnpm/fs.graceful-fs": "1100.1.0"
+    "@pnpm/pkg-manifest.utils": "1100.2.6"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -50,8 +50,8 @@
     "@types/is-windows": "^1.0.2",
     "@types/parse-json": "^7.0.0",
     "tempy": "3.0.0",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.13",
-    "@pnpm/test-fixtures": "1100.0.0"
+    "@pnpm/test-fixtures": "1100.0.0",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.14"
   },
   "engines": {
     "node": ">=22.13"