@instantdb/core 0.22.86-experimental.split-store.20249342206.1 → 0.22.86-experimental.split-store.20250097559.1

package/__tests__/src/store.test.ts

@@ -64,8 +64,13 @@ function checkIndexIntegrity({
   const aevTriples = allMapValues(store.aev, 3).sort(tripleSort);
   const vaeTriples = allMapValues(store.vae, 3);
 
-  // Check eav and aev have all the same values
-  expect(eavTriples).toEqual(aevTriples);
+  // Check eav and aev have all the same triples
+  for (let i = 0; i < eavTriples.length; i++) {
+    const et = eavTriples[i];
+    const at = aevTriples[i];
+    expect(et).toEqual(at);
+  }
+  expect(eavTriples.length).toEqual(aevTriples.length);
 
   // Check vae doesn't have extra triples
   for (const triple of vaeTriples) {
@@ -512,6 +517,8 @@ test('deepMerge', () => {
     ),
   );
 
+  checkIndexIntegrity(gameCtx);
+
   const updatedCtx = transact(
     gameCtx.store,
     gameCtx.attrsStore,
@@ -537,6 +544,7 @@ test('deepMerge', () => {
       }),
     ),
   );
+
   const updatedGame = query(updatedCtx, {
     games: { $: { where: { id: gameId } } },
   }).data.games[0];
@@ -551,8 +559,7 @@ test('deepMerge', () => {
     inventory: ['shield'],
     locations: ['forest', undefined, 'castle'],
   });
-  // XXXX: Why does this fail??
-  //checkIndexIntegrity(updatedCtx);
+  checkIndexIntegrity(updatedCtx);
 });
 
 test('recursive links w same id', () => {

package/dist/commonjs/Reactor.d.ts

@@ -3,8 +3,8 @@
  */
 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);
-    /** @type {sts.AttrsStore | undefined} */
-    attrs: sts.AttrsStore | undefined;
+    /** @type {s.AttrsStore | undefined} */
+    attrs: s.AttrsStore | undefined;
     _isOnline: boolean;
     _isShutdown: boolean;
     status: string;
@@ -79,7 +79,7 @@ export default class Reactor<RoomSchema extends import("./presence.ts").RoomSche
     queryCacheLimit: any;
     versions: any;
     _beforeUnload(): void;
-    ensureAttrs(): sts.AttrsStore;
+    ensureAttrs(): s.AttrsStore;
     updateSchema(schema: any): void;
     _reactorStats(): {
         inFlightMutationCount: number;
@@ -143,16 +143,16 @@ export default class Reactor<RoomSchema extends import("./presence.ts").RoomSche
     _cleanupQuery(q: any, hash: any): void;
     /**
      *
-     * @param {sts.AttrsStore} attrs
+     * @param {s.AttrsStore} attrs
      * @param {any} muts
      * @param {number} [processedTxId]
      */
-    _rewriteMutations(attrs: sts.AttrsStore, muts: any, processedTxId?: number): any;
+    _rewriteMutations(attrs: s.AttrsStore, muts: any, processedTxId?: number): any;
     _rewriteMutationsSorted(attrs: any, muts: any): any[];
     /**
-     * @returns {sts.AttrsStore}
+     * @returns {s.AttrsStore}
      */
-    optimisticAttrs(): sts.AttrsStore;
+    optimisticAttrs(): s.AttrsStore;
     /** Runs instaql on a query and a store */
     dataForQuery(hash: any): any;
     _applyOptimisticUpdates(store: any, attrsStore: any, mutations: any, processedTxId: any): {
@@ -354,7 +354,7 @@ 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 sts from './store.ts';
+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

@@ -60,7 +60,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const weakHash_ts_1 = __importDefault(require("./utils/weakHash.js"));
 const instaql_ts_1 = __importDefault(require("./instaql.js"));
 const instaml = __importStar(require("./instaml.js"));
-const sts = __importStar(require("./store.js"));
+const s = __importStar(require("./store.js"));
 const uuid_ts_1 = __importDefault(require("./utils/uuid.js"));
 const IndexedDBStorage_ts_1 = __importDefault(require("./IndexedDBStorage.js"));
 const WindowNetworkListener_js_1 = __importDefault(require("./WindowNetworkListener.js"));
@@ -150,10 +150,10 @@ 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 attrsStore = sts.attrsStoreFromJSON(v.result.attrsStore, v.result.store);
+        const attrsStore = s.attrsStoreFromJSON(v.result.attrsStore, v.result.store);
         if (attrsStore) {
             const storeJSON = v.result.store;
-            v.result.store = sts.fromJSON(attrsStore, Object.assign(Object.assign({}, storeJSON), { useDateObjects: useDateObjects }));
+            v.result.store = s.fromJSON(attrsStore, Object.assign(Object.assign({}, storeJSON), { useDateObjects: useDateObjects }));
             v.result.attrsStore = attrsStore;
         }
     }
@@ -170,7 +170,7 @@ function querySubToStorage(_key, sub) {
     const jsonSub = /** @type {import('./reactorTypes.ts').QuerySubInStorage} */ (rest);
     if (result) {
         /** @type {import('./reactorTypes.ts').QuerySubResultInStorage} */
-        const jsonResult = Object.assign(Object.assign({}, result), { store: sts.toJSON(result.store), attrsStore: result.attrsStore.toJSON() });
+        const jsonResult = Object.assign(Object.assign({}, result), { store: s.toJSON(result.store), attrsStore: result.attrsStore.toJSON() });
         jsonSub.result = jsonResult;
     }
     return jsonSub;
@@ -483,7 +483,7 @@ class Reactor {
         this._syncTable = new SyncTable_ts_1.SyncTable(this._trySendAuthed.bind(this), new Storage(this.config.appId, 'syncSubs'), {
             useDateObjects: this.config.useDateObjects,
         }, this._log, (triples) => {
-            return sts.createStore(this.ensureAttrs(), triples, this.config.enableCardinalityInference, this.config.useDateObjects);
+            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
@@ -678,7 +678,7 @@ class Reactor {
                 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 attrsStore = this.ensureAttrs();
-                const store = sts.createStore(attrsStore, triples, enableCardinalityInference, this.config.useDateObjects);
+                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 });
@@ -738,7 +738,7 @@ class Reactor {
                     const hash = (0, weakHash_ts_1.default)(q);
                     const triples = (0, instaqlResult_js_1.extractTriples)(result);
                     const attrsStore = this.ensureAttrs();
-                    const store = sts.createStore(attrsStore, triples, enableCardinalityInference, this.config.useDateObjects);
+                    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'];
@@ -794,7 +794,6 @@ class Reactor {
                 if (newAttrs.length) {
                     const existingAttrs = Object.values(this.ensureAttrs().attrs);
                     this._setAttrs([...existingAttrs, ...newAttrs]);
-                    this._setAttrs(newAttrs);
                 }
                 this._finishTransaction('synced', eventId);
                 this._cleanupPendingMutationsTimeout();
@@ -956,7 +955,7 @@ class Reactor {
         this._completeQueryOnce(q, hash, r.dfd);
     }
     _setAttrs(attrs) {
-        this.attrs = new sts.AttrsStoreClass(attrs.reduce((acc, attr) => {
+        this.attrs = new s.AttrsStoreClass(attrs.reduce((acc, attr) => {
             acc[attr.id] = attr;
             return acc;
         }, {}), this._linkIndex);
@@ -1067,7 +1066,7 @@ class Reactor {
     // server attr-ids.
     /**
      *
-     * @param {sts.AttrsStore} attrs
+     * @param {s.AttrsStore} attrs
      * @param {any} muts
      * @param {number} [processedTxId]
      */
@@ -1078,12 +1077,12 @@ class Reactor {
             return new Map();
         const findExistingAttr = (attr) => {
             const [_, etype, label] = attr['forward-identity'];
-            const existing = sts.getAttrByFwdIdentName(attrs, etype, label);
+            const existing = s.getAttrByFwdIdentName(attrs, etype, label);
             return existing;
         };
         const findReverseAttr = (attr) => {
             const [_, etype, label] = attr['forward-identity'];
-            const revAttr = sts.getAttrByReverseIdentName(attrs, etype, label);
+            const revAttr = s.getAttrByReverseIdentName(attrs, etype, label);
             return revAttr;
         };
         const mapping = { attrIdMap: {}, refSwapAttrIds: new Set() };
@@ -1147,7 +1146,7 @@ class Reactor {
     // ---------------------------
     // Transact
     /**
-     * @returns {sts.AttrsStore}
+     * @returns {s.AttrsStore}
      */
     optimisticAttrs() {
         var _a, _b;
@@ -1169,7 +1168,7 @@ class Reactor {
             }
         }
         if (!deletedAttrIds.size && !pendingAttrs.length) {
-            return this.attrs || new sts.AttrsStoreClass({}, this._linkIndex);
+            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) {
@@ -1178,7 +1177,7 @@ class Reactor {
         for (const id of deletedAttrIds) {
             delete attrs[id];
         }
-        return new sts.AttrsStoreClass(attrs, this._linkIndex);
+        return new s.AttrsStoreClass(attrs, this._linkIndex);
     }
     /** Runs instaql on a query and a store */
     dataForQuery(hash) {
@@ -1212,7 +1211,7 @@ class Reactor {
     _applyOptimisticUpdates(store, attrsStore, mutations, processedTxId) {
         for (const [_, mut] of mutations) {
             if (!mut['tx-id'] || (processedTxId && mut['tx-id'] > processedTxId)) {
-                const result = sts.transact(store, attrsStore, mut['tx-steps']);
+                const result = s.transact(store, attrsStore, mut['tx-steps']);
                 store = result.store;
                 attrsStore = result.attrsStore;
             }