@shotstack/shotstack-canvas 2.1.7 → 2.1.9

package/dist/entry.node.cjs

@@ -503,6 +503,7 @@ var canvasStyleSchema = import_zod2.richTextStyleSchema.extend({
   textDecoration: import_zod.z.enum(["none", "underline", "line-through"]).default("none"),
   gradient: canvasGradientSchema.optional()
 });
+var captionStyleSchema = canvasStyleSchema.omit({ wordSpacing: true });
 var canvasStrokeSchema = import_zod2.richTextStrokeSchema.extend({
   width: import_zod.z.number().min(0).default(0),
   color: import_zod.z.string().regex(HEX6).default("#000000"),
@@ -628,7 +629,7 @@ var richCaptionAssetSchema = import_zod.z.object({
   src: import_zod.z.string().min(1).optional(),
   words: import_zod.z.array(wordTimingSchema).max(1e5).optional(),
   font: richCaptionFontSchema.optional(),
-  style: canvasStyleSchema.optional(),
+  style: captionStyleSchema.optional(),
   stroke: canvasStrokeSchema.optional(),
   shadow: canvasShadowSchema.optional(),
   background: canvasBackgroundSchema.optional(),

package/dist/entry.node.d.cts

@@ -273,7 +273,6 @@ declare const richCaptionAssetSchema: z.ZodObject<{
         background: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
     style: z.ZodOptional<z.ZodObject<{
-        wordSpacing: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>, z.ZodString]>>>;
         letterSpacing: z.ZodDefault<z.ZodNumber>;
         lineHeight: z.ZodDefault<z.ZodNumber>;
         textTransform: z.ZodDefault<z.ZodEnum<{
@@ -410,7 +409,6 @@ declare const CanvasRichCaptionAssetSchema: z.ZodObject<{
         background: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
     style: z.ZodOptional<z.ZodObject<{
-        wordSpacing: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>, z.ZodString]>>>;
         letterSpacing: z.ZodDefault<z.ZodNumber>;
         lineHeight: z.ZodDefault<z.ZodNumber>;
         textTransform: z.ZodDefault<z.ZodEnum<{

package/dist/entry.node.d.ts

@@ -273,7 +273,6 @@ declare const richCaptionAssetSchema: z.ZodObject<{
         background: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
     style: z.ZodOptional<z.ZodObject<{
-        wordSpacing: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>, z.ZodString]>>>;
         letterSpacing: z.ZodDefault<z.ZodNumber>;
         lineHeight: z.ZodDefault<z.ZodNumber>;
         textTransform: z.ZodDefault<z.ZodEnum<{
@@ -410,7 +409,6 @@ declare const CanvasRichCaptionAssetSchema: z.ZodObject<{
         background: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
     style: z.ZodOptional<z.ZodObject<{
-        wordSpacing: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>, z.ZodString]>>>;
         letterSpacing: z.ZodDefault<z.ZodNumber>;
         lineHeight: z.ZodDefault<z.ZodNumber>;
         textTransform: z.ZodDefault<z.ZodEnum<{

package/dist/entry.node.js

@@ -100,6 +100,7 @@ var canvasStyleSchema = richTextStyleSchema.extend({
   textDecoration: z.enum(["none", "underline", "line-through"]).default("none"),
   gradient: canvasGradientSchema.optional()
 });
+var captionStyleSchema = canvasStyleSchema.omit({ wordSpacing: true });
 var canvasStrokeSchema = richTextStrokeSchema.extend({
   width: z.number().min(0).default(0),
   color: z.string().regex(HEX6).default("#000000"),
@@ -225,7 +226,7 @@ var richCaptionAssetSchema = z.object({
   src: z.string().min(1).optional(),
   words: z.array(wordTimingSchema).max(1e5).optional(),
   font: richCaptionFontSchema.optional(),
-  style: canvasStyleSchema.optional(),
+  style: captionStyleSchema.optional(),
   stroke: canvasStrokeSchema.optional(),
   shadow: canvasShadowSchema.optional(),
   background: canvasBackgroundSchema.optional(),

package/dist/entry.web.d.ts

@@ -273,7 +273,6 @@ declare const richCaptionAssetSchema: z.ZodObject<{
         background: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
     style: z.ZodOptional<z.ZodObject<{
-        wordSpacing: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>, z.ZodString]>>>;
         letterSpacing: z.ZodDefault<z.ZodNumber>;
         lineHeight: z.ZodDefault<z.ZodNumber>;
         textTransform: z.ZodDefault<z.ZodEnum<{
@@ -410,7 +409,6 @@ declare const CanvasRichCaptionAssetSchema: z.ZodObject<{
         background: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
     style: z.ZodOptional<z.ZodObject<{
-        wordSpacing: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>, z.ZodString]>>>;
         letterSpacing: z.ZodDefault<z.ZodNumber>;
         lineHeight: z.ZodDefault<z.ZodNumber>;
         textTransform: z.ZodDefault<z.ZodEnum<{

package/dist/entry.web.js

@@ -4063,8 +4063,8 @@ var require_decode = __commonJS({
                 meta_block_remaining_len -= len;
                 if (copy_dst >= ringbuffer_end) {
                   output.write(ringbuffer, ringbuffer_size);
-                  for (var _x2 = 0; _x2 < copy_dst - ringbuffer_end; _x2++)
-                    ringbuffer[_x2] = ringbuffer[ringbuffer_end + _x2];
+                  for (var _x = 0; _x < copy_dst - ringbuffer_end; _x++)
+                    ringbuffer[_x] = ringbuffer[ringbuffer_end + _x];
                 }
               } else {
                 throw new Error("Invalid backward reference. pos: " + pos + " distance: " + distance + " len: " + copy_length + " bytes left: " + meta_block_remaining_len);
@@ -4777,7 +4777,7 @@ function assertNotEqual(val) {
 }
 function assertIs(_arg) {
 }
-function assertNever(_x2) {
+function assertNever(_x) {
   throw new Error("Unexpected value in exhaustive check");
 }
 function assert(_) {
@@ -17978,6 +17978,7 @@ var canvasStyleSchema = richTextStyleSchema.extend({
   textDecoration: external_exports.enum(["none", "underline", "line-through"]).default("none"),
   gradient: canvasGradientSchema.optional()
 });
+var captionStyleSchema = canvasStyleSchema.omit({ wordSpacing: true });
 var canvasStrokeSchema = richTextStrokeSchema.extend({
   width: external_exports.number().min(0).default(0),
   color: external_exports.string().regex(HEX6).default("#000000"),
@@ -18103,7 +18104,7 @@ var richCaptionAssetSchema = external_exports.object({
   src: external_exports.string().min(1).optional(),
   words: external_exports.array(wordTimingSchema).max(1e5).optional(),
   font: richCaptionFontSchema.optional(),
-  style: canvasStyleSchema.optional(),
+  style: captionStyleSchema.optional(),
   stroke: canvasStrokeSchema.optional(),
   shadow: canvasShadowSchema.optional(),
   background: canvasBackgroundSchema.optional(),
@@ -34264,12 +34265,12 @@ function parseHex6(hex3, alpha = 1) {
   return { r, g, b, a: alpha };
 }
 
-// node_modules/.pnpm/lru-cache@11.2.6/node_modules/lru-cache/dist/esm/index.min.js
-var M = typeof performance == "object" && performance && typeof performance.now == "function" ? performance : Date;
+// node_modules/.pnpm/lru-cache@11.2.7/node_modules/lru-cache/dist/esm/index.min.js
+var x = typeof performance == "object" && performance && typeof performance.now == "function" ? performance : Date;
 var I = /* @__PURE__ */ new Set();
 var R = typeof process == "object" && process ? process : {};
-var x = (a, t, e, i) => {
-  typeof R.emitWarning == "function" ? R.emitWarning(a, t, e, i) : console.error(`[${e}] ${t}: ${a}`);
+var U = (c, t, e, i) => {
+  typeof R.emitWarning == "function" ? R.emitWarning(c, t, e, i) : console.error(`[${e}] ${t}: ${c}`);
 };
 var C = globalThis.AbortController;
 var D = globalThis.AbortSignal;
@@ -34297,13 +34298,13 @@ if (typeof C > "u") {
       }
     }
   };
-  let a = R.env?.LRU_CACHE_IGNORE_AC_WARNING !== "1", t = () => {
-    a && (a = false, x("AbortController is not defined. If using lru-cache in node 14, load an AbortController polyfill from the `node-abort-controller` package. A minimal polyfill is provided for use by LRUCache.fetch(), but it should not be relied upon in other contexts (eg, passing it to other APIs that use AbortController/AbortSignal might have undesirable effects). You may disable this with LRU_CACHE_IGNORE_AC_WARNING=1 in the env.", "NO_ABORT_CONTROLLER", "ENOTSUP", t));
+  let c = R.env?.LRU_CACHE_IGNORE_AC_WARNING !== "1", t = () => {
+    c && (c = false, U("AbortController is not defined. If using lru-cache in node 14, load an AbortController polyfill from the `node-abort-controller` package. A minimal polyfill is provided for use by LRUCache.fetch(), but it should not be relied upon in other contexts (eg, passing it to other APIs that use AbortController/AbortSignal might have undesirable effects). You may disable this with LRU_CACHE_IGNORE_AC_WARNING=1 in the env.", "NO_ABORT_CONTROLLER", "ENOTSUP", t));
   };
 }
-var G = (a) => !I.has(a);
-var y = (a) => a && a === Math.floor(a) && a > 0 && isFinite(a);
-var U = (a) => y(a) ? a <= Math.pow(2, 8) ? Uint8Array : a <= Math.pow(2, 16) ? Uint16Array : a <= Math.pow(2, 32) ? Uint32Array : a <= Number.MAX_SAFE_INTEGER ? z2 : null : null;
+var G = (c) => !I.has(c);
+var y = (c) => c && c === Math.floor(c) && c > 0 && isFinite(c);
+var M = (c) => y(c) ? c <= Math.pow(2, 8) ? Uint8Array : c <= Math.pow(2, 16) ? Uint16Array : c <= Math.pow(2, 32) ? Uint32Array : c <= Number.MAX_SAFE_INTEGER ? z2 : null : null;
 var z2 = class extends Array {
   constructor(t) {
     super(t), this.fill(0);
@@ -34318,7 +34319,7 @@ var W = (_a2 = class {
     this.heap = new e(t), this.length = 0;
   }
   static create(t) {
-    let e = U(t);
+    let e = M(t);
     if (!e) return [];
     __privateSet(_a2, _o, true);
     let i = new _a2(t, e);
@@ -34331,10 +34332,10 @@ var W = (_a2 = class {
     return this.heap[--this.length];
   }
 }, _o = new WeakMap(), __privateAdd(_a2, _o, false), _a2);
-var _a3, _b, _o2, _c2, _w, _C, _S, _L, _I, _m, _n, __, _s, _i, _t, _a4, _u, _l, _h, _b2, _r, _y, _A, _d, _g, _T, _v, _f, _x, _a_instances, j_fn, _R, _z, _N, _p, B_fn, _W, _U, _P, F_fn, O_fn, H_fn, M_fn, G_fn, e_fn, k_fn, D_fn, E_fn, V_fn, _c;
+var _a3, _b, _o2, _c2, _w, _C, _S, _L, _I, _m, _n, __, _s, _i, _t, _a4, _u, _l, _h, _b2, _r, _y, _A, _d, _g, _T, _v, _f, _U, _c_instances, j_fn, _R, _z, _N, _p, B_fn, _W, _M, _P, F_fn, O_fn, H_fn, x_fn, G_fn, e_fn, k_fn, D_fn, E_fn, V_fn, _c;
 var L = (_c = class {
   constructor(t) {
-    __privateAdd(this, _a_instances);
+    __privateAdd(this, _c_instances);
     __privateAdd(this, _o2);
     __privateAdd(this, _c2);
     __privateAdd(this, _w);
@@ -34376,7 +34377,7 @@ var L = (_c = class {
     __privateAdd(this, _T);
     __privateAdd(this, _v);
     __privateAdd(this, _f);
-    __privateAdd(this, _x);
+    __privateAdd(this, _U);
     __privateAdd(this, _R, () => {
     });
     __privateAdd(this, _z, () => {
@@ -34386,37 +34387,37 @@ var L = (_c = class {
     __privateAdd(this, _p, () => false);
     __privateAdd(this, _W, (t) => {
     });
-    __privateAdd(this, _U, (t, e, i) => {
+    __privateAdd(this, _M, (t, e, i) => {
     });
     __privateAdd(this, _P, (t, e, i, s) => {
       if (i || s) throw new TypeError("cannot set size without setting maxSize or maxEntrySize on cache");
       return 0;
     });
     __publicField(this, _a3, "LRUCache");
-    let { max: e = 0, ttl: i, ttlResolution: s = 1, ttlAutopurge: h, updateAgeOnGet: n, updateAgeOnHas: o, allowStale: r, dispose: f, onInsert: m, disposeAfter: c, noDisposeOnSet: d, noUpdateTTL: g, maxSize: A = 0, maxEntrySize: p = 0, sizeCalculation: _, fetchMethod: l, memoMethod: w, noDeleteOnFetchRejection: b, noDeleteOnStaleGet: S, allowStaleOnFetchRejection: u, allowStaleOnFetchAbort: T, ignoreFetchAbort: F, perf: v } = t;
+    let { max: e = 0, ttl: i, ttlResolution: s = 1, ttlAutopurge: n, updateAgeOnGet: o, updateAgeOnHas: h, allowStale: r, dispose: a, onInsert: w, disposeAfter: f, noDisposeOnSet: d, noUpdateTTL: g, maxSize: A = 0, maxEntrySize: p = 0, sizeCalculation: _, fetchMethod: l, memoMethod: S, noDeleteOnFetchRejection: b, noDeleteOnStaleGet: m, allowStaleOnFetchRejection: u, allowStaleOnFetchAbort: T, ignoreFetchAbort: F, perf: v } = t;
     if (v !== void 0 && typeof v?.now != "function") throw new TypeError("perf option must have a now() method if specified");
-    if (__privateSet(this, _m, v ?? M), e !== 0 && !y(e)) throw new TypeError("max option must be a nonnegative integer");
-    let O = e ? U(e) : Array;
+    if (__privateSet(this, _m, v ?? x), e !== 0 && !y(e)) throw new TypeError("max option must be a nonnegative integer");
+    let O = e ? M(e) : Array;
     if (!O) throw new Error("invalid max value: " + e);
     if (__privateSet(this, _o2, e), __privateSet(this, _c2, A), this.maxEntrySize = p || __privateGet(this, _c2), this.sizeCalculation = _, this.sizeCalculation) {
       if (!__privateGet(this, _c2) && !this.maxEntrySize) throw new TypeError("cannot set sizeCalculation without setting maxSize or maxEntrySize");
       if (typeof this.sizeCalculation != "function") throw new TypeError("sizeCalculation set to non-function");
     }
-    if (w !== void 0 && typeof w != "function") throw new TypeError("memoMethod must be a function if defined");
-    if (__privateSet(this, _I, w), l !== void 0 && typeof l != "function") throw new TypeError("fetchMethod must be a function if specified");
-    if (__privateSet(this, _L, l), __privateSet(this, _v, !!l), __privateSet(this, _s, /* @__PURE__ */ new Map()), __privateSet(this, _i, new Array(e).fill(void 0)), __privateSet(this, _t, new Array(e).fill(void 0)), __privateSet(this, _a4, new O(e)), __privateSet(this, _u, new O(e)), __privateSet(this, _l, 0), __privateSet(this, _h, 0), __privateSet(this, _b2, W.create(e)), __privateSet(this, _n, 0), __privateSet(this, __, 0), typeof f == "function" && __privateSet(this, _w, f), typeof m == "function" && __privateSet(this, _C, m), typeof c == "function" ? (__privateSet(this, _S, c), __privateSet(this, _r, [])) : (__privateSet(this, _S, void 0), __privateSet(this, _r, void 0)), __privateSet(this, _T, !!__privateGet(this, _w)), __privateSet(this, _x, !!__privateGet(this, _C)), __privateSet(this, _f, !!__privateGet(this, _S)), this.noDisposeOnSet = !!d, this.noUpdateTTL = !!g, this.noDeleteOnFetchRejection = !!b, this.allowStaleOnFetchRejection = !!u, this.allowStaleOnFetchAbort = !!T, this.ignoreFetchAbort = !!F, this.maxEntrySize !== 0) {
+    if (S !== void 0 && typeof S != "function") throw new TypeError("memoMethod must be a function if defined");
+    if (__privateSet(this, _I, S), l !== void 0 && typeof l != "function") throw new TypeError("fetchMethod must be a function if specified");
+    if (__privateSet(this, _L, l), __privateSet(this, _v, !!l), __privateSet(this, _s, /* @__PURE__ */ new Map()), __privateSet(this, _i, new Array(e).fill(void 0)), __privateSet(this, _t, new Array(e).fill(void 0)), __privateSet(this, _a4, new O(e)), __privateSet(this, _u, new O(e)), __privateSet(this, _l, 0), __privateSet(this, _h, 0), __privateSet(this, _b2, W.create(e)), __privateSet(this, _n, 0), __privateSet(this, __, 0), typeof a == "function" && __privateSet(this, _w, a), typeof w == "function" && __privateSet(this, _C, w), typeof f == "function" ? (__privateSet(this, _S, f), __privateSet(this, _r, [])) : (__privateSet(this, _S, void 0), __privateSet(this, _r, void 0)), __privateSet(this, _T, !!__privateGet(this, _w)), __privateSet(this, _U, !!__privateGet(this, _C)), __privateSet(this, _f, !!__privateGet(this, _S)), this.noDisposeOnSet = !!d, this.noUpdateTTL = !!g, this.noDeleteOnFetchRejection = !!b, this.allowStaleOnFetchRejection = !!u, this.allowStaleOnFetchAbort = !!T, this.ignoreFetchAbort = !!F, this.maxEntrySize !== 0) {
       if (__privateGet(this, _c2) !== 0 && !y(__privateGet(this, _c2))) throw new TypeError("maxSize must be a positive integer if specified");
       if (!y(this.maxEntrySize)) throw new TypeError("maxEntrySize must be a positive integer if specified");
-      __privateMethod(this, _a_instances, B_fn).call(this);
+      __privateMethod(this, _c_instances, B_fn).call(this);
     }
-    if (this.allowStale = !!r, this.noDeleteOnStaleGet = !!S, this.updateAgeOnGet = !!n, this.updateAgeOnHas = !!o, this.ttlResolution = y(s) || s === 0 ? s : 1, this.ttlAutopurge = !!h, this.ttl = i || 0, this.ttl) {
+    if (this.allowStale = !!r, this.noDeleteOnStaleGet = !!m, this.updateAgeOnGet = !!o, this.updateAgeOnHas = !!h, this.ttlResolution = y(s) || s === 0 ? s : 1, this.ttlAutopurge = !!n, this.ttl = i || 0, this.ttl) {
       if (!y(this.ttl)) throw new TypeError("ttl must be a positive integer if specified");
-      __privateMethod(this, _a_instances, j_fn).call(this);
+      __privateMethod(this, _c_instances, j_fn).call(this);
     }
     if (__privateGet(this, _o2) === 0 && this.ttl === 0 && __privateGet(this, _c2) === 0) throw new TypeError("At least one of max, maxSize, or ttl is required");
     if (!this.ttlAutopurge && !__privateGet(this, _o2) && !__privateGet(this, _c2)) {
       let E = "LRU_CACHE_UNBOUNDED";
-      G(E) && (I.add(E), x("TTL caching without ttlAutopurge, max, or maxSize can result in unbounded memory consumption.", "UnboundedCacheWarning", E, _c));
+      G(E) && (I.add(E), U("TTL caching without ttlAutopurge, max, or maxSize can result in unbounded memory consumption.", "UnboundedCacheWarning", E, _c));
     }
   }
   get perf() {
@@ -34429,19 +34430,19 @@ var L = (_c = class {
       return __privateGet(t, _h);
     }, free: __privateGet(t, _b2), isBackgroundFetch: (e) => {
       var _a5;
-      return __privateMethod(_a5 = t, _a_instances, e_fn).call(_a5, e);
-    }, backgroundFetch: (e, i, s, h) => {
+      return __privateMethod(_a5 = t, _c_instances, e_fn).call(_a5, e);
+    }, backgroundFetch: (e, i, s, n) => {
       var _a5;
-      return __privateMethod(_a5 = t, _a_instances, G_fn).call(_a5, e, i, s, h);
+      return __privateMethod(_a5 = t, _c_instances, G_fn).call(_a5, e, i, s, n);
     }, moveToTail: (e) => {
       var _a5;
-      return __privateMethod(_a5 = t, _a_instances, D_fn).call(_a5, e);
+      return __privateMethod(_a5 = t, _c_instances, D_fn).call(_a5, e);
     }, indexes: (e) => {
       var _a5;
-      return __privateMethod(_a5 = t, _a_instances, F_fn).call(_a5, e);
+      return __privateMethod(_a5 = t, _c_instances, F_fn).call(_a5, e);
     }, rindexes: (e) => {
       var _a5;
-      return __privateMethod(_a5 = t, _a_instances, O_fn).call(_a5, e);
+      return __privateMethod(_a5 = t, _c_instances, O_fn).call(_a5, e);
     }, isStale: (e) => {
       var _a5;
       return __privateGet(_a5 = t, _p).call(_a5, e);
@@ -34478,82 +34479,82 @@ var L = (_c = class {
     return __privateGet(this, _s).has(t) ? 1 / 0 : 0;
   }
   *entries() {
-    for (let t of __privateMethod(this, _a_instances, F_fn).call(this)) __privateGet(this, _t)[t] !== void 0 && __privateGet(this, _i)[t] !== void 0 && !__privateMethod(this, _a_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield [__privateGet(this, _i)[t], __privateGet(this, _t)[t]]);
+    for (let t of __privateMethod(this, _c_instances, F_fn).call(this)) __privateGet(this, _t)[t] !== void 0 && __privateGet(this, _i)[t] !== void 0 && !__privateMethod(this, _c_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield [__privateGet(this, _i)[t], __privateGet(this, _t)[t]]);
   }
   *rentries() {
-    for (let t of __privateMethod(this, _a_instances, O_fn).call(this)) __privateGet(this, _t)[t] !== void 0 && __privateGet(this, _i)[t] !== void 0 && !__privateMethod(this, _a_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield [__privateGet(this, _i)[t], __privateGet(this, _t)[t]]);
+    for (let t of __privateMethod(this, _c_instances, O_fn).call(this)) __privateGet(this, _t)[t] !== void 0 && __privateGet(this, _i)[t] !== void 0 && !__privateMethod(this, _c_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield [__privateGet(this, _i)[t], __privateGet(this, _t)[t]]);
   }
   *keys() {
-    for (let t of __privateMethod(this, _a_instances, F_fn).call(this)) {
+    for (let t of __privateMethod(this, _c_instances, F_fn).call(this)) {
       let e = __privateGet(this, _i)[t];
-      e !== void 0 && !__privateMethod(this, _a_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield e);
+      e !== void 0 && !__privateMethod(this, _c_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield e);
     }
   }
   *rkeys() {
-    for (let t of __privateMethod(this, _a_instances, O_fn).call(this)) {
+    for (let t of __privateMethod(this, _c_instances, O_fn).call(this)) {
       let e = __privateGet(this, _i)[t];
-      e !== void 0 && !__privateMethod(this, _a_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield e);
+      e !== void 0 && !__privateMethod(this, _c_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield e);
     }
   }
   *values() {
-    for (let t of __privateMethod(this, _a_instances, F_fn).call(this)) __privateGet(this, _t)[t] !== void 0 && !__privateMethod(this, _a_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield __privateGet(this, _t)[t]);
+    for (let t of __privateMethod(this, _c_instances, F_fn).call(this)) __privateGet(this, _t)[t] !== void 0 && !__privateMethod(this, _c_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield __privateGet(this, _t)[t]);
   }
   *rvalues() {
-    for (let t of __privateMethod(this, _a_instances, O_fn).call(this)) __privateGet(this, _t)[t] !== void 0 && !__privateMethod(this, _a_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield __privateGet(this, _t)[t]);
+    for (let t of __privateMethod(this, _c_instances, O_fn).call(this)) __privateGet(this, _t)[t] !== void 0 && !__privateMethod(this, _c_instances, e_fn).call(this, __privateGet(this, _t)[t]) && (yield __privateGet(this, _t)[t]);
   }
   [(_b = Symbol.iterator, _a3 = Symbol.toStringTag, _b)]() {
     return this.entries();
   }
   find(t, e = {}) {
-    for (let i of __privateMethod(this, _a_instances, F_fn).call(this)) {
-      let s = __privateGet(this, _t)[i], h = __privateMethod(this, _a_instances, e_fn).call(this, s) ? s.__staleWhileFetching : s;
-      if (h !== void 0 && t(h, __privateGet(this, _i)[i], this)) return this.get(__privateGet(this, _i)[i], e);
+    for (let i of __privateMethod(this, _c_instances, F_fn).call(this)) {
+      let s = __privateGet(this, _t)[i], n = __privateMethod(this, _c_instances, e_fn).call(this, s) ? s.__staleWhileFetching : s;
+      if (n !== void 0 && t(n, __privateGet(this, _i)[i], this)) return this.get(__privateGet(this, _i)[i], e);
     }
   }
   forEach(t, e = this) {
-    for (let i of __privateMethod(this, _a_instances, F_fn).call(this)) {
-      let s = __privateGet(this, _t)[i], h = __privateMethod(this, _a_instances, e_fn).call(this, s) ? s.__staleWhileFetching : s;
-      h !== void 0 && t.call(e, h, __privateGet(this, _i)[i], this);
+    for (let i of __privateMethod(this, _c_instances, F_fn).call(this)) {
+      let s = __privateGet(this, _t)[i], n = __privateMethod(this, _c_instances, e_fn).call(this, s) ? s.__staleWhileFetching : s;
+      n !== void 0 && t.call(e, n, __privateGet(this, _i)[i], this);
     }
   }
   rforEach(t, e = this) {
-    for (let i of __privateMethod(this, _a_instances, O_fn).call(this)) {
-      let s = __privateGet(this, _t)[i], h = __privateMethod(this, _a_instances, e_fn).call(this, s) ? s.__staleWhileFetching : s;
-      h !== void 0 && t.call(e, h, __privateGet(this, _i)[i], this);
+    for (let i of __privateMethod(this, _c_instances, O_fn).call(this)) {
+      let s = __privateGet(this, _t)[i], n = __privateMethod(this, _c_instances, e_fn).call(this, s) ? s.__staleWhileFetching : s;
+      n !== void 0 && t.call(e, n, __privateGet(this, _i)[i], this);
     }
   }
   purgeStale() {
     let t = false;
-    for (let e of __privateMethod(this, _a_instances, O_fn).call(this, { allowStale: true })) __privateGet(this, _p).call(this, e) && (__privateMethod(this, _a_instances, E_fn).call(this, __privateGet(this, _i)[e], "expire"), t = true);
+    for (let e of __privateMethod(this, _c_instances, O_fn).call(this, { allowStale: true })) __privateGet(this, _p).call(this, e) && (__privateMethod(this, _c_instances, E_fn).call(this, __privateGet(this, _i)[e], "expire"), t = true);
     return t;
   }
   info(t) {
     let e = __privateGet(this, _s).get(t);
     if (e === void 0) return;
-    let i = __privateGet(this, _t)[e], s = __privateMethod(this, _a_instances, e_fn).call(this, i) ? i.__staleWhileFetching : i;
+    let i = __privateGet(this, _t)[e], s = __privateMethod(this, _c_instances, e_fn).call(this, i) ? i.__staleWhileFetching : i;
     if (s === void 0) return;
-    let h = { value: s };
+    let n = { value: s };
     if (__privateGet(this, _d) && __privateGet(this, _A)) {
-      let n = __privateGet(this, _d)[e], o = __privateGet(this, _A)[e];
-      if (n && o) {
-        let r = n - (__privateGet(this, _m).now() - o);
-        h.ttl = r, h.start = Date.now();
+      let o = __privateGet(this, _d)[e], h = __privateGet(this, _A)[e];
+      if (o && h) {
+        let r = o - (__privateGet(this, _m).now() - h);
+        n.ttl = r, n.start = Date.now();
       }
     }
-    return __privateGet(this, _y) && (h.size = __privateGet(this, _y)[e]), h;
+    return __privateGet(this, _y) && (n.size = __privateGet(this, _y)[e]), n;
   }
   dump() {
     let t = [];
-    for (let e of __privateMethod(this, _a_instances, F_fn).call(this, { allowStale: true })) {
-      let i = __privateGet(this, _i)[e], s = __privateGet(this, _t)[e], h = __privateMethod(this, _a_instances, e_fn).call(this, s) ? s.__staleWhileFetching : s;
-      if (h === void 0 || i === void 0) continue;
-      let n = { value: h };
+    for (let e of __privateMethod(this, _c_instances, F_fn).call(this, { allowStale: true })) {
+      let i = __privateGet(this, _i)[e], s = __privateGet(this, _t)[e], n = __privateMethod(this, _c_instances, e_fn).call(this, s) ? s.__staleWhileFetching : s;
+      if (n === void 0 || i === void 0) continue;
+      let o = { value: n };
       if (__privateGet(this, _d) && __privateGet(this, _A)) {
-        n.ttl = __privateGet(this, _d)[e];
-        let o = __privateGet(this, _m).now() - __privateGet(this, _A)[e];
-        n.start = Math.floor(Date.now() - o);
+        o.ttl = __privateGet(this, _d)[e];
+        let h = __privateGet(this, _m).now() - __privateGet(this, _A)[e];
+        o.start = Math.floor(Date.now() - h);
       }
-      __privateGet(this, _y) && (n.size = __privateGet(this, _y)[e]), t.unshift([i, n]);
+      __privateGet(this, _y) && (o.size = __privateGet(this, _y)[e]), t.unshift([i, o]);
     }
     return t;
   }
@@ -34570,28 +34571,28 @@ var L = (_c = class {
   set(t, e, i = {}) {
     var _a5, _b3, _c3, _d2;
     if (e === void 0) return this.delete(t), this;
-    let { ttl: s = this.ttl, start: h, noDisposeOnSet: n = this.noDisposeOnSet, sizeCalculation: o = this.sizeCalculation, status: r } = i, { noUpdateTTL: f = this.noUpdateTTL } = i, m = __privateGet(this, _P).call(this, t, e, i.size || 0, o);
-    if (this.maxEntrySize && m > this.maxEntrySize) return r && (r.set = "miss", r.maxEntrySizeExceeded = true), __privateMethod(this, _a_instances, E_fn).call(this, t, "set"), this;
-    let c = __privateGet(this, _n) === 0 ? void 0 : __privateGet(this, _s).get(t);
-    if (c === void 0) c = __privateGet(this, _n) === 0 ? __privateGet(this, _h) : __privateGet(this, _b2).length !== 0 ? __privateGet(this, _b2).pop() : __privateGet(this, _n) === __privateGet(this, _o2) ? __privateMethod(this, _a_instances, M_fn).call(this, false) : __privateGet(this, _n), __privateGet(this, _i)[c] = t, __privateGet(this, _t)[c] = e, __privateGet(this, _s).set(t, c), __privateGet(this, _a4)[__privateGet(this, _h)] = c, __privateGet(this, _u)[c] = __privateGet(this, _h), __privateSet(this, _h, c), __privateWrapper(this, _n)._++, __privateGet(this, _U).call(this, c, m, r), r && (r.set = "add"), f = false, __privateGet(this, _x) && ((_a5 = __privateGet(this, _C)) == null ? void 0 : _a5.call(this, e, t, "add"));
+    let { ttl: s = this.ttl, start: n, noDisposeOnSet: o = this.noDisposeOnSet, sizeCalculation: h = this.sizeCalculation, status: r } = i, { noUpdateTTL: a = this.noUpdateTTL } = i, w = __privateGet(this, _P).call(this, t, e, i.size || 0, h);
+    if (this.maxEntrySize && w > this.maxEntrySize) return r && (r.set = "miss", r.maxEntrySizeExceeded = true), __privateMethod(this, _c_instances, E_fn).call(this, t, "set"), this;
+    let f = __privateGet(this, _n) === 0 ? void 0 : __privateGet(this, _s).get(t);
+    if (f === void 0) f = __privateGet(this, _n) === 0 ? __privateGet(this, _h) : __privateGet(this, _b2).length !== 0 ? __privateGet(this, _b2).pop() : __privateGet(this, _n) === __privateGet(this, _o2) ? __privateMethod(this, _c_instances, x_fn).call(this, false) : __privateGet(this, _n), __privateGet(this, _i)[f] = t, __privateGet(this, _t)[f] = e, __privateGet(this, _s).set(t, f), __privateGet(this, _a4)[__privateGet(this, _h)] = f, __privateGet(this, _u)[f] = __privateGet(this, _h), __privateSet(this, _h, f), __privateWrapper(this, _n)._++, __privateGet(this, _M).call(this, f, w, r), r && (r.set = "add"), a = false, __privateGet(this, _U) && ((_a5 = __privateGet(this, _C)) == null ? void 0 : _a5.call(this, e, t, "add"));
     else {
-      __privateMethod(this, _a_instances, D_fn).call(this, c);
-      let d = __privateGet(this, _t)[c];
+      __privateMethod(this, _c_instances, D_fn).call(this, f);
+      let d = __privateGet(this, _t)[f];
       if (e !== d) {
-        if (__privateGet(this, _v) && __privateMethod(this, _a_instances, e_fn).call(this, d)) {
+        if (__privateGet(this, _v) && __privateMethod(this, _c_instances, e_fn).call(this, d)) {
           d.__abortController.abort(new Error("replaced"));
           let { __staleWhileFetching: g } = d;
-          g !== void 0 && !n && (__privateGet(this, _T) && ((_b3 = __privateGet(this, _w)) == null ? void 0 : _b3.call(this, g, t, "set")), __privateGet(this, _f) && __privateGet(this, _r)?.push([g, t, "set"]));
-        } else n || (__privateGet(this, _T) && ((_c3 = __privateGet(this, _w)) == null ? void 0 : _c3.call(this, d, t, "set")), __privateGet(this, _f) && __privateGet(this, _r)?.push([d, t, "set"]));
-        if (__privateGet(this, _W).call(this, c), __privateGet(this, _U).call(this, c, m, r), __privateGet(this, _t)[c] = e, r) {
+          g !== void 0 && !o && (__privateGet(this, _T) && ((_b3 = __privateGet(this, _w)) == null ? void 0 : _b3.call(this, g, t, "set")), __privateGet(this, _f) && __privateGet(this, _r)?.push([g, t, "set"]));
+        } else o || (__privateGet(this, _T) && ((_c3 = __privateGet(this, _w)) == null ? void 0 : _c3.call(this, d, t, "set")), __privateGet(this, _f) && __privateGet(this, _r)?.push([d, t, "set"]));
+        if (__privateGet(this, _W).call(this, f), __privateGet(this, _M).call(this, f, w, r), __privateGet(this, _t)[f] = e, r) {
           r.set = "replace";
-          let g = d && __privateMethod(this, _a_instances, e_fn).call(this, d) ? d.__staleWhileFetching : d;
+          let g = d && __privateMethod(this, _c_instances, e_fn).call(this, d) ? d.__staleWhileFetching : d;
           g !== void 0 && (r.oldValue = g);
         }
       } else r && (r.set = "update");
-      __privateGet(this, _x) && this.onInsert?.(e, t, e === d ? "update" : "replace");
+      __privateGet(this, _U) && this.onInsert?.(e, t, e === d ? "update" : "replace");
     }
-    if (s !== 0 && !__privateGet(this, _d) && __privateMethod(this, _a_instances, j_fn).call(this), __privateGet(this, _d) && (f || __privateGet(this, _N).call(this, c, s, h), r && __privateGet(this, _z).call(this, r, c)), !n && __privateGet(this, _f) && __privateGet(this, _r)) {
+    if (s !== 0 && !__privateGet(this, _d) && __privateMethod(this, _c_instances, j_fn).call(this), __privateGet(this, _d) && (a || __privateGet(this, _N).call(this, f, s, n), r && __privateGet(this, _z).call(this, r, f)), !o && __privateGet(this, _f) && __privateGet(this, _r)) {
       let d = __privateGet(this, _r), g;
       for (; g = d?.shift(); ) (_d2 = __privateGet(this, _S)) == null ? void 0 : _d2.call(this, ...g);
     }
@@ -34602,7 +34603,7 @@ var L = (_c = class {
     try {
       for (; __privateGet(this, _n); ) {
         let t = __privateGet(this, _t)[__privateGet(this, _l)];
-        if (__privateMethod(this, _a_instances, M_fn).call(this, true), __privateMethod(this, _a_instances, e_fn).call(this, t)) {
+        if (__privateMethod(this, _c_instances, x_fn).call(this, true), __privateMethod(this, _c_instances, e_fn).call(this, t)) {
           if (t.__staleWhileFetching) return t.__staleWhileFetching;
         } else if (t !== void 0) return t;
       }
@@ -34614,38 +34615,38 @@ var L = (_c = class {
     }
   }
   has(t, e = {}) {
-    let { updateAgeOnHas: i = this.updateAgeOnHas, status: s } = e, h = __privateGet(this, _s).get(t);
-    if (h !== void 0) {
-      let n = __privateGet(this, _t)[h];
-      if (__privateMethod(this, _a_instances, e_fn).call(this, n) && n.__staleWhileFetching === void 0) return false;
-      if (__privateGet(this, _p).call(this, h)) s && (s.has = "stale", __privateGet(this, _z).call(this, s, h));
-      else return i && __privateGet(this, _R).call(this, h), s && (s.has = "hit", __privateGet(this, _z).call(this, s, h)), true;
+    let { updateAgeOnHas: i = this.updateAgeOnHas, status: s } = e, n = __privateGet(this, _s).get(t);
+    if (n !== void 0) {
+      let o = __privateGet(this, _t)[n];
+      if (__privateMethod(this, _c_instances, e_fn).call(this, o) && o.__staleWhileFetching === void 0) return false;
+      if (__privateGet(this, _p).call(this, n)) s && (s.has = "stale", __privateGet(this, _z).call(this, s, n));
+      else return i && __privateGet(this, _R).call(this, n), s && (s.has = "hit", __privateGet(this, _z).call(this, s, n)), true;
     } else s && (s.has = "miss");
     return false;
   }
   peek(t, e = {}) {
     let { allowStale: i = this.allowStale } = e, s = __privateGet(this, _s).get(t);
     if (s === void 0 || !i && __privateGet(this, _p).call(this, s)) return;
-    let h = __privateGet(this, _t)[s];
-    return __privateMethod(this, _a_instances, e_fn).call(this, h) ? h.__staleWhileFetching : h;
+    let n = __privateGet(this, _t)[s];
+    return __privateMethod(this, _c_instances, e_fn).call(this, n) ? n.__staleWhileFetching : n;
   }
   async fetch(t, e = {}) {
-    let { allowStale: i = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: h = this.noDeleteOnStaleGet, ttl: n = this.ttl, noDisposeOnSet: o = this.noDisposeOnSet, size: r = 0, sizeCalculation: f = this.sizeCalculation, noUpdateTTL: m = this.noUpdateTTL, noDeleteOnFetchRejection: c = this.noDeleteOnFetchRejection, allowStaleOnFetchRejection: d = this.allowStaleOnFetchRejection, ignoreFetchAbort: g = this.ignoreFetchAbort, allowStaleOnFetchAbort: A = this.allowStaleOnFetchAbort, context: p, forceRefresh: _ = false, status: l, signal: w } = e;
-    if (!__privateGet(this, _v)) return l && (l.fetch = "get"), this.get(t, { allowStale: i, updateAgeOnGet: s, noDeleteOnStaleGet: h, status: l });
-    let b = { allowStale: i, updateAgeOnGet: s, noDeleteOnStaleGet: h, ttl: n, noDisposeOnSet: o, size: r, sizeCalculation: f, noUpdateTTL: m, noDeleteOnFetchRejection: c, allowStaleOnFetchRejection: d, allowStaleOnFetchAbort: A, ignoreFetchAbort: g, status: l, signal: w }, S = __privateGet(this, _s).get(t);
-    if (S === void 0) {
+    let { allowStale: i = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, ttl: o = this.ttl, noDisposeOnSet: h = this.noDisposeOnSet, size: r = 0, sizeCalculation: a = this.sizeCalculation, noUpdateTTL: w = this.noUpdateTTL, noDeleteOnFetchRejection: f = this.noDeleteOnFetchRejection, allowStaleOnFetchRejection: d = this.allowStaleOnFetchRejection, ignoreFetchAbort: g = this.ignoreFetchAbort, allowStaleOnFetchAbort: A = this.allowStaleOnFetchAbort, context: p, forceRefresh: _ = false, status: l, signal: S } = e;
+    if (!__privateGet(this, _v)) return l && (l.fetch = "get"), this.get(t, { allowStale: i, updateAgeOnGet: s, noDeleteOnStaleGet: n, status: l });
+    let b = { allowStale: i, updateAgeOnGet: s, noDeleteOnStaleGet: n, ttl: o, noDisposeOnSet: h, size: r, sizeCalculation: a, noUpdateTTL: w, noDeleteOnFetchRejection: f, allowStaleOnFetchRejection: d, allowStaleOnFetchAbort: A, ignoreFetchAbort: g, status: l, signal: S }, m = __privateGet(this, _s).get(t);
+    if (m === void 0) {
       l && (l.fetch = "miss");
-      let u = __privateMethod(this, _a_instances, G_fn).call(this, t, S, b, p);
+      let u = __privateMethod(this, _c_instances, G_fn).call(this, t, m, b, p);
       return u.__returned = u;
     } else {
-      let u = __privateGet(this, _t)[S];
-      if (__privateMethod(this, _a_instances, e_fn).call(this, u)) {
+      let u = __privateGet(this, _t)[m];
+      if (__privateMethod(this, _c_instances, e_fn).call(this, u)) {
         let E = i && u.__staleWhileFetching !== void 0;
         return l && (l.fetch = "inflight", E && (l.returnedStale = true)), E ? u.__staleWhileFetching : u.__returned = u;
       }
-      let T = __privateGet(this, _p).call(this, S);
-      if (!_ && !T) return l && (l.fetch = "hit"), __privateMethod(this, _a_instances, D_fn).call(this, S), s && __privateGet(this, _R).call(this, S), l && __privateGet(this, _z).call(this, l, S), u;
-      let F = __privateMethod(this, _a_instances, G_fn).call(this, t, S, b, p), O = F.__staleWhileFetching !== void 0 && i;
+      let T = __privateGet(this, _p).call(this, m);
+      if (!_ && !T) return l && (l.fetch = "hit"), __privateMethod(this, _c_instances, D_fn).call(this, m), s && __privateGet(this, _R).call(this, m), l && __privateGet(this, _z).call(this, l, m), u;
+      let F = __privateMethod(this, _c_instances, G_fn).call(this, t, m, b, p), O = F.__staleWhileFetching !== void 0 && i;
       return l && (l.fetch = T ? "stale" : "refresh", O && T && (l.returnedStale = true)), O ? F.__staleWhileFetching : F.__returned = F;
     }
   }
@@ -34657,117 +34658,122 @@ var L = (_c = class {
   memo(t, e = {}) {
     let i = __privateGet(this, _I);
     if (!i) throw new Error("no memoMethod provided to constructor");
-    let { context: s, forceRefresh: h, ...n } = e, o = this.get(t, n);
-    if (!h && o !== void 0) return o;
-    let r = i(t, o, { options: n, context: s });
-    return this.set(t, r, n), r;
+    let { context: s, forceRefresh: n, ...o } = e, h = this.get(t, o);
+    if (!n && h !== void 0) return h;
+    let r = i(t, h, { options: o, context: s });
+    return this.set(t, r, o), r;
   }
   get(t, e = {}) {
-    let { allowStale: i = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: h = this.noDeleteOnStaleGet, status: n } = e, o = __privateGet(this, _s).get(t);
-    if (o !== void 0) {
-      let r = __privateGet(this, _t)[o], f = __privateMethod(this, _a_instances, e_fn).call(this, r);
-      return n && __privateGet(this, _z).call(this, n, o), __privateGet(this, _p).call(this, o) ? (n && (n.get = "stale"), f ? (n && i && r.__staleWhileFetching !== void 0 && (n.returnedStale = true), i ? r.__staleWhileFetching : void 0) : (h || __privateMethod(this, _a_instances, E_fn).call(this, t, "expire"), n && i && (n.returnedStale = true), i ? r : void 0)) : (n && (n.get = "hit"), f ? r.__staleWhileFetching : (__privateMethod(this, _a_instances, D_fn).call(this, o), s && __privateGet(this, _R).call(this, o), r));
-    } else n && (n.get = "miss");
+    let { allowStale: i = this.allowStale, updateAgeOnGet: s = this.updateAgeOnGet, noDeleteOnStaleGet: n = this.noDeleteOnStaleGet, status: o } = e, h = __privateGet(this, _s).get(t);
+    if (h !== void 0) {
+      let r = __privateGet(this, _t)[h], a = __privateMethod(this, _c_instances, e_fn).call(this, r);
+      return o && __privateGet(this, _z).call(this, o, h), __privateGet(this, _p).call(this, h) ? (o && (o.get = "stale"), a ? (o && i && r.__staleWhileFetching !== void 0 && (o.returnedStale = true), i ? r.__staleWhileFetching : void 0) : (n || __privateMethod(this, _c_instances, E_fn).call(this, t, "expire"), o && i && (o.returnedStale = true), i ? r : void 0)) : (o && (o.get = "hit"), a ? r.__staleWhileFetching : (__privateMethod(this, _c_instances, D_fn).call(this, h), s && __privateGet(this, _R).call(this, h), r));
+    } else o && (o.get = "miss");
   }
   delete(t) {
-    return __privateMethod(this, _a_instances, E_fn).call(this, t, "delete");
+    return __privateMethod(this, _c_instances, E_fn).call(this, t, "delete");
   }
   clear() {
-    return __privateMethod(this, _a_instances, V_fn).call(this, "delete");
+    return __privateMethod(this, _c_instances, V_fn).call(this, "delete");
   }
-}, _o2 = new WeakMap(), _c2 = new WeakMap(), _w = new WeakMap(), _C = new WeakMap(), _S = new WeakMap(), _L = new WeakMap(), _I = new WeakMap(), _m = new WeakMap(), _n = new WeakMap(), __ = new WeakMap(), _s = new WeakMap(), _i = new WeakMap(), _t = new WeakMap(), _a4 = new WeakMap(), _u = new WeakMap(), _l = new WeakMap(), _h = new WeakMap(), _b2 = new WeakMap(), _r = new WeakMap(), _y = new WeakMap(), _A = new WeakMap(), _d = new WeakMap(), _g = new WeakMap(), _T = new WeakMap(), _v = new WeakMap(), _f = new WeakMap(), _x = new WeakMap(), _a_instances = new WeakSet(), j_fn = function() {
+}, _o2 = new WeakMap(), _c2 = new WeakMap(), _w = new WeakMap(), _C = new WeakMap(), _S = new WeakMap(), _L = new WeakMap(), _I = new WeakMap(), _m = new WeakMap(), _n = new WeakMap(), __ = new WeakMap(), _s = new WeakMap(), _i = new WeakMap(), _t = new WeakMap(), _a4 = new WeakMap(), _u = new WeakMap(), _l = new WeakMap(), _h = new WeakMap(), _b2 = new WeakMap(), _r = new WeakMap(), _y = new WeakMap(), _A = new WeakMap(), _d = new WeakMap(), _g = new WeakMap(), _T = new WeakMap(), _v = new WeakMap(), _f = new WeakMap(), _U = new WeakMap(), _c_instances = new WeakSet(), j_fn = function() {
   let t = new z2(__privateGet(this, _o2)), e = new z2(__privateGet(this, _o2));
   __privateSet(this, _d, t), __privateSet(this, _A, e);
   let i = this.ttlAutopurge ? new Array(__privateGet(this, _o2)) : void 0;
-  __privateSet(this, _g, i), __privateSet(this, _N, (n, o, r = __privateGet(this, _m).now()) => {
-    if (e[n] = o !== 0 ? r : 0, t[n] = o, i?.[n] && (clearTimeout(i[n]), i[n] = void 0), o !== 0 && i) {
-      let f = setTimeout(() => {
-        __privateGet(this, _p).call(this, n) && __privateMethod(this, _a_instances, E_fn).call(this, __privateGet(this, _i)[n], "expire");
-      }, o + 1);
-      f.unref && f.unref(), i[n] = f;
-    }
-  }), __privateSet(this, _R, (n) => {
-    e[n] = t[n] !== 0 ? __privateGet(this, _m).now() : 0;
-  }), __privateSet(this, _z, (n, o) => {
-    if (t[o]) {
-      let r = t[o], f = e[o];
-      if (!r || !f) return;
-      n.ttl = r, n.start = f, n.now = s || h();
-      let m = n.now - f;
-      n.remainingTTL = r - m;
+  __privateSet(this, _g, i), __privateSet(this, _N, (h, r, a = __privateGet(this, _m).now()) => {
+    e[h] = r !== 0 ? a : 0, t[h] = r, s(h, r);
+  }), __privateSet(this, _R, (h) => {
+    e[h] = t[h] !== 0 ? __privateGet(this, _m).now() : 0, s(h, t[h]);
+  });
+  let s = this.ttlAutopurge ? (h, r) => {
+    if (i?.[h] && (clearTimeout(i[h]), i[h] = void 0), r && r !== 0 && i) {
+      let a = setTimeout(() => {
+        __privateGet(this, _p).call(this, h) && __privateMethod(this, _c_instances, E_fn).call(this, __privateGet(this, _i)[h], "expire");
+      }, r + 1);
+      a.unref && a.unref(), i[h] = a;
+    }
+  } : () => {
+  };
+  __privateSet(this, _z, (h, r) => {
+    if (t[r]) {
+      let a = t[r], w = e[r];
+      if (!a || !w) return;
+      h.ttl = a, h.start = w, h.now = n || o();
+      let f = h.now - w;
+      h.remainingTTL = a - f;
     }
   });
-  let s = 0, h = () => {
-    let n = __privateGet(this, _m).now();
+  let n = 0, o = () => {
+    let h = __privateGet(this, _m).now();
     if (this.ttlResolution > 0) {
-      s = n;
-      let o = setTimeout(() => s = 0, this.ttlResolution);
-      o.unref && o.unref();
-    }
-    return n;
-  };
-  this.getRemainingTTL = (n) => {
-    let o = __privateGet(this, _s).get(n);
-    if (o === void 0) return 0;
-    let r = t[o], f = e[o];
-    if (!r || !f) return 1 / 0;
-    let m = (s || h()) - f;
-    return r - m;
-  }, __privateSet(this, _p, (n) => {
-    let o = e[n], r = t[n];
-    return !!r && !!o && (s || h()) - o > r;
+      n = h;
+      let r = setTimeout(() => n = 0, this.ttlResolution);
+      r.unref && r.unref();
+    }
+    return h;
+  };
+  this.getRemainingTTL = (h) => {
+    let r = __privateGet(this, _s).get(h);
+    if (r === void 0) return 0;
+    let a = t[r], w = e[r];
+    if (!a || !w) return 1 / 0;
+    let f = (n || o()) - w;
+    return a - f;
+  }, __privateSet(this, _p, (h) => {
+    let r = e[h], a = t[h];
+    return !!a && !!r && (n || o()) - r > a;
   });
 }, _R = new WeakMap(), _z = new WeakMap(), _N = new WeakMap(), _p = new WeakMap(), B_fn = function() {
   let t = new z2(__privateGet(this, _o2));
   __privateSet(this, __, 0), __privateSet(this, _y, t), __privateSet(this, _W, (e) => {
     __privateSet(this, __, __privateGet(this, __) - t[e]), t[e] = 0;
-  }), __privateSet(this, _P, (e, i, s, h) => {
-    if (__privateMethod(this, _a_instances, e_fn).call(this, i)) return 0;
-    if (!y(s)) if (h) {
-      if (typeof h != "function") throw new TypeError("sizeCalculation must be a function");
-      if (s = h(i, e), !y(s)) throw new TypeError("sizeCalculation return invalid (expect positive integer)");
+  }), __privateSet(this, _P, (e, i, s, n) => {
+    if (__privateMethod(this, _c_instances, e_fn).call(this, i)) return 0;
+    if (!y(s)) if (n) {
+      if (typeof n != "function") throw new TypeError("sizeCalculation must be a function");
+      if (s = n(i, e), !y(s)) throw new TypeError("sizeCalculation return invalid (expect positive integer)");
     } else throw new TypeError("invalid size value (must be positive integer). When maxSize or maxEntrySize is used, sizeCalculation or size must be set.");
     return s;
-  }), __privateSet(this, _U, (e, i, s) => {
+  }), __privateSet(this, _M, (e, i, s) => {
     if (t[e] = i, __privateGet(this, _c2)) {
-      let h = __privateGet(this, _c2) - t[e];
-      for (; __privateGet(this, __) > h; ) __privateMethod(this, _a_instances, M_fn).call(this, true);
+      let n = __privateGet(this, _c2) - t[e];
+      for (; __privateGet(this, __) > n; ) __privateMethod(this, _c_instances, x_fn).call(this, true);
     }
     __privateSet(this, __, __privateGet(this, __) + t[e]), s && (s.entrySize = i, s.totalCalculatedSize = __privateGet(this, __));
   });
-}, _W = new WeakMap(), _U = new WeakMap(), _P = new WeakMap(), F_fn = function* ({ allowStale: t = this.allowStale } = {}) {
-  if (__privateGet(this, _n)) for (let e = __privateGet(this, _h); !(!__privateMethod(this, _a_instances, H_fn).call(this, e) || ((t || !__privateGet(this, _p).call(this, e)) && (yield e), e === __privateGet(this, _l))); ) e = __privateGet(this, _u)[e];
+}, _W = new WeakMap(), _M = new WeakMap(), _P = new WeakMap(), F_fn = function* ({ allowStale: t = this.allowStale } = {}) {
+  if (__privateGet(this, _n)) for (let e = __privateGet(this, _h); !(!__privateMethod(this, _c_instances, H_fn).call(this, e) || ((t || !__privateGet(this, _p).call(this, e)) && (yield e), e === __privateGet(this, _l))); ) e = __privateGet(this, _u)[e];
 }, O_fn = function* ({ allowStale: t = this.allowStale } = {}) {
-  if (__privateGet(this, _n)) for (let e = __privateGet(this, _l); !(!__privateMethod(this, _a_instances, H_fn).call(this, e) || ((t || !__privateGet(this, _p).call(this, e)) && (yield e), e === __privateGet(this, _h))); ) e = __privateGet(this, _a4)[e];
+  if (__privateGet(this, _n)) for (let e = __privateGet(this, _l); !(!__privateMethod(this, _c_instances, H_fn).call(this, e) || ((t || !__privateGet(this, _p).call(this, e)) && (yield e), e === __privateGet(this, _h))); ) e = __privateGet(this, _a4)[e];
 }, H_fn = function(t) {
   return t !== void 0 && __privateGet(this, _s).get(__privateGet(this, _i)[t]) === t;
-}, M_fn = function(t) {
+}, x_fn = function(t) {
   var _a5;
   let e = __privateGet(this, _l), i = __privateGet(this, _i)[e], s = __privateGet(this, _t)[e];
-  return __privateGet(this, _v) && __privateMethod(this, _a_instances, e_fn).call(this, s) ? s.__abortController.abort(new Error("evicted")) : (__privateGet(this, _T) || __privateGet(this, _f)) && (__privateGet(this, _T) && ((_a5 = __privateGet(this, _w)) == null ? void 0 : _a5.call(this, s, i, "evict")), __privateGet(this, _f) && __privateGet(this, _r)?.push([s, i, "evict"])), __privateGet(this, _W).call(this, e), __privateGet(this, _g)?.[e] && (clearTimeout(__privateGet(this, _g)[e]), __privateGet(this, _g)[e] = void 0), t && (__privateGet(this, _i)[e] = void 0, __privateGet(this, _t)[e] = void 0, __privateGet(this, _b2).push(e)), __privateGet(this, _n) === 1 ? (__privateSet(this, _l, __privateSet(this, _h, 0)), __privateGet(this, _b2).length = 0) : __privateSet(this, _l, __privateGet(this, _a4)[e]), __privateGet(this, _s).delete(i), __privateWrapper(this, _n)._--, e;
+  return __privateGet(this, _v) && __privateMethod(this, _c_instances, e_fn).call(this, s) ? s.__abortController.abort(new Error("evicted")) : (__privateGet(this, _T) || __privateGet(this, _f)) && (__privateGet(this, _T) && ((_a5 = __privateGet(this, _w)) == null ? void 0 : _a5.call(this, s, i, "evict")), __privateGet(this, _f) && __privateGet(this, _r)?.push([s, i, "evict"])), __privateGet(this, _W).call(this, e), __privateGet(this, _g)?.[e] && (clearTimeout(__privateGet(this, _g)[e]), __privateGet(this, _g)[e] = void 0), t && (__privateGet(this, _i)[e] = void 0, __privateGet(this, _t)[e] = void 0, __privateGet(this, _b2).push(e)), __privateGet(this, _n) === 1 ? (__privateSet(this, _l, __privateSet(this, _h, 0)), __privateGet(this, _b2).length = 0) : __privateSet(this, _l, __privateGet(this, _a4)[e]), __privateGet(this, _s).delete(i), __privateWrapper(this, _n)._--, e;
 }, G_fn = function(t, e, i, s) {
-  let h = e === void 0 ? void 0 : __privateGet(this, _t)[e];
-  if (__privateMethod(this, _a_instances, e_fn).call(this, h)) return h;
-  let n = new C(), { signal: o } = i;
-  o?.addEventListener("abort", () => n.abort(o.reason), { signal: n.signal });
-  let r = { signal: n.signal, options: i, context: s }, f = (p, _ = false) => {
-    let { aborted: l } = n.signal, w = i.ignoreFetchAbort && p !== void 0, b = i.ignoreFetchAbort || !!(i.allowStaleOnFetchAbort && p !== void 0);
-    if (i.status && (l && !_ ? (i.status.fetchAborted = true, i.status.fetchError = n.signal.reason, w && (i.status.fetchAbortIgnored = true)) : i.status.fetchResolved = true), l && !w && !_) return c(n.signal.reason, b);
-    let S = g, u = __privateGet(this, _t)[e];
-    return (u === g || w && _ && u === void 0) && (p === void 0 ? S.__staleWhileFetching !== void 0 ? __privateGet(this, _t)[e] = S.__staleWhileFetching : __privateMethod(this, _a_instances, E_fn).call(this, t, "fetch") : (i.status && (i.status.fetchUpdated = true), this.set(t, p, r.options))), p;
-  }, m = (p) => (i.status && (i.status.fetchRejected = true, i.status.fetchError = p), c(p, false)), c = (p, _) => {
-    let { aborted: l } = n.signal, w = l && i.allowStaleOnFetchAbort, b = w || i.allowStaleOnFetchRejection, S = b || i.noDeleteOnFetchRejection, u = g;
-    if (__privateGet(this, _t)[e] === g && (!S || !_ && u.__staleWhileFetching === void 0 ? __privateMethod(this, _a_instances, E_fn).call(this, t, "fetch") : w || (__privateGet(this, _t)[e] = u.__staleWhileFetching)), b) return i.status && u.__staleWhileFetching !== void 0 && (i.status.returnedStale = true), u.__staleWhileFetching;
+  let n = e === void 0 ? void 0 : __privateGet(this, _t)[e];
+  if (__privateMethod(this, _c_instances, e_fn).call(this, n)) return n;
+  let o = new C(), { signal: h } = i;
+  h?.addEventListener("abort", () => o.abort(h.reason), { signal: o.signal });
+  let r = { signal: o.signal, options: i, context: s }, a = (p, _ = false) => {
+    let { aborted: l } = o.signal, S = i.ignoreFetchAbort && p !== void 0, b = i.ignoreFetchAbort || !!(i.allowStaleOnFetchAbort && p !== void 0);
+    if (i.status && (l && !_ ? (i.status.fetchAborted = true, i.status.fetchError = o.signal.reason, S && (i.status.fetchAbortIgnored = true)) : i.status.fetchResolved = true), l && !S && !_) return f(o.signal.reason, b);
+    let m = g, u = __privateGet(this, _t)[e];
+    return (u === g || S && _ && u === void 0) && (p === void 0 ? m.__staleWhileFetching !== void 0 ? __privateGet(this, _t)[e] = m.__staleWhileFetching : __privateMethod(this, _c_instances, E_fn).call(this, t, "fetch") : (i.status && (i.status.fetchUpdated = true), this.set(t, p, r.options))), p;
+  }, w = (p) => (i.status && (i.status.fetchRejected = true, i.status.fetchError = p), f(p, false)), f = (p, _) => {
+    let { aborted: l } = o.signal, S = l && i.allowStaleOnFetchAbort, b = S || i.allowStaleOnFetchRejection, m = b || i.noDeleteOnFetchRejection, u = g;
+    if (__privateGet(this, _t)[e] === g && (!m || !_ && u.__staleWhileFetching === void 0 ? __privateMethod(this, _c_instances, E_fn).call(this, t, "fetch") : S || (__privateGet(this, _t)[e] = u.__staleWhileFetching)), b) return i.status && u.__staleWhileFetching !== void 0 && (i.status.returnedStale = true), u.__staleWhileFetching;
     if (u.__returned === u) throw p;
   }, d = (p, _) => {
     var _a5;
-    let l = (_a5 = __privateGet(this, _L)) == null ? void 0 : _a5.call(this, t, h, r);
-    l && l instanceof Promise && l.then((w) => p(w === void 0 ? void 0 : w), _), n.signal.addEventListener("abort", () => {
-      (!i.ignoreFetchAbort || i.allowStaleOnFetchAbort) && (p(void 0), i.allowStaleOnFetchAbort && (p = (w) => f(w, true)));
+    let l = (_a5 = __privateGet(this, _L)) == null ? void 0 : _a5.call(this, t, n, r);
+    l && l instanceof Promise && l.then((S) => p(S === void 0 ? void 0 : S), _), o.signal.addEventListener("abort", () => {
+      (!i.ignoreFetchAbort || i.allowStaleOnFetchAbort) && (p(void 0), i.allowStaleOnFetchAbort && (p = (S) => a(S, true)));
     });
   };
   i.status && (i.status.fetchDispatched = true);
-  let g = new Promise(d).then(f, m), A = Object.assign(g, { __abortController: n, __staleWhileFetching: h, __returned: void 0 });
+  let g = new Promise(d).then(a, w), A = Object.assign(g, { __abortController: o, __staleWhileFetching: n, __returned: void 0 });
   return e === void 0 ? (this.set(t, A, { ...r.options, status: void 0 }), e = __privateGet(this, _s).get(t)) : __privateGet(this, _t)[e] = A, A;
 }, e_fn = function(t) {
   if (!__privateGet(this, _v)) return false;
@@ -34776,37 +34782,37 @@ var L = (_c = class {
 }, k_fn = function(t, e) {
   __privateGet(this, _u)[e] = t, __privateGet(this, _a4)[t] = e;
 }, D_fn = function(t) {
-  t !== __privateGet(this, _h) && (t === __privateGet(this, _l) ? __privateSet(this, _l, __privateGet(this, _a4)[t]) : __privateMethod(this, _a_instances, k_fn).call(this, __privateGet(this, _u)[t], __privateGet(this, _a4)[t]), __privateMethod(this, _a_instances, k_fn).call(this, __privateGet(this, _h), t), __privateSet(this, _h, t));
+  t !== __privateGet(this, _h) && (t === __privateGet(this, _l) ? __privateSet(this, _l, __privateGet(this, _a4)[t]) : __privateMethod(this, _c_instances, k_fn).call(this, __privateGet(this, _u)[t], __privateGet(this, _a4)[t]), __privateMethod(this, _c_instances, k_fn).call(this, __privateGet(this, _h), t), __privateSet(this, _h, t));
 }, E_fn = function(t, e) {
   var _a5, _b3;
   let i = false;
   if (__privateGet(this, _n) !== 0) {
     let s = __privateGet(this, _s).get(t);
-    if (s !== void 0) if (__privateGet(this, _g)?.[s] && (clearTimeout(__privateGet(this, _g)?.[s]), __privateGet(this, _g)[s] = void 0), i = true, __privateGet(this, _n) === 1) __privateMethod(this, _a_instances, V_fn).call(this, e);
+    if (s !== void 0) if (__privateGet(this, _g)?.[s] && (clearTimeout(__privateGet(this, _g)?.[s]), __privateGet(this, _g)[s] = void 0), i = true, __privateGet(this, _n) === 1) __privateMethod(this, _c_instances, V_fn).call(this, e);
     else {
       __privateGet(this, _W).call(this, s);
-      let h = __privateGet(this, _t)[s];
-      if (__privateMethod(this, _a_instances, e_fn).call(this, h) ? h.__abortController.abort(new Error("deleted")) : (__privateGet(this, _T) || __privateGet(this, _f)) && (__privateGet(this, _T) && ((_a5 = __privateGet(this, _w)) == null ? void 0 : _a5.call(this, h, t, e)), __privateGet(this, _f) && __privateGet(this, _r)?.push([h, t, e])), __privateGet(this, _s).delete(t), __privateGet(this, _i)[s] = void 0, __privateGet(this, _t)[s] = void 0, s === __privateGet(this, _h)) __privateSet(this, _h, __privateGet(this, _u)[s]);
+      let n = __privateGet(this, _t)[s];
+      if (__privateMethod(this, _c_instances, e_fn).call(this, n) ? n.__abortController.abort(new Error("deleted")) : (__privateGet(this, _T) || __privateGet(this, _f)) && (__privateGet(this, _T) && ((_a5 = __privateGet(this, _w)) == null ? void 0 : _a5.call(this, n, t, e)), __privateGet(this, _f) && __privateGet(this, _r)?.push([n, t, e])), __privateGet(this, _s).delete(t), __privateGet(this, _i)[s] = void 0, __privateGet(this, _t)[s] = void 0, s === __privateGet(this, _h)) __privateSet(this, _h, __privateGet(this, _u)[s]);
       else if (s === __privateGet(this, _l)) __privateSet(this, _l, __privateGet(this, _a4)[s]);
       else {
-        let n = __privateGet(this, _u)[s];
-        __privateGet(this, _a4)[n] = __privateGet(this, _a4)[s];
-        let o = __privateGet(this, _a4)[s];
-        __privateGet(this, _u)[o] = __privateGet(this, _u)[s];
+        let o = __privateGet(this, _u)[s];
+        __privateGet(this, _a4)[o] = __privateGet(this, _a4)[s];
+        let h = __privateGet(this, _a4)[s];
+        __privateGet(this, _u)[h] = __privateGet(this, _u)[s];
       }
       __privateWrapper(this, _n)._--, __privateGet(this, _b2).push(s);
     }
   }
   if (__privateGet(this, _f) && __privateGet(this, _r)?.length) {
-    let s = __privateGet(this, _r), h;
-    for (; h = s?.shift(); ) (_b3 = __privateGet(this, _S)) == null ? void 0 : _b3.call(this, ...h);
+    let s = __privateGet(this, _r), n;
+    for (; n = s?.shift(); ) (_b3 = __privateGet(this, _S)) == null ? void 0 : _b3.call(this, ...n);
   }
   return i;
 }, V_fn = function(t) {
   var _a5, _b3;
-  for (let e of __privateMethod(this, _a_instances, O_fn).call(this, { allowStale: true })) {
+  for (let e of __privateMethod(this, _c_instances, O_fn).call(this, { allowStale: true })) {
     let i = __privateGet(this, _t)[e];
-    if (__privateMethod(this, _a_instances, e_fn).call(this, i)) i.__abortController.abort(new Error("deleted"));
+    if (__privateMethod(this, _c_instances, e_fn).call(this, i)) i.__abortController.abort(new Error("deleted"));
     else {
       let s = __privateGet(this, _i)[e];
       __privateGet(this, _T) && ((_a5 = __privateGet(this, _w)) == null ? void 0 : _a5.call(this, i, s, t)), __privateGet(this, _f) && __privateGet(this, _r)?.push([i, s, t]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shotstack/shotstack-canvas",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "Text layout & animation engine (HarfBuzz) for Node & Web - fully self-contained.",
   "type": "module",
   "main": "./dist/entry.node.cjs",
@@ -51,7 +51,7 @@
   "dependencies": {
     "@resvg/resvg-js": "^2.6.2",
     "@resvg/resvg-wasm": "^2.6.2",
-    "@shotstack/schemas": "1.9.2",
+    "@shotstack/schemas": "1.9.3",
     "bidi-js": "^1.0.3",
     "canvas": "npm:@napi-rs/canvas@^0.1.54",
     "ffmpeg-static": "^5.2.0",