@patterkit/compiler 0.4.7 → 0.6.0

package/dist/index.cjs

@@ -348,6 +348,7 @@ var import_dialect4 = require("@patterkit/dialect");
 // src/export.ts
 var import_core = require("@patterkit/core");
 var import_dialect3 = require("@patterkit/dialect");
+var import_model2 = require("@patterkit/model");
 function compileEffect(e, foreign) {
   return { kind: "set", target: e.target, value: compileExpression(e.value, foreign) };
 }
@@ -361,6 +362,8 @@ function compileNode(node, foreign) {
       shared: node.shared,
       options: node.options,
       children: node.children.map((c) => compileNode(c, foreign)),
+      padAfterDefault: node.padAfterDefault,
+      // line padding: the default for the beats inside
       gameData: node.gameData,
       tags: node.tags,
       // author tags (#215), accumulated at runtime
@@ -378,6 +381,8 @@ function compileNode(node, foreign) {
     beats: node.beats,
     onEnter: node.onEnter?.map((e) => compileEffect(e, foreign)),
     onExit: node.onExit?.map((e) => compileEffect(e, foreign)),
+    padAfterDefault: node.padAfterDefault,
+    // line padding: the default for the beats inside
     gameData: node.gameData,
     tags: node.tags,
     // author tags (#215)
@@ -395,6 +400,8 @@ function compileBlock(block, foreign) {
     ...block.gameId ? { gameId: block.gameId } : {},
     // host-facing address; runtime falls back to the name slug
     children: block.children.map((c) => compileNode(c, foreign)),
+    padAfterDefault: block.padAfterDefault,
+    // line padding: the default for the beats inside
     gameData: block.gameData,
     tags: block.tags
     // author tags (#215)
@@ -407,6 +414,8 @@ function compileScene(scene, foreign) {
     name: scene.name,
     ...scene.gameId ? { gameId: scene.gameId } : {},
     // host-facing address; runtime falls back to the name slug
+    padAfterDefault: scene.padAfterDefault,
+    // line padding: the default for the beats inside
     gameData: scene.gameData,
     tags: scene.tags,
     // author tags (#215)
@@ -446,6 +455,7 @@ function exportBundle(input) {
   const scenesOut = {};
   for (const scene of scenes) scenesOut[scene.id] = compileScene(scene, compileScopes);
   const externalScopes = externalScopesIn(scenesOut, /* @__PURE__ */ new Set([...import_dialect3.EXTERNAL_SCOPES, ...gameExternal.map((s) => s.token)]));
+  const qualifiers = (0, import_model2.usedQualifiers)(project, scenes).map((q) => ({ gameId: q.gameId, name: q.name }));
   const strings = {};
   for (const loc of locales) {
     if (includeLocales && !includeLocales.includes(loc.locale)) continue;
@@ -464,21 +474,26 @@ function exportBundle(input) {
       // Binds saves to the content they were taken against, and gates bundle
       // staleness (schema §10.5). A stable strict-JSON fingerprint - independent
       // of the source-form trailing-comma policy.
-      // `scopeRegistry` is folded in only when present, so projects without host scopes keep their exact
-      // prior hash (no ripple to existing bundles / the conformance corpus).
+      // `scopeRegistry` and `qualifiers` are folded in only when present, so projects without them keep
+      // their exact prior hash (no ripple to existing bundles / the conformance corpus).
       hash: (0, import_core.hash32)((0, import_core.canonicalStringify)({
         scenes: scenesOut,
         strings,
         properties: project.properties ?? [],
-        ...foreignScopes ? { scopeRegistry: foreignScopes } : {}
+        ...foreignScopes ? { scopeRegistry: foreignScopes } : {},
+        ...qualifiers.length > 0 ? { qualifiers } : {},
+        ...typeof project.padAfterDefault === "number" ? { padAfterDefault: project.padAfterDefault } : {}
       }, { trailingComma: false })),
       // Structure-only fingerprint (live bundle refresh): the same hash with the string tables left
       // out. Same structureHash + a different hash = a text-only edit, safe to swap in place with
       // `engine.replaceStrings()`; a changed structureHash needs the full save/load hot swap.
+      // A qualifier's name rides in `qualifiers`, not the string tables, so renaming one is a structure change.
       structureHash: (0, import_core.hash32)((0, import_core.canonicalStringify)({
         scenes: scenesOut,
         properties: project.properties ?? [],
-        ...foreignScopes ? { scopeRegistry: foreignScopes } : {}
+        ...foreignScopes ? { scopeRegistry: foreignScopes } : {},
+        ...qualifiers.length > 0 ? { qualifiers } : {},
+        ...typeof project.padAfterDefault === "number" ? { padAfterDefault: project.padAfterDefault } : {}
       }, { trailingComma: false }))
     },
     voiced: project.voiced ?? false,
@@ -494,6 +509,9 @@ function exportBundle(input) {
       if (c.gameData !== void 0) m.gameData = c.gameData;
       return m;
     }),
+    ...qualifiers.length > 0 ? { qualifiers } : {},
+    // 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: project.properties,
     scopeRegistry: hostScopes,
     gameDataFields: project.gameDataFields,

package/dist/index.js

@@ -314,6 +314,7 @@ import { hostScopesToSpec as hostScopesToSpec4, EXTERNAL_SCOPES as EXTERNAL_SCOP
 // src/export.ts
 import { canonicalStringify, hash32 } from "@patterkit/core";
 import { hostScopesToSpec as hostScopesToSpec3, withEngineScopes as withEngineScopes2, EXTERNAL_SCOPES } from "@patterkit/dialect";
+import { usedQualifiers } from "@patterkit/model";
 function compileEffect(e, foreign) {
   return { kind: "set", target: e.target, value: compileExpression(e.value, foreign) };
 }
@@ -327,6 +328,8 @@ function compileNode(node, foreign) {
       shared: node.shared,
       options: node.options,
       children: node.children.map((c) => compileNode(c, foreign)),
+      padAfterDefault: node.padAfterDefault,
+      // line padding: the default for the beats inside
       gameData: node.gameData,
       tags: node.tags,
       // author tags (#215), accumulated at runtime
@@ -344,6 +347,8 @@ function compileNode(node, foreign) {
     beats: node.beats,
     onEnter: node.onEnter?.map((e) => compileEffect(e, foreign)),
     onExit: node.onExit?.map((e) => compileEffect(e, foreign)),
+    padAfterDefault: node.padAfterDefault,
+    // line padding: the default for the beats inside
     gameData: node.gameData,
     tags: node.tags,
     // author tags (#215)
@@ -361,6 +366,8 @@ function compileBlock(block, foreign) {
     ...block.gameId ? { gameId: block.gameId } : {},
     // host-facing address; runtime falls back to the name slug
     children: block.children.map((c) => compileNode(c, foreign)),
+    padAfterDefault: block.padAfterDefault,
+    // line padding: the default for the beats inside
     gameData: block.gameData,
     tags: block.tags
     // author tags (#215)
@@ -373,6 +380,8 @@ function compileScene(scene, foreign) {
     name: scene.name,
     ...scene.gameId ? { gameId: scene.gameId } : {},
     // host-facing address; runtime falls back to the name slug
+    padAfterDefault: scene.padAfterDefault,
+    // line padding: the default for the beats inside
     gameData: scene.gameData,
     tags: scene.tags,
     // author tags (#215)
@@ -412,6 +421,7 @@ function exportBundle(input) {
   const scenesOut = {};
   for (const scene of scenes) scenesOut[scene.id] = compileScene(scene, compileScopes);
   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 strings = {};
   for (const loc of locales) {
     if (includeLocales && !includeLocales.includes(loc.locale)) continue;
@@ -430,21 +440,26 @@ function exportBundle(input) {
       // Binds saves to the content they were taken against, and gates bundle
       // staleness (schema §10.5). A stable strict-JSON fingerprint - independent
       // of the source-form trailing-comma policy.
-      // `scopeRegistry` is folded in only when present, so projects without host scopes keep their exact
-      // prior hash (no ripple to existing bundles / the conformance corpus).
+      // `scopeRegistry` and `qualifiers` are folded in only when present, so projects without them keep
+      // their exact prior hash (no ripple to existing bundles / the conformance corpus).
       hash: hash32(canonicalStringify({
         scenes: scenesOut,
         strings,
         properties: project.properties ?? [],
-        ...foreignScopes ? { scopeRegistry: foreignScopes } : {}
+        ...foreignScopes ? { scopeRegistry: foreignScopes } : {},
+        ...qualifiers.length > 0 ? { qualifiers } : {},
+        ...typeof project.padAfterDefault === "number" ? { padAfterDefault: project.padAfterDefault } : {}
       }, { trailingComma: false })),
       // Structure-only fingerprint (live bundle refresh): the same hash with the string tables left
       // out. Same structureHash + a different hash = a text-only edit, safe to swap in place with
       // `engine.replaceStrings()`; a changed structureHash needs the full save/load hot swap.
+      // A qualifier's name rides in `qualifiers`, not the string tables, so renaming one is a structure change.
       structureHash: hash32(canonicalStringify({
         scenes: scenesOut,
         properties: project.properties ?? [],
-        ...foreignScopes ? { scopeRegistry: foreignScopes } : {}
+        ...foreignScopes ? { scopeRegistry: foreignScopes } : {},
+        ...qualifiers.length > 0 ? { qualifiers } : {},
+        ...typeof project.padAfterDefault === "number" ? { padAfterDefault: project.padAfterDefault } : {}
       }, { trailingComma: false }))
     },
     voiced: project.voiced ?? false,
@@ -460,6 +475,9 @@ function exportBundle(input) {
       if (c.gameData !== void 0) m.gameData = c.gameData;
       return m;
     }),
+    ...qualifiers.length > 0 ? { qualifiers } : {},
+    // 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: project.properties,
     scopeRegistry: hostScopes,
     gameDataFields: project.gameDataFields,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/compiler",
-  "version": "0.4.7",
+  "version": "0.6.0",
   "description": "Patter compiler: compile condition/effect expressions, validate them, and export source to the runtime bundle.",
   "type": "module",
   "license": "MIT",
@@ -34,9 +34,9 @@
     "build": "tsup src/index.ts --format esm,cjs --dts --clean"
   },
   "dependencies": {
-    "@patterkit/model": "0.10.0",
-    "@patterkit/core": "0.4.1",
-    "@patterkit/dialect": "0.2.6",
+    "@patterkit/model": "0.12.0",
+    "@patterkit/core": "0.6.0",
+    "@patterkit/dialect": "0.2.8",
     "@wildwinter/expr": "^0.5.0"
   },
   "peerDependencies": {