@rljson/rljson 0.0.34 → 0.0.36

package/dist/content/cake.d.ts

@@ -19,11 +19,16 @@ export interface Cake extends Json {
      * must match these slice ids of the layers.
      * The slice ids can be found in the idSet table.
      */
-    sliceIds: SliceIdsRef;
-    /**
-     * The table containing the slice ids of the layer
-     */
-    sliceIdsTable: TableKey;
+    sliceIds: {
+        /**
+         * The table containing the item ids of the layer
+         */
+        table: TableKey;
+        /**
+         * A row in table, that contains the slice ids of the layer
+         */
+        row: SliceIdsRef;
+    };
     /**
      * The table containing the slice layers defining the layers
      */

package/dist/content/layer.d.ts

@@ -15,15 +15,16 @@ export interface Layer extends Json {
      * `base` an optional base layer that is extended by this layer
      */
     base?: LayerRef;
-    /**
-     * The item ids of the layer. If present, the item ids in `assign`
-     * must match these ids. The item id sets can be found in the sliceIds table.
-     */
-    sliceIds?: SliceIdsRef;
-    /**
-     * The table containing the item ids of the layer
-     */
-    sliceIdsTable?: TableKey;
+    sliceIds: {
+        /**
+         * The table containing the item ids of the layer
+         */
+        table: TableKey;
+        /**
+         * A row in table, that contains the slice ids of the layer
+         */
+        row: SliceIdsRef;
+    };
     /**
      * The table containing the ingredients that are assigned to the items
      * with the assign property below

package/dist/rljson.js

@@ -51,12 +51,34 @@ const bakeryExample = () => {
     ],
     _hash: ""
   });
+  const slices = hip({
+    _type: "sliceIds",
+    _data: [
+      {
+        add: ["slice0", "slice1"],
+        remove: []
+      }
+    ]
+  });
+  const ingredientTypes = hip({
+    _type: "sliceIds",
+    _data: [
+      {
+        add: ["flour"],
+        remove: []
+      }
+    ]
+  });
   const recipes = hip({
     _type: "layers",
     _data: [
       {
         id: "tastyCake",
         ingredientsTable: "recipeIngredients",
+        sliceIds: {
+          table: "ingredientTypes",
+          row: ingredientTypes._data[0]._hash
+        },
         assign: {
           flour: recipeIngredients._data[0]._hash
         },
@@ -69,6 +91,10 @@ const bakeryExample = () => {
     _data: [
       {
         ingredientsTable: "recipes",
+        sliceIds: {
+          table: "slices",
+          row: slices._data[0]._hash
+        },
         assign: {
           slice0: recipes._data[0]._hash,
           slice1: recipes._data[0]._hash
@@ -76,22 +102,15 @@ const bakeryExample = () => {
       }
     ]
   });
-  const slices = hip({
-    _type: "sliceIds",
-    _data: [
-      {
-        add: ["slice0", "slice1"],
-        remove: []
-      }
-    ]
-  });
   const cakes = hip({
     _type: "cakes",
     _data: [
       {
         id: "cake1",
-        sliceIdsTable: "slices",
-        sliceIds: slices._data[0]._hash,
+        sliceIds: {
+          table: "slices",
+          row: slices._data[0]._hash
+        },
         layersTable: "layers",
         layers: {
           flour: layers._data[0]._hash
@@ -117,6 +136,7 @@ const bakeryExample = () => {
     buffets,
     cakes,
     slices,
+    ingredientTypes,
     layers,
     recipes,
     recipeIngredients,
@@ -278,15 +298,22 @@ __publicField(_Example, "ok", {
     const ingredient0 = ingredients._data[0];
     const ingredient1 = ingredients._data[1];
     const layer0 = hip({
-      sliceIdsTable: "sliceIds",
-      sliceIds: "MgHRBYSrhpyl4rvsOmAWcQ",
+      sliceIds: {
+        table: "sliceIds",
+        row: "MgHRBYSrhpyl4rvsOmAWcQ"
+      },
       ingredientsTable: "ingredients",
-      assign: {}
+      assign: {
+        id0: ingredient0._hash,
+        id1: ingredient1._hash
+      }
     });
     const layer1 = hip({
       base: layer0._hash,
-      sliceIdsTable: "sliceIds",
-      sliceIds: "MgHRBYSrhpyl4rvsOmAWcQ",
+      sliceIds: {
+        table: "sliceIds",
+        row: "MgHRBYSrhpyl4rvsOmAWcQ"
+      },
       ingredientsTable: "ingredients",
       assign: {
         id0: ingredient0._hash,
@@ -298,8 +325,10 @@ __publicField(_Example, "ok", {
       _data: [layer0, layer1]
     });
     const cake = hip({
-      sliceIdsTable: "sliceIds",
-      sliceIds: sliceIds._data[0]._hash,
+      sliceIds: {
+        table: "sliceIds",
+        row: sliceIds._data[0]._hash
+      },
       layersTable: "layers",
       layers: {
         layer0: layer0._hash,
@@ -423,7 +452,7 @@ __publicField(_Example, "broken", {
     missingSliceIdSet: () => {
       const result = _Example.ok.complete();
       const layer1 = result.layers._data[1];
-      layer1.sliceIds = "MISSING1";
+      layer1.sliceIds.row = "MISSING1";
       return hip(result, {
         updateExistingHashes: true,
         throwOnWrongHashes: false
@@ -446,11 +475,16 @@ __publicField(_Example, "broken", {
   cakes: {
     missingSliceIdSet: () => {
       const result = _Example.ok.complete();
-      result.cakes._data[0].sliceIds = "MISSING";
+      result.cakes._data[0].sliceIds.row = "MISSING";
       hip(result.cakes, {
         updateExistingHashes: true,
         throwOnWrongHashes: false
       });
+      result.buffets._data[0].items[0].ref = result.cakes._data[0]._hash;
+      hip(result.buffets, {
+        updateExistingHashes: true,
+        throwOnWrongHashes: false
+      });
       return result;
     },
     missingLayersTable: () => {
@@ -627,8 +661,9 @@ class _BaseValidator {
       // Check layers
       () => this._layerBasesNotFound(),
       () => this._layerSliceIdsTableNotFound(),
-      () => this._layerSliceIdsNotFound(),
+      () => this._layerSliceIdsRowNotFound(),
       () => this._layerIngredientAssignmentsNotFound(),
+      () => this._layerAssignmentsDoNotMatchSliceIds(),
       // Check cakes
       () => this._cakeSliceIdsTableNotFound(),
       () => this._cakeSliceIdsNotFound(),
@@ -1119,16 +1154,16 @@ class _BaseValidator {
       }
       const layersTable = table;
       for (const layer of layersTable._data) {
-        const sliceIds = layer.sliceIdsTable;
+        const sliceIds = layer.sliceIds;
         if (!sliceIds) {
           continue;
         }
-        const sliceIdsTable = this.rljsonIndexed[sliceIds];
+        const sliceIdsTable = this.rljsonIndexed[sliceIds.table];
         if (!sliceIdsTable) {
           brokenLayers.push({
             layersTable: tableKey,
             layerHash: layer._hash,
-            missingSliceIdsTable: sliceIds
+            missingSliceIdsTable: sliceIds.table
           });
         }
       }
@@ -1140,7 +1175,7 @@ class _BaseValidator {
       };
     }
   }
-  _layerSliceIdsNotFound() {
+  _layerSliceIdsRowNotFound() {
     const brokenLayers = [];
     iterateTables(this.rljson, (tableKey, table) => {
       if (table._type !== "layers") {
@@ -1148,24 +1183,24 @@ class _BaseValidator {
       }
       const layersTable = table;
       for (const layer of layersTable._data) {
-        const idSetRef = layer.sliceIds;
-        if (!idSetRef) {
+        const sliceIds = layer.sliceIds;
+        if (!sliceIds) {
           continue;
         }
-        const sliceIds = layer.sliceIdsTable;
-        const sliceIdsTable = this.rljsonIndexed[sliceIds];
-        const idSet = sliceIdsTable._data[idSetRef];
+        const sliceIdsTableName = sliceIds.table;
+        const sliceIdsTable = this.rljsonIndexed[sliceIdsTableName];
+        const idSet = sliceIdsTable._data[sliceIds.row];
         if (!idSet) {
           brokenLayers.push({
             layersTable: tableKey,
             layerHash: layer._hash,
-            missingSliceIds: idSetRef
+            missingSliceIdsRow: sliceIds.row
           });
         }
       }
     });
     if (brokenLayers.length > 0) {
-      this.errors.layerSliceIdsNotFound = {
+      this.errors.layerSliceIdsRowNotFound = {
         error: "Id sets of layers are missing",
         brokenLayers
       };
@@ -1221,6 +1256,44 @@ class _BaseValidator {
       };
     }
   }
+  _layerAssignmentsDoNotMatchSliceIds() {
+    const layersWithMissingAssignments = [];
+    iterateTables(this.rljson, (tableKey, table) => {
+      if (table._type !== "layers") {
+        return;
+      }
+      const layersTable = table;
+      for (const layer of layersTable._data) {
+        if (!layer.sliceIds) {
+          continue;
+        }
+        const sliceIdsTable = this.rljsonIndexed[layer.sliceIds.table];
+        const sliceIdsRow = sliceIdsTable._data[layer.sliceIds.row];
+        const sliceIds = sliceIdsRow.add;
+        const sliceIdsInLayer = Object.keys(layer.assign);
+        const unassignedSliceIds = [];
+        for (const expectedSliceId of sliceIds) {
+          if (sliceIdsInLayer.indexOf(expectedSliceId) === -1) {
+            unassignedSliceIds.push(expectedSliceId);
+          }
+        }
+        if (unassignedSliceIds.length) {
+          layersWithMissingAssignments.push({
+            brokenLayer: layer._hash,
+            layersTable: tableKey,
+            unassignedSliceIds
+          });
+          continue;
+        }
+      }
+    });
+    if (layersWithMissingAssignments.length > 0) {
+      this.errors.layerAssignmentsDoNotMatchSliceIds = {
+        error: "Layers have missing assignments",
+        layers: layersWithMissingAssignments
+      };
+    }
+  }
   _cakeSliceIdsTableNotFound() {
     const brokenCakes = [];
     iterateTables(this.rljson, (tableKey, table) => {
@@ -1229,16 +1302,16 @@ class _BaseValidator {
       }
       const cakesTable = table;
       for (const cake of cakesTable._data) {
-        const sliceIdsTableName = cake.sliceIdsTable;
-        if (!sliceIdsTableName) {
+        const sliceIds = cake.sliceIds;
+        if (!sliceIds) {
           continue;
         }
-        const sliceIdsTable = this.rljsonIndexed[sliceIdsTableName];
+        const sliceIdsTable = this.rljsonIndexed[sliceIds.table];
         if (!sliceIdsTable) {
           brokenCakes.push({
             cakeTable: tableKey,
             brokenCake: cake._hash,
-            missingSliceIdsTable: sliceIdsTableName
+            missingSliceIdsTable: sliceIds.table
           });
         }
       }
@@ -1258,18 +1331,18 @@ class _BaseValidator {
       }
       const cakesTable = table;
       for (const cake of cakesTable._data) {
-        const sliceIdsRef = cake.sliceIds;
-        if (!sliceIdsRef) {
+        const sliceIds = cake.sliceIds;
+        if (!sliceIds) {
           continue;
         }
-        const sliceIdsTableName = cake.sliceIdsTable;
+        const sliceIdsTableName = cake.sliceIds.table;
         const sliceIdsTable = this.rljsonIndexed[sliceIdsTableName];
-        const sliceIds = sliceIdsTable._data[sliceIdsRef];
-        if (!sliceIds) {
+        const sliceIdValues = sliceIdsTable._data[sliceIds.row];
+        if (!sliceIdValues) {
           brokenCakes.push({
             cakeTable: tableKey,
             brokenCake: cake._hash,
-            missingSliceIds: sliceIdsRef
+            missingSliceIdsRow: sliceIds.row
           });
         }
       }

package/dist/src/example.ts

@@ -168,16 +168,23 @@ export class Example {
       const ingredient1 = ingredients._data[1];
 
       const layer0: Layer = hip({
-        sliceIdsTable: 'sliceIds',
-        sliceIds: 'MgHRBYSrhpyl4rvsOmAWcQ',
+        sliceIds: {
+          table: 'sliceIds',
+          row: 'MgHRBYSrhpyl4rvsOmAWcQ',
+        },
         ingredientsTable: 'ingredients',
-        assign: {},
+        assign: {
+          id0: ingredient0._hash,
+          id1: ingredient1._hash,
+        },
       });
 
       const layer1: Layer = hip({
         base: layer0._hash as string,
-        sliceIdsTable: 'sliceIds',
-        sliceIds: 'MgHRBYSrhpyl4rvsOmAWcQ',
+        sliceIds: {
+          table: 'sliceIds',
+          row: 'MgHRBYSrhpyl4rvsOmAWcQ',
+        },
         ingredientsTable: 'ingredients',
         assign: {
           id0: ingredient0._hash,
@@ -191,8 +198,10 @@ export class Example {
       } as LayersTable);
 
       const cake: Cake = hip({
-        sliceIdsTable: 'sliceIds',
-        sliceIds: sliceIds._data[0]._hash as string,
+        sliceIds: {
+          table: 'sliceIds',
+          row: sliceIds._data[0]._hash as string,
+        },
         layersTable: 'layers',
         layers: {
           layer0: layer0._hash as string,
@@ -328,7 +337,7 @@ export class Example {
         const result = Example.ok.complete();
         const layer1 = result.layers._data[1];
 
-        layer1.sliceIds = 'MISSING1';
+        layer1.sliceIds.row = 'MISSING1';
 
         // Recalculate hashes
         return hip(result, {
@@ -356,11 +365,20 @@ export class Example {
     cakes: {
       missingSliceIdSet: (): Rljson => {
         const result = Example.ok.complete();
-        result.cakes._data[0].sliceIds = 'MISSING'; // Missing ID set
+        result.cakes._data[0].sliceIds.row = 'MISSING'; // Missing ID set
         hip(result.cakes, {
           updateExistingHashes: true,
           throwOnWrongHashes: false,
         });
+
+        result.buffets._data[0].items[0].ref = result.cakes._data[0]
+          ._hash as string; // Update buffet reference
+
+        hip(result.buffets, {
+          updateExistingHashes: true,
+          throwOnWrongHashes: false,
+        });
+
         return result;
       },
 

package/dist/validate/base-validator.d.ts

@@ -20,10 +20,12 @@ export interface BaseErrors extends Errors {
     tableCfgHasRootHeadSharedError?: Json;
     refsNotFound?: Json;
     layerBasesNotFound?: Json;
+    layerSliceIdsGivenButNoTable?: Json;
     layerSliceIdsTableNotFound?: Json;
-    layerSliceIdsNotFound?: Json;
+    layerSliceIdsRowNotFound?: Json;
     layerIngredientTablesNotFound?: Json;
     layerIngredientAssignmentsNotFound?: Json;
+    layerAssignmentsDoNotMatchSliceIds?: Json;
     cakeSliceIdsTableNotFound?: Json;
     cakeSliceIdsNotFound?: Json;
     cakeLayerTablesNotFound?: Json;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/rljson",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "packageManager": "pnpm@10.6.3",
   "description": "The RLJSON data format specification",
   "homepage": "https://github.com/rljson/rljson",