@rljson/rljson 0.0.52 → 0.0.53

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export * from './content/table-cfg.ts';
 export * from './example.ts';
 export * from './example/bakery-example.ts';
 export * from './rljson.ts';
+export * from './tools/remove-duplicates.ts';
 export * from './typedefs.ts';
 export * from './validate/base-validator.ts';
 export * from './validate/validate.ts';

package/dist/rljson.js

@@ -1,6 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { hip, hsh } from "@rljson/hash";
 import { exampleJsonObject, jsonValueTypes, jsonValueType, jsonValueMatchesType } from "@rljson/json";
 // @license
@@ -157,237 +154,117 @@ const exampleRevision = () => ({
 // @license
 const exampleSliceIdsTable = () => bakeryExample().slices;
 // @license
-const _Example = class _Example {
-};
-__publicField(_Example, "ok", {
-  bakery: () => bakeryExample(),
-  empty: () => {
-    return {};
-  },
-  binary: () => {
-    return {
-      table: {
-        _type: "components",
-        _data: [
-          { a: false, b: false },
-          { a: false, b: true },
-          { a: true, b: false },
-          { a: true, b: true }
-        ]
-      }
-    };
-  },
-  singleRow: () => {
-    const tableCfgs = hip({
-      _hash: "",
-      _type: "tableCfgs",
-      _data: [
-        {
-          version: 0,
-          _hash: "",
-          key: "table",
-          type: "components",
-          isHead: false,
-          isRoot: false,
-          isShared: true,
-          columns: [
-            {
-              key: "int",
-              type: "number"
-            },
-            {
-              key: "double",
-              type: "number"
-            },
-            {
-              key: "string",
-              type: "string"
-            },
-            {
-              key: "boolean",
-              type: "boolean"
-            },
-            {
-              key: "null",
-              type: "string"
-            },
-            {
-              key: "jsonArray",
-              type: "jsonArray"
-            },
-            {
-              key: "json",
-              type: "json"
-            },
-            {
-              key: "jsonValue",
-              type: "jsonValue"
-            }
+class Example {
+  static ok = {
+    bakery: () => bakeryExample(),
+    empty: () => {
+      return {};
+    },
+    binary: () => {
+      return {
+        table: {
+          _type: "components",
+          _data: [
+            { a: false, b: false },
+            { a: false, b: true },
+            { a: true, b: false },
+            { a: true, b: true }
           ]
         }
-      ]
-    });
-    const result = {
-      tableCfgs,
-      table: {
-        _tableCfg: tableCfgs._data[0]._hash,
-        _type: "components",
-        _data: [exampleJsonObject()],
-        _hash: ""
-      }
-    };
-    return result;
-  },
-  multipleRows: () => {
-    return {
-      table: {
-        _type: "components",
-        _data: [
-          {
-            string: "str0",
-            boolean: true,
-            number: 1,
-            array: [1, "str0", true, { a: { b: "c" } }],
-            object: { a: { b: "c" } }
-          },
-          {
-            string: "str1",
-            boolean: true,
-            number: 1,
-            array: [1, "str1", true, { a: { b: "c" } }],
-            object: { a: { b: "c" } }
-          },
-          {
-            string: "str2",
-            boolean: false,
-            number: 1,
-            array: [1, "str1", true, { a: { b: "c" } }],
-            object: { d: { e: "f" } }
-          }
-        ]
-      }
-    };
-  },
-  singleRef: () => {
-    return {
-      tableA: {
-        _type: "components",
-        _data: [
-          {
-            keyA0: "a0"
-          },
-          {
-            keyA1: "a1"
-          }
-        ]
-      },
-      tableB: {
-        _type: "components",
+      };
+    },
+    singleRow: () => {
+      const tableCfgs = hip({
+        _hash: "",
+        _type: "tableCfgs",
         _data: [
           {
-            tableARef: "KFQrf4mEz0UPmUaFHwH4T6"
+            version: 0,
+            _hash: "",
+            key: "table",
+            type: "components",
+            isHead: false,
+            isRoot: false,
+            isShared: true,
+            columns: [
+              {
+                key: "int",
+                type: "number"
+              },
+              {
+                key: "double",
+                type: "number"
+              },
+              {
+                key: "string",
+                type: "string"
+              },
+              {
+                key: "boolean",
+                type: "boolean"
+              },
+              {
+                key: "null",
+                type: "string"
+              },
+              {
+                key: "jsonArray",
+                type: "jsonArray"
+              },
+              {
+                key: "json",
+                type: "json"
+              },
+              {
+                key: "jsonValue",
+                type: "jsonValue"
+              }
+            ]
           }
         ]
-      }
-    };
-  },
-  complete: () => {
-    const sliceIds = hip({
-      _type: "sliceIds",
-      _data: [
-        {
-          add: ["id0", "id1"]
+      });
+      const result = {
+        tableCfgs,
+        table: {
+          _tableCfg: tableCfgs._data[0]._hash,
+          _type: "components",
+          _data: [exampleJsonObject()],
+          _hash: ""
         }
-      ]
-    });
-    const components = hip({
-      _type: "components",
-      _data: [{ a: "0" }, { a: "1" }]
-    });
-    const component0 = components._data[0];
-    const component1 = components._data[1];
-    const abLayer0 = hip({
-      sliceIdsTable: "sliceIds",
-      sliceIdsTableRow: "MgHRBYSrhpyl4rvsOmAWcQ",
-      componentsTable: "components",
-      add: {
-        id0: component0._hash,
-        id1: component1._hash
-      }
-    });
-    const abLayer1 = hip({
-      base: abLayer0._hash,
-      sliceIdsTable: "sliceIds",
-      sliceIdsTableRow: "MgHRBYSrhpyl4rvsOmAWcQ",
-      componentsTable: "components",
-      add: {
-        id0: component0._hash,
-        id1: component1._hash
-      }
-    });
-    const abLayers = hip({
-      _type: "layers",
-      _data: [abLayer0, abLayer1]
-    });
-    const cake = hip({
-      sliceIdsTable: "sliceIds",
-      sliceIdsRow: sliceIds._data[0]._hash,
-      layers: {
-        abLayers: abLayer1._hash
-      }
-    });
-    const cakes = hip({
-      _type: "cakes",
-      _data: [cake]
-    });
-    const buffets = hip({
-      _type: "buffets",
-      _data: [
-        {
-          items: [
+      };
+      return result;
+    },
+    multipleRows: () => {
+      return {
+        table: {
+          _type: "components",
+          _data: [
             {
-              table: "cakes",
-              ref: cakes._data[0]._hash
+              string: "str0",
+              boolean: true,
+              number: 1,
+              array: [1, "str0", true, { a: { b: "c" } }],
+              object: { a: { b: "c" } }
             },
             {
-              table: "abLayers",
-              ref: abLayer0._hash
+              string: "str1",
+              boolean: true,
+              number: 1,
+              array: [1, "str1", true, { a: { b: "c" } }],
+              object: { a: { b: "c" } }
+            },
+            {
+              string: "str2",
+              boolean: false,
+              number: 1,
+              array: [1, "str1", true, { a: { b: "c" } }],
+              object: { d: { e: "f" } }
             }
           ]
         }
-      ]
-    });
-    return {
-      sliceIds,
-      components,
-      abLayers,
-      cakes,
-      buffets
-    };
-  }
-});
-__publicField(_Example, "broken", {
-  base: {
-    brokenTableKey: () => {
-      return {
-        brok$en: {
-          _data: []
-        }
-      };
-    },
-    missingData: () => {
-      return {
-        table: {}
       };
     },
-    dataNotBeingAnArray: () => {
-      return {
-        table: {
-          _data: {}
-        }
-      };
-    },
-    missingRef: () => {
+    singleRef: () => {
       return {
         tableA: {
           _type: "components",
@@ -404,126 +281,245 @@ __publicField(_Example, "broken", {
           _type: "components",
           _data: [
             {
-              tableARef: "MISSINGREF"
-              // MISSINGREF does not exist in tableA
+              tableARef: "KFQrf4mEz0UPmUaFHwH4T6"
             }
           ]
         }
       };
     },
-    missingReferencedTable: () => {
-      return {
-        tableB: {
-          _type: "components",
-          _data: [
-            {
-              tableARef: "MISSINGREF"
-              // tableA is missing
-            }
-          ]
-        }
-      };
-    }
-  },
-  tableCfg: {
-    wrongType: () => {
-      const result = _Example.ok.singleRow();
-      const columns = result.tableCfgs._data[0].columns;
-      const intColumn = columns.find((c) => c.key === "int");
-      intColumn.type = "numberBroken";
-      return hip(result, {
-        updateExistingHashes: true,
-        throwOnWrongHashes: false
+    complete: () => {
+      const sliceIds = hip({
+        _type: "sliceIds",
+        _data: [
+          {
+            add: ["id0", "id1"]
+          }
+        ]
       });
-    }
-  },
-  layers: {
-    missingBase: () => {
-      const result = _Example.ok.complete();
-      const layer1 = result.abLayers._data[1];
-      layer1.base = "MISSING";
-      return hip(result, {
-        updateExistingHashes: true,
-        throwOnWrongHashes: false
+      const components = hip({
+        _type: "components",
+        _data: [{ a: "0" }, { a: "1" }]
       });
-    },
-    missingSliceIdSet: () => {
-      const result = _Example.ok.complete();
-      const layer1 = result.abLayers._data[1];
-      layer1.sliceIdsTableRow = "MISSING1";
-      return hip(result, {
-        updateExistingHashes: true,
-        throwOnWrongHashes: false
+      const component0 = components._data[0];
+      const component1 = components._data[1];
+      const abLayer0 = hip({
+        sliceIdsTable: "sliceIds",
+        sliceIdsTableRow: "MgHRBYSrhpyl4rvsOmAWcQ",
+        componentsTable: "components",
+        add: {
+          id0: component0._hash,
+          id1: component1._hash
+        }
       });
-    },
-    missingAssignedComponentTable: () => {
-      const result = _Example.ok.complete();
-      delete result.components;
-      return result;
-    },
-    missingAssignedComponent: () => {
-      const result = _Example.ok.complete();
-      result.components._data.splice(1, 2);
-      return hip(result, {
-        updateExistingHashes: true,
-        throwOnWrongHashes: false
+      const abLayer1 = hip({
+        base: abLayer0._hash,
+        sliceIdsTable: "sliceIds",
+        sliceIdsTableRow: "MgHRBYSrhpyl4rvsOmAWcQ",
+        componentsTable: "components",
+        add: {
+          id0: component0._hash,
+          id1: component1._hash
+        }
       });
-    }
-  },
-  cakes: {
-    missingSliceIdSet: () => {
-      const result = _Example.ok.complete();
-      result.cakes._data[0].sliceIdsRow = "MISSING";
-      hip(result.cakes, {
-        updateExistingHashes: true,
-        throwOnWrongHashes: false
+      const abLayers = hip({
+        _type: "layers",
+        _data: [abLayer0, abLayer1]
       });
-      result.buffets._data[0].items[0].ref = result.cakes._data[0]._hash;
-      hip(result.buffets, {
-        updateExistingHashes: true,
-        throwOnWrongHashes: false
+      const cake = hip({
+        sliceIdsTable: "sliceIds",
+        sliceIdsRow: sliceIds._data[0]._hash,
+        layers: {
+          abLayers: abLayer1._hash
+        }
       });
-      return result;
-    },
-    missingLayersTable: () => {
-      const result = _Example.ok.complete();
-      result.cakes._data[0].layers = { MISSING: "HASH" };
-      hip(result.cakes, {
-        updateExistingHashes: true,
-        throwOnWrongHashes: false
+      const cakes = hip({
+        _type: "cakes",
+        _data: [cake]
       });
-      return result;
-    },
-    missingCakeLayer: () => {
-      const result = _Example.ok.complete();
-      result.cakes._data[0].layers["abLayers"] = "MISSING0";
-      hip(result.cakes, {
-        updateExistingHashes: true,
-        throwOnWrongHashes: false
+      const buffets = hip({
+        _type: "buffets",
+        _data: [
+          {
+            items: [
+              {
+                table: "cakes",
+                ref: cakes._data[0]._hash
+              },
+              {
+                table: "abLayers",
+                ref: abLayer0._hash
+              }
+            ]
+          }
+        ]
       });
-      return result;
+      return {
+        sliceIds,
+        components,
+        abLayers,
+        cakes,
+        buffets
+      };
     }
-  },
-  buffets: {
-    missingTable: () => {
-      const result = _Example.ok.complete();
-      const buffet = result.buffets._data[0];
-      buffet.items[0].table = "MISSING0";
-      buffet.items[1].table = "MISSING1";
-      hip(result, { updateExistingHashes: true, throwOnWrongHashes: false });
-      return result;
+  };
+  static broken = {
+    base: {
+      brokenTableKey: () => {
+        return {
+          brok$en: {
+            _data: []
+          }
+        };
+      },
+      missingData: () => {
+        return {
+          table: {}
+        };
+      },
+      dataNotBeingAnArray: () => {
+        return {
+          table: {
+            _data: {}
+          }
+        };
+      },
+      missingRef: () => {
+        return {
+          tableA: {
+            _type: "components",
+            _data: [
+              {
+                keyA0: "a0"
+              },
+              {
+                keyA1: "a1"
+              }
+            ]
+          },
+          tableB: {
+            _type: "components",
+            _data: [
+              {
+                tableARef: "MISSINGREF"
+                // MISSINGREF does not exist in tableA
+              }
+            ]
+          }
+        };
+      },
+      missingReferencedTable: () => {
+        return {
+          tableB: {
+            _type: "components",
+            _data: [
+              {
+                tableARef: "MISSINGREF"
+                // tableA is missing
+              }
+            ]
+          }
+        };
+      }
     },
-    missingItems: () => {
-      const result = _Example.ok.complete();
-      const buffet = result.buffets._data[0];
-      buffet.items[0].ref = "MISSING0";
-      buffet.items[1].ref = "MISSING1";
-      hip(result, { updateExistingHashes: true, throwOnWrongHashes: false });
-      return result;
+    tableCfg: {
+      wrongType: () => {
+        const result = Example.ok.singleRow();
+        const columns = result.tableCfgs._data[0].columns;
+        const intColumn = columns.find((c) => c.key === "int");
+        intColumn.type = "numberBroken";
+        return hip(result, {
+          updateExistingHashes: true,
+          throwOnWrongHashes: false
+        });
+      }
+    },
+    layers: {
+      missingBase: () => {
+        const result = Example.ok.complete();
+        const layer1 = result.abLayers._data[1];
+        layer1.base = "MISSING";
+        return hip(result, {
+          updateExistingHashes: true,
+          throwOnWrongHashes: false
+        });
+      },
+      missingSliceIdSet: () => {
+        const result = Example.ok.complete();
+        const layer1 = result.abLayers._data[1];
+        layer1.sliceIdsTableRow = "MISSING1";
+        return hip(result, {
+          updateExistingHashes: true,
+          throwOnWrongHashes: false
+        });
+      },
+      missingAssignedComponentTable: () => {
+        const result = Example.ok.complete();
+        delete result.components;
+        return result;
+      },
+      missingAssignedComponent: () => {
+        const result = Example.ok.complete();
+        result.components._data.splice(1, 2);
+        return hip(result, {
+          updateExistingHashes: true,
+          throwOnWrongHashes: false
+        });
+      }
+    },
+    cakes: {
+      missingSliceIdSet: () => {
+        const result = Example.ok.complete();
+        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: () => {
+        const result = Example.ok.complete();
+        result.cakes._data[0].layers = { MISSING: "HASH" };
+        hip(result.cakes, {
+          updateExistingHashes: true,
+          throwOnWrongHashes: false
+        });
+        return result;
+      },
+      missingCakeLayer: () => {
+        const result = Example.ok.complete();
+        result.cakes._data[0].layers["abLayers"] = "MISSING0";
+        hip(result.cakes, {
+          updateExistingHashes: true,
+          throwOnWrongHashes: false
+        });
+        return result;
+      }
+    },
+    buffets: {
+      missingTable: () => {
+        const result = Example.ok.complete();
+        const buffet = result.buffets._data[0];
+        buffet.items[0].table = "MISSING0";
+        buffet.items[1].table = "MISSING1";
+        hip(result, { updateExistingHashes: true, throwOnWrongHashes: false });
+        return result;
+      },
+      missingItems: () => {
+        const result = Example.ok.complete();
+        const buffet = result.buffets._data[0];
+        buffet.items[0].ref = "MISSING0";
+        buffet.items[1].ref = "MISSING1";
+        hip(result, { updateExistingHashes: true, throwOnWrongHashes: false });
+        return result;
+      }
     }
-  }
-});
-let Example = _Example;
+  };
+}
 // @license
 const throwOnInvalidTableCfg = (tableCfg) => {
   if (tableCfg.columns.length < 2) {
@@ -602,8 +598,8 @@ const addColumnsToTableCfg = (tableCfg, columns) => {
 const exampleTableCfgTable = () => Example.ok.singleRow().tableCfgs;
 const exampleTableCfg = (tableCfg = void 0) => {
   return {
-    key: (tableCfg == null ? void 0 : tableCfg.key) ?? "table",
-    columns: (tableCfg == null ? void 0 : tableCfg.columns) ?? [
+    key: tableCfg?.key ?? "table",
+    columns: tableCfg?.columns ?? [
       {
         key: "_hash",
         type: "string"
@@ -617,7 +613,7 @@ const exampleTableCfg = (tableCfg = void 0) => {
         type: "number"
       }
     ],
-    type: (tableCfg == null ? void 0 : tableCfg.type) ?? "components",
+    type: tableCfg?.type ?? "components",
     isHead: true,
     isRoot: true,
     isShared: false
@@ -664,6 +660,20 @@ const iterateTables = async (rljson, callback) => {
   }
 };
 // @license
+const removeDuplicates = (rljson) => {
+  const result = {};
+  for (const key in rljson) {
+    if (key.startsWith("_")) continue;
+    const table = rljson[key];
+    const data = table._data;
+    const newData = Array.from(
+      new Map(data.map((row) => [row._hash, row])).values()
+    );
+    result[key] = { ...table, _data: newData };
+  }
+  return hip(result, { throwOnWrongHashes: false });
+};
+// @license
 const contentTypes = [
   "buffets",
   "cakes",
@@ -706,9 +716,7 @@ const rljsonIndexed = (rljson) => {
 };
 // @license
 class BaseValidator {
-  constructor() {
-    __publicField(this, "name", "base");
-  }
+  name = "base";
   async validate(rljson) {
     return this.validateSync(rljson);
   }
@@ -721,18 +729,13 @@ class BaseValidator {
 }
 class _BaseValidator {
   constructor(rljson) {
-    __publicField(this, "errors", { hasErrors: false });
-    // ######################
-    // Private
-    // ######################
-    __publicField(this, "tableKeys");
-    __publicField(this, "rljsonIndexed");
     this.rljson = rljson;
     this.tableKeys = Object.keys(this.rljson).filter(
       (table) => !table.startsWith("_")
     );
     this.rljsonIndexed = rljsonIndexed(rljson);
   }
+  errors = { hasErrors: false };
   get hasErrors() {
     return Object.keys(this.errors).length > 1;
   }
@@ -777,6 +780,11 @@ class _BaseValidator {
     this.errors.hasErrors = this.hasErrors;
     return this.errors;
   }
+  // ######################
+  // Private
+  // ######################
+  tableKeys;
+  rljsonIndexed;
   _tableKeysNotLowerCamelCase() {
     const invalidTableKeys = [];
     for (const tableKey of this.tableKeys) {
@@ -821,7 +829,7 @@ class _BaseValidator {
             continue;
           }
           if (!BaseValidator.isValidFieldName(columnName)) {
-            invalidColumnNames[tableKey] ?? (invalidColumnNames[tableKey] = []);
+            invalidColumnNames[tableKey] ??= [];
             invalidColumnNames[tableKey].push(columnName);
             hadErrors = true;
           }
@@ -1479,12 +1487,6 @@ class _BaseValidator {
 const isValidFieldName = (fieldName) => BaseValidator.isValidFieldName(fieldName);
 // @license
 class Validate {
-  constructor() {
-    // ######################
-    // Private
-    // ######################
-    __publicField(this, "_validators", []);
-  }
   addValidator(validator) {
     this._validators.push(validator);
   }
@@ -1513,6 +1515,10 @@ class Validate {
       return acc;
     }, {});
   }
+  // ######################
+  // Private
+  // ######################
+  _validators = [];
 }
 export {
   BaseValidator,
@@ -1534,6 +1540,7 @@ export {
   isValidFieldName,
   iterateTables,
   iterateTablesSync,
+  removeDuplicates,
   reservedFieldNames,
   reservedTableKeys,
   throwOnInvalidTableCfg,

package/dist/tools/remove-duplicates.d.ts

@@ -0,0 +1,2 @@
+import { Rljson } from '../rljson.ts';
+export declare const removeDuplicates: (rljson: Rljson) => Rljson;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/rljson",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "description": "The RLJSON data format specification",
   "homepage": "https://github.com/rljson/rljson",
   "bugs": "https://github.com/rljson/rljson/issues",