zyrk 0.5.6 → 0.5.7

package/VERSION

@@ -1 +1 @@
-v0.5.6
+v0.5.7

package/dist/commands/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAoEA,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAwEF,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAqZjB"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAwEA,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAwEF,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAoajB"}

package/dist/commands/deploy.js

@@ -1,3 +1,4 @@
+import { selectPlatformGraph, selectWorkspacePlatform, } from "../install/platform.js";
 import { installedRegistryConfig } from "../install/registry-policy.js";
 /** Self-contained runtime deployment and explicit local Docker commands. */
 import { constants } from "node:fs";
@@ -179,7 +180,13 @@ export async function runDeployCommand(options) {
             const installedKeys = new Set(Array.isArray(state.contexts)
                 ? state.contexts.filter((v) => typeof v === "string")
                 : []);
-            const installedNodes = resolved.nodes.filter((n) => installedKeys.has(n.key));
+            const activeResolved = selectPlatformGraph({
+                ...resolved,
+                roots: resolved.roots.filter((root) => installedKeys.has(root.target)),
+            }, new Set(Object.keys(object(manifest.optionalDependencies)
+                ? manifest.optionalDependencies
+                : {})));
+            const installedNodes = activeResolved.nodes.filter((n) => installedKeys.has(n.key));
             const graph = createGraphDoc(installedNodes.map((n) => ({ ...n, deps: n.edges })));
             const directories = privateGraph
                 ? await privateDirectories(project, store, graph, state)
@@ -830,7 +837,7 @@ async function exportWorkspace(options, project, manifest, state, out, parent, f
         throw error("ZYRK_DEPLOY_ESCAPE", "Deployment output must be outside the managed store.");
     const barrier = await acquireLock(path.join(store.paths.locksDir, "liveness.lock"), { name: "workspace deployment retention" });
     try {
-        const graph = locked.graph, byKey = new Map(graph.nodes.map((n) => [n.key, n]));
+        const graph = selectWorkspacePlatform(locked.graph, undefined, true), byKey = new Map(graph.nodes.map((n) => [n.key, n]));
         const selected = new Set();
         const visit = (key) => {
             if (selected.has(key))

package/dist/commands/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/commands/project.ts"],"names":[],"mappings":"AAwDA,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAiJF,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAgRjB"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/commands/project.ts"],"names":[],"mappings":"AA4DA,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,MAAM,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AA+LF,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAgRjB"}

package/dist/commands/project.js

@@ -1,3 +1,4 @@
+import { selectPlatformGraph, selectWorkspacePlatform, } from "../install/platform.js";
 import { discoverWorkspaces, findWorkspaceRoot, planWorkspaceDependencies, selectWorkspaceImporters, workspaceScriptOrder, } from "../install/workspaces.js";
 import { readWorkspaceLock } from "../install/workspace-lock.js";
 /** Project inspection and explicit execution (SPEC 12.2, 18.3.1, D-1). */
@@ -48,6 +49,7 @@ function validateState(raw) {
         (raw.linker !== undefined &&
             raw.linker !== "private" &&
             raw.linker !== "shared") ||
+        (raw.omitDev !== undefined && typeof raw.omitDev !== "boolean") ||
         !Array.isArray(raw.direct) ||
         raw.direct.some((e) => !object(e) ||
             typeof e.name !== "string" ||
@@ -67,7 +69,8 @@ async function load(project) {
             state.lockDigest !== sha512Hex(canonicalJson(locked.doc)))
             throw fail("ZYRK_LOCK_MISMATCH", "The workspace manifests, authoritative lock and installed generation disagree.");
         const importer = workspace.importers.find((item) => item.directory === project);
-        const own = locked.graph.nodes.find((node) => node.kind === "local" && node.importer === importer?.id);
+        const activeGraph = selectWorkspacePlatform(locked.graph, undefined, state.omitDev);
+        const own = activeGraph.nodes.find((node) => node.kind === "local" && node.importer === importer?.id);
         if (!own)
             throw fail("ZYRK_LOCK_MISMATCH", "The selected workspace importer is absent from the authoritative graph.");
         return {
@@ -77,7 +80,7 @@ async function load(project) {
                 roots: {
                     ".": Object.fromEntries(own.edges.map((edge) => [edge.name, edge.target])),
                 },
-                nodes: Object.fromEntries(locked.graph.nodes.map((node) => [
+                nodes: Object.fromEntries(activeGraph.nodes.map((node) => [
                     node.key,
                     {
                         name: node.name,
@@ -103,7 +106,29 @@ async function load(project) {
     if (sha512Hex(canonicalJson(doc)) !== state.lockDigest ||
         doc.zyrk === undefined)
         throw fail("ZYRK_LOCK_MISMATCH", "The installed generation and package-lock.json disagree.");
-    return { state, extension: doc.zyrk };
+    const graph = selectPlatformGraph({
+        ...lockedGraph(doc),
+        roots: lockedGraph(doc).roots.filter((root) => state.direct.some((entry) => entry.name === root.name)),
+    }, new Set(Object.keys(object(doc.packages?.[""]?.optionalDependencies)
+        ? doc.packages[""].optionalDependencies
+        : {})));
+    return {
+        state,
+        extension: {
+            ...doc.zyrk,
+            roots: {
+                ".": Object.fromEntries(graph.roots.map((root) => [root.name, root.target])),
+            },
+            nodes: Object.fromEntries(graph.nodes.map((node) => [
+                node.key,
+                {
+                    ...doc.zyrk.nodes[node.key],
+                    edges: Object.fromEntries(node.edges.map((edge) => [edge.name, edge.target])),
+                    peers: Object.fromEntries(node.peerBindings.map((peer) => [peer.name, peer.target])),
+                },
+            ])),
+        },
+    };
 }
 function emit(options, result, human) {
     options.stdout.write(options.json

package/dist/install/platform.d.ts

@@ -1,5 +1,5 @@
 import { type RuntimePlatform, type FinalizedGraph } from "../resolve/resolver.ts";
 import type { WorkspaceGraph } from "./workspace-graph.ts";
 export declare function selectPlatformGraph(graph: FinalizedGraph, optionalRoots: ReadonlySet<string>, platform?: RuntimePlatform): FinalizedGraph;
-export declare function selectWorkspacePlatform(graph: WorkspaceGraph, platform?: RuntimePlatform): WorkspaceGraph;
+export declare function selectWorkspacePlatform(graph: WorkspaceGraph, platform?: RuntimePlatform, omitDev?: boolean): WorkspaceGraph;
 //# sourceMappingURL=platform.d.ts.map

package/dist/install/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../src/install/platform.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAuG3D,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,cAAc,EACrB,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,EAClC,QAAQ,kBAAoB,GAC3B,cAAc,CAqBhB;AACD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,cAAc,EACrB,QAAQ,kBAAoB,GAC3B,cAAc,CAsBhB"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../src/install/platform.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAuG3D,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,cAAc,EACrB,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,EAClC,QAAQ,kBAAoB,GAC3B,cAAc,CAqBhB;AACD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,cAAc,EACrB,QAAQ,kBAAoB,EAC5B,OAAO,UAAQ,GACd,cAAc,CA+BhB"}

package/dist/install/platform.js

@@ -78,7 +78,14 @@ export function selectPlatformGraph(graph, optionalRoots, platform = currentPlat
         })),
     };
 }
-export function selectWorkspacePlatform(graph, platform = currentPlatform()) {
+export function selectWorkspacePlatform(graph, platform = currentPlatform(), omitDev = false) {
+    if (omitDev)
+        graph = {
+            ...graph,
+            nodes: graph.nodes.map((node) => node.kind === "local"
+                ? { ...node, edges: node.edges.filter((edge) => edge.kind !== "dev") }
+                : node),
+        };
     const { active, viable, omissions } = select(graph.nodes, Object.entries(graph.importers).map(([name, target]) => ({ name, target })), platform);
     return {
         ...graph,

package/dist/install/workspace-install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-install.d.ts","sourceRoot":"","sources":["../../src/install/workspace-install.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAuH9D,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CAkrBxB"}
+{"version":3,"file":"workspace-install.d.ts","sourceRoot":"","sources":["../../src/install/workspace-install.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAuH9D,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,CAAC,CAmrBxB"}

package/dist/install/workspace-install.js

@@ -189,7 +189,7 @@ export async function installWorkspaceProject(options) {
             : workspaceLockDoc(project, graph, fp), lockText = options.frozen
             ? await readFile(path.join(root, "package-lock.json"), "utf8")
             : JSON.stringify(doc, null, 2) + "\n";
-        graph = selectWorkspacePlatform(graph, options.platform);
+        graph = selectWorkspacePlatform(graph, options.platform, options.omitDev);
         const warnings = graph.omissions.map((o) => `${o.name}: omitted incompatible optional workspace dependency.`);
         for (const importer of project.importers)
             for (const stage of ["preinstall", "install", "postinstall"])
@@ -528,6 +528,7 @@ export async function installWorkspaceProject(options) {
                     linker: contexts.size ? "private" : "shared",
                     workspaceRoot: root,
                     importer: importer.id,
+                    omitDev: options.omitDev === true,
                     storeRoot: options.store.paths.root,
                     instances: registration.instances,
                     activeContexts: registration.contexts,

package/dist/install/workspace-lock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-lock.d.ts","sourceRoot":"","sources":["../../src/install/workspace-lock.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AASvD,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,wBAAgB,YAAY,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,MAAM,CAqBtD;AACD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,qBAAqB,GACxB,UAAU,CA0CZ;AACD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,CAmTrE;AACD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,EAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,EACpD,oBAAoB,UAAQ,GAC3B,OAAO,CAAC;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,GAAG,IAAI,CAAC,CAmD5D"}
+{"version":3,"file":"workspace-lock.d.ts","sourceRoot":"","sources":["../../src/install/workspace-lock.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AASvD,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,wBAAgB,YAAY,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,MAAM,CAqBtD;AACD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,qBAAqB,GACxB,UAAU,CA0CZ;AACD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,CAmTrE;AACD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,EAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,EACpD,oBAAoB,UAAQ,GAC3B,OAAO,CAAC;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,GAAG,IAAI,CAAC,CAwD5D"}

package/dist/install/workspace-lock.js

@@ -325,8 +325,13 @@ export async function readWorkspaceLock(root, project, registryOrigin, allowPlat
         object(doc) &&
         object(doc.zyrk) &&
         doc.zyrk.version === 2 &&
-        doc.zyrk.platformPolicy === undefined)
+        doc.zyrk.platformPolicy === undefined) {
+        const checked = structuredClone(doc);
+        checked.zyrk.platformPolicy =
+            "portable-optional/1";
+        validateWorkspaceLockDoc(checked);
         return null;
+    }
     const graph = validateWorkspaceLockDoc(doc);
     if (project) {
         const expected = new Map(project.importers.map((i) => [i.id, i]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zyrk",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "Storage-efficient Node package manager: one verified store per user, shared across projects through links.",
   "license": "MIT",
   "type": "module",