@poe-platform/safe-bash 0.1.816 → 0.1.817

package/dist/pdf-ast/index.js

@@ -715,12 +715,12 @@ var RecordReader = class {
         continue;
       }
       if (remaining === -1) {
-        const field2 = (await this.take(1))[0];
-        if (field2 === 9 /* End */) {
+        const field3 = (await this.take(1))[0];
+        if (field3 === 9 /* End */) {
           remaining = 0;
           continue;
         }
-        if (field2 !== 4 /* String */) throw new Error("Invalid capture key");
+        if (field3 !== 4 /* String */) throw new Error("Invalid capture key");
         await this.discard(await this.size(4 /* String */) * 2);
       } else remaining--;
       const current = tag ?? (await this.take(1))[0];
@@ -747,9 +747,9 @@ var RecordReader = class {
     }
     let matched = false;
     for (; ; ) {
-      const field2 = (await this.take(1))[0];
-      if (field2 === 9 /* End */) return matched;
-      if (field2 !== 4 /* String */) throw new Error("Invalid capture key");
+      const field3 = (await this.take(1))[0];
+      if (field3 === 9 /* End */) return matched;
+      if (field3 !== 4 /* String */) throw new Error("Invalid capture key");
       if (await this.stringEquals(path[depth])) matched = await this.matches(path, expected, depth + 1);
       else await this.skip();
     }
@@ -763,10 +763,10 @@ var RecordReader = class {
     if (tag === 8 /* Object */) {
       const value2 = {};
       for (; ; ) {
-        const field2 = (await this.take(1))[0];
-        if (field2 === 9 /* End */) return value2;
-        if (field2 !== 4 /* String */) throw new Error("Invalid capture key");
-        const key = await this.value(field2);
+        const field3 = (await this.take(1))[0];
+        if (field3 === 9 /* End */) return value2;
+        if (field3 !== 4 /* String */) throw new Error("Invalid capture key");
+        const key = await this.value(field3);
         Object.defineProperty(value2, key, {
           value: await this.value(),
           enumerable: true,
@@ -15005,17 +15005,17 @@ var Type1Font = class {
       "StdHW",
       "StdVW"
     ];
-    for (const field2 of fields2) {
-      if (!properties.privateData.has(field2)) {
+    for (const field3 of fields2) {
+      if (!properties.privateData.has(field3)) {
         continue;
       }
-      const value = properties.privateData.get(field2);
+      const value = properties.privateData.get(field3);
       if (Array.isArray(value)) {
         for (let j = value.length - 1; j > 0; j--) {
           value[j] -= value[j - 1];
         }
       }
-      privateDict.setByName(field2, value);
+      privateDict.setByName(field3, value);
     }
     cff.topDict.privateDict = privateDict;
     const subrIndex = new CFFIndex();
@@ -28378,6 +28378,7 @@ function* repairCandidateSteps(size) {
 // packages/pdf-ast/src/cos/value-parser.ts
 function* parseValueSteps(lexer, maxDepth, repair = false, maxNodes = Infinity, options = {}) {
   yield;
+  if (options.deferArrayValues && !options.deferDictionaryValues) throw new TypeError("Deferred array values require deferred dictionary values");
   if (options.deferDictionaryValues && (!options.dictionaryStorage || options.arrayStorage !== options.dictionaryStorage || options.stringStorage !== options.dictionaryStorage || options.containerStorage !== options.dictionaryStorage)) throw new TypeError("Deferred resource values require shared caller backing");
   let work = 0;
   let nodes = 0;
@@ -28421,7 +28422,7 @@ function* parseValueSteps(lexer, maxDepth, repair = false, maxNodes = Infinity,
   while (true) {
     if (++work % 16 === 0) yield;
     const parent = current;
-    const deferred = options.deferDictionaryValues && (parent?.deferred || parent?.kind === "dict" && parent.storedEntries);
+    const deferred = options.deferDictionaryValues && (parent?.deferred || parent?.kind === "dict" && parent.storedEntries || options.deferArrayValues && parent?.kind === "array" && parent.storedItems);
     const selectedString = parent?.kind === "dict" && parent.key && options.storedStringKeys?.includes(parent.key.decoded) || !parent && options.storeRootString;
     lexer.setStringStorage?.(options.stringStorage && (selectedString || deferred) ? options.stringStorage : void 0);
     const tok = yield "token";
@@ -31845,27 +31846,27 @@ function* parseXrefRevisionAtSteps(bytes, xrefOffset, maxDecompressedBytes, maxR
       const objNum = startObj + i;
       const field0 = w0 > 0 ? readInt(w0) : 1;
       const field1 = readInt(w1);
-      const field2 = w2 > 0 ? readInt(w2) : 0;
+      const field22 = w2 > 0 ? readInt(w2) : 0;
       if (field0 === 0) {
         entries.set(objNum, {
           type: "free",
           objectNumber: objNum,
           nextFreeObjectNumber: field1,
-          generationNumber: field2
+          generationNumber: field22
         });
       } else if (field0 === 1) {
         entries.set(objNum, {
           type: "uncompressed",
           objectNumber: objNum,
           offset: field1,
-          generationNumber: field2
+          generationNumber: field22
         });
       } else if (field0 === 2) {
         entries.set(objNum, {
           type: "compressed",
           objectNumber: objNum,
           objectStreamNumber: field1,
-          indexInStream: field2
+          indexInStream: field22
         });
       } else {
         throw new PdfError("E_PARSE", `Invalid XRef entry type: ${field0}`);
@@ -33469,6 +33470,12 @@ function embedTrueTypeFontInCos(doc, font, usedGlyphs) {
 }
 
 // packages/pdf-ast/src/fonts/resolve.ts
+function* field(dict, key) {
+  if (!dict.storedEntries) return dictGet(dict, key);
+  const value = yield { kind: "dictionary-value", dict, key };
+  if (value && !("kind" in value)) throw new TypeError("Expected a font dictionary value");
+  return value;
+}
 function* resolve(node, storeRootArray = false, storeRootDictionary = false, arrayPathPrefix) {
   const value = yield { kind: "resolve", node, storeRootArray, storeRootDictionary, ...arrayPathPrefix ? { arrayPathPrefix } : {} };
   if (value && !("kind" in value)) throw new TypeError("Font lookup returned stream bytes instead of a COS value");
@@ -33506,10 +33513,10 @@ function* resolvePageFontsSteps(rootRef, resourcesDict, selectedName, options =
   const allocationOptions = { onAllocation: (bytes) => allocation.admit(bytes) };
   const fonts = /* @__PURE__ */ new Map();
   const catalog = yield* resolveDict2(rootRef);
-  const acroForm = catalog ? yield* resolveDict2(dictGet(catalog, "AcroForm")) : void 0;
-  const drDict = acroForm ? yield* resolveDict2(dictGet(acroForm, "DR")) : void 0;
-  const drFontDict = drDict ? yield* resolveDict2(dictGet(drDict, "Font"), true) : void 0;
-  const pageFontDict = resourcesDict ? yield* resolveDict2(dictGet(resourcesDict, "Font"), true) : void 0;
+  const acroForm = catalog ? yield* resolveDict2(yield* field(catalog, "AcroForm")) : void 0;
+  const drDict = acroForm ? yield* resolveDict2(yield* field(acroForm, "DR")) : void 0;
+  const drFontDict = drDict ? yield* resolveDict2(yield* field(drDict, "Font"), true) : void 0;
+  const pageFontDict = resourcesDict ? yield* resolveDict2(yield* field(resourcesDict, "Font"), true) : void 0;
   for (const dictionary of [drFontDict, pageFontDict]) {
     if (!dictionary) continue;
     const cursor = new PdfDictionaryCursor(dictionary);
@@ -33520,17 +33527,17 @@ function* resolvePageFontsSteps(rootRef, resourcesDict, selectedName, options =
       const fName = entry.key.decoded;
       if (selectedName !== void 0 && fName !== selectedName)
         continue;
-      const fObj = yield* resolveDict2(entry.value);
+      const fObj = yield* resolveDict2(entry.value, true);
       if (!fObj)
         continue;
       allocation.admit(1024);
-      const subtypeNode = yield* resolve(dictGet(fObj, "Subtype"));
+      const subtypeNode = yield* resolve(yield* field(fObj, "Subtype"));
       const subtype = subtypeNode?.kind === "name" ? subtypeNode.decoded : "Type1";
-      const baseFontNode = yield* resolve(dictGet(fObj, "BaseFont"));
+      const baseFontNode = yield* resolve(yield* field(fObj, "BaseFont"));
       const baseFont = baseFontNode?.kind === "name" ? baseFontNode.decoded : "Helvetica";
       let cmap;
       let storedCMap;
-      const toUniNode = yield* resolve(dictGet(fObj, "ToUnicode"));
+      const toUniNode = yield* resolve(yield* field(fObj, "ToUnicode"));
       if (toUniNode?.kind === "stream") {
         try {
           const value = yield { kind: "decode", stream: toUniNode, purpose: "unicode-cmap" };
@@ -33544,17 +33551,14 @@ function* resolvePageFontsSteps(rootRef, resourcesDict, selectedName, options =
             throw error;
         }
       }
-      const encNode = yield* resolve(dictGet(fObj, "Encoding"));
+      let encNode = yield* resolve(yield* field(fObj, "Encoding"), false, true);
+      let differenceArray;
       if (encNode?.kind === "dict") {
-        const diffRef = dictGet(encNode, "Differences");
-        if (diffRef?.kind === "ref") {
-          const resolvedDiff = yield* resolve(diffRef, true);
-          if (resolvedDiff?.kind === "array") {
-            dictSet(encNode, "Differences", resolvedDiff);
-          }
-        }
+        differenceArray = yield* field(encNode, "Differences");
+        if (differenceArray?.kind === "ref") differenceArray = yield* resolve(differenceArray, true);
+        const baseEncoding = yield* field(encNode, "BaseEncoding");
+        encNode = cosDict({ ...baseEncoding ? { BaseEncoding: baseEncoding } : {}, ...differenceArray ? { Differences: differenceArray } : {} });
       }
-      const differenceArray = encNode?.kind === "dict" ? dictGet(encNode, "Differences") : void 0;
       let storedEncoding;
       if (options.resourceStorage && differenceArray?.kind === "array") {
         const value = yield { kind: "font-encoding", array: differenceArray };
@@ -33580,28 +33584,29 @@ function* resolvePageFontsSteps(rootRef, resourcesDict, selectedName, options =
       let charProcs;
       let fontResources;
       if (subtype === "Type3") {
-        const fmArr = yield* resolveArray2(dictGet(fObj, "FontMatrix"));
-        if (fmArr && fmArr.items.length >= 6) {
-          const mn = function* (idx, fb = 0) {
-            const r = yield* resolve(fmArr.items[idx]);
-            return r?.kind === "number" ? r.value : fb;
-          };
-          fontMatrix = [yield* mn(0, 1e-3), yield* mn(1, 0), yield* mn(2, 0), yield* mn(3, 1e-3), yield* mn(4, 0), yield* mn(5, 0)];
+        const fmArr = yield* resolveArray2(yield* field(fObj, "FontMatrix"), true);
+        if (fmArr && (fmArr.storedItems?.length ?? fmArr.items.length) >= 6) {
+          const cursor2 = arrayCursor(fmArr);
+          fontMatrix = [1e-3, 0, 0, 1e-3, 0, 0];
+          for (let i = 0; i < 6; i++) {
+            const value = yield* resolve(yield* cursor2.next());
+            if (value?.kind === "number") fontMatrix[i] = value.value;
+          }
         } else {
           fontMatrix = [1e-3, 0, 0, 1e-3, 0, 0];
         }
-        charProcs = yield* resolveDict2(dictGet(fObj, "CharProcs"));
-        fontResources = yield* resolveDict2(dictGet(fObj, "Resources"), false, ["Resources"]);
+        charProcs = yield* resolveDict2(yield* field(fObj, "CharProcs"), true);
+        fontResources = yield* resolveDict2(yield* field(fObj, "Resources"), false, ["Resources"]);
       }
       const type3Scale1000 = subtype === "Type3" && fontMatrix ? Math.hypot(fontMatrix[0], fontMatrix[1]) * 1e3 : 1;
+      const descendants = subtype === "Type0" ? yield* resolveArray2(yield* field(fObj, "DescendantFonts"), true) : void 0;
+      const cidDict = descendants ? yield* resolveDict2(yield* arrayCursor(descendants).next(), true) : void 0;
       if (subtype === "Type0") {
-        const descArr = yield* resolveArray2(dictGet(fObj, "DescendantFonts"));
-        const cidDict = descArr && descArr.items[0] ? yield* resolveDict2(descArr.items[0]) : void 0;
         if (cidDict) {
-          const dwNode = yield* resolve(dictGet(cidDict, "DW"));
+          const dwNode = yield* resolve(yield* field(cidDict, "DW"));
           if (dwNode?.kind === "number")
             defaultWidth = dwNode.value;
-          const wArr = yield* resolveArray2(dictGet(cidDict, "W"), true);
+          const wArr = yield* resolveArray2(yield* field(cidDict, "W"), true);
           if (wArr) {
             const cursor2 = arrayCursor(wArr);
             while (cursor2.remaining) {
@@ -33627,11 +33632,11 @@ function* resolvePageFontsSteps(rootRef, resourcesDict, selectedName, options =
           }
         }
       } else {
-        const firstCharNode = yield* resolve(dictGet(fObj, "FirstChar"));
-        const widthsArr = yield* resolveArray2(dictGet(fObj, "Widths"), true);
+        const firstCharNode = yield* resolve(yield* field(fObj, "FirstChar"));
+        const widthsArr = yield* resolveArray2(yield* field(fObj, "Widths"), true);
         if (widthsArr) {
-          const descriptor = yield* resolveDict2(dictGet(fObj, "FontDescriptor"));
-          const missingWidth = descriptor ? yield* resolve(dictGet(descriptor, "MissingWidth")) : void 0;
+          const descriptor = yield* resolveDict2(yield* field(fObj, "FontDescriptor"), true);
+          const missingWidth = descriptor ? yield* resolve(yield* field(descriptor, "MissingWidth")) : void 0;
           defaultWidth = (missingWidth?.kind === "number" ? missingWidth.value : 0) * type3Scale1000;
           const firstChar = firstCharNode?.kind === "number" ? firstCharNode.value : 0;
           const cursor2 = arrayCursor(widthsArr);
@@ -33654,13 +33659,11 @@ function* resolvePageFontsSteps(rootRef, resourcesDict, selectedName, options =
       let storedTrueType;
       let embeddedTrueType;
       let simpleToGid;
-      const fDescDirect = yield* resolveDict2(dictGet(fObj, "FontDescriptor"));
-      const descArrForTt = subtype === "Type0" ? yield* resolveArray2(dictGet(fObj, "DescendantFonts")) : void 0;
-      const cidDictForTt = descArrForTt && descArrForTt.items[0] ? yield* resolveDict2(descArrForTt.items[0]) : void 0;
-      const fDesc = fDescDirect ?? (cidDictForTt ? yield* resolveDict2(dictGet(cidDictForTt, "FontDescriptor")) : void 0);
+      const fDescDirect = yield* resolveDict2(yield* field(fObj, "FontDescriptor"), true);
+      const fDesc = fDescDirect ?? (cidDict ? yield* resolveDict2(yield* field(cidDict, "FontDescriptor"), true) : void 0);
       let cidToGid;
       let storedCidToGid;
-      const cidMap = cidDictForTt ? yield* resolve(dictGet(cidDictForTt, "CIDToGIDMap")) : void 0;
+      const cidMap = cidDict ? yield* resolve(yield* field(cidDict, "CIDToGIDMap")) : void 0;
       if (cidMap?.kind === "stream") {
         const bytes = yield { kind: "decode", stream: cidMap, purpose: "cid-map" };
         if (bytes && "byteLength" in bytes && "storage" in bytes) storedCidToGid = bytes;
@@ -33672,15 +33675,15 @@ function* resolvePageFontsSteps(rootRef, resourcesDict, selectedName, options =
         } else throw new TypeError("Font decoder did not return CID map bytes");
       }
       if (fDesc) {
-        const type1Program = yield* resolve(dictGet(fDesc, "FontFile"));
-        const program = (yield* resolve(dictGet(fDesc, "FontFile2"))) ?? (yield* resolve(dictGet(fDesc, "FontFile3"))) ?? type1Program;
+        const type1Program = yield* resolve(yield* field(fDesc, "FontFile"));
+        const program = (yield* resolve(yield* field(fDesc, "FontFile2"))) ?? (yield* resolve(yield* field(fDesc, "FontFile3"))) ?? type1Program;
         if (program?.kind === "stream") {
-          const programType = yield* resolve(dictGet(program.dict, "Subtype"));
-          const baseEncoding = encNode?.kind === "dict" ? yield* resolve(dictGet(encNode, "BaseEncoding")) : encNode;
+          const programType = yield* resolve(yield* field(program.dict, "Subtype"));
+          const baseEncoding = encNode?.kind === "dict" ? yield* resolve(yield* field(encNode, "BaseEncoding")) : encNode;
           if (program === type1Program) {
-            const length1 = yield* resolve(dictGet(program.dict, "Length1"));
-            const length2 = yield* resolve(dictGet(program.dict, "Length2"));
-            const flags = yield* resolve(dictGet(fDesc, "Flags"));
+            const length1 = yield* resolve(yield* field(program.dict, "Length1"));
+            const length2 = yield* resolve(yield* field(program.dict, "Length2"));
+            const flags = yield* resolve(yield* field(fDesc, "Flags"));
             const type1Properties = {
               length1: length1?.kind === "number" ? length1.value : 0,
               length2: length2?.kind === "number" ? length2.value : 0,
@@ -33800,7 +33803,7 @@ function resolvePageFonts(doc, resourcesDict, selectedName) {
   while (!step.done) {
     let value;
     try {
-      if (step.value.kind === "dictionary-entry" || step.value.kind === "font-encoding" || step.value.kind === "font-label" || step.value.kind === "array-item" || step.value.kind === "truetype-map" || step.value.kind === "font-width-set") throw new TypeError("Stored font requires asynchronous evaluation");
+      if (step.value.kind === "dictionary-value" || step.value.kind === "dictionary-entry" || step.value.kind === "font-encoding" || step.value.kind === "font-label" || step.value.kind === "array-item" || step.value.kind === "truetype-map" || step.value.kind === "font-width-set") throw new TypeError("Stored font requires asynchronous evaluation");
       value = step.value.kind === "resolve" ? doc.resolve(step.value.node) : doc.decodeStream(step.value.stream);
     } catch (error) {
       step = steps.throw(error);
@@ -35414,7 +35417,7 @@ var StoredJbigIndex = class {
   *set(key, value) {
     const record = yield* StoredJbigList.create(9);
     const fields2 = value instanceof StoredJbigHuffman ? [2, value.nodes.length, value.nodes.capacity, value.nodes.buffer.position, value.nodes.buffer.length] : value instanceof StoredJbigList ? [0, value.length, value.capacity, value.buffer.position, value.buffer.length] : [1, value.width, value.height, value.length, value.bitmap.position, value.bitmap.length, value.bitmap.rowSize, value.bitmap.width, value.bitmap.height];
-    for (const field2 of fields2) yield* record.push(field2);
+    for (const field3 of fields2) yield* record.push(field3);
     const slot = yield* this.find(key, true);
     yield { kind: "number-write", ...slot, value: record.buffer.position + 1 };
   }
@@ -38361,7 +38364,7 @@ var JpxImage = class {
       } };
       const tile = yield* this.parseCodestreamTileSteps(data, start, end, selected);
       const values = [tile.left, tile.top, tile.width, tile.height, tile.items.position, tile.items.length];
-      for (let field2 = 0; field2 < 6; field2++) yield* jpxVectorWrite(records2, number * 6 + field2, values[field2]);
+      for (let field3 = 0; field3 < 6; field3++) yield* jpxVectorWrite(records2, number * 6 + field3, values[field3]);
     }
     this.storedTiles = { length: count, records: records2 };
   }
@@ -38843,8 +38846,8 @@ function* buildCodeblocks(context, subband, dimensions) {
       if (context.storedPlanes) {
         codeblock.record = codeblocks.records;
         codeblock.recordIndex = codeblocks.length++;
-        for (let field2 = 0; field2 < jpxCodeblockGeometry.length; field2++) {
-          yield* jpxVectorWrite(codeblock.record, codeblock.recordIndex * 18 + field2, codeblock[jpxCodeblockGeometry[field2]]);
+        for (let field3 = 0; field3 < jpxCodeblockGeometry.length; field3++) {
+          yield* jpxVectorWrite(codeblock.record, codeblock.recordIndex * 18 + field3, codeblock[jpxCodeblockGeometry[field3]]);
         }
         yield* writeJpxCodeblock(codeblock);
       } else codeblocks.push(codeblock);
@@ -38898,8 +38901,8 @@ function* writeJpxPrecinct(precinct) {
     precinct.zeroBitPlanesTree ? precinct.zeroBitPlanesTree.root.position + 1 : 0,
     precinct.zeroBitPlanesTree ? precinct.zeroBitPlanesTree.presence.position + 1 : 0
   ];
-  for (let field2 = 0; field2 < values.length; field2++) {
-    yield* jpxVectorWrite(collection.records, precinct.number * 8 + field2, values[field2]);
+  for (let field3 = 0; field3 < values.length; field3++) {
+    yield* jpxVectorWrite(collection.records, precinct.number * 8 + field3, values[field3]);
   }
   collection.cached = precinct;
 }
@@ -38908,7 +38911,7 @@ function* readJpxPrecinct(collection, number) {
   if (collection.cached?.number === number) return collection.cached;
   if (!(yield* jpxVectorRead(collection.records, number * 8))) return void 0;
   const values = [];
-  for (let field2 = 1; field2 < 8; field2++) values.push(yield* jpxVectorRead(collection.records, number * 8 + field2));
+  for (let field3 = 1; field3 < 8; field3++) values.push(yield* jpxVectorRead(collection.records, number * 8 + field3));
   const precinct = { collection, number, cbxMin: values[0], cbyMin: values[1], cbxMax: values[2], cbyMax: values[3] };
   if (values[4]) {
     const width = precinct.cbxMax - precinct.cbxMin + 1, height = precinct.cbyMax - precinct.cbyMin + 1;
@@ -38937,8 +38940,8 @@ function* writeJpxCodeblock(block) {
     data?.totalLength ?? 0,
     data?.codingpasses ?? 0
   ];
-  for (let field2 = 0; field2 < values.length; field2++) {
-    yield* jpxVectorWrite(block.record, block.recordIndex * 18 + 7 + field2, values[field2]);
+  for (let field3 = 0; field3 < values.length; field3++) {
+    yield* jpxVectorWrite(block.record, block.recordIndex * 18 + 7 + field3, values[field3]);
   }
 }
 function* readJpxCodeblock(subband, index2, withPrecinct = true) {
@@ -38946,8 +38949,8 @@ function* readJpxCodeblock(subband, index2, withPrecinct = true) {
   if (!blocks.records) return blocks[index2];
   const block = { record: blocks.records, recordIndex: index2, subbandType: subband.type };
   const values = [];
-  for (let field2 = 0; field2 < 18; field2++) values.push(yield* jpxVectorRead(blocks.records, index2 * 18 + field2));
-  for (let field2 = 0; field2 < jpxCodeblockGeometry.length; field2++) block[jpxCodeblockGeometry[field2]] = values[field2];
+  for (let field3 = 0; field3 < 18; field3++) values.push(yield* jpxVectorRead(blocks.records, index2 * 18 + field3));
+  for (let field3 = 0; field3 < jpxCodeblockGeometry.length; field3++) block[jpxCodeblockGeometry[field3]] = values[field3];
   if (withPrecinct) block.precinct = yield* readJpxPrecinct(subband.precincts, block.precinctNumber);
   block.Lblock = values[7];
   if (values[8]) block.included = true;
@@ -39261,12 +39264,12 @@ var jpxSubbandFields = ["tbx0", "tby0", "tbx1", "tby1"];
 var jpxBlockFields = ["codeblockWidth", "codeblockHeight", "numcodeblockwide", "numcodeblockhigh"];
 var jpxSubbandTypes = ["LL", "HL", "LH", "HH"];
 function* writeJpxResolution(collection, resolution) {
-  const values = jpxResolutionFields.map((field2) => resolution[field2]);
-  values.push(...jpxPrecinctFields.map((field2) => resolution.precinctParameters[field2]), resolution.subbands.length);
+  const values = jpxResolutionFields.map((field3) => resolution[field3]);
+  values.push(...jpxPrecinctFields.map((field3) => resolution.precinctParameters[field3]), resolution.subbands.length);
   for (const band of resolution.subbands) values.push(
     jpxSubbandTypes.indexOf(band.type),
-    ...jpxSubbandFields.map((field2) => band[field2]),
-    ...jpxBlockFields.map((field2) => band.codeblockParameters[field2]),
+    ...jpxSubbandFields.map((field3) => band[field3]),
+    ...jpxBlockFields.map((field3) => band.codeblockParameters[field3]),
     band.codeblocks.length,
     band.codeblocks.records.position,
     band.codeblocks.records.length,
@@ -39291,13 +39294,13 @@ function* readJpxResolution(collection, index2) {
     return yield* jpxVectorRead(collection.records, offset++);
   };
   const resolution = { onAllocation: context.onAllocation, packetAdmission: 128, precinctParameters: {}, subbands: [] };
-  for (const field2 of jpxResolutionFields) resolution[field2] = yield* read();
-  for (const field2 of jpxPrecinctFields) resolution.precinctParameters[field2] = yield* read();
+  for (const field3 of jpxResolutionFields) resolution[field3] = yield* read();
+  for (const field3 of jpxPrecinctFields) resolution.precinctParameters[field3] = yield* read();
   const count = yield* read();
   for (let i = 0; i < count; i++) {
     const band = { type: jpxSubbandTypes[yield* read()], resolution, codeblockParameters: {} };
-    for (const field2 of jpxSubbandFields) band[field2] = yield* read();
-    for (const field2 of jpxBlockFields) band.codeblockParameters[field2] = yield* read();
+    for (const field3 of jpxSubbandFields) band[field3] = yield* read();
+    for (const field3 of jpxBlockFields) band.codeblockParameters[field3] = yield* read();
     band.codeblocks = { length: yield* read(), records: { position: yield* read(), length: yield* read(), bytesPerElement: 8, integer: false } };
     band.precincts = { records: { position: yield* read(), length: yield* read(), bytesPerElement: 8, integer: false }, admission: entry.trees[i] };
     resolution.subbands.push(band);
@@ -42768,7 +42771,8 @@ function* runColorProgramSteps(doc, work, sources) {
     let step = work.next();
     while (!step.done) {
       const request = step.value;
-      if (request.kind === "resolve") step = work.next(doc?.resolve(request.node));
+      if (request.kind === "dictionary-value") step = work.next(dictGet(request.dict, request.key));
+      else if (request.kind === "resolve") step = work.next(doc?.resolve(request.node));
       else if (request.kind === "resource") {
         const map = doc?.resolveDict(dictGet(request.resources, request.category));
         step = work.next(map ? dictGet(map, request.name) : void 0);
@@ -43346,7 +43350,7 @@ function* evaluateMaskTransferSteps(doc, transfer, sources) {
 function* resolveMaskParameterSteps(mask, form, activeResources) {
   const group = yield* resolveColorNode(dictGet(form.dict, "Group"), "dict");
   const colorSpace = group ? dictGet(group, "CS") : void 0;
-  const bc = yield* resolveColorNode(dictGet(mask, "BC"), "array");
+  const bc = yield* resolveColorNode(yield { kind: "dictionary-value", dict: mask, key: "BC" }, "array");
   let components;
   if (bc) {
     components = [];
@@ -43356,7 +43360,7 @@ function* resolveMaskParameterSteps(mask, form, activeResources) {
     }
   }
   const [r, g, b] = components ? yield* convertContentColorSteps(true, colorSpace, "DeviceRGB", components, activeResources) : [0, 0, 0];
-  const transfer = yield* resolveColorNode(dictGet(mask, "TR"));
+  const transfer = yield* resolveColorNode(yield { kind: "dictionary-value", dict: mask, key: "TR" });
   const transferMap = transfer?.kind === "dict" || transfer?.kind === "stream" ? yield { kind: "transfer", node: transfer } : void 0;
   return { backdrop: { r, g, b }, transferMap };
 }
@@ -43747,12 +43751,12 @@ function* evaluateContentSteps(params) {
       const extDict = yield* resolveEvaluationDict(dictGet(activeResources, "ExtGState"), ["Resources", "ExtGState"]);
       const gsDict = extDict ? yield* resolveEvaluationDict(yield* lookupEvaluationDictionary(extDict, ops[0].decoded, true), ["Resources", "ExtGState", ops[0].decoded], true) : void 0;
       if (gsDict) {
-        const mask = yield* resolveEvaluationNode(yield* lookupEvaluationDictionary(gsDict, "SMask"));
+        const mask = yield* resolveEvaluationNode(yield* lookupEvaluationDictionary(gsDict, "SMask", true), false, void 0, true);
         if (mask?.kind === "name" && mask.decoded === "None") {
           st.softMask = void 0;
         } else if (mask?.kind === "dict") {
-          const subtype = yield* resolveEvaluationNode(dictGet(mask, "S"));
-          const form = yield* resolveEvaluationNode(dictGet(mask, "G"));
+          const subtype = yield* resolveEvaluationNode(yield* lookupEvaluationDictionary(mask, "S"));
+          const form = yield* resolveEvaluationNode(yield* lookupEvaluationDictionary(mask, "G"));
           if (form?.kind === "stream" && subtype?.kind === "name" && (subtype.decoded === "Alpha" || subtype.decoded === "Luminosity")) {
             if (depth >= 8) throw new PdfError("E_LIMIT", "Soft-mask nesting exceeds the form depth limit");
             const parentOperations = capturedOperations;
@@ -44366,7 +44370,7 @@ function* evaluateContentSteps(params) {
                     explicitName = reply.node?.kind === "name" ? reply.node.decoded : void 0;
                   }
                   const gName = explicitName ?? item.unicode;
-                  const procNode = gName ? yield* resolveEvaluationNode(dictGet(font.charProcs, gName)) : void 0;
+                  const procNode = gName ? yield* resolveEvaluationNode(yield* lookupEvaluationDictionary(font.charProcs, gName)) : void 0;
                   if (procNode?.kind === "stream") {
                     const fm = font.fontMatrix ?? [1e-3, 0, 0, 1e-3, 0, 0];
                     const source2 = { stream: procNode };
@@ -49458,11 +49462,11 @@ async function* readCosXrefRevision(source, offset, options = {}) {
       for (let i = 0; i < count; i++) {
         const type = w0 ? await reader.integer(w0) : 1;
         const field1 = await reader.integer(w1);
-        const field2 = w2 ? await reader.integer(w2) : 0;
+        const field22 = w2 ? await reader.integer(w2) : 0;
         signal?.throwIfAborted();
-        if (type === 0) yield { type: "free", objectNumber: start + i, nextFreeObjectNumber: field1, generationNumber: field2 };
-        else if (type === 1) yield { type: "uncompressed", objectNumber: start + i, offset: field1, generationNumber: field2 };
-        else if (type === 2) yield { type: "compressed", objectNumber: start + i, objectStreamNumber: field1, indexInStream: field2 };
+        if (type === 0) yield { type: "free", objectNumber: start + i, nextFreeObjectNumber: field1, generationNumber: field22 };
+        else if (type === 1) yield { type: "uncompressed", objectNumber: start + i, offset: field1, generationNumber: field22 };
+        else if (type === 2) yield { type: "compressed", objectNumber: start + i, objectStreamNumber: field1, indexInStream: field22 };
         else throw new PdfError("E_PARSE", `Invalid XRef entry type: ${type}`);
         if (++turns % 64 === 0) await new Promise((resolve2) => setTimeout(resolve2, 0));
       }
@@ -49900,7 +49904,7 @@ function integer2(value, name, minimum = 0) {
 function maximum2(value, name) {
   return value === void 0 || value === Infinity ? Number.MAX_SAFE_INTEGER : integer2(value, name);
 }
-function field(dict, key) {
+function field2(dict, key) {
   const value = dictGet(dict, key);
   if (value?.kind !== "number" || !Number.isSafeInteger(value.value) || value.value < 0) throw new PdfError("E_PARSE", `Invalid object stream /${key}`);
   return value.value;
@@ -50169,8 +50173,8 @@ var PdfObjectReader = class {
     }
     const object = await this.load(number, generation, active);
     if (object?.value.kind !== "dict" || !object.stream || dictGet(object.value, "Type")?.kind !== "name" || dictGet(object.value, "Type").decoded !== "ObjStm") throw new PdfError("E_PARSE", "Invalid object stream dictionary");
-    const count = field(object.value, "N");
-    const first = field(object.value, "First");
+    const count = field2(object.value, "N");
+    const first = field2(object.value, "First");
     if (count > maximum2(this.options.maxObjectStreamMembers, "maxObjectStreamMembers") || count > Math.floor(Number.MAX_SAFE_INTEGER / 16)) throw new PdfError("E_LIMIT", "PDF object stream member limit exceeded");
     active.add(number);
     let dict;
@@ -51354,8 +51358,8 @@ function createRetainedColorAccess(document2, storage, options, storedFunctions
       const item = dictGet(dict, key);
       if (!item) continue;
       charge(64);
-      const field2 = key === "Functions" ? await snapshotFunction(item, depth + 1) : await snapshotNumbers(item);
-      selected.entries.push({ key: cosName(key), value: field2 ?? { kind: "null" } });
+      const field3 = key === "Functions" ? await snapshotFunction(item, depth + 1) : await snapshotNumbers(item);
+      selected.entries.push({ key: cosName(key), value: field3 ?? { kind: "null" } });
     }
     if (value?.kind === "stream" && (kind === 0 || kind === 4) && storedFunctions) return storeFunction(value, selected);
     return value?.kind === "stream" && (kind === 0 || kind === 4) ? cosStream(selected, await decode2(value)) : selected;
@@ -51536,7 +51540,8 @@ async function runRetainedColorProgram(document2, storage, options, work) {
       options.signal?.throwIfAborted();
       const request = step.value;
       let result;
-      if (request.kind === "resolve") result = await resolve2(request.node);
+      if (request.kind === "dictionary-value") result = await readPdfDictionaryValue(request.dict, request.key, options.signal);
+      else if (request.kind === "resolve") result = await resolve2(request.node);
       else if (request.kind === "resource") result = await resource(request);
       else if (request.kind === "decode") result = await decode2(request.stream, request.length, request.start);
       else if (request.kind === "calibrated") result = createCalibratedColorSpace(context, request.family, await snapshot(request.parameters));
@@ -53460,8 +53465,8 @@ async function readType1Header(lexer, initialMatrix, storage, signal) {
     if (!await token2.equals("/")) continue;
     switch (await (await lexer.next())?.keyword()) {
       case "FontMatrix": {
-        const field2 = await readType1NumberArray(lexer);
-        matrix2 = field2.count > 6 ? [...field2.values, 0] : field2.values;
+        const field3 = await readType1NumberArray(lexer);
+        matrix2 = field3.count > 6 ? [...field3.values, 0] : field3.values;
         break;
       }
       case "FontBBox":
@@ -53736,8 +53741,8 @@ async function parseStoredType1Cid(source, properties, storage, signal) {
     const key = await keyToken?.keyword();
     switch (key) {
       case "FontMatrix": {
-        const field2 = await readType1NumberArray(lexer);
-        properties.fontMatrix = field2.count > 6 ? [...field2.values, 0] : field2.values;
+        const field3 = await readType1NumberArray(lexer);
+        properties.fontMatrix = field3.count > 6 ? [...field3.values, 0] : field3.values;
         break;
       }
       case "FontBBox":
@@ -54494,8 +54499,8 @@ async function readCffDictionary(source, selected) {
 var TOP_FIELDS = /* @__PURE__ */ new Set([15, 16, 17, 18, 3079, 3102, 3108, 3109]);
 var PRIVATE_FIELDS = /* @__PURE__ */ new Set([19]);
 var DEFAULT_MATRIX = [1e-3, 0, 0, 1e-3, 0, 0];
-function scalar(dict, field2, fallback = 0) {
-  return dict.get(field2)?.values[0] ?? fallback;
+function scalar(dict, field3, fallback = 0) {
+  return dict.get(field3)?.values[0] ?? fallback;
 }
 function matrix(dict) {
   const entry = dict.get(3079);
@@ -55437,8 +55442,8 @@ async function resolveRetainedFont(document2, storage, resources, name, options
       }
       let value;
       if (step.value.kind === "resolve") {
-        const retained = await document2.lookup(step.value.node, options.resourceStorage ? { dictionaryStorage: options.resourceStorage, deferDictionaryValues: true, containerStorage: options.resourceStorage, stringStorage: options.resourceStorage, storedDictionaryKeys: ["Font", "XObject", "Properties"], storedDictionaryPaths: [["Resources", "*"]], storeRootDictionary: step.value.storeRootDictionary ?? false, arrayStorage: options.resourceStorage, storedArrayKeys: ["Widths", "W", "Differences"], storeRootArray: step.value.storeRootArray ?? false } : {}, step.value.arrayPathPrefix);
-        value = retained ? await materializeResourceValue(retained.value, signal) : void 0;
+        const retained = await document2.lookup(step.value.node, options.resourceStorage ? { dictionaryStorage: options.resourceStorage, deferDictionaryValues: true, deferArrayValues: true, containerStorage: options.resourceStorage, stringStorage: options.resourceStorage, storedDictionaryKeys: ["Font", "XObject", "Properties"], storedDictionaryPaths: [["Resources", "*"]], storeRootDictionary: step.value.storeRootDictionary ?? false, arrayStorage: options.resourceStorage, storedArrayKeys: ["Widths", "W", "Differences"], storeRootArray: step.value.storeRootArray ?? false } : {}, step.value.arrayPathPrefix);
+        value = retained ? options.resourceStorage && (step.value.storeRootDictionary || step.value.storeRootArray) ? retained.value : await materializeResourceValue(retained.value, signal) : void 0;
         if (retained?.stream) {
           if (retained.value.kind !== "dict" || !retained.reference) throw new PdfError("E_PARSE", "Font stream has no retained identity");
           allocation.admit(256);
@@ -55446,6 +55451,8 @@ async function resolveRetainedFont(document2, storage, resources, name, options
           identities.set(stream, retained.reference);
           value = stream;
         }
+      } else if (step.value.kind === "dictionary-value") {
+        value = await readPdfDictionaryValue(step.value.dict, step.value.key, signal, { preserveDeferred: true });
       } else if (step.value.kind === "dictionary-entry") {
         const record = await readStoredRecord(step.value.entries.storage, step.value.position, signal);
         value = cosArray([record.value.key, record.value.value, cosNumber(record.next)]);
@@ -58714,8 +58721,8 @@ async function* walkRetainedFormFieldDetails(document2, storage, options = {}) {
           yield value2;
         }
       }
-      async function* appearances(field2) {
-        const appearance = await resolve2(dictGet(field2, "AP"));
+      async function* appearances(field3) {
+        const appearance = await resolve2(dictGet(field3, "AP"));
         const normal = appearance?.kind === "dict" ? await resolve2(dictGet(appearance, "N")) : void 0;
         if (normal?.kind === "dict") for (const pair of normal.entries) {
           await checkpoint();
@@ -58728,8 +58735,8 @@ async function* walkRetainedFormFieldDetails(document2, storage, options = {}) {
           yield* appearances(dict);
           const kids = await resolve2(dictGet(dict, "Kids"));
           if (kids?.kind === "array") for (const kid of kids.items) {
-            const field2 = await resolve2(kid);
-            if (field2?.kind === "dict") yield* appearances(field2);
+            const field3 = await resolve2(kid);
+            if (field3?.kind === "dict") yield* appearances(field3);
           }
           if (count === 1) yield* unique("Yes");
         }
@@ -60413,7 +60420,7 @@ async function* walkRetainedJavaScripts(document2, storage, options) {
     const kids = await resolve2(dictGet(dict, "Kids"));
     if (kids?.kind === "array") for (const kid of kids.items) yield* tree(kid, depth + 1);
   }
-  async function* field2(node, fallback, depth = 0) {
+  async function* field3(node, fallback, depth = 0) {
     if (depth > options.maxDepth) throw new PdfError("E_LIMIT", "PDF JavaScript field depth limit exceeded");
     const dict = await dictionary(node, "field");
     if (!dict) return;
@@ -60422,7 +60429,7 @@ async function* walkRetainedJavaScripts(document2, storage, options) {
     yield* action(dictGet(dict, "A"), `${label} Action`);
     yield* additional(dictGet(dict, "AA"), label);
     const kids = await resolve2(dictGet(dict, "Kids"));
-    if (kids?.kind === "array") for (const kid of kids.items) yield* field2(kid, label, depth + 1);
+    if (kids?.kind === "array") for (const kid of kids.items) yield* field3(kid, label, depth + 1);
   }
   try {
     const root = await dictionary(document2.crossReference.rootRef);
@@ -60435,11 +60442,11 @@ async function* walkRetainedJavaScripts(document2, storage, options) {
       const label = `Page ${page2.index + 1}`;
       yield* additional(dictGet(page2.dict, "AA"), label);
       const annots = await resolve2(dictGet(page2.dict, "Annots"));
-      if (annots?.kind === "array") for (let i = 0; i < annots.items.length; i++) yield* field2(annots.items[i], `${label} Annot ${i + 1}`);
+      if (annots?.kind === "array") for (let i = 0; i < annots.items.length; i++) yield* field3(annots.items[i], `${label} Annot ${i + 1}`);
     }
     const form = await dictionary(dictGet(root, "AcroForm"));
     const fields2 = form ? await resolve2(dictGet(form, "Fields")) : void 0;
-    if (fields2?.kind === "array") for (let i = 0; i < fields2.items.length; i++) yield* field2(fields2.items[i], `Field ${i + 1}`);
+    if (fields2?.kind === "array") for (let i = 0; i < fields2.items.length; i++) yield* field3(fields2.items[i], `Field ${i + 1}`);
   } catch (error) {
     failed = true;
     throw error;
@@ -62381,14 +62388,14 @@ async function createRetainedPageCopy(input, indicesOrStorage, storageOrOptions,
       if (fields2?.kind === "array" && acro?.kind === "dict") {
         let addedFields = false;
         const rootNumbers = new IntegerTable6(backing, 64);
-        for (const field2 of fields2.items) {
-          if (!await hasCloned(field2)) continue;
-          const cloned = await clone(field2);
+        for (const field3 of fields2.items) {
+          if (!await hasCloned(field3)) continue;
+          const cloned = await clone(field3);
           if (cloned.kind !== "ref") continue;
-          const dict = await targetDict(cloned), source = await sourceValue(field2), sourceKids = source?.kind === "dict" ? await sourceValue(dictGet(source, "Kids")) : void 0;
+          const dict = await targetDict(cloned), source = await sourceValue(field3), sourceKids = source?.kind === "dict" ? await sourceValue(dictGet(source, "Kids")) : void 0;
           let kids = dict && dictGet(dict, "Kids");
           if (kids?.kind === "ref") kids = (await store.get(kids.objectNumber))?.value;
-          if (dict && kids?.kind === "array" && field2.kind === "ref" && sourceKids?.kind === "array" && sourceKids.items.length === kids.items.length) {
+          if (dict && kids?.kind === "array" && field3.kind === "ref" && sourceKids?.kind === "array" && sourceKids.items.length === kids.items.length) {
             const filtered = [];
             for (let i = 0; i < kids.items.length; i++) if (await hasCloned(sourceKids.items[i])) filtered.push(kids.items[i]);
             if (filtered.length) {
@@ -62435,12 +62442,12 @@ async function createRetainedPageCopy(input, indicesOrStorage, storageOrOptions,
     }
   }
   const encoder = new TextEncoder();
-  async function* dictionary(dict, field2, values) {
+  async function* dictionary(dict, field3, values) {
     yield encoder.encode("<<\n");
     for (const entry of dict.entries) {
       yield* serializeCosNodeChunks(entry.key, { chunkBytes: options.chunkBytes ?? 16384, maxRecursionDepth: maximumDepth, signal }, 1);
       yield encoder.encode(" ");
-      if (entry.key.decoded === field2) {
+      if (entry.key.decoded === field3) {
         if (values.count && maximumDepth < 2) throw new PdfError("E_LIMIT", "PDF page copy depth limit exceeded");
         yield encoder.encode("[ ");
         for await (const reference of references(values)) yield encoder.encode(`${reference.objectNumber} 0 R `);
@@ -62468,10 +62475,10 @@ async function createRetainedPageCopy(input, indicesOrStorage, storageOrOptions,
     const pageTree = cosDict({ Type: cosName("Pages"), Count: cosNumber(pageCount), Kids: cosArray([]) });
     if (pageLabels) await store.setSerializedValue(pageLabels);
     if (attachmentNames) await store.setSerializedValue(attachmentNames);
-    async function saveList(number, dict, field2, values) {
+    async function saveList(number, dict, field3, values) {
       let length = 0;
-      for await (const bytes of dictionary(dict, field2, values)) length += bytes.length;
-      await store.setSerializedValue({ objectNumber: number, generationNumber: 0, body: { length, chunks: dictionary(dict, field2, values) } });
+      for await (const bytes of dictionary(dict, field3, values)) length += bytes.length;
+      await store.setSerializedValue({ objectNumber: number, generationNumber: 0, body: { length, chunks: dictionary(dict, field3, values) } });
     }
     await saveList(2, pageTree, "Kids", pages);
     if (formRef) await saveList(formRef.objectNumber, (await store.get(formRef.objectNumber)).value, "Fields", formFields);
@@ -63171,9 +63178,9 @@ q ${sx} 0 0 ${sy} ${tx} ${ty} cm /${name} Do Q
     if (!firstPage) return;
     for (let i = 0; i < fieldCount; i++) {
       await checkpoint();
-      const location = (await readStoredRecord(backing, Number(await fields2.get(BigInt(i))), signal)).value, field2 = await locate(location);
-      if (field2?.value.kind !== "dict" || await baked.get(BigInt(await identity(field2.location)))) continue;
-      const rect = await resolve2(dictGet(field2.value, "Rect")), items = rect?.kind === "array" ? rect.items : [], x = await number(items[0], 50), y = await number(items[1], 700), value = await resolve2(dictGet(field2.value, "V") ?? dictGet(field2.value, "AS"));
+      const location = (await readStoredRecord(backing, Number(await fields2.get(BigInt(i))), signal)).value, field3 = await locate(location);
+      if (field3?.value.kind !== "dict" || await baked.get(BigInt(await identity(field3.location)))) continue;
+      const rect = await resolve2(dictGet(field3.value, "Rect")), items = rect?.kind === "array" ? rect.items : [], x = await number(items[0], 50), y = await number(items[1], 700), value = await resolve2(dictGet(field3.value, "V") ?? dictGet(field3.value, "AS"));
       await draw(firstPage, await textValue(value, false), x + 2, y + 4);
     }
     const latest = await locate(form);
@@ -63744,21 +63751,21 @@ async function generateRetainedFormAppearances(document2, store, storage, signal
         continue;
       }
       await checkpoint(frame.depth);
-      const field2 = await locate(frame.location);
-      if (field2?.value.kind !== "dict") continue;
-      if (!field2.location.path.length) {
-        const id = field2.location.reference.objectNumber;
+      const field3 = await locate(frame.location);
+      if (field3?.value.kind !== "dict") continue;
+      if (!field3.location.path.length) {
+        const id = field3.location.reference.objectNumber;
         if (await active.get(BigInt(id)) === 1n) continue;
         await active.set(BigInt(id), 1n);
         await push({ exit: id });
       }
-      const name = await resolve2(dictGet(field2.value, "T")), ft = await resolve2(dictGet(field2.value, "FT"));
+      const name = await resolve2(dictGet(field3.value, "T")), ft = await resolve2(dictGet(field3.value, "FT"));
       const partial = name?.kind === "name" ? name.decoded : name?.kind === "string" ? decodePdfString(name) : "";
       const named = update ? frame.named && partial ? `${frame.named}.${partial}` : partial || frame.named : frame.named || partial ? "1" : "";
-      const inherited = { ...frame, named, ft: ft?.kind === "name" ? ft.decoded : frame.ft, ff: await number(dictGet(field2.value, "Ff"), frame.ff), q: await number(dictGet(field2.value, "Q"), frame.q) };
-      const maxLen = await resolve2(dictGet(field2.value, "MaxLen"));
+      const inherited = { ...frame, named, ft: ft?.kind === "name" ? ft.decoded : frame.ft, ff: await number(dictGet(field3.value, "Ff"), frame.ff), q: await number(dictGet(field3.value, "Q"), frame.q) };
+      const maxLen = await resolve2(dictGet(field3.value, "MaxLen"));
       if (maxLen?.kind === "number") inherited.maxLen = maxLen.value;
-      const kids = await locate(child(field2.location, "Kids"));
+      const kids = await locate(child(field3.location, "Kids"));
       if (kids?.value.kind === "array" && kids.value.items.length) {
         let namedKids = false;
         for (let i = 0; i < kids.value.items.length; i++) {
@@ -63783,14 +63790,14 @@ async function generateRetainedFormAppearances(document2, store, storage, signal
         matched = true;
         const value2 = update.value;
         if (typeof value2 === "boolean" || inherited.ft === "Btn") {
-          const on = await onValue(field2.location);
+          const on = await onValue(field3.location);
           const checked = typeof value2 === "boolean" ? value2 : value2 !== "Off" && value2 !== "false" && value2 !== "0" && value2 !== "";
           const chosen = typeof value2 === "string" && value2 !== "true" && value2 !== "false" && value2 !== "Off" ? value2 : on;
           const state = cosName(checked ? chosen : "Off");
-          dictSet(field2.value, "FT", cosName("Btn"));
-          dictSet(field2.value, "V", state);
-          dictSet(field2.value, "AS", state);
-          await store.set(field2.owner);
+          dictSet(field3.value, "FT", cosName("Btn"));
+          dictSet(field3.value, "V", state);
+          dictSet(field3.value, "AS", state);
+          await store.set(field3.owner);
           if (kids?.value.kind === "array") for (let i = 0; i < kids.value.items.length; i++) {
             await checkpoint();
             const kid = await locate(itemLocation(kids.location, i, kids.value.items[i]));
@@ -63802,13 +63809,13 @@ async function generateRetainedFormAppearances(document2, store, storage, signal
           }
           continue;
         }
-        if (!inherited.ft) dictSet(field2.value, "FT", cosName("Tx"));
+        if (!inherited.ft) dictSet(field3.value, "FT", cosName("Tx"));
         let text2 = String(value2);
         const multi = inherited.ft === "Ch" && !!(inherited.ff & 1 << 21) && text2.includes(",");
         const selected = multi ? text2.split(",").map((value3) => value3.trim()).filter(Boolean) : [text2];
-        dictSet(field2.value, "V", multi ? cosArray(selected.map((value3) => cosString(value3))) : cosString(text2));
+        dictSet(field3.value, "V", multi ? cosArray(selected.map((value3) => cosString(value3))) : cosString(text2));
         if (inherited.ft === "Ch") {
-          const choices = await resolve2(dictGet(field2.value, "Opt")), indices = [];
+          const choices = await resolve2(dictGet(field3.value, "Opt")), indices = [];
           if (choices?.kind === "array") for (let i = 0; i < choices.items.length; i++) {
             await checkpoint();
             const option = await resolve2(choices.items[i]);
@@ -63831,10 +63838,10 @@ async function generateRetainedFormAppearances(document2, store, storage, signal
               }
             }
           }
-          if (indices.length) dictSet(field2.value, "I", cosArray(indices.map((value3) => cosNumber(value3))));
+          if (indices.length) dictSet(field3.value, "I", cosArray(indices.map((value3) => cosNumber(value3))));
         }
-        await store.set(field2.owner);
-        await synthesize(field2.location, text2, inherited);
+        await store.set(field3.owner);
+        await synthesize(field3.location, text2, inherited);
         if (kids?.value.kind === "array") for (let i = 0; i < kids.value.items.length; i++) {
           await checkpoint();
           const kid = await locate(itemLocation(kids.location, i, kids.value.items[i]));
@@ -63842,24 +63849,24 @@ async function generateRetainedFormAppearances(document2, store, storage, signal
         }
         continue;
       }
-      const value = await resolve2(dictGet(field2.value, "V"));
+      const value = await resolve2(dictGet(field3.value, "V"));
       if (!value) continue;
-      const appearance = await resolve2(dictGet(field2.value, "AP")), hasNormal = appearance?.kind === "dict" && dictGet(appearance, "N") !== void 0;
+      const appearance = await resolve2(dictGet(field3.value, "AP")), hasNormal = appearance?.kind === "dict" && dictGet(appearance, "N") !== void 0;
       if (!force && hasNormal) continue;
       if (inherited.ft === "Btn") {
-        dictSet(field2.value, "AS", cosName(value.kind === "name" ? value.decoded : value.kind === "string" ? decodePdfString(value) : "Off"));
+        dictSet(field3.value, "AS", cosName(value.kind === "name" ? value.decoded : value.kind === "string" ? decodePdfString(value) : "Off"));
         if (!hasNormal) {
-          const name2 = await onValue(field2.location), dict = cosDict({ Type: cosName("XObject"), Subtype: cosName("Form"), BBox: cosArray([0, 0, 12, 12].map((v) => cosNumber(v))) });
+          const name2 = await onValue(field3.location), dict = cosDict({ Type: cosName("XObject"), Subtype: cosName("Form"), BBox: cosArray([0, 0, 12, 12].map((v) => cosNumber(v))) });
           const on = await stream(dict, [new TextEncoder().encode("q 0 0 0 rg 2 2 8 8 re f Q\n")]);
           const off = await stream(dict, [new TextEncoder().encode("q Q\n")]);
-          dictSet(field2.value, "AP", cosDict({ N: cosDict({ [name2]: on, Off: off }) }));
+          dictSet(field3.value, "AP", cosDict({ N: cosDict({ [name2]: on, Off: off }) }));
         }
-        await store.set(field2.owner);
+        await store.set(field3.owner);
         continue;
       }
       let text = value.kind === "string" ? decodePdfString(value) : value.kind === "name" ? value.decoded : "";
       if (inherited.ft === "Ch") {
-        const choices = await resolve2(dictGet(field2.value, "Opt"));
+        const choices = await resolve2(dictGet(field3.value, "Opt"));
         if (choices?.kind === "array") for (const choice of choices.items) {
           await checkpoint();
           const pair = await resolve2(choice);
@@ -63872,7 +63879,7 @@ async function generateRetainedFormAppearances(document2, store, storage, signal
           }
         }
       }
-      await synthesize(field2.location, text, inherited);
+      await synthesize(field3.location, text, inherited);
       if (kids?.value.kind === "array") for (let i = 0; i < kids.value.items.length; i++) {
         await checkpoint();
         const kid = await locate(itemLocation(kids.location, i, kids.value.items[i]));
@@ -63883,8 +63890,8 @@ async function generateRetainedFormAppearances(document2, store, storage, signal
       const fields3 = await locate(child(formLocation, "Fields"));
       if (fields3?.value.kind === "array") {
         const value = update.value;
-        const field2 = typeof value === "boolean" ? cosDict({ FT: cosName("Btn"), T: cosString(update.name), V: cosName(value ? "Yes" : "Off"), AS: cosName(value ? "Yes" : "Off") }) : cosDict({ FT: cosName("Tx"), T: cosString(update.name), V: cosString(value) });
-        fields3.value.items.push(await store.allocate(field2));
+        const field3 = typeof value === "boolean" ? cosDict({ FT: cosName("Btn"), T: cosString(update.name), V: cosName(value ? "Yes" : "Off"), AS: cosName(value ? "Yes" : "Off") }) : cosDict({ FT: cosName("Tx"), T: cosString(update.name), V: cosString(value) });
+        fields3.value.items.push(await store.allocate(field3));
         await store.set(fields3.owner);
       }
     }
@@ -66729,7 +66736,7 @@ async function* parseRetainedFormData(source, storage, options = {}) {
     const prefix = await text.prefix();
     if (prefix === "%FDF-" || await text.indexOf("/FDF") >= 0 && await text.indexOf("/Fields") >= 0) await parseRetainedFdf(source, storage, set, signal);
     else if (prefix === "<?xml" || prefix === "<xfdf" || await text.indexOf("<fields") >= 0) {
-      let position = 0, head = -1, field2 = "";
+      let position = 0, head = -1, field3 = "";
       while (position < text.length) {
         await checkpoint();
         const lt = await text.indexOf("<", position);
@@ -66742,7 +66749,7 @@ async function* parseRetainedFormData(source, storage, options = {}) {
         if (raw.startsWith("/")) {
           if (raw.slice(1).trim().toLowerCase() === "field" && head !== -1) {
             const row = (await readStoredRecord(state, head, signal)).value;
-            field2 = row.field;
+            field3 = row.field;
             head = row.previous;
           }
           continue;
@@ -66759,14 +66766,14 @@ async function* parseRetainedFormData(source, storage, options = {}) {
             }
           }
           if (!selfClosing) {
-            head = await appendStoredRecord(state, { field: field2, previous: head }, -1, signal);
-            field2 = field2 && part ? `${field2}.${part}` : field2 || part;
+            head = await appendStoredRecord(state, { field: field3, previous: head }, -1, signal);
+            field3 = field3 && part ? `${field3}.${part}` : field3 || part;
           }
         } else if (name === "value" && !selfClosing && head !== -1) {
           const close = await text.indexOf("</value>", position);
           if (close >= 0) {
             const value = decodeFormDataEntities(await text.read(position, close));
-            if (field2) await set(field2, value === "Off" ? false : value === "Yes" || value === "On" ? true : value, true);
+            if (field3) await set(field3, value === "Off" ? false : value === "Yes" || value === "On" ? true : value, true);
             position = close + 8;
           }
         }