@patterkit/compiler 0.9.0 → 0.10.0

package/dist/index.cjs

@@ -555,6 +555,7 @@ 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()) {
@@ -562,7 +563,13 @@ function extensionPass(input) {
       if (target !== void 0) fields[kind] = (0, import_extensions.compiledTarget)(target);
     }
     const projectEntry = projectValues.get(id);
-    bundle[id] = { version: manifest.version, fields, ...projectEntry !== void 0 ? { project: projectEntry } : {} };
+    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 } : {}
+    };
   }
   const sortedNodes = new Map([...values.entries()].map(([id, v]) => [id, sortRecord(v)]));
   return { issues, compiled: { bundle, nodes: sortedNodes } };
@@ -592,10 +599,11 @@ function claimIssues(input, nodes, claims) {
       });
       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)(claim.claim, node.gameData[claim.field])) {
+      for (const p of (0, import_extensions.valueProblems)(effective, node.gameData[claim.field])) {
         issues.push({
           severity: p.severity,
           file,
@@ -809,7 +817,8 @@ 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) and the project node's values.
+    // 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.
     ...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

@@ -324,10 +324,12 @@ import {
   claimClashes,
   compileEntry,
   compiledTarget,
+  effectiveClaim,
   entryProblems,
   manifestProblems,
   orphanedEntries,
   resolvedClaims,
+  settingValues,
   targetOf,
   valueProblems
 } from "@wildwinter/toolkit/extensions";
@@ -530,6 +532,7 @@ 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()) {
@@ -537,7 +540,13 @@ function extensionPass(input) {
       if (target !== void 0) fields[kind] = compiledTarget(target);
     }
     const projectEntry = projectValues.get(id);
-    bundle[id] = { version: manifest.version, fields, ...projectEntry !== void 0 ? { project: projectEntry } : {} };
+    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 } : {}
+    };
   }
   const sortedNodes = new Map([...values.entries()].map(([id, v]) => [id, sortRecord(v)]));
   return { issues, compiled: { bundle, nodes: sortedNodes } };
@@ -567,10 +576,11 @@ function claimIssues(input, nodes, claims) {
       });
       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(claim.claim, node.gameData[claim.field])) {
+      for (const p of valueProblems(effective, node.gameData[claim.field])) {
         issues.push({
           severity: p.severity,
           file,
@@ -784,7 +794,8 @@ 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) and the project node's values.
+    // 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.
     ...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.9.0",
+  "version": "0.10.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.16.0",
-    "@patterkit/core": "0.9.0",
-    "@patterkit/dialect": "0.2.13",
+    "@patterkit/model": "0.17.0",
+    "@patterkit/core": "0.9.1",
+    "@patterkit/dialect": "0.2.14",
     "@wildwinter/expr": "^0.6.0",
-    "@wildwinter/toolkit": "^0.2.0"
+    "@wildwinter/toolkit": "^0.2.1"
   },
   "peerDependencies": {
     "@wildwinter/scoperegistry": ">=0.9.0 <1.0.0"