@instantdb/core 0.22.88 → 0.22.89-experimental.drewh-fix-export.20277749804.1

package/dist/commonjs/Reactor.d.ts

@@ -3,12 +3,13 @@
  */
 export default class Reactor<RoomSchema extends import("./presence.ts").RoomSchemaShape = {}> {
     constructor(config: any, Storage: typeof IndexedDBStorage | undefined, NetworkListener: typeof WindowNetworkListener | undefined, versions: any, EventSourceConstructor: any);
-    attrs: any;
+    /** @type {s.AttrsStore | undefined} */
+    attrs: s.AttrsStore | undefined;
     _isOnline: boolean;
     _isShutdown: boolean;
     status: string;
-    /** @type {PersistedObject} */
-    querySubs: PersistedObject<any, any, any>;
+    /** @type {PersistedObject<string, QuerySub, QuerySubInStorage>} */
+    querySubs: PersistedObject<string, QuerySub, QuerySubInStorage>;
     /** @type {PersistedObject} */
     kv: PersistedObject<any, any, any>;
     /** @type {SyncTable} */
@@ -78,6 +79,7 @@ export default class Reactor<RoomSchema extends import("./presence.ts").RoomSche
     queryCacheLimit: any;
     versions: any;
     _beforeUnload(): void;
+    ensureAttrs(): s.AttrsStore;
     updateSchema(schema: any): void;
     _reactorStats(): {
         inFlightMutationCount: number;
@@ -139,12 +141,24 @@ export default class Reactor<RoomSchema extends import("./presence.ts").RoomSche
     _unsubQuery(q: any, hash: any, cb: any): void;
     _hasQueryListeners(hash: any): boolean;
     _cleanupQuery(q: any, hash: any): void;
-    _rewriteMutations(attrs: any, muts: any, processedTxId: any): any;
+    /**
+     *
+     * @param {s.AttrsStore} attrs
+     * @param {any} muts
+     * @param {number} [processedTxId]
+     */
+    _rewriteMutations(attrs: s.AttrsStore, muts: any, processedTxId?: number): any;
     _rewriteMutationsSorted(attrs: any, muts: any): any[];
-    optimisticAttrs(): any;
+    /**
+     * @returns {s.AttrsStore}
+     */
+    optimisticAttrs(): s.AttrsStore;
     /** Runs instaql on a query and a store */
     dataForQuery(hash: any): any;
-    _applyOptimisticUpdates(store: any, mutations: any, processedTxId: any): any;
+    _applyOptimisticUpdates(store: any, attrsStore: any, mutations: any, processedTxId: any): {
+        store: any;
+        attrsStore: any;
+    };
     /** Re-run instaql and call all callbacks with new data */
     notifyOne: (hash: any) => void;
     notifyOneQueryOnce: (hash: any) => void;
@@ -338,6 +352,9 @@ export type Logger = import("./utils/log.ts").Logger;
 export type Connection = import("./Connection.ts").Connection<any>;
 export type TransportType = import("./Connection.ts").TransportType;
 export type EventSourceConstructor = import("./Connection.ts").EventSourceConstructor;
+export type QuerySub = import("./reactorTypes.ts").QuerySub;
+export type QuerySubInStorage = import("./reactorTypes.ts").QuerySubInStorage;
+import * as s from './store.ts';
 import { PersistedObject } from './utils/PersistedObject.ts';
 import { SyncTable } from './SyncTable.ts';
 import { Deferred } from './utils/Deferred.js';

package/dist/commonjs/Reactor.d.ts.map

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

package/dist/commonjs/Reactor.js

@@ -87,6 +87,8 @@ const SyncTable_ts_1 = require("./SyncTable.js");
 /** @typedef {import('./Connection.ts').Connection} Connection */
 /** @typedef {import('./Connection.ts').TransportType} TransportType */
 /** @typedef {import('./Connection.ts').EventSourceConstructor} EventSourceConstructor */
+/** @typedef {import('./reactorTypes.ts').QuerySub} QuerySub */
+/** @typedef {import('./reactorTypes.ts').QuerySubInStorage} QuerySubInStorage */
 const STATUS = {
     CONNECTING: 'connecting',
     OPENED: 'opened',
@@ -139,20 +141,37 @@ const ignoreLogging = {
     'refresh-presence': true,
     'patch-presence': true,
 };
+/**
+ * @param {QuerySubInStorage} x
+ * @param {boolean | null} useDateObjects
+ * @returns {QuerySub}
+ */
 function querySubFromStorage(x, useDateObjects) {
     var _a;
     const v = typeof x === 'string' ? JSON.parse(x) : x;
     if ((_a = v === null || v === void 0 ? void 0 : v.result) === null || _a === void 0 ? void 0 : _a.store) {
-        const storeJSON = v.result.store;
-        v.result.store = s.fromJSON(Object.assign(Object.assign({}, storeJSON), { useDateObjects: useDateObjects }));
+        const attrsStore = s.attrsStoreFromJSON(v.result.attrsStore, v.result.store);
+        if (attrsStore) {
+            const storeJSON = v.result.store;
+            v.result.store = s.fromJSON(attrsStore, Object.assign(Object.assign({}, storeJSON), { useDateObjects: useDateObjects }));
+            v.result.attrsStore = attrsStore;
+        }
     }
     return v;
 }
+/**
+ *
+ * @param {string} _key
+ * @param {QuerySub} sub
+ * @returns QuerySubInStorage
+ */
 function querySubToStorage(_key, sub) {
-    var _a;
-    const jsonSub = Object.assign({}, sub);
-    if ((_a = sub.result) === null || _a === void 0 ? void 0 : _a.store) {
-        jsonSub.result = Object.assign(Object.assign({}, sub.result), { store: s.toJSON(sub.result.store) });
+    const { result } = sub, rest = __rest(sub, ["result"]);
+    const jsonSub = /** @type {import('./reactorTypes.ts').QuerySubInStorage} */ (rest);
+    if (result) {
+        /** @type {import('./reactorTypes.ts').QuerySubResultInStorage} */
+        const jsonResult = Object.assign(Object.assign({}, result), { store: s.toJSON(result.store), attrsStore: result.attrsStore.toJSON() });
+        jsonSub.result = jsonResult;
     }
     return jsonSub;
 }
@@ -297,7 +316,7 @@ class Reactor {
             }
             try {
                 const txSteps = instaml.transform({
-                    attrs: this.optimisticAttrs(),
+                    attrsStore: this.optimisticAttrs(),
                     schema: this.config.schema,
                     stores: Object.values(this.querySubs.currentValue).map((sub) => { var _a; return (_a = sub === null || sub === void 0 ? void 0 : sub.result) === null || _a === void 0 ? void 0 : _a.store; }),
                     useDateObjects: this.config.useDateObjects,
@@ -463,7 +482,9 @@ class Reactor {
         this._initStorage(Storage);
         this._syncTable = new SyncTable_ts_1.SyncTable(this._trySendAuthed.bind(this), new Storage(this.config.appId, 'syncSubs'), {
             useDateObjects: this.config.useDateObjects,
-        }, this._log, (triples) => s.createStore(this.attrs, triples, this.config.enableCardinalityInference, this._linkIndex, this.config.useDateObjects));
+        }, this._log, (triples) => {
+            return s.createStore(this.ensureAttrs(), triples, this.config.enableCardinalityInference, this.config.useDateObjects);
+        }, () => this.ensureAttrs());
         this._oauthCallbackResponse = this._oauthLoginInit();
         // kick off a request to cache it
         this.getCurrentUser();
@@ -493,6 +514,12 @@ class Reactor {
             addEventListener('beforeunload', this._beforeUnload);
         }
     }
+    ensureAttrs() {
+        if (!this.attrs) {
+            throw new Error('attrs have not loaded.');
+        }
+        return this.attrs;
+    }
     updateSchema(schema) {
         this.config = Object.assign(Object.assign({}, this.config), { schema: schema, cardinalityInference: Boolean(schema) });
         this._linkIndex = schema ? (0, linkIndex_ts_1.createLinkIndex)(this.config.schema) : null;
@@ -516,7 +543,7 @@ class Reactor {
             serialize: querySubToStorage,
             parse: (_key, x) => querySubFromStorage(x, this.config.useDateObjects),
             // objectSize
-            objectSize: (x) => { var _a, _b, _c, _d; return (_d = (_c = (_b = (_a = x.result) === null || _a === void 0 ? void 0 : _a.store) === null || _b === void 0 ? void 0 : _b.triples) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0; },
+            objectSize: (x) => { var _a, _b, _c, _d; return (_d = (_c = (_b = (_a = x === null || x === void 0 ? void 0 : x.result) === null || _a === void 0 ? void 0 : _a.store) === null || _b === void 0 ? void 0 : _b.triples) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0; },
             logger: this._log,
             preloadEntryCount: 10,
             gc: {
@@ -650,7 +677,8 @@ class Reactor {
                 const pageInfo = (_d = (_c = result === null || result === void 0 ? void 0 : result[0]) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d['page-info'];
                 const aggregate = (_f = (_e = result === null || result === void 0 ? void 0 : result[0]) === null || _e === void 0 ? void 0 : _e.data) === null || _f === void 0 ? void 0 : _f['aggregate'];
                 const triples = (0, instaqlResult_js_1.extractTriples)(result);
-                const store = s.createStore(this.attrs, triples, enableCardinalityInference, this._linkIndex, this.config.useDateObjects);
+                const attrsStore = this.ensureAttrs();
+                const store = s.createStore(attrsStore, triples, enableCardinalityInference, this.config.useDateObjects);
                 this.querySubs.updateInPlace((prev) => {
                     if (!prev[hash]) {
                         this._log.info('Missing value in querySubs', { hash, q });
@@ -658,6 +686,7 @@ class Reactor {
                     }
                     prev[hash].result = {
                         store,
+                        attrsStore,
                         pageInfo,
                         aggregate,
                         processedTxId: msg['processed-tx-id'],
@@ -692,7 +721,7 @@ class Reactor {
                     this._setAttrs(attrs);
                 }
                 this._cleanupPendingMutationsTimeout();
-                const rewrittenMutations = this._rewriteMutations(this.attrs, this._pendingMutations(), processedTxId);
+                const rewrittenMutations = this._rewriteMutations(this.ensureAttrs(), this._pendingMutations(), processedTxId);
                 if (rewrittenMutations !== this._pendingMutations()) {
                     // We know we've changed the mutations to fix the attr ids and removed
                     // processed attrs, so we'll persist those changes to prevent optimisticAttrs
@@ -708,19 +737,33 @@ class Reactor {
                     const result = x['instaql-result'];
                     const hash = (0, weakHash_ts_1.default)(q);
                     const triples = (0, instaqlResult_js_1.extractTriples)(result);
-                    const store = s.createStore(this.attrs, triples, enableCardinalityInference, this._linkIndex, this.config.useDateObjects);
-                    const newStore = this._applyOptimisticUpdates(store, mutations, processedTxId);
+                    const attrsStore = this.ensureAttrs();
+                    const store = s.createStore(attrsStore, triples, enableCardinalityInference, this.config.useDateObjects);
+                    const { store: newStore, attrsStore: newAttrsStore } = this._applyOptimisticUpdates(store, attrsStore, mutations, processedTxId);
                     const pageInfo = (_b = (_a = result === null || result === void 0 ? void 0 : result[0]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b['page-info'];
                     const aggregate = (_d = (_c = result === null || result === void 0 ? void 0 : result[0]) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d['aggregate'];
-                    return { q, hash, store: newStore, pageInfo, aggregate };
+                    return {
+                        q,
+                        hash,
+                        store: newStore,
+                        attrsStore: newAttrsStore,
+                        pageInfo,
+                        aggregate,
+                    };
                 });
-                updates.forEach(({ hash, q, store, pageInfo, aggregate }) => {
+                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, pageInfo, aggregate, processedTxId };
+                        prev[hash].result = {
+                            store,
+                            attrsStore,
+                            pageInfo,
+                            aggregate,
+                            processedTxId,
+                        };
                     });
                 });
                 this._cleanupPendingMutationsQueries();
@@ -732,7 +775,7 @@ class Reactor {
             case 'transact-ok': {
                 const { 'client-event-id': eventId, 'tx-id': txId } = msg;
                 this._inFlightMutationEventIds.delete(eventId);
-                const muts = this._rewriteMutations(this.attrs, this._pendingMutations());
+                const muts = this._rewriteMutations(this.ensureAttrs(), this._pendingMutations());
                 const prevMutation = muts.get(eventId);
                 if (!prevMutation) {
                     break;
@@ -741,11 +784,17 @@ class Reactor {
                 this._updatePendingMutations((prev) => {
                     prev.set(eventId, Object.assign(Object.assign({}, prev.get(eventId)), { 'tx-id': txId, confirmed: Date.now() }));
                 });
-                const newAttrs = prevMutation['tx-steps']
-                    .filter(([action, ..._args]) => action === 'add-attr')
-                    .map(([_action, attr]) => attr)
-                    .concat(Object.values(this.attrs));
-                this._setAttrs(newAttrs);
+                const newAttrs = [];
+                for (const step of prevMutation['tx-steps']) {
+                    if (step[0] === 'add-attr') {
+                        const attr = step[1];
+                        newAttrs.push(attr);
+                    }
+                }
+                if (newAttrs.length) {
+                    const existingAttrs = Object.values(this.ensureAttrs().attrs);
+                    this._setAttrs([...existingAttrs, ...newAttrs]);
+                }
                 this._finishTransaction('synced', eventId);
                 this._cleanupPendingMutationsTimeout();
                 break;
@@ -906,10 +955,10 @@ class Reactor {
         this._completeQueryOnce(q, hash, r.dfd);
     }
     _setAttrs(attrs) {
-        this.attrs = attrs.reduce((acc, attr) => {
+        this.attrs = new s.AttrsStoreClass(attrs.reduce((acc, attr) => {
             acc[attr.id] = attr;
             return acc;
-        }, {});
+        }, {}), this._linkIndex);
         this.notifyAttrsSubs();
     }
     _startQuerySub(q, hash) {
@@ -1015,6 +1064,12 @@ class Reactor {
     // We remove `add-attr` commands for attrs that already exist.
     // We update `add-triple` and `retract-triple` commands to use the
     // server attr-ids.
+    /**
+     *
+     * @param {s.AttrsStore} attrs
+     * @param {any} muts
+     * @param {number} [processedTxId]
+     */
     _rewriteMutations(attrs, muts, processedTxId) {
         if (!attrs)
             return muts;
@@ -1022,12 +1077,12 @@ class Reactor {
             return new Map();
         const findExistingAttr = (attr) => {
             const [_, etype, label] = attr['forward-identity'];
-            const existing = instaml.getAttrByFwdIdentName(attrs, etype, label);
+            const existing = s.getAttrByFwdIdentName(attrs, etype, label);
             return existing;
         };
         const findReverseAttr = (attr) => {
             const [_, etype, label] = attr['forward-identity'];
-            const revAttr = instaml.getAttrByReverseIdentName(attrs, etype, label);
+            const revAttr = s.getAttrByReverseIdentName(attrs, etype, label);
             return revAttr;
         };
         const mapping = { attrIdMap: {}, refSwapAttrIds: new Set() };
@@ -1090,8 +1145,11 @@ class Reactor {
     }
     // ---------------------------
     // Transact
+    /**
+     * @returns {s.AttrsStore}
+     */
     optimisticAttrs() {
-        var _a;
+        var _a, _b;
         const pendingMutationSteps = [...this._pendingMutations().values()] // hack due to Map()
             .flatMap((x) => x['tx-steps']);
         const deletedAttrIds = new Set(pendingMutationSteps
@@ -1104,17 +1162,22 @@ class Reactor {
             }
             else if (_action === 'update-attr' &&
                 attr.id &&
-                ((_a = this.attrs) === null || _a === void 0 ? void 0 : _a[attr.id])) {
-                const fullAttr = Object.assign(Object.assign({}, this.attrs[attr.id]), attr);
+                ((_a = this.attrs) === null || _a === void 0 ? void 0 : _a.getAttr(attr.id))) {
+                const fullAttr = Object.assign(Object.assign({}, this.attrs.getAttr(attr.id)), attr);
                 pendingAttrs.push(fullAttr);
             }
         }
-        const attrsWithoutDeleted = [
-            ...Object.values(this.attrs || {}),
-            ...pendingAttrs,
-        ].filter((a) => !deletedAttrIds.has(a.id));
-        const attrsRecord = Object.fromEntries(attrsWithoutDeleted.map((a) => [a.id, a]));
-        return attrsRecord;
+        if (!deletedAttrIds.size && !pendingAttrs.length) {
+            return this.attrs || new s.AttrsStoreClass({}, this._linkIndex);
+        }
+        const attrs = Object.assign({}, (((_b = this.attrs) === null || _b === void 0 ? void 0 : _b.attrs) || {}));
+        for (const attr of pendingAttrs) {
+            attrs[attr.id] = attr;
+        }
+        for (const id of deletedAttrIds) {
+            delete attrs[id];
+        }
+        return new s.AttrsStoreClass(attrs, this._linkIndex);
     }
     /** Runs instaql on a query and a store */
     dataForQuery(hash) {
@@ -1139,19 +1202,21 @@ class Reactor {
             pendingMutationsVersion === cached.pendingMutationsVersion) {
             return cached;
         }
-        const { store, pageInfo, aggregate, processedTxId } = result;
-        const mutations = this._rewriteMutationsSorted(store.attrs, pendingMutations);
-        const newStore = this._applyOptimisticUpdates(store, mutations, processedTxId);
-        const resp = (0, instaql_ts_1.default)({ store: newStore, pageInfo, aggregate }, q);
+        const { store, attrsStore, pageInfo, aggregate, processedTxId } = result;
+        const mutations = this._rewriteMutationsSorted(attrsStore, pendingMutations);
+        const { store: newStore, attrsStore: newAttrsStore } = this._applyOptimisticUpdates(store, attrsStore, mutations, processedTxId);
+        const resp = (0, instaql_ts_1.default)({ store: newStore, attrsStore: newAttrsStore, pageInfo, aggregate }, q);
         return { data: resp, querySubVersion, pendingMutationsVersion };
     }
-    _applyOptimisticUpdates(store, mutations, processedTxId) {
+    _applyOptimisticUpdates(store, attrsStore, mutations, processedTxId) {
         for (const [_, mut] of mutations) {
             if (!mut['tx-id'] || (processedTxId && mut['tx-id'] > processedTxId)) {
-                store = s.transact(store, mut['tx-steps']);
+                const result = s.transact(store, attrsStore, mut['tx-steps']);
+                store = result.store;
+                attrsStore = result.attrsStore;
             }
         }
-        return store;
+        return { store, attrsStore };
     }
     /** Re-compute all subscriptions */
     notifyAll() {
@@ -1231,7 +1296,7 @@ class Reactor {
             .forEach(({ eventId, q }) => {
             this._trySendAuthed(eventId, { op: 'add-query', q });
         });
-        const muts = this._rewriteMutationsSorted(this.attrs, this._pendingMutations());
+        const muts = this._rewriteMutationsSorted(this.ensureAttrs(), this._pendingMutations());
         muts.forEach(([eventId, mut]) => {
             if (!mut['tx-id']) {
                 this._sendMutation(eventId, mut);
@@ -1518,7 +1583,7 @@ class Reactor {
     subscribeAttrs(cb) {
         this.attrsCbs.push(cb);
         if (this.attrs) {
-            cb(this.attrs);
+            cb(this.attrs.attrs);
         }
         return () => {
             this.attrsCbs = this.attrsCbs.filter((x) => x !== cb);
@@ -1534,7 +1599,7 @@ class Reactor {
         if (!this.attrs)
             return;
         const oas = this.optimisticAttrs();
-        this.attrsCbs.forEach((cb) => cb(oas));
+        this.attrsCbs.forEach((cb) => cb(oas.attrs));
     }
     notifyConnectionStatusSubs(status) {
         this.connectionStatusCbs.forEach((cb) => cb(status));