@patterkit/compiler 0.10.0 → 0.12.0

package/dist/index.cjs

@@ -618,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) };
@@ -656,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,
@@ -742,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}`));
@@ -758,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: {
@@ -810,9 +836,10 @@ function exportBundle(input) {
     // The project's own line-padding default, only when it sets one: absent, every runtime uses the built-in one.
     ...typeof project.padAfterDefault === "number" ? { padAfterDefault: project.padAfterDefault } : {},
     properties: resolved(project.properties),
-    // A host scope's declarations ship as written: there, "no default" is the game's to supply, and saying
-    // so is what an integrator reads the bundle for.
-    scopeRegistry: hostScopes,
+    scopeRegistry: hostScopes && {
+      ...hostScopes,
+      scopes: hostScopes.scopes.map((s) => s.declarations ? { ...s, declarations: resolved(s.declarations) } : s)
+    },
     gameDataFields: project.gameDataFields && Object.fromEntries(
       Object.entries(project.gameDataFields).map(([kind, fields]) => [kind, resolved(fields)])
     ),

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";
@@ -595,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) };
@@ -633,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,
@@ -719,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}`));
@@ -735,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: {
@@ -787,9 +813,10 @@ function exportBundle(input) {
     // The project's own line-padding default, only when it sets one: absent, every runtime uses the built-in one.
     ...typeof project.padAfterDefault === "number" ? { padAfterDefault: project.padAfterDefault } : {},
     properties: resolved(project.properties),
-    // A host scope's declarations ship as written: there, "no default" is the game's to supply, and saying
-    // so is what an integrator reads the bundle for.
-    scopeRegistry: hostScopes,
+    scopeRegistry: hostScopes && {
+      ...hostScopes,
+      scopes: hostScopes.scopes.map((s) => s.declarations ? { ...s, declarations: resolved(s.declarations) } : s)
+    },
     gameDataFields: project.gameDataFields && Object.fromEntries(
       Object.entries(project.gameDataFields).map(([kind, fields]) => [kind, resolved(fields)])
     ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/compiler",
-  "version": "0.10.0",
+  "version": "0.12.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.17.0",
-    "@patterkit/core": "0.9.1",
-    "@patterkit/dialect": "0.2.14",
+    "@patterkit/model": "0.19.0",
+    "@patterkit/core": "0.9.3",
+    "@patterkit/dialect": "0.2.16",
     "@wildwinter/expr": "^0.6.0",
-    "@wildwinter/toolkit": "^0.2.1"
+    "@wildwinter/toolkit": "^0.2.2"
   },
   "peerDependencies": {
     "@wildwinter/scoperegistry": ">=0.9.0 <1.0.0"