@rljson/db 0.0.10 → 0.0.11

package/dist/db.js

@@ -184,7 +184,6 @@ class CakeController extends BaseController {
     this._refs = _refs;
     this._contentType = "cakes";
   }
-  _table = null;
   _baseLayers = {};
   async init() {
     if (this._tableKey.endsWith("Cake") === false) {
@@ -192,9 +191,8 @@ class CakeController extends BaseController {
         `Table ${this._tableKey} is not supported by CakeController.`
       );
     }
-    const rljson = await this._core.dumpTable(this._tableKey);
-    this._table = rljson[this._tableKey];
-    if (this._table._type !== "cakes") {
+    const contentType = await this._core.contentType(this._tableKey);
+    if (contentType !== "cakes") {
       throw new Error(`Table ${this._tableKey} is not of type cakes.`);
     }
     this._tableCfg = await this._core.tableCfg(this._tableKey);
@@ -207,19 +205,10 @@ class CakeController extends BaseController {
       }
       const baseCake = baseCakes[0];
       this._baseLayers = rmhsh(baseCake.layers);
-    } else {
-      const cake = this._table._data[0];
-      if (!!cake) {
-        this._refs = {
-          sliceIdsTable: cake.sliceIdsTable,
-          sliceIdsRow: cake.sliceIdsRow
-        };
-        this._baseLayers = rmhsh(cake.layers);
-      }
     }
   }
   async getChildRefs(where, filter) {
-    if (!this._table) {
+    if (!this._tableCfg) {
       throw new Error(`Controller not initialized.`);
     }
     const childRefs = [];
@@ -310,9 +299,8 @@ class ComponentController extends BaseController {
     if (!!this._refs && !this._refs.base) {
       throw new Error(`Refs are not required on ComponentController.`);
     }
-    const rljson = await this._core.dumpTable(this._tableKey);
-    const table = rljson[this._tableKey];
-    if (this._allowedContentTypes.indexOf(table._type) === -1) {
+    const contentType = await this._core.contentType(this._tableKey);
+    if (this._allowedContentTypes.indexOf(contentType) === -1) {
       throw new Error(`Table ${this._tableKey} is not of type components.`);
     }
     this._tableCfg = await this._core.tableCfg(this._tableKey);
@@ -653,9 +641,8 @@ class SliceIdController extends BaseController {
         `Table ${this._tableKey} is not supported by SliceIdController.`
       );
     }
-    const rljson = await this._core.dumpTable(this._tableKey);
-    const table = rljson[this._tableKey];
-    if (table._type !== "sliceIds") {
+    const contentType = await this._core.contentType(this._tableKey);
+    if (contentType !== "sliceIds") {
       throw new Error(`Table ${this._tableKey} is not of type sliceIds.`);
     }
     this._tableCfg = await this._core.tableCfg(this._tableKey);
@@ -666,13 +653,6 @@ class SliceIdController extends BaseController {
       if (SliceIds2.length === 0) {
         throw new Error(`Base sliceId ${this._refs.base} does not exist.`);
       }
-    } else {
-      const sliceId = table._data[0];
-      if (!!sliceId) {
-        this._refs = {
-          base: sliceId.base
-        };
-      }
     }
   }
   async insert(command, value, origin, refs) {
@@ -771,9 +751,8 @@ class LayerController extends BaseController {
         `Table ${this._tableKey} is not supported by LayerController.`
       );
     }
-    const rljson = await this._core.dumpTable(this._tableKey);
-    const table = rljson[this._tableKey];
-    if (table._type !== "layers") {
+    const contentType = await this._core.contentType(this._tableKey);
+    if (contentType !== "layers") {
       throw new Error(`Table ${this._tableKey} is not of type layers.`);
     }
     this._tableCfg = await this._core.tableCfg(this._tableKey);
@@ -792,15 +771,6 @@ class LayerController extends BaseController {
           componentsTable: baseLayer.componentsTable
         };
       }
-    } else {
-      const layer = table._data[0];
-      if (!!layer) {
-        this._refs = {
-          sliceIdsTable: layer.sliceIdsTable,
-          sliceIdsTableRow: layer.sliceIdsTableRow,
-          componentsTable: layer.componentsTable
-        };
-      }
     }
   }
   async insert(command, value, origin, refs) {
@@ -1071,17 +1041,8 @@ class Core {
   }
   // ...........................................................................
   async tableCfg(table) {
-    const { [table]: dump } = await this._io.dumpTable({ table });
-    const tableCfgRef = dump._tableCfg;
     const tableCfgs = await this._io.rawTableCfgs();
-    let tableCfg;
-    if (!tableCfgRef) {
-      tableCfg = tableCfgs.find((tc) => tc.key === table);
-    } else {
-      tableCfg = tableCfgs.find(
-        (tc) => tc.key === table && tc._hash === tableCfgRef
-      );
-    }
+    const tableCfg = tableCfgs.find((tc) => tc.key === table);
     return tableCfg;
   }
   // ...........................................................................
@@ -2731,7 +2692,7 @@ class Db {
    * @returns An array of Rljson objects matching the route and filter
    * @throws {Error} If the route is not valid or if any controller cannot be created
    */
-  async get(route, where, filter, sliceIds) {
+  async get(route, where, filter, sliceIds, options) {
     if (!route.isValid) throw new Error(`Route ${route.flat} is not valid.`);
     const isolatedRoute = await this.isolatePropertyKeyFromRoute(route);
     const controllers = await this.indexedControllers(isolatedRoute);
@@ -2740,7 +2701,9 @@ class Db {
       where,
       controllers,
       filter,
-      sliceIds
+      sliceIds,
+      void 0,
+      options
     );
     const dataWithControllers = {
       ...data,
@@ -2758,20 +2721,30 @@ class Db {
    * @param controllers - The controllers to use for fetching data
    * @param filter - Optional filter to apply to the data at the current route segment
    * @param sliceIds - Optional slice IDs to filter the data at the current route segment
+   * @param routeAccumulator - The accumulated route up to the current segment
+   * @param options - Additional options for fetching data
    * @returns - An Rljson object matching the route and filters
    */
-  async _get(route, where, controllers, filter, sliceIds, routeAccumulator) {
-    const params = {
-      route: route.flat,
-      where,
-      filter,
-      sliceIds,
-      routeAccumulator: routeAccumulator ? routeAccumulator.flat : ""
-    };
-    const cacheHash = hsh(rmhsh(params))._hash;
-    const isCached = this._cache.has(cacheHash);
-    if (isCached) {
-      return this._cache.get(cacheHash);
+  async _get(route, where, controllers, filter, sliceIds, routeAccumulator, options) {
+    const opts = options ?? {};
+    const routeHasRefs = route.flat != route.flatWithoutRefs;
+    const hasFilter = filter !== void 0 && filter.length > 0;
+    const cacheable = !!routeHasRefs || !!hasFilter;
+    let cacheHash = "";
+    if (cacheable) {
+      const params = {
+        route: route.flat,
+        where,
+        filter,
+        sliceIds,
+        routeAccumulator: routeAccumulator ? routeAccumulator.flat : "",
+        options: opts
+      };
+      cacheHash = hsh(rmhsh(params))._hash;
+      const isCached = this._cache.has(cacheHash);
+      if (isCached) {
+        return this._cache.get(cacheHash);
+      }
     }
     const nodeTableKey = route.top.tableKey;
     const nodeRoute = route;
@@ -2791,10 +2764,57 @@ class Db {
       [nodeTableKey]: { _data: nodeRows, _type: nodeType, _hash: nodeHash }
     } = await nodeController.get(nodeWhere);
     const nodeColumnCfgs = nodeController.tableCfg().columns;
+    const filterActive = filter && filter.length > 0;
+    const sliceIdActive = nodeSliceIds && nodeSliceIds.length > 0;
+    const filterMap = filterActive ? /* @__PURE__ */ new Map() : null;
+    if (filterActive) {
+      for (const f of filter) {
+        if (f.tableKey === nodeTableKey) {
+          if (!filterMap.has(f.ref)) {
+            filterMap.set(f.ref, []);
+          }
+          filterMap.get(f.ref).push(f);
+        }
+      }
+    }
+    const sliceIdResolvePromises = /* @__PURE__ */ new Map();
+    const nodeSliceIdSet = sliceIdActive ? new Set(nodeSliceIds) : null;
+    if (sliceIdActive) {
+      for (const nodeRow of nodeRows) {
+        if (nodeType === "cakes") {
+          const cake = nodeRow;
+          const key = `${cake.sliceIdsTable}:${cake.sliceIdsRow}`;
+          if (!sliceIdResolvePromises.has(key)) {
+            sliceIdResolvePromises.set(
+              key,
+              this._resolveSliceIds(cake.sliceIdsTable, cake.sliceIdsRow)
+            );
+          }
+        } else if (nodeType === "layers") {
+          const layer = nodeRow;
+          const key = `${layer.sliceIdsTable}:${layer.sliceIdsTableRow}`;
+          if (!sliceIdResolvePromises.has(key)) {
+            sliceIdResolvePromises.set(
+              key,
+              this._resolveSliceIds(
+                layer.sliceIdsTable,
+                layer.sliceIdsTableRow
+              )
+            );
+          }
+        }
+      }
+    }
+    const resolvedSliceIds = /* @__PURE__ */ new Map();
+    if (sliceIdResolvePromises.size > 0) {
+      const entries = Array.from(sliceIdResolvePromises.entries());
+      const results = await Promise.all(entries.map(([, p]) => p));
+      entries.forEach(([key], idx) => {
+        resolvedSliceIds.set(key, new Set(results[idx]));
+      });
+    }
     const nodeRowsFiltered = [];
     for (const nodeRow of nodeRows) {
-      const filterActive = filter && filter.length > 0;
-      const sliceIdActive = nodeSliceIds && nodeSliceIds.length > 0;
       if (!filterActive && !sliceIdActive) {
         nodeRowsFiltered.push(nodeRow);
         continue;
@@ -2802,12 +2822,10 @@ class Db {
       let filterResult = false;
       const filterProperties = [];
       if (filterActive) {
-        for (const f of filter) {
-          if (f.tableKey !== nodeTableKey) continue;
-          if (nodeRow._hash === f.ref) {
-            filterProperties.push(f);
-            filterResult = true;
-          }
+        const rowFilters = filterMap.get(nodeRow._hash);
+        if (rowFilters) {
+          filterProperties.push(...rowFilters);
+          filterResult = true;
         }
       } else {
         filterResult = true;
@@ -2817,36 +2835,36 @@ class Db {
         switch (nodeType) {
           case "cakes":
             const cake = nodeRow;
-            const cakeSliceIds = await this._resolveSliceIds(
-              cake.sliceIdsTable,
-              cake.sliceIdsRow
-            );
-            const cakeMatchesSliceIds = nodeSliceIds.filter(
-              (sId) => cakeSliceIds.includes(sId)
-            );
-            if (cakeMatchesSliceIds.length > 0) sliceIdResult = true;
+            const cakeKey = `${cake.sliceIdsTable}:${cake.sliceIdsRow}`;
+            const cakeSliceIdSet = resolvedSliceIds.get(cakeKey);
+            for (const sId of nodeSliceIdSet) {
+              if (cakeSliceIdSet.has(sId)) {
+                sliceIdResult = true;
+                break;
+              }
+            }
             break;
           case "layers":
             const layer = nodeRow;
-            const layerSliceIds = await this._resolveSliceIds(
-              layer.sliceIdsTable,
-              layer.sliceIdsTableRow
-            );
-            const layerMatchesSliceIds = nodeSliceIds.filter(
-              (sId) => layerSliceIds.includes(sId)
-            );
-            if (layerMatchesSliceIds.length > 0) sliceIdResult = true;
+            const layerKey = `${layer.sliceIdsTable}:${layer.sliceIdsTableRow}`;
+            const layerSliceIdSet = resolvedSliceIds.get(layerKey);
+            for (const sId of nodeSliceIdSet) {
+              if (layerSliceIdSet.has(sId)) {
+                sliceIdResult = true;
+                break;
+              }
+            }
             break;
           case "components":
             if (filterProperties.length > 0) {
-              const componentSliceIds = filterProperties.flatMap(
-                (f) => f.sliceIds
-              );
-              const componentMatchesSliceIds = nodeSliceIds.filter(
-                (sId) => componentSliceIds.includes(sId)
+              const componentSliceIdSet = new Set(
+                filterProperties.flatMap((f) => f.sliceIds)
               );
-              if (componentMatchesSliceIds.length > 0) {
-                sliceIdResult = true;
+              for (const sId of nodeSliceIdSet) {
+                if (componentSliceIdSet.has(sId)) {
+                  sliceIdResult = true;
+                  break;
+                }
               }
             }
             break;
@@ -2867,47 +2885,49 @@ class Db {
         _hash: nodeHash
       }
     };
-    const nodeValue = node[nodeTableKey]._data.filter(
-      (v) => v !== void 0 && v !== null
-    );
     if (route.isRoot) {
+      const baseRouteStr = (routeAccumulator ? routeAccumulator.flat : nodeTableKey) + (nodeHash ? `@${nodeHash}` : "");
       if (route.hasPropertyKey) {
-        const isolatedNode = this.isolatePropertyFromComponents(
-          node,
-          route.propertyKey
+        const isolatedNode = opts.skipRljson ? {} : this.isolatePropertyFromComponents(node, route.propertyKey);
+        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: { [nodeTableKey]: node[nodeTableKey] },
-          cell: nodeValue.map(
-            (v, idx) => ({
-              value: v[route.propertyKey] ?? null,
-              row: v,
-              route: Route.fromFlat(
-                (routeAccumulator ? routeAccumulator.flat : nodeTableKey) + (nodeHash ? `@${nodeHash}` : "") + `/${route.propertyKey}`
-              ).toRouteWithProperty(),
-              path: [[nodeTableKey, "_data", idx, route.propertyKey]]
-            })
-          )
+          tree: tree3,
+          cell: cell3
         };
         this._cache.set(cacheHash, result3);
         return result3;
       }
+      const routeObj = opts.skipCell ? null : Route.fromFlat(baseRouteStr);
+      const rljson2 = opts.skipRljson ? {} : node;
+      const tree2 = opts.skipTree ? {} : { [nodeTableKey]: node[nodeTableKey] };
+      const cell2 = opts.skipCell ? [] : nodeRowsFiltered.map(
+        (v, idx) => ({
+          value: v[route.propertyKey] ?? null,
+          row: v,
+          route: routeObj,
+          path: [[nodeTableKey, "_data", idx]]
+        })
+      );
       const result2 = {
-        rljson: node,
-        tree: { [nodeTableKey]: node[nodeTableKey] },
-        cell: nodeValue.map(
-          (v, idx) => ({
-            value: v[route.propertyKey] ?? null,
-            row: v,
-            route: Route.fromFlat(
-              (routeAccumulator ? routeAccumulator.flat : nodeTableKey) + (nodeHash ? `@${nodeHash}` : "")
-            ),
-            path: [[nodeTableKey, "_data", idx]]
-          })
-        )
+        rljson: rljson2,
+        tree: tree2,
+        cell: cell2
       };
-      this._cache.set(cacheHash, result2);
+      if (cacheable) {
+        this._cache.set(cacheHash, result2);
+      }
       return result2;
     }
     const childrenRoute = route.deeper();
@@ -2916,12 +2936,20 @@ class Db {
     const childrenThroughProperty = childrenWhere?._through;
     const nodeChildrenArray = [];
     const nodeRowsMatchingChildrenRefs = /* @__PURE__ */ new Map();
+    const columnReferenceMap = nodeType === "components" ? nodeColumnCfgs.filter((c) => c.ref?.tableKey === childrenTableKey).filter(
+      (c) => c.ref && ["components", "cakes"].includes(c.ref.type)
+    ).reduce((acc, curr) => {
+      acc.set(curr.key, curr.ref.tableKey);
+      return acc;
+    }, /* @__PURE__ */ new Map()) : null;
+    const childRefsPromises = nodeRowsFiltered.map(
+      (nodeRow) => nodeController.getChildRefs(nodeRow._hash)
+    );
+    const allChildRefs = await Promise.all(childRefsPromises);
     for (let i = 0; i < nodeRowsFiltered.length; i++) {
       const nodeRow = nodeRowsFiltered[i];
-      const nodeRowObj = { ...{}, ...nodeRow };
-      const childrenRefs = await nodeController.getChildRefs(
-        nodeRow._hash
-      );
+      const nodeRowHash = nodeRow._hash;
+      const childrenRefs = allChildRefs[i];
       const childrenRefTypes = /* @__PURE__ */ new Map();
       const childrenRefSliceIds = /* @__PURE__ */ new Set();
       for (const cr of childrenRefs) {
@@ -2942,13 +2970,19 @@ class Db {
           }
         }
       }
-      if (childrenRefTypes.size > 1) {
+      const childrenRefTypesSet = /* @__PURE__ */ new Set([
+        ...childrenRefTypes.values()
+      ]);
+      if (childrenRefTypesSet.size > 1) {
         throw new Error(
-          `Db._get: Multiple reference types found for children of table ${nodeTableKey}.`
+          `Db._get: Multiple reference types found for children of node table "${nodeTableKey}" and row "${nodeRowHash}". Found types: ${[
+            ...childrenRefTypesSet
+          ].join(", ")}.`
         );
       }
-      const cakeIsReferenced = childrenRefTypes.size === 1 && [...childrenRefTypes.values()][0] === "cakes";
-      const componentIsReferenced = childrenRefTypes.size === 1 && nodeType === "components" && [...childrenRefTypes.values()][0] === "components";
+      const childrenRefType = childrenRefTypesSet.size > 0 ? [...childrenRefTypesSet][0] : null;
+      const cakeIsReferenced = childrenRefTypes.size > 0 && childrenRefType === "cakes";
+      const componentIsReferenced = childrenRefTypes.size > 0 && nodeType === "components" && childrenRefType === "components";
       const childrenSliceIds = cakeIsReferenced ? [...childrenRefSliceIds] : componentIsReferenced ? void 0 : nodeSliceIds;
       const {
         rljson: rowChildrenRljson,
@@ -2962,29 +2996,43 @@ class Db {
         childrenSliceIds,
         Route.fromFlat(
           (routeAccumulator ? routeAccumulator.flat : nodeTableKey) + (nodeHash ? `@${nodeHash}` : "") + "/" + childrenTableKey
-        )
+        ),
+        opts
       );
+      if (!rowChildrenRljson[childrenTableKey] || rowChildrenRljson[childrenTableKey]._data.length === 0)
+        continue;
+      nodeChildrenArray.push(rowChildrenRljson);
+      if (opts.skipTree && opts.skipCell) {
+        nodeRowsMatchingChildrenRefs.set(nodeRowHash, {
+          rljson: nodeRow,
+          tree: {},
+          cell: []
+        });
+        continue;
+      }
+      const nodeRowObj = { ...nodeRow };
       if (cakeIsReferenced) {
         const refKey = [...childrenRefTypes.keys()][0];
         nodeRowObj[refKey] = rowChildrenTree;
       }
-      if (rowChildrenRljson[childrenTableKey]._data.length === 0) continue;
-      nodeChildrenArray.push(rowChildrenRljson);
       if (childrenThroughProperty) {
-        const resolvedChildrenHashes = rowChildrenRljson[childrenTableKey]._data.map((rc) => rc._hash);
+        const resolvedChildrenHashesSet = new Set(
+          rowChildrenRljson[childrenTableKey]._data.map(
+            (rc) => rc._hash
+          )
+        );
         for (const nr of nodeRowsFiltered) {
-          {
-            const throughHashesInRowCouldBeArray = nr[childrenThroughProperty];
-            const throughHashesInRow = Array.isArray(
-              throughHashesInRowCouldBeArray
-            ) ? throughHashesInRowCouldBeArray : [throughHashesInRowCouldBeArray];
-            for (const th of throughHashesInRow) {
-              if (resolvedChildrenHashes.includes(th)) {
-                nodeRowObj[childrenThroughProperty] = {
-                  ...rowChildrenTree[childrenTableKey],
-                  ...{ _tableKey: childrenTableKey }
-                };
-              }
+          const throughHashesInRowCouldBeArray = nr[childrenThroughProperty];
+          const throughHashesInRow = Array.isArray(
+            throughHashesInRowCouldBeArray
+          ) ? throughHashesInRowCouldBeArray : [throughHashesInRowCouldBeArray];
+          for (const th of throughHashesInRow) {
+            if (resolvedChildrenHashesSet.has(th)) {
+              nodeRowObj[childrenThroughProperty] = {
+                ...rowChildrenTree[childrenTableKey],
+                _tableKey: childrenTableKey
+              };
+              break;
             }
           }
         }
@@ -2993,8 +3041,14 @@ class Db {
       const childrenRefsOfRow = childrenRefs.filter(
         (cr) => cr.tableKey == childrenTableKey
       );
+      const resolvedChildrenHashSet = new Set(
+        resolvedChildren.map((ch) => ch._hash)
+      );
       const matchingChildrenRefs = childrenRefsOfRow.filter(
-        (cr) => !!resolvedChildren.find((ch) => cr.ref === ch._hash)
+        (cr) => resolvedChildrenHashSet.has(cr.ref)
+      );
+      const matchingRefsMap = new Map(
+        matchingChildrenRefs.map((cr) => [cr.ref, cr])
       );
       if (nodeType === "layers") {
         const compChildrenTrees = rowChildrenTree[childrenTableKey]._data;
@@ -3006,9 +3060,8 @@ class Db {
           };
         });
         const layerTreesAndPaths = components.map(({ tree: comp, path }) => {
-          const sliceIds2 = matchingChildrenRefs.find(
-            (cr) => cr.ref === comp._hash
-          )?.sliceIds;
+          const matchedRef = matchingRefsMap.get(comp._hash);
+          const sliceIds2 = matchedRef?.sliceIds;
           if (!sliceIds2 || sliceIds2.length === 0) {
             throw new Error(
               `Db._get: No sliceIds found for component ${comp._hash} of layer ${nodeRow._hash}.`
@@ -3020,99 +3073,90 @@ class Db {
             );
           }
           const sliceId = sliceIds2[0];
-          const pathsForSliceId = [
-            ...path.map((p) => p[0]).map((p) => {
-              const newPath = [...p];
-              newPath[2] = 0;
-              return ["add", sliceId, ...newPath];
-            })
-          ];
+          const pathsForSliceId = path.map((p) => {
+            const newPath = [...p[0]];
+            newPath[2] = 0;
+            return ["add", sliceId, ...newPath];
+          });
           return {
             [sliceId]: {
               tree: {
                 [childrenTableKey]: {
-                  ...{ _data: [comp] },
-                  ...{ _type: "components" }
+                  _data: [comp],
+                  _type: "components"
                 }
               },
               path: pathsForSliceId
             }
           };
         });
-        const layer = layerTreesAndPaths.flatMap(
-          (ltap) => Object.entries(ltap).map(([sliceId, { tree }]) => ({
-            [sliceId]: tree
-          }))
-        ).reduce((a, b) => ({ ...a, ...b }), {});
-        const paths = layerTreesAndPaths.map(
-          (ltap) => Object.values(ltap)[0].path
+        const layer = {};
+        const paths = [];
+        for (const ltap of layerTreesAndPaths) {
+          for (const [sliceId, value] of Object.entries(ltap)) {
+            layer[sliceId] = value.tree;
+            if (!opts.skipCell) {
+              paths.push(value.path);
+            }
+          }
+        }
+        const rljson2 = nodeRow;
+        const tree2 = opts.skipTree ? {} : {
+          ...nodeRowObj,
+          add: { ...nodeRowObj.add, ...layer }
+        };
+        const cell2 = opts.skipCell ? [] : rowChildrenCell.map(
+          (c, idx) => ({
+            ...c,
+            path: [paths.flat()[idx]]
+          })
         );
-        nodeRowsMatchingChildrenRefs.set(nodeRow._hash, {
-          rljson: nodeRow,
-          tree: {
-            ...nodeRowObj,
-            add: { ...nodeRowObj.add, ...layer }
-          },
-          cell: rowChildrenCell.map(
-            (c, idx) => ({
-              ...c,
-              ...{
-                path: [paths.flat()[idx]]
-              }
-            })
-          )
+        nodeRowsMatchingChildrenRefs.set(nodeRowHash, {
+          rljson: rljson2,
+          tree: tree2,
+          cell: cell2
         });
       } else if (nodeType === "cakes") {
-        nodeRowsMatchingChildrenRefs.set(nodeRow._hash, {
+        nodeRowsMatchingChildrenRefs.set(nodeRowHash, {
           rljson: nodeRow,
-          tree: {
+          tree: opts.skipTree ? {} : {
             ...nodeRowObj,
             layers: { ...nodeRowObj.layers, ...rowChildrenTree }
           },
-          cell: rowChildrenCell.map((c) => ({
+          cell: opts.skipCell ? [] : rowChildrenCell.map((c) => ({
             ...c,
-            ...{
-              path: c.path.map((p) => ["layers", ...p])
-            }
+            path: c.path.map((p) => ["layers", ...p])
           }))
         });
       } else if (nodeType === "components") {
         if (rowChildrenTree && Object.keys(rowChildrenTree).length > 0) {
-          const columnReferenceMap = nodeColumnCfgs.filter(
-            (c) => c.ref && ["components", "cakes"].includes(c.ref.type)
-          ).reduce((acc, curr) => {
-            acc.set(curr.key, curr.ref.tableKey);
-            return acc;
-          }, /* @__PURE__ */ new Map());
-          const resolvedRefs = {};
+          const resolvedProperties = {};
+          const allCells = [];
           for (const [colKey, childTableKey] of columnReferenceMap) {
-            const tree = {
-              ...rowChildrenTree[childTableKey],
-              ...{ _tableKey: childTableKey }
-            };
-            const cell = rowChildrenCell.map((c) => ({
-              ...c,
-              ...{
+            if (!opts.skipTree) {
+              resolvedProperties[colKey] = {
+                ...rowChildrenTree[childTableKey],
+                _tableKey: childTableKey
+              };
+            }
+            if (!opts.skipCell) {
+              const cell2 = rowChildrenCell.map((c) => ({
+                ...c,
                 path: c.path.filter((p) => p[0] === childTableKey).map((p) => [colKey, ...p.slice(1)])
-              }
-            }));
-            resolvedRefs[colKey] = { tree, cell };
+              }));
+              allCells.push(...cell2);
+            }
           }
-          const resolvedProperties = Object.entries(resolvedRefs).map(([colKey, { tree }]) => ({
-            [colKey]: tree
-          })).reduce((a, b) => ({ ...a, ...b }), {});
-          const resolvedTree = {
-            ...nodeRowObj,
-            ...resolvedProperties
-          };
-          const resolvedCell = Object.values(resolvedRefs).map((r) => r.cell).flat();
-          nodeRowsMatchingChildrenRefs.set(nodeRow._hash, {
+          nodeRowsMatchingChildrenRefs.set(nodeRowHash, {
             rljson: nodeRow,
-            tree: resolvedTree,
-            cell: resolvedCell
+            tree: opts.skipTree ? {} : {
+              ...nodeRowObj,
+              ...resolvedProperties
+            },
+            cell: allCells
           });
         } else {
-          nodeRowsMatchingChildrenRefs.set(nodeRow._hash, {
+          nodeRowsMatchingChildrenRefs.set(nodeRowHash, {
             rljson: nodeRow,
             tree: { ...nodeRowObj },
             cell: rowChildrenCell
@@ -3124,43 +3168,46 @@ class Db {
         );
       }
     }
-    const nodeChildren = makeUnique(
-      merge(...nodeChildrenArray)
-    );
+    const nodeChildren = opts.skipRljson ? {} : makeUnique(merge(...nodeChildrenArray));
     const matchedNodeRows = Array.from(nodeRowsMatchingChildrenRefs.values());
-    const result = {
-      rljson: {
-        ...node,
-        ...{
-          [nodeTableKey]: {
-            ...{
-              _data: matchedNodeRows.map((mr) => mr.rljson),
-              _type: nodeType
-            },
-            ...{
-              ...nodeHash ? { _hash: nodeHash } : {}
-            }
-          }
-        },
-        ...nodeChildren
+    const rljson = opts.skipRljson ? {} : {
+      ...node,
+      [nodeTableKey]: {
+        _data: matchedNodeRows.map((mr) => mr.rljson),
+        _type: nodeType,
+        ...nodeHash ? { _hash: nodeHash } : {}
       },
-      tree: {
-        [nodeTableKey]: {
-          ...{
-            _data: matchedNodeRows.map((mr) => mr.tree),
-            _type: nodeType
-          },
-          ...{
-            ...nodeHash ? { _hash: nodeHash } : {}
-          }
+      ...nodeChildren
+    };
+    const tree = opts.skipTree ? {} : {
+      [nodeTableKey]: {
+        _data: matchedNodeRows.map((mr) => mr.tree),
+        _type: nodeType,
+        ...nodeHash ? { _hash: nodeHash } : {}
+      }
+    };
+    const cell = opts.skipCell ? [] : (() => {
+      let totalSize = 0;
+      for (const mr of matchedNodeRows) {
+        totalSize += mr.cell.length;
+      }
+      const cells = new Array(totalSize);
+      let cellIdx = 0;
+      for (let rowIdx = 0; rowIdx < matchedNodeRows.length; rowIdx++) {
+        const mr = matchedNodeRows[rowIdx];
+        for (const c of mr.cell) {
+          cells[cellIdx++] = {
+            ...c,
+            path: c.path.map((p) => [nodeTableKey, "_data", rowIdx, ...p])
+          };
         }
-      },
-      cell: matchedNodeRows.map(
-        (mr, idx) => mr.cell.map((c) => ({
-          ...c,
-          ...{ path: c.path.map((p) => [nodeTableKey, "_data", idx, ...p]) }
-        }))
-      ).flat()
+      }
+      return cells;
+    })();
+    const result = {
+      rljson,
+      tree,
+      cell
     };
     this._cache.set(cacheHash, result);
     return result;
@@ -3192,7 +3239,13 @@ class Db {
   async join(columnSelection, cakeKey, cakeRef) {
     const {
       tree: { [cakeKey]: cakesTable }
-    } = await this.get(Route.fromFlat(`${cakeKey}@${cakeRef}`), {});
+    } = await this.get(
+      Route.fromFlat(`${cakeKey}@${cakeRef}`),
+      {},
+      void 0,
+      void 0,
+      { skipCell: true, skipRljson: true }
+    );
     const cakes = cakesTable._data;
     if (cakes.length === 0) {
       throw new Error(
@@ -4192,7 +4245,11 @@ class MultiEditProcessor {
         multiEdit.previous
       );
       const previousMultiEdit = previousMultiEdits[0];
-      return this._resolve(previousMultiEdit);
+      const previousEditFromMultiEdit = previousMultiEdit.edit;
+      const previousEdit = this._edits[this._edits.length - 2] ? this._edits[this._edits.length - 2]._hash : null;
+      if (previousEdit !== previousEditFromMultiEdit) {
+        return await this._resolve(previousMultiEdit);
+      }
     }
   }
   //...........................................................................
@@ -4329,6 +4386,14 @@ class MultiEditProcessor {
     }
     return this._join;
   }
+  //...........................................................................
+  /**
+   * Get the list of Edits applied in this MultiEditProcessor
+   * @returns Array of Edits
+   */
+  get edits() {
+    return this._edits;
+  }
 }
 class MultiEditManager {
   constructor(_cakeKey, _db) {