@patterkit/compiler 0.12.0 → 0.13.0

package/dist/index.cjs

@@ -472,6 +472,29 @@ function extensionPass(input) {
   for (const p of (0, import_extensions.claimClashes)(claims)) issues.push({ severity: p.severity, file: projectPath, code: p.code, message: p.message });
   issues.push(...claimIssues(input, nodes, claims));
   const exists = (kind, id) => kind === "cast" ? (project.cast ?? []).some((c) => c.name === id) : nodes.get(id)?.kind === kind;
+  const projectId = project.project.id;
+  const projectEntries = /* @__PURE__ */ new Map();
+  for (const { shard } of input.shards) {
+    const entry = shard.entries?.["project"]?.[projectId];
+    if (typeof entry === "object" && entry !== null && !Array.isArray(entry) && !projectEntries.has(shard.extension)) {
+      projectEntries.set(shard.extension, entry);
+    }
+  }
+  const contexts = /* @__PURE__ */ new Map();
+  for (const [ext, manifest] of sound) {
+    contexts.set(ext, { exists, list: (0, import_extensions.pickLists)((0, import_extensions.targetOf)(manifest, "patter", "project"), projectEntries.get(ext)) });
+  }
+  const nodesOf = (kind) => kind === "cast" ? (project.cast ?? []).map((c) => ({ id: c.name })) : [...nodes].filter(([, n]) => n.kind === kind).map(([id]) => ({ id }));
+  for (const [ext, manifest] of [...sound].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) {
+    const said = /* @__PURE__ */ new Set();
+    for (const decl of pickDecls(manifest)) {
+      for (const p of (0, import_extensions.pickClashes)(decl, { nodes: nodesOf, list: contexts.get(ext).list })) {
+        if (said.has(p.message)) continue;
+        said.add(p.message);
+        issues.push({ severity: p.severity, file: projectPath, node: projectId, code: p.code, message: `the Patter extension "${ext}": ${p.message}` });
+      }
+    }
+  }
   const sceneIds = new Set(scenes.map((s) => s.id));
   const values = /* @__PURE__ */ new Map();
   const projectValues = /* @__PURE__ */ new Map();
@@ -541,7 +564,7 @@ function extensionPass(input) {
             message: `entries.${kind}.${id} belongs ${node.scene === void 0 ? "in the project's own shard" : `in scene "${node.scene}"'s shard`}; it's compiled from here all the same`
           });
         }
-        const problems = (0, import_extensions.entryProblems)(target, entry, { exists });
+        const problems = (0, import_extensions.entryProblems)(target, entry, contexts.get(ext) ?? { exists });
         for (const p of problems) issues.push(issueOf(path, p, `entries.${kind}.${id}${p.path === "" ? ": " : "."}`, id));
         if (problems.some((p) => p.severity === "error")) continue;
         const compiled = (0, import_extensions.compileEntry)(target, entry);
@@ -574,6 +597,16 @@ function extensionPass(input) {
   const sortedNodes = new Map([...values.entries()].map(([id, v]) => [id, sortRecord(v)]));
   return { issues, compiled: { bundle, nodes: sortedNodes } };
 }
+function pickDecls(manifest) {
+  const out = [];
+  const walk = (decl) => {
+    if (decl.type === "pick") out.push(decl);
+    for (const f of decl.fields ?? []) walk(f);
+    if (decl.of !== void 0) walk(decl.of);
+  };
+  for (const target of Object.values(manifest.targets.patter ?? {})) for (const f of target.fields ?? []) walk(f);
+  return out;
+}
 function sortRecord(r) {
   return Object.fromEntries(Object.keys(r).sort().map((k) => [k, r[k]]));
 }

package/dist/index.js

@@ -328,6 +328,8 @@ import {
   entryProblems,
   manifestProblems,
   orphanedEntries,
+  pickClashes,
+  pickLists,
   resolvedClaims,
   settingValues,
   targetOf,
@@ -449,6 +451,29 @@ function extensionPass(input) {
   for (const p of claimClashes(claims)) issues.push({ severity: p.severity, file: projectPath, code: p.code, message: p.message });
   issues.push(...claimIssues(input, nodes, claims));
   const exists = (kind, id) => kind === "cast" ? (project.cast ?? []).some((c) => c.name === id) : nodes.get(id)?.kind === kind;
+  const projectId = project.project.id;
+  const projectEntries = /* @__PURE__ */ new Map();
+  for (const { shard } of input.shards) {
+    const entry = shard.entries?.["project"]?.[projectId];
+    if (typeof entry === "object" && entry !== null && !Array.isArray(entry) && !projectEntries.has(shard.extension)) {
+      projectEntries.set(shard.extension, entry);
+    }
+  }
+  const contexts = /* @__PURE__ */ new Map();
+  for (const [ext, manifest] of sound) {
+    contexts.set(ext, { exists, list: pickLists(targetOf(manifest, "patter", "project"), projectEntries.get(ext)) });
+  }
+  const nodesOf = (kind) => kind === "cast" ? (project.cast ?? []).map((c) => ({ id: c.name })) : [...nodes].filter(([, n]) => n.kind === kind).map(([id]) => ({ id }));
+  for (const [ext, manifest] of [...sound].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) {
+    const said = /* @__PURE__ */ new Set();
+    for (const decl of pickDecls(manifest)) {
+      for (const p of pickClashes(decl, { nodes: nodesOf, list: contexts.get(ext).list })) {
+        if (said.has(p.message)) continue;
+        said.add(p.message);
+        issues.push({ severity: p.severity, file: projectPath, node: projectId, code: p.code, message: `the Patter extension "${ext}": ${p.message}` });
+      }
+    }
+  }
   const sceneIds = new Set(scenes.map((s) => s.id));
   const values = /* @__PURE__ */ new Map();
   const projectValues = /* @__PURE__ */ new Map();
@@ -518,7 +543,7 @@ function extensionPass(input) {
             message: `entries.${kind}.${id} belongs ${node.scene === void 0 ? "in the project's own shard" : `in scene "${node.scene}"'s shard`}; it's compiled from here all the same`
           });
         }
-        const problems = entryProblems(target, entry, { exists });
+        const problems = entryProblems(target, entry, contexts.get(ext) ?? { exists });
         for (const p of problems) issues.push(issueOf(path, p, `entries.${kind}.${id}${p.path === "" ? ": " : "."}`, id));
         if (problems.some((p) => p.severity === "error")) continue;
         const compiled = compileEntry(target, entry);
@@ -551,6 +576,16 @@ function extensionPass(input) {
   const sortedNodes = new Map([...values.entries()].map(([id, v]) => [id, sortRecord(v)]));
   return { issues, compiled: { bundle, nodes: sortedNodes } };
 }
+function pickDecls(manifest) {
+  const out = [];
+  const walk = (decl) => {
+    if (decl.type === "pick") out.push(decl);
+    for (const f of decl.fields ?? []) walk(f);
+    if (decl.of !== void 0) walk(decl.of);
+  };
+  for (const target of Object.values(manifest.targets.patter ?? {})) for (const f of target.fields ?? []) walk(f);
+  return out;
+}
 function sortRecord(r) {
   return Object.fromEntries(Object.keys(r).sort().map((k) => [k, r[k]]));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/compiler",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Patter compiler: compile condition/effect expressions, validate them, and export source to the runtime bundle.",
   "type": "module",
   "license": "MIT",
@@ -35,10 +35,10 @@
   },
   "dependencies": {
     "@patterkit/model": "0.19.0",
-    "@patterkit/core": "0.9.3",
+    "@patterkit/core": "0.9.4",
     "@patterkit/dialect": "0.2.16",
     "@wildwinter/expr": "^0.6.0",
-    "@wildwinter/toolkit": "^0.2.2"
+    "@wildwinter/toolkit": "^0.2.5"
   },
   "peerDependencies": {
     "@wildwinter/scoperegistry": ">=0.9.0 <1.0.0"