@shihengtech/utils 0.0.2 → 0.0.4

package/{dist → es}/index.js

@@ -1,6 +1,43 @@
 import localforage from 'localforage';
 import { equals } from 'ramda';
 
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+
 // src/class/ReplaySubject/index.ts
 var ReplaySubject = class {
   constructor(maxBufferSize = 1) {
@@ -26,23 +63,27 @@ var ReplaySubject = class {
 };
 
 // src/utils/fnRunner/index.ts
-async function fnRunner(fn, retryTimes = 0) {
-  const times = (retryTimes || 0) + 1;
-  for (let i = 0; i < times; i++) {
-    try {
-      return await fn();
-    } catch (error) {
-      if (i === times - 1) {
-        throw error;
+function fnRunner(fn, retryTimes = 0) {
+  return __async(this, null, function* () {
+    const times = (retryTimes || 0) + 1;
+    for (let i = 0; i < times; i++) {
+      try {
+        return yield fn();
+      } catch (error) {
+        if (i === times - 1) {
+          throw error;
+        }
       }
     }
-  }
-  throw new Error("fnRunner: Unexpected error - all retries exhausted.");
+    throw new Error("fnRunner: Unexpected error - all retries exhausted.");
+  });
 }
 
 // src/utils/createQueryWithCache/index.ts
+var DB_NAME = "sh-cache-common";
 var db = localforage.createInstance({
-  name: "sh-common-cache"
+  name: DB_NAME,
+  storeName: "main-store"
   // driver: [localforage.LOCALSTORAGE, localforage.INDEXEDDB, localforage.WEBSQL],
 });
 function createQueryWithCache(key, fn, options) {
@@ -58,21 +99,20 @@ function createQueryWithCache(key, fn, options) {
     onSuccess,
     onError,
     errorHandler
-  } = {
+  } = __spreadValues({
     equals: (a, b) => a.length === b.length && a.every((item, index) => item === b[index]),
     retry: 0,
     compareBeforeUpdate: equals,
-    remoteMemoryCache: false,
-    ...options
-  };
+    remoteMemoryCache: false
+  }, options);
   const cacheUpdateSubject = new ReplaySubject(1);
-  const getLocalCache = async (args) => {
-    const cache = await db.getItem(key);
+  const getLocalCache = (args) => __async(null, null, function* () {
+    const cache = yield db.getItem(key);
     if (cache && (!version2 || cache.version === version2) && (!cache.expires || cache.expires > Date.now()) && equals$1(cache.args, args)) {
       return cache.result;
     }
     throw new Error("Cache not found");
-  };
+  });
   const remoteResultCache = {
     success: false,
     args: [],
@@ -102,22 +142,20 @@ function createQueryWithCache(key, fn, options) {
     }).catch(clearMemoryCache);
     return { type: "remote", promiseResult: result };
   };
-  const queryRemote = async (args) => {
+  const queryRemote = (args) => __async(null, null, function* () {
     const rs = {
       type: "remote",
       result: null
     };
     try {
       const { type, promiseResult } = queryWithMemoryCache(args);
-      const result = rs.result = await promiseResult;
-      type === "remote" && (!cacheEnabled || await cacheEnabled(args)) && Promise.resolve().then(async () => {
-        const oldCache = await getLocalCache(args).catch(() => null);
-        const cacheData = {
+      const result = rs.result = yield promiseResult;
+      type === "remote" && (!cacheEnabled || (yield cacheEnabled(args))) && Promise.resolve().then(() => __async(null, null, function* () {
+        const oldCache = yield getLocalCache(args).catch(() => null);
+        const cacheData = __spreadValues(__spreadValues({
           args,
-          result,
-          ...version2 && { version: version2 },
-          ...maxAge && { expires: Date.now() + maxAge }
-        };
+          result
+        }, version2 && { version: version2 }), maxAge && { expires: Date.now() + maxAge });
         db.setItem(key, cacheData);
         if (compareBeforeUpdate && oldCache && compareBeforeUpdate(oldCache.result, result)) {
           return;
@@ -127,53 +165,54 @@ function createQueryWithCache(key, fn, options) {
           cacheData,
           isCacheHit: !!oldCache
         });
-      });
+      }));
     } catch (error) {
       if (errorHandler) {
-        rs.result = await errorHandler(error);
+        rs.result = yield errorHandler(error);
       } else {
         throw error;
       }
     }
     return rs.result;
-  };
-  const _fn = async (...args) => {
-    await beforeRequest?.();
+  });
+  const _fn = (...args) => __async(null, null, function* () {
+    yield beforeRequest == null ? void 0 : beforeRequest();
     const [cacheResult, remoteResult] = [
       getLocalCache(args),
       queryRemote(args)
     ];
     cacheResult.then(
-      (result2) => onSuccess?.({
+      (result2) => onSuccess == null ? void 0 : onSuccess({
         type: "local",
         result: result2
       })
     ).catch(() => {
     });
     remoteResult.then(
-      (result2) => onSuccess?.({
+      (result2) => onSuccess == null ? void 0 : onSuccess({
         type: "remote",
         result: result2
       })
-    ).catch((error) => onError?.(error)).catch(() => {
+    ).catch((error) => onError == null ? void 0 : onError(error)).catch(() => {
     });
-    const result = await Promise.race([
+    const result = yield Promise.race([
       cacheResult.catch(() => remoteResult),
       remoteResult
     ]);
     return result;
-  };
+  });
   _fn.subscribeCacheUpdate = (fn2) => cacheUpdateSubject.subscribe(fn2);
-  _fn.clearCache = async () => {
+  _fn.clearCache = () => __async(null, null, function* () {
     clearMemoryCache();
-    await db.removeItem(key);
-  };
+    yield db.removeItem(key);
+  });
   return _fn;
 }
 createQueryWithCache.useDb = (newDb) => {
   if (typeof newDb === "string") {
     db = localforage.createInstance({
-      name: newDb
+      name: DB_NAME,
+      storeName: newDb
     });
   } else {
     db = newDb;
@@ -181,7 +220,7 @@ createQueryWithCache.useDb = (newDb) => {
 };
 
 // src/index.ts
-var version = "0.0.2";
+var version = "0.0.3";
 
 export { ReplaySubject, createQueryWithCache, fnRunner, version };
 //# sourceMappingURL=index.js.map

package/es/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/class/ReplaySubject/index.ts","../src/utils/fnRunner/index.ts","../src/utils/createQueryWithCache/index.ts","../src/index.ts"],"names":["version","equals","deepEquals","result","fn"],"mappings":"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","file":"index.js","sourcesContent":["class ReplaySubject<T> {\n  private maxBufferSize: number\n  private buffer: T[] = []\n\n  private subscriptions: ((data: T) => void)[] = []\n\n  constructor(maxBufferSize = 1) {\n    this.maxBufferSize = maxBufferSize\n  }\n\n  subscribe(fn: (data: T) => void) {\n    this.subscriptions.push(fn)\n    this.buffer.forEach(data => fn(data))\n    return () => this.unsubscribe(fn)\n  }\n\n  unsubscribe(fn: (data: T) => void) {\n    this.subscriptions = this.subscriptions.filter(f => f !== fn)\n  }\n\n  next(data: T) {\n    this.subscriptions.forEach(fn => fn(data))\n    this.buffer.push(data)\n    if (this.buffer.length > this.maxBufferSize) {\n      this.buffer = this.buffer.slice(1)\n    }\n  }\n}\n\nexport { ReplaySubject }\n","export async function fnRunner<T extends (...args: any[]) => Promise<any>>(fn: T, retryTimes: number = 0): Promise<Awaited<ReturnType<T>>> {\n  const times = (retryTimes || 0) + 1\n  for (let i = 0; i < times; i++) {\n    try {\n      return await fn()\n    }\n    catch (error) {\n      // Only throw if this was the last attempt\n      if (i === times - 1) {\n        throw error\n      }\n    }\n  }\n  // This line should never be reached, but it's required for type safety.\n  throw new Error('fnRunner: Unexpected error - all retries exhausted.')\n}\n","import localforage from 'localforage'\nimport { equals as deepEquals } from 'ramda'\nimport { ReplaySubject } from '../../class'\nimport { fnRunner } from '../fnRunner'\n\ntype DBType = Pick<\n  LocalForage,\n  'getItem' | 'setItem' | 'removeItem' | 'clear'\n  // 这些可以暂时不考虑\n  //  | 'clear' | 'keys' | 'length'\n>\n\nconst DB_NAME = 'sh-cache-common'\n\nlet db: DBType = localforage.createInstance({\n  name: DB_NAME,\n  storeName: 'main-store',\n  // driver: [localforage.LOCALSTORAGE, localforage.INDEXEDDB, localforage.WEBSQL],\n})\n\ninterface CacheItem<T extends (...args: any[]) => Promise<any>> {\n  /** 缓存参数 */\n  args: Parameters<T>\n  /** 缓存版本，用于缓存数据结构变更 */\n  version?: string\n  /** 缓存过期时间，为空表示永不过期 */\n  expires?: number\n  /** 缓存结果 */\n  result: Awaited<ReturnType<T>>\n}\n\ninterface CacheOptions<T extends (...args: any[]) => Promise<any>> {\n  /** 缓存过期时间，为空表示永不过期 */\n  maxAge?: number\n  /** 缓存版本，用于缓存数据结构变更 */\n  version?: string\n  /**\n   * 重试次数，为0表示不重试\n   * @default 0\n   */\n  retry?: number\n  /**\n   * 是否比较旧缓存与新缓存后再触发 onCacheUpdate\n   * 为 true 时，只有当新旧缓存不一致时才触发 onCacheUpdate\n   * 为 false 时，总是触发 onCacheUpdate\n   * @default R.equals\n   */\n  compareBeforeUpdate?:\n    | ((prev: Awaited<ReturnType<T>>, next: Awaited<ReturnType<T>>) => boolean)\n    | false\n  /**\n   * 是否启用远程内存缓存\n   * 为 true 时，启用远程内存缓存\n   * 为 false 时，不启用远程内存缓存\n   * @default false\n   */\n  remoteMemoryCache?: boolean\n  /** @default (a, b) => a.length === b.length && a.every((item, index) => item === b[index]) */\n  equals?: (prev: Parameters<T>, next: Parameters<T>) => boolean\n  /**\n   * 根据入参决定是否添加缓存\n   * 不传的话默认启用缓存\n   */\n  cacheEnabled?: (args: Parameters<T>) => Promise<boolean>\n  /** 请求前回调 */\n  beforeRequest?: () => Promise<void> | void\n  /** 请求成功回调 */\n  onSuccess?: (result: {\n    type: 'local' | 'remote'\n    result: Awaited<ReturnType<T>>\n  }) => void\n  /** 请求错误回调 */\n  onError?: (error: any) => void\n  /** 远程请求错误处理 */\n  errorHandler?: (error: any) => any\n  // /** 缓存更新回调 */\n  // onCacheUpdate?: (\n  //   result: Awaited<ReturnType<T>>,\n  //   cacheData: CacheItem<T>,\n  // ) => void;\n}\n\ninterface CacheUpdateEvent<T extends (...args: any[]) => Promise<any>> {\n  result: Awaited<ReturnType<T>>\n  cacheData: CacheItem<T>\n  isCacheHit: boolean\n}\n\nfunction createQueryWithCache<T extends (...args: any[]) => Promise<any>>(key: string, fn: T, options?: CacheOptions<T>) {\n  const {\n    retry,\n    maxAge,\n    version,\n    compareBeforeUpdate,\n    remoteMemoryCache,\n    equals,\n    cacheEnabled,\n    beforeRequest,\n    onSuccess,\n    onError,\n    errorHandler,\n  } = {\n    equals: (a, b) =>\n      a.length === b.length && a.every((item, index) => item === b[index]),\n    retry: 0,\n    compareBeforeUpdate: deepEquals,\n    remoteMemoryCache: false,\n    ...options,\n  } satisfies CacheOptions<T>\n\n  const cacheUpdateSubject = new ReplaySubject<CacheUpdateEvent<T>>(1)\n\n  const getLocalCache = async (args: Parameters<T>) => {\n    const cache = await db.getItem<CacheItem<T>>(key)\n    if (\n      cache\n      && (!version || cache.version === version)\n      && (!cache.expires || cache.expires > Date.now())\n      && equals(cache.args, args)\n    ) {\n      return cache.result\n    }\n\n    throw new Error('Cache not found')\n  }\n\n  const remoteResultCache: {\n    success: boolean\n    args: Parameters<T>\n    result: ReturnType<T> | null\n  } = {\n    success: false,\n    args: [] as any,\n    result: null,\n  }\n\n  const clearMemoryCache = () => {\n    remoteResultCache.success = false\n    remoteResultCache.result = null\n    remoteResultCache.args = [] as any\n  }\n\n  const queryWithMemoryCache = (args: Parameters<T>) => {\n    if (remoteResultCache.success && equals(remoteResultCache.args, args)) {\n      return {\n        type: 'memory' as const,\n        promiseResult: remoteResultCache.result!,\n      }\n    }\n\n    remoteResultCache.args = args\n    remoteResultCache.success = true\n    const result = (remoteResultCache.result = fnRunner(\n      () => fn(...args),\n      retry,\n    ) as ReturnType<T>)\n\n    Promise.resolve(result)\n      .then((result) => {\n        !remoteMemoryCache && clearMemoryCache()\n        return result\n      })\n      .catch(clearMemoryCache)\n\n    return { type: 'remote' as const, promiseResult: result }\n  }\n\n  const queryRemote = async (args: Parameters<T>) => {\n    const rs = {\n      type: 'remote' as const,\n      result: null as unknown as Awaited<ReturnType<T>>,\n    }\n\n    try {\n      const { type, promiseResult } = queryWithMemoryCache(args)\n      const result = (rs.result = await promiseResult)\n\n      // 设置缓存\n      type === 'remote'\n      && (!cacheEnabled || (await cacheEnabled(args)))\n      && Promise.resolve().then(async () => {\n        const oldCache = await getLocalCache(args).catch(() => null)\n\n        const cacheData = {\n          args,\n          result,\n          ...(version && { version }),\n          ...(maxAge && { expires: Date.now() + maxAge }),\n        }\n        db.setItem(key, cacheData)\n\n        // 如果配置了比较，且旧缓存存在且与新结果相等，则不触发 onCacheUpdate\n        if (\n          compareBeforeUpdate\n          && oldCache\n          && compareBeforeUpdate(oldCache.result, result)\n        ) {\n          return\n        }\n        cacheUpdateSubject.next({\n          result,\n          cacheData,\n          isCacheHit: !!oldCache,\n        })\n      })\n    }\n    catch (error) {\n      if (errorHandler) {\n        rs.result = (await errorHandler(error)) as Awaited<ReturnType<T>>\n      }\n      else {\n        throw error\n      }\n    }\n\n    return rs.result\n  }\n\n  const _fn = async (...args: Parameters<T>) => {\n    await beforeRequest?.()\n\n    const [cacheResult, remoteResult] = [\n      getLocalCache(args),\n      queryRemote(args),\n    ]\n    cacheResult\n      .then(result =>\n        onSuccess?.({\n          type: 'local' as const,\n          result: result as Awaited<ReturnType<T>>,\n        }),\n      )\n      .catch(() => {})\n    remoteResult\n      .then(result =>\n        onSuccess?.({\n          type: 'remote' as const,\n          result: result as Awaited<ReturnType<T>>,\n        }),\n      )\n      .catch(error => onError?.(error))\n      .catch(() => {})\n    const result = await Promise.race([\n      cacheResult.catch(() => remoteResult),\n      remoteResult,\n    ])\n\n    return result\n  }\n\n  _fn.subscribeCacheUpdate = (fn: (data: CacheUpdateEvent<T>) => void) =>\n    cacheUpdateSubject.subscribe(fn)\n\n  _fn.clearCache = async () => {\n    clearMemoryCache()\n    await db.removeItem(key)\n  }\n\n  return _fn\n}\n\n/**\n * 使用自定义数据库实例\n * @param newDb 数据库实例或 storeName，如果为字符串，则使用 localforage 创建一个实例\n */\ncreateQueryWithCache.useDb = <T extends string>(newDb: DBType | (T extends 'main-store' ? never : T)) => {\n  if (typeof newDb === 'string') {\n    db = localforage.createInstance({\n      name: DB_NAME,\n      storeName: newDb,\n    })\n  }\n  else {\n    db = newDb\n  }\n}\n\nexport { createQueryWithCache }\n","/**\n * @shihengtech/utils - A collection of utility functions\n */\n\n// Type checking utilities\nexport * from './class'\nexport * from './utils'\n// Version\nexport const version = '0.0.3'\n"]}

package/{dist → lib}/index.d.ts

@@ -73,15 +73,15 @@ declare function createQueryWithCache<T extends (...args: any[]) => Promise<any>
     clearCache(): Promise<void>;
 };
 declare namespace createQueryWithCache {
-    var useDb: (newDb: DBType | string) => void;
+    var useDb: <T extends string>(newDb: DBType | (T extends "main-store" ? never : T)) => void;
 }
 
-declare function fnRunner<T>(fn: () => Promise<T>, retryTimes?: number): Promise<T>;
+declare function fnRunner<T extends (...args: any[]) => Promise<any>>(fn: T, retryTimes?: number): Promise<Awaited<ReturnType<T>>>;
 
 /**
  * @shihengtech/utils - A collection of utility functions
  */
 
-declare const version = "0.0.2";
+declare const version = "0.0.3";
 
 export { ReplaySubject, createQueryWithCache, fnRunner, version };

package/{dist/index.cjs → lib/index.js}

@@ -7,6 +7,43 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var localforage__default = /*#__PURE__*/_interopDefault(localforage);
 
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+
 // src/class/ReplaySubject/index.ts
 var ReplaySubject = class {
   constructor(maxBufferSize = 1) {
@@ -32,23 +69,27 @@ var ReplaySubject = class {
 };
 
 // src/utils/fnRunner/index.ts
-async function fnRunner(fn, retryTimes = 0) {
-  const times = (retryTimes || 0) + 1;
-  for (let i = 0; i < times; i++) {
-    try {
-      return await fn();
-    } catch (error) {
-      if (i === times - 1) {
-        throw error;
+function fnRunner(fn, retryTimes = 0) {
+  return __async(this, null, function* () {
+    const times = (retryTimes || 0) + 1;
+    for (let i = 0; i < times; i++) {
+      try {
+        return yield fn();
+      } catch (error) {
+        if (i === times - 1) {
+          throw error;
+        }
       }
     }
-  }
-  throw new Error("fnRunner: Unexpected error - all retries exhausted.");
+    throw new Error("fnRunner: Unexpected error - all retries exhausted.");
+  });
 }
 
 // src/utils/createQueryWithCache/index.ts
+var DB_NAME = "sh-cache-common";
 var db = localforage__default.default.createInstance({
-  name: "sh-common-cache"
+  name: DB_NAME,
+  storeName: "main-store"
   // driver: [localforage.LOCALSTORAGE, localforage.INDEXEDDB, localforage.WEBSQL],
 });
 function createQueryWithCache(key, fn, options) {
@@ -64,21 +105,20 @@ function createQueryWithCache(key, fn, options) {
     onSuccess,
     onError,
     errorHandler
-  } = {
+  } = __spreadValues({
     equals: (a, b) => a.length === b.length && a.every((item, index) => item === b[index]),
     retry: 0,
     compareBeforeUpdate: ramda.equals,
-    remoteMemoryCache: false,
-    ...options
-  };
+    remoteMemoryCache: false
+  }, options);
   const cacheUpdateSubject = new ReplaySubject(1);
-  const getLocalCache = async (args) => {
-    const cache = await db.getItem(key);
+  const getLocalCache = (args) => __async(null, null, function* () {
+    const cache = yield db.getItem(key);
     if (cache && (!version2 || cache.version === version2) && (!cache.expires || cache.expires > Date.now()) && equals(cache.args, args)) {
       return cache.result;
     }
     throw new Error("Cache not found");
-  };
+  });
   const remoteResultCache = {
     success: false,
     args: [],
@@ -108,22 +148,20 @@ function createQueryWithCache(key, fn, options) {
     }).catch(clearMemoryCache);
     return { type: "remote", promiseResult: result };
   };
-  const queryRemote = async (args) => {
+  const queryRemote = (args) => __async(null, null, function* () {
     const rs = {
       type: "remote",
       result: null
     };
     try {
       const { type, promiseResult } = queryWithMemoryCache(args);
-      const result = rs.result = await promiseResult;
-      type === "remote" && (!cacheEnabled || await cacheEnabled(args)) && Promise.resolve().then(async () => {
-        const oldCache = await getLocalCache(args).catch(() => null);
-        const cacheData = {
+      const result = rs.result = yield promiseResult;
+      type === "remote" && (!cacheEnabled || (yield cacheEnabled(args))) && Promise.resolve().then(() => __async(null, null, function* () {
+        const oldCache = yield getLocalCache(args).catch(() => null);
+        const cacheData = __spreadValues(__spreadValues({
           args,
-          result,
-          ...version2 && { version: version2 },
-          ...maxAge && { expires: Date.now() + maxAge }
-        };
+          result
+        }, version2 && { version: version2 }), maxAge && { expires: Date.now() + maxAge });
         db.setItem(key, cacheData);
         if (compareBeforeUpdate && oldCache && compareBeforeUpdate(oldCache.result, result)) {
           return;
@@ -133,53 +171,54 @@ function createQueryWithCache(key, fn, options) {
           cacheData,
           isCacheHit: !!oldCache
         });
-      });
+      }));
     } catch (error) {
       if (errorHandler) {
-        rs.result = await errorHandler(error);
+        rs.result = yield errorHandler(error);
       } else {
         throw error;
       }
     }
     return rs.result;
-  };
-  const _fn = async (...args) => {
-    await beforeRequest?.();
+  });
+  const _fn = (...args) => __async(null, null, function* () {
+    yield beforeRequest == null ? void 0 : beforeRequest();
     const [cacheResult, remoteResult] = [
       getLocalCache(args),
       queryRemote(args)
     ];
     cacheResult.then(
-      (result2) => onSuccess?.({
+      (result2) => onSuccess == null ? void 0 : onSuccess({
         type: "local",
         result: result2
       })
     ).catch(() => {
     });
     remoteResult.then(
-      (result2) => onSuccess?.({
+      (result2) => onSuccess == null ? void 0 : onSuccess({
         type: "remote",
         result: result2
       })
-    ).catch((error) => onError?.(error)).catch(() => {
+    ).catch((error) => onError == null ? void 0 : onError(error)).catch(() => {
     });
-    const result = await Promise.race([
+    const result = yield Promise.race([
       cacheResult.catch(() => remoteResult),
       remoteResult
     ]);
     return result;
-  };
+  });
   _fn.subscribeCacheUpdate = (fn2) => cacheUpdateSubject.subscribe(fn2);
-  _fn.clearCache = async () => {
+  _fn.clearCache = () => __async(null, null, function* () {
     clearMemoryCache();
-    await db.removeItem(key);
-  };
+    yield db.removeItem(key);
+  });
   return _fn;
 }
 createQueryWithCache.useDb = (newDb) => {
   if (typeof newDb === "string") {
     db = localforage__default.default.createInstance({
-      name: newDb
+      name: DB_NAME,
+      storeName: newDb
     });
   } else {
     db = newDb;
@@ -187,11 +226,11 @@ createQueryWithCache.useDb = (newDb) => {
 };
 
 // src/index.ts
-var version = "0.0.2";
+var version = "0.0.3";
 
 exports.ReplaySubject = ReplaySubject;
 exports.createQueryWithCache = createQueryWithCache;
 exports.fnRunner = fnRunner;
 exports.version = version;
-//# sourceMappingURL=index.cjs.map
-//# sourceMappingURL=index.cjs.map
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/class/ReplaySubject/index.ts","../src/utils/fnRunner/index.ts","../src/utils/createQueryWithCache/index.ts","../src/index.ts"],"names":["localforage","version","deepEquals","result","fn"],"mappings":"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","file":"index.js","sourcesContent":["class ReplaySubject<T> {\n  private maxBufferSize: number\n  private buffer: T[] = []\n\n  private subscriptions: ((data: T) => void)[] = []\n\n  constructor(maxBufferSize = 1) {\n    this.maxBufferSize = maxBufferSize\n  }\n\n  subscribe(fn: (data: T) => void) {\n    this.subscriptions.push(fn)\n    this.buffer.forEach(data => fn(data))\n    return () => this.unsubscribe(fn)\n  }\n\n  unsubscribe(fn: (data: T) => void) {\n    this.subscriptions = this.subscriptions.filter(f => f !== fn)\n  }\n\n  next(data: T) {\n    this.subscriptions.forEach(fn => fn(data))\n    this.buffer.push(data)\n    if (this.buffer.length > this.maxBufferSize) {\n      this.buffer = this.buffer.slice(1)\n    }\n  }\n}\n\nexport { ReplaySubject }\n","export async function fnRunner<T extends (...args: any[]) => Promise<any>>(fn: T, retryTimes: number = 0): Promise<Awaited<ReturnType<T>>> {\n  const times = (retryTimes || 0) + 1\n  for (let i = 0; i < times; i++) {\n    try {\n      return await fn()\n    }\n    catch (error) {\n      // Only throw if this was the last attempt\n      if (i === times - 1) {\n        throw error\n      }\n    }\n  }\n  // This line should never be reached, but it's required for type safety.\n  throw new Error('fnRunner: Unexpected error - all retries exhausted.')\n}\n","import localforage from 'localforage'\nimport { equals as deepEquals } from 'ramda'\nimport { ReplaySubject } from '../../class'\nimport { fnRunner } from '../fnRunner'\n\ntype DBType = Pick<\n  LocalForage,\n  'getItem' | 'setItem' | 'removeItem' | 'clear'\n  // 这些可以暂时不考虑\n  //  | 'clear' | 'keys' | 'length'\n>\n\nconst DB_NAME = 'sh-cache-common'\n\nlet db: DBType = localforage.createInstance({\n  name: DB_NAME,\n  storeName: 'main-store',\n  // driver: [localforage.LOCALSTORAGE, localforage.INDEXEDDB, localforage.WEBSQL],\n})\n\ninterface CacheItem<T extends (...args: any[]) => Promise<any>> {\n  /** 缓存参数 */\n  args: Parameters<T>\n  /** 缓存版本，用于缓存数据结构变更 */\n  version?: string\n  /** 缓存过期时间，为空表示永不过期 */\n  expires?: number\n  /** 缓存结果 */\n  result: Awaited<ReturnType<T>>\n}\n\ninterface CacheOptions<T extends (...args: any[]) => Promise<any>> {\n  /** 缓存过期时间，为空表示永不过期 */\n  maxAge?: number\n  /** 缓存版本，用于缓存数据结构变更 */\n  version?: string\n  /**\n   * 重试次数，为0表示不重试\n   * @default 0\n   */\n  retry?: number\n  /**\n   * 是否比较旧缓存与新缓存后再触发 onCacheUpdate\n   * 为 true 时，只有当新旧缓存不一致时才触发 onCacheUpdate\n   * 为 false 时，总是触发 onCacheUpdate\n   * @default R.equals\n   */\n  compareBeforeUpdate?:\n    | ((prev: Awaited<ReturnType<T>>, next: Awaited<ReturnType<T>>) => boolean)\n    | false\n  /**\n   * 是否启用远程内存缓存\n   * 为 true 时，启用远程内存缓存\n   * 为 false 时，不启用远程内存缓存\n   * @default false\n   */\n  remoteMemoryCache?: boolean\n  /** @default (a, b) => a.length === b.length && a.every((item, index) => item === b[index]) */\n  equals?: (prev: Parameters<T>, next: Parameters<T>) => boolean\n  /**\n   * 根据入参决定是否添加缓存\n   * 不传的话默认启用缓存\n   */\n  cacheEnabled?: (args: Parameters<T>) => Promise<boolean>\n  /** 请求前回调 */\n  beforeRequest?: () => Promise<void> | void\n  /** 请求成功回调 */\n  onSuccess?: (result: {\n    type: 'local' | 'remote'\n    result: Awaited<ReturnType<T>>\n  }) => void\n  /** 请求错误回调 */\n  onError?: (error: any) => void\n  /** 远程请求错误处理 */\n  errorHandler?: (error: any) => any\n  // /** 缓存更新回调 */\n  // onCacheUpdate?: (\n  //   result: Awaited<ReturnType<T>>,\n  //   cacheData: CacheItem<T>,\n  // ) => void;\n}\n\ninterface CacheUpdateEvent<T extends (...args: any[]) => Promise<any>> {\n  result: Awaited<ReturnType<T>>\n  cacheData: CacheItem<T>\n  isCacheHit: boolean\n}\n\nfunction createQueryWithCache<T extends (...args: any[]) => Promise<any>>(key: string, fn: T, options?: CacheOptions<T>) {\n  const {\n    retry,\n    maxAge,\n    version,\n    compareBeforeUpdate,\n    remoteMemoryCache,\n    equals,\n    cacheEnabled,\n    beforeRequest,\n    onSuccess,\n    onError,\n    errorHandler,\n  } = {\n    equals: (a, b) =>\n      a.length === b.length && a.every((item, index) => item === b[index]),\n    retry: 0,\n    compareBeforeUpdate: deepEquals,\n    remoteMemoryCache: false,\n    ...options,\n  } satisfies CacheOptions<T>\n\n  const cacheUpdateSubject = new ReplaySubject<CacheUpdateEvent<T>>(1)\n\n  const getLocalCache = async (args: Parameters<T>) => {\n    const cache = await db.getItem<CacheItem<T>>(key)\n    if (\n      cache\n      && (!version || cache.version === version)\n      && (!cache.expires || cache.expires > Date.now())\n      && equals(cache.args, args)\n    ) {\n      return cache.result\n    }\n\n    throw new Error('Cache not found')\n  }\n\n  const remoteResultCache: {\n    success: boolean\n    args: Parameters<T>\n    result: ReturnType<T> | null\n  } = {\n    success: false,\n    args: [] as any,\n    result: null,\n  }\n\n  const clearMemoryCache = () => {\n    remoteResultCache.success = false\n    remoteResultCache.result = null\n    remoteResultCache.args = [] as any\n  }\n\n  const queryWithMemoryCache = (args: Parameters<T>) => {\n    if (remoteResultCache.success && equals(remoteResultCache.args, args)) {\n      return {\n        type: 'memory' as const,\n        promiseResult: remoteResultCache.result!,\n      }\n    }\n\n    remoteResultCache.args = args\n    remoteResultCache.success = true\n    const result = (remoteResultCache.result = fnRunner(\n      () => fn(...args),\n      retry,\n    ) as ReturnType<T>)\n\n    Promise.resolve(result)\n      .then((result) => {\n        !remoteMemoryCache && clearMemoryCache()\n        return result\n      })\n      .catch(clearMemoryCache)\n\n    return { type: 'remote' as const, promiseResult: result }\n  }\n\n  const queryRemote = async (args: Parameters<T>) => {\n    const rs = {\n      type: 'remote' as const,\n      result: null as unknown as Awaited<ReturnType<T>>,\n    }\n\n    try {\n      const { type, promiseResult } = queryWithMemoryCache(args)\n      const result = (rs.result = await promiseResult)\n\n      // 设置缓存\n      type === 'remote'\n      && (!cacheEnabled || (await cacheEnabled(args)))\n      && Promise.resolve().then(async () => {\n        const oldCache = await getLocalCache(args).catch(() => null)\n\n        const cacheData = {\n          args,\n          result,\n          ...(version && { version }),\n          ...(maxAge && { expires: Date.now() + maxAge }),\n        }\n        db.setItem(key, cacheData)\n\n        // 如果配置了比较，且旧缓存存在且与新结果相等，则不触发 onCacheUpdate\n        if (\n          compareBeforeUpdate\n          && oldCache\n          && compareBeforeUpdate(oldCache.result, result)\n        ) {\n          return\n        }\n        cacheUpdateSubject.next({\n          result,\n          cacheData,\n          isCacheHit: !!oldCache,\n        })\n      })\n    }\n    catch (error) {\n      if (errorHandler) {\n        rs.result = (await errorHandler(error)) as Awaited<ReturnType<T>>\n      }\n      else {\n        throw error\n      }\n    }\n\n    return rs.result\n  }\n\n  const _fn = async (...args: Parameters<T>) => {\n    await beforeRequest?.()\n\n    const [cacheResult, remoteResult] = [\n      getLocalCache(args),\n      queryRemote(args),\n    ]\n    cacheResult\n      .then(result =>\n        onSuccess?.({\n          type: 'local' as const,\n          result: result as Awaited<ReturnType<T>>,\n        }),\n      )\n      .catch(() => {})\n    remoteResult\n      .then(result =>\n        onSuccess?.({\n          type: 'remote' as const,\n          result: result as Awaited<ReturnType<T>>,\n        }),\n      )\n      .catch(error => onError?.(error))\n      .catch(() => {})\n    const result = await Promise.race([\n      cacheResult.catch(() => remoteResult),\n      remoteResult,\n    ])\n\n    return result\n  }\n\n  _fn.subscribeCacheUpdate = (fn: (data: CacheUpdateEvent<T>) => void) =>\n    cacheUpdateSubject.subscribe(fn)\n\n  _fn.clearCache = async () => {\n    clearMemoryCache()\n    await db.removeItem(key)\n  }\n\n  return _fn\n}\n\n/**\n * 使用自定义数据库实例\n * @param newDb 数据库实例或 storeName，如果为字符串，则使用 localforage 创建一个实例\n */\ncreateQueryWithCache.useDb = <T extends string>(newDb: DBType | (T extends 'main-store' ? never : T)) => {\n  if (typeof newDb === 'string') {\n    db = localforage.createInstance({\n      name: DB_NAME,\n      storeName: newDb,\n    })\n  }\n  else {\n    db = newDb\n  }\n}\n\nexport { createQueryWithCache }\n","/**\n * @shihengtech/utils - A collection of utility functions\n */\n\n// Type checking utilities\nexport * from './class'\nexport * from './utils'\n// Version\nexport const version = '0.0.3'\n"]}

package/package.json

@@ -1,36 +1,39 @@
 {
   "name": "@shihengtech/utils",
-  "type": "module",
-  "version": "0.0.2",
-  "description": "A collection of utility tools",
-  "author": "",
+  "version": "0.0.4",
+  "description": "A collection of utility tools for frontend projects",
+  "author": {
+    "name": "asakura",
+    "email": "csh572078151@gmail.com"
+  },
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": ""
   },
   "keywords": [
-    "tools",
     "utils",
-    "utilities"
+    "utilities",
+    "tools",
+    "shihengtech"
   ],
+  "sideEffects": false,
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
-    }
+      "types": "./lib/index.d.ts",
+      "import": "./es/index.js",
+      "require": "./lib/index.js"
+    },
+    "./package.json": "./package.json"
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./lib/index.js",
+  "module": "./es/index.js",
+  "unpkg": "dist/sh-utils.js",
+  "types": "./lib/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "es",
+    "lib"
   ],
   "engines": {
     "node": ">=16.0.0"
@@ -39,22 +42,10 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "scripts": {
-    "dev": "tsup --watch",
-    "build": "tsup",
-    "test": "vitest",
-    "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "prepublishOnly": "npm run build"
-  },
   "dependencies": {
     "localforage": "^1.10.0",
-    "ramda": "^0.32.0"
+    "ramda": "^0.32.0",
+    "tslib": "^2.8.1"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.13.0",
@@ -67,5 +58,17 @@
     "typescript": "^5.3.2",
     "vitepress": "^1.0.0-rc.31",
     "vitest": "^1.0.0"
+  },
+  "scripts": {
+    "dev": "tsup --watch",
+    "build": "tsup",
+    "test": "vitest",
+    "test:run": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
-}
+}