@patterkit/compiler 0.7.0 → 0.8.0

package/dist/index.cjs

@@ -154,7 +154,7 @@ function validateConditions(input, options = {}) {
   const validateElement = (blocks, sceneProps, onEntry, elementId) => {
     const schema = (0, import_dialect2.buildSchema)(input.project, sceneProps, foreign);
     const checkedSchema = checked ? (0, import_dialect2.buildSchema)(input.project, sceneProps, checked) : void 0;
-    const check = (nodeId, field, src) => {
+    const check = (nodeId, field, src, assignedTo) => {
       let ast;
       try {
         ast = (0, import_expr.parse)(src, dialect);
@@ -162,7 +162,7 @@ function validateConditions(input, options = {}) {
         issues.push({ nodeId, field, src, severity: "error", message: e instanceof Error ? e.message : String(e) });
         return;
       }
-      const strict = (0, import_expr.validateExpr)(ast, schema, dialect);
+      const strict = [...(0, import_expr.validateExpr)(ast, schema, dialect), ...assignedTo ? (0, import_expr.validateAssignment)(assignedTo, ast, schema, dialect) : []];
       for (const iss of strict) {
         issues.push({ nodeId, field, src, severity: iss.severity, message: iss.message });
       }
@@ -215,7 +215,7 @@ function validateConditions(input, options = {}) {
     const checkEffects = (nodeId, list, label) => {
       for (const e of list ?? []) {
         checkTarget(nodeId, `${label}.set`, e.target);
-        check(nodeId, `${label}.set`, e.value);
+        check(nodeId, `${label}.set`, e.value, TARGET_REF.test(e.target) ? (0, import_dialect2.splitRef)(e.target, isScopeToken) : void 0);
       }
     };
     checkEffects(elementId, onEntry, "onEntry");
@@ -346,6 +346,7 @@ function readOnlyForeignTargets(spec) {
 var import_dialect4 = require("@patterkit/dialect");
 
 // src/export.ts
+var import_scoperegistry = require("@wildwinter/scoperegistry");
 var import_core = require("@patterkit/core");
 var import_dialect3 = require("@patterkit/dialect");
 var import_model2 = require("@patterkit/model");
@@ -443,6 +444,9 @@ function externalScopesIn(scenes, external) {
   walk(scenes);
   return [...found].sort();
 }
+function resolved(decls) {
+  return decls?.map((d) => d.default === void 0 ? { ...d, default: (0, import_scoperegistry.defaultFor)(d) } : d);
+}
 function exportBundle(input) {
   const { project, scenes, locales = [], includeLocales } = input;
   const hostScopes = projectScopes(project, input.gameScopes).host;
@@ -517,13 +521,17 @@ function exportBundle(input) {
     ...speakerPattern !== void 0 ? { speakerPattern } : {},
     // 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,
+    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,
-    gameDataFields: project.gameDataFields,
+    gameDataFields: project.gameDataFields && Object.fromEntries(
+      Object.entries(project.gameDataFields).map(([kind, fields]) => [kind, resolved(fields)])
+    ),
     // 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.
     ...project.closedCaptions ? { closedCaptions: project.closedCaptions } : {},
-    scenes: scenesOut,
+    scenes: Object.fromEntries(Object.entries(scenesOut).map(([id, sc]) => [id, sc.sceneProps ? { ...sc, sceneProps: resolved(sc.sceneProps) } : sc])),
     strings,
     // Other engines' scopes the content names, so the engine can say when the game has not registered one.
     ...externalScopes.length > 0 ? { externalScopes } : {}

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/expressions.ts
-import { compile, parse, validateExpr } from "@wildwinter/expr";
+import { compile, parse, validateAssignment, validateExpr } from "@wildwinter/expr";
 import { dialectWithForeignScopes, buildSchema, extractSlots, splitRef, withEngineScopes, hostScopesToSpec as hostScopesToSpec2 } from "@patterkit/dialect";
 import { referenceNote } from "@wildwinter/scoperegistry/scopes";
 
@@ -120,7 +120,7 @@ function validateConditions(input, options = {}) {
   const validateElement = (blocks, sceneProps, onEntry, elementId) => {
     const schema = buildSchema(input.project, sceneProps, foreign);
     const checkedSchema = checked ? buildSchema(input.project, sceneProps, checked) : void 0;
-    const check = (nodeId, field, src) => {
+    const check = (nodeId, field, src, assignedTo) => {
       let ast;
       try {
         ast = parse(src, dialect);
@@ -128,7 +128,7 @@ function validateConditions(input, options = {}) {
         issues.push({ nodeId, field, src, severity: "error", message: e instanceof Error ? e.message : String(e) });
         return;
       }
-      const strict = validateExpr(ast, schema, dialect);
+      const strict = [...validateExpr(ast, schema, dialect), ...assignedTo ? validateAssignment(assignedTo, ast, schema, dialect) : []];
       for (const iss of strict) {
         issues.push({ nodeId, field, src, severity: iss.severity, message: iss.message });
       }
@@ -181,7 +181,7 @@ function validateConditions(input, options = {}) {
     const checkEffects = (nodeId, list, label) => {
       for (const e of list ?? []) {
         checkTarget(nodeId, `${label}.set`, e.target);
-        check(nodeId, `${label}.set`, e.value);
+        check(nodeId, `${label}.set`, e.value, TARGET_REF.test(e.target) ? splitRef(e.target, isScopeToken) : void 0);
       }
     };
     checkEffects(elementId, onEntry, "onEntry");
@@ -312,6 +312,7 @@ function readOnlyForeignTargets(spec) {
 import { hostScopesToSpec as hostScopesToSpec4, EXTERNAL_SCOPES as EXTERNAL_SCOPES2 } from "@patterkit/dialect";
 
 // src/export.ts
+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";
@@ -409,6 +410,9 @@ function externalScopesIn(scenes, external) {
   walk(scenes);
   return [...found].sort();
 }
+function resolved(decls) {
+  return decls?.map((d) => d.default === void 0 ? { ...d, default: defaultFor(d) } : d);
+}
 function exportBundle(input) {
   const { project, scenes, locales = [], includeLocales } = input;
   const hostScopes = projectScopes(project, input.gameScopes).host;
@@ -483,13 +487,17 @@ function exportBundle(input) {
     ...speakerPattern !== void 0 ? { speakerPattern } : {},
     // 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,
+    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,
-    gameDataFields: project.gameDataFields,
+    gameDataFields: project.gameDataFields && Object.fromEntries(
+      Object.entries(project.gameDataFields).map(([kind, fields]) => [kind, resolved(fields)])
+    ),
     // 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.
     ...project.closedCaptions ? { closedCaptions: project.closedCaptions } : {},
-    scenes: scenesOut,
+    scenes: Object.fromEntries(Object.entries(scenesOut).map(([id, sc]) => [id, sc.sceneProps ? { ...sc, sceneProps: resolved(sc.sceneProps) } : sc])),
     strings,
     // Other engines' scopes the content names, so the engine can say when the game has not registered one.
     ...externalScopes.length > 0 ? { externalScopes } : {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/compiler",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Patter compiler: compile condition/effect expressions, validate them, and export source to the runtime bundle.",
   "type": "module",
   "license": "MIT",
@@ -34,15 +34,15 @@
     "build": "tsup src/index.ts --format esm,cjs --dts --clean"
   },
   "dependencies": {
-    "@patterkit/model": "0.14.0",
-    "@patterkit/core": "0.7.0",
-    "@patterkit/dialect": "0.2.11",
-    "@wildwinter/expr": "^0.5.0"
+    "@patterkit/model": "0.15.0",
+    "@patterkit/core": "0.8.0",
+    "@patterkit/dialect": "0.2.12",
+    "@wildwinter/expr": "^0.6.0"
   },
   "peerDependencies": {
-    "@wildwinter/scoperegistry": ">=0.8.0 <1.0.0"
+    "@wildwinter/scoperegistry": ">=0.9.0 <1.0.0"
   },
   "devDependencies": {
-    "@wildwinter/scoperegistry": ">=0.8.0 <1.0.0"
+    "@wildwinter/scoperegistry": ">=0.9.0 <1.0.0"
   }
 }