diff --git a/.prettierignore b/.prettierignore index e33594bd7..90371a116 100644 --- a/.prettierignore +++ b/.prettierignore @@ -6,6 +6,7 @@ external/bcmaps/ external/builder/fixtures/ external/builder/fixtures_babel/ external/quickjs/ +test/stats/results/ test/tmp/ test/pdfs/ web/locale/ diff --git a/.stylelintignore b/.stylelintignore index e33594bd7..90371a116 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -6,6 +6,7 @@ external/bcmaps/ external/builder/fixtures/ external/builder/fixtures_babel/ external/quickjs/ +test/stats/results/ test/tmp/ test/pdfs/ web/locale/ diff --git a/eslint.config.mjs b/eslint.config.mjs index 16bba1b99..41ffad5d3 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -35,6 +35,7 @@ export default [ "external/builder/fixtures_babel/", "external/quickjs/", "external/openjpeg/", + "test/stats/results/", "test/tmp/", "test/pdfs/", "web/locale/", diff --git a/src/core/catalog.js b/src/core/catalog.js index 8f09309b9..00524c32e 100644 --- a/src/core/catalog.js +++ b/src/core/catalog.js @@ -720,12 +720,12 @@ class Catalog { } } } else if (obj instanceof Dict) { - obj.forEach(function (key, value) { + for (const [key, value] of obj) { const dest = fetchDest(value); if (dest) { dests[key] = dest; } - }); + } } return shadow(this, "destinations", dests); } diff --git a/src/core/document.js b/src/core/document.js index 3c2599233..1744066d1 100644 --- a/src/core/document.js +++ b/src/core/document.js @@ -1282,13 +1282,8 @@ class PDFDocument { }, }; - const fonts = new Map(); - fontRes.forEach((fontName, font) => { - fonts.set(fontName, font); - }); const promises = []; - - for (const [fontName, font] of fonts) { + for (const [fontName, font] of fontRes) { const descriptor = font.get("FontDescriptor"); if (!(descriptor instanceof Dict)) { continue; diff --git a/src/core/primitives.js b/src/core/primitives.js index 0ee534145..c48a34eb7 100644 --- a/src/core/primitives.js +++ b/src/core/primitives.js @@ -69,7 +69,7 @@ const nonSerializable = function nonSerializableClosure() { class Dict { constructor(xref = null) { // Map should only be used internally, use functions below to access. - this._map = Object.create(null); + this._map = new Map(); this.xref = xref; this.objId = null; this.suppressEncryption = false; @@ -81,12 +81,12 @@ class Dict { } get size() { - return Object.keys(this._map).length; + return this._map.size; } // Automatically dereferences Ref objects. get(key1, key2, key3) { - let value = this._map[key1]; + let value = this._map.get(key1); if (value === undefined && key2 !== undefined) { if ( (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) && @@ -94,7 +94,7 @@ class Dict { ) { unreachable("Dict.get: Expected keys to be ordered by length."); } - value = this._map[key2]; + value = this._map.get(key2); if (value === undefined && key3 !== undefined) { if ( (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) && @@ -102,7 +102,7 @@ class Dict { ) { unreachable("Dict.get: Expected keys to be ordered by length."); } - value = this._map[key3]; + value = this._map.get(key3); } } if (value instanceof Ref && this.xref) { @@ -113,7 +113,7 @@ class Dict { // Same as get(), but returns a promise and uses fetchIfRefAsync(). async getAsync(key1, key2, key3) { - let value = this._map[key1]; + let value = this._map.get(key1); if (value === undefined && key2 !== undefined) { if ( (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) && @@ -121,7 +121,7 @@ class Dict { ) { unreachable("Dict.getAsync: Expected keys to be ordered by length."); } - value = this._map[key2]; + value = this._map.get(key2); if (value === undefined && key3 !== undefined) { if ( (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) && @@ -129,7 +129,7 @@ class Dict { ) { unreachable("Dict.getAsync: Expected keys to be ordered by length."); } - value = this._map[key3]; + value = this._map.get(key3); } } if (value instanceof Ref && this.xref) { @@ -140,7 +140,7 @@ class Dict { // Same as get(), but dereferences all elements if the result is an Array. getArray(key1, key2, key3) { - let value = this._map[key1]; + let value = this._map.get(key1); if (value === undefined && key2 !== undefined) { if ( (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) && @@ -148,7 +148,7 @@ class Dict { ) { unreachable("Dict.getArray: Expected keys to be ordered by length."); } - value = this._map[key2]; + value = this._map.get(key2); if (value === undefined && key3 !== undefined) { if ( (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) && @@ -156,7 +156,7 @@ class Dict { ) { unreachable("Dict.getArray: Expected keys to be ordered by length."); } - value = this._map[key3]; + value = this._map.get(key3); } } if (value instanceof Ref && this.xref) { @@ -176,16 +176,16 @@ class Dict { // No dereferencing. getRaw(key) { - return this._map[key]; + return this._map.get(key); } getKeys() { - return Object.keys(this._map); + return [...this._map.keys()]; } // No dereferencing. getRawValues() { - return Object.values(this._map); + return [...this._map.values()]; } set(key, value) { @@ -196,16 +196,21 @@ class Dict { unreachable('Dict.set: The "value" cannot be undefined.'); } } - this._map[key] = value; + this._map.set(key, value); } has(key) { - return this._map[key] !== undefined; + return this._map.has(key); } - forEach(callback) { - for (const key in this._map) { - callback(key, this.get(key)); + *[Symbol.iterator]() { + for (const [key, value] of this._map) { + yield [ + key, + value instanceof Ref && this.xref + ? this.xref.fetch(value, this.suppressEncryption) + : value, + ]; } } @@ -226,7 +231,7 @@ class Dict { if (!(dict instanceof Dict)) { continue; } - for (const [key, value] of Object.entries(dict._map)) { + for (const [key, value] of dict._map) { let property = properties.get(key); if (property === undefined) { property = []; @@ -242,20 +247,20 @@ class Dict { } for (const [name, values] of properties) { if (values.length === 1 || !(values[0] instanceof Dict)) { - mergedDict._map[name] = values[0]; + mergedDict._map.set(name, values[0]); continue; } const subDict = new Dict(xref); for (const dict of values) { - for (const [key, value] of Object.entries(dict._map)) { - if (subDict._map[key] === undefined) { - subDict._map[key] = value; + for (const [key, value] of dict._map) { + if (!subDict._map.has(key)) { + subDict._map.set(key, value); } } } if (subDict.size > 0) { - mergedDict._map[name] = subDict; + mergedDict._map.set(name, subDict); } } properties.clear(); diff --git a/src/core/struct_tree.js b/src/core/struct_tree.js index 7f5c7b45e..fa27a14c0 100644 --- a/src/core/struct_tree.js +++ b/src/core/struct_tree.js @@ -62,12 +62,11 @@ class StructTreeRoot { if (!(roleMapDict instanceof Dict)) { return; } - roleMapDict.forEach((key, value) => { - if (!(value instanceof Name)) { - return; + for (const [key, value] of roleMapDict) { + if (value instanceof Name) { + this.roleMap.set(key, value.name); } - this.roleMap.set(key, value.name); - }); + } } static async canCreateStructureTree({ diff --git a/src/core/worker.js b/src/core/worker.js index cba6cb0ce..e285d6491 100644 --- a/src/core/worker.js +++ b/src/core/worker.js @@ -688,11 +688,11 @@ class WorkerMessageHandler { const infoObj = Object.create(null); const xrefInfo = xref.trailer.get("Info") || null; if (xrefInfo instanceof Dict) { - xrefInfo.forEach((key, value) => { + for (const [key, value] of xrefInfo) { if (typeof value === "string") { infoObj[key] = stringToPDFString(value); } - }); + } } newXrefInfo = { diff --git a/src/pdf.js b/src/pdf.js index 2febc4227..ecb6606dd 100644 --- a/src/pdf.js +++ b/src/pdf.js @@ -80,7 +80,7 @@ const pdfjsVersion = const pdfjsBuild = typeof PDFJSDev !== "undefined" ? PDFJSDev.eval("BUNDLE_BUILD") : void 0; -if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING")) { +if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING || GENERIC")) { globalThis.pdfjsTestingUtils = { HighlightOutliner, }; diff --git a/test/unit/primitives_spec.js b/test/unit/primitives_spec.js index caefdf025..00c491004 100644 --- a/test/unit/primitives_spec.js +++ b/test/unit/primitives_spec.js @@ -221,17 +221,12 @@ describe("primitives", function () { expect(values[2]).toEqual(testFontFile); }); - it("should callback for each stored key", function () { - const callbackSpy = jasmine.createSpy("spy on callback in dictionary"); - - dictWithManyKeys.forEach(callbackSpy); - - expect(callbackSpy).toHaveBeenCalled(); - const callbackSpyCalls = callbackSpy.calls; - expect(callbackSpyCalls.argsFor(0)).toEqual(["FontFile", testFontFile]); - expect(callbackSpyCalls.argsFor(1)).toEqual(["FontFile2", testFontFile2]); - expect(callbackSpyCalls.argsFor(2)).toEqual(["FontFile3", testFontFile3]); - expect(callbackSpyCalls.count()).toEqual(3); + it("should iterate through each stored key", function () { + expect([...dictWithManyKeys]).toEqual([ + ["FontFile", testFontFile], + ["FontFile2", testFontFile2], + ["FontFile3", testFontFile3], + ]); }); it("should handle keys pointing to indirect objects, both sync and async", async function () {