@sprig-and-prose/sprig-scenes 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @sprig-and-prose/sprig-scenes
 
+## 0.2.1
+
+### Patch Changes
+
+- 2a40227: - **scenes:** Emit array kinds in manifest as `array: { of: { type } }` to match prose; recognize field modifier `optional { }` when tokenized as identifier.
+  - **scene-engine:** Consume new array manifest shape (`kind.array.of`).
+  - **sprig-edge:** Attestation validation uses new array manifest shape (`kind.array.of`).
+- Updated dependencies [2a40227]
+  - @sprig-and-prose/sprig-scene-engine@0.1.1
+
 ## 0.2.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sprig-and-prose/sprig-scenes",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "Scene compiler and canonical outputs for sprig",
   "main": "src/index.js",

package/src/canonical/tools.scene.json

@@ -30,7 +30,9 @@
         "tools": {
           "type": {
             "array": {
-              "actor": "Tool"
+              "of": {
+                "actor": "Tool"
+              }
             }
           }
         }
@@ -63,7 +65,9 @@
         "tools": {
           "type": {
             "array": {
-              "actor": "Tool"
+              "of": {
+                "actor": "Tool"
+              }
             }
           }
         }
@@ -75,14 +79,18 @@
     "ContainerRows": {
       "kind": {
         "array": {
-          "actor": "ContainerRow"
+          "of": {
+            "actor": "ContainerRow"
+          }
         }
       }
     },
     "AnotherToolPortal": {
       "kind": {
         "array": {
-          "actor": "Something"
+          "of": {
+            "actor": "Something"
+          }
         }
       }
     }

package/src/compiler/compile_scene.js

@@ -37,12 +37,12 @@ function toKindRef(parsed) {
   }
   if (typeof parsed === 'object' && parsed !== null && 'arrayOf' in parsed && parsed.arrayOf != null) {
     const inner = toKindRef(parsed.arrayOf);
-    return inner != null ? { array: inner } : null;
+    return inner != null ? { array: { of: inner } } : null;
   }
-  // New array format: { array: itemType, minItems?, maxItems? }
+  // New array format: { array: itemType, minItems?, maxItems? } => manifest { array: { of: KindRef } }
   if (typeof parsed === 'object' && parsed !== null && 'array' in parsed) {
     const inner = toKindRef(parsed.array);
-    return inner != null ? { array: inner } : null;
+    return inner != null ? { array: { of: inner } } : null;
   }
   // Primitive with optional constraints (already KindRef-shaped)
   if (typeof parsed === 'object' && parsed !== null && 'primitive' in parsed) {
@@ -937,7 +937,7 @@ class SceneParser extends ParserCore {
         this.expect('RBRACKET');
         if (inner) {
           const ref = toKindRef(inner);
-          if (ref) return { array: ref };
+          if (ref) return { array: { of: ref } };
         }
         continue;
       }
@@ -1200,7 +1200,7 @@ class SceneParser extends ParserCore {
 
         const typeTok = this.peek();
         if (typeTok) {
-          if (typeTok.type === 'KEYWORD' && PRIMITIVE_KINDS.has(typeTok.value)) {
+          if ((typeTok.type === 'KEYWORD' || typeTok.type === 'IDENTIFIER') && PRIMITIVE_KINDS.has(typeTok.value)) {
             itemType = this.parsePrimitiveType(typeTok.value);
           } else if (typeTok.type === 'IDENTIFIER' || typeTok.type === 'KEYWORD') {
             itemType = { actor: typeTok.value };
@@ -1273,7 +1273,7 @@ class SceneParser extends ParserCore {
         continue;
       }
 
-      if (depth === 1 && token.type === 'KEYWORD' && token.value === 'optional') {
+      if (depth === 1 && (token.type === 'KEYWORD' || token.type === 'IDENTIFIER') && token.value === 'optional') {
         this.advance();
         if (this.match('LBRACE')) {
           this.advance();
@@ -2257,7 +2257,7 @@ function isActorKind(kindRef) {
 
 /**
  * @param {KindRef} kindRef
- * @returns {kindRef is { array: KindRef }}
+ * @returns {kindRef is { array: { of: KindRef } }}
  */
 function isArrayKind(kindRef) {
   return (
@@ -2304,7 +2304,7 @@ function validateKindRefConstraints(kindRef, context) {
     return;
   }
   if (isArrayKind(kindRef)) {
-    validateKindRefConstraints(kindRef.array, context);
+    validateKindRefConstraints(kindRef.array.of, context);
     return;
   }
   if (isObjectKind(kindRef)) {
@@ -2351,7 +2351,7 @@ function kindTypesEqual(left, right) {
     return left.actor === right.actor;
   }
   if (isArrayKind(left) && isArrayKind(right)) {
-    return kindTypesEqual(left.array, right.array);
+    return kindTypesEqual(left.array.of, right.array.of);
   }
   if (isObjectKind(left) && isObjectKind(right)) {
     const lk = Object.keys(left.object).sort();
@@ -2542,7 +2542,7 @@ function assertActorRefsExist(scene, kindRef, context) {
     return;
   }
   if (isArrayKind(kindRef)) {
-    assertActorRefsExist(scene, kindRef.array, context);
+    assertActorRefsExist(scene, kindRef.array.of, context);
   }
   if (isObjectKind(kindRef)) {
     for (const ref of Object.values(kindRef.object)) {

package/src/manifest/scene_manifest.d.ts

@@ -11,11 +11,11 @@ export type PrimitiveKind =
   | 'date'
   | 'route';
 
-/** Uniform kind: primitive, object (named fields), or array. */
+/** Uniform kind: primitive, object (named fields), or array. Array mirrors prose: array { of { Type } } => { array: { of: KindRef } }. */
 export type Kind =
   | { primitive: PrimitiveKind }
   | { object: Record<string, KindRef> }
-  | { array: KindRef };
+  | { array: { of: KindRef } };
 
 /** Reference: full Kind or actor by name. */
 export type KindRef = Kind | { actor: string };

package/src/manifest/scene_manifest.js

@@ -16,7 +16,8 @@
 
 /**
  * Uniform kind: primitive, object (named fields), or array.
- * @typedef {{ primitive: PrimitiveKind } | { object: Record<string, KindRef> } | { array: KindRef }} Kind
+ * Array mirrors prose: array { of { Type } } => { array: { of: KindRef } }.
+ * @typedef {{ primitive: PrimitiveKind } | { object: Record<string, KindRef> } | { array: { of: KindRef } }} Kind
  */
 
 /**

package/test/compile_scene.test.js

@@ -94,11 +94,11 @@ test('tools scene: portals have array kind', async () => {
 
   strictEqual(!!manifest.portals?.ContainerRows, true);
   deepStrictEqual(manifest.portals.ContainerRows.kind, {
-    array: { actor: 'ContainerRow' },
+    array: { of: { actor: 'ContainerRow' } },
   });
   strictEqual(!!manifest.portals?.AnotherToolPortal, true);
   deepStrictEqual(manifest.portals.AnotherToolPortal.kind, {
-    array: { actor: 'Something' },
+    array: { of: { actor: 'Something' } },
   });
 });
 
@@ -257,7 +257,7 @@ test('skills scene: derived PlayerSkills has each step with expected shape', asy
 
   const playerSkills = manifest.derived?.PlayerSkills;
   strictEqual(!!playerSkills, true);
-  strictEqual(playerSkills?.kind?.array?.actor, 'PlayerSkill');
+  strictEqual(playerSkills?.kind?.array?.of?.actor, 'PlayerSkill');
   const steps = playerSkills?.steps ?? [];
   strictEqual(steps.length, 1);
   strictEqual(steps[0]?.type, 'each');