@signaldb/core 1.5.4 → 1.7.0

package/dist/index4.mjs

@@ -1,69 +1,173 @@
-import createPersistenceAdapter from "./index7.mjs";
-function createTemporaryFallbackExecutor(firstResolvingPromiseFunction, secondResolvingPromiseFunction, options) {
-  const cacheTimeout = options == null ? void 0 : options.cacheTimeout;
-  let isResolved = false;
-  let resolvedValue = null;
-  let timeout = null;
-  let secondaryPromise = null;
-  return (...args) => {
-    if (secondaryPromise == null) {
-      if (timeout) {
-        clearTimeout(timeout);
-        timeout = null;
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import ReplicatedCollection from "./index23.mjs";
+import createSignal from "./index21.mjs";
+class AutoFetchCollection extends ReplicatedCollection {
+  /**
+   * @param options {Object} - Options for the collection.
+   * @param options.fetchQueryItems {Function} - A function that fetches items from the server. It takes the selector as an argument and returns a promise that resolves to an object with an `items` property.
+   * @param options.purgeDelay {Number} - The delay in milliseconds before purging an item from the cache.
+   */
+  constructor(options) {
+    let triggerRemoteChange;
+    super({
+      ...options,
+      pull: () => Promise.resolve({
+        items: [...this.itemsCache.values()].reduce((memo, items) => {
+          const newItems = [...memo];
+          items.forEach((item) => {
+            const index = newItems.findIndex((i) => i.id === item.id);
+            if (index === -1) {
+              newItems.push(item);
+              return;
+            }
+            newItems[index] = this.mergeItems(newItems[index], item);
+          });
+          return newItems;
+        }, [])
+      }),
+      registerRemoteChange: async (onChange) => {
+        triggerRemoteChange = onChange;
       }
-      secondaryPromise = secondResolvingPromiseFunction(...args).then((result) => {
-        {
-          timeout = setTimeout(() => {
-            isResolved = false;
-            resolvedValue = null;
-            secondaryPromise = null;
-          }, cacheTimeout);
-        }
-        isResolved = true;
-        resolvedValue = result;
-        if (options == null ? void 0 : options.onResolve)
-          options.onResolve(resolvedValue);
-        return result;
-      });
-    } else if (isResolved) {
-      return secondaryPromise;
+    });
+    __publicField(this, "activeObservers", /* @__PURE__ */ new Map());
+    __publicField(this, "observerTimeouts", /* @__PURE__ */ new Map());
+    __publicField(this, "purgeDelay");
+    __publicField(this, "idQueryCache", /* @__PURE__ */ new Map());
+    __publicField(this, "itemsCache", /* @__PURE__ */ new Map());
+    __publicField(this, "fetchQueryItems");
+    __publicField(this, "triggerReload", null);
+    __publicField(this, "reactivityAdapter", null);
+    __publicField(this, "loadingSignals", /* @__PURE__ */ new Map());
+    __publicField(this, "isFetchingSignal");
+    __publicField(this, "mergeItems");
+    this.mergeItems = options.mergeItems ?? ((itemA, itemB) => ({ ...itemA, ...itemB }));
+    this.purgeDelay = options.purgeDelay ?? 1e4;
+    this.isFetchingSignal = createSignal(options.reactivity, false);
+    if (!triggerRemoteChange)
+      throw new Error("No triggerRemoteChange method found. Looks like your persistence adapter was not registered");
+    this.triggerReload = triggerRemoteChange;
+    this.reactivityAdapter = options.reactivity ?? null;
+    this.fetchQueryItems = options.fetchQueryItems;
+    this.on("observer.created", (selector) => this.handleObserverCreation(selector ?? {}));
+    this.on("observer.disposed", (selector) => setTimeout(() => this.handleObserverDisposal(selector ?? {}), 100));
+    if (options.registerRemoteChange) {
+      void options.registerRemoteChange(() => this.forceRefetch());
     }
-    return firstResolvingPromiseFunction(...args);
-  };
-}
-function combinePersistenceAdapters(slowAdapter, fastAdapter) {
-  let handleChange = null;
-  const readExecutor = createTemporaryFallbackExecutor(() => fastAdapter.load(), () => slowAdapter.load(), {
-    cacheTimeout: 100,
-    onResolve: (result) => {
-      var _a, _b, _c;
-      if (handleChange)
-        void handleChange();
-      void fastAdapter.save(result.items || [], {
-        added: ((_a = result.changes) == null ? void 0 : _a.added) || [],
-        modified: ((_b = result.changes) == null ? void 0 : _b.modified) || [],
-        removed: ((_c = result.changes) == null ? void 0 : _c.removed) || []
+  }
+  /**
+   * Registers a query manually that items should be fetched for it
+   * @param selector {Object} Selector of the query
+   */
+  registerQuery(selector) {
+    this.handleObserverCreation(selector);
+  }
+  /**
+   * Unregisters a query manually that items are not fetched anymore for it
+   * @param selector {Object} Selector of the query
+   */
+  unregisterQuery(selector) {
+    this.handleObserverDisposal(selector);
+  }
+  getKeyForSelector(selector) {
+    return JSON.stringify(selector);
+  }
+  async forceRefetch() {
+    return Promise.all([...this.activeObservers.values()].map(({ selector }) => this.fetchSelector(selector))).then(() => {
+    });
+  }
+  fetchSelector(selector) {
+    this.isFetchingSignal.set(true);
+    return this.fetchQueryItems(selector).then((response) => {
+      if (!response.items)
+        throw new Error("AutoFetchCollection currently only works with a full item response");
+      this.itemsCache.set(this.getKeyForSelector(selector), response.items);
+      response.items.forEach((item) => {
+        const queries = this.idQueryCache.get(item.id) ?? [];
+        queries.push(selector);
+        this.idQueryCache.set(item.id, queries);
+      });
+      this.setLoading(selector, true);
+      this.once("persistence.received", () => {
+        this.setLoading(selector, false);
       });
+      if (!this.triggerReload)
+        throw new Error("No triggerReload method found. Looks like your persistence adapter was not registered");
+      void this.triggerReload();
+    }).catch((error) => {
+      this.emit("persistence.error", error);
+    }).finally(() => {
+      this.isFetchingSignal.set(false);
+    });
+  }
+  handleObserverCreation(selector) {
+    var _a;
+    const activeObservers = ((_a = this.activeObservers.get(this.getKeyForSelector(selector))) == null ? void 0 : _a.count) ?? 0;
+    this.activeObservers.set(this.getKeyForSelector(selector), {
+      selector,
+      count: activeObservers + 1
+    });
+    const timeout = this.observerTimeouts.get(this.getKeyForSelector(selector));
+    if (timeout)
+      clearTimeout(timeout);
+    if (activeObservers === 0)
+      void this.fetchSelector(selector);
+  }
+  handleObserverDisposal(selector) {
+    var _a;
+    const currentObservers = ((_a = this.activeObservers.get(this.getKeyForSelector(selector))) == null ? void 0 : _a.count) ?? 0;
+    const activeObservers = currentObservers - 1;
+    if (activeObservers > 0) {
+      this.activeObservers.set(this.getKeyForSelector(selector), {
+        selector,
+        count: activeObservers
+      });
+      return;
+    }
+    const timeout = this.observerTimeouts.get(this.getKeyForSelector(selector));
+    if (timeout)
+      clearTimeout(timeout);
+    const removeObserver = () => {
+      this.activeObservers.delete(this.getKeyForSelector(selector));
+      this.itemsCache.delete(this.getKeyForSelector(selector));
+      if (!this.triggerReload)
+        throw new Error("No triggerReload method found. Looks like your persistence adapter was not registered");
+      void this.triggerReload();
+    };
+    if (this.purgeDelay === 0) {
+      removeObserver();
+      return;
+    }
+    this.observerTimeouts.set(this.getKeyForSelector(selector), setTimeout(removeObserver, this.purgeDelay));
+  }
+  ensureSignal(selector) {
+    if (!this.reactivityAdapter)
+      throw new Error("No reactivity adapter found");
+    if (!this.loadingSignals.has(this.getKeyForSelector(selector))) {
+      this.loadingSignals.set(this.getKeyForSelector(selector), createSignal(this.reactivityAdapter, false));
     }
-  });
-  return createPersistenceAdapter({
-    async register(onChange) {
-      handleChange = onChange;
-      await Promise.all([slowAdapter.register(onChange), fastAdapter.register(onChange)]);
-    },
-    async load() {
-      const promise = readExecutor();
-      return promise;
-    },
-    async save(items, changes) {
-      await Promise.all([
-        fastAdapter.save(items, changes),
-        slowAdapter.save(items, changes)
-      ]);
+    return this.loadingSignals.get(this.getKeyForSelector(selector));
+  }
+  setLoading(selector, value) {
+    const signal = this.ensureSignal(selector);
+    signal.set(value);
+  }
+  /**
+   * Indicates wether a query is currently been loaded
+   * ⚡️ this function is reactive!
+   * @param selector {Object} Selector of the query
+   * @returns The loading state
+   */
+  isLoading(selector) {
+    const isPushing = this.isPushing();
+    if (!selector) {
+      return this.isFetchingSignal.get() || isPushing;
     }
-  });
+    const signal = this.ensureSignal(selector);
+    return signal.get() || isPushing;
+  }
 }
 export {
-  createTemporaryFallbackExecutor,
-  combinePersistenceAdapters as default
+  AutoFetchCollection as default
 };

package/dist/index5.mjs

@@ -1,6 +1,69 @@
-function createIndexProvider(definition) {
-  return definition;
+import createPersistenceAdapter from "./index8.mjs";
+function createTemporaryFallbackExecutor(firstResolvingPromiseFunction, secondResolvingPromiseFunction, options) {
+  const cacheTimeout = options == null ? void 0 : options.cacheTimeout;
+  let isResolved = false;
+  let resolvedValue = null;
+  let timeout = null;
+  let secondaryPromise = null;
+  return (...args) => {
+    if (secondaryPromise == null) {
+      if (timeout) {
+        clearTimeout(timeout);
+        timeout = null;
+      }
+      secondaryPromise = secondResolvingPromiseFunction(...args).then((result) => {
+        {
+          timeout = setTimeout(() => {
+            isResolved = false;
+            resolvedValue = null;
+            secondaryPromise = null;
+          }, cacheTimeout);
+        }
+        isResolved = true;
+        resolvedValue = result;
+        if (options == null ? void 0 : options.onResolve)
+          options.onResolve(resolvedValue);
+        return result;
+      });
+    } else if (isResolved) {
+      return secondaryPromise;
+    }
+    return firstResolvingPromiseFunction(...args);
+  };
+}
+function combinePersistenceAdapters(slowAdapter, fastAdapter) {
+  let handleChange = null;
+  const readExecutor = createTemporaryFallbackExecutor(() => fastAdapter.load(), () => slowAdapter.load(), {
+    cacheTimeout: 100,
+    onResolve: (result) => {
+      var _a, _b, _c;
+      if (handleChange)
+        void handleChange();
+      void fastAdapter.save(result.items || [], {
+        added: ((_a = result.changes) == null ? void 0 : _a.added) || [],
+        modified: ((_b = result.changes) == null ? void 0 : _b.modified) || [],
+        removed: ((_c = result.changes) == null ? void 0 : _c.removed) || []
+      });
+    }
+  });
+  return createPersistenceAdapter({
+    async register(onChange) {
+      handleChange = onChange;
+      await Promise.all([slowAdapter.register(onChange), fastAdapter.register(onChange)]);
+    },
+    async load() {
+      const promise = readExecutor();
+      return promise;
+    },
+    async save(items, changes) {
+      await Promise.all([
+        fastAdapter.save(items, changes),
+        slowAdapter.save(items, changes)
+      ]);
+    }
+  });
 }
 export {
-  createIndexProvider as default
+  createTemporaryFallbackExecutor,
+  combinePersistenceAdapters as default
 };

package/dist/index6.mjs

@@ -1,6 +1,6 @@
-function createMemoryAdapter(definition) {
+function createIndexProvider(definition) {
   return definition;
 }
 export {
-  createMemoryAdapter as default
+  createIndexProvider as default
 };

package/dist/index7.mjs

@@ -1,6 +1,6 @@
-function createPersistenceAdapter(definition) {
+function createMemoryAdapter(definition) {
   return definition;
 }
 export {
-  createPersistenceAdapter as default
+  createMemoryAdapter as default
 };

package/dist/index8.mjs

@@ -1,6 +1,6 @@
-function createReactivityAdapter(definition) {
+function createPersistenceAdapter(definition) {
   return definition;
 }
 export {
-  createReactivityAdapter as default
+  createPersistenceAdapter as default
 };

package/dist/index9.mjs

@@ -1,30 +1,6 @@
-function isEqual(a, b) {
-  if (Object.is(a, b))
-    return true;
-  if (a instanceof RegExp && b instanceof RegExp)
-    return a.toString() === b.toString();
-  if (a instanceof Date && b instanceof Date)
-    return a.getTime() === b.getTime();
-  if (typeof a !== "object")
-    return false;
-  if (typeof b !== "object")
-    return false;
-  if (a === null)
-    return false;
-  if (b === null)
-    return false;
-  const aKeys = Object.keys(a);
-  const bKeys = Object.keys(b);
-  if (aKeys.length !== bKeys.length)
-    return false;
-  for (const key of aKeys) {
-    if (!bKeys.includes(key))
-      return false;
-    if (!isEqual(a[key], b[key]))
-      return false;
-  }
-  return true;
+function createReactivityAdapter(definition) {
+  return definition;
 }
 export {
-  isEqual as default
+  createReactivityAdapter as default
 };

package/dist/types/IndexProvider.d.ts

@@ -3,10 +3,12 @@ import type { FlatSelector } from './Selector';
 type IndexResult = {
     positions: number[];
     fields: string[];
+    keepSelector?: boolean;
     matched: true;
 } | {
     positions?: never;
     fields?: never;
+    keepSelector?: never;
     matched: false;
 };
 interface IndexProvider<T extends BaseItem<I> = BaseItem, I = any> {

package/dist/types/Modifier.d.ts

@@ -1,39 +1,46 @@
+import type { DotNotation, GetType } from './Selector';
 type Dictionary<T> = Record<string, T>;
-type PartialMapTo<T, M> = Partial<Record<keyof T, M>>;
+type PartialMapTo<T, M> = Partial<Record<DotNotation<T>, M>> & Dictionary<M>;
 type OnlyElementsOfArrays<T> = T extends any[] ? Partial<T[0]> : never;
 type ElementsOf<T> = {
-    [P in keyof T]?: OnlyElementsOfArrays<T[P]>;
+    [P in DotNotation<T>]?: OnlyElementsOfArrays<GetType<T, P>>;
 };
 type PushModifier<T> = {
-    [P in keyof T]?: OnlyElementsOfArrays<T[P]> | {
-        $each?: T[P] | undefined;
+    [P in DotNotation<T>]?: OnlyElementsOfArrays<GetType<T, P>> | {
+        $each?: GetType<T, P> | undefined;
         $position?: number | undefined;
         $slice?: number | undefined;
         $sort?: 1 | -1 | Dictionary<number> | undefined;
     };
 };
 type ArraysOrEach<T> = {
-    [P in keyof T]?: OnlyElementsOfArrays<T[P]> | {
-        $each: T[P];
+    [P in DotNotation<T>]?: OnlyElementsOfArrays<GetType<T, P>> | {
+        $each: GetType<T, P>;
     };
 };
 type CurrentDateModifier = {
     $type: 'timestamp' | 'date';
 } | true;
 type Modifier<T extends Dictionary<any> = Dictionary<any>> = {
-    $currentDate?: (Partial<Record<keyof T, CurrentDateModifier>> & Dictionary<CurrentDateModifier>) | undefined;
+    $currentDate?: (Partial<Record<DotNotation<T>, CurrentDateModifier>> & Dictionary<CurrentDateModifier>) | undefined;
     $inc?: (PartialMapTo<T, number> & Dictionary<number>) | undefined;
     $min?: (PartialMapTo<T, Date | number> & Dictionary<Date | number>) | undefined;
     $max?: (PartialMapTo<T, Date | number> & Dictionary<Date | number>) | undefined;
     $mul?: (PartialMapTo<T, number> & Dictionary<number>) | undefined;
     $rename?: (PartialMapTo<T, string> & Dictionary<string>) | undefined;
-    $set?: (Partial<T> & Dictionary<any>) | undefined;
-    $setOnInsert?: (Partial<T> & Dictionary<any>) | undefined;
+    $set?: ({
+        [P in DotNotation<T>]?: GetType<T, P>;
+    } & Dictionary<any>) | undefined;
+    $setOnInsert?: ({
+        [P in DotNotation<T>]?: GetType<T, P>;
+    } & Dictionary<any>) | undefined;
     $unset?: (PartialMapTo<T, string | boolean | 1 | 0> & Dictionary<any>) | undefined;
     $addToSet?: (ArraysOrEach<T> & Dictionary<any>) | undefined;
     $push?: (PushModifier<T> & Dictionary<any>) | undefined;
     $pull?: (ElementsOf<T> & Dictionary<any>) | undefined;
-    $pullAll?: (Partial<T> & Dictionary<any>) | undefined;
+    $pullAll?: ({
+        [P in DotNotation<T>]?: GetType<T, P>;
+    } & Dictionary<any>) | undefined;
     $pop?: (PartialMapTo<T, 1 | -1> & Dictionary<1 | -1>) | undefined;
 };
 export default Modifier;

package/dist/types/Selector.d.ts

@@ -14,13 +14,7 @@ export interface FieldExpression<T> {
     $mod?: number[];
     $regex?: RegExp | string;
     $options?: string;
-    $text?: {
-        $search: string;
-        $language?: string;
-        $caseSensitive?: boolean;
-        $diacriticSensitive?: boolean;
-    };
-    $where?: string | ((item: T) => boolean);
+    $where?: string | ((this: T) => boolean);
     $all?: T[];
     $elemMatch?: T extends object ? Query<T> : FieldExpression<T>;
     $size?: number;

package/dist/utils/getMatchingKeys.d.ts

@@ -1,8 +1,8 @@
 import type { BaseItem } from '../Collection/types';
 import type { FlatSelector } from '../types/Selector';
 type KeyResult = {
-    include: string[] | null;
-    exclude: string[] | null;
+    include: (string | null)[] | null;
+    exclude: (string | null)[] | null;
 };
 /**
  * Extracts the matching and excluded keys for a given field in a selector.

package/dist/utils/serializeValue.d.ts

@@ -9,4 +9,4 @@
  *   - Other values are stringified using `JSON.stringify`.
  * @returns A string representation of the value.
  */
-export default function serializeValue(value: any): string;
+export default function serializeValue(value: any): string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signaldb/core",
-  "version": "1.5.4",
+  "version": "1.7.0",
   "description": "SignalDB is a client-side database that provides a simple MongoDB-like interface to the data with first-class typescript support to achieve an optimistic UI. Data persistence can be achieved by using storage providers that store the data through a JSON interface to places such as localStorage.",
   "scripts": {
     "build": "rimraf dist && vite build",