localdb-ces6q 0.0.4 → 0.1.0

package/LocalDB.d.ts

@@ -1,5 +1,5 @@
+import { BTree } from 'bplustree-mq4uj/btree.js';
 import { Debounce } from 'util-3gcvv/class/Debounce.js';
-import { SortedArray } from 'util-3gcvv/class/SortedArray.js';
 import { LocalDBState } from './LocalDBState.js';
 import type { KeyOf } from 'util-3gcvv/types/types.js';
 import type { Collection, Collections, CollectionsChange, CollectionsChangeMap, ColListener, DBListener, DocListener, FieldListener, ICollectionConfig, ICollectionsConfig, ICollectionsFields, IDBOperation, IDBOperationHistoryItem, IDBQuery, IDBTxOptions, IDocument } from './types.js';
@@ -13,7 +13,7 @@ export declare class LocalDB<CollectionTypes extends Record<string, IDocument>>
         [ColName in KeyOf<CollectionTypes>]: Debounce<() => void>;
     };
     protected _indexes: {
-        [ColName in KeyOf<CollectionTypes>]: Record<string, SortedArray<CollectionTypes[ColName]>>;
+        [ColName in KeyOf<CollectionTypes>]: Record<string, BTree<CollectionTypes[ColName], CollectionTypes[ColName]>>;
     };
     protected _txChangedFields: CollectionsChangeMap<CollectionTypes>;
     protected _txChanges: CollectionsChange<CollectionTypes>;

package/LocalDB.js

@@ -1,5 +1,5 @@
+import { BTree } from 'bplustree-mq4uj/btree.js';
 import { Debounce } from 'util-3gcvv/class/Debounce.js';
-import { SortedArray } from 'util-3gcvv/class/SortedArray.js';
 import { deepEqual } from 'util-3gcvv/deepEqual.js';
 import { objectEmpty, objectKeys } from 'util-3gcvv/object.js';
 import { randomString } from 'util-3gcvv/string.js';
@@ -57,7 +57,7 @@ export class LocalDB {
         for (let col in this._indexes) {
             const indexes = this._indexes[col];
             for (let name in indexes) {
-                indexes[name].destroy();
+                indexes[name].clear();
             }
         }
         this._indexes = {};
@@ -135,7 +135,14 @@ export class LocalDB {
                 if (!comparator) {
                     throw new Error(`Comparator must be set to index ${col}/${field}`);
                 }
-                fieldIndexes[field] = new SortedArray(docs, (a, b) => comparator(a[field], b[field]));
+                fieldIndexes[field] = new BTree(docs.map((d) => [d, d]), (a, b) => comparator(a[field], b[field]));
+            }
+        }
+        const { indexes } = config;
+        if (indexes) {
+            for (const name in indexes) {
+                const { compare } = indexes[name];
+                fieldIndexes[name] = new BTree(docs.map((d) => [d, d]), compare);
             }
         }
         this._indexes[col] = fieldIndexes;
@@ -287,7 +294,7 @@ export class LocalDB {
         if (!(index in col)) {
             throw new Error(`index ${colName}/${index} not found`);
         }
-        return col[index].array;
+        return col[index].valuesArray();
     }
     query({ collection, orderBy, limit, startAfter, startAt, endAfter, endAt, }) {
         const col = this._indexes[collection];
@@ -296,7 +303,7 @@ export class LocalDB {
         }
         const index = col[orderBy];
         // TODO
-        return index.array;
+        return index.valuesArray();
     }
     //
     // Set / Update
@@ -353,12 +360,12 @@ export class LocalDB {
         // update indexes
         const indexes = this._indexes[colName];
         for (let indexName in indexes) {
-            indexes[indexName].insertOne(next);
+            indexes[indexName].set(next, next, true);
         }
         this._txRollbacks.push(() => {
             const indexes = this._indexes[colName];
             for (let indexName in indexes) {
-                indexes[indexName].removeOne(next);
+                indexes[indexName].delete(next);
             }
         });
         // update undo history
@@ -556,14 +563,14 @@ export class LocalDB {
             // update indexes
             const indexes = this._indexes[colName];
             for (let indexName in indexes) {
-                indexes[indexName].removeOne(prev);
-                indexes[indexName].insertOne(next);
+                indexes[indexName].delete(prev);
+                indexes[indexName].set(next, next, true);
             }
             this._txRollbacks.push(() => {
                 const indexes = this._indexes[colName];
                 for (let indexName in indexes) {
-                    indexes[indexName].removeOne(next);
-                    indexes[indexName].insertOne(prev);
+                    indexes[indexName].delete(next);
+                    indexes[indexName].set(prev, prev, true);
                 }
             });
             // update undo history
@@ -652,14 +659,14 @@ export class LocalDB {
             // update indexes
             const indexes = this._indexes[colName];
             for (let indexName in indexes) {
-                indexes[indexName].removeMany(prevDocs);
-                indexes[indexName].insertMany(nextDocs);
+                indexes[indexName].deleteKeys(prevDocs);
+                indexes[indexName].setPairs(nextDocs.map((doc) => [doc, doc]), true);
             }
             this._txRollbacks.push(() => {
                 const indexes = this._indexes[colName];
                 for (let indexName in indexes) {
-                    indexes[indexName].removeMany(nextDocs);
-                    indexes[indexName].insertMany(prevDocs);
+                    indexes[indexName].deleteKeys(nextDocs);
+                    indexes[indexName].setPairs(prevDocs.map((doc) => [doc, doc]), true);
                 }
             });
             // update undo history
@@ -715,12 +722,12 @@ export class LocalDB {
         // update indexes
         const indexes = this._indexes[colName];
         for (let indexName in indexes) {
-            indexes[indexName].removeOne(prev);
+            indexes[indexName].delete(prev);
         }
         this._txRollbacks.push(() => {
             const indexes = this._indexes[colName];
             for (let indexName in indexes) {
-                indexes[indexName].insertOne(prev);
+                indexes[indexName].set(prev, prev, true);
             }
         });
         // update undo history
@@ -786,12 +793,12 @@ export class LocalDB {
         // update indexes
         const indexes = this._indexes[colName];
         for (let indexName in indexes) {
-            indexes[indexName].removeMany(prevDocs);
+            indexes[indexName].deleteKeys(prevDocs);
         }
         this._txRollbacks.push(() => {
             const indexes = this._indexes[colName];
             for (let indexName in indexes) {
-                indexes[indexName].insertMany(prevDocs);
+                indexes[indexName].setPairs(prevDocs.map((d) => [d, d]), true);
             }
         });
         // update undo history

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "localdb-ces6q",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "description": "TypeScript ECMAScript Module Library Template",
   "type": "module",
   "module": "dist/index.js",
@@ -26,6 +26,7 @@
   },
   "homepage": "https://github.com/joonhocho/localdb#readme",
   "dependencies": {
+    "bplustree-mq4uj": "^0.0.2",
     "util-3gcvv": "^0.4.7"
   },
   "devDependencies": {

package/types.d.ts

@@ -29,12 +29,16 @@ export type ICollectionFieldsConfig<Doc extends IDocument> = {
         index?: 'asc' | 'desc';
     };
 };
+export interface IDocumentIndexConfig<Doc extends IDocument> {
+    fields: Array<KeyOf<Doc>>;
+    compare: (a: Doc, b: Doc) => number;
+}
 export interface ICollectionConfig<CollectionTypes extends Record<string, IDocument>, Doc extends IDocument> {
     localStorageKey?: string;
     localStorageSetWait?: number;
     remoteStorageKey?: string;
     remoteStorageSetWait?: number;
-    indexes?: Array<KeyOf<Doc> | Array<KeyOf<Doc>>>;
+    indexes?: Record<string, IDocumentIndexConfig<Doc>>;
     idFields?: Array<KeyOf<Doc>>;
     fields: ICollectionFieldsConfig<Doc>;
     computes?: Array<{