@instantdb/core 0.22.86-experimental.split-store.20178922132.1 → 0.22.86-experimental.split-store.20243647937.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instantdb/core",
-  "version": "0.22.86-experimental.split-store.20178922132.1",
+  "version": "0.22.86-experimental.split-store.20243647937.1",
   "description": "Instant's core local abstraction",
   "homepage": "https://github.com/instantdb/instant/tree/main/client/packages/core",
   "repository": {
@@ -53,7 +53,7 @@
   "dependencies": {
     "mutative": "^1.0.10",
     "uuid": "^11.1.0",
-    "@instantdb/version": "0.22.86-experimental.split-store.20178922132.1"
+    "@instantdb/version": "0.22.86-experimental.split-store.20243647937.1"
   },
   "scripts": {
     "test": "vitest",

package/src/Reactor.js

@@ -661,38 +661,49 @@ export default class Reactor {
           const result = x['instaql-result'];
           const hash = weakHash(q);
           const triples = extractTriples(result);
+          const attrsStore = this.ensureAttrs();
           const store = sts.createStore(
-            this.ensureAttrs(),
+            attrsStore,
             triples,
             enableCardinalityInference,
             this.config.useDateObjects,
           );
-          const newStore = this._applyOptimisticUpdates(
-            store,
-            this.ensureAttrs(),
-            mutations,
-            processedTxId,
-          );
+          const { store: newStore, attrsStore: newAttrsStore } =
+            this._applyOptimisticUpdates(
+              store,
+              attrsStore,
+              mutations,
+              processedTxId,
+            );
           const pageInfo = result?.[0]?.data?.['page-info'];
           const aggregate = result?.[0]?.data?.['aggregate'];
-          return { q, hash, store: newStore, pageInfo, aggregate };
+          return {
+            q,
+            hash,
+            store: newStore,
+            attrsStore: newAttrsStore,
+            pageInfo,
+            aggregate,
+          };
         });
 
-        updates.forEach(({ hash, q, store, pageInfo, aggregate }) => {
-          this.querySubs.updateInPlace((prev) => {
-            if (!prev[hash]) {
-              this._log.error('Missing value in querySubs', { hash, q });
-              return;
-            }
-            prev[hash].result = {
-              store,
-              attrsStore: this.ensureAttrs(),
-              pageInfo,
-              aggregate,
-              processedTxId,
-            };
-          });
-        });
+        updates.forEach(
+          ({ hash, q, store, attrsStore, pageInfo, aggregate }) => {
+            this.querySubs.updateInPlace((prev) => {
+              if (!prev[hash]) {
+                this._log.error('Missing value in querySubs', { hash, q });
+                return;
+              }
+              prev[hash].result = {
+                store,
+                attrsStore,
+                pageInfo,
+                aggregate,
+                processedTxId,
+              };
+            });
+          },
+        );
 
         this._cleanupPendingMutationsQueries();
 
@@ -919,7 +930,7 @@ export default class Reactor {
   }
 
   _setAttrs(attrs) {
-    this.attrs = new sts.AttrsStore(
+    this.attrs = new sts.AttrsStoreClass(
       attrs.reduce((acc, attr) => {
         acc[attr.id] = attr;
         return acc;
@@ -1195,7 +1206,7 @@ export default class Reactor {
     }
 
     if (!deletedAttrIds.size && !pendingAttrs.length) {
-      return this.attrs || new sts.AttrsStore({}, this._linkIndex);
+      return this.attrs || new sts.AttrsStoreClass({}, this._linkIndex);
     }
 
     const attrs = { ...(this.attrs?.attrs || {}) };
@@ -1206,7 +1217,7 @@ export default class Reactor {
       delete attrs[id];
     }
 
-    return new sts.AttrsStore(attrs, this._linkIndex);
+    return new sts.AttrsStoreClass(attrs, this._linkIndex);
   }
 
   /** Runs instaql on a query and a store */
@@ -1239,14 +1250,10 @@ export default class Reactor {
       attrsStore,
       pendingMutations,
     );
-    const newStore = this._applyOptimisticUpdates(
-      store,
-      attrsStore,
-      mutations,
-      processedTxId,
-    );
+    const { store: newStore, attrsStore: newAttrsStore } =
+      this._applyOptimisticUpdates(store, attrsStore, mutations, processedTxId);
     const resp = instaql(
-      { store: newStore, attrsStore, pageInfo, aggregate },
+      { store: newStore, attrsStore: newAttrsStore, pageInfo, aggregate },
       q,
     );
 
@@ -1256,10 +1263,12 @@ export default class Reactor {
   _applyOptimisticUpdates(store, attrsStore, mutations, processedTxId) {
     for (const [_, mut] of mutations) {
       if (!mut['tx-id'] || (processedTxId && mut['tx-id'] > processedTxId)) {
-        store = sts.transact(store, attrsStore, mut['tx-steps']);
+        const result = sts.transact(store, attrsStore, mut['tx-steps']);
+        store = result.store;
+        attrsStore = result.attrsStore;
       }
     }
-    return store;
+    return { store, attrsStore };
   }
 
   /** Re-run instaql and call all callbacks with new data */

package/src/instaml.ts

@@ -1,6 +1,7 @@
 import {
   allMapValues,
   AttrsStore,
+  AttrsStoreClass,
   getAttrByFwdIdentName,
   getAttrByReverseIdentName,
   Store,
@@ -205,7 +206,7 @@ function expandUnlink({ attrsStore }: Ctx, [etype, eidA, obj]) {
 }
 
 function checkEntityExists(
-  stores: (Store | undefined)[],
+  stores: (Store | undefined)[] | undefined,
   attrsStore: AttrsStore,
   etype: string,
   eid: string,
@@ -241,10 +242,10 @@ function checkEntityExists(
 }
 
 type Ctx = {
-  stores: (Store | undefined)[];
+  stores?: (Store | undefined)[];
   attrsStore: AttrsStore;
-  schema: Schema;
-  useDateObjects: boolean | null;
+  schema?: Schema;
+  useDateObjects?: boolean | null;
 };
 
 function convertOpts({ stores, attrsStore }: Ctx, [etype, eid, obj_, opts]) {
@@ -458,7 +459,7 @@ function refPropsFromSchema(schema: Schema, etype, label) {
 }
 
 function createRefAttr(
-  schema: Schema,
+  schema: Schema | undefined,
   etype: string,
   label: string,
   props?: Partial<InstantDBAttr> | undefined,
@@ -593,7 +594,7 @@ function createMissingAttrs(
       identName.indexOf('.') !== -1 &&
       // attr names can have `.` in them, so use the attr we find with a `.`
       // before assuming it's a ref lookup.
-      !attrByRevIdent(etype, identName)
+      !attrByFwdIdent(etype, identName)
     );
   }
 
@@ -694,7 +695,7 @@ function createMissingAttrs(
     for (const attr of localAttrs) {
       nextAttrs[attr.id] = attr;
     }
-    return [new AttrsStore(nextAttrs, attrsStore.linkIndex), addOps];
+    return [new AttrsStoreClass(nextAttrs, attrsStore.linkIndex), addOps];
   }
   return [attrsStore, addOps];
 }

package/src/instaql.ts

@@ -900,8 +900,8 @@ export default function query(
   }: {
     store: s.Store;
     attrsStore: s.AttrsStore;
-    pageInfo: any;
-    aggregate: any;
+    pageInfo?: any;
+    aggregate?: any;
   },
   q,
 ) {

package/src/store.ts

@@ -18,23 +18,23 @@ export type Store = {
   eav: Map<string, Map<string, Map<any, Triple>>>;
   aev: Map<string, Map<string, Map<any, Triple>>>;
   vae: Map<any, Map<string, Map<string, Triple>>>;
-  useDateObjects: boolean | null;
-  cardinalityInference: boolean | null;
+  useDateObjects: boolean | null | undefined;
+  cardinalityInference: boolean | null | undefined;
 };
 
 type StoreJsonVersion0 = {
   __type: 'store';
   attrs: Attrs;
   triples: Triple[];
-  cardinalityInference: boolean | null;
+  cardinalityInference: boolean | null | undefined;
   linkIndex: LinkIndex | null;
-  useDateObjects: boolean | null;
+  useDateObjects: boolean | null | undefined;
 };
 
 type StoreJsonVersion1 = {
   triples: Triple[];
-  cardinalityInference: boolean | null;
-  useDateObjects: boolean | null;
+  cardinalityInference: boolean | null | undefined;
+  useDateObjects: boolean | null | undefined;
   version: 1;
 };
 
@@ -45,7 +45,22 @@ export type AttrsStoreJson = {
   linkIndex: LinkIndex | null;
 };
 
-export class AttrsStore {
+export interface AttrsStore {
+  attrs: Attrs;
+  linkIndex: LinkIndex | null;
+  resetAttrIndexes(): void;
+  addAttr(attr: InstantDBAttr): void;
+  deleteAttr(attrId: string): void;
+  updateAttr(partialAttr: Partial<InstantDBAttr> & { id: string }): void;
+  getAttr(id: string): InstantDBAttr | undefined;
+  blobAttrs: Map<string, Map<string, InstantDBAttr>>;
+  primaryKeys: Map<string, InstantDBAttr>;
+  forwardIdents: Map<string, Map<string, InstantDBAttr>>;
+  revIdents: Map<string, Map<string, InstantDBAttr>>;
+  toJSON(): AttrsStoreJson;
+}
+
+export class AttrsStoreClass implements AttrsStore {
   public attrs: Attrs;
   public linkIndex: LinkIndex | null;
   private _blobAttrs: Map<string, Map<string, InstantDBAttr>> | null = null;
@@ -53,7 +68,6 @@ export class AttrsStore {
   private _forwardIdents: Map<string, Map<string, InstantDBAttr>> | null = null;
   private _revIdents: Map<string, Map<string, InstantDBAttr>> | null = null;
   constructor(attrs: Attrs, linkIndex: LinkIndex | null) {
-    console.log('attrs init', new Error('trace'));
     this.attrs = attrs;
     this.linkIndex = linkIndex;
   }
@@ -187,19 +201,22 @@ function deleteInMap(m, path) {
   deleteInMap(m.get(head), tail);
 }
 
-function setInMap(m, path, value) {
-  if (path.length === 0) throw new Error('path must have at least one element');
-  if (path.length === 1) {
-    m.set(path[0], value);
-    return;
+function setInMap(m: Map<any, any>, path: any[], value: any) {
+  let current = m;
+  const lastI = path.length - 1;
+  for (let i = 0; i < lastI; i++) {
+    const part = path[i];
+
+    let nextMap = current.get(part);
+    if (nextMap === undefined) {
+      nextMap = new Map();
+      current.set(part, nextMap);
+    }
+    current = nextMap;
   }
-  const [head, ...tail] = path;
-  let nextM = m.get(head);
-  if (!nextM) {
-    nextM = new Map();
-    m.set(head, nextM);
+  if (lastI > -1) {
+    current.set(path[lastI], value);
   }
-  setInMap(nextM, tail, value);
 }
 
 function isDateAttr(attr: InstantDBAttr) {
@@ -209,7 +226,7 @@ function isDateAttr(attr: InstantDBAttr) {
 function createTripleIndexes(
   attrsStore: AttrsStore,
   triples: Triple[],
-  useDateObjects: boolean | null,
+  useDateObjects: boolean | null | undefined,
 ): Pick<Store, 'eav' | 'aev' | 'vae'> {
   const eav = new Map();
   const aev = new Map();
@@ -286,10 +303,10 @@ export function attrsStoreFromJSON(
   storeJSON: StoreJson | null,
 ): AttrsStore | undefined {
   if (attrsStoreJSON) {
-    return new AttrsStore(attrsStoreJSON.attrs, attrsStoreJSON.linkIndex);
+    return new AttrsStoreClass(attrsStoreJSON.attrs, attrsStoreJSON.linkIndex);
   }
   if (storeJSON && '__type' in storeJSON) {
-    return new AttrsStore(storeJSON.attrs, storeJSON.linkIndex);
+    return new AttrsStoreClass(storeJSON.attrs, storeJSON.linkIndex);
   }
 }
 
@@ -304,8 +321,8 @@ export function hasEntity(store: Store, e: string) {
 export function createStore(
   attrsStore: AttrsStore,
   triples: Triple[],
-  enableCardinalityInference: boolean | null,
-  useDateObjects: boolean | null,
+  enableCardinalityInference?: boolean | null,
+  useDateObjects?: boolean | null,
 ): Store {
   const store = createTripleIndexes(
     attrsStore,
@@ -876,7 +893,11 @@ function findTriple(
   return getInMap(store.eav, [eid, aid]);
 }
 
-export function transact(store: Store, attrsStore: AttrsStore, txSteps) {
+export function transact(
+  store: Store,
+  attrsStore: AttrsStore,
+  txSteps,
+): { store: Store; attrsStore: AttrsStore } {
   const txStepsFiltered = txSteps.filter(
     ([action, eid, attrId, value, opts]) => {
       if (action !== 'add-triple' && action !== 'deep-merge-triple') {
@@ -915,9 +936,19 @@ export function transact(store: Store, attrsStore: AttrsStore, txSteps) {
     },
   );
 
-  return create(store, (draft) => {
-    txStepsFiltered.forEach((txStep) => {
-      applyTxStep(draft, attrsStore, txStep);
-    });
-  });
+  return create(
+    { store, attrsStore },
+    (draft) => {
+      txStepsFiltered.forEach((txStep) => {
+        applyTxStep(draft.store, draft.attrsStore, txStep);
+      });
+    },
+    {
+      mark: (target) => {
+        if (target instanceof AttrsStoreClass) {
+          return 'immutable';
+        }
+      },
+    },
+  );
 }

package/__tests__/src/instaql.bench.js

@@ -1,29 +0,0 @@
-import { bench } from 'vitest';
-
-import zenecaAttrs from './data/zeneca/attrs.json';
-import zenecaTriples from './data/zeneca/triples.json';
-import { createStore } from '../../src/store';
-import query from '../../src/instaql';
-
-const zenecaIdToAttr = zenecaAttrs.reduce((res, x) => {
-  res[x.id] = x;
-  return res;
-}, {});
-
-const store = createStore(zenecaIdToAttr, zenecaTriples);
-
-bench('big query', () => {
-  query(
-    { store },
-    {
-      users: {
-        bookshelves: {
-          books: {},
-          users: {
-            bookshelves: {},
-          },
-        },
-      },
-    },
-  );
-});