@synstack/fs-cache 1.1.7 → 1.2.1

package/dist/fs-cache.index.cjs

@@ -61,6 +61,7 @@ var FsCache = class _FsCache {
     this._config = config;
   }
   static cwd(cwd) {
+    if (cwd instanceof import_fs.FsDir) return new _FsCache({ cwd: cwd.path });
     return new _FsCache({ cwd });
   }
   key(key) {

package/dist/fs-cache.index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/fs-cache.index.ts","../src/fs-cache.lib.ts","../src/deepEqual.lib.ts"],"sourcesContent":["export * from \"./fs-cache.lib\";\n","import { OneToN } from \"@shared/ts.utils\";\nimport { dir } from \"@synstack/fs\";\nimport { deepEqual } from \"./deepEqual.lib\";\n\ntype $Partial<T> = Partial<T>;\n\ninterface CacheValue<TValue = any> {\n  isLocked?: boolean;\n  input: any;\n  output: TValue;\n}\n\ndeclare namespace FsCache {\n  export type KeyFn<TFnArgs extends any[] = any[]> =\n    | string\n    | ((...args: TFnArgs) => string);\n  export type Key<TFnArgs extends any[] = any[]> = OneToN<KeyFn<TFnArgs>>;\n\n  interface Options<TFnArgs extends any[] = any[]> {\n    cwd: string;\n    key: Key<TFnArgs>;\n    pretty?: boolean;\n  }\n\n  namespace Options {\n    export type Partial = $Partial<Options>;\n  }\n}\n\nexport class FsCache<TConfig extends FsCache.Options.Partial> {\n  private readonly _config: TConfig;\n\n  private constructor(config: TConfig) {\n    this._config = config;\n  }\n\n  public static cwd(this: void, cwd: string) {\n    return new FsCache({ cwd });\n  }\n\n  public key<TFnArgs extends any[], TKey extends FsCache.Key<TFnArgs>>(\n    key: TKey,\n  ) {\n    return new FsCache({ ...this._config, key });\n  }\n\n  public pretty(pretty: boolean) {\n    return new FsCache({ ...this._config, pretty });\n  }\n\n  private static keyToRelativePath(key: FsCache.Key, args: any[]) {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n    return `./${key.map((k) => (k instanceof Function ? k(...args) : k)).join(\"/\")}.json`;\n  }\n\n  public async lock<TFnArgs extends any[]>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    isLocked: boolean,\n    args: TFnArgs,\n  ) {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const cacheDir = dir(this._config.cwd);\n    const file = cacheDir.file(relativePath);\n\n    if (!(await file.exists())) {\n      console.warn(\n        \"[fs-cache] Failed to update lock on non-existing file\",\n        file.path,\n      );\n      return;\n    }\n\n    const value = await file.read.json<CacheValue>();\n    await file.write.json({\n      isLocked,\n      ...value,\n    });\n  }\n\n  public async get<TFnArgs extends any[], TValue = any>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n  ): Promise<[\"miss\", null] | [\"hit\", TValue]> {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const cacheDir = dir(this._config.cwd);\n\n    if (!(await cacheDir.file(relativePath).exists())) return [\"miss\", null];\n\n    const value = await cacheDir\n      .file(relativePath)\n      .read.json<CacheValue<TValue>>();\n\n    if (value === null) return [\"miss\", null];\n\n    if (value.isLocked || deepEqual(value.input, args))\n      return [\"hit\", value.output];\n\n    return [\"miss\", null];\n  }\n\n  public async setDefault<TFnArgs extends any[], TValue = any>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n    defaultValue: TValue,\n  ) {\n    const [status] = await this.get<TFnArgs, TValue>(args);\n    if (status === \"hit\") return false;\n    return this.set(args, defaultValue);\n  }\n\n  public async set<TFnArgs extends any[]>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n    value: any,\n  ) {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const file = dir(this._config.cwd).file(relativePath);\n    return file.write.text(\n      JSON.stringify(\n        { input: args, output: value } satisfies CacheValue,\n        null,\n        this._config.pretty ? 2 : undefined,\n      ),\n    );\n  }\n\n  public fn<TFnArgs extends any[], TFnOutput>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    fn: (...args: TFnArgs) => Promise<TFnOutput> | TFnOutput,\n  ): (...args: TFnArgs) => Promise<TFnOutput> {\n    return async (...args: TFnArgs): Promise<TFnOutput> => {\n      const [status, value] = await this.get<TFnArgs, TFnOutput>(args);\n      if (status === \"hit\") return value;\n\n      const output = await Promise.resolve(fn(...args));\n      await this.set(args, output);\n      return output;\n    };\n  }\n}\n\nexport const fsCache = FsCache.cwd;\n","export function deepEqual(obj1: any, obj2: any) {\n  if (obj1 === obj2) {\n    return true;\n  }\n\n  if (isPrimitive(obj1) && isPrimitive(obj2)) {\n    return obj1 === obj2;\n  }\n\n  if (obj1 == null || obj2 == null) {\n    return false;\n  }\n\n  const keys1 = Object.keys(obj1 as {}).filter((k) => obj1[k] !== undefined);\n  const keys2 = Object.keys(obj2 as {}).filter((k) => obj2[k] !== undefined);\n\n  if (keys1.length !== keys2.length) return false;\n\n  for (const key of keys1) {\n    if (!keys2.includes(key)) return false;\n    if (!deepEqual(obj1[key], obj2[key])) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\n//check if value is primitive\nfunction isPrimitive(obj: any) {\n  return obj !== Object(obj);\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/fs-cache.index.ts","../src/fs-cache.lib.ts","../src/deepEqual.lib.ts"],"sourcesContent":["export * from \"./fs-cache.lib.ts\";\n","import { type OneToN } from \"../../shared/src/ts.utils.ts\";\nimport { dir, FsDir } from \"@synstack/fs\";\nimport { deepEqual } from \"./deepEqual.lib.ts\";\n\ntype $Partial<T> = Partial<T>;\n\ninterface CacheValue<TValue = any> {\n  isLocked?: boolean;\n  input: any;\n  output: TValue;\n}\n\ndeclare namespace FsCache {\n  export type KeyFn<TFnArgs extends any[] = any[]> =\n    | string\n    | ((...args: TFnArgs) => string);\n  export type Key<TFnArgs extends any[] = any[]> = OneToN<KeyFn<TFnArgs>>;\n\n  interface Options<TFnArgs extends any[] = any[]> {\n    cwd: string;\n    key: Key<TFnArgs>;\n    pretty?: boolean;\n  }\n\n  namespace Options {\n    export type Partial = $Partial<Options>;\n  }\n}\n\nexport class FsCache<TConfig extends FsCache.Options.Partial> {\n  private readonly _config: TConfig;\n\n  private constructor(config: TConfig) {\n    this._config = config;\n  }\n\n  public static cwd(this: void, cwd: string | FsDir) {\n    if (cwd instanceof FsDir) return new FsCache({ cwd: cwd.path });\n    return new FsCache({ cwd });\n  }\n\n  public key<TFnArgs extends any[], TKey extends FsCache.Key<TFnArgs>>(\n    key: TKey,\n  ) {\n    return new FsCache({ ...this._config, key });\n  }\n\n  public pretty(pretty: boolean) {\n    return new FsCache({ ...this._config, pretty });\n  }\n\n  private static keyToRelativePath(key: FsCache.Key, args: any[]) {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n    return `./${key.map((k) => (k instanceof Function ? k(...args) : k)).join(\"/\")}.json`;\n  }\n\n  public async lock<TFnArgs extends any[]>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    isLocked: boolean,\n    args: TFnArgs,\n  ) {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const cacheDir = dir(this._config.cwd);\n    const file = cacheDir.file(relativePath);\n\n    if (!(await file.exists())) {\n      console.warn(\n        \"[fs-cache] Failed to update lock on non-existing file\",\n        file.path,\n      );\n      return;\n    }\n\n    const value = await file.read.json<CacheValue>();\n    await file.write.json({\n      isLocked,\n      ...value,\n    });\n  }\n\n  public async get<TFnArgs extends any[], TValue = any>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n  ): Promise<[\"miss\", null] | [\"hit\", TValue]> {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const cacheDir = dir(this._config.cwd);\n\n    if (!(await cacheDir.file(relativePath).exists())) return [\"miss\", null];\n\n    const value = await cacheDir\n      .file(relativePath)\n      .read.json<CacheValue<TValue>>();\n\n    if (value === null) return [\"miss\", null];\n\n    if (value.isLocked || deepEqual(value.input, args))\n      return [\"hit\", value.output];\n\n    return [\"miss\", null];\n  }\n\n  public async setDefault<TFnArgs extends any[], TValue = any>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n    defaultValue: TValue,\n  ) {\n    const [status] = await this.get<TFnArgs, TValue>(args);\n    if (status === \"hit\") return false;\n    return this.set(args, defaultValue);\n  }\n\n  public async set<TFnArgs extends any[]>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n    value: any,\n  ) {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const file = dir(this._config.cwd).file(relativePath);\n    return file.write.text(\n      JSON.stringify(\n        { input: args, output: value } satisfies CacheValue,\n        null,\n        this._config.pretty ? 2 : undefined,\n      ),\n    );\n  }\n\n  public fn<TFnArgs extends any[], TFnOutput>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    fn: (...args: TFnArgs) => Promise<TFnOutput> | TFnOutput,\n  ): (...args: TFnArgs) => Promise<TFnOutput> {\n    return async (...args: TFnArgs): Promise<TFnOutput> => {\n      const [status, value] = await this.get<TFnArgs, TFnOutput>(args);\n      if (status === \"hit\") return value;\n\n      const output = await Promise.resolve(fn(...args));\n      await this.set(args, output);\n      return output;\n    };\n  }\n}\n\nexport const fsCache = FsCache.cwd;\n","export function deepEqual(obj1: any, obj2: any) {\n  if (obj1 === obj2) {\n    return true;\n  }\n\n  if (isPrimitive(obj1) && isPrimitive(obj2)) {\n    return obj1 === obj2;\n  }\n\n  if (obj1 == null || obj2 == null) {\n    return false;\n  }\n\n  const keys1 = Object.keys(obj1 as {}).filter((k) => obj1[k] !== undefined);\n  const keys2 = Object.keys(obj2 as {}).filter((k) => obj2[k] !== undefined);\n\n  if (keys1.length !== keys2.length) return false;\n\n  for (const key of keys1) {\n    if (!keys2.includes(key)) return false;\n    if (!deepEqual(obj1[key], obj2[key])) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\n//check if value is primitive\nfunction isPrimitive(obj: any) {\n  return obj !== Object(obj);\n}\n"],"mappings":"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","names":[]}

package/dist/fs-cache.index.d.cts

@@ -1,3 +1,5 @@
+import { FsDir } from '@synstack/fs';
+
 /**
  * One or more values
  */
@@ -19,7 +21,7 @@ declare namespace FsCache {
 declare class FsCache<TConfig extends FsCache.Options.Partial> {
     private readonly _config;
     private constructor();
-    static cwd(this: void, cwd: string): FsCache<{
+    static cwd(this: void, cwd: string | FsDir): FsCache<{
         cwd: string;
     }>;
     key<TFnArgs extends any[], TKey extends FsCache.Key<TFnArgs>>(key: TKey): FsCache<TConfig & {

package/dist/fs-cache.index.d.ts

@@ -1,3 +1,5 @@
+import { FsDir } from '@synstack/fs';
+
 /**
  * One or more values
  */
@@ -19,7 +21,7 @@ declare namespace FsCache {
 declare class FsCache<TConfig extends FsCache.Options.Partial> {
     private readonly _config;
     private constructor();
-    static cwd(this: void, cwd: string): FsCache<{
+    static cwd(this: void, cwd: string | FsDir): FsCache<{
         cwd: string;
     }>;
     key<TFnArgs extends any[], TKey extends FsCache.Key<TFnArgs>>(key: TKey): FsCache<TConfig & {

package/dist/fs-cache.index.js

@@ -1,5 +1,5 @@
 // src/fs-cache.lib.ts
-import { dir } from "@synstack/fs";
+import { dir, FsDir } from "@synstack/fs";
 
 // src/deepEqual.lib.ts
 function deepEqual(obj1, obj2) {
@@ -34,6 +34,7 @@ var FsCache = class _FsCache {
     this._config = config;
   }
   static cwd(cwd) {
+    if (cwd instanceof FsDir) return new _FsCache({ cwd: cwd.path });
     return new _FsCache({ cwd });
   }
   key(key) {

package/dist/fs-cache.index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/fs-cache.lib.ts","../src/deepEqual.lib.ts"],"sourcesContent":["import { OneToN } from \"@shared/ts.utils\";\nimport { dir } from \"@synstack/fs\";\nimport { deepEqual } from \"./deepEqual.lib\";\n\ntype $Partial<T> = Partial<T>;\n\ninterface CacheValue<TValue = any> {\n  isLocked?: boolean;\n  input: any;\n  output: TValue;\n}\n\ndeclare namespace FsCache {\n  export type KeyFn<TFnArgs extends any[] = any[]> =\n    | string\n    | ((...args: TFnArgs) => string);\n  export type Key<TFnArgs extends any[] = any[]> = OneToN<KeyFn<TFnArgs>>;\n\n  interface Options<TFnArgs extends any[] = any[]> {\n    cwd: string;\n    key: Key<TFnArgs>;\n    pretty?: boolean;\n  }\n\n  namespace Options {\n    export type Partial = $Partial<Options>;\n  }\n}\n\nexport class FsCache<TConfig extends FsCache.Options.Partial> {\n  private readonly _config: TConfig;\n\n  private constructor(config: TConfig) {\n    this._config = config;\n  }\n\n  public static cwd(this: void, cwd: string) {\n    return new FsCache({ cwd });\n  }\n\n  public key<TFnArgs extends any[], TKey extends FsCache.Key<TFnArgs>>(\n    key: TKey,\n  ) {\n    return new FsCache({ ...this._config, key });\n  }\n\n  public pretty(pretty: boolean) {\n    return new FsCache({ ...this._config, pretty });\n  }\n\n  private static keyToRelativePath(key: FsCache.Key, args: any[]) {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n    return `./${key.map((k) => (k instanceof Function ? k(...args) : k)).join(\"/\")}.json`;\n  }\n\n  public async lock<TFnArgs extends any[]>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    isLocked: boolean,\n    args: TFnArgs,\n  ) {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const cacheDir = dir(this._config.cwd);\n    const file = cacheDir.file(relativePath);\n\n    if (!(await file.exists())) {\n      console.warn(\n        \"[fs-cache] Failed to update lock on non-existing file\",\n        file.path,\n      );\n      return;\n    }\n\n    const value = await file.read.json<CacheValue>();\n    await file.write.json({\n      isLocked,\n      ...value,\n    });\n  }\n\n  public async get<TFnArgs extends any[], TValue = any>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n  ): Promise<[\"miss\", null] | [\"hit\", TValue]> {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const cacheDir = dir(this._config.cwd);\n\n    if (!(await cacheDir.file(relativePath).exists())) return [\"miss\", null];\n\n    const value = await cacheDir\n      .file(relativePath)\n      .read.json<CacheValue<TValue>>();\n\n    if (value === null) return [\"miss\", null];\n\n    if (value.isLocked || deepEqual(value.input, args))\n      return [\"hit\", value.output];\n\n    return [\"miss\", null];\n  }\n\n  public async setDefault<TFnArgs extends any[], TValue = any>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n    defaultValue: TValue,\n  ) {\n    const [status] = await this.get<TFnArgs, TValue>(args);\n    if (status === \"hit\") return false;\n    return this.set(args, defaultValue);\n  }\n\n  public async set<TFnArgs extends any[]>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n    value: any,\n  ) {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const file = dir(this._config.cwd).file(relativePath);\n    return file.write.text(\n      JSON.stringify(\n        { input: args, output: value } satisfies CacheValue,\n        null,\n        this._config.pretty ? 2 : undefined,\n      ),\n    );\n  }\n\n  public fn<TFnArgs extends any[], TFnOutput>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    fn: (...args: TFnArgs) => Promise<TFnOutput> | TFnOutput,\n  ): (...args: TFnArgs) => Promise<TFnOutput> {\n    return async (...args: TFnArgs): Promise<TFnOutput> => {\n      const [status, value] = await this.get<TFnArgs, TFnOutput>(args);\n      if (status === \"hit\") return value;\n\n      const output = await Promise.resolve(fn(...args));\n      await this.set(args, output);\n      return output;\n    };\n  }\n}\n\nexport const fsCache = FsCache.cwd;\n","export function deepEqual(obj1: any, obj2: any) {\n  if (obj1 === obj2) {\n    return true;\n  }\n\n  if (isPrimitive(obj1) && isPrimitive(obj2)) {\n    return obj1 === obj2;\n  }\n\n  if (obj1 == null || obj2 == null) {\n    return false;\n  }\n\n  const keys1 = Object.keys(obj1 as {}).filter((k) => obj1[k] !== undefined);\n  const keys2 = Object.keys(obj2 as {}).filter((k) => obj2[k] !== undefined);\n\n  if (keys1.length !== keys2.length) return false;\n\n  for (const key of keys1) {\n    if (!keys2.includes(key)) return false;\n    if (!deepEqual(obj1[key], obj2[key])) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\n//check if value is primitive\nfunction isPrimitive(obj: any) {\n  return obj !== Object(obj);\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/fs-cache.lib.ts","../src/deepEqual.lib.ts"],"sourcesContent":["import { type OneToN } from \"../../shared/src/ts.utils.ts\";\nimport { dir, FsDir } from \"@synstack/fs\";\nimport { deepEqual } from \"./deepEqual.lib.ts\";\n\ntype $Partial<T> = Partial<T>;\n\ninterface CacheValue<TValue = any> {\n  isLocked?: boolean;\n  input: any;\n  output: TValue;\n}\n\ndeclare namespace FsCache {\n  export type KeyFn<TFnArgs extends any[] = any[]> =\n    | string\n    | ((...args: TFnArgs) => string);\n  export type Key<TFnArgs extends any[] = any[]> = OneToN<KeyFn<TFnArgs>>;\n\n  interface Options<TFnArgs extends any[] = any[]> {\n    cwd: string;\n    key: Key<TFnArgs>;\n    pretty?: boolean;\n  }\n\n  namespace Options {\n    export type Partial = $Partial<Options>;\n  }\n}\n\nexport class FsCache<TConfig extends FsCache.Options.Partial> {\n  private readonly _config: TConfig;\n\n  private constructor(config: TConfig) {\n    this._config = config;\n  }\n\n  public static cwd(this: void, cwd: string | FsDir) {\n    if (cwd instanceof FsDir) return new FsCache({ cwd: cwd.path });\n    return new FsCache({ cwd });\n  }\n\n  public key<TFnArgs extends any[], TKey extends FsCache.Key<TFnArgs>>(\n    key: TKey,\n  ) {\n    return new FsCache({ ...this._config, key });\n  }\n\n  public pretty(pretty: boolean) {\n    return new FsCache({ ...this._config, pretty });\n  }\n\n  private static keyToRelativePath(key: FsCache.Key, args: any[]) {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n    return `./${key.map((k) => (k instanceof Function ? k(...args) : k)).join(\"/\")}.json`;\n  }\n\n  public async lock<TFnArgs extends any[]>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    isLocked: boolean,\n    args: TFnArgs,\n  ) {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const cacheDir = dir(this._config.cwd);\n    const file = cacheDir.file(relativePath);\n\n    if (!(await file.exists())) {\n      console.warn(\n        \"[fs-cache] Failed to update lock on non-existing file\",\n        file.path,\n      );\n      return;\n    }\n\n    const value = await file.read.json<CacheValue>();\n    await file.write.json({\n      isLocked,\n      ...value,\n    });\n  }\n\n  public async get<TFnArgs extends any[], TValue = any>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n  ): Promise<[\"miss\", null] | [\"hit\", TValue]> {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const cacheDir = dir(this._config.cwd);\n\n    if (!(await cacheDir.file(relativePath).exists())) return [\"miss\", null];\n\n    const value = await cacheDir\n      .file(relativePath)\n      .read.json<CacheValue<TValue>>();\n\n    if (value === null) return [\"miss\", null];\n\n    if (value.isLocked || deepEqual(value.input, args))\n      return [\"hit\", value.output];\n\n    return [\"miss\", null];\n  }\n\n  public async setDefault<TFnArgs extends any[], TValue = any>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n    defaultValue: TValue,\n  ) {\n    const [status] = await this.get<TFnArgs, TValue>(args);\n    if (status === \"hit\") return false;\n    return this.set(args, defaultValue);\n  }\n\n  public async set<TFnArgs extends any[]>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    args: TFnArgs,\n    value: any,\n  ) {\n    const relativePath = FsCache.keyToRelativePath(this._config.key, args);\n    const file = dir(this._config.cwd).file(relativePath);\n    return file.write.text(\n      JSON.stringify(\n        { input: args, output: value } satisfies CacheValue,\n        null,\n        this._config.pretty ? 2 : undefined,\n      ),\n    );\n  }\n\n  public fn<TFnArgs extends any[], TFnOutput>(\n    this: FsCache<FsCache.Options<TFnArgs>>,\n    fn: (...args: TFnArgs) => Promise<TFnOutput> | TFnOutput,\n  ): (...args: TFnArgs) => Promise<TFnOutput> {\n    return async (...args: TFnArgs): Promise<TFnOutput> => {\n      const [status, value] = await this.get<TFnArgs, TFnOutput>(args);\n      if (status === \"hit\") return value;\n\n      const output = await Promise.resolve(fn(...args));\n      await this.set(args, output);\n      return output;\n    };\n  }\n}\n\nexport const fsCache = FsCache.cwd;\n","export function deepEqual(obj1: any, obj2: any) {\n  if (obj1 === obj2) {\n    return true;\n  }\n\n  if (isPrimitive(obj1) && isPrimitive(obj2)) {\n    return obj1 === obj2;\n  }\n\n  if (obj1 == null || obj2 == null) {\n    return false;\n  }\n\n  const keys1 = Object.keys(obj1 as {}).filter((k) => obj1[k] !== undefined);\n  const keys2 = Object.keys(obj2 as {}).filter((k) => obj2[k] !== undefined);\n\n  if (keys1.length !== keys2.length) return false;\n\n  for (const key of keys1) {\n    if (!keys2.includes(key)) return false;\n    if (!deepEqual(obj1[key], obj2[key])) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\n//check if value is primitive\nfunction isPrimitive(obj: any) {\n  return obj !== Object(obj);\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -4,8 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "packageManager": "yarn@4.4.0",
-  "version": "1.1.7",
+  "version": "1.2.1",
   "description": "Human-friendly file system caching",
   "keywords": [
     "cache",
@@ -26,8 +25,8 @@
     "build": "tsup",
     "build:watch": "tsup --watch",
     "test:types": "tsc --noEmit",
-    "test:unit": "node --import tsx --test src/**/*.test.ts",
-    "test:unit:watch": "node --import tsx --watch --test src/**/*.test.ts",
+    "test:unit": "node --experimental-strip-types --test src/**/*.test.ts",
+    "test:unit:watch": "node --experimental-strip-types --watch --test --watch src/**/*.test.ts",
     "test": "yarn test:types && yarn test:unit",
     "prepare": "yarn test && yarn build"
   },
@@ -44,18 +43,17 @@
     }
   },
   "dependencies": {
-    "@synstack/fs": "1.2.9"
+    "@synstack/fs": "1.3.1"
   },
   "devDependencies": {
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.9.3",
     "tsup": "^8.3.5",
-    "tsx": "^4.19.2",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "files": [
     "src/**/*.ts",
     "!src/**/*.test.ts",
     "dist/**/*"
   ],
-  "gitHead": "f83452856a75ba766d607e3b49072d9cea3bdbdc"
+  "gitHead": "7f68a964a86707c6b5f0928182b77911e048bea2"
 }

package/src/fs-cache.index.ts

@@ -1 +1 @@
-export * from "./fs-cache.lib";
+export * from "./fs-cache.lib.ts";

package/src/fs-cache.lib.ts

@@ -1,6 +1,6 @@
-import { OneToN } from "@shared/ts.utils";
-import { dir } from "@synstack/fs";
-import { deepEqual } from "./deepEqual.lib";
+import { type OneToN } from "../../shared/src/ts.utils.ts";
+import { dir, FsDir } from "@synstack/fs";
+import { deepEqual } from "./deepEqual.lib.ts";
 
 type $Partial<T> = Partial<T>;
 
@@ -34,7 +34,8 @@ export class FsCache<TConfig extends FsCache.Options.Partial> {
     this._config = config;
   }
 
-  public static cwd(this: void, cwd: string) {
+  public static cwd(this: void, cwd: string | FsDir) {
+    if (cwd instanceof FsDir) return new FsCache({ cwd: cwd.path });
     return new FsCache({ cwd });
   }