@rljson/rljson 0.0.64 → 0.0.66

package/dist/rljson.js

@@ -131,6 +131,7 @@ class Route {
       const refKey = Object.keys(segment).find(
         (k) => k.endsWith("Ref") && k !== "tableKey"
       );
+      /* v8 ignore next -- @preserve */
       if (refKey) {
         return segment[refKey];
       }
@@ -534,26 +535,172 @@ class Example {
       };
     },
     singleRef: () => {
+      const tableCfgs = hip({
+        _type: "tableCfgs",
+        _data: [
+          {
+            key: "tableA",
+            type: "components",
+            isHead: false,
+            isRoot: false,
+            isShared: true,
+            columns: [
+              {
+                key: "_hash",
+                type: "string",
+                titleLong: "Hash",
+                titleShort: "Hash"
+              },
+              {
+                key: "propertyA",
+                type: "string",
+                titleLong: "Key",
+                titleShort: "Key"
+              }
+            ],
+            _hash: ""
+          },
+          {
+            key: "tableB",
+            type: "components",
+            isHead: false,
+            isRoot: false,
+            isShared: true,
+            columns: [
+              {
+                key: "_hash",
+                type: "string",
+                titleLong: "Hash",
+                titleShort: "Hash"
+              },
+              {
+                key: "propertyAFromTableA",
+                type: "string",
+                titleLong: "Table A Reference",
+                titleShort: "TableARef",
+                ref: {
+                  tableKey: "tableA",
+                  columnKey: "propertyA"
+                }
+              }
+            ],
+            _hash: ""
+          }
+        ]
+      });
+      const tableA = hip({
+        _type: "components",
+        _tableCfg: tableCfgs._data[0]._hash,
+        _data: [
+          {
+            propertyA: "a0"
+          },
+          {
+            propertyA: "a1"
+          }
+        ],
+        _hash: ""
+      });
+      const tableB = hip({
+        _type: "components",
+        _tableCfg: tableCfgs._data[1]._hash,
+        _data: [
+          {
+            propertyAFromTableA: tableA._data[0]._hash
+          }
+        ],
+        _hash: ""
+      });
       return {
-        tableA: {
-          _type: "components",
-          _data: [
-            {
-              keyA0: "a0"
-            },
-            {
-              keyA1: "a1"
-            }
-          ]
-        },
-        tableB: {
-          _type: "components",
-          _data: [
-            {
-              tableARef: "KFQrf4mEz0UPmUaFHwH4T6"
-            }
-          ]
-        }
+        tableCfgs,
+        tableA,
+        tableB
+      };
+    },
+    multiRef: () => {
+      const tableCfgs = hip({
+        _type: "tableCfgs",
+        _data: [
+          {
+            key: "tableA",
+            type: "components",
+            isHead: false,
+            isRoot: false,
+            isShared: true,
+            columns: [
+              {
+                key: "_hash",
+                type: "string",
+                titleLong: "Hash",
+                titleShort: "Hash"
+              },
+              {
+                key: "propertyA",
+                type: "string",
+                titleLong: "Key",
+                titleShort: "Key"
+              }
+            ],
+            _hash: ""
+          },
+          {
+            key: "tableB",
+            type: "components",
+            isHead: false,
+            isRoot: false,
+            isShared: true,
+            columns: [
+              {
+                key: "_hash",
+                type: "string",
+                titleLong: "Hash",
+                titleShort: "Hash"
+              },
+              {
+                key: "propertyAFromTableA",
+                type: "jsonValue",
+                titleLong: "Table A Reference",
+                titleShort: "TableARef",
+                ref: {
+                  tableKey: "tableA",
+                  columnKey: "propertyA"
+                }
+              }
+            ],
+            _hash: ""
+          }
+        ]
+      });
+      const tableA = hip({
+        _type: "components",
+        _tableCfg: tableCfgs._data[0]._hash,
+        _data: [
+          {
+            propertyA: "a0"
+          },
+          {
+            propertyA: "a1"
+          }
+        ],
+        _hash: ""
+      });
+      const tableB = hip({
+        _type: "components",
+        _tableCfg: tableCfgs._data[1]._hash,
+        _data: [
+          {
+            propertyAFromTableA: [
+              tableA._data[0]._hash,
+              tableA._data[1]._hash
+            ]
+          }
+        ],
+        _hash: ""
+      });
+      return {
+        tableCfgs,
+        tableA,
+        tableB
       };
     },
     singleSliceIdRef: () => {
@@ -596,89 +743,6 @@ class Example {
         }
       };
     },
-    singleNamedRef: () => {
-      return {
-        tableA: {
-          _type: "components",
-          _data: [
-            {
-              keyA0: "a0"
-            },
-            {
-              keyA1: "a1"
-            }
-          ]
-        },
-        tableB: {
-          _type: "components",
-          _data: [
-            {
-              namedRef: { component: "tableA", ref: "KFQrf4mEz0UPmUaFHwH4T6" }
-            }
-          ]
-        }
-      };
-    },
-    multiRef: () => {
-      return {
-        tableA: {
-          _type: "components",
-          _data: [
-            {
-              keyA0: "a0"
-            },
-            {
-              keyA1: "a1"
-            }
-          ]
-        },
-        tableB: {
-          _type: "components",
-          _data: [
-            {
-              tableARef: ["KFQrf4mEz0UPmUaFHwH4T6", "YPw-pxhqaUOWRFGramr4B1"]
-            }
-          ]
-        }
-      };
-    },
-    multiMixedRef: () => {
-      return {
-        tableA: {
-          _type: "components",
-          _data: [
-            {
-              keyA0: "a0"
-            },
-            {
-              keyA1: "a1"
-            }
-          ]
-        },
-        tableB: {
-          _type: "components",
-          _data: [
-            {
-              keyB0: "b0"
-            },
-            {
-              keyB1: "b1"
-            }
-          ]
-        },
-        tableC: {
-          _type: "components",
-          _data: [
-            {
-              tableRef: [
-                { component: "tableA", ref: "KFQrf4mEz0UPmUaFHwH4T6" },
-                { component: "tableB", ref: "dXhIygNwNMVPEqFbsFJkn6" }
-              ]
-            }
-          ]
-        }
-      };
-    },
     complete: () => {
       const sliceIds = hip({
         _type: "sliceIds",
@@ -776,87 +840,220 @@ class Example {
         };
       },
       missingRef: () => {
+        const tableCfgs = hip({
+          _type: "tableCfgs",
+          _data: [
+            {
+              key: "tableA",
+              type: "components",
+              isHead: false,
+              isRoot: false,
+              isShared: true,
+              columns: [
+                {
+                  key: "_hash",
+                  type: "string",
+                  titleLong: "Hash",
+                  titleShort: "Hash"
+                },
+                {
+                  key: "propertyA",
+                  type: "string",
+                  titleLong: "Key",
+                  titleShort: "Key"
+                }
+              ],
+              _hash: ""
+            },
+            {
+              key: "tableB",
+              type: "components",
+              isHead: false,
+              isRoot: false,
+              isShared: true,
+              columns: [
+                {
+                  key: "_hash",
+                  type: "string",
+                  titleLong: "Hash",
+                  titleShort: "Hash"
+                },
+                {
+                  key: "propertyAFromTableA",
+                  type: "jsonValue",
+                  titleLong: "Table A Reference",
+                  titleShort: "TableARef",
+                  ref: {
+                    tableKey: "tableA",
+                    columnKey: "propertyA"
+                  }
+                }
+              ],
+              _hash: ""
+            }
+          ]
+        });
+        const tableA = hip({
+          _type: "components",
+          _tableCfg: tableCfgs._data[0]._hash,
+          _data: [
+            {
+              propertyA: "a0"
+            },
+            {
+              propertyA: "a1"
+            }
+          ],
+          _hash: ""
+        });
+        const tableB = hip({
+          _type: "components",
+          _tableCfg: tableCfgs._data[1]._hash,
+          _data: [
+            {
+              propertyAFromTableA: "MISSINGREF"
+              // Missing reference
+            }
+          ],
+          _hash: ""
+        });
         return {
-          tableA: {
-            _type: "components",
-            _data: [
-              {
-                keyA0: "a0"
-              },
-              {
-                keyA1: "a1"
-              }
-            ]
-          },
-          tableB: {
-            _type: "components",
-            _data: [
-              {
-                tableARef: "MISSINGREF"
-                // MISSINGREF does not exist in tableA
-              }
-            ]
-          }
-        };
-      },
-      missingNamedRef: () => {
-        return {
-          tableA: {
-            _type: "components",
-            _data: [
-              {
-                keyA0: "a0"
-              },
-              {
-                keyA1: "a1"
-              }
-            ]
-          },
-          tableB: {
-            _type: "components",
-            _data: [
-              {
-                namedRef: { component: "tableA", ref: "MISSINGREF" }
-                // MISSINGREF does not exist in tableA
-              }
-            ]
-          }
+          tableCfgs,
+          tableA,
+          tableB
         };
       },
       missingMultiRef: () => {
+        const tableCfgs = hip({
+          _type: "tableCfgs",
+          _data: [
+            {
+              key: "tableA",
+              type: "components",
+              isHead: false,
+              isRoot: false,
+              isShared: true,
+              columns: [
+                {
+                  key: "_hash",
+                  type: "string",
+                  titleLong: "Hash",
+                  titleShort: "Hash"
+                },
+                {
+                  key: "propertyA",
+                  type: "string",
+                  titleLong: "Key",
+                  titleShort: "Key"
+                }
+              ],
+              _hash: ""
+            },
+            {
+              key: "tableB",
+              type: "components",
+              isHead: false,
+              isRoot: false,
+              isShared: true,
+              columns: [
+                {
+                  key: "_hash",
+                  type: "string",
+                  titleLong: "Hash",
+                  titleShort: "Hash"
+                },
+                {
+                  key: "propertyAFromTableA",
+                  type: "jsonValue",
+                  titleLong: "Table A Reference",
+                  titleShort: "TableARef",
+                  ref: {
+                    tableKey: "tableA",
+                    columnKey: "propertyA"
+                  }
+                }
+              ],
+              _hash: ""
+            }
+          ]
+        });
+        const tableA = hip({
+          _type: "components",
+          _tableCfg: tableCfgs._data[0]._hash,
+          _data: [
+            {
+              propertyA: "a0"
+            },
+            {
+              propertyA: "a1"
+            }
+          ],
+          _hash: ""
+        });
+        const tableB = hip({
+          _type: "components",
+          _tableCfg: tableCfgs._data[1]._hash,
+          _data: [
+            {
+              propertyAFromTableA: [tableA._data[0]._hash, "MISSINGREF"]
+              // Missing reference
+            }
+          ],
+          _hash: ""
+        });
         return {
-          tableA: {
-            _type: "components",
-            _data: [
-              {
-                keyA0: "a0"
-              },
-              {
-                keyA1: "a1"
-              }
-            ]
-          },
-          tableB: {
-            _type: "components",
-            _data: [
-              {
-                tableARef: ["KFQrf4mEz0UPmUaFHwH4T6", "MISSING"]
-              }
-            ]
-          }
+          tableCfgs,
+          tableA,
+          tableB
         };
       },
       missingReferencedTable: () => {
+        const tableCfgs = hip({
+          _type: "tableCfgs",
+          _data: [
+            {
+              key: "tableB",
+              type: "components",
+              isHead: false,
+              isRoot: false,
+              isShared: true,
+              columns: [
+                {
+                  key: "_hash",
+                  type: "string",
+                  titleLong: "Hash",
+                  titleShort: "Hash"
+                },
+                {
+                  key: "propertyAFromTableA",
+                  type: "jsonValue",
+                  titleLong: "Table A Reference",
+                  titleShort: "TableARef",
+                  ref: {
+                    tableKey: "tableA",
+                    // Referenced table missing
+                    columnKey: "propertyA"
+                  }
+                }
+              ],
+              _hash: ""
+            }
+          ]
+        });
+        const tableB = hip({
+          _type: "components",
+          _tableCfg: tableCfgs._data[0]._hash,
+          _data: [
+            {
+              propertyAFromTableA: "MISSINGREF"
+              // Missing reference
+            }
+          ],
+          _hash: ""
+        });
         return {
-          tableB: {
-            _type: "components",
-            _data: [
-              {
-                tableARef: "MISSINGREF"
-                // tableA is missing
-              }
-            ]
-          }
+          tableCfgs,
+          tableB
         };
       },
       missingSliceId: () => {
@@ -1244,6 +1441,12 @@ const validateInsert = (insert) => {
   return InsertValidator.create(insert).validate();
 };
 // @license
+const exampleInsert = () => ({
+  route: "a/b/c",
+  command: "add",
+  value: { x: { y: { z: true } } }
+});
+// @license
 const reservedFieldNames = ["_data"];
 const reservedTableKeys = [
   "_hash",
@@ -1393,7 +1596,6 @@ class _BaseValidator {
       () => this._rootOrHeadTableHasNoIdColumn(),
       // Check references
       () => this._refsNotFound(),
-      () => this._sliceIdRefsNotFound(),
       // Check layers
       () => this._layerBasesNotFound(),
       () => this._layerSliceIdsTableNotFound(),
@@ -1488,15 +1690,9 @@ class _BaseValidator {
         throwOnWrongHashes: true
       });
     } catch (error) {
-      if (error instanceof Error) {
-        this.errors.hashesNotValid = {
-          error: error.message
-        };
-      } else {
-        this.errors.hashesNotValid = {
-          error: "Unknown error"
-        };
-      }
+      this.errors.hashesNotValid = {
+        error: error.message
+      };
     }
   }
   // ...........................................................................
@@ -1768,36 +1964,46 @@ class _BaseValidator {
   _refsNotFound() {
     const missingRefs = [];
     iterateTablesSync(this.rljson, (tableKey, table) => {
-      const tableData = table._data;
-      for (const item of tableData) {
-        for (const key of Object.keys(item)) {
-          if (key.endsWith("Ref")) {
-            const targetItemRefs = Array.isArray(item[key]) ? item[key] : [item[key]];
-            for (const targetItemRef of targetItemRefs) {
-              const targetTableKey = typeof targetItemRef !== "string" ? targetItemRef.component : key.substring(0, key.length - 3);
-              const targetItemHash = typeof targetItemRef !== "string" ? targetItemRef.ref : targetItemRef;
-              const itemHash = item._hash;
+      if (tableKey === "tableCfgs") return;
+      const tableCfgRef = table._tableCfg;
+      if (!tableCfgRef) return;
+      const tableCfg = this.rljsonIndexed.tableCfgs._data[tableCfgRef];
+      /* v8 ignore next -- @preserve */
+      if (!tableCfg) return;
+      const tableRows = table._data;
+      for (const row of tableRows) {
+        for (const columnKey of Object.keys(row)) {
+          if (columnKey.startsWith("_")) continue;
+          const columnCfg = tableCfg.columns.find(
+            (col) => col.key === columnKey
+          );
+          /* v8 ignore next -- @preserve */
+          if (columnCfg === void 0) continue;
+          if (columnCfg.ref && columnCfg.ref.tableKey) {
+            const targetTableKey = columnCfg.ref.tableKey;
+            const targetRefs = Array.isArray(row[columnKey]) ? row[columnKey] : [row[columnKey]];
+            for (const targetRef of targetRefs) {
               if (this.tableKeys.indexOf(targetTableKey) === -1) {
                 missingRefs.push({
                   error: `Target table "${targetTableKey}" not found.`,
                   sourceTable: tableKey,
-                  sourceKey: key,
-                  sourceItemHash: itemHash,
-                  targetItemHash,
+                  sourceKey: columnKey,
+                  sourceItemHash: row._hash,
+                  targetItemHash: targetRef,
                   targetTable: targetTableKey
                 });
                 continue;
               }
               const targetTableIndexed = this.rljsonIndexed[targetTableKey];
-              const referencedItem = targetTableIndexed._data[targetItemHash];
+              const referencedItem = targetTableIndexed._data[targetRef];
               if (referencedItem === void 0) {
                 missingRefs.push({
                   sourceTable: tableKey,
-                  sourceItemHash: itemHash,
-                  sourceKey: key,
-                  targetItemHash,
+                  sourceItemHash: row._hash,
+                  sourceKey: columnKey,
+                  targetItemHash: targetRef,
                   targetTable: targetTableKey,
-                  error: `Table "${targetTableKey}" has no item with hash "${targetItemHash}"`
+                  error: `Table "${targetTableKey}" has no item with hash "${targetRef}"`
                 });
               }
             }
@@ -1813,49 +2019,6 @@ class _BaseValidator {
     }
   }
   // ...........................................................................
-  _sliceIdRefsNotFound() {
-    const missingSliceIdRefs = [];
-    iterateTablesSync(this.rljson, (tableKey, table) => {
-      const tableData = table._data;
-      for (const item of tableData) {
-        for (const key of Object.keys(item)) {
-          if (key.endsWith("SliceId")) {
-            const targetSliceIds = Array.isArray(item[key]) ? item[key] : [item[key]];
-            for (const targetSliceId of targetSliceIds) {
-              if (this.tableKeys.indexOf(key) === -1) {
-                missingSliceIdRefs.push({
-                  sourceTable: tableKey,
-                  targetSliceId,
-                  targetTable: key,
-                  error: `Target table "${targetSliceId}" not found.`
-                });
-                continue;
-              }
-              const targetSliceIdsTable = this.rljson[key];
-              const targetSliceIds2 = targetSliceIdsTable._data.flatMap(
-                (d) => [...d.add, ...d.remove ?? []]
-              );
-              if (targetSliceIds2.indexOf(targetSliceId) === -1) {
-                missingSliceIdRefs.push({
-                  sourceTable: tableKey,
-                  targetSliceId,
-                  targetTable: key,
-                  error: `Table "${key}" has no sliceId "${targetSliceId}"`
-                });
-              }
-            }
-          }
-        }
-      }
-    });
-    if (missingSliceIdRefs.length > 0) {
-      this.errors.refsNotFound = {
-        error: "Broken references",
-        missingRefs: missingSliceIdRefs
-      };
-    }
-  }
-  // ...........................................................................
   _layerBasesNotFound() {
     const brokenLayers = [];
     iterateTablesSync(this.rljson, (tableKey, table) => {
@@ -2219,6 +2382,7 @@ export {
   exampleCakesTable,
   exampleComponentsTable,
   exampleHistoryTable,
+  exampleInsert,
   exampleLayersTable,
   exampleRevision,
   exampleRljson,