@patterkit/compiler 0.9.0 → 0.11.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,
@@ -610,11 +618,21 @@ function claimIssues(input, nodes, claims) {
 }
 
 // src/export.ts
-function compileBeat(beat, ctx) {
+function compileBeat(beat, ctx, asAction = false) {
   const values = ctx.extensions.get(beat.id);
-  if (values === void 0 && !Object.prototype.hasOwnProperty.call(beat, "extensions")) return beat;
-  const { extensions: _source, ...rest } = beat;
-  return values !== void 0 ? { ...rest, extensions: values } : rest;
+  const action = asAction && beat.kind === "text";
+  const has = (k) => Object.prototype.hasOwnProperty.call(beat, k);
+  if (values === void 0 && !action && !has("extensions") && !has("action")) return beat;
+  const { extensions: _source, action: _action, ...rest } = beat;
+  return { ...rest, ...values !== void 0 ? { extensions: values } : {}, ...action ? { action: true } : {} };
+}
+function collectActionIds(scene, out) {
+  for (const block of scene.blocks) {
+    (0, import_model3.walkNodes)(block.children, (node) => {
+      if (node.type !== "snippet") return;
+      for (const beat of node.beats ?? []) if (beat.kind === "text" && beat.action) out.push(beat.id);
+    });
+  }
 }
 function compileEffect(e, foreign) {
   return { kind: "set", target: e.target, value: compileExpression(e.value, foreign) };
@@ -648,7 +666,7 @@ function compileNode(node, ctx) {
     id: node.id,
     type: "snippet",
     condition: node.condition !== void 0 ? compileExpression(node.condition, foreign) : void 0,
-    beats: node.beats && node.beats.map((b) => compileBeat(b, ctx)),
+    beats: node.beats && node.beats.map((b) => compileBeat(b, ctx, ctx.action)),
     onEnter: node.onEnter?.map((e) => compileEffect(e, foreign)),
     onExit: node.onExit?.map((e) => compileEffect(e, foreign)),
     padAfterDefault: node.padAfterDefault,
@@ -734,7 +752,12 @@ function exportBundle(input) {
   const extensionSection = compiledExt !== void 0 && Object.keys(compiledExt.bundle).length > 0 ? compiledExt.bundle : void 0;
   const ctx = { foreign: compileScopes, extensions: compiledExt?.nodes ?? /* @__PURE__ */ new Map() };
   const scenesOut = {};
-  for (const scene of scenes) scenesOut[scene.id] = compileScene(scene, ctx);
+  const actionIds = [];
+  for (const scene of scenes) {
+    const action = (0, import_model3.textIsAction)(project, scene);
+    scenesOut[scene.id] = compileScene(scene, action ? { ...ctx, action } : ctx);
+    if (action) collectActionIds(scenesOut[scene.id], actionIds);
+  }
   const externalScopes = externalScopesIn(scenesOut, /* @__PURE__ */ new Set([...import_dialect3.EXTERNAL_SCOPES, ...gameExternal.map((s) => s.token)]));
   const qualifiers = (0, import_model3.usedQualifiers)(project, scenes).map((q) => ({ gameId: q.gameId, name: q.name }));
   const usedPairs = new Set((0, import_model3.usedSpeakerPairs)(scenes).map((p) => `${p.character}\0${p.qualifier}`));
@@ -750,6 +773,17 @@ function exportBundle(input) {
       table[key] = text;
     }
   }
+  if (actionIds.length > 0) {
+    const source = {};
+    for (const loc of locales) if (loc.locale === project.locales.default) Object.assign(source, loc.strings);
+    for (const [locale, table] of Object.entries(strings)) {
+      if (locale === project.locales.default) continue;
+      for (const id of actionIds) {
+        if (id in source) table[id] = source[id];
+        else delete table[id];
+      }
+    }
+  }
   return {
     schema: "patter/bundle@0",
     content: {
@@ -809,7 +843,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

@@ -315,7 +315,7 @@ import { hostScopesToSpec as hostScopesToSpec4, EXTERNAL_SCOPES as EXTERNAL_SCOP
 import { defaultFor } from "@wildwinter/scoperegistry";
 import { canonicalStringify, hash32 } from "@patterkit/core";
 import { hostScopesToSpec as hostScopesToSpec3, withEngineScopes as withEngineScopes2, EXTERNAL_SCOPES } from "@patterkit/dialect";
-import { usedQualifiers, usedSpeakerPairs, DEFAULT_SPEAKER_PATTERN } from "@patterkit/model";
+import { textIsAction, usedQualifiers, usedSpeakerPairs, walkNodes as walkNodes2, DEFAULT_SPEAKER_PATTERN } from "@patterkit/model";
 
 // src/extensions.ts
 import { EXTENSIONS_DIR, MANIFEST_EXTENSION, PROJECT_LOCALE_SCENE } from "@patterkit/model";
@@ -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,
@@ -585,11 +595,21 @@ function claimIssues(input, nodes, claims) {
 }
 
 // src/export.ts
-function compileBeat(beat, ctx) {
+function compileBeat(beat, ctx, asAction = false) {
   const values = ctx.extensions.get(beat.id);
-  if (values === void 0 && !Object.prototype.hasOwnProperty.call(beat, "extensions")) return beat;
-  const { extensions: _source, ...rest } = beat;
-  return values !== void 0 ? { ...rest, extensions: values } : rest;
+  const action = asAction && beat.kind === "text";
+  const has = (k) => Object.prototype.hasOwnProperty.call(beat, k);
+  if (values === void 0 && !action && !has("extensions") && !has("action")) return beat;
+  const { extensions: _source, action: _action, ...rest } = beat;
+  return { ...rest, ...values !== void 0 ? { extensions: values } : {}, ...action ? { action: true } : {} };
+}
+function collectActionIds(scene, out) {
+  for (const block of scene.blocks) {
+    walkNodes2(block.children, (node) => {
+      if (node.type !== "snippet") return;
+      for (const beat of node.beats ?? []) if (beat.kind === "text" && beat.action) out.push(beat.id);
+    });
+  }
 }
 function compileEffect(e, foreign) {
   return { kind: "set", target: e.target, value: compileExpression(e.value, foreign) };
@@ -623,7 +643,7 @@ function compileNode(node, ctx) {
     id: node.id,
     type: "snippet",
     condition: node.condition !== void 0 ? compileExpression(node.condition, foreign) : void 0,
-    beats: node.beats && node.beats.map((b) => compileBeat(b, ctx)),
+    beats: node.beats && node.beats.map((b) => compileBeat(b, ctx, ctx.action)),
     onEnter: node.onEnter?.map((e) => compileEffect(e, foreign)),
     onExit: node.onExit?.map((e) => compileEffect(e, foreign)),
     padAfterDefault: node.padAfterDefault,
@@ -709,7 +729,12 @@ function exportBundle(input) {
   const extensionSection = compiledExt !== void 0 && Object.keys(compiledExt.bundle).length > 0 ? compiledExt.bundle : void 0;
   const ctx = { foreign: compileScopes, extensions: compiledExt?.nodes ?? /* @__PURE__ */ new Map() };
   const scenesOut = {};
-  for (const scene of scenes) scenesOut[scene.id] = compileScene(scene, ctx);
+  const actionIds = [];
+  for (const scene of scenes) {
+    const action = textIsAction(project, scene);
+    scenesOut[scene.id] = compileScene(scene, action ? { ...ctx, action } : ctx);
+    if (action) collectActionIds(scenesOut[scene.id], actionIds);
+  }
   const externalScopes = externalScopesIn(scenesOut, /* @__PURE__ */ new Set([...EXTERNAL_SCOPES, ...gameExternal.map((s) => s.token)]));
   const qualifiers = usedQualifiers(project, scenes).map((q) => ({ gameId: q.gameId, name: q.name }));
   const usedPairs = new Set(usedSpeakerPairs(scenes).map((p) => `${p.character}\0${p.qualifier}`));
@@ -725,6 +750,17 @@ function exportBundle(input) {
       table[key] = text;
     }
   }
+  if (actionIds.length > 0) {
+    const source = {};
+    for (const loc of locales) if (loc.locale === project.locales.default) Object.assign(source, loc.strings);
+    for (const [locale, table] of Object.entries(strings)) {
+      if (locale === project.locales.default) continue;
+      for (const id of actionIds) {
+        if (id in source) table[id] = source[id];
+        else delete table[id];
+      }
+    }
+  }
   return {
     schema: "patter/bundle@0",
     content: {
@@ -784,7 +820,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.11.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.18.0",
+    "@patterkit/core": "0.9.2",
+    "@patterkit/dialect": "0.2.15",
     "@wildwinter/expr": "^0.6.0",
-    "@wildwinter/toolkit": "^0.2.0"
+    "@wildwinter/toolkit": "^0.2.1"
   },
   "peerDependencies": {
     "@wildwinter/scoperegistry": ">=0.9.0 <1.0.0"