@rljson/rljson 0.0.34 → 0.0.37

package/dist/content/cake.d.ts

@@ -19,11 +19,11 @@ 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;
+    sliceIdsTable: TableKey;
     /**
-     * The table containing the slice ids of the layer
+     * A row in table, that contains the slice ids of the layer
      */
-    sliceIdsTable: TableKey;
+    sliceIdsRow: SliceIdsRef;
     /**
      * The table containing the slice layers defining the layers
      */

package/dist/content/layer.d.ts

@@ -16,14 +16,13 @@ export interface Layer extends Json {
      */
     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.
+     * The table containing the item ids of the layer
      */
-    sliceIds?: SliceIdsRef;
+    sliceIdsTable: TableKey;
     /**
-     * The table containing the item ids of the layer
+     * A row in table, that contains the slice ids of the layer
      */
-    sliceIdsTable?: TableKey;
+    sliceIdsTableRow: SliceIdsRef;
     /**
      * The table containing the ingredients that are assigned to the items
      * with the assign property below

package/dist/rljson.js

@@ -51,12 +51,32 @@ 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",
+        sliceIdsTable: "ingredientTypes",
+        sliceIdsTableRow: ingredientTypes._data[0]._hash,
         assign: {
           flour: recipeIngredients._data[0]._hash
         },
@@ -69,6 +89,8 @@ const bakeryExample = () => {
     _data: [
       {
         ingredientsTable: "recipes",
+        sliceIdsTable: "slices",
+        sliceIdsTableRow: slices._data[0]._hash,
         assign: {
           slice0: recipes._data[0]._hash,
           slice1: recipes._data[0]._hash
@@ -76,22 +98,13 @@ 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,
+        sliceIdsRow: slices._data[0]._hash,
         layersTable: "layers",
         layers: {
           flour: layers._data[0]._hash
@@ -117,6 +130,7 @@ const bakeryExample = () => {
     buffets,
     cakes,
     slices,
+    ingredientTypes,
     layers,
     recipes,
     recipeIngredients,
@@ -279,14 +293,17 @@ __publicField(_Example, "ok", {
     const ingredient1 = ingredients._data[1];
     const layer0 = hip({
       sliceIdsTable: "sliceIds",
-      sliceIds: "MgHRBYSrhpyl4rvsOmAWcQ",
+      sliceIdsTableRow: "MgHRBYSrhpyl4rvsOmAWcQ",
       ingredientsTable: "ingredients",
-      assign: {}
+      assign: {
+        id0: ingredient0._hash,
+        id1: ingredient1._hash
+      }
     });
     const layer1 = hip({
       base: layer0._hash,
       sliceIdsTable: "sliceIds",
-      sliceIds: "MgHRBYSrhpyl4rvsOmAWcQ",
+      sliceIdsTableRow: "MgHRBYSrhpyl4rvsOmAWcQ",
       ingredientsTable: "ingredients",
       assign: {
         id0: ingredient0._hash,
@@ -299,7 +316,7 @@ __publicField(_Example, "ok", {
     });
     const cake = hip({
       sliceIdsTable: "sliceIds",
-      sliceIds: sliceIds._data[0]._hash,
+      sliceIdsRow: sliceIds._data[0]._hash,
       layersTable: "layers",
       layers: {
         layer0: layer0._hash,
@@ -423,7 +440,7 @@ __publicField(_Example, "broken", {
     missingSliceIdSet: () => {
       const result = _Example.ok.complete();
       const layer1 = result.layers._data[1];
-      layer1.sliceIds = "MISSING1";
+      layer1.sliceIdsTableRow = "MISSING1";
       return hip(result, {
         updateExistingHashes: true,
         throwOnWrongHashes: false
@@ -446,11 +463,16 @@ __publicField(_Example, "broken", {
   cakes: {
     missingSliceIdSet: () => {
       const result = _Example.ok.complete();
-      result.cakes._data[0].sliceIds = "MISSING";
+      result.cakes._data[0].sliceIdsRow = "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 +649,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 +1142,12 @@ class _BaseValidator {
       }
       const layersTable = table;
       for (const layer of layersTable._data) {
-        const sliceIds = layer.sliceIdsTable;
-        if (!sliceIds) {
-          continue;
-        }
-        const sliceIdsTable = this.rljsonIndexed[sliceIds];
+        const sliceIdsTable = this.rljsonIndexed[layer.sliceIdsTable];
         if (!sliceIdsTable) {
           brokenLayers.push({
             layersTable: tableKey,
             layerHash: layer._hash,
-            missingSliceIdsTable: sliceIds
+            missingSliceIdsTable: layer.sliceIdsTable
           });
         }
       }
@@ -1140,7 +1159,7 @@ class _BaseValidator {
       };
     }
   }
-  _layerSliceIdsNotFound() {
+  _layerSliceIdsRowNotFound() {
     const brokenLayers = [];
     iterateTables(this.rljson, (tableKey, table) => {
       if (table._type !== "layers") {
@@ -1148,24 +1167,20 @@ class _BaseValidator {
       }
       const layersTable = table;
       for (const layer of layersTable._data) {
-        const idSetRef = layer.sliceIds;
-        if (!idSetRef) {
-          continue;
-        }
-        const sliceIds = layer.sliceIdsTable;
-        const sliceIdsTable = this.rljsonIndexed[sliceIds];
-        const idSet = sliceIdsTable._data[idSetRef];
+        const sliceIdsTableName = layer.sliceIdsTable;
+        const sliceIdsTable = this.rljsonIndexed[sliceIdsTableName];
+        const idSet = sliceIdsTable._data[layer.sliceIdsTableRow];
         if (!idSet) {
           brokenLayers.push({
             layersTable: tableKey,
             layerHash: layer._hash,
-            missingSliceIds: idSetRef
+            missingSliceIdsRow: layer.sliceIdsTableRow
           });
         }
       }
     });
     if (brokenLayers.length > 0) {
-      this.errors.layerSliceIdsNotFound = {
+      this.errors.layerSliceIdsRowNotFound = {
         error: "Id sets of layers are missing",
         brokenLayers
       };
@@ -1221,6 +1236,41 @@ class _BaseValidator {
       };
     }
   }
+  _layerAssignmentsDoNotMatchSliceIds() {
+    const layersWithMissingAssignments = [];
+    iterateTables(this.rljson, (tableKey, table) => {
+      if (table._type !== "layers") {
+        return;
+      }
+      const layersTable = table;
+      for (const layer of layersTable._data) {
+        const sliceIdsTable = this.rljsonIndexed[layer.sliceIdsTable];
+        const sliceIdsRow = sliceIdsTable._data[layer.sliceIdsTableRow];
+        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 +1279,12 @@ class _BaseValidator {
       }
       const cakesTable = table;
       for (const cake of cakesTable._data) {
-        const sliceIdsTableName = cake.sliceIdsTable;
-        if (!sliceIdsTableName) {
-          continue;
-        }
-        const sliceIdsTable = this.rljsonIndexed[sliceIdsTableName];
+        const sliceIdsTable = this.rljsonIndexed[cake.sliceIdsTable];
         if (!sliceIdsTable) {
           brokenCakes.push({
             cakeTable: tableKey,
             brokenCake: cake._hash,
-            missingSliceIdsTable: sliceIdsTableName
+            missingSliceIdsTable: cake.sliceIdsTable
           });
         }
       }
@@ -1258,18 +1304,14 @@ class _BaseValidator {
       }
       const cakesTable = table;
       for (const cake of cakesTable._data) {
-        const sliceIdsRef = cake.sliceIds;
-        if (!sliceIdsRef) {
-          continue;
-        }
         const sliceIdsTableName = cake.sliceIdsTable;
         const sliceIdsTable = this.rljsonIndexed[sliceIdsTableName];
-        const sliceIds = sliceIdsTable._data[sliceIdsRef];
-        if (!sliceIds) {
+        const sliceIdValues = sliceIdsTable._data[cake.sliceIdsRow];
+        if (!sliceIdValues) {
           brokenCakes.push({
             cakeTable: tableKey,
             brokenCake: cake._hash,
-            missingSliceIds: sliceIdsRef
+            missingSliceIdsRow: cake.sliceIdsRow
           });
         }
       }

package/dist/src/example.ts

@@ -39,7 +39,7 @@ export class Example {
     },
 
     singleRow: (): Rljson => {
-      const tableCfgs: TablesCfgTable = hip({
+      const tableCfgs = hip<TablesCfgTable>({
         _hash: '',
 
         _type: 'ingredients',
@@ -151,7 +151,7 @@ export class Example {
       };
     },
     complete: (): Rljson => {
-      const sliceIds: SliceIdsTable = hip({
+      const sliceIds = hip<SliceIdsTable>({
         _type: 'sliceIds',
         _data: [
           {
@@ -160,24 +160,27 @@ export class Example {
         ],
       });
 
-      const ingredients: IngredientsTable<any> = hip({
+      const ingredients = hip<IngredientsTable<any>>({
         _type: 'ingredients',
         _data: [{ a: '0' }, { a: '1' }],
       });
       const ingredient0 = ingredients._data[0];
       const ingredient1 = ingredients._data[1];
 
-      const layer0: Layer = hip({
+      const layer0 = hip<Layer>({
         sliceIdsTable: 'sliceIds',
-        sliceIds: 'MgHRBYSrhpyl4rvsOmAWcQ',
+        sliceIdsTableRow: 'MgHRBYSrhpyl4rvsOmAWcQ',
         ingredientsTable: 'ingredients',
-        assign: {},
+        assign: {
+          id0: ingredient0._hash,
+          id1: ingredient1._hash,
+        },
       });
 
-      const layer1: Layer = hip({
+      const layer1 = hip<Layer>({
         base: layer0._hash as string,
         sliceIdsTable: 'sliceIds',
-        sliceIds: 'MgHRBYSrhpyl4rvsOmAWcQ',
+        sliceIdsTableRow: 'MgHRBYSrhpyl4rvsOmAWcQ',
         ingredientsTable: 'ingredients',
         assign: {
           id0: ingredient0._hash,
@@ -185,14 +188,14 @@ export class Example {
         },
       });
 
-      const layers: LayersTable = hip({
+      const layers = hip<LayersTable>({
         _type: 'layers',
         _data: [layer0, layer1],
       } as LayersTable);
 
-      const cake: Cake = hip({
+      const cake = hip<Cake>({
         sliceIdsTable: 'sliceIds',
-        sliceIds: sliceIds._data[0]._hash as string,
+        sliceIdsRow: sliceIds._data[0]._hash as string,
         layersTable: 'layers',
         layers: {
           layer0: layer0._hash as string,
@@ -200,12 +203,12 @@ export class Example {
         },
       });
 
-      const cakes: CakesTable = hip({
+      const cakes = hip<CakesTable>({
         _type: 'cakes',
         _data: [cake],
       });
 
-      const buffets: BuffetsTable = hip({
+      const buffets = hip<BuffetsTable>({
         _type: 'buffets',
         _data: [
           {
@@ -326,9 +329,9 @@ export class Example {
 
       missingSliceIdSet: (): Rljson => {
         const result = Example.ok.complete();
-        const layer1 = result.layers._data[1];
+        const layer1 = (result.layers as LayersTable)._data[1];
 
-        layer1.sliceIds = 'MISSING1';
+        layer1.sliceIdsTableRow = 'MISSING1';
 
         // Recalculate hashes
         return hip(result, {
@@ -356,11 +359,21 @@ export class Example {
     cakes: {
       missingSliceIdSet: (): Rljson => {
         const result = Example.ok.complete();
-        result.cakes._data[0].sliceIds = 'MISSING'; // Missing ID set
+        (result.cakes as CakesTable)._data[0].sliceIdsRow = 'MISSING'; // Missing ID set
+
         hip(result.cakes, {
           updateExistingHashes: true,
           throwOnWrongHashes: false,
         });
+
+        (result.buffets as BuffetsTable)._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.37",
   "packageManager": "pnpm@10.6.3",
   "description": "The RLJSON data format specification",
   "homepage": "https://github.com/rljson/rljson",