@patterkit/compiler 0.2.8 → 0.3.0

package/dist/index.cjs

@@ -37,7 +37,7 @@ function compileExpression(src, foreign) {
 }
 function validateConditions(input, options = {}) {
   const issues = [];
-  const foreign = options.foreignScopes;
+  const foreign = (0, import_dialect.withEngineScopes)(options.foreignScopes);
   const dialect = (0, import_dialect.dialectWithForeignScopes)(foreign);
   const readOnly = readOnlyForeignTargets(foreign);
   const opaqueForeign = opaqueForeignTokens(foreign);
@@ -132,10 +132,11 @@ function validateInterpolation(input, options = {}) {
   const voiced = input.project.voiced ?? false;
   const tables = (input.locales ?? []).map((l) => ({ locale: l.locale, strings: l.strings }));
   const defaultLocale = input.project.locales.default;
-  const opaqueForeign = opaqueForeignTokens(options.foreignScopes);
-  const isScopeToken = scopeTokenTest(options.foreignScopes);
+  const foreign = (0, import_dialect.withEngineScopes)(options.foreignScopes);
+  const opaqueForeign = opaqueForeignTokens(foreign);
+  const isScopeToken = scopeTokenTest(foreign);
   for (const scene of input.scenes) {
-    const schema = (0, import_dialect.buildSchema)(input.project, scene.sceneProps, options.foreignScopes);
+    const schema = (0, import_dialect.buildSchema)(input.project, scene.sceneProps, foreign);
     const known = (ref) => {
       const { scope, name } = (0, import_dialect.splitRef)(ref, isScopeToken);
       if (opaqueForeign.has(scope)) return true;
@@ -303,11 +304,33 @@ function compileScene(scene, foreign) {
     blocks: scene.blocks.map((b) => compileBlock(b, foreign))
   };
 }
+function externalScopesIn(scenes) {
+  const found = /* @__PURE__ */ new Set();
+  const external = new Set(import_dialect2.EXTERNAL_SCOPES);
+  const walk = (node) => {
+    if (!Array.isArray(node) && (node === null || typeof node !== "object")) return;
+    if (Array.isArray(node)) {
+      if (node[0] === "sv" && typeof node[1] === "string" && external.has(node[1])) found.add(node[1]);
+      for (const n of node) walk(n);
+      return;
+    }
+    const o = node;
+    if (o["kind"] === "set" && typeof o["target"] === "string") {
+      const head = o["target"].replace(/^@/, "").split(".")[0];
+      if (o["target"].includes(".") && external.has(head)) found.add(head);
+    }
+    for (const v of Object.values(o)) walk(v);
+  };
+  walk(scenes);
+  return [...found].sort();
+}
 function exportBundle(input) {
   const { project, scenes, locales = [], includeLocales } = input;
   const foreignScopes = input.foreignScopes ?? (0, import_dialect2.hostScopesToSpec)(project.scopeRegistry);
+  const compileScopes = (0, import_dialect2.withEngineScopes)(foreignScopes);
   const scenesOut = {};
-  for (const scene of scenes) scenesOut[scene.id] = compileScene(scene, foreignScopes);
+  for (const scene of scenes) scenesOut[scene.id] = compileScene(scene, compileScopes);
+  const externalScopes = externalScopesIn(scenesOut);
   const strings = {};
   for (const loc of locales) {
     if (includeLocales && !includeLocales.includes(loc.locale)) continue;
@@ -363,7 +386,9 @@ function exportBundle(input) {
     // runtime falls back to `[` / `]` when absent, so default projects keep their exact prior bundle.
     ...project.closedCaptions ? { closedCaptions: project.closedCaptions } : {},
     scenes: scenesOut,
-    strings
+    strings,
+    // Other engines' scopes the content names, so the engine can say when the game has not registered one.
+    ...externalScopes.length > 0 ? { externalScopes } : {}
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.js

@@ -1,13 +1,13 @@
 // src/expressions.ts
 import { compile, parse, validateExpr } from "@wildwinter/expr";
-import { dialectWithForeignScopes, buildSchema, extractSlots, splitRef } from "@patterkit/dialect";
+import { dialectWithForeignScopes, buildSchema, extractSlots, splitRef, withEngineScopes } from "@patterkit/dialect";
 import { walkNodes } from "@patterkit/model";
 function compileExpression(src, foreign) {
   return compile(src, dialectWithForeignScopes(foreign));
 }
 function validateConditions(input, options = {}) {
   const issues = [];
-  const foreign = options.foreignScopes;
+  const foreign = withEngineScopes(options.foreignScopes);
   const dialect = dialectWithForeignScopes(foreign);
   const readOnly = readOnlyForeignTargets(foreign);
   const opaqueForeign = opaqueForeignTokens(foreign);
@@ -102,10 +102,11 @@ function validateInterpolation(input, options = {}) {
   const voiced = input.project.voiced ?? false;
   const tables = (input.locales ?? []).map((l) => ({ locale: l.locale, strings: l.strings }));
   const defaultLocale = input.project.locales.default;
-  const opaqueForeign = opaqueForeignTokens(options.foreignScopes);
-  const isScopeToken = scopeTokenTest(options.foreignScopes);
+  const foreign = withEngineScopes(options.foreignScopes);
+  const opaqueForeign = opaqueForeignTokens(foreign);
+  const isScopeToken = scopeTokenTest(foreign);
   for (const scene of input.scenes) {
-    const schema = buildSchema(input.project, scene.sceneProps, options.foreignScopes);
+    const schema = buildSchema(input.project, scene.sceneProps, foreign);
     const known = (ref) => {
       const { scope, name } = splitRef(ref, isScopeToken);
       if (opaqueForeign.has(scope)) return true;
@@ -205,7 +206,7 @@ import { hostScopesToSpec as hostScopesToSpec2 } from "@patterkit/dialect";
 
 // src/export.ts
 import { canonicalStringify, hash32 } from "@patterkit/core";
-import { hostScopesToSpec } from "@patterkit/dialect";
+import { hostScopesToSpec, withEngineScopes as withEngineScopes2, EXTERNAL_SCOPES } from "@patterkit/dialect";
 function compileEffect(e, foreign) {
   return { kind: "set", target: e.target, value: compileExpression(e.value, foreign) };
 }
@@ -273,11 +274,33 @@ function compileScene(scene, foreign) {
     blocks: scene.blocks.map((b) => compileBlock(b, foreign))
   };
 }
+function externalScopesIn(scenes) {
+  const found = /* @__PURE__ */ new Set();
+  const external = new Set(EXTERNAL_SCOPES);
+  const walk = (node) => {
+    if (!Array.isArray(node) && (node === null || typeof node !== "object")) return;
+    if (Array.isArray(node)) {
+      if (node[0] === "sv" && typeof node[1] === "string" && external.has(node[1])) found.add(node[1]);
+      for (const n of node) walk(n);
+      return;
+    }
+    const o = node;
+    if (o["kind"] === "set" && typeof o["target"] === "string") {
+      const head = o["target"].replace(/^@/, "").split(".")[0];
+      if (o["target"].includes(".") && external.has(head)) found.add(head);
+    }
+    for (const v of Object.values(o)) walk(v);
+  };
+  walk(scenes);
+  return [...found].sort();
+}
 function exportBundle(input) {
   const { project, scenes, locales = [], includeLocales } = input;
   const foreignScopes = input.foreignScopes ?? hostScopesToSpec(project.scopeRegistry);
+  const compileScopes = withEngineScopes2(foreignScopes);
   const scenesOut = {};
-  for (const scene of scenes) scenesOut[scene.id] = compileScene(scene, foreignScopes);
+  for (const scene of scenes) scenesOut[scene.id] = compileScene(scene, compileScopes);
+  const externalScopes = externalScopesIn(scenesOut);
   const strings = {};
   for (const loc of locales) {
     if (includeLocales && !includeLocales.includes(loc.locale)) continue;
@@ -333,7 +356,9 @@ function exportBundle(input) {
     // runtime falls back to `[` / `]` when absent, so default projects keep their exact prior bundle.
     ...project.closedCaptions ? { closedCaptions: project.closedCaptions } : {},
     scenes: scenesOut,
-    strings
+    strings,
+    // Other engines' scopes the content names, so the engine can say when the game has not registered one.
+    ...externalScopes.length > 0 ? { externalScopes } : {}
   };
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/compiler",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "description": "Patter compiler: compile condition/effect expressions, validate them, and export source to the runtime bundle.",
   "type": "module",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "build": "tsup src/index.ts --format esm,cjs --dts --clean"
   },
   "dependencies": {
-    "@patterkit/model": "0.5.0",
-    "@patterkit/core": "0.2.4",
-    "@patterkit/dialect": "0.1.9",
+    "@patterkit/model": "0.6.0",
+    "@patterkit/core": "0.2.5",
+    "@patterkit/dialect": "0.2.0",
     "@wildwinter/expr": "^0.5.0",
-    "@wildwinter/scoperegistry": "^0.6.0"
+    "@wildwinter/scoperegistry": "^0.7.0"
   }
 }