cross-state 0.56.4 → 1.0.1

package/dist/{diff-CElc7pJI.d.ts → diff-CAQaunfv.d.cts}

@@ -1,4 +1,4 @@
-import { KeyType } from "./store-DnZ6fsiJ.js";
+import { M as KeyType } from "./store-XcnTdeiJ.cjs";
 
 //#region src/lib/diff.d.ts
 type Patch = {
@@ -18,5 +18,5 @@ interface DiffOptions {
 }
 declare function diff(a: any, b: any, options?: DiffOptions): [patches: Patch[], reversePatches: Patch[]];
 //#endregion
-export { DiffOptions, Patch, diff };
-//# sourceMappingURL=diff-CElc7pJI.d.ts.map
+export { Patch as n, diff as r, DiffOptions as t };
+//# sourceMappingURL=diff-CAQaunfv.d.cts.map

package/dist/{diff-BslUrJZE.d.cts → diff-DFvRd-Gf.d.ts}

@@ -1,4 +1,4 @@
-import { KeyType } from "./store-MBrcOgtz.cjs";
+import { M as KeyType } from "./store-BRHFhRPm.js";
 
 //#region src/lib/diff.d.ts
 type Patch = {
@@ -18,5 +18,5 @@ interface DiffOptions {
 }
 declare function diff(a: any, b: any, options?: DiffOptions): [patches: Patch[], reversePatches: Patch[]];
 //#endregion
-export { DiffOptions, Patch, diff };
-//# sourceMappingURL=diff-BslUrJZE.d.cts.map
+export { Patch as n, diff as r, DiffOptions as t };
+//# sourceMappingURL=diff-DFvRd-Gf.d.ts.map

package/dist/{extendedJson-BZkQBXEv.js → extendedJson-Dv9q6rps.js}

@@ -25,5 +25,5 @@ function fromExtendedJsonString(value, reviver) {
 }
 
 //#endregion
-export { fromExtendedJson, fromExtendedJsonString, toExtendedJson, toExtendedJsonString };
-//# sourceMappingURL=extendedJson-BZkQBXEv.js.map
+export { toExtendedJsonString as i, fromExtendedJsonString as n, toExtendedJson as r, fromExtendedJson as t };
+//# sourceMappingURL=extendedJson-Dv9q6rps.js.map

package/dist/{extendedJson-BZkQBXEv.js.map → extendedJson-Dv9q6rps.js.map}

@@ -1 +1 @@
-{"version":3,"file":"extendedJson-BZkQBXEv.js","names":[],"sources":["../src/lib/extendedJson.ts"],"sourcesContent":["export function toExtendedJson(value: unknown): unknown {\n  if (value instanceof Map) {\n    return {\n      __map: [...value].map(([k, v]) => [toExtendedJson(k), toExtendedJson(v)]),\n    };\n  }\n\n  if (value instanceof Set) {\n    return {\n      __set: [...value].map(toExtendedJson),\n    };\n  }\n\n  if (value instanceof Date) {\n    return {\n      __date: value.toISOString(),\n    };\n  }\n\n  if (typeof value === 'bigint') {\n    return {\n      __bigint: value.toString(),\n    };\n  }\n\n  if (Array.isArray(value)) {\n    return value.map(toExtendedJson);\n  }\n\n  if (typeof value === 'object' && value !== null) {\n    return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, toExtendedJson(v)]));\n  }\n\n  return value;\n}\n\nexport function toExtendedJsonString(\n  value: any,\n  replacer?: (this: any, key: string, value: any) => any,\n  space?: string | number,\n): string;\nexport function toExtendedJsonString(\n  value: any,\n  replacer?: (number | string)[] | null,\n  space?: string | number,\n): string;\nexport function toExtendedJsonString(value: unknown, ...args: any[]): string {\n  return JSON.stringify(toExtendedJson(value), ...args);\n}\n\nexport function fromExtendedJson(value: unknown): unknown {\n  if (typeof value !== 'object' || value === null) {\n    return value;\n  }\n\n  if ('__map' in value) {\n    return new Map(\n      (value.__map as [unknown, unknown][]).map(([k, v]) => [\n        fromExtendedJson(k),\n        fromExtendedJson(v),\n      ]),\n    );\n  }\n\n  if ('__set' in value) {\n    return new Set((value.__set as unknown[]).map(fromExtendedJson));\n  }\n\n  if ('__date' in value) {\n    return new Date(value.__date as string);\n  }\n\n  if ('__bigint' in value) {\n    return BigInt(value.__bigint as string);\n  }\n\n  if (Array.isArray(value)) {\n    return value.map(fromExtendedJson);\n  }\n\n  return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, fromExtendedJson(v)]));\n}\n\nexport function fromExtendedJsonString(\n  value: string,\n  reviver?: (this: any, key: string, value: any) => any,\n): unknown {\n  return fromExtendedJson(JSON.parse(value, reviver));\n}\n"],"mappings":";AAAA,SAAgB,eAAe,OAAyB;AACtD,KAAI,iBAAiB,IACnB,QAAO,EACL,OAAO,CAAC,GAAG,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,eAAe,IAAI,eAAe;AAIzE,KAAI,iBAAiB,IACnB,QAAO,EACL,OAAO,CAAC,GAAG,OAAO,IAAI;AAI1B,KAAI,iBAAiB,KACnB,QAAO,EACL,QAAQ,MAAM;AAIlB,KAAI,OAAO,UAAU,SACnB,QAAO,EACL,UAAU,MAAM;AAIpB,KAAI,MAAM,QAAQ,OAChB,QAAO,MAAM,IAAI;AAGnB,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO,OAAO,YAAY,OAAO,QAAQ,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,eAAe;AAGrF,QAAO;;AAaT,SAAgB,qBAAqB,OAAgB,GAAG,MAAqB;AAC3E,QAAO,KAAK,UAAU,eAAe,QAAQ,GAAG;;AAGlD,SAAgB,iBAAiB,OAAyB;AACxD,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO;AAGT,KAAI,WAAW,MACb,QAAO,IAAI,IACR,MAAM,MAA+B,KAAK,CAAC,GAAG,OAAO,CACpD,iBAAiB,IACjB,iBAAiB;AAKvB,KAAI,WAAW,MACb,QAAO,IAAI,IAAK,MAAM,MAAoB,IAAI;AAGhD,KAAI,YAAY,MACd,QAAO,IAAI,KAAK,MAAM;AAGxB,KAAI,cAAc,MAChB,QAAO,OAAO,MAAM;AAGtB,KAAI,MAAM,QAAQ,OAChB,QAAO,MAAM,IAAI;AAGnB,QAAO,OAAO,YAAY,OAAO,QAAQ,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,iBAAiB;;AAGvF,SAAgB,uBACd,OACA,SACS;AACT,QAAO,iBAAiB,KAAK,MAAM,OAAO"}
+{"version":3,"file":"extendedJson-Dv9q6rps.js","names":[],"sources":["../src/lib/extendedJson.ts"],"sourcesContent":["export function toExtendedJson(value: unknown): unknown {\n  if (value instanceof Map) {\n    return {\n      __map: [...value].map(([k, v]) => [toExtendedJson(k), toExtendedJson(v)]),\n    };\n  }\n\n  if (value instanceof Set) {\n    return {\n      __set: [...value].map(toExtendedJson),\n    };\n  }\n\n  if (value instanceof Date) {\n    return {\n      __date: value.toISOString(),\n    };\n  }\n\n  if (typeof value === 'bigint') {\n    return {\n      __bigint: value.toString(),\n    };\n  }\n\n  if (Array.isArray(value)) {\n    return value.map(toExtendedJson);\n  }\n\n  if (typeof value === 'object' && value !== null) {\n    return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, toExtendedJson(v)]));\n  }\n\n  return value;\n}\n\nexport function toExtendedJsonString(\n  value: any,\n  replacer?: (this: any, key: string, value: any) => any,\n  space?: string | number,\n): string;\nexport function toExtendedJsonString(\n  value: any,\n  replacer?: (number | string)[] | null,\n  space?: string | number,\n): string;\nexport function toExtendedJsonString(value: unknown, ...args: any[]): string {\n  return JSON.stringify(toExtendedJson(value), ...args);\n}\n\nexport function fromExtendedJson(value: unknown): unknown {\n  if (typeof value !== 'object' || value === null) {\n    return value;\n  }\n\n  if ('__map' in value) {\n    return new Map(\n      (value.__map as [unknown, unknown][]).map(([k, v]) => [\n        fromExtendedJson(k),\n        fromExtendedJson(v),\n      ]),\n    );\n  }\n\n  if ('__set' in value) {\n    return new Set((value.__set as unknown[]).map(fromExtendedJson));\n  }\n\n  if ('__date' in value) {\n    return new Date(value.__date as string);\n  }\n\n  if ('__bigint' in value) {\n    return BigInt(value.__bigint as string);\n  }\n\n  if (Array.isArray(value)) {\n    return value.map(fromExtendedJson);\n  }\n\n  return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, fromExtendedJson(v)]));\n}\n\nexport function fromExtendedJsonString(\n  value: string,\n  reviver?: (this: any, key: string, value: any) => any,\n): unknown {\n  return fromExtendedJson(JSON.parse(value, reviver));\n}\n"],"mappings":";AAAA,SAAgB,eAAe,OAAyB;AACtD,KAAI,iBAAiB,IACnB,QAAO,EACL,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC,EAC1E;AAGH,KAAI,iBAAiB,IACnB,QAAO,EACL,OAAO,CAAC,GAAG,MAAM,CAAC,IAAI,eAAe,EACtC;AAGH,KAAI,iBAAiB,KACnB,QAAO,EACL,QAAQ,MAAM,aAAa,EAC5B;AAGH,KAAI,OAAO,UAAU,SACnB,QAAO,EACL,UAAU,MAAM,UAAU,EAC3B;AAGH,KAAI,MAAM,QAAQ,MAAM,CACtB,QAAO,MAAM,IAAI,eAAe;AAGlC,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC,CAAC;AAG1F,QAAO;;AAaT,SAAgB,qBAAqB,OAAgB,GAAG,MAAqB;AAC3E,QAAO,KAAK,UAAU,eAAe,MAAM,EAAE,GAAG,KAAK;;AAGvD,SAAgB,iBAAiB,OAAyB;AACxD,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO;AAGT,KAAI,WAAW,MACb,QAAO,IAAI,IACR,MAAM,MAA+B,KAAK,CAAC,GAAG,OAAO,CACpD,iBAAiB,EAAE,EACnB,iBAAiB,EAAE,CACpB,CAAC,CACH;AAGH,KAAI,WAAW,MACb,QAAO,IAAI,IAAK,MAAM,MAAoB,IAAI,iBAAiB,CAAC;AAGlE,KAAI,YAAY,MACd,QAAO,IAAI,KAAK,MAAM,OAAiB;AAGzC,KAAI,cAAc,MAChB,QAAO,OAAO,MAAM,SAAmB;AAGzC,KAAI,MAAM,QAAQ,MAAM,CACtB,QAAO,MAAM,IAAI,iBAAiB;AAGpC,QAAO,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,iBAAiB,EAAE,CAAC,CAAC,CAAC;;AAG5F,SAAgB,uBACd,OACA,SACS;AACT,QAAO,iBAAiB,KAAK,MAAM,OAAO,QAAQ,CAAC"}

package/dist/{extendedJson-Dn2F7Edo.cjs → extendedJson-ursQ8DbQ.cjs}

@@ -50,4 +50,4 @@ Object.defineProperty(exports, 'toExtendedJsonString', {
     return toExtendedJsonString;
   }
 });
-//# sourceMappingURL=extendedJson-Dn2F7Edo.cjs.map
+//# sourceMappingURL=extendedJson-ursQ8DbQ.cjs.map

package/dist/{extendedJson-Dn2F7Edo.cjs.map → extendedJson-ursQ8DbQ.cjs.map}

@@ -1 +1 @@
-{"version":3,"file":"extendedJson-Dn2F7Edo.cjs","names":[],"sources":["../src/lib/extendedJson.ts"],"sourcesContent":["export function toExtendedJson(value: unknown): unknown {\n  if (value instanceof Map) {\n    return {\n      __map: [...value].map(([k, v]) => [toExtendedJson(k), toExtendedJson(v)]),\n    };\n  }\n\n  if (value instanceof Set) {\n    return {\n      __set: [...value].map(toExtendedJson),\n    };\n  }\n\n  if (value instanceof Date) {\n    return {\n      __date: value.toISOString(),\n    };\n  }\n\n  if (typeof value === 'bigint') {\n    return {\n      __bigint: value.toString(),\n    };\n  }\n\n  if (Array.isArray(value)) {\n    return value.map(toExtendedJson);\n  }\n\n  if (typeof value === 'object' && value !== null) {\n    return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, toExtendedJson(v)]));\n  }\n\n  return value;\n}\n\nexport function toExtendedJsonString(\n  value: any,\n  replacer?: (this: any, key: string, value: any) => any,\n  space?: string | number,\n): string;\nexport function toExtendedJsonString(\n  value: any,\n  replacer?: (number | string)[] | null,\n  space?: string | number,\n): string;\nexport function toExtendedJsonString(value: unknown, ...args: any[]): string {\n  return JSON.stringify(toExtendedJson(value), ...args);\n}\n\nexport function fromExtendedJson(value: unknown): unknown {\n  if (typeof value !== 'object' || value === null) {\n    return value;\n  }\n\n  if ('__map' in value) {\n    return new Map(\n      (value.__map as [unknown, unknown][]).map(([k, v]) => [\n        fromExtendedJson(k),\n        fromExtendedJson(v),\n      ]),\n    );\n  }\n\n  if ('__set' in value) {\n    return new Set((value.__set as unknown[]).map(fromExtendedJson));\n  }\n\n  if ('__date' in value) {\n    return new Date(value.__date as string);\n  }\n\n  if ('__bigint' in value) {\n    return BigInt(value.__bigint as string);\n  }\n\n  if (Array.isArray(value)) {\n    return value.map(fromExtendedJson);\n  }\n\n  return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, fromExtendedJson(v)]));\n}\n\nexport function fromExtendedJsonString(\n  value: string,\n  reviver?: (this: any, key: string, value: any) => any,\n): unknown {\n  return fromExtendedJson(JSON.parse(value, reviver));\n}\n"],"mappings":";;AAAA,SAAgB,eAAe,OAAyB;AACtD,KAAI,iBAAiB,IACnB,QAAO,EACL,OAAO,CAAC,GAAG,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,eAAe,IAAI,eAAe;AAIzE,KAAI,iBAAiB,IACnB,QAAO,EACL,OAAO,CAAC,GAAG,OAAO,IAAI;AAI1B,KAAI,iBAAiB,KACnB,QAAO,EACL,QAAQ,MAAM;AAIlB,KAAI,OAAO,UAAU,SACnB,QAAO,EACL,UAAU,MAAM;AAIpB,KAAI,MAAM,QAAQ,OAChB,QAAO,MAAM,IAAI;AAGnB,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO,OAAO,YAAY,OAAO,QAAQ,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,eAAe;AAGrF,QAAO;;AAaT,SAAgB,qBAAqB,OAAgB,GAAG,MAAqB;AAC3E,QAAO,KAAK,UAAU,eAAe,QAAQ,GAAG;;AAGlD,SAAgB,iBAAiB,OAAyB;AACxD,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO;AAGT,KAAI,WAAW,MACb,QAAO,IAAI,IACR,MAAM,MAA+B,KAAK,CAAC,GAAG,OAAO,CACpD,iBAAiB,IACjB,iBAAiB;AAKvB,KAAI,WAAW,MACb,QAAO,IAAI,IAAK,MAAM,MAAoB,IAAI;AAGhD,KAAI,YAAY,MACd,QAAO,IAAI,KAAK,MAAM;AAGxB,KAAI,cAAc,MAChB,QAAO,OAAO,MAAM;AAGtB,KAAI,MAAM,QAAQ,OAChB,QAAO,MAAM,IAAI;AAGnB,QAAO,OAAO,YAAY,OAAO,QAAQ,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,iBAAiB;;AAGvF,SAAgB,uBACd,OACA,SACS;AACT,QAAO,iBAAiB,KAAK,MAAM,OAAO"}
+{"version":3,"file":"extendedJson-ursQ8DbQ.cjs","names":[],"sources":["../src/lib/extendedJson.ts"],"sourcesContent":["export function toExtendedJson(value: unknown): unknown {\n  if (value instanceof Map) {\n    return {\n      __map: [...value].map(([k, v]) => [toExtendedJson(k), toExtendedJson(v)]),\n    };\n  }\n\n  if (value instanceof Set) {\n    return {\n      __set: [...value].map(toExtendedJson),\n    };\n  }\n\n  if (value instanceof Date) {\n    return {\n      __date: value.toISOString(),\n    };\n  }\n\n  if (typeof value === 'bigint') {\n    return {\n      __bigint: value.toString(),\n    };\n  }\n\n  if (Array.isArray(value)) {\n    return value.map(toExtendedJson);\n  }\n\n  if (typeof value === 'object' && value !== null) {\n    return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, toExtendedJson(v)]));\n  }\n\n  return value;\n}\n\nexport function toExtendedJsonString(\n  value: any,\n  replacer?: (this: any, key: string, value: any) => any,\n  space?: string | number,\n): string;\nexport function toExtendedJsonString(\n  value: any,\n  replacer?: (number | string)[] | null,\n  space?: string | number,\n): string;\nexport function toExtendedJsonString(value: unknown, ...args: any[]): string {\n  return JSON.stringify(toExtendedJson(value), ...args);\n}\n\nexport function fromExtendedJson(value: unknown): unknown {\n  if (typeof value !== 'object' || value === null) {\n    return value;\n  }\n\n  if ('__map' in value) {\n    return new Map(\n      (value.__map as [unknown, unknown][]).map(([k, v]) => [\n        fromExtendedJson(k),\n        fromExtendedJson(v),\n      ]),\n    );\n  }\n\n  if ('__set' in value) {\n    return new Set((value.__set as unknown[]).map(fromExtendedJson));\n  }\n\n  if ('__date' in value) {\n    return new Date(value.__date as string);\n  }\n\n  if ('__bigint' in value) {\n    return BigInt(value.__bigint as string);\n  }\n\n  if (Array.isArray(value)) {\n    return value.map(fromExtendedJson);\n  }\n\n  return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, fromExtendedJson(v)]));\n}\n\nexport function fromExtendedJsonString(\n  value: string,\n  reviver?: (this: any, key: string, value: any) => any,\n): unknown {\n  return fromExtendedJson(JSON.parse(value, reviver));\n}\n"],"mappings":";;AAAA,SAAgB,eAAe,OAAyB;AACtD,KAAI,iBAAiB,IACnB,QAAO,EACL,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC,EAC1E;AAGH,KAAI,iBAAiB,IACnB,QAAO,EACL,OAAO,CAAC,GAAG,MAAM,CAAC,IAAI,eAAe,EACtC;AAGH,KAAI,iBAAiB,KACnB,QAAO,EACL,QAAQ,MAAM,aAAa,EAC5B;AAGH,KAAI,OAAO,UAAU,SACnB,QAAO,EACL,UAAU,MAAM,UAAU,EAC3B;AAGH,KAAI,MAAM,QAAQ,MAAM,CACtB,QAAO,MAAM,IAAI,eAAe;AAGlC,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC,CAAC;AAG1F,QAAO;;AAaT,SAAgB,qBAAqB,OAAgB,GAAG,MAAqB;AAC3E,QAAO,KAAK,UAAU,eAAe,MAAM,EAAE,GAAG,KAAK;;AAGvD,SAAgB,iBAAiB,OAAyB;AACxD,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO;AAGT,KAAI,WAAW,MACb,QAAO,IAAI,IACR,MAAM,MAA+B,KAAK,CAAC,GAAG,OAAO,CACpD,iBAAiB,EAAE,EACnB,iBAAiB,EAAE,CACpB,CAAC,CACH;AAGH,KAAI,WAAW,MACb,QAAO,IAAI,IAAK,MAAM,MAAoB,IAAI,iBAAiB,CAAC;AAGlE,KAAI,YAAY,MACd,QAAO,IAAI,KAAK,MAAM,OAAiB;AAGzC,KAAI,cAAc,MAChB,QAAO,OAAO,MAAM,SAAmB;AAGzC,KAAI,MAAM,QAAQ,MAAM,CACtB,QAAO,MAAM,IAAI,iBAAiB;AAGpC,QAAO,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,iBAAiB,EAAE,CAAC,CAAC,CAAC;;AAG5F,SAAgB,uBACd,OACA,SACS;AACT,QAAO,iBAAiB,KAAK,MAAM,OAAO,QAAQ,CAAC"}

package/dist/index.cjs

@@ -1,10 +1,9 @@
-const require_store = require('./store-CdST5wJZ.cjs');
-const require_propAccess = require('./propAccess-BdLsqViO.cjs');
-const require_hash = require('./hash-Dv3XlmHn.cjs');
-const require_scope = require('./scope-CfLlLxo9.cjs');
-const require_patchMethods = require('./patchMethods-hhlLwtqE.cjs');
-const require_extendedJson = require('./extendedJson-Dn2F7Edo.cjs');
-const require_persist = require('./persist-DboMIMOK.cjs');
+const require_store = require('./store-C1NYHLgR.cjs');
+const require_propAccess = require('./propAccess-C2AIn9RC.cjs');
+const require_scope = require('./scope-C1bcfK8e.cjs');
+const require_patchMethods = require('./patchMethods-B7Hm5-Qh.cjs');
+const require_extendedJson = require('./extendedJson-ursQ8DbQ.cjs');
+const require_persist = require('./persist-DMbVdqS_.cjs');
 
 //#region src/core/pagedCache.ts
 var PagedCache = class PagedCache extends require_scope.Cache {
@@ -60,10 +59,9 @@ async function loadPage(cache, helpers, oldPages) {
 	});
 	const pages = page === null ? oldPages : oldPages.concat(page);
 	const pageCount = getPageCount?.call(cache, pages) ?? null;
-	const hasMore = hasMorePages ? hasMorePages.call(cache, pages) : pageCount !== null ? pages.length < pageCount : page !== null;
 	return {
 		pages,
-		hasMore,
+		hasMore: hasMorePages ? hasMorePages.call(cache, pages) : pageCount !== null ? pages.length < pageCount : page !== null,
 		pageCount
 	};
 }
@@ -107,14 +105,14 @@ exports.findOrDefault = findOrDefault;
 exports.fromExtendedJson = require_extendedJson.fromExtendedJson;
 exports.fromExtendedJsonString = require_extendedJson.fromExtendedJsonString;
 exports.get = require_propAccess.get;
-exports.hash = require_hash.hash;
+exports.hash = require_scope.hash;
 exports.mapMethods = require_store.mapMethods;
 exports.persist = require_persist.persist;
 exports.recordMethods = require_store.recordMethods;
 exports.set = require_propAccess.set;
 exports.setMethods = require_store.setMethods;
 exports.shallowEqual = require_propAccess.shallowEqual;
-exports.simpleHash = require_hash.simpleHash;
+exports.simpleHash = require_scope.simpleHash;
 exports.strictEqual = require_propAccess.strictEqual;
 exports.toExtendedJson = require_extendedJson.toExtendedJson;
 exports.toExtendedJsonString = require_extendedJson.toExtendedJsonString;

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","names":["Cache","definition: PagedCacheDefinition<T, Args>","internalCreate","options","createPagedCache: typeof createPaged & { defaultOptions: CacheOptions<any, any> }","defaultCacheOptions"],"sources":["../src/core/pagedCache.ts","../src/lib/updateHelpers.ts"],"sourcesContent":["import {\n  Cache,\n  defaultCacheOptions,\n  internalCreate,\n  type CacheOptions,\n  type CreateCacheResult,\n} from '@core/cache';\nimport type { CalculationActions } from '@core/commonTypes';\nimport { autobind } from '@lib/autobind';\n\nexport interface PageCacheFunctionProps<T> extends CalculationActions<Promise<PagedCacheState<T>>> {\n  /**\n   * Previously fetched pages (in order).\n   */\n  pages: T[];\n  /**\n   * Last fetched page or null if there are no previously fetched pages.\n   */\n  prevPage: T | null;\n}\n\nexport interface PageCacheFunction<T> {\n  (props: PageCacheFunctionProps<T>): Promise<T | null>;\n}\n\nexport interface PagedCacheDefinition<T, Args extends any[]> {\n  /**\n   * Function to fetch a page.\n   * The function receives the current state of the cache, including previously fetched pages.\n   */\n  fetchPage: (this: PagedCache<T, Args>, props: PageCacheFunctionProps<T>) => Promise<T | null>;\n  /**\n   * Optional function to determine the total number of pages - usually based on data in the fetched pages.\n   */\n  getPageCount?: (this: PagedCache<T, Args>, pages: T[]) => number | null;\n  /**\n   * Optional function to determine if there are more pages to fetch - usually based on data in the fetched pages.\n   * If not provided, it will be assumed there are more pages until getPageCount is provided and the number of fetched pages equals the page count or until fetchPage returns null.\n   */\n  hasMorePages?: (this: PagedCache<T, Args>, pages: T[]) => boolean;\n}\n\nexport interface PagedCacheDefinitionFunction<T, Args extends any[]> {\n  (...args: Args): PagedCacheDefinition<T, Args>;\n}\n\nexport interface PagedCacheState<T> {\n  pages: T[];\n  hasMore: boolean;\n  pageCount: number | null;\n}\n\nexport interface FetchNextPageOptions {\n  /**\n   * If true, will throw if the cache is in an error state or if another page is being fetched.\n   */\n  throwOnError?: boolean;\n}\n\nexport class PagedCache<T, Args extends any[] = []> extends Cache<PagedCacheState<T>, Args> {\n  constructor(\n    public readonly definition: PagedCacheDefinition<T, Args>,\n    args: Args,\n    options: CacheOptions<PagedCacheState<T>, Args> = {},\n  ) {\n    super(async (helpers) => loadPage(this, helpers, []), args, options, undefined);\n    autobind(PagedCache);\n  }\n\n  async fetchNextPage({ throwOnError }: FetchNextPageOptions = {}): Promise<void> {\n    const { status, isStale, isUpdating, value } = this.state.get();\n\n    if (status === 'error') {\n      if (!throwOnError) return;\n      throw new Error('Cannot fetch next page while cache is in error state');\n    }\n\n    if (isUpdating) {\n      if (!throwOnError) return;\n      throw new Error('Cannot fetch next page while another page is being fetched');\n    }\n\n    if (status === 'pending' || isStale) {\n      await this.get().catch(() => {});\n      return;\n    }\n\n    if (!value.hasMore) {\n      if (!throwOnError) return;\n      throw new Error('No more pages to fetch');\n    }\n\n    this.stalePromise = this.calculatedValue?.value;\n\n    const ac = new AbortController();\n    const promise = loadPage(\n      this,\n      {\n        use() {\n          throw new Error('Not implemented');\n        },\n        connect() {\n          throw new Error('Not implemented');\n        },\n        signal: ac.signal,\n      },\n      value.pages,\n    );\n\n    this.updateValue(promise);\n\n    try {\n      await promise;\n    } catch (error) {\n      if (!throwOnError) return;\n      throw error;\n    }\n  }\n}\n\nasync function loadPage<T, Args extends any[]>(\n  cache: PagedCache<T, Args>,\n  helpers: CalculationActions<Promise<PagedCacheState<T>>>,\n  oldPages: T[],\n) {\n  const { fetchPage, hasMorePages, getPageCount } = cache.definition;\n\n  const page = await fetchPage.call(cache, {\n    ...helpers,\n    pages: oldPages,\n    prevPage: oldPages.length > 0 ? oldPages[oldPages.length - 1]! : null,\n  });\n\n  const pages = page === null ? oldPages : oldPages.concat(page);\n  const pageCount = getPageCount?.call(cache, pages) ?? null;\n  const hasMore = hasMorePages\n    ? hasMorePages.call(cache, pages)\n    : pageCount !== null\n      ? pages.length < pageCount\n      : page !== null;\n\n  return { pages, hasMore, pageCount };\n}\n\nfunction createPaged<T, Args extends any[] = []>(\n  definition: PagedCacheDefinitionFunction<T, Args>,\n  options?: CacheOptions<PagedCacheState<T>, Args>,\n): CreateCacheResult<PagedCacheState<T>, Args, PagedCache<T, Args>>;\n\nfunction createPaged<T>(\n  definition: PagedCacheDefinition<T, []>,\n  options?: CacheOptions<PagedCacheState<T>, []>,\n): CreateCacheResult<PagedCacheState<T>, [], PagedCache<T, []>>;\n\nfunction createPaged<T, Args extends any[] = []>(\n  definition: PagedCacheDefinitionFunction<T, Args> | PagedCacheDefinition<T, Args>,\n  options?: CacheOptions<PagedCacheState<T>, Args>,\n): CreateCacheResult<PagedCacheState<T>, Args, PagedCache<T, Args>> {\n  return internalCreate<PagedCacheState<T>, Args, PagedCache<T, Args>>((args, options) => {\n    let currentDefinition = definition;\n    if (currentDefinition instanceof Function) {\n      currentDefinition = currentDefinition(...args);\n    }\n    return new PagedCache(currentDefinition, args, options);\n  }, options);\n}\n\nexport const createPagedCache: typeof createPaged & { defaultOptions: CacheOptions<any, any> } =\n  /* @__PURE__ */ Object.assign(createPaged, {\n    defaultOptions: defaultCacheOptions,\n  });\n","export function findOrDefault<T>(\n  array: T[],\n  predicate: (item: T) => boolean,\n  defaultValue: T | (() => T),\n): T {\n  const index = array.findIndex(predicate);\n\n  if (index >= 0) {\n    return array[index]!;\n  }\n\n  const value = defaultValue instanceof Function ? defaultValue() : defaultValue;\n  array.push(value);\n  return value;\n}\n"],"mappings":";;;;;;;;;AA2DA,IAAa,aAAb,MAAa,mBAA+CA,oBAAgC;CAC1F,YACE,AAAgBC,YAChB,MACA,UAAkD,IAClD;AACA,QAAM,OAAO,YAAY,SAAS,MAAM,SAAS,KAAK,MAAM,SAAS;EAJrD;AAKhB,yBAAS;;CAGX,MAAM,cAAc,EAAE,iBAAuC,IAAmB;EAC9E,MAAM,EAAE,QAAQ,SAAS,YAAY,UAAU,KAAK,MAAM;AAE1D,MAAI,WAAW,SAAS;AACtB,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM;;AAGlB,MAAI,YAAY;AACd,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM;;AAGlB,MAAI,WAAW,aAAa,SAAS;AACnC,SAAM,KAAK,MAAM,YAAY;AAC7B;;AAGF,MAAI,CAAC,MAAM,SAAS;AAClB,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM;;AAGlB,OAAK,eAAe,KAAK,iBAAiB;EAE1C,MAAM,KAAK,IAAI;EACf,MAAM,UAAU,SACd,MACA;GACE,MAAM;AACJ,UAAM,IAAI,MAAM;;GAElB,UAAU;AACR,UAAM,IAAI,MAAM;;GAElB,QAAQ,GAAG;KAEb,MAAM;AAGR,OAAK,YAAY;AAEjB,MAAI;AACF,SAAM;WACC,OAAO;AACd,OAAI,CAAC,aAAc;AACnB,SAAM;;;;AAKZ,eAAe,SACb,OACA,SACA,UACA;CACA,MAAM,EAAE,WAAW,cAAc,iBAAiB,MAAM;CAExD,MAAM,OAAO,MAAM,UAAU,KAAK,OAAO;EACvC,GAAG;EACH,OAAO;EACP,UAAU,SAAS,SAAS,IAAI,SAAS,SAAS,SAAS,KAAM;;CAGnE,MAAM,QAAQ,SAAS,OAAO,WAAW,SAAS,OAAO;CACzD,MAAM,YAAY,cAAc,KAAK,OAAO,UAAU;CACtD,MAAM,UAAU,eACZ,aAAa,KAAK,OAAO,SACzB,cAAc,OACZ,MAAM,SAAS,YACf,SAAS;AAEf,QAAO;EAAE;EAAO;EAAS;;;AAa3B,SAAS,YACP,YACA,SACkE;AAClE,QAAOC,8BAA+D,MAAM,cAAY;EACtF,IAAI,oBAAoB;AACxB,MAAI,6BAA6B,SAC/B,qBAAoB,kBAAkB,GAAG;AAE3C,SAAO,IAAI,WAAW,mBAAmB,MAAMC;IAC9C;;AAGL,MAAaC,mBACK,uBAAO,OAAO,aAAa,EACzC,gBAAgBC;;;;ACzKpB,SAAgB,cACd,OACA,WACA,cACG;CACH,MAAM,QAAQ,MAAM,UAAU;AAE9B,KAAI,SAAS,EACX,QAAO,MAAM;CAGf,MAAM,QAAQ,wBAAwB,WAAW,iBAAiB;AAClE,OAAM,KAAK;AACX,QAAO"}
+{"version":3,"file":"index.cjs","names":["Cache","definition: PagedCacheDefinition<T, Args>","internalCreate","options","createPagedCache: typeof createPaged & { defaultOptions: CacheOptions<any, any> }","defaultCacheOptions"],"sources":["../src/core/pagedCache.ts","../src/lib/updateHelpers.ts"],"sourcesContent":["import {\n  Cache,\n  defaultCacheOptions,\n  internalCreate,\n  type CacheOptions,\n  type CreateCacheResult,\n} from '@core/cache';\nimport type { CalculationActions } from '@core/commonTypes';\nimport { autobind } from '@lib/autobind';\n\nexport interface PageCacheFunctionProps<T> extends CalculationActions<Promise<PagedCacheState<T>>> {\n  /**\n   * Previously fetched pages (in order).\n   */\n  pages: T[];\n  /**\n   * Last fetched page or null if there are no previously fetched pages.\n   */\n  prevPage: T | null;\n}\n\nexport interface PageCacheFunction<T> {\n  (props: PageCacheFunctionProps<T>): Promise<T | null>;\n}\n\nexport interface PagedCacheDefinition<T, Args extends any[]> {\n  /**\n   * Function to fetch a page.\n   * The function receives the current state of the cache, including previously fetched pages.\n   */\n  fetchPage: (this: PagedCache<T, Args>, props: PageCacheFunctionProps<T>) => Promise<T | null>;\n  /**\n   * Optional function to determine the total number of pages - usually based on data in the fetched pages.\n   */\n  getPageCount?: (this: PagedCache<T, Args>, pages: T[]) => number | null;\n  /**\n   * Optional function to determine if there are more pages to fetch - usually based on data in the fetched pages.\n   * If not provided, it will be assumed there are more pages until getPageCount is provided and the number of fetched pages equals the page count or until fetchPage returns null.\n   */\n  hasMorePages?: (this: PagedCache<T, Args>, pages: T[]) => boolean;\n}\n\nexport interface PagedCacheDefinitionFunction<T, Args extends any[]> {\n  (...args: Args): PagedCacheDefinition<T, Args>;\n}\n\nexport interface PagedCacheState<T> {\n  pages: T[];\n  hasMore: boolean;\n  pageCount: number | null;\n}\n\nexport interface FetchNextPageOptions {\n  /**\n   * If true, will throw if the cache is in an error state or if another page is being fetched.\n   */\n  throwOnError?: boolean;\n}\n\nexport class PagedCache<T, Args extends any[] = []> extends Cache<PagedCacheState<T>, Args> {\n  constructor(\n    public readonly definition: PagedCacheDefinition<T, Args>,\n    args: Args,\n    options: CacheOptions<PagedCacheState<T>, Args> = {},\n  ) {\n    super(async (helpers) => loadPage(this, helpers, []), args, options, undefined);\n    autobind(PagedCache);\n  }\n\n  async fetchNextPage({ throwOnError }: FetchNextPageOptions = {}): Promise<void> {\n    const { status, isStale, isUpdating, value } = this.state.get();\n\n    if (status === 'error') {\n      if (!throwOnError) return;\n      throw new Error('Cannot fetch next page while cache is in error state');\n    }\n\n    if (isUpdating) {\n      if (!throwOnError) return;\n      throw new Error('Cannot fetch next page while another page is being fetched');\n    }\n\n    if (status === 'pending' || isStale) {\n      await this.get().catch(() => {});\n      return;\n    }\n\n    if (!value.hasMore) {\n      if (!throwOnError) return;\n      throw new Error('No more pages to fetch');\n    }\n\n    this.stalePromise = this.calculatedValue?.value;\n\n    const ac = new AbortController();\n    const promise = loadPage(\n      this,\n      {\n        use() {\n          throw new Error('Not implemented');\n        },\n        connect() {\n          throw new Error('Not implemented');\n        },\n        signal: ac.signal,\n      },\n      value.pages,\n    );\n\n    this.updateValue(promise);\n\n    try {\n      await promise;\n    } catch (error) {\n      if (!throwOnError) return;\n      throw error;\n    }\n  }\n}\n\nasync function loadPage<T, Args extends any[]>(\n  cache: PagedCache<T, Args>,\n  helpers: CalculationActions<Promise<PagedCacheState<T>>>,\n  oldPages: T[],\n) {\n  const { fetchPage, hasMorePages, getPageCount } = cache.definition;\n\n  const page = await fetchPage.call(cache, {\n    ...helpers,\n    pages: oldPages,\n    prevPage: oldPages.length > 0 ? oldPages[oldPages.length - 1]! : null,\n  });\n\n  const pages = page === null ? oldPages : oldPages.concat(page);\n  const pageCount = getPageCount?.call(cache, pages) ?? null;\n  const hasMore = hasMorePages\n    ? hasMorePages.call(cache, pages)\n    : pageCount !== null\n      ? pages.length < pageCount\n      : page !== null;\n\n  return { pages, hasMore, pageCount };\n}\n\nfunction createPaged<T, Args extends any[] = []>(\n  definition: PagedCacheDefinitionFunction<T, Args>,\n  options?: CacheOptions<PagedCacheState<T>, Args>,\n): CreateCacheResult<PagedCacheState<T>, Args, PagedCache<T, Args>>;\n\nfunction createPaged<T>(\n  definition: PagedCacheDefinition<T, []>,\n  options?: CacheOptions<PagedCacheState<T>, []>,\n): CreateCacheResult<PagedCacheState<T>, [], PagedCache<T, []>>;\n\nfunction createPaged<T, Args extends any[] = []>(\n  definition: PagedCacheDefinitionFunction<T, Args> | PagedCacheDefinition<T, Args>,\n  options?: CacheOptions<PagedCacheState<T>, Args>,\n): CreateCacheResult<PagedCacheState<T>, Args, PagedCache<T, Args>> {\n  return internalCreate<PagedCacheState<T>, Args, PagedCache<T, Args>>((args, options) => {\n    let currentDefinition = definition;\n    if (currentDefinition instanceof Function) {\n      currentDefinition = currentDefinition(...args);\n    }\n    return new PagedCache(currentDefinition, args, options);\n  }, options);\n}\n\nexport const createPagedCache: typeof createPaged & { defaultOptions: CacheOptions<any, any> } =\n  /* @__PURE__ */ Object.assign(createPaged, {\n    defaultOptions: defaultCacheOptions,\n  });\n","export function findOrDefault<T>(\n  array: T[],\n  predicate: (item: T) => boolean,\n  defaultValue: T | (() => T),\n): T {\n  const index = array.findIndex(predicate);\n\n  if (index >= 0) {\n    return array[index]!;\n  }\n\n  const value = defaultValue instanceof Function ? defaultValue() : defaultValue;\n  array.push(value);\n  return value;\n}\n"],"mappings":";;;;;;;;AA2DA,IAAa,aAAb,MAAa,mBAA+CA,oBAAgC;CAC1F,YACE,AAAgBC,YAChB,MACA,UAAkD,EAAE,EACpD;AACA,QAAM,OAAO,YAAY,SAAS,MAAM,SAAS,EAAE,CAAC,EAAE,MAAM,SAAS,OAAU;EAJ/D;AAKhB,yBAAS,WAAW;;CAGtB,MAAM,cAAc,EAAE,iBAAuC,EAAE,EAAiB;EAC9E,MAAM,EAAE,QAAQ,SAAS,YAAY,UAAU,KAAK,MAAM,KAAK;AAE/D,MAAI,WAAW,SAAS;AACtB,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM,uDAAuD;;AAGzE,MAAI,YAAY;AACd,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM,6DAA6D;;AAG/E,MAAI,WAAW,aAAa,SAAS;AACnC,SAAM,KAAK,KAAK,CAAC,YAAY,GAAG;AAChC;;AAGF,MAAI,CAAC,MAAM,SAAS;AAClB,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM,yBAAyB;;AAG3C,OAAK,eAAe,KAAK,iBAAiB;EAE1C,MAAM,KAAK,IAAI,iBAAiB;EAChC,MAAM,UAAU,SACd,MACA;GACE,MAAM;AACJ,UAAM,IAAI,MAAM,kBAAkB;;GAEpC,UAAU;AACR,UAAM,IAAI,MAAM,kBAAkB;;GAEpC,QAAQ,GAAG;GACZ,EACD,MAAM,MACP;AAED,OAAK,YAAY,QAAQ;AAEzB,MAAI;AACF,SAAM;WACC,OAAO;AACd,OAAI,CAAC,aAAc;AACnB,SAAM;;;;AAKZ,eAAe,SACb,OACA,SACA,UACA;CACA,MAAM,EAAE,WAAW,cAAc,iBAAiB,MAAM;CAExD,MAAM,OAAO,MAAM,UAAU,KAAK,OAAO;EACvC,GAAG;EACH,OAAO;EACP,UAAU,SAAS,SAAS,IAAI,SAAS,SAAS,SAAS,KAAM;EAClE,CAAC;CAEF,MAAM,QAAQ,SAAS,OAAO,WAAW,SAAS,OAAO,KAAK;CAC9D,MAAM,YAAY,cAAc,KAAK,OAAO,MAAM,IAAI;AAOtD,QAAO;EAAE;EAAO,SANA,eACZ,aAAa,KAAK,OAAO,MAAM,GAC/B,cAAc,OACZ,MAAM,SAAS,YACf,SAAS;EAEU;EAAW;;AAatC,SAAS,YACP,YACA,SACkE;AAClE,QAAOC,8BAA+D,MAAM,cAAY;EACtF,IAAI,oBAAoB;AACxB,MAAI,6BAA6B,SAC/B,qBAAoB,kBAAkB,GAAG,KAAK;AAEhD,SAAO,IAAI,WAAW,mBAAmB,MAAMC,UAAQ;IACtD,QAAQ;;AAGb,MAAaC,mBACK,uBAAO,OAAO,aAAa,EACzC,gBAAgBC,mCACjB,CAAC;;;;AC1KJ,SAAgB,cACd,OACA,WACA,cACG;CACH,MAAM,QAAQ,MAAM,UAAU,UAAU;AAExC,KAAI,SAAS,EACX,QAAO,MAAM;CAGf,MAAM,QAAQ,wBAAwB,WAAW,cAAc,GAAG;AAClE,OAAM,KAAK,MAAM;AACjB,QAAO"}

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-import { Cache, CacheBundle, CacheFunction, CacheGetOptions, CacheOptions, CacheState, CreateCacheResult, ErrorState, PendingState, Resource, ResourceGroup, Scope, ValueState, allResources, createCache, createResourceGroup, createScope } from "./scope-CcBxgcrs.cjs";
-import { AsyncConnectionActions, AsyncUpdateFunction, BaseConnectionActions, BoundStoreMethods, CalculationActions, Cancel, Connection, ConnectionActions, Constrain, DisposableCancel, Duration, Effect, KeyType, Listener, Path, PathAsArray, PathAsString, Selector, SettablePath, SettablePathAsArray, SettablePathAsString, SettableValue, Store, StoreMethods, StoreOptions, StoreOptionsWithMethods, SubscribeOptions, Update, UpdateFrom, UpdateFunction, Use, Value, arrayMethods, createStore, mapMethods, recordMethods, setMethods } from "./store-MBrcOgtz.cjs";
-import { Patch, diff } from "./diff-BslUrJZE.cjs";
-import { Persist, PersistOptions, PersistStorage, PersistStorageBase, PersistStorageWithKeys, PersistStorageWithLength, PersistStorageWithListItems, persist } from "./persist-DVKRq8RQ.cjs";
+import { _ as ValueState, a as CacheFunction, c as CreateCacheResult, d as ResourceGroup, f as allResources, g as PendingState, h as ErrorState, i as CacheBundle, l as createCache, m as CacheState, n as createScope, o as CacheGetOptions, p as createResourceGroup, r as Cache, s as CacheOptions, t as Scope, u as Resource } from "./scope-CESkVNvI.cjs";
+import { B as Value, C as Selector, D as UpdateFunction, E as UpdateFrom, F as PathAsString, I as SettablePath, K as Constrain, L as SettablePathAsArray, M as KeyType, N as Path, O as Use, P as PathAsArray, R as SettablePathAsString, S as Listener, T as Update, _ as Connection, a as StoreOptions, b as Duration, c as arrayMethods, d as setMethods, f as AsyncConnectionActions, g as Cancel, h as CalculationActions, i as StoreMethods, l as mapMethods, m as BaseConnectionActions, o as StoreOptionsWithMethods, p as AsyncUpdateFunction, r as Store, s as createStore, t as BoundStoreMethods, u as recordMethods, v as ConnectionActions, w as SubscribeOptions, x as Effect, y as DisposableCancel, z as SettableValue } from "./store-XcnTdeiJ.cjs";
+import { n as Patch, r as diff } from "./diff-CAQaunfv.cjs";
+import { a as PersistStorageBase, c as PersistStorageWithListItems, i as PersistStorage, n as PersistOptions, o as PersistStorageWithKeys, r as persist, s as PersistStorageWithLength, t as Persist } from "./persist-CHRYYolx.cjs";
 
 //#region src/core/pagedCache.d.ts
 interface PageCacheFunctionProps<T> extends CalculationActions<Promise<PagedCacheState<T>>> {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { Cache, CacheBundle, CacheFunction, CacheGetOptions, CacheOptions, CacheState, CreateCacheResult, ErrorState, PendingState, Resource, ResourceGroup, Scope, ValueState, allResources, createCache, createResourceGroup, createScope } from "./scope-D3jkIPgn.js";
-import { AsyncConnectionActions, AsyncUpdateFunction, BaseConnectionActions, BoundStoreMethods, CalculationActions, Cancel, Connection, ConnectionActions, Constrain, DisposableCancel, Duration, Effect, KeyType, Listener, Path, PathAsArray, PathAsString, Selector, SettablePath, SettablePathAsArray, SettablePathAsString, SettableValue, Store, StoreMethods, StoreOptions, StoreOptionsWithMethods, SubscribeOptions, Update, UpdateFrom, UpdateFunction, Use, Value, arrayMethods, createStore, mapMethods, recordMethods, setMethods } from "./store-DnZ6fsiJ.js";
-import { Patch, diff } from "./diff-CElc7pJI.js";
-import { Persist, PersistOptions, PersistStorage, PersistStorageBase, PersistStorageWithKeys, PersistStorageWithLength, PersistStorageWithListItems, persist } from "./persist-olbNkcdZ.js";
+import { _ as ValueState, a as CacheFunction, c as CreateCacheResult, d as ResourceGroup, f as allResources, g as PendingState, h as ErrorState, i as CacheBundle, l as createCache, m as CacheState, n as createScope, o as CacheGetOptions, p as createResourceGroup, r as Cache, s as CacheOptions, t as Scope, u as Resource } from "./scope-DJXSRsGy.js";
+import { B as Value, C as Selector, D as UpdateFunction, E as UpdateFrom, F as PathAsString, I as SettablePath, K as Constrain, L as SettablePathAsArray, M as KeyType, N as Path, O as Use, P as PathAsArray, R as SettablePathAsString, S as Listener, T as Update, _ as Connection, a as StoreOptions, b as Duration, c as arrayMethods, d as setMethods, f as AsyncConnectionActions, g as Cancel, h as CalculationActions, i as StoreMethods, l as mapMethods, m as BaseConnectionActions, o as StoreOptionsWithMethods, p as AsyncUpdateFunction, r as Store, s as createStore, t as BoundStoreMethods, u as recordMethods, v as ConnectionActions, w as SubscribeOptions, x as Effect, y as DisposableCancel, z as SettableValue } from "./store-BRHFhRPm.js";
+import { n as Patch, r as diff } from "./diff-DFvRd-Gf.js";
+import { a as PersistStorageBase, c as PersistStorageWithListItems, i as PersistStorage, n as PersistOptions, o as PersistStorageWithKeys, r as persist, s as PersistStorageWithLength, t as Persist } from "./persist-DyI_JLxZ.js";
 
 //#region src/core/pagedCache.d.ts
 interface PageCacheFunctionProps<T> extends CalculationActions<Promise<PagedCacheState<T>>> {

package/dist/index.js

@@ -1,10 +1,9 @@
-import { Store, arrayMethods, autobind, calcDuration, createStore, mapMethods, recordMethods, setMethods } from "./store-Dx8w7yT-.js";
-import { deepEqual, get, set, shallowEqual, strictEqual } from "./propAccess-B260LXN1.js";
-import { hash, simpleHash } from "./hash-DNFM5y_h.js";
-import { Cache, InstanceCache, ResourceGroup, Scope, allResources, createCache, createResourceGroup, createScope, defaultCacheOptions, internalCreate } from "./scope-7LeON9bZ.js";
-import { applyPatches, diff } from "./patchMethods-C_f3PORQ.js";
-import { fromExtendedJson, fromExtendedJsonString, toExtendedJson, toExtendedJsonString } from "./extendedJson-BZkQBXEv.js";
-import { persist } from "./persist-CLgS5Cqw.js";
+import { a as mapMethods, h as autobind, i as arrayMethods, m as calcDuration, n as createStore, o as recordMethods, s as setMethods, t as Store } from "./store-v3RYWzVg.js";
+import { a as set, c as deepEqual, l as shallowEqual, n as get, u as strictEqual } from "./propAccess-DvWFpYoj.js";
+import { a as defaultCacheOptions, c as allResources, d as hash, f as simpleHash, i as createCache, l as createResourceGroup, n as createScope, o as internalCreate, r as Cache, s as ResourceGroup, t as Scope, u as InstanceCache } from "./scope-CKGsCVn3.js";
+import { i as applyPatches, r as diff } from "./patchMethods-iK2F87G0.js";
+import { i as toExtendedJsonString, n as fromExtendedJsonString, r as toExtendedJson, t as fromExtendedJson } from "./extendedJson-Dv9q6rps.js";
+import { t as persist } from "./persist-Bunx8xfQ.js";
 
 //#region src/core/pagedCache.ts
 var PagedCache = class PagedCache extends Cache {
@@ -60,10 +59,9 @@ async function loadPage(cache, helpers, oldPages) {
 	});
 	const pages = page === null ? oldPages : oldPages.concat(page);
 	const pageCount = getPageCount?.call(cache, pages) ?? null;
-	const hasMore = hasMorePages ? hasMorePages.call(cache, pages) : pageCount !== null ? pages.length < pageCount : page !== null;
 	return {
 		pages,
-		hasMore,
+		hasMore: hasMorePages ? hasMorePages.call(cache, pages) : pageCount !== null ? pages.length < pageCount : page !== null,
 		pageCount
 	};
 }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["definition: PagedCacheDefinition<T, Args>","options","createPagedCache: typeof createPaged & { defaultOptions: CacheOptions<any, any> }"],"sources":["../src/core/pagedCache.ts","../src/lib/updateHelpers.ts"],"sourcesContent":["import {\n  Cache,\n  defaultCacheOptions,\n  internalCreate,\n  type CacheOptions,\n  type CreateCacheResult,\n} from '@core/cache';\nimport type { CalculationActions } from '@core/commonTypes';\nimport { autobind } from '@lib/autobind';\n\nexport interface PageCacheFunctionProps<T> extends CalculationActions<Promise<PagedCacheState<T>>> {\n  /**\n   * Previously fetched pages (in order).\n   */\n  pages: T[];\n  /**\n   * Last fetched page or null if there are no previously fetched pages.\n   */\n  prevPage: T | null;\n}\n\nexport interface PageCacheFunction<T> {\n  (props: PageCacheFunctionProps<T>): Promise<T | null>;\n}\n\nexport interface PagedCacheDefinition<T, Args extends any[]> {\n  /**\n   * Function to fetch a page.\n   * The function receives the current state of the cache, including previously fetched pages.\n   */\n  fetchPage: (this: PagedCache<T, Args>, props: PageCacheFunctionProps<T>) => Promise<T | null>;\n  /**\n   * Optional function to determine the total number of pages - usually based on data in the fetched pages.\n   */\n  getPageCount?: (this: PagedCache<T, Args>, pages: T[]) => number | null;\n  /**\n   * Optional function to determine if there are more pages to fetch - usually based on data in the fetched pages.\n   * If not provided, it will be assumed there are more pages until getPageCount is provided and the number of fetched pages equals the page count or until fetchPage returns null.\n   */\n  hasMorePages?: (this: PagedCache<T, Args>, pages: T[]) => boolean;\n}\n\nexport interface PagedCacheDefinitionFunction<T, Args extends any[]> {\n  (...args: Args): PagedCacheDefinition<T, Args>;\n}\n\nexport interface PagedCacheState<T> {\n  pages: T[];\n  hasMore: boolean;\n  pageCount: number | null;\n}\n\nexport interface FetchNextPageOptions {\n  /**\n   * If true, will throw if the cache is in an error state or if another page is being fetched.\n   */\n  throwOnError?: boolean;\n}\n\nexport class PagedCache<T, Args extends any[] = []> extends Cache<PagedCacheState<T>, Args> {\n  constructor(\n    public readonly definition: PagedCacheDefinition<T, Args>,\n    args: Args,\n    options: CacheOptions<PagedCacheState<T>, Args> = {},\n  ) {\n    super(async (helpers) => loadPage(this, helpers, []), args, options, undefined);\n    autobind(PagedCache);\n  }\n\n  async fetchNextPage({ throwOnError }: FetchNextPageOptions = {}): Promise<void> {\n    const { status, isStale, isUpdating, value } = this.state.get();\n\n    if (status === 'error') {\n      if (!throwOnError) return;\n      throw new Error('Cannot fetch next page while cache is in error state');\n    }\n\n    if (isUpdating) {\n      if (!throwOnError) return;\n      throw new Error('Cannot fetch next page while another page is being fetched');\n    }\n\n    if (status === 'pending' || isStale) {\n      await this.get().catch(() => {});\n      return;\n    }\n\n    if (!value.hasMore) {\n      if (!throwOnError) return;\n      throw new Error('No more pages to fetch');\n    }\n\n    this.stalePromise = this.calculatedValue?.value;\n\n    const ac = new AbortController();\n    const promise = loadPage(\n      this,\n      {\n        use() {\n          throw new Error('Not implemented');\n        },\n        connect() {\n          throw new Error('Not implemented');\n        },\n        signal: ac.signal,\n      },\n      value.pages,\n    );\n\n    this.updateValue(promise);\n\n    try {\n      await promise;\n    } catch (error) {\n      if (!throwOnError) return;\n      throw error;\n    }\n  }\n}\n\nasync function loadPage<T, Args extends any[]>(\n  cache: PagedCache<T, Args>,\n  helpers: CalculationActions<Promise<PagedCacheState<T>>>,\n  oldPages: T[],\n) {\n  const { fetchPage, hasMorePages, getPageCount } = cache.definition;\n\n  const page = await fetchPage.call(cache, {\n    ...helpers,\n    pages: oldPages,\n    prevPage: oldPages.length > 0 ? oldPages[oldPages.length - 1]! : null,\n  });\n\n  const pages = page === null ? oldPages : oldPages.concat(page);\n  const pageCount = getPageCount?.call(cache, pages) ?? null;\n  const hasMore = hasMorePages\n    ? hasMorePages.call(cache, pages)\n    : pageCount !== null\n      ? pages.length < pageCount\n      : page !== null;\n\n  return { pages, hasMore, pageCount };\n}\n\nfunction createPaged<T, Args extends any[] = []>(\n  definition: PagedCacheDefinitionFunction<T, Args>,\n  options?: CacheOptions<PagedCacheState<T>, Args>,\n): CreateCacheResult<PagedCacheState<T>, Args, PagedCache<T, Args>>;\n\nfunction createPaged<T>(\n  definition: PagedCacheDefinition<T, []>,\n  options?: CacheOptions<PagedCacheState<T>, []>,\n): CreateCacheResult<PagedCacheState<T>, [], PagedCache<T, []>>;\n\nfunction createPaged<T, Args extends any[] = []>(\n  definition: PagedCacheDefinitionFunction<T, Args> | PagedCacheDefinition<T, Args>,\n  options?: CacheOptions<PagedCacheState<T>, Args>,\n): CreateCacheResult<PagedCacheState<T>, Args, PagedCache<T, Args>> {\n  return internalCreate<PagedCacheState<T>, Args, PagedCache<T, Args>>((args, options) => {\n    let currentDefinition = definition;\n    if (currentDefinition instanceof Function) {\n      currentDefinition = currentDefinition(...args);\n    }\n    return new PagedCache(currentDefinition, args, options);\n  }, options);\n}\n\nexport const createPagedCache: typeof createPaged & { defaultOptions: CacheOptions<any, any> } =\n  /* @__PURE__ */ Object.assign(createPaged, {\n    defaultOptions: defaultCacheOptions,\n  });\n","export function findOrDefault<T>(\n  array: T[],\n  predicate: (item: T) => boolean,\n  defaultValue: T | (() => T),\n): T {\n  const index = array.findIndex(predicate);\n\n  if (index >= 0) {\n    return array[index]!;\n  }\n\n  const value = defaultValue instanceof Function ? defaultValue() : defaultValue;\n  array.push(value);\n  return value;\n}\n"],"mappings":";;;;;;;;;AA2DA,IAAa,aAAb,MAAa,mBAA+C,MAAgC;CAC1F,YACE,AAAgBA,YAChB,MACA,UAAkD,IAClD;AACA,QAAM,OAAO,YAAY,SAAS,MAAM,SAAS,KAAK,MAAM,SAAS;EAJrD;AAKhB,WAAS;;CAGX,MAAM,cAAc,EAAE,iBAAuC,IAAmB;EAC9E,MAAM,EAAE,QAAQ,SAAS,YAAY,UAAU,KAAK,MAAM;AAE1D,MAAI,WAAW,SAAS;AACtB,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM;;AAGlB,MAAI,YAAY;AACd,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM;;AAGlB,MAAI,WAAW,aAAa,SAAS;AACnC,SAAM,KAAK,MAAM,YAAY;AAC7B;;AAGF,MAAI,CAAC,MAAM,SAAS;AAClB,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM;;AAGlB,OAAK,eAAe,KAAK,iBAAiB;EAE1C,MAAM,KAAK,IAAI;EACf,MAAM,UAAU,SACd,MACA;GACE,MAAM;AACJ,UAAM,IAAI,MAAM;;GAElB,UAAU;AACR,UAAM,IAAI,MAAM;;GAElB,QAAQ,GAAG;KAEb,MAAM;AAGR,OAAK,YAAY;AAEjB,MAAI;AACF,SAAM;WACC,OAAO;AACd,OAAI,CAAC,aAAc;AACnB,SAAM;;;;AAKZ,eAAe,SACb,OACA,SACA,UACA;CACA,MAAM,EAAE,WAAW,cAAc,iBAAiB,MAAM;CAExD,MAAM,OAAO,MAAM,UAAU,KAAK,OAAO;EACvC,GAAG;EACH,OAAO;EACP,UAAU,SAAS,SAAS,IAAI,SAAS,SAAS,SAAS,KAAM;;CAGnE,MAAM,QAAQ,SAAS,OAAO,WAAW,SAAS,OAAO;CACzD,MAAM,YAAY,cAAc,KAAK,OAAO,UAAU;CACtD,MAAM,UAAU,eACZ,aAAa,KAAK,OAAO,SACzB,cAAc,OACZ,MAAM,SAAS,YACf,SAAS;AAEf,QAAO;EAAE;EAAO;EAAS;;;AAa3B,SAAS,YACP,YACA,SACkE;AAClE,QAAO,gBAA+D,MAAM,cAAY;EACtF,IAAI,oBAAoB;AACxB,MAAI,6BAA6B,SAC/B,qBAAoB,kBAAkB,GAAG;AAE3C,SAAO,IAAI,WAAW,mBAAmB,MAAMC;IAC9C;;AAGL,MAAaC,mBACK,uBAAO,OAAO,aAAa,EACzC,gBAAgB;;;;ACzKpB,SAAgB,cACd,OACA,WACA,cACG;CACH,MAAM,QAAQ,MAAM,UAAU;AAE9B,KAAI,SAAS,EACX,QAAO,MAAM;CAGf,MAAM,QAAQ,wBAAwB,WAAW,iBAAiB;AAClE,OAAM,KAAK;AACX,QAAO"}
+{"version":3,"file":"index.js","names":["definition: PagedCacheDefinition<T, Args>","options","createPagedCache: typeof createPaged & { defaultOptions: CacheOptions<any, any> }"],"sources":["../src/core/pagedCache.ts","../src/lib/updateHelpers.ts"],"sourcesContent":["import {\n  Cache,\n  defaultCacheOptions,\n  internalCreate,\n  type CacheOptions,\n  type CreateCacheResult,\n} from '@core/cache';\nimport type { CalculationActions } from '@core/commonTypes';\nimport { autobind } from '@lib/autobind';\n\nexport interface PageCacheFunctionProps<T> extends CalculationActions<Promise<PagedCacheState<T>>> {\n  /**\n   * Previously fetched pages (in order).\n   */\n  pages: T[];\n  /**\n   * Last fetched page or null if there are no previously fetched pages.\n   */\n  prevPage: T | null;\n}\n\nexport interface PageCacheFunction<T> {\n  (props: PageCacheFunctionProps<T>): Promise<T | null>;\n}\n\nexport interface PagedCacheDefinition<T, Args extends any[]> {\n  /**\n   * Function to fetch a page.\n   * The function receives the current state of the cache, including previously fetched pages.\n   */\n  fetchPage: (this: PagedCache<T, Args>, props: PageCacheFunctionProps<T>) => Promise<T | null>;\n  /**\n   * Optional function to determine the total number of pages - usually based on data in the fetched pages.\n   */\n  getPageCount?: (this: PagedCache<T, Args>, pages: T[]) => number | null;\n  /**\n   * Optional function to determine if there are more pages to fetch - usually based on data in the fetched pages.\n   * If not provided, it will be assumed there are more pages until getPageCount is provided and the number of fetched pages equals the page count or until fetchPage returns null.\n   */\n  hasMorePages?: (this: PagedCache<T, Args>, pages: T[]) => boolean;\n}\n\nexport interface PagedCacheDefinitionFunction<T, Args extends any[]> {\n  (...args: Args): PagedCacheDefinition<T, Args>;\n}\n\nexport interface PagedCacheState<T> {\n  pages: T[];\n  hasMore: boolean;\n  pageCount: number | null;\n}\n\nexport interface FetchNextPageOptions {\n  /**\n   * If true, will throw if the cache is in an error state or if another page is being fetched.\n   */\n  throwOnError?: boolean;\n}\n\nexport class PagedCache<T, Args extends any[] = []> extends Cache<PagedCacheState<T>, Args> {\n  constructor(\n    public readonly definition: PagedCacheDefinition<T, Args>,\n    args: Args,\n    options: CacheOptions<PagedCacheState<T>, Args> = {},\n  ) {\n    super(async (helpers) => loadPage(this, helpers, []), args, options, undefined);\n    autobind(PagedCache);\n  }\n\n  async fetchNextPage({ throwOnError }: FetchNextPageOptions = {}): Promise<void> {\n    const { status, isStale, isUpdating, value } = this.state.get();\n\n    if (status === 'error') {\n      if (!throwOnError) return;\n      throw new Error('Cannot fetch next page while cache is in error state');\n    }\n\n    if (isUpdating) {\n      if (!throwOnError) return;\n      throw new Error('Cannot fetch next page while another page is being fetched');\n    }\n\n    if (status === 'pending' || isStale) {\n      await this.get().catch(() => {});\n      return;\n    }\n\n    if (!value.hasMore) {\n      if (!throwOnError) return;\n      throw new Error('No more pages to fetch');\n    }\n\n    this.stalePromise = this.calculatedValue?.value;\n\n    const ac = new AbortController();\n    const promise = loadPage(\n      this,\n      {\n        use() {\n          throw new Error('Not implemented');\n        },\n        connect() {\n          throw new Error('Not implemented');\n        },\n        signal: ac.signal,\n      },\n      value.pages,\n    );\n\n    this.updateValue(promise);\n\n    try {\n      await promise;\n    } catch (error) {\n      if (!throwOnError) return;\n      throw error;\n    }\n  }\n}\n\nasync function loadPage<T, Args extends any[]>(\n  cache: PagedCache<T, Args>,\n  helpers: CalculationActions<Promise<PagedCacheState<T>>>,\n  oldPages: T[],\n) {\n  const { fetchPage, hasMorePages, getPageCount } = cache.definition;\n\n  const page = await fetchPage.call(cache, {\n    ...helpers,\n    pages: oldPages,\n    prevPage: oldPages.length > 0 ? oldPages[oldPages.length - 1]! : null,\n  });\n\n  const pages = page === null ? oldPages : oldPages.concat(page);\n  const pageCount = getPageCount?.call(cache, pages) ?? null;\n  const hasMore = hasMorePages\n    ? hasMorePages.call(cache, pages)\n    : pageCount !== null\n      ? pages.length < pageCount\n      : page !== null;\n\n  return { pages, hasMore, pageCount };\n}\n\nfunction createPaged<T, Args extends any[] = []>(\n  definition: PagedCacheDefinitionFunction<T, Args>,\n  options?: CacheOptions<PagedCacheState<T>, Args>,\n): CreateCacheResult<PagedCacheState<T>, Args, PagedCache<T, Args>>;\n\nfunction createPaged<T>(\n  definition: PagedCacheDefinition<T, []>,\n  options?: CacheOptions<PagedCacheState<T>, []>,\n): CreateCacheResult<PagedCacheState<T>, [], PagedCache<T, []>>;\n\nfunction createPaged<T, Args extends any[] = []>(\n  definition: PagedCacheDefinitionFunction<T, Args> | PagedCacheDefinition<T, Args>,\n  options?: CacheOptions<PagedCacheState<T>, Args>,\n): CreateCacheResult<PagedCacheState<T>, Args, PagedCache<T, Args>> {\n  return internalCreate<PagedCacheState<T>, Args, PagedCache<T, Args>>((args, options) => {\n    let currentDefinition = definition;\n    if (currentDefinition instanceof Function) {\n      currentDefinition = currentDefinition(...args);\n    }\n    return new PagedCache(currentDefinition, args, options);\n  }, options);\n}\n\nexport const createPagedCache: typeof createPaged & { defaultOptions: CacheOptions<any, any> } =\n  /* @__PURE__ */ Object.assign(createPaged, {\n    defaultOptions: defaultCacheOptions,\n  });\n","export function findOrDefault<T>(\n  array: T[],\n  predicate: (item: T) => boolean,\n  defaultValue: T | (() => T),\n): T {\n  const index = array.findIndex(predicate);\n\n  if (index >= 0) {\n    return array[index]!;\n  }\n\n  const value = defaultValue instanceof Function ? defaultValue() : defaultValue;\n  array.push(value);\n  return value;\n}\n"],"mappings":";;;;;;;;AA2DA,IAAa,aAAb,MAAa,mBAA+C,MAAgC;CAC1F,YACE,AAAgBA,YAChB,MACA,UAAkD,EAAE,EACpD;AACA,QAAM,OAAO,YAAY,SAAS,MAAM,SAAS,EAAE,CAAC,EAAE,MAAM,SAAS,OAAU;EAJ/D;AAKhB,WAAS,WAAW;;CAGtB,MAAM,cAAc,EAAE,iBAAuC,EAAE,EAAiB;EAC9E,MAAM,EAAE,QAAQ,SAAS,YAAY,UAAU,KAAK,MAAM,KAAK;AAE/D,MAAI,WAAW,SAAS;AACtB,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM,uDAAuD;;AAGzE,MAAI,YAAY;AACd,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM,6DAA6D;;AAG/E,MAAI,WAAW,aAAa,SAAS;AACnC,SAAM,KAAK,KAAK,CAAC,YAAY,GAAG;AAChC;;AAGF,MAAI,CAAC,MAAM,SAAS;AAClB,OAAI,CAAC,aAAc;AACnB,SAAM,IAAI,MAAM,yBAAyB;;AAG3C,OAAK,eAAe,KAAK,iBAAiB;EAE1C,MAAM,KAAK,IAAI,iBAAiB;EAChC,MAAM,UAAU,SACd,MACA;GACE,MAAM;AACJ,UAAM,IAAI,MAAM,kBAAkB;;GAEpC,UAAU;AACR,UAAM,IAAI,MAAM,kBAAkB;;GAEpC,QAAQ,GAAG;GACZ,EACD,MAAM,MACP;AAED,OAAK,YAAY,QAAQ;AAEzB,MAAI;AACF,SAAM;WACC,OAAO;AACd,OAAI,CAAC,aAAc;AACnB,SAAM;;;;AAKZ,eAAe,SACb,OACA,SACA,UACA;CACA,MAAM,EAAE,WAAW,cAAc,iBAAiB,MAAM;CAExD,MAAM,OAAO,MAAM,UAAU,KAAK,OAAO;EACvC,GAAG;EACH,OAAO;EACP,UAAU,SAAS,SAAS,IAAI,SAAS,SAAS,SAAS,KAAM;EAClE,CAAC;CAEF,MAAM,QAAQ,SAAS,OAAO,WAAW,SAAS,OAAO,KAAK;CAC9D,MAAM,YAAY,cAAc,KAAK,OAAO,MAAM,IAAI;AAOtD,QAAO;EAAE;EAAO,SANA,eACZ,aAAa,KAAK,OAAO,MAAM,GAC/B,cAAc,OACZ,MAAM,SAAS,YACf,SAAS;EAEU;EAAW;;AAatC,SAAS,YACP,YACA,SACkE;AAClE,QAAO,gBAA+D,MAAM,cAAY;EACtF,IAAI,oBAAoB;AACxB,MAAI,6BAA6B,SAC/B,qBAAoB,kBAAkB,GAAG,KAAK;AAEhD,SAAO,IAAI,WAAW,mBAAmB,MAAMC,UAAQ;IACtD,QAAQ;;AAGb,MAAaC,mBACK,uBAAO,OAAO,aAAa,EACzC,gBAAgB,qBACjB,CAAC;;;;AC1KJ,SAAgB,cACd,OACA,WACA,cACG;CACH,MAAM,QAAQ,MAAM,UAAU,UAAU;AAExC,KAAI,SAAS,EACX,QAAO,MAAM;CAGf,MAAM,QAAQ,wBAAwB,WAAW,cAAc,GAAG;AAClE,OAAM,KAAK,MAAM;AACjB,QAAO"}

package/dist/mutative/index.cjs

@@ -1,3 +1,4 @@
-const require_mutativeMethods = require('../mutativeMethods-CgXk_bMt.cjs');
+require('../path-B-Rq5q6m.cjs');
+const require_mutativeMethods = require('../mutativeMethods-CkNycpO9.cjs');
 
 exports.mutativeMethods = require_mutativeMethods.mutativeMethods;

package/dist/mutative/index.d.cts

@@ -1,3 +1,3 @@
-import "../store-MBrcOgtz.cjs";
-import { Mutation, mutativeMethods } from "../mutativeMethods-DWhwZRzv.cjs";
+import "../store-XcnTdeiJ.cjs";
+import { n as mutativeMethods, t as Mutation } from "../mutativeMethods-C8VcZWED.cjs";
 export { type Mutation, mutativeMethods };

package/dist/mutative/index.d.ts

@@ -1,3 +1,3 @@
-import "../store-DnZ6fsiJ.js";
-import { Mutation, mutativeMethods } from "../mutativeMethods-Bhd1Yi22.js";
+import "../store-BRHFhRPm.js";
+import { n as mutativeMethods, t as Mutation } from "../mutativeMethods-BT1Cim3p.js";
 export { type Mutation, mutativeMethods };

package/dist/mutative/index.js

@@ -1,3 +1,4 @@
-import { mutativeMethods } from "../mutativeMethods-CZKeRIDL.js";
+import "../path-CyYq74W8.js";
+import { t as mutativeMethods } from "../mutativeMethods-Jowr0Znn.js";
 
 export { mutativeMethods };

package/dist/mutative/register.cjs

@@ -1,6 +1,7 @@
-const require_store = require('../store-CdST5wJZ.cjs');
-require('../propAccess-BdLsqViO.cjs');
-const require_mutativeMethods = require('../mutativeMethods-CgXk_bMt.cjs');
+require('../path-B-Rq5q6m.cjs');
+const require_store = require('../store-C1NYHLgR.cjs');
+require('../propAccess-C2AIn9RC.cjs');
+const require_mutativeMethods = require('../mutativeMethods-CkNycpO9.cjs');
 
 //#region src/mutative/register.ts
 Object.assign(require_store.Store.prototype, require_mutativeMethods.mutativeMethods);

package/dist/mutative/register.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"register.cjs","names":["Store","mutativeMethods","autobind"],"sources":["../../src/mutative/register.ts"],"sourcesContent":["import { autobind } from '@lib/autobind';\nimport { mutativeMethods } from './mutativeMethods';\nimport { Store } from '@core';\n\ntype MutativeMethods = typeof mutativeMethods;\n\ndeclare module '..' {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  interface Store<T> extends MutativeMethods {}\n}\n\nObject.assign(Store.prototype, mutativeMethods);\nautobind(Store);\n"],"mappings":";;;;;AAWA,OAAO,OAAOA,oBAAM,WAAWC;AAC/BC,uBAASF"}
+{"version":3,"file":"register.cjs","names":["Store","mutativeMethods","autobind"],"sources":["../../src/mutative/register.ts"],"sourcesContent":["import { autobind } from '@lib/autobind';\nimport { mutativeMethods } from './mutativeMethods';\nimport { Store } from '@core';\n\ntype MutativeMethods = typeof mutativeMethods;\n\ndeclare module '..' {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  interface Store<T> extends MutativeMethods {}\n}\n\nObject.assign(Store.prototype, mutativeMethods);\nautobind(Store);\n"],"mappings":";;;;;;AAWA,OAAO,OAAOA,oBAAM,WAAWC,wCAAgB;AAC/CC,uBAASF,oBAAM"}

package/dist/mutative/register.d.cts

@@ -1,11 +1,9 @@
-import "../store-MBrcOgtz.cjs";
-import { mutativeMethods } from "../mutativeMethods-DWhwZRzv.cjs";
+import "../store-XcnTdeiJ.cjs";
+import { n as mutativeMethods } from "../mutativeMethods-C8VcZWED.cjs";
 
 //#region src/mutative/register.d.ts
 type MutativeMethods = typeof mutativeMethods;
 declare module ".." {
   interface Store<T> extends MutativeMethods {}
 }
-//#endregion
-export {};
 //# sourceMappingURL=register.d.cts.map

package/dist/mutative/register.d.ts

@@ -1,5 +1,5 @@
-import "../store-DnZ6fsiJ.js";
-import { mutativeMethods } from "../mutativeMethods-Bhd1Yi22.js";
+import "../store-BRHFhRPm.js";
+import { n as mutativeMethods } from "../mutativeMethods-BT1Cim3p.js";
 
 //#region src/mutative/register.d.ts
 type MutativeMethods = typeof mutativeMethods;

package/dist/mutative/register.js

@@ -1,6 +1,7 @@
-import { Store, autobind } from "../store-Dx8w7yT-.js";
-import "../propAccess-B260LXN1.js";
-import { mutativeMethods } from "../mutativeMethods-CZKeRIDL.js";
+import { h as autobind, t as Store } from "../store-v3RYWzVg.js";
+import "../propAccess-DvWFpYoj.js";
+import "../path-CyYq74W8.js";
+import { t as mutativeMethods } from "../mutativeMethods-Jowr0Znn.js";
 
 //#region src/mutative/register.ts
 Object.assign(Store.prototype, mutativeMethods);

package/dist/mutative/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","names":[],"sources":["../../src/mutative/register.ts"],"sourcesContent":["import { autobind } from '@lib/autobind';\nimport { mutativeMethods } from './mutativeMethods';\nimport { Store } from '@core';\n\ntype MutativeMethods = typeof mutativeMethods;\n\ndeclare module '..' {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  interface Store<T> extends MutativeMethods {}\n}\n\nObject.assign(Store.prototype, mutativeMethods);\nautobind(Store);\n"],"mappings":";;;;;AAWA,OAAO,OAAO,MAAM,WAAW;AAC/B,SAAS"}
+{"version":3,"file":"register.js","names":[],"sources":["../../src/mutative/register.ts"],"sourcesContent":["import { autobind } from '@lib/autobind';\nimport { mutativeMethods } from './mutativeMethods';\nimport { Store } from '@core';\n\ntype MutativeMethods = typeof mutativeMethods;\n\ndeclare module '..' {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  interface Store<T> extends MutativeMethods {}\n}\n\nObject.assign(Store.prototype, mutativeMethods);\nautobind(Store);\n"],"mappings":";;;;;;AAWA,OAAO,OAAO,MAAM,WAAW,gBAAgB;AAC/C,SAAS,MAAM"}

package/dist/{mutativeMethods-Bhd1Yi22.d.ts → mutativeMethods-BT1Cim3p.d.ts}

@@ -1,4 +1,4 @@
-import { Constrain, Path, Store, Value } from "./store-DnZ6fsiJ.js";
+import { B as Value, K as Constrain, N as Path, r as Store } from "./store-BRHFhRPm.js";
 import { Draft } from "mutative";
 
 //#region src/mutative/mutativeMethods.d.ts
@@ -9,5 +9,5 @@ declare const mutativeMethods: {
   update: typeof update;
 };
 //#endregion
-export { Mutation, mutativeMethods };
-//# sourceMappingURL=mutativeMethods-Bhd1Yi22.d.ts.map
+export { mutativeMethods as n, Mutation as t };
+//# sourceMappingURL=mutativeMethods-BT1Cim3p.d.ts.map

package/dist/{mutativeMethods-DWhwZRzv.d.cts → mutativeMethods-C8VcZWED.d.cts}

@@ -1,4 +1,4 @@
-import { Constrain, Path, Store, Value } from "./store-MBrcOgtz.cjs";
+import { B as Value, K as Constrain, N as Path, r as Store } from "./store-XcnTdeiJ.cjs";
 import { Draft } from "mutative";
 
 //#region src/mutative/mutativeMethods.d.ts
@@ -9,5 +9,5 @@ declare const mutativeMethods: {
   update: typeof update;
 };
 //#endregion
-export { Mutation, mutativeMethods };
-//# sourceMappingURL=mutativeMethods-DWhwZRzv.d.cts.map
+export { mutativeMethods as n, Mutation as t };
+//# sourceMappingURL=mutativeMethods-C8VcZWED.d.cts.map

package/dist/{mutativeMethods-CgXk_bMt.cjs → mutativeMethods-CkNycpO9.cjs}

@@ -1,23 +1,22 @@
-const require_chunk = require('./chunk-CUT6urMc.cjs');
-const mutative = require_chunk.__toESM(require("mutative"));
+const require_path = require('./path-B-Rq5q6m.cjs');
+let mutative = require("mutative");
+mutative = require_path.__toESM(mutative);
 
 //#region src/mutative/mutativeMethods.ts
 function update(...args) {
 	if (args.length === 1) {
 		const [mutation] = args;
 		this.set((value) => {
-			const result = (0, mutative.create)(value, (draft) => {
+			return (0, mutative.create)(value, (draft) => {
 				mutation(draft);
 			});
-			return result;
 		});
 	} else {
 		const [path, mutation] = args;
 		this.set(path, (value) => {
-			const result = (0, mutative.create)(value, (draft) => {
+			return (0, mutative.create)(value, (draft) => {
 				mutation(draft);
 			});
-			return result;
 		});
 	}
 }
@@ -30,4 +29,4 @@ Object.defineProperty(exports, 'mutativeMethods', {
     return mutativeMethods;
   }
 });
-//# sourceMappingURL=mutativeMethods-CgXk_bMt.cjs.map
+//# sourceMappingURL=mutativeMethods-CkNycpO9.cjs.map

package/dist/{mutativeMethods-CgXk_bMt.cjs.map → mutativeMethods-CkNycpO9.cjs.map}

@@ -1 +1 @@
-{"version":3,"file":"mutativeMethods-CgXk_bMt.cjs","names":["mutativeMethods: {\n  update: typeof update;\n}"],"sources":["../src/mutative/mutativeMethods.ts"],"sourcesContent":["import type { Store } from '@core/store';\nimport type { Constrain } from '@lib/constrain';\nimport { type Path, type Value } from '@lib/path';\nimport { create, type Draft } from 'mutative';\n\nexport type Mutation<T> = (draft: Draft<T>) => void;\n\nfunction update<T>(this: Store<T>, mutation: Mutation<T>): void;\n\nfunction update<T, const P>(\n  this: Store<T>,\n  path: Constrain<P, Path<T>>,\n  mutation: Mutation<Value<T, P>>,\n): void;\n\nfunction update<T, const TPath>(\n  this: Store<T>,\n  ...args:\n    | [recipe: Mutation<T>]\n    | [path: Constrain<TPath, Path<T>>, mutation: Mutation<Value<T, TPath>>]\n) {\n  if (args.length === 1) {\n    const [mutation] = args;\n\n    this.set((value) => {\n      const result = create(value, (draft) => {\n        mutation(draft);\n      });\n      return result;\n    });\n  } else {\n    const [path, mutation] = args;\n\n    this.set(path, (value) => {\n      const result = create(value, (draft) => {\n        mutation(draft);\n      });\n      return result;\n    });\n  }\n}\n\nexport const mutativeMethods: {\n  update: typeof update;\n} = {\n  update,\n};\n"],"mappings":";;;;AAeA,SAAS,OAEP,GAAG,MAGH;AACA,KAAI,KAAK,WAAW,GAAG;EACrB,MAAM,CAAC,YAAY;AAEnB,OAAK,KAAK,UAAU;GAClB,MAAM,8BAAgB,QAAQ,UAAU;AACtC,aAAS;;AAEX,UAAO;;QAEJ;EACL,MAAM,CAAC,MAAM,YAAY;AAEzB,OAAK,IAAI,OAAO,UAAU;GACxB,MAAM,8BAAgB,QAAQ,UAAU;AACtC,aAAS;;AAEX,UAAO;;;;AAKb,MAAaA,kBAET,EACF"}
+{"version":3,"file":"mutativeMethods-CkNycpO9.cjs","names":["mutativeMethods: {\n  update: typeof update;\n}"],"sources":["../src/mutative/mutativeMethods.ts"],"sourcesContent":["import type { Store } from '@core/store';\nimport type { Constrain } from '@lib/constrain';\nimport { type Path, type Value } from '@lib/path';\nimport { create, type Draft } from 'mutative';\n\nexport type Mutation<T> = (draft: Draft<T>) => void;\n\nfunction update<T>(this: Store<T>, mutation: Mutation<T>): void;\n\nfunction update<T, const P>(\n  this: Store<T>,\n  path: Constrain<P, Path<T>>,\n  mutation: Mutation<Value<T, P>>,\n): void;\n\nfunction update<T, const TPath>(\n  this: Store<T>,\n  ...args:\n    | [recipe: Mutation<T>]\n    | [path: Constrain<TPath, Path<T>>, mutation: Mutation<Value<T, TPath>>]\n) {\n  if (args.length === 1) {\n    const [mutation] = args;\n\n    this.set((value) => {\n      const result = create(value, (draft) => {\n        mutation(draft);\n      });\n      return result;\n    });\n  } else {\n    const [path, mutation] = args;\n\n    this.set(path, (value) => {\n      const result = create(value, (draft) => {\n        mutation(draft);\n      });\n      return result;\n    });\n  }\n}\n\nexport const mutativeMethods: {\n  update: typeof update;\n} = {\n  update,\n};\n"],"mappings":";;;;;AAeA,SAAS,OAEP,GAAG,MAGH;AACA,KAAI,KAAK,WAAW,GAAG;EACrB,MAAM,CAAC,YAAY;AAEnB,OAAK,KAAK,UAAU;AAIlB,+BAHsB,QAAQ,UAAU;AACtC,aAAS,MAAM;KACf;IAEF;QACG;EACL,MAAM,CAAC,MAAM,YAAY;AAEzB,OAAK,IAAI,OAAO,UAAU;AAIxB,+BAHsB,QAAQ,UAAU;AACtC,aAAS,MAAM;KACf;IAEF;;;AAIN,MAAaA,kBAET,EACF,QACD"}

package/dist/{mutativeMethods-CZKeRIDL.js → mutativeMethods-Jowr0Znn.js}

@@ -5,23 +5,21 @@ function update(...args) {
 	if (args.length === 1) {
 		const [mutation] = args;
 		this.set((value) => {
-			const result = create(value, (draft) => {
+			return create(value, (draft) => {
 				mutation(draft);
 			});
-			return result;
 		});
 	} else {
 		const [path, mutation] = args;
 		this.set(path, (value) => {
-			const result = create(value, (draft) => {
+			return create(value, (draft) => {
 				mutation(draft);
 			});
-			return result;
 		});
 	}
 }
 const mutativeMethods = { update };
 
 //#endregion
-export { mutativeMethods };
-//# sourceMappingURL=mutativeMethods-CZKeRIDL.js.map
+export { mutativeMethods as t };
+//# sourceMappingURL=mutativeMethods-Jowr0Znn.js.map

package/dist/{mutativeMethods-CZKeRIDL.js.map → mutativeMethods-Jowr0Znn.js.map}

@@ -1 +1 @@
-{"version":3,"file":"mutativeMethods-CZKeRIDL.js","names":["mutativeMethods: {\n  update: typeof update;\n}"],"sources":["../src/mutative/mutativeMethods.ts"],"sourcesContent":["import type { Store } from '@core/store';\nimport type { Constrain } from '@lib/constrain';\nimport { type Path, type Value } from '@lib/path';\nimport { create, type Draft } from 'mutative';\n\nexport type Mutation<T> = (draft: Draft<T>) => void;\n\nfunction update<T>(this: Store<T>, mutation: Mutation<T>): void;\n\nfunction update<T, const P>(\n  this: Store<T>,\n  path: Constrain<P, Path<T>>,\n  mutation: Mutation<Value<T, P>>,\n): void;\n\nfunction update<T, const TPath>(\n  this: Store<T>,\n  ...args:\n    | [recipe: Mutation<T>]\n    | [path: Constrain<TPath, Path<T>>, mutation: Mutation<Value<T, TPath>>]\n) {\n  if (args.length === 1) {\n    const [mutation] = args;\n\n    this.set((value) => {\n      const result = create(value, (draft) => {\n        mutation(draft);\n      });\n      return result;\n    });\n  } else {\n    const [path, mutation] = args;\n\n    this.set(path, (value) => {\n      const result = create(value, (draft) => {\n        mutation(draft);\n      });\n      return result;\n    });\n  }\n}\n\nexport const mutativeMethods: {\n  update: typeof update;\n} = {\n  update,\n};\n"],"mappings":";;;AAeA,SAAS,OAEP,GAAG,MAGH;AACA,KAAI,KAAK,WAAW,GAAG;EACrB,MAAM,CAAC,YAAY;AAEnB,OAAK,KAAK,UAAU;GAClB,MAAM,SAAS,OAAO,QAAQ,UAAU;AACtC,aAAS;;AAEX,UAAO;;QAEJ;EACL,MAAM,CAAC,MAAM,YAAY;AAEzB,OAAK,IAAI,OAAO,UAAU;GACxB,MAAM,SAAS,OAAO,QAAQ,UAAU;AACtC,aAAS;;AAEX,UAAO;;;;AAKb,MAAaA,kBAET,EACF"}
+{"version":3,"file":"mutativeMethods-Jowr0Znn.js","names":["mutativeMethods: {\n  update: typeof update;\n}"],"sources":["../src/mutative/mutativeMethods.ts"],"sourcesContent":["import type { Store } from '@core/store';\nimport type { Constrain } from '@lib/constrain';\nimport { type Path, type Value } from '@lib/path';\nimport { create, type Draft } from 'mutative';\n\nexport type Mutation<T> = (draft: Draft<T>) => void;\n\nfunction update<T>(this: Store<T>, mutation: Mutation<T>): void;\n\nfunction update<T, const P>(\n  this: Store<T>,\n  path: Constrain<P, Path<T>>,\n  mutation: Mutation<Value<T, P>>,\n): void;\n\nfunction update<T, const TPath>(\n  this: Store<T>,\n  ...args:\n    | [recipe: Mutation<T>]\n    | [path: Constrain<TPath, Path<T>>, mutation: Mutation<Value<T, TPath>>]\n) {\n  if (args.length === 1) {\n    const [mutation] = args;\n\n    this.set((value) => {\n      const result = create(value, (draft) => {\n        mutation(draft);\n      });\n      return result;\n    });\n  } else {\n    const [path, mutation] = args;\n\n    this.set(path, (value) => {\n      const result = create(value, (draft) => {\n        mutation(draft);\n      });\n      return result;\n    });\n  }\n}\n\nexport const mutativeMethods: {\n  update: typeof update;\n} = {\n  update,\n};\n"],"mappings":";;;AAeA,SAAS,OAEP,GAAG,MAGH;AACA,KAAI,KAAK,WAAW,GAAG;EACrB,MAAM,CAAC,YAAY;AAEnB,OAAK,KAAK,UAAU;AAIlB,UAHe,OAAO,QAAQ,UAAU;AACtC,aAAS,MAAM;KACf;IAEF;QACG;EACL,MAAM,CAAC,MAAM,YAAY;AAEzB,OAAK,IAAI,OAAO,UAAU;AAIxB,UAHe,OAAO,QAAQ,UAAU;AACtC,aAAS,MAAM;KACf;IAEF;;;AAIN,MAAaA,kBAET,EACF,QACD"}

package/dist/{patchMethods-hhlLwtqE.cjs → patchMethods-B7Hm5-Qh.cjs}

@@ -1,5 +1,5 @@
-const require_propAccess = require('./propAccess-BdLsqViO.cjs');
-const require_extendedJson = require('./extendedJson-Dn2F7Edo.cjs');
+const require_propAccess = require('./propAccess-C2AIn9RC.cjs');
+const require_extendedJson = require('./extendedJson-ursQ8DbQ.cjs');
 
 //#region src/lib/applyPatches.ts
 function applySinglePatch(target, patch) {
@@ -15,9 +15,7 @@ function applyPatches(target, ...patches) {
 //#region src/lib/diff.ts
 function diff(a, b, options = {}) {
 	const result = [..._diff(a, b, options)];
-	const patches = result.map(([patch]) => patch);
-	const reversePatches = result.map(([, reversePatch]) => reversePatch);
-	return [patches, reversePatches];
+	return [result.map(([patch]) => patch), result.map(([, reversePatch]) => reversePatch)];
 }
 function* _diff(a, b, options, prefix = []) {
 	if (a === b) return;
@@ -261,4 +259,4 @@ Object.defineProperty(exports, 'subscribePatches', {
     return subscribePatches;
   }
 });
-//# sourceMappingURL=patchMethods-hhlLwtqE.cjs.map
+//# sourceMappingURL=patchMethods-B7Hm5-Qh.cjs.map