@arcote.tech/arc 0.0.21 → 0.0.23

package/dist/collection/collection.d.ts

@@ -3,6 +3,7 @@ import type { ArcIdAny } from "../elements/id";
 import { type ArcObjectAny } from "../elements/object";
 import { objectUtil, type DeepPartial, type util } from "../utils";
 import type { DataStorage } from "../data-storage";
+import type { IndexQueryArgument } from "../db";
 import { ArcAllItemsQueryBuilder } from "./query-builders/all-items";
 import { ArcIndexedItemsQueryBuilder } from "./query-builders/indexed";
 import { ArcOneItemQueryBuilder } from "./query-builders/one-item";
@@ -27,6 +28,11 @@ type CollectionCommandContext<Id extends ArcIdAny, Schema extends ArcObjectAny>
     edit: (id: util.GetType<Id>, editCallback: (item: Deserialize<Id, Schema>) => Promise<void> | void) => Promise<void>;
     modify: (id: util.GetType<Id>, data: objectUtil.addQuestionMarks<DeepPartial<util.FirstArgument<Schema["serialize"]>>>) => Promise<any>;
 };
+type IndexValue<Schema extends ArcObjectAny, Indexes extends keyof ReturnType<Schema["deserialize"]>, I extends {
+    [name: string]: Indexes[];
+}, func extends keyof I> = {
+    [Key in I[func][number]]: util.GetType<Schema>[Key];
+};
 export declare class ArcCollection<Name extends string, Id extends ArcIdAny, Schema extends ArcObjectAny> extends ArcContextElement<{
     type: "delete";
     from: CollectionItem<ArcCollection<Name, Id, Schema>>;
@@ -68,14 +74,10 @@ export declare class ArcIndexedCollection<Name extends string, Id extends ArcIdA
     readonly indexes: I;
     constructor(name: Name, id: Id, schema: Schema, options: ArcCollectionOptions<Id, Schema>, indexes: I);
     commandContext(dataStorage: DataStorage, publishEvent: (event: this["$event"]) => Promise<void>): CollectionCommandContext<Id, Schema> & {
-        [func in keyof I]: (args: {
-            [Key in I[func][number]]: util.GetType<Schema>[Key];
-        }) => Deserialize<Id, Schema>[];
+        [func in keyof I]: (args: IndexValue<Schema, Indexes, I, func>) => Deserialize<Id, Schema>[];
     };
     queryBuilder(): CollectionQueryBuilder<ArcCollection<Name, Id, Schema>> & {
-        [func in keyof I]: (args: {
-            [Key in I[func][number]]: util.GetType<Schema>[Key];
-        }) => ArcIndexedItemsQueryBuilder<ArcIndexedCollection<Name, Id, Schema, Indexes, I>>;
+        [func in keyof I]: (args: objectUtil.simplify<IndexQueryArgument<objectUtil.simplify<IndexValue<Schema, Indexes, I, func>>>>) => ArcIndexedItemsQueryBuilder<ArcIndexedCollection<Name, Id, Schema, Indexes, I>>;
     };
 }
 export type ArcCollectionAny = ArcCollection<any, any, any>;

package/dist/collection/queries/abstract-many-items.d.ts

@@ -5,7 +5,7 @@ import { ArcCollectionQuery } from "./abstract-collection-query";
 export declare class QueryCollectionResult<C extends ArcCollectionAny> {
     private result;
     constructor(result: CollectionItem<C>[]);
-    get(id: util.GetType<C["id"]>): ({
+    get(id: util.GetType<C["id"]> | null): ({
         _id: string;
     } & ReturnType<C["deserialize"]> extends infer T ? { [KeyType in keyof T]: ({
         _id: string;

package/dist/data-storage/data-storage-forked.d.ts

@@ -9,7 +9,7 @@ export declare class ForkedDataStorage extends DataStorage {
     getReadWriteTransaction(): Promise<ReadWriteTransaction>;
     getStore<Item extends {
         _id: string;
-    }>(storeName: string, deserialize?: (data: any) => Item): StoreState<Item>;
+    }>(storeName: string): StoreState<Item>;
     fork(): ForkedDataStorage;
     merge(): Promise<void>;
 }

package/dist/data-storage/data-storage.abstract.d.ts

@@ -5,7 +5,7 @@ import type { StoreState } from "./store-state.abstract";
 export declare abstract class DataStorage {
     abstract getStore<Item extends {
         _id: string;
-    }>(storeName: string, deserialize?: (data: any) => Item): StoreState<Item>;
+    }>(storeName: string): StoreState<Item>;
     abstract fork(): ForkedDataStorage;
     abstract getReadTransaction(): Promise<ReadTransaction>;
     abstract getReadWriteTransaction(): Promise<ReadWriteTransaction>;

package/dist/data-storage/store-state-fork.d.ts

@@ -6,7 +6,7 @@ export declare class ForkedStoreState<Item extends {
     master: StoreState<Item>;
     protected changedItems: Map<string, Item | null>;
     changes: StoreStateChange<Item>[];
-    constructor(storeName: string, dataStorage: DataStorage, master: StoreState<Item>, deserialize?: (data: any) => Item);
+    constructor(storeName: string, dataStorage: DataStorage, master: StoreState<Item>);
     applyChangeAndReturnEvent(change: StoreStateChange<Item>): Promise<{
         from: Item | null;
         to: Item | null;

package/dist/data-storage/store-state.abstract.d.ts

@@ -5,7 +5,7 @@ export declare abstract class StoreState<Item extends {
 }> {
     storeName: string;
     protected dataStorage: DataStorage;
-    protected deserialize?: ((data: any) => Item) | undefined;
+    deserialize?: ((data: any) => Item) | undefined;
     protected listeners: Map<QueryListenerCallback<Item>, QueryListener<Item>>;
     constructor(storeName: string, dataStorage: DataStorage, deserialize?: ((data: any) => Item) | undefined);
     abstract applyChange(change: StoreStateChange<Item>): Promise<{

package/dist/db/interface.d.ts

@@ -1,7 +1,21 @@
 import type { ArcContextAny } from "../context";
+export type IndexQueryArgument<T> = T | ({
+    $gt?: T;
+    $gte?: T;
+    $lt?: T;
+    $lte?: T;
+} & ({
+    $gt: T;
+} | {
+    $gte: T;
+} | {
+    $lt: T;
+} | {
+    $lte: T;
+}));
 export interface ReadTransaction {
     findById(store: string, id: any): Promise<any | undefined>;
-    findByIndex(store: string, index: string, data: any): Promise<any[]>;
+    findByIndex(store: string, index: string, data: IndexQueryArgument<any>): Promise<any[]>;
     findAll(store: string): Promise<any[]>;
 }
 export interface ReadWriteTransaction extends ReadTransaction {

package/dist/index.js

@@ -55,7 +55,7 @@ class QueryCollectionResult {
     this.result = result;
   }
   get(id) {
-    return this.result.find((r) => r._id === id);
+    return id ? this.result.find((r) => r._id === id) : undefined;
   }
   map(callbackfn) {
     return this.result.map(callbackfn);
@@ -358,7 +358,7 @@ class ArcIndexedCollection extends ArcCollection {
         if (!(name in this.indexes)) {
           throw new Error(`Index "${name}" not found in collection "${this.name}"`);
         }
-        return (data) => dataStorage.getStore(this.name, this.deserialize.bind(this)).findByIndex(name, data);
+        return (data) => dataStorage.getStore(this.name).findByIndex(name, data);
       }
     });
   }
@@ -490,7 +490,7 @@ class StoreState {
     this.deserialize = deserialize;
   }
   fork() {
-    return new ForkedStoreState(this.storeName, this.dataStorage, this, this.deserialize);
+    return new ForkedStoreState(this.storeName, this.dataStorage, this);
   }
   async set(item) {
     const change = {
@@ -543,8 +543,8 @@ class ForkedStoreState extends StoreState {
   master;
   changedItems = new Map;
   changes = [];
-  constructor(storeName, dataStorage, master, deserialize) {
-    super(storeName, dataStorage, deserialize);
+  constructor(storeName, dataStorage, master) {
+    super(storeName, dataStorage, master.deserialize);
     this.master = master;
   }
   async applyChangeAndReturnEvent(change) {
@@ -677,11 +677,11 @@ class ForkedDataStorage extends DataStorage {
   getReadWriteTransaction() {
     return this.master.getReadWriteTransaction();
   }
-  getStore(storeName, deserialize) {
+  getStore(storeName) {
     if (this.stores.has(storeName))
       return this.stores.get(storeName);
-    const masterStorage = this.master.getStore(storeName, deserialize);
-    const storage = new ForkedStoreState(storeName, this, masterStorage, deserialize);
+    const masterStorage = this.master.getStore(storeName);
+    const storage = new ForkedStoreState(storeName, this, masterStorage);
     this.stores.set(storeName, storage);
     return storage;
   }
@@ -786,6 +786,8 @@ class MasterStoreState extends StoreState {
     }
   }
   async findById(id, listener) {
+    if (!id)
+      return;
     if (listener)
       this.listeners.set(listener, { callback: listener, id });
     if (this.items.has(id))
@@ -1240,28 +1242,18 @@ class RTCClient {
     }
     const { results, syncDate } = await response.json();
     const pendingStoreChanges = [];
+    const transaction = await this.storage.getReadWriteTransaction();
     for (const { store, items } of results) {
       this.syncProgressCallback?.({ store, size: items.length });
-      const storeState = this.storage.getStore(store);
-      if (!storeState) {
-        console.error(`Store ${store} not found`);
-        continue;
-      }
-      const changes = items.map((item) => {
+      for (const item of items) {
         if (item.deleted) {
-          return {
-            type: "delete",
-            id: item._id
-          };
+          await transaction.remove(store, item._id);
+        } else {
+          await transaction.set(store, item);
         }
-        return {
-          type: "set",
-          data: item
-        };
-      });
-      pendingStoreChanges.push(storeState.applyChanges(changes));
+      }
     }
-    await Promise.all(pendingStoreChanges);
+    await transaction.commit();
     const stateStorage = this.storage.getStore("state");
     await stateStorage.applyChanges([
       {

package/dist/tests/query-notification-optimization.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=query-notification-optimization.test.d.ts.map

package/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "private": false,
   "author": "Przemysław Krasiński [arcote.tech]",
   "description": "Arc is a framework designed to align code closely with business logic, streamlining development and enhancing productivity.",