Merge pull request #12563 from Snuffleupagus/rm-SystemJS-worker

[api-minor] Remove SystemJS usage, in development mode, from the worker

.eslintrc

@@ -28,7 +28,6 @@
   "globals": {
     "PDFJSDev": false,
     "exports": false,
-    "SystemJS": false,
   },
 
   "rules": {

package.json

@@ -48,8 +48,6 @@
     "streamqueue": "^1.1.2",
     "stylelint": "^15.6.0",
     "stylelint-prettier": "^3.0.0",
-    "systemjs": "^0.21.6",
-    "systemjs-plugin-babel": "^0.0.25",
     "terser": "^5.17.1",
     "through2": "^4.0.2",
     "ttest": "^4.0.0",

src/core/annotation.js

@@ -1556,11 +1556,10 @@ class WidgetAnnotation extends Annotation {
 
     this.setDefaultAppearance(params);
 
-    data.hasAppearance =
-      (this._needAppearances &&
-        data.fieldValue !== undefined &&
-        data.fieldValue !== null) ||
-      data.hasAppearance;
+    data.hasAppearance ||=
+      this._needAppearances &&
+      data.fieldValue !== undefined &&
+      data.fieldValue !== null;
 
     const fieldType = getInheritableProperty({ dict, key: "FT" });
     data.fieldType = fieldType instanceof Name ? fieldType.name : null;
@@ -1808,7 +1807,7 @@ class WidgetAnnotation extends Annotation {
       if (!this._hasValueFromXFA && rotation === undefined) {
         return null;
       }
-      value = value || this.data.fieldValue;
+      value ||= this.data.fieldValue;
     }
 
     // Value can be an array (with choice list and multiple selections)
@@ -3472,7 +3471,7 @@ class LinkAnnotation extends Annotation {
     }
 
     // The color entry for a link annotation is the color of the border.
-    this.data.borderColor = this.data.borderColor || this.data.color;
+    this.data.borderColor ||= this.data.color;
 
     Catalog.parseDestDictionary({
       destDict: params.dict,

src/core/catalog.js

@@ -985,12 +985,8 @@ class Catalog {
       } else if (typeof js !== "string") {
         return;
       }
-
-      if (javaScript === null) {
-        javaScript = new Map();
-      }
       js = stringToPDFString(js).replaceAll("\x00", "");
-      javaScript.set(name, js);
+      (javaScript ||= new Map()).set(name, js);
     }
 
     if (obj instanceof Dict && obj.has("JavaScript")) {

src/core/chunked_stream.js

@@ -14,7 +14,7 @@
  */
 
 import { arrayBuffersToBytes, MissingDataException } from "./core_utils.js";
-import { assert, createPromiseCapability } from "../shared/util.js";
+import { assert, PromiseCapability } from "../shared/util.js";
 import { Stream } from "./stream.js";
 
 class ChunkedStream extends Stream {
@@ -275,7 +275,7 @@ class ChunkedStreamManager {
     this.progressiveDataLength = 0;
     this.aborted = false;
 
-    this._loadedStreamCapability = createPromiseCapability();
+    this._loadedStreamCapability = new PromiseCapability();
   }
 
   sendRequest(begin, end) {
@@ -349,7 +349,7 @@ class ChunkedStreamManager {
       return Promise.resolve();
     }
 
-    const capability = createPromiseCapability();
+    const capability = new PromiseCapability();
     this._promisesByRequest.set(requestId, capability);
 
     const chunksToRequest = [];

src/core/colorspace.js

@@ -1220,9 +1220,9 @@ const CalRGBCS = (function CalRGBCSClosure() {
           "WhitePoint missing - required for color space CalRGB"
         );
       }
-      blackPoint = blackPoint || new Float32Array(3);
-      gamma = gamma || new Float32Array([1, 1, 1]);
-      matrix = matrix || new Float32Array([1, 0, 0, 0, 1, 0, 0, 0, 1]);
+      blackPoint ||= new Float32Array(3);
+      gamma ||= new Float32Array([1, 1, 1]);
+      matrix ||= new Float32Array([1, 0, 0, 0, 1, 0, 0, 0, 1]);
 
       // Translate arguments to spec variables.
       const XW = whitePoint[0];
@@ -1396,8 +1396,8 @@ const LabCS = (function LabCSClosure() {
           "WhitePoint missing - required for color space Lab"
         );
       }
-      blackPoint = blackPoint || [0, 0, 0];
-      range = range || [-100, 100, -100, 100];
+      blackPoint ||= [0, 0, 0];
+      range ||= [-100, 100, -100, 100];
 
       // Translate args to spec variables
       this.XW = whitePoint[0];

src/core/core_utils.js

@@ -38,22 +38,6 @@ function getLookupTableFactory(initializer) {
   };
 }
 
-function getArrayLookupTableFactory(initializer) {
-  let lookup;
-  return function () {
-    if (initializer) {
-      let arr = initializer();
-      initializer = null;
-      lookup = Object.create(null);
-      for (let i = 0, ii = arr.length; i < ii; i += 2) {
-        lookup[arr[i]] = arr[i + 1];
-      }
-      arr = null;
-    }
-    return lookup;
-  };
-}
-
 class MissingDataException extends BaseException {
   constructor(begin, end) {
     super(`Missing data [${begin}, ${end})`, "MissingDataException");
@@ -153,10 +137,7 @@ function getInheritableProperty({
       if (stopWhenFound) {
         return value;
       }
-      if (!values) {
-        values = [];
-      }
-      values.push(value);
+      (values ||= []).push(value);
     }
     dict = dict.get("Parent");
   }
@@ -338,7 +319,7 @@ function _collectJS(entry, xref, list, parents) {
       } else if (typeof js === "string") {
         code = js;
       }
-      code = code && stringToPDFString(code).replaceAll("\x00", "");
+      code &&= stringToPDFString(code).replaceAll("\x00", "");
       if (code) {
         list.push(code);
       }
@@ -616,7 +597,6 @@ export {
   encodeToXmlString,
   escapePDFName,
   escapeString,
-  getArrayLookupTableFactory,
   getInheritableProperty,
   getLookupTableFactory,
   getNewAnnotationsMap,