@patterkit/compiler 0.12.0 → 0.14.0

package/dist/index.cjs

@@ -430,18 +430,17 @@ function extensionPass(input) {
   for (const [id, entry] of Object.entries(taken)) {
     const m = manifests.get(id);
     const version = typeof entry?.version === "string" ? entry.version : "";
-    const settings = entry?.settings ?? {};
     if (m === void 0) {
       issues.push({
         severity: "warning",
         file: projectPath,
         message: `the project takes the Patter extension "${id}", but has no manifest for it at ${import_model2.EXTENSIONS_DIR}/${id}${import_model2.MANIFEST_EXTENSION}; its data is left as it is, and not compiled`
       });
-      takenList.push({ id, settings });
+      takenList.push({ id });
       continue;
     }
     if (!m.sound) {
-      takenList.push({ id, settings });
+      takenList.push({ id });
       continue;
     }
     const manifest = m.manifest;
@@ -452,26 +451,34 @@ function extensionPass(input) {
         message: `the project takes "${id}" ${version === "" ? "with no version" : `at version ${version}`}, but its manifest is version ${manifest.version}; run \`patter format\` to take it (renamed stages are renamed in the data as it does)`
       });
     }
-    const known = new Set((manifest.settings ?? []).map((s) => s.name));
-    for (const [name, value] of Object.entries(settings)) {
-      if (!known.has(name)) {
-        issues.push({ severity: "warning", file: projectPath, message: `"${id}" has no setting "${name}"; it's ignored` });
-      } else if (typeof value !== "string" || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(value)) {
-        issues.push({
-          severity: "error",
-          file: projectPath,
-          message: `"${id}"'s setting "${name}" names a gameData field, so it's a field name, not ${JSON.stringify(value)}`
-        });
-      }
-    }
-    takenList.push({ id, settings, manifest });
+    takenList.push({ id, manifest });
   }
   const sound = new Map(takenList.filter((t) => t.manifest !== void 0).map((t) => [t.id, t.manifest]));
   const nodes = extensionNodes(project, scenes);
-  const claims = takenList.flatMap((t) => t.manifest ? (0, import_extensions.resolvedClaims)(t.manifest, "patter", t.settings) : []);
-  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 +548,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);
@@ -555,7 +562,6 @@ function extensionPass(input) {
     }
   }
   const bundle = {};
-  const chosen = new Map(takenList.map((t) => [t.id, t.settings]));
   for (const [id, manifest] of [...sound.entries()].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) {
     const fields = {};
     for (const kind of Object.keys(manifest.targets.patter ?? {}).sort()) {
@@ -563,59 +569,24 @@ function extensionPass(input) {
       if (target !== void 0) fields[kind] = (0, import_extensions.compiledTarget)(target);
     }
     const projectEntry = projectValues.get(id);
-    const settings = (manifest.settings ?? []).length > 0 ? sortRecord((0, import_extensions.settingValues)(manifest, chosen.get(id))) : void 0;
-    bundle[id] = {
-      version: manifest.version,
-      fields,
-      ...projectEntry !== void 0 ? { project: projectEntry } : {},
-      ...settings !== void 0 ? { settings } : {}
-    };
+    bundle[id] = { version: manifest.version, fields, ...projectEntry !== void 0 ? { project: projectEntry } : {} };
   }
   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]]));
 }
-function claimIssues(input, nodes, claims) {
-  const issues = [];
-  const projectPath = input.projectPath ?? "";
-  const declared = input.project.gameDataFields ?? {};
-  for (const claim of claims) {
-    const decl = (declared[claim.kind] ?? []).find((d) => d.name === claim.field);
-    if (decl === void 0) {
-      issues.push({
-        severity: "warning",
-        file: projectPath,
-        message: `the Patter extension "${claim.extension}" claims the ${claim.kind} gameData field "${claim.field}", which the project doesn't declare`
-      });
-      continue;
-    }
-    if (decl.type !== claim.claim.type) {
-      issues.push({
-        severity: "error",
-        file: projectPath,
-        message: `the Patter extension "${claim.extension}" claims the ${claim.kind} gameData field "${claim.field}" as ${claim.claim.type}, but the project declares it as ${decl.type}`
-      });
-      continue;
-    }
-    const effective = (0, import_extensions.effectiveClaim)(claim.claim, decl);
-    for (const [id, node] of nodes) {
-      if (node.kind !== claim.kind || node.gameData === void 0 || !own(node.gameData, claim.field)) continue;
-      const file = (node.scene !== void 0 ? input.sceneFiles?.[node.scene] : void 0) ?? projectPath;
-      for (const p of (0, import_extensions.valueProblems)(effective, node.gameData[claim.field])) {
-        issues.push({
-          severity: p.severity,
-          file,
-          node: id,
-          code: p.code,
-          message: `${claim.kind} '${id}' gameData "${claim.field}", as the Patter extension "${claim.extension}" claims it: ${p.message}`
-        });
-      }
-    }
-  }
-  return issues;
-}
 
 // src/export.ts
 function compileBeat(beat, ctx, asAction = false) {
@@ -844,8 +815,7 @@ function exportBundle(input) {
       Object.entries(project.gameDataFields).map(([kind, fields]) => [kind, resolved(fields)])
     ),
     // The extensions the project takes: each one's version, its compiled declarations by node kind (every
-    // default resolved, editor-only fields and the editor's words left out), the project node's values, and
-    // its settings, each the project's value or else the default.
+    // default resolved, editor-only fields and the editor's words left out), and the project node's values.
     ...extensionSection !== void 0 ? { extensions: extensionSection } : {},
     // Closed-caption delimiters ride along only when the project pins a non-default pair (#214); the
     // runtime falls back to `[` / `]` when absent, so default projects keep their exact prior bundle.

package/dist/index.js

@@ -321,17 +321,14 @@ import { textIsAction, usedQualifiers, usedSpeakerPairs, walkNodes as walkNodes2
 import { EXTENSIONS_DIR, MANIFEST_EXTENSION, PROJECT_LOCALE_SCENE } from "@patterkit/model";
 import {
   HOSTS,
-  claimClashes,
   compileEntry,
   compiledTarget,
-  effectiveClaim,
   entryProblems,
   manifestProblems,
   orphanedEntries,
-  resolvedClaims,
-  settingValues,
-  targetOf,
-  valueProblems
+  pickClashes,
+  pickLists,
+  targetOf
 } from "@wildwinter/toolkit/extensions";
 function extensionNodes(project, scenes) {
   const nodes = /* @__PURE__ */ new Map();
@@ -407,18 +404,17 @@ function extensionPass(input) {
   for (const [id, entry] of Object.entries(taken)) {
     const m = manifests.get(id);
     const version = typeof entry?.version === "string" ? entry.version : "";
-    const settings = entry?.settings ?? {};
     if (m === void 0) {
       issues.push({
         severity: "warning",
         file: projectPath,
         message: `the project takes the Patter extension "${id}", but has no manifest for it at ${EXTENSIONS_DIR}/${id}${MANIFEST_EXTENSION}; its data is left as it is, and not compiled`
       });
-      takenList.push({ id, settings });
+      takenList.push({ id });
       continue;
     }
     if (!m.sound) {
-      takenList.push({ id, settings });
+      takenList.push({ id });
       continue;
     }
     const manifest = m.manifest;
@@ -429,26 +425,34 @@ function extensionPass(input) {
         message: `the project takes "${id}" ${version === "" ? "with no version" : `at version ${version}`}, but its manifest is version ${manifest.version}; run \`patter format\` to take it (renamed stages are renamed in the data as it does)`
       });
     }
-    const known = new Set((manifest.settings ?? []).map((s) => s.name));
-    for (const [name, value] of Object.entries(settings)) {
-      if (!known.has(name)) {
-        issues.push({ severity: "warning", file: projectPath, message: `"${id}" has no setting "${name}"; it's ignored` });
-      } else if (typeof value !== "string" || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(value)) {
-        issues.push({
-          severity: "error",
-          file: projectPath,
-          message: `"${id}"'s setting "${name}" names a gameData field, so it's a field name, not ${JSON.stringify(value)}`
-        });
-      }
-    }
-    takenList.push({ id, settings, manifest });
+    takenList.push({ id, manifest });
   }
   const sound = new Map(takenList.filter((t) => t.manifest !== void 0).map((t) => [t.id, t.manifest]));
   const nodes = extensionNodes(project, scenes);
-  const claims = takenList.flatMap((t) => t.manifest ? resolvedClaims(t.manifest, "patter", t.settings) : []);
-  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 +522,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);
@@ -532,7 +536,6 @@ function extensionPass(input) {
     }
   }
   const bundle = {};
-  const chosen = new Map(takenList.map((t) => [t.id, t.settings]));
   for (const [id, manifest] of [...sound.entries()].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) {
     const fields = {};
     for (const kind of Object.keys(manifest.targets.patter ?? {}).sort()) {
@@ -540,59 +543,24 @@ function extensionPass(input) {
       if (target !== void 0) fields[kind] = compiledTarget(target);
     }
     const projectEntry = projectValues.get(id);
-    const settings = (manifest.settings ?? []).length > 0 ? sortRecord(settingValues(manifest, chosen.get(id))) : void 0;
-    bundle[id] = {
-      version: manifest.version,
-      fields,
-      ...projectEntry !== void 0 ? { project: projectEntry } : {},
-      ...settings !== void 0 ? { settings } : {}
-    };
+    bundle[id] = { version: manifest.version, fields, ...projectEntry !== void 0 ? { project: projectEntry } : {} };
   }
   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]]));
 }
-function claimIssues(input, nodes, claims) {
-  const issues = [];
-  const projectPath = input.projectPath ?? "";
-  const declared = input.project.gameDataFields ?? {};
-  for (const claim of claims) {
-    const decl = (declared[claim.kind] ?? []).find((d) => d.name === claim.field);
-    if (decl === void 0) {
-      issues.push({
-        severity: "warning",
-        file: projectPath,
-        message: `the Patter extension "${claim.extension}" claims the ${claim.kind} gameData field "${claim.field}", which the project doesn't declare`
-      });
-      continue;
-    }
-    if (decl.type !== claim.claim.type) {
-      issues.push({
-        severity: "error",
-        file: projectPath,
-        message: `the Patter extension "${claim.extension}" claims the ${claim.kind} gameData field "${claim.field}" as ${claim.claim.type}, but the project declares it as ${decl.type}`
-      });
-      continue;
-    }
-    const effective = effectiveClaim(claim.claim, decl);
-    for (const [id, node] of nodes) {
-      if (node.kind !== claim.kind || node.gameData === void 0 || !own(node.gameData, claim.field)) continue;
-      const file = (node.scene !== void 0 ? input.sceneFiles?.[node.scene] : void 0) ?? projectPath;
-      for (const p of valueProblems(effective, node.gameData[claim.field])) {
-        issues.push({
-          severity: p.severity,
-          file,
-          node: id,
-          code: p.code,
-          message: `${claim.kind} '${id}' gameData "${claim.field}", as the Patter extension "${claim.extension}" claims it: ${p.message}`
-        });
-      }
-    }
-  }
-  return issues;
-}
 
 // src/export.ts
 function compileBeat(beat, ctx, asAction = false) {
@@ -821,8 +789,7 @@ function exportBundle(input) {
       Object.entries(project.gameDataFields).map(([kind, fields]) => [kind, resolved(fields)])
     ),
     // The extensions the project takes: each one's version, its compiled declarations by node kind (every
-    // default resolved, editor-only fields and the editor's words left out), the project node's values, and
-    // its settings, each the project's value or else the default.
+    // default resolved, editor-only fields and the editor's words left out), and the project node's values.
     ...extensionSection !== void 0 ? { extensions: extensionSection } : {},
     // Closed-caption delimiters ride along only when the project pins a non-default pair (#214); the
     // runtime falls back to `[` / `]` when absent, so default projects keep their exact prior bundle.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/compiler",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "Patter compiler: compile condition/effect expressions, validate them, and export source to the runtime bundle.",
   "type": "module",
   "license": "MIT",
@@ -34,11 +34,11 @@
     "build": "tsup src/index.ts --format esm,cjs --dts --clean"
   },
   "dependencies": {
-    "@patterkit/model": "0.19.0",
-    "@patterkit/core": "0.9.3",
-    "@patterkit/dialect": "0.2.16",
+    "@patterkit/model": "0.20.0",
+    "@patterkit/core": "0.9.5",
+    "@patterkit/dialect": "0.2.17",
     "@wildwinter/expr": "^0.6.0",
-    "@wildwinter/toolkit": "^0.2.2"
+    "@wildwinter/toolkit": "^0.3.0"
   },
   "peerDependencies": {
     "@wildwinter/scoperegistry": ">=0.9.0 <1.0.0"