@rljson/db 0.0.11 → 0.0.12

package/dist/controller/controller.d.ts

@@ -20,7 +20,7 @@ export type ControllerChildProperty = {
  * @property {ControllerRunFn<N>} insert - Function to execute a command on the table.
  * @property {() => Promise<void>} init - Initializes the controller.
  * @property {() => Promise<T>} table - Retrieves the current state of the table.
- * @property {(where: string | { [column: string]: JsonValue }) => Promise<Rljson>} get - Fetches data from the table based on a condition.
+ * @property {(where: string | { [column: string]: JsonValue }, filter: Json | undefined, path: string | undefined) => Promise<Rljson>} get - Fetches data from the table based on a condition.
  * @property {(where: string | Json, filter?: Json) => Promise<Array<{ tableKey: TableKey; ref: Ref }>>} getChildRefs - Retrieves references to child entries in related tables based on a condition.
  * @param {string | Json }} where - The condition to filter the data.
  * @returns {Promise<Json[] | null>} A promise that resolves to an array of JSON objects or null if no data is found.
@@ -30,7 +30,7 @@ export interface Controller<T extends TableType, C extends JsonValue, N extends
     insert: ControllerRunFn<N, C>;
     init(): Promise<void>;
     table(): Promise<T>;
-    get(where: string | Json, filter?: Json): Promise<Rljson>;
+    get(where: string | Json, filter?: Json, path?: string): Promise<Rljson>;
     getChildRefs(where: string | Json, filter?: Json): Promise<ControllerChildProperty[]>;
     filterRow(row: Json, key: string, value: JsonValue): Promise<boolean>;
     contentType(): ContentType;

package/dist/controller/tree-controller.d.ts

@@ -0,0 +1,18 @@
+import { Json } from '@rljson/json';
+import { InsertCommand, InsertHistoryRow, Ref, Rljson, TableKey, Tree, TreesTable } from '@rljson/rljson';
+import { Core } from '../core.ts';
+import { Cell } from '../db.ts';
+import { BaseController } from './base-controller.ts';
+import { Controller, ControllerChildProperty } from './controller.ts';
+export declare class TreeController<N extends string, C extends Tree> extends BaseController<TreesTable, C> implements Controller<TreesTable, C, N> {
+    protected readonly _core: Core;
+    protected readonly _tableKey: TableKey;
+    constructor(_core: Core, _tableKey: TableKey);
+    init(): Promise<void>;
+    insert(command: InsertCommand, value: Tree, origin?: Ref): Promise<InsertHistoryRow<any>[]>;
+    get(where: string | Json, filter?: Json, path?: string): Promise<Rljson>;
+    buildTreeFromTrees(trees: Tree[]): Promise<Json>;
+    buildCellsFromTree(trees: Tree[]): Promise<Cell[]>;
+    getChildRefs(where: string | Json, filter?: Json): Promise<ControllerChildProperty[]>;
+    filterRow(): Promise<boolean>;
+}

package/dist/db.d.ts

@@ -131,12 +131,6 @@ export declare class Db {
      * @throws {Error} If the InsertHistory table does not exist
      */
     private _writeInsertHistory;
-    /**
-     * Add a head revision for a cake
-     * @param cakeKey - The cake table key
-     * @param cakeRef - The cake reference
-     */
-    addHeadRevision(cakeKey: string, cakeRef: Ref): Promise<InsertHistoryRow<string>[]>;
     /**
      * Add a multiEdit
      * @param cakeKey - The cake table key

package/dist/db.js

@@ -1,4 +1,4 @@
-import { timeId, createInsertHistoryTableCfg, Validate, BaseValidator, Route, isTimeId, getTimeIdTimestamp, createSliceIdsTableCfg, createLayerTableCfg, createCakeTableCfg, createHeadsTableCfg } from "@rljson/rljson";
+import { timeId, Route, createInsertHistoryTableCfg, Validate, BaseValidator, treeFromObject, isTimeId, getTimeIdTimestamp, createSliceIdsTableCfg, createLayerTableCfg, createCakeTableCfg } from "@rljson/rljson";
 import { rmhsh, hsh, Hash, hip } from "@rljson/hash";
 import { equals, merge } from "@rljson/json";
 import { IoMem } from "@rljson/io";
@@ -208,9 +208,6 @@ class CakeController extends BaseController {
     }
   }
   async getChildRefs(where, filter) {
-    if (!this._tableCfg) {
-      throw new Error(`Controller not initialized.`);
-    }
     const childRefs = [];
     const { [this._tableKey]: table } = await this.get(where, filter);
     const cakes = table._data;
@@ -291,7 +288,7 @@ class ComponentController extends BaseController {
     "edits",
     "editHistory",
     "multiEdits",
-    "head"
+    "insertHistory"
   ];
   _resolvedColumns = null;
   _refTableKeyToColumnKeyMap = null;
@@ -933,6 +930,199 @@ class LayerController extends BaseController {
     return false;
   }
 }
+class TreeController extends BaseController {
+  constructor(_core, _tableKey) {
+    super(_core, _tableKey);
+    this._core = _core;
+    this._tableKey = _tableKey;
+    this._contentType = "trees";
+  }
+  async init() {
+    if (this._tableKey.endsWith("Tree") === false) {
+      throw new Error(
+        `Table ${this._tableKey} is not supported by TreeController.`
+      );
+    }
+    const contentType = await this._core.contentType(this._tableKey);
+    if (contentType !== "trees") {
+      throw new Error(`Table ${this._tableKey} is not of type trees.`);
+    }
+    this._tableCfg = await this._core.tableCfg(this._tableKey);
+  }
+  async insert(command, value, origin) {
+    if (!command.startsWith("add") && !command.startsWith("remove")) {
+      throw new Error(`Command ${command} is not supported by TreeController.`);
+    }
+    const rlJson = { [this._tableKey]: { _data: [value] } };
+    await this._core.import(rlJson);
+    const result = {
+      //Ref to component
+      [this._tableKey + "Ref"]: hsh(value)._hash,
+      //Data from edit
+      route: "",
+      origin,
+      //Unique id/timestamp
+      timeId: timeId()
+    };
+    return [result];
+  }
+  async get(where, filter, path) {
+    const {
+      [this._tableKey]: { _data: trees }
+    } = typeof where === "string" ? await this._getByHash(where, filter) : await this._getByWhere(where, filter);
+    if (trees.length === 0) {
+      return { [this._tableKey]: { _data: [], _type: "trees" } };
+    }
+    if (trees.length > 1) {
+      throw new Error(
+        `Multiple trees found for where clause. Please specify a more specific query.`
+      );
+    }
+    const treeRoute = Route.fromFlat(path || "");
+    const treeId = treeRoute.segments.length > 0 ? treeRoute.top.tableKey : null;
+    const tree = trees[0];
+    if (treeId && treeId !== tree.id) {
+      return { [this._tableKey]: { _data: [], _type: "trees" } };
+    }
+    const children = [];
+    for (const childRef of tree.children ?? []) {
+      const child = await this.get(
+        childRef,
+        void 0,
+        treeRoute.deeper().flat
+      );
+      const childData = child[this._tableKey]._data;
+      children.push(...childData);
+    }
+    return {
+      [this._tableKey]: {
+        _data: [...children, tree],
+        _type: "trees"
+      }
+    };
+  }
+  async buildTreeFromTrees(trees) {
+    if (trees.length === 0) {
+      return {};
+    }
+    const treeMap = /* @__PURE__ */ new Map();
+    for (const tree of trees) {
+      treeMap.set(tree._hash, tree);
+    }
+    const buildObject = (tree) => {
+      if (!tree.isParent || !tree.children || tree.children.length === 0) {
+        return tree;
+      }
+      const result2 = {};
+      for (const childHash of tree.children) {
+        const childTree = treeMap.get(childHash);
+        if (childTree && childTree.id) {
+          result2[childTree.id] = buildObject(childTree);
+        }
+      }
+      return result2;
+    };
+    const referencedHashes = /* @__PURE__ */ new Set();
+    for (const tree of trees) {
+      if (tree.children) {
+        for (const childHash of tree.children) {
+          referencedHashes.add(childHash);
+        }
+      }
+    }
+    const rootTrees = trees.filter(
+      (tree) => !referencedHashes.has(tree._hash)
+    );
+    if (rootTrees.length === 0) {
+      return {};
+    }
+    if (rootTrees.length === 1) {
+      const rootTree = rootTrees[0];
+      if (rootTree.id) {
+        return { [rootTree.id]: buildObject(rootTree) };
+      }
+      return buildObject(rootTree);
+    }
+    const result = {};
+    for (const rootTree of rootTrees) {
+      if (rootTree.id) {
+        result[rootTree.id] = buildObject(rootTree);
+      }
+    }
+    return result;
+  }
+  async buildCellsFromTree(trees) {
+    const cells = [];
+    if (trees.length === 0) {
+      return cells;
+    }
+    const treeMap = /* @__PURE__ */ new Map();
+    const childToParentMap = /* @__PURE__ */ new Map();
+    for (const tree of trees) {
+      const treeHash = tree._hash;
+      treeMap.set(treeHash, tree);
+      if (tree.children) {
+        for (const childHash of tree.children) {
+          childToParentMap.set(childHash, treeHash);
+        }
+      }
+    }
+    const availableHashes = /* @__PURE__ */ new Set();
+    for (const tree of trees) {
+      availableHashes.add(tree._hash);
+    }
+    const leafNodes = trees.filter((tree) => {
+      if (!tree.children || tree.children.length === 0) {
+        return true;
+      }
+      const hasChildInTrees = tree.children.some(
+        (childHash) => availableHashes.has(childHash)
+      );
+      return !hasChildInTrees;
+    });
+    for (const leaf of leafNodes) {
+      const pathIds = [];
+      let currentHash = leaf._hash;
+      while (currentHash) {
+        const current = treeMap.get(currentHash);
+        if (!current) break;
+        if (current.id) {
+          pathIds.unshift(current.id);
+        }
+        const parentHash = childToParentMap.get(currentHash);
+        if (!parentHash) break;
+        currentHash = parentHash;
+      }
+      const routeStr = "/" + pathIds.join("/");
+      const route = Route.fromFlat(routeStr);
+      cells.push({
+        route,
+        value: leaf,
+        row: leaf,
+        path: [[this._tableKey, "_data", 0, ...pathIds]]
+      });
+    }
+    return cells;
+  }
+  async getChildRefs(where, filter) {
+    const childRefs = [];
+    const { [this._tableKey]: table } = await this.get(where, filter);
+    const trees = table._data;
+    for (const tree of trees) {
+      for (const treeChildRef of tree.children ?? []) {
+        childRefs.push({
+          tableKey: this._tableKey,
+          ref: treeChildRef
+        });
+      }
+    }
+    return childRefs;
+  }
+  /* v8 ignore next -- @preserve */
+  async filterRow() {
+    return false;
+  }
+}
 const createController = async (type, core, tableKey, refs) => {
   let ctrl;
   switch (type) {
@@ -943,7 +1133,7 @@ const createController = async (type, core, tableKey, refs) => {
     case "edits":
     case "editHistory":
     case "multiEdits":
-    case "head":
+    case "insertHistory":
       ctrl = new ComponentController(core, tableKey, refs);
       break;
     case "cakes":
@@ -956,6 +1146,9 @@ const createController = async (type, core, tableKey, refs) => {
         refs
       );
       break;
+    case "trees":
+      ctrl = new TreeController(core, tableKey);
+      break;
     default:
       throw new Error(`Controller for type ${type} is not implemented yet.`);
   }
@@ -1062,7 +1255,7 @@ const inject = (tree, path, value) => {
       tree[segment] = value;
       delete tree["_hash"];
     } else {
-      if (!tree[segment]) {
+      if (!tree[segment] || typeof tree[segment] !== "object") {
         tree[segment] = {};
       }
       tree = tree[segment];
@@ -2762,7 +2955,7 @@ class Db {
     delete nodeWhere["_tableKey"];
     const {
       [nodeTableKey]: { _data: nodeRows, _type: nodeType, _hash: nodeHash }
-    } = await nodeController.get(nodeWhere);
+    } = await nodeController.get(nodeWhere, void 0, route.propertyKey);
     const nodeColumnCfgs = nodeController.tableCfg().columns;
     const filterActive = filter && filter.length > 0;
     const sliceIdActive = nodeSliceIds && nodeSliceIds.length > 0;
@@ -2892,20 +3085,39 @@ class Db {
         const routeWithProperty = opts.skipCell ? null : Route.fromFlat(
           baseRouteStr + `/${route.propertyKey}`
         ).toRouteWithProperty();
-        const tree3 = opts.skipTree ? {} : { [nodeTableKey]: node[nodeTableKey] };
-        const cell3 = opts.skipCell ? [] : nodeRowsFiltered.map(
-          (v, idx) => ({
-            value: v[route.propertyKey] ?? null,
-            row: v,
-            route: routeWithProperty,
-            path: [[nodeTableKey, "_data", idx, route.propertyKey]]
-          })
-        );
-        const result3 = {
-          rljson: isolatedNode,
-          tree: tree3,
-          cell: cell3
-        };
+        let result3;
+        if (nodeType === "trees") {
+          const rljson3 = node;
+          const tree3 = opts.skipTree ? {} : {
+            [nodeTableKey]: {
+              _data: [
+                await nodeController.buildTreeFromTrees(nodeRows)
+              ],
+              _type: "trees"
+            }
+          };
+          const cell3 = opts.skipCell ? [] : await nodeController.buildCellsFromTree(nodeRows);
+          result3 = {
+            rljson: rljson3,
+            tree: tree3,
+            cell: cell3
+          };
+        } else {
+          const tree3 = opts.skipTree ? {} : { [nodeTableKey]: node[nodeTableKey] };
+          const cell3 = opts.skipCell ? [] : nodeRowsFiltered.map(
+            (v, idx) => ({
+              value: v[route.propertyKey] ?? null,
+              row: v,
+              route: routeWithProperty,
+              path: [[nodeTableKey, "_data", idx, route.propertyKey]]
+            })
+          );
+          result3 = {
+            rljson: isolatedNode,
+            tree: tree3,
+            cell: cell3
+          };
+        }
         this._cache.set(cacheHash, result3);
         return result3;
       }
@@ -3319,7 +3531,10 @@ class Db {
     for (const [tableKey, controller] of Object.entries(controllers)) {
       runFns[tableKey] = controller.insert.bind(controller);
     }
-    return this._insert(route, tree, runFns, options);
+    const insertHistoryRow = await this._insert(route, tree, runFns, options);
+    if (!options?.skipHistory)
+      await this._writeInsertHistory(route.top.tableKey, insertHistoryRow[0]);
+    return insertHistoryRow;
   }
   // ...........................................................................
   /**
@@ -3345,7 +3560,7 @@ class Db {
     const previousHash = nodeSegment[nodeTableKey + "Ref"] ?? null;
     const previousTimeId = nodeSegment[nodeTableKey + "InsertHistoryRef"] ?? null;
     const previous = previousHash ? await this.getTimeIdsForRef(nodeTableKey, previousHash) : previousTimeId ? [previousTimeId] : [];
-    if (!nodeRoute.isRoot) {
+    if (!nodeRoute.isRoot && nodeType != "trees") {
       const childRoute = nodeRoute.deeper(1);
       const childTableKey = childRoute.top.tableKey;
       if (nodeType === "cakes") {
@@ -3516,10 +3731,31 @@ class Db {
           );
         }
       }
+      if (nodeType === "trees") {
+        const treeObject = tree[nodeTableKey]._data[0];
+        if (!treeObject) {
+          throw new Error(
+            `Db._insert: No tree data found for table "${nodeTableKey}" in route "${route.flat}".`
+          );
+        }
+        const trees = treeFromObject(treeObject);
+        const writePromises = trees.map(
+          (tree2) => runFn("add", tree2, "db.insert")
+        );
+        const writeResults = await Promise.all(writePromises);
+        const lastResult = writeResults[writeResults.length - 1];
+        if (lastResult && lastResult.length > 0) {
+          results.push(
+            ...lastResult.map((r) => ({
+              ...r,
+              ...{ previous },
+              ...{ route: route.flat }
+            }))
+          );
+        }
+      }
     }
     for (const result of results) {
-      if (!options?.skipHistory)
-        await this._writeInsertHistory(nodeTableKey, result);
       if (!options?.skipNotification)
         this.notify.notify(Route.fromFlat(result.route), result);
     }
@@ -3599,21 +3835,6 @@ class Db {
     });
   }
   // ...........................................................................
-  /**
-   * Add a head revision for a cake
-   * @param cakeKey - The cake table key
-   * @param cakeRef - The cake reference
-   */
-  async addHeadRevision(cakeKey, cakeRef) {
-    const cakeHeadKey = cakeKey + "Heads";
-    const cakeHeadController = await this.getController(cakeHeadKey);
-    return await cakeHeadController.insert("add", {
-      cakeRef,
-      timeId: timeId(),
-      _hash: ""
-    });
-  }
-  // ...........................................................................
   /**
    * Add a multiEdit
    * @param cakeKey - The cake table key
@@ -4194,9 +4415,6 @@ class MultiEditProcessor {
     }
     const inserted = inserteds[0];
     const writtenCakeRef = inserted[this._cakeKey + "Ref"];
-    if (!options?.skipHeadUpdate) {
-      await this._db.addHeadRevision(this._cakeKey, writtenCakeRef);
-    }
     if (!options?.skipSaveMultiEdit) {
       await this._db.addMultiEdit(this._cakeKey, this._multiEdit);
     }
@@ -5358,27 +5576,6 @@ const staticExample = () => {
       }
     ]
   });
-  const carCakeHeadTableCfg = hip(
-    createHeadsTableCfg("carCake")
-  );
-  const carCakeHeads = hip({
-    _tableCfg: carCakeHeadTableCfg._hash,
-    _type: "head",
-    _data: [
-      {
-        timeId: "1764756756311:jkCG",
-        cakeRef: carCake._data[0]._hash
-      },
-      {
-        timeId: "1764756756312:1AGV",
-        cakeRef: carCake._data[1]._hash
-      },
-      {
-        timeId: "1764756756312:g8nh",
-        cakeRef: carCake._data[2]._hash
-      }
-    ]
-  });
   const seriesSliceIdTableCfg = hip(
     createSliceIdsTableCfg("seriesSliceId")
   );
@@ -5735,27 +5932,6 @@ const staticExample = () => {
       }
     ]
   });
-  const seriesCakeHeadTableCfg = hip(
-    createHeadsTableCfg("seriesCake")
-  );
-  const seriesCakeHeads = hip({
-    _tableCfg: seriesCakeHeadTableCfg._hash,
-    _type: "head",
-    _data: [
-      {
-        timeId: "1764756756315:L14y",
-        cakeRef: seriesCake._data[0]._hash
-      },
-      {
-        timeId: "1764756756315:xCXT",
-        cakeRef: seriesCake._data[1]._hash
-      },
-      {
-        timeId: "1764756756315:fZwA",
-        cakeRef: seriesCake._data[2]._hash
-      }
-    ]
-  });
   const catalogSliceIdTableCfg = hip(
     createSliceIdsTableCfg("catalogSliceId")
   );
@@ -5857,19 +6033,6 @@ const staticExample = () => {
       }
     ]
   });
-  const catalogCakeHeadTableCfg = hip(
-    createHeadsTableCfg("catalogCake")
-  );
-  const catalogCakeHeads = hip({
-    _tableCfg: catalogCakeHeadTableCfg._hash,
-    _type: "head",
-    _data: [
-      {
-        timeId: "1764756756317:5UTy",
-        cakeRef: catalogCake._data[0]._hash
-      }
-    ]
-  });
   const tableCfgs = {
     _data: [
       carSliceIdTableCfg,
@@ -5881,19 +6044,16 @@ const staticExample = () => {
       carTechnicalLayerTableCfg,
       carColorLayerTableCfg,
       carCakeTableCfg,
-      carCakeHeadTableCfg,
       seriesSliceIdTableCfg,
       seriesGeneralTableCfg,
       seriesCarsTableCfg,
       seriesGeneralLayerTableCfg,
       seriesCarsLayerTableCfg,
       seriesCakeTableCfg,
-      seriesCakeHeadTableCfg,
       catalogSliceIdTableCfg,
       catalogSeriesTableCfg,
       catalogSeriesLayerTableCfg,
-      catalogCakeTableCfg,
-      catalogCakeHeadTableCfg
+      catalogCakeTableCfg
     ]
   };
   const staticExample2 = {
@@ -5906,19 +6066,16 @@ const staticExample = () => {
     carTechnicalLayer,
     carColorLayer,
     carCake,
-    carCakeHeads,
     seriesSliceId,
     seriesGeneral,
     seriesCars,
     seriesGeneralLayer,
     seriesCarsLayer,
     seriesCake,
-    seriesCakeHeads,
     catalogSliceId,
     catalogSeries,
     catalogSeriesLayer,
     catalogCake,
-    catalogCakeHeads,
     tableCfgs
   };
   return staticExample2;