@rljson/rljson 0.0.36 → 0.0.37

package/dist/content/cake.d.ts

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

package/dist/content/layer.d.ts

@@ -15,16 +15,14 @@ export interface Layer extends Json {
      * `base` an optional base layer that is extended by this layer
      */
     base?: LayerRef;
-    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 item ids of the layer
+     */
+    sliceIdsTable: TableKey;
+    /**
+     * A row in table, that contains the slice ids of the layer
+     */
+    sliceIdsTableRow: SliceIdsRef;
     /**
      * The table containing the ingredients that are assigned to the items
      * with the assign property below

package/dist/rljson.js

@@ -75,10 +75,8 @@ const bakeryExample = () => {
       {
         id: "tastyCake",
         ingredientsTable: "recipeIngredients",
-        sliceIds: {
-          table: "ingredientTypes",
-          row: ingredientTypes._data[0]._hash
-        },
+        sliceIdsTable: "ingredientTypes",
+        sliceIdsTableRow: ingredientTypes._data[0]._hash,
         assign: {
           flour: recipeIngredients._data[0]._hash
         },
@@ -91,10 +89,8 @@ const bakeryExample = () => {
     _data: [
       {
         ingredientsTable: "recipes",
-        sliceIds: {
-          table: "slices",
-          row: slices._data[0]._hash
-        },
+        sliceIdsTable: "slices",
+        sliceIdsTableRow: slices._data[0]._hash,
         assign: {
           slice0: recipes._data[0]._hash,
           slice1: recipes._data[0]._hash
@@ -107,10 +103,8 @@ const bakeryExample = () => {
     _data: [
       {
         id: "cake1",
-        sliceIds: {
-          table: "slices",
-          row: slices._data[0]._hash
-        },
+        sliceIdsTable: "slices",
+        sliceIdsRow: slices._data[0]._hash,
         layersTable: "layers",
         layers: {
           flour: layers._data[0]._hash
@@ -298,10 +292,8 @@ __publicField(_Example, "ok", {
     const ingredient0 = ingredients._data[0];
     const ingredient1 = ingredients._data[1];
     const layer0 = hip({
-      sliceIds: {
-        table: "sliceIds",
-        row: "MgHRBYSrhpyl4rvsOmAWcQ"
-      },
+      sliceIdsTable: "sliceIds",
+      sliceIdsTableRow: "MgHRBYSrhpyl4rvsOmAWcQ",
       ingredientsTable: "ingredients",
       assign: {
         id0: ingredient0._hash,
@@ -310,10 +302,8 @@ __publicField(_Example, "ok", {
     });
     const layer1 = hip({
       base: layer0._hash,
-      sliceIds: {
-        table: "sliceIds",
-        row: "MgHRBYSrhpyl4rvsOmAWcQ"
-      },
+      sliceIdsTable: "sliceIds",
+      sliceIdsTableRow: "MgHRBYSrhpyl4rvsOmAWcQ",
       ingredientsTable: "ingredients",
       assign: {
         id0: ingredient0._hash,
@@ -325,10 +315,8 @@ __publicField(_Example, "ok", {
       _data: [layer0, layer1]
     });
     const cake = hip({
-      sliceIds: {
-        table: "sliceIds",
-        row: sliceIds._data[0]._hash
-      },
+      sliceIdsTable: "sliceIds",
+      sliceIdsRow: sliceIds._data[0]._hash,
       layersTable: "layers",
       layers: {
         layer0: layer0._hash,
@@ -452,7 +440,7 @@ __publicField(_Example, "broken", {
     missingSliceIdSet: () => {
       const result = _Example.ok.complete();
       const layer1 = result.layers._data[1];
-      layer1.sliceIds.row = "MISSING1";
+      layer1.sliceIdsTableRow = "MISSING1";
       return hip(result, {
         updateExistingHashes: true,
         throwOnWrongHashes: false
@@ -475,7 +463,7 @@ __publicField(_Example, "broken", {
   cakes: {
     missingSliceIdSet: () => {
       const result = _Example.ok.complete();
-      result.cakes._data[0].sliceIds.row = "MISSING";
+      result.cakes._data[0].sliceIdsRow = "MISSING";
       hip(result.cakes, {
         updateExistingHashes: true,
         throwOnWrongHashes: false
@@ -1154,16 +1142,12 @@ class _BaseValidator {
       }
       const layersTable = table;
       for (const layer of layersTable._data) {
-        const sliceIds = layer.sliceIds;
-        if (!sliceIds) {
-          continue;
-        }
-        const sliceIdsTable = this.rljsonIndexed[sliceIds.table];
+        const sliceIdsTable = this.rljsonIndexed[layer.sliceIdsTable];
         if (!sliceIdsTable) {
           brokenLayers.push({
             layersTable: tableKey,
             layerHash: layer._hash,
-            missingSliceIdsTable: sliceIds.table
+            missingSliceIdsTable: layer.sliceIdsTable
           });
         }
       }
@@ -1183,18 +1167,14 @@ class _BaseValidator {
       }
       const layersTable = table;
       for (const layer of layersTable._data) {
-        const sliceIds = layer.sliceIds;
-        if (!sliceIds) {
-          continue;
-        }
-        const sliceIdsTableName = sliceIds.table;
+        const sliceIdsTableName = layer.sliceIdsTable;
         const sliceIdsTable = this.rljsonIndexed[sliceIdsTableName];
-        const idSet = sliceIdsTable._data[sliceIds.row];
+        const idSet = sliceIdsTable._data[layer.sliceIdsTableRow];
         if (!idSet) {
           brokenLayers.push({
             layersTable: tableKey,
             layerHash: layer._hash,
-            missingSliceIdsRow: sliceIds.row
+            missingSliceIdsRow: layer.sliceIdsTableRow
           });
         }
       }
@@ -1264,11 +1244,8 @@ class _BaseValidator {
       }
       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 sliceIdsTable = this.rljsonIndexed[layer.sliceIdsTable];
+        const sliceIdsRow = sliceIdsTable._data[layer.sliceIdsTableRow];
         const sliceIds = sliceIdsRow.add;
         const sliceIdsInLayer = Object.keys(layer.assign);
         const unassignedSliceIds = [];
@@ -1302,16 +1279,12 @@ class _BaseValidator {
       }
       const cakesTable = table;
       for (const cake of cakesTable._data) {
-        const sliceIds = cake.sliceIds;
-        if (!sliceIds) {
-          continue;
-        }
-        const sliceIdsTable = this.rljsonIndexed[sliceIds.table];
+        const sliceIdsTable = this.rljsonIndexed[cake.sliceIdsTable];
         if (!sliceIdsTable) {
           brokenCakes.push({
             cakeTable: tableKey,
             brokenCake: cake._hash,
-            missingSliceIdsTable: sliceIds.table
+            missingSliceIdsTable: cake.sliceIdsTable
           });
         }
       }
@@ -1331,18 +1304,14 @@ class _BaseValidator {
       }
       const cakesTable = table;
       for (const cake of cakesTable._data) {
-        const sliceIds = cake.sliceIds;
-        if (!sliceIds) {
-          continue;
-        }
-        const sliceIdsTableName = cake.sliceIds.table;
+        const sliceIdsTableName = cake.sliceIdsTable;
         const sliceIdsTable = this.rljsonIndexed[sliceIdsTableName];
-        const sliceIdValues = sliceIdsTable._data[sliceIds.row];
+        const sliceIdValues = sliceIdsTable._data[cake.sliceIdsRow];
         if (!sliceIdValues) {
           brokenCakes.push({
             cakeTable: tableKey,
             brokenCake: cake._hash,
-            missingSliceIdsRow: sliceIds.row
+            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,18 +160,16 @@ 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({
-        sliceIds: {
-          table: 'sliceIds',
-          row: 'MgHRBYSrhpyl4rvsOmAWcQ',
-        },
+      const layer0 = hip<Layer>({
+        sliceIdsTable: 'sliceIds',
+        sliceIdsTableRow: 'MgHRBYSrhpyl4rvsOmAWcQ',
         ingredientsTable: 'ingredients',
         assign: {
           id0: ingredient0._hash,
@@ -179,12 +177,10 @@ export class Example {
         },
       });
 
-      const layer1: Layer = hip({
+      const layer1 = hip<Layer>({
         base: layer0._hash as string,
-        sliceIds: {
-          table: 'sliceIds',
-          row: 'MgHRBYSrhpyl4rvsOmAWcQ',
-        },
+        sliceIdsTable: 'sliceIds',
+        sliceIdsTableRow: 'MgHRBYSrhpyl4rvsOmAWcQ',
         ingredientsTable: 'ingredients',
         assign: {
           id0: ingredient0._hash,
@@ -192,16 +188,14 @@ export class Example {
         },
       });
 
-      const layers: LayersTable = hip({
+      const layers = hip<LayersTable>({
         _type: 'layers',
         _data: [layer0, layer1],
       } as LayersTable);
 
-      const cake: Cake = hip({
-        sliceIds: {
-          table: 'sliceIds',
-          row: sliceIds._data[0]._hash as string,
-        },
+      const cake = hip<Cake>({
+        sliceIdsTable: 'sliceIds',
+        sliceIdsRow: sliceIds._data[0]._hash as string,
         layersTable: 'layers',
         layers: {
           layer0: layer0._hash as string,
@@ -209,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: [
           {
@@ -335,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.row = 'MISSING1';
+        layer1.sliceIdsTableRow = 'MISSING1';
 
         // Recalculate hashes
         return hip(result, {
@@ -365,14 +359,15 @@ export class Example {
     cakes: {
       missingSliceIdSet: (): Rljson => {
         const result = Example.ok.complete();
-        result.cakes._data[0].sliceIds.row = 'MISSING'; // Missing ID set
+        (result.cakes as CakesTable)._data[0].sliceIdsRow = '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
+        (result.buffets as BuffetsTable)._data[0].items[0].ref = result.cakes
+          ._data[0]._hash as string; // Update buffet reference
 
         hip(result.buffets, {
           updateExistingHashes: true,

package/package.json

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