refactor: simplify options handling

Author: eventualbuddha

dist/jsQR.js

@@ -362,15 +362,12 @@ var defaultOptions = {
 };
 function jsQR(data, width, height, providedOptions) {
     if (providedOptions === void 0) { providedOptions = {}; }
-    var options = defaultOptions;
-    Object.keys(options || {}).forEach(function (opt) {
-        options[opt] = providedOptions[opt] || options[opt];
-    });
-    var shouldInvert = options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst";
-    var tryInvertedFirst = options.inversionAttempts === "onlyInvert" || options.inversionAttempts === "invertFirst";
-    var _a = binarizer_1.binarize(data, width, height, shouldInvert), binarized = _a.binarized, inverted = _a.inverted;
+    var _a = providedOptions.inversionAttempts, inversionAttempts = _a === void 0 ? defaultOptions.inversionAttempts : _a;
+    var shouldInvert = inversionAttempts === "attemptBoth" || inversionAttempts === "invertFirst";
+    var tryInvertedFirst = inversionAttempts === "onlyInvert" || inversionAttempts === "invertFirst";
+    var _b = binarizer_1.binarize(data, width, height, shouldInvert), binarized = _b.binarized, inverted = _b.inverted;
     var result = scan(tryInvertedFirst ? inverted : binarized);
-    if (!result && (options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst")) {
+    if (!result && (inversionAttempts === "attemptBoth" || inversionAttempts === "invertFirst")) {
         result = scan(tryInvertedFirst ? binarized : inverted);
     }
     return result;

docs/jsQR.js

@@ -362,15 +362,12 @@ var defaultOptions = {
 };
 function jsQR(data, width, height, providedOptions) {
     if (providedOptions === void 0) { providedOptions = {}; }
-    var options = defaultOptions;
-    Object.keys(options || {}).forEach(function (opt) {
-        options[opt] = providedOptions[opt] || options[opt];
-    });
-    var shouldInvert = options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst";
-    var tryInvertedFirst = options.inversionAttempts === "onlyInvert" || options.inversionAttempts === "invertFirst";
-    var _a = binarizer_1.binarize(data, width, height, shouldInvert), binarized = _a.binarized, inverted = _a.inverted;
+    var _a = providedOptions.inversionAttempts, inversionAttempts = _a === void 0 ? defaultOptions.inversionAttempts : _a;
+    var shouldInvert = inversionAttempts === "attemptBoth" || inversionAttempts === "invertFirst";
+    var tryInvertedFirst = inversionAttempts === "onlyInvert" || inversionAttempts === "invertFirst";
+    var _b = binarizer_1.binarize(data, width, height, shouldInvert), binarized = _b.binarized, inverted = _b.inverted;
     var result = scan(tryInvertedFirst ? inverted : binarized);
-    if (!result && (options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst")) {
+    if (!result && (inversionAttempts === "attemptBoth" || inversionAttempts === "invertFirst")) {
         result = scan(tryInvertedFirst ? binarized : inverted);
     }
     return result;

src/index.ts

@@ -64,17 +64,12 @@ const defaultOptions: Options = {
 };
 
 function jsQR(data: Uint8ClampedArray, width: number, height: number, providedOptions: Options = {}): QRCode | null {
-
-  const options = defaultOptions;
-  Object.keys(options || {}).forEach(opt => { // Sad implementation of Object.assign since we target es5 not es6
-    (options as any)[opt] = (providedOptions as any)[opt] || (options as any)[opt];
-  });
-
-  const shouldInvert = options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst";
-  const tryInvertedFirst = options.inversionAttempts === "onlyInvert" || options.inversionAttempts === "invertFirst";
+  const { inversionAttempts = defaultOptions.inversionAttempts } = providedOptions
+  const shouldInvert = inversionAttempts === "attemptBoth" || inversionAttempts === "invertFirst";
+  const tryInvertedFirst = inversionAttempts === "onlyInvert" || inversionAttempts === "invertFirst";
   const {binarized, inverted} = binarize(data, width, height, shouldInvert);
   let result = scan(tryInvertedFirst ? inverted : binarized);
-  if (!result && (options.inversionAttempts === "attemptBoth" || options.inversionAttempts === "invertFirst")) {
+  if (!result && (inversionAttempts === "attemptBoth" || inversionAttempts === "invertFirst")) {
     result = scan(tryInvertedFirst ? binarized : inverted);
   }
   return result;