@instantdb/core 0.22.86-experimental.split-store.20178922132.1 → 0.22.87-experimental.drewh-explorer-component.20180358679.1

package/dist/esm/store.d.ts

@@ -2,14 +2,24 @@ import { InstantDBAttr } from './attrTypes.ts';
 import { LinkIndex } from './utils/linkIndex.ts';
 type Triple = [string, string, any, number];
 type Attrs = Record<string, InstantDBAttr>;
+type AttrIndexes = {
+    blobAttrs: Map<string, Map<string, InstantDBAttr>>;
+    primaryKeys: Map<string, InstantDBAttr>;
+    forwardIdents: Map<string, Map<string, InstantDBAttr>>;
+    revIdents: Map<string, Map<string, InstantDBAttr>>;
+};
 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;
+    attrs: Attrs;
+    attrIndexes: AttrIndexes;
     cardinalityInference: boolean | null;
+    linkIndex: LinkIndex | null;
+    __type: 'store';
 };
-type StoreJsonVersion0 = {
+export type StoreJson = {
     __type: 'store';
     attrs: Attrs;
     triples: Triple[];
@@ -17,55 +27,22 @@ type StoreJsonVersion0 = {
     linkIndex: LinkIndex | null;
     useDateObjects: boolean | null;
 };
-type StoreJsonVersion1 = {
-    triples: Triple[];
-    cardinalityInference: boolean | null;
-    useDateObjects: boolean | null;
-    version: 1;
-};
-export type StoreJson = StoreJsonVersion0 | StoreJsonVersion1;
-export type AttrsStoreJson = {
-    attrs: Attrs;
-    linkIndex: LinkIndex | null;
-};
-export declare class AttrsStore {
-    attrs: Attrs;
-    linkIndex: LinkIndex | null;
-    private _blobAttrs;
-    private _primaryKeys;
-    private _forwardIdents;
-    private _revIdents;
-    constructor(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;
-    get blobAttrs(): Map<string, Map<string, InstantDBAttr>>;
-    get primaryKeys(): Map<string, InstantDBAttr>;
-    get forwardIdents(): Map<string, Map<string, InstantDBAttr>>;
-    get revIdents(): Map<string, Map<string, InstantDBAttr>>;
-    toJSON(): AttrsStoreJson;
-}
 export declare function isBlob(attr: InstantDBAttr): boolean;
 export declare function getInMap(obj: any, path: any): any;
-export declare function toJSON(store: Store): StoreJsonVersion1;
-export declare function fromJSON(attrsStore: AttrsStore, storeJSON: StoreJson): Store;
-export declare function attrsStoreFromJSON(attrsStoreJSON: AttrsStoreJson | null, storeJSON: StoreJson | null): AttrsStore | undefined;
+export declare function toJSON(store: Store): StoreJson;
+export declare function fromJSON(storeJSON: StoreJson): Store;
 export declare function hasTriple(store: Store, [e, a, v]: [string, string, any]): boolean;
 export declare function hasEntity(store: Store, e: string): boolean;
-export declare function createStore(attrsStore: AttrsStore, triples: Triple[], enableCardinalityInference: boolean | null, useDateObjects: boolean | null): Store;
-export declare function retractTriple(store: Store, attrsStore: AttrsStore, rawTriple: Triple): void;
-export declare function addTriple(store: Store, attrsStore: AttrsStore, rawTriple: Triple): void;
+export declare function createStore(attrs: Record<string, InstantDBAttr>, triples: Triple[], enableCardinalityInference: boolean | null, linkIndex: LinkIndex | null, useDateObjects: boolean | null): Store;
+export declare function retractTriple(store: Store, rawTriple: Triple): void;
+export declare function addTriple(store: Store, rawTriple: Triple): void;
 export declare function allMapValues(m: any, level: any, res?: any[]): any[];
 export declare function getTriples(store: any, [e, a, v]: [any, any, any]): any[];
 export declare function getAsObject(store: Store, attrs: Map<string, InstantDBAttr> | undefined, e: string): {};
-export declare function getAttrByFwdIdentName(attrsStore: AttrsStore, inputEtype: string, inputLabel: string): InstantDBAttr | undefined;
-export declare function getAttrByReverseIdentName(attrsStore: AttrsStore, inputEtype: string, inputLabel: string): InstantDBAttr | undefined;
-export declare function getBlobAttrs(attrsStore: AttrsStore, etype: string): Map<string, InstantDBAttr> | undefined;
-export declare function getPrimaryKeyAttr(attrsStore: AttrsStore, etype: string): InstantDBAttr | undefined;
-export declare function transact(store: Store, attrsStore: AttrsStore, txSteps: any): Store;
+export declare function getAttrByFwdIdentName(store: Store, inputEtype: string, inputLabel: string): InstantDBAttr | undefined;
+export declare function getAttrByReverseIdentName(store: Store, inputEtype: string, inputLabel: string): InstantDBAttr | undefined;
+export declare function getBlobAttrs(store: Store, etype: string): Map<string, InstantDBAttr> | undefined;
+export declare function getPrimaryKeyAttr(store: Store, etype: string): InstantDBAttr | undefined;
+export declare function transact(store: Store, txSteps: any): Store;
 export {};
 //# sourceMappingURL=store.d.ts.map

package/dist/esm/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/store.ts"],"names":[],"mappings":"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"}

package/dist/esm/store.js

@@ -1,102 +1,6 @@
 import { create } from 'mutative';
 import { immutableDeepMerge } from './utils/object.js';
 import { coerceToDate } from "./utils/dates.js";
-export class AttrsStore {
-    constructor(attrs, linkIndex) {
-        this._blobAttrs = null;
-        this._primaryKeys = null;
-        this._forwardIdents = null;
-        this._revIdents = null;
-        console.log('attrs init', new Error('trace'));
-        this.attrs = attrs;
-        this.linkIndex = linkIndex;
-    }
-    resetAttrIndexes() {
-        this._blobAttrs = null;
-        this._primaryKeys = null;
-        this._forwardIdents = null;
-        this._revIdents = null;
-    }
-    addAttr(attr) {
-        this.attrs[attr.id] = attr;
-        this.resetAttrIndexes();
-    }
-    deleteAttr(attrId) {
-        delete this.attrs[attrId];
-        this.resetAttrIndexes();
-    }
-    updateAttr(partialAttr) {
-        const attr = this.attrs[partialAttr.id];
-        if (!attr)
-            return;
-        this.attrs[partialAttr.id] = Object.assign(Object.assign({}, attr), partialAttr);
-        this.resetAttrIndexes();
-    }
-    getAttr(id) {
-        return this.attrs[id];
-    }
-    // XXX: Might be better to create all of the indexes at once as soon as someone
-    //      requests one index
-    get blobAttrs() {
-        if (this._blobAttrs) {
-            return this._blobAttrs;
-        }
-        console.log('blobAttrs');
-        this._blobAttrs = new Map();
-        for (const attr of Object.values(this.attrs)) {
-            if (isBlob(attr)) {
-                const [_, fwdEtype, fwdLabel] = attr['forward-identity'];
-                setInMap(this.blobAttrs, [fwdEtype, fwdLabel], attr);
-            }
-        }
-        return this._blobAttrs;
-    }
-    get primaryKeys() {
-        if (this._primaryKeys) {
-            return this._primaryKeys;
-        }
-        console.log('primayKeys');
-        this._primaryKeys = new Map();
-        for (const attr of Object.values(this.attrs)) {
-            if (attr['primary?']) {
-                const [_, fwdEtype] = attr['forward-identity'];
-                setInMap(this._primaryKeys, [fwdEtype], attr);
-            }
-        }
-        return this._primaryKeys;
-    }
-    get forwardIdents() {
-        if (this._forwardIdents) {
-            return this._forwardIdents;
-        }
-        console.log('fwdIdents');
-        this._forwardIdents = new Map();
-        for (const attr of Object.values(this.attrs)) {
-            const fwdIdent = attr['forward-identity'];
-            const [_, fwdEtype, fwdLabel] = fwdIdent;
-            setInMap(this._forwardIdents, [fwdEtype, fwdLabel], attr);
-        }
-        return this._forwardIdents;
-    }
-    get revIdents() {
-        if (this._revIdents) {
-            return this._revIdents;
-        }
-        console.log('revIdents');
-        this._revIdents = new Map();
-        for (const attr of Object.values(this.attrs)) {
-            const revIdent = attr['reverse-identity'];
-            if (revIdent) {
-                const [_, revEtype, revLabel] = revIdent;
-                setInMap(this._revIdents, [revEtype, revLabel], attr);
-            }
-        }
-        return this._revIdents;
-    }
-    toJSON() {
-        return { attrs: this.attrs, linkIndex: this.linkIndex };
-    }
-}
 function hasEA(attr) {
     return attr['cardinality'] === 'one';
 }
@@ -142,15 +46,15 @@ function setInMap(m, path, value) {
 function isDateAttr(attr) {
     return attr['checked-data-type'] === 'date';
 }
-function createTripleIndexes(attrsStore, triples, useDateObjects) {
+function createTripleIndexes(attrs, triples, useDateObjects) {
     const eav = new Map();
     const aev = new Map();
     const vae = new Map();
     for (const triple of triples) {
-        let [eid, aid, v] = triple;
-        const attr = attrsStore.getAttr(aid);
+        let [eid, aid, v, t] = triple;
+        const attr = getAttr(attrs, aid);
         if (!attr) {
-            console.warn('no such attr', aid, eid);
+            console.warn('no such attr', eid, attrs);
             continue;
         }
         if (attr['checked-data-type'] === 'date' && useDateObjects) {
@@ -190,22 +94,16 @@ function createAttrIndexes(attrs) {
 }
 export function toJSON(store) {
     return {
+        __type: store.__type,
+        attrs: store.attrs,
         triples: allMapValues(store.eav, 3),
         cardinalityInference: store.cardinalityInference,
+        linkIndex: store.linkIndex,
         useDateObjects: store.useDateObjects,
-        version: 1,
     };
 }
-export function fromJSON(attrsStore, storeJSON) {
-    return createStore(attrsStore, storeJSON.triples, storeJSON.cardinalityInference, storeJSON.useDateObjects);
-}
-export function attrsStoreFromJSON(attrsStoreJSON, storeJSON) {
-    if (attrsStoreJSON) {
-        return new AttrsStore(attrsStoreJSON.attrs, attrsStoreJSON.linkIndex);
-    }
-    if (storeJSON && '__type' in storeJSON) {
-        return new AttrsStore(storeJSON.attrs, storeJSON.linkIndex);
-    }
+export function fromJSON(storeJSON) {
+    return createStore(storeJSON.attrs, storeJSON.triples, storeJSON.cardinalityInference, storeJSON.linkIndex, storeJSON.useDateObjects);
 }
 export function hasTriple(store, [e, a, v]) {
     return getInMap(store.eav, [e, a, v]) !== undefined;
@@ -213,10 +111,17 @@ export function hasTriple(store, [e, a, v]) {
 export function hasEntity(store, e) {
     return getInMap(store.eav, [e]) !== undefined;
 }
-export function createStore(attrsStore, triples, enableCardinalityInference, useDateObjects) {
-    const store = createTripleIndexes(attrsStore, triples, useDateObjects);
-    store.cardinalityInference = enableCardinalityInference;
+function resetAttrIndexes(store) {
+    store.attrIndexes = createAttrIndexes(store.attrs);
+}
+export function createStore(attrs, triples, enableCardinalityInference, linkIndex, useDateObjects) {
+    const store = createTripleIndexes(attrs, triples, useDateObjects);
     store.useDateObjects = useDateObjects;
+    store.attrs = attrs;
+    store.attrIndexes = createAttrIndexes(attrs);
+    store.cardinalityInference = enableCardinalityInference;
+    store.linkIndex = linkIndex;
+    store.__type = 'store';
     return store;
 }
 // We may have local triples with lookup refs in them,
@@ -273,13 +178,13 @@ function resolveLookupRefs(store, triple) {
         return [eid, ...rest];
     }
 }
-export function retractTriple(store, attrsStore, rawTriple) {
+export function retractTriple(store, rawTriple) {
     const triple = resolveLookupRefs(store, rawTriple);
     if (!triple) {
         return;
     }
     const [eid, aid, v] = triple;
-    const attr = attrsStore.getAttr(aid);
+    const attr = getAttr(store.attrs, aid);
     if (!attr) {
         return;
     }
@@ -320,14 +225,14 @@ function getCreatedAt(store, attr, triple) {
      */
     return createdAt || Date.now() * 10 + _seed++;
 }
-export function addTriple(store, attrsStore, rawTriple) {
+export function addTriple(store, rawTriple) {
     var _a;
     const triple = resolveLookupRefs(store, rawTriple);
     if (!triple) {
         return;
     }
     let [eid, aid, v] = triple;
-    const attr = attrsStore.getAttr(aid);
+    const attr = getAttr(store.attrs, aid);
     if (!attr) {
         // (XXX): Due to the way we're handling attrs, it's
         // possible to enter a state where we receive a triple without an attr.
@@ -356,14 +261,14 @@ export function addTriple(store, attrsStore, rawTriple) {
         setInMap(store.vae, [v, aid, eid], enhancedTriple);
     }
 }
-function mergeTriple(store, attrsStore, rawTriple) {
+function mergeTriple(store, rawTriple) {
     var _a;
     const triple = resolveLookupRefs(store, rawTriple);
     if (!triple) {
         return;
     }
     const [eid, aid, update] = triple;
-    const attr = attrsStore.getAttr(aid);
+    const attr = getAttr(store.attrs, aid);
     if (!attr)
         return;
     if (!isBlob(attr))
@@ -384,7 +289,7 @@ function mergeTriple(store, attrsStore, rawTriple) {
     ];
     setInMap(store.eav, [eid, aid], new Map([[updatedValue, enhancedTriple]]));
 }
-function deleteEntity(store, attrsStore, args) {
+function deleteEntity(store, args) {
     var _a, _b;
     const [lookup, etype] = args;
     const triple = resolveLookupRefs(store, [lookup]);
@@ -396,10 +301,10 @@ function deleteEntity(store, attrsStore, args) {
     const eMap = store.eav.get(id);
     if (eMap) {
         for (const a of eMap.keys()) {
-            const attr = attrsStore.getAttr(a);
+            const attr = store.attrs[a];
             // delete cascade refs
             if (attr && attr['on-delete-reverse'] === 'cascade') {
-                allMapValues(eMap.get(a), 1).forEach(([e, a, v]) => { var _a; return deleteEntity(store, attrsStore, [v, (_a = attr['reverse-identity']) === null || _a === void 0 ? void 0 : _a[1]]); });
+                allMapValues(eMap.get(a), 1).forEach(([e, a, v]) => { var _a; return deleteEntity(store, [v, (_a = attr['reverse-identity']) === null || _a === void 0 ? void 0 : _a[1]]); });
             }
             if (
             // Fall back to deleting everything if we've rehydrated tx-steps from
@@ -424,7 +329,7 @@ function deleteEntity(store, attrsStore, args) {
         vaeTriples.forEach((triple) => {
             var _a, _b, _c;
             const [e, a, v] = triple;
-            const attr = attrsStore.getAttr(a);
+            const attr = store.attrs[a];
             if (!etype || !attr || ((_a = attr['reverse-identity']) === null || _a === void 0 ? void 0 : _a[1]) === etype) {
                 deleteInMap(store.eav, [e, a, v]);
                 deleteInMap(store.aev, [a, e, v]);
@@ -433,7 +338,7 @@ function deleteEntity(store, attrsStore, args) {
             if (attr &&
                 attr['on-delete'] === 'cascade' &&
                 ((_b = attr['reverse-identity']) === null || _b === void 0 ? void 0 : _b[1]) === etype) {
-                deleteEntity(store, attrsStore, [e, (_c = attr['forward-identity']) === null || _c === void 0 ? void 0 : _c[1]]);
+                deleteEntity(store, [e, (_c = attr['forward-identity']) === null || _c === void 0 ? void 0 : _c[1]]);
             }
         });
     }
@@ -449,55 +354,58 @@ function deleteEntity(store, attrsStore, args) {
 // * We could batch this reset at the end
 // * We could add an ave index for all triples, so removing the
 //   right triples is easy and fast.
-function resetIndexMap(store, attrsStore, newTriples) {
-    const newIndexMap = createTripleIndexes(attrsStore, newTriples, store.useDateObjects);
+function resetIndexMap(store, newTriples) {
+    const newIndexMap = createTripleIndexes(store.attrs, newTriples, store.useDateObjects);
     Object.keys(newIndexMap).forEach((key) => {
         store[key] = newIndexMap[key];
     });
 }
-function addAttr(attrsStore, [attr]) {
-    attrsStore.addAttr(attr);
+function addAttr(store, [attr]) {
+    store.attrs[attr.id] = attr;
+    resetAttrIndexes(store);
 }
 function getAllTriples(store) {
     return allMapValues(store.eav, 3);
 }
-function deleteAttr(store, attrsStore, [id]) {
-    if (!attrsStore.getAttr(id))
+function deleteAttr(store, [id]) {
+    if (!store.attrs[id])
         return;
     const newTriples = getAllTriples(store).filter(([_, aid]) => aid !== id);
-    attrsStore.deleteAttr(id);
-    resetIndexMap(store, attrsStore, newTriples);
+    delete store.attrs[id];
+    resetAttrIndexes(store);
+    resetIndexMap(store, newTriples);
 }
-function updateAttr(store, attrsStore, [partialAttr]) {
-    const attr = attrsStore.getAttr(partialAttr.id);
+function updateAttr(store, [partialAttr]) {
+    const attr = store.attrs[partialAttr.id];
     if (!attr)
         return;
-    attrsStore.updateAttr(partialAttr);
-    resetIndexMap(store, attrsStore, getAllTriples(store));
+    store.attrs[partialAttr.id] = Object.assign(Object.assign({}, attr), partialAttr);
+    resetAttrIndexes(store);
+    resetIndexMap(store, getAllTriples(store));
 }
-function applyTxStep(store, attrsStore, txStep) {
+function applyTxStep(store, txStep) {
     const [action, ...args] = txStep;
     switch (action) {
         case 'add-triple':
-            addTriple(store, attrsStore, args);
+            addTriple(store, args);
             break;
         case 'deep-merge-triple':
-            mergeTriple(store, attrsStore, args);
+            mergeTriple(store, args);
             break;
         case 'retract-triple':
-            retractTriple(store, attrsStore, args);
+            retractTriple(store, args);
             break;
         case 'delete-entity':
-            deleteEntity(store, attrsStore, args);
+            deleteEntity(store, args);
             break;
         case 'add-attr':
-            addAttr(attrsStore, args);
+            addAttr(store, args);
             break;
         case 'delete-attr':
-            deleteAttr(store, attrsStore, args);
+            deleteAttr(store, args);
             break;
         case 'update-attr':
-            updateAttr(store, attrsStore, args);
+            updateAttr(store, args);
             break;
         case 'restore-attr':
             break;
@@ -660,32 +568,32 @@ export function getAsObject(store, attrs, e) {
     }
     return obj;
 }
-export function getAttrByFwdIdentName(attrsStore, inputEtype, inputLabel) {
+export function getAttrByFwdIdentName(store, inputEtype, inputLabel) {
     var _a;
-    return (_a = attrsStore.forwardIdents.get(inputEtype)) === null || _a === void 0 ? void 0 : _a.get(inputLabel);
+    return (_a = store.attrIndexes.forwardIdents.get(inputEtype)) === null || _a === void 0 ? void 0 : _a.get(inputLabel);
 }
-export function getAttrByReverseIdentName(attrsStore, inputEtype, inputLabel) {
+export function getAttrByReverseIdentName(store, inputEtype, inputLabel) {
     var _a;
-    return (_a = attrsStore.revIdents.get(inputEtype)) === null || _a === void 0 ? void 0 : _a.get(inputLabel);
+    return (_a = store.attrIndexes.revIdents.get(inputEtype)) === null || _a === void 0 ? void 0 : _a.get(inputLabel);
 }
-export function getBlobAttrs(attrsStore, etype) {
-    return attrsStore.blobAttrs.get(etype);
+export function getBlobAttrs(store, etype) {
+    return store.attrIndexes.blobAttrs.get(etype);
 }
-export function getPrimaryKeyAttr(attrsStore, etype) {
+export function getPrimaryKeyAttr(store, etype) {
     var _a;
-    const fromPrimary = attrsStore.primaryKeys.get(etype);
+    const fromPrimary = store.attrIndexes.primaryKeys.get(etype);
     if (fromPrimary) {
         return fromPrimary;
     }
-    return (_a = attrsStore.forwardIdents.get(etype)) === null || _a === void 0 ? void 0 : _a.get('id');
+    return (_a = store.attrIndexes.forwardIdents.get(etype)) === null || _a === void 0 ? void 0 : _a.get('id');
 }
-function findTriple(store, attrsStore, rawTriple) {
+function findTriple(store, rawTriple) {
     const triple = resolveLookupRefs(store, rawTriple);
     if (!triple) {
         return;
     }
     const [eid, aid, v] = triple;
-    const attr = attrsStore.getAttr(aid);
+    const attr = getAttr(store.attrs, aid);
     if (!attr) {
         // (XXX): Due to the way we're handling attrs, it's
         // possible to enter a state where we receive a triple without an attr.
@@ -695,7 +603,7 @@ function findTriple(store, attrsStore, rawTriple) {
     }
     return getInMap(store.eav, [eid, aid]);
 }
-export function transact(store, attrsStore, txSteps) {
+export function transact(store, txSteps) {
     const txStepsFiltered = txSteps.filter(([action, eid, attrId, value, opts]) => {
         if (action !== 'add-triple' && action !== 'deep-merge-triple') {
             return true;
@@ -705,10 +613,10 @@ export function transact(store, attrsStore, txSteps) {
             return true;
         }
         let exists = false;
-        const attr = attrsStore.getAttr(attrId);
+        const attr = getAttr(store.attrs, attrId);
         if (attr) {
-            const idAttr = getPrimaryKeyAttr(attrsStore, attr['forward-identity'][1]);
-            exists = !!findTriple(store, attrsStore, [
+            const idAttr = getPrimaryKeyAttr(store, attr['forward-identity'][1]);
+            exists = !!findTriple(store, [
                 eid,
                 idAttr === null || idAttr === void 0 ? void 0 : idAttr.id,
                 eid,
@@ -724,7 +632,7 @@ export function transact(store, attrsStore, txSteps) {
     });
     return create(store, (draft) => {
         txStepsFiltered.forEach((txStep) => {
-            applyTxStep(draft, attrsStore, txStep);
+            applyTxStep(draft, txStep);
         });
     });
 }