effect 4.1.0 → 4.1.2

package/dist/internal/graphqlHeaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlHeaders.d.ts","sourceRoot":"","sources":["../../src/internal/graphqlHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AAItC,eAAO,MAAM,aAAa,+HAKzB,CAAA"}
+{"version":3,"file":"graphqlHeaders.d.ts","sourceRoot":"","sources":["../../src/internal/graphqlHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AAItC,eAAO,MAAM,aAAa,+HAKzB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,UAAW,MAAM,GAAG,SAAS,OAAO,MAAM,KAAG,QAAQ,CAAC,QAAQ,GAAG,SAI5F,CAAA"}

package/dist/internal/graphqlHeaders.js

@@ -1,4 +1,5 @@
 import * as Headers from "../http/Headers.js";
+import * as Result from "../Result.js";
 import * as Schema from "../Schema.js";
 import * as SchemaGetter from "../SchemaGetter.js";
 // Keep headers branded at runtime while encoding only their string entries.
@@ -8,4 +9,14 @@ export const HeadersSchema = /*#__PURE__*/Schema.Record(Schema.String, Schema.St
     ...headers
   }))
 }));
+/**
+ * Parses a `Retry-After` header value, either whole seconds or an HTTP date,
+ * into a `Duration` measured from `now` (epoch milliseconds). Anything else,
+ * such as `1.5` or `-1`, yields `undefined`.
+ */
+export const parseRetryAfter = (value, now) => {
+  if (value === undefined) return undefined;
+  const retryAfter = Headers.parseRetryAfter(value);
+  return Result.isSuccess(retryAfter) ? Headers.retryAfterDelay(retryAfter.success, now) : undefined;
+};
 //# sourceMappingURL=graphqlHeaders.js.map

package/dist/internal/graphqlHeaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlHeaders.js","names":[],"sources":["../../src/internal/graphqlHeaders.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,oBAAoB;AAC7C,OAAO,KAAK,MAAM,MAAM,cAAc;AACtC,OAAO,KAAK,YAAY,MAAM,oBAAoB;AAElD;AACA,OAAO,MAAM,aAAa,gBAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,cAC3E,MAAM,CAAC,QAAQ,cAAC,MAAM,CAAC,OAAO,CAAkB,OAAO,CAAC,SAAS,CAAC,EAAE;EAClE,MAAM,eAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;EACjD,MAAM,eAAE,YAAY,CAAC,SAAS,CAAE,OAAO,KAAM;IAAE,GAAG;EAAO,CAAE,CAAC;CAC7D,CAAC,CACH","ignoreList":[]}
+{"version":3,"file":"graphqlHeaders.js","names":[],"sources":["../../src/internal/graphqlHeaders.ts"],"sourcesContent":[null],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,oBAAoB;AAC7C,OAAO,KAAK,MAAM,MAAM,cAAc;AACtC,OAAO,KAAK,MAAM,MAAM,cAAc;AACtC,OAAO,KAAK,YAAY,MAAM,oBAAoB;AAElD;AACA,OAAO,MAAM,aAAa,gBAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,cAC3E,MAAM,CAAC,QAAQ,cAAC,MAAM,CAAC,OAAO,CAAkB,OAAO,CAAC,SAAS,CAAC,EAAE;EAClE,MAAM,eAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;EACjD,MAAM,eAAE,YAAY,CAAC,SAAS,CAAE,OAAO,KAAM;IAAE,GAAG;EAAO,CAAE,CAAC;CAC7D,CAAC,CACH;AAED;;;;;AAKA,OAAO,MAAM,eAAe,GAAG,CAAC,KAAyB,EAAE,GAAW,KAAmC;EACvG,IAAI,KAAK,KAAK,SAAS,EAAE,OAAO,SAAS;EACzC,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC;EACjD,OAAO,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,SAAS;AACpG,CAAC","ignoreList":[]}

package/dist/internal/jsonParser.d.ts

@@ -0,0 +1,5 @@
+type Format = "JSON5" | "JSONC";
+export declare const syntaxError: (text: string, at: number, format: Format) => SyntaxError;
+export declare const parse: (text: string, format: Format) => unknown;
+export {};
+//# sourceMappingURL=jsonParser.d.ts.map

package/dist/internal/jsonParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonParser.d.ts","sourceRoot":"","sources":["../../src/internal/jsonParser.ts"],"names":[],"mappings":"AA0BA,KAAK,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;AAE/B,eAAO,MAAM,WAAW,SAAU,MAAM,MAAM,MAAM,UAAU,MAAM,KAAG,WAMtE,CAAA;AAgBD,eAAO,MAAM,KAAK,SAAU,MAAM,UAAU,MAAM,KAAG,OAgQpD,CAAA"}

package/dist/internal/jsonParser.js

@@ -0,0 +1,280 @@
+const json5Space = /(?:[\t\n\v\f\r \u00A0\u2028\u2029\uFEFF\p{Zs}]|\/\/[^\n\r\u2028\u2029]*|\/\*[^]*?\*\/)*/uy;
+const idStart = /[$_\p{ID_Start}]/u;
+const idPart = /[$\u200C\u200D\p{ID_Continue}]/u;
+const idName = /[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*/uy;
+const hexDigits = /[\da-fA-F]*/y;
+const isDigit = code => code >= 0x30 && code <= 0x39;
+const isAsciiIdPart = code => code >= 0x61 && code <= 0x7a || code >= 0x41 && code <= 0x5a || isDigit(code) || code === 0x5f || code === 0x24;
+const jsoncSpace = /(?:[ \t\r\n]|\/\/[^\r\n]*|\/\*[^]*?\*\/)*/uy;
+const jsonNumber = /-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/y;
+// The escapes JSON and JSON5 share, indexed by the character after the backslash.
+// A null prototype keeps absent entries from resolving to inherited properties.
+const escapes = /*#__PURE__*/Object.create(null);
+for (const [escape, value] of ["\"\"", "\\\\", "//", "b\b", "f\f", "n\n", "r\r", "t\t"]) {
+  escapes[/*#__PURE__*/escape.charCodeAt(0)] = value;
+}
+// Runs of string content that need no further inspection.
+const json5Double = /[^"\\\n\r]*/y;
+const json5Single = /[^'\\\n\r]*/y;
+// JSON forbids unescaped U+0000 through U+001F.
+// oxlint-disable-next-line no-control-regex
+const jsonDouble = /[^"\\\x00-\x1f]*/y;
+export const syntaxError = (text, at, format) => {
+  const json5 = format === "JSON5";
+  const lines = text.slice(0, at).split(json5 ? /\r\n|[\n\r\u2028\u2029]/ : /\r\n|[\n\r]/);
+  return new SyntaxError(`Invalid ${json5 ? "JSON5" : "JSONC"} at line ${lines.length}, column ${lines[lines.length - 1].length + 1}`);
+};
+const set = (object, key, value) => {
+  // Members are own data properties, as with JSON.parse. Assignment creates one unless
+  // the key is inherited (`__proto__`, `constructor`, added accessors, ...), where it
+  // could run a setter or throw, so inherited keys are defined directly.
+  if (key in Object.prototype) {
+    Object.defineProperty(object, key, {
+      value,
+      writable: true,
+      enumerable: true,
+      configurable: true
+    });
+  } else object[key] = value;
+};
+// JSONC only uses the strict mode to locate errors after JSON.parse fails.
+export const parse = (text, format) => {
+  const json5 = format === "JSON5";
+  const space = json5 ? json5Space : jsoncSpace;
+  // JSON strings forbid raw characters below U+0020; JSON5 strings only forbid line breaks.
+  const plainFloor = json5 ? 0 : 0x20;
+  let i = 0;
+  const fail = at => {
+    throw syntaxError(text, at, format);
+  };
+  /** Skips whitespace and comments, rejecting a `/` that starts neither. */
+  const skip = () => {
+    // ASCII whitespace dominates formatted documents; the pattern handles the rest.
+    let code = text.charCodeAt(i);
+    while (code === 0x20 || code === 0x0a || code === 0x0d || code === 0x09) code = text.charCodeAt(++i);
+    if (code > 0x20 && code !== 0x2f && code < 0xa0) return;
+    space.lastIndex = i;
+    space.test(text);
+    i = space.lastIndex;
+    if (text.charCodeAt(i) === 0x2f) {
+      fail(text.charAt(i + 1) === "*" ? text.length : i + 1);
+    }
+  };
+  /** Advances past a sticky pattern at `i`, returning the matched length. */
+  const run = pattern => {
+    pattern.lastIndex = i;
+    const length = pattern.test(text) ? pattern.lastIndex - i : 0;
+    i += length;
+    return length;
+  };
+  const word = (literal, result) => {
+    if (!text.startsWith(literal, i)) {
+      let at = i;
+      while (text.charAt(at) === literal[at - i]) at++;
+      fail(at);
+    }
+    i += literal.length;
+    return result;
+  };
+  const hex = count => {
+    let value = 0;
+    for (const end = i + count; i < end; i++) {
+      const code = text.charCodeAt(i);
+      const lower = code | 0x20;
+      if (isDigit(code)) value = value * 16 + code - 0x30;else if (lower >= 0x61 && lower <= 0x66) value = value * 16 + lower - 0x57;else fail(i);
+    }
+    return String.fromCharCode(value);
+  };
+  const number = () => {
+    if (!json5) {
+      const start = i;
+      if (run(jsonNumber) === 0) fail(i);
+      return Number(text.slice(start, i));
+    }
+    let code = text.charCodeAt(i);
+    let sign = 1;
+    if (code === 0x2b || code === 0x2d) {
+      if (code === 0x2d) sign = -1;
+      code = text.charCodeAt(++i);
+    }
+    const start = i;
+    if (code === 0x49) return word("Infinity", sign * Infinity);
+    if (code === 0x4e) return word("NaN", NaN);
+    if (code === 0x30 && (text.charCodeAt(i + 1) | 0x20) === 0x78) {
+      i += 2;
+      if (run(hexDigits) === 0) fail(i);
+      return sign * Number(text.slice(start, i));
+    }
+    // Integers below 2^53 are accumulated directly; anything else goes through Number.
+    let integer = 0;
+    if (code === 0x30) code = text.charCodeAt(++i);else if (isDigit(code)) {
+      do {
+        integer = integer * 10 + code - 0x30;
+        code = text.charCodeAt(++i);
+      } while (isDigit(code));
+    } else if (code !== 0x2e) fail(i);
+    if (code !== 0x2e && code !== 0x65 && code !== 0x45 && i - start < 16) return sign * integer;
+    if (code === 0x2e) {
+      const fraction = ++i;
+      while (isDigit(text.charCodeAt(i))) i++;
+      // A leading decimal point needs digits after it; a trailing one does not.
+      if (i === fraction && fraction === start + 1) fail(i);
+      code = text.charCodeAt(i);
+    }
+    if (code === 0x65 || code === 0x45) {
+      code = text.charCodeAt(++i);
+      if (code === 0x2b || code === 0x2d) i++;
+      const exponent = i;
+      while (isDigit(text.charCodeAt(i))) i++;
+      if (i === exponent) fail(i);
+    }
+    return sign * Number(text.slice(start, i));
+  };
+  const string = quote => {
+    const plain = quote === 0x27 ? json5Single : json5 ? json5Double : jsonDouble;
+    let result = "";
+    for (i++;;) {
+      // Plain content runs until the quote, an escape, a line break, a control character
+      // JSON forbids, or the end of input, where `code` is NaN and fails the last test.
+      const start = i;
+      let code = text.charCodeAt(i);
+      // Short runs are cheaper to scan by hand; long runs are handed to the pattern.
+      const handoff = i + 24;
+      while (code !== quote && code !== 0x5c && code !== 0x0a && code !== 0x0d && code >= plainFloor) {
+        if (++i === handoff) {
+          run(plain);
+          code = text.charCodeAt(i);
+          break;
+        }
+        code = text.charCodeAt(i);
+      }
+      result += text.slice(start, i);
+      i++;
+      if (code === quote) return result;
+      // Anything else that stops a plain run is an escape or a forbidden character.
+      if (code !== 0x5c) fail(i - 1);
+      const escape = text.charCodeAt(i++);
+      const simple = escapes[escape];
+      if (simple !== undefined) result += simple;else if (escape === 0x75) result += hex(4);else if (!json5 || i > text.length || escape >= 0x31 && escape <= 0x39) fail(i - 1);else if (escape === 0x76) result += "\v";else if (escape === 0x78) result += hex(2);else if (escape === 0x30) {
+        if (isDigit(text.charCodeAt(i))) fail(i);
+        result += "\0";
+      } else if (escape === 0x0d) {
+        // A CR LF line continuation contributes nothing, like a single line terminator.
+        if (text.charCodeAt(i) === 0x0a) i++;
+      } else if (escape !== 0x0a && escape !== 0x2028 && escape !== 0x2029) result += text[i - 1];
+    }
+  };
+  const identifier = () => {
+    const start = i;
+    let code = text.charCodeAt(i);
+    if (isAsciiIdPart(code) && !isDigit(code)) {
+      do code = text.charCodeAt(++i); while (isAsciiIdPart(code));
+      // Past an ASCII name, only an escape or a non-ASCII character can continue it.
+      if (code !== 0x5c && !(code >= 0x80)) return text.slice(start, i);
+      i = start;
+    }
+    run(idName);
+    let name = text.slice(start, i);
+    if (name !== "" && text.charAt(i) !== "\\") return name;
+    // Escapes are validated one code point at a time.
+    for (;;) {
+      const at = i;
+      const valid = name === "" ? idStart : idPart;
+      let c = String.fromCodePoint(text.codePointAt(i) ?? 0);
+      if (c === "\\") {
+        if (text.charAt(i + 1) !== "u") fail(i + 1);
+        i += 2;
+        c = hex(4);
+        if (!valid.test(c)) fail(at);
+      } else if (i < text.length && valid.test(c)) i += c.length;else if (name === "") fail(i);else return name;
+      name += c;
+    }
+  };
+  const stack = [];
+  /**
+   * Reads a value at `i`, which must already be past any whitespace. Opening a
+   * collection returns `undefined`; the collection is completed later.
+   */
+  const value = () => {
+    const code = text.charCodeAt(i);
+    switch (code) {
+      case 0x7b:
+        stack.push({
+          object: true,
+          value: {},
+          key: "",
+          first: true
+        });
+        i++;
+        return undefined;
+      case 0x5b:
+        stack.push({
+          object: false,
+          value: [],
+          first: true
+        });
+        i++;
+        return undefined;
+      case 0x22:
+        return string(0x22);
+      case 0x27:
+        return json5 ? string(0x27) : fail(i);
+      case 0x6e:
+        return word("null", null);
+      case 0x74:
+        return word("true", true);
+      case 0x66:
+        return word("false", false);
+      case 0x2b:
+      case 0x2d:
+      case 0x2e:
+      case 0x49:
+      case 0x4e:
+        return number();
+    }
+    return isDigit(code) ? number() : fail(i);
+  };
+  /** After a member: consumes a comma unless the collection ends. */
+  const separated = close => {
+    skip();
+    const code = text.charCodeAt(i);
+    if (code === close) return;
+    if (code !== 0x2c) fail(i);
+    i++;
+    skip();
+    if (!json5 && text.charCodeAt(i) === close) fail(i);
+  };
+  skip();
+  let result = value();
+  // An explicit stack keeps deep nesting off the call stack.
+  while (stack.length > 0) {
+    const frame = stack[stack.length - 1];
+    const close = frame.object ? 0x7d : 0x5d;
+    if (frame.first) skip();else separated(close);
+    if (text.charCodeAt(i) === close) {
+      stack.pop();
+      i++;
+      const parent = stack[stack.length - 1];
+      if (parent === undefined) result = frame.value;else if (parent.object) set(parent.value, parent.key, frame.value);else parent.value.push(frame.value);
+      continue;
+    }
+    frame.first = false;
+    if (!frame.object) {
+      const item = value();
+      if (item !== undefined) frame.value.push(item);
+    } else {
+      const quote = text.charCodeAt(i);
+      if (!json5 && quote !== 0x22) fail(i);
+      const key = quote === 0x22 || quote === 0x27 ? string(quote) : identifier();
+      skip();
+      if (text.charCodeAt(i++) !== 0x3a) fail(i - 1);
+      skip();
+      const item = value();
+      if (item === undefined) frame.key = key;else set(frame.value, key, item);
+    }
+  }
+  skip();
+  if (i < text.length) fail(i);
+  return result;
+};
+//# sourceMappingURL=jsonParser.js.map

package/dist/internal/jsonParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonParser.js","names":[],"sources":["../../src/internal/jsonParser.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/internal/persistence.js

@@ -1,12 +1,19 @@
 /** @internal */
 export const sqlCleanupBatchSize = 1000;
+/**
+ * Percent-encodes `%` and `:` so the result contains no `:` and distinct inputs
+ * stay distinct.
+ *
+ * @internal
+ */
+export const escapeKeySegment = segment => segment.replace(/%/g, "%25").replace(/:/g, "%3A");
 /**
  * Key prefix for a persistence store. The store id is escaped so the namespace
  * always ends at its first `:`, and distinct store / key pairs never collide.
  *
  * @internal
  */
-export const storeNamespace = storeId => `${storeId.replace(/%/g, "%25").replace(/:/g, "%3A")}:`;
+export const storeNamespace = storeId => `${escapeKeySegment(storeId)}:`;
 /** @internal */
 export const escapeRedisGlob = pattern => pattern.replace(/[\\*?[\]]/g, "\\$&");
 //# sourceMappingURL=persistence.js.map

package/dist/internal/persistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"persistence.js","names":[],"sources":["../../src/internal/persistence.ts"],"sourcesContent":[null],"mappings":"AAAA;AACA,OAAO,MAAM,mBAAmB,GAAG,IAAI;AAEvC;;;;;;AAMA,OAAO,MAAM,cAAc,GAAI,OAAe,IAAa,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG;AAElH;AACA,OAAO,MAAM,eAAe,GAAI,OAAe,IAAa,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC","ignoreList":[]}
+{"version":3,"file":"persistence.js","names":[],"sources":["../../src/internal/persistence.ts"],"sourcesContent":[null],"mappings":"AAAA;AACA,OAAO,MAAM,mBAAmB,GAAG,IAAI;AAEvC;;;;;;AAMA,OAAO,MAAM,gBAAgB,GAAI,OAAe,IAAa,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;AAE9G;;;;;;AAMA,OAAO,MAAM,cAAc,GAAI,OAAe,IAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG;AAE1F;AACA,OAAO,MAAM,eAAe,GAAI,OAAe,IAAa,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC","ignoreList":[]}

package/dist/internal/request.js

@@ -41,8 +41,34 @@ const makeBatchMap = resolver => {
     delete: key => MutableHashMap.remove(map, key)
   };
 };
-const batchPool = [];
 const pendingBatches = /*#__PURE__*/new WeakMap();
+// Batches are built outside `addEntry` so their callbacks do not share a closure
+// context with per-request entries, which would keep completed requests alive.
+const makeBatch = (key, context, resolver, map) => {
+  const batch = {
+    key,
+    context,
+    resolver,
+    map,
+    entrySet: new Set(),
+    entries: new Set(),
+    delayEffect: effect.flatMap(withFiber(delayFiber => {
+      // Reentrant delay callbacks may fill the batch and interrupt this fiber.
+      batch.fiber = delayFiber;
+      return batch.resolver.delay;
+    }), _ => runBatch(batch)),
+    run: effect.onExit(effect.suspend(() => batch.resolver.runAll(Array.from(batch.entries), batch.key)), exit => {
+      for (const entry of batch.entrySet) {
+        entry.completeUnsafe(exit._tag === "Success" ? exitDie(new Error("Effect.request: RequestResolver did not complete request", {
+          cause: entry.request
+        })) : exit);
+      }
+      batch.entries.clear();
+      return effect.void;
+    })
+  };
+  return batch;
+};
 const addEntry = (resolver, request, resume, fiber) => {
   let batchMap = pendingBatches.get(resolver);
   if (!batchMap) {
@@ -70,46 +96,7 @@ const addEntry = (resolver, request, resume, fiber) => {
   batch = batchMap.get(key);
   const isNewBatch = batch === undefined;
   if (!batch) {
-    if (batchPool.length > 0) {
-      batch = batchPool.pop();
-      batch.key = key;
-      batch.context = fiber.context;
-      batch.resolver = resolver;
-      batch.map = batchMap;
-    } else {
-      const newBatch = {
-        key,
-        context: fiber.context,
-        resolver,
-        map: batchMap,
-        entrySet: new Set(),
-        entries: new Set(),
-        delayEffect: effect.flatMap(withFiber(delayFiber => {
-          // Reentrant delay callbacks may fill the batch and interrupt this fiber.
-          newBatch.fiber = delayFiber;
-          return newBatch.resolver.delay;
-        }), _ => runBatch(newBatch)),
-        run: effect.onExit(effect.suspend(() => newBatch.resolver.runAll(Array.from(newBatch.entries), newBatch.key)), exit => {
-          for (const entry of newBatch.entrySet) {
-            entry.completeUnsafe(exit._tag === "Success" ? exitDie(new Error("Effect.request: RequestResolver did not complete request", {
-              cause: entry.request
-            })) : exit);
-          }
-          newBatch.entries.clear();
-          if (batchPool.length < 128) {
-            newBatch.entrySet.clear();
-            newBatch.key = undefined;
-            newBatch.context = undefined;
-            newBatch.fiber = undefined;
-            newBatch.resolver = undefined;
-            newBatch.map = undefined;
-            batchPool.push(newBatch);
-          }
-          return effect.void;
-        })
-      };
-      batch = newBatch;
-    }
+    batch = makeBatch(key, fiber.context, resolver, batchMap);
     batchMap.set(key, batch);
   }
   batch.entrySet.add(entry);
@@ -118,7 +105,7 @@ const addEntry = (resolver, request, resume, fiber) => {
     const delayFiber = effect.runForkWith(fiber.context)(batch.delayEffect, {
       scheduler: fiber.cache.scheduler
     });
-    // A synchronous delay may have already run and recycled this batch.
+    // A synchronous delay may have already run this batch.
     if (completed || batchMap.get(key) !== batch) return entry;
     batch.fiber = delayFiber;
   }

package/dist/internal/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","names":[],"sources":["../../src/internal/request.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"request.js","names":[],"sources":["../../src/internal/request.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/internal/schema/fromJsonSchemaDocument.js

@@ -471,7 +471,8 @@ export function fromJsonSchemaMultiDocument(document, options, singleRoot = fals
           return out;
         }
       case "Union":
-        return representation.types.length > 1 || representation.types.some(hasChoices);
+        // Finite primitive literal sets intersect without expansion, so they can be duplicated across branches.
+        return !isLiteralSet(representation) && (representation.types.length > 1 || representation.types.some(hasChoices));
       case "Arrays":
         return representation.elements.some(element => hasChoices(element.type)) || representation.rest.some(hasChoices);
       case "Objects":
@@ -496,14 +497,14 @@ export function fromJsonSchemaMultiDocument(document, options, singleRoot = fals
     if (representation._tag !== "Literal") return undefined;
     return representation.literal;
   }
+  function isLiteralSet(union) {
+    return (union.options?.mode ?? "anyOf") === "anyOf" && union.types.every(type => literalValue(type) !== undefined);
+  }
   function intersectLiteralUnions(left, right, path) {
-    if ((left.options?.mode ?? "anyOf") !== "anyOf" || (right.options?.mode ?? "anyOf") !== "anyOf") {
-      return undefined;
-    }
+    if (!isLiteralSet(left) || !isLiteralSet(right)) return undefined;
     const rightByValue = new Map();
     for (const representation of right.types) {
       const value = literalValue(representation);
-      if (value === undefined) return undefined;
       const previous = rightByValue.get(value);
       rightByValue.set(value, {
         ...representation,
@@ -512,9 +513,7 @@ export function fromJsonSchemaMultiDocument(document, options, singleRoot = fals
     }
     const types = [];
     for (const representation of left.types) {
-      const value = literalValue(representation);
-      if (value === undefined) return undefined;
-      const match = rightByValue.get(value);
+      const match = rightByValue.get(literalValue(representation));
       if (match !== undefined) types.push(intersect(representation, annotate(match, right), path));
     }
     return makeUnion(left, types);