Simplify acroform options mapping

Author: blikblum

lib/mixins/acroform.js

@@ -40,48 +40,36 @@ const FORMAT_DEFAULT = {
   },
 };
 
-function mapType(type, pdfObject) {
+function mapTypeAndFlags(type, userOptions, pdfObject) {
+  let flags = userOptions.Ff ?? 0;
+
   if (type === 'text') {
     pdfObject.FT = 'Tx';
   } else if (type === 'pushButton') {
     pdfObject.FT = 'Btn';
-    pdfObject.pushButton = true;
+    flags |= FIELD_FLAGS.pushButton;
   } else if (type === 'radioButton') {
     pdfObject.FT = 'Btn';
-    pdfObject.radioButton = true;
+    flags |= FIELD_FLAGS.radioButton;
   } else if (type === 'checkbox') {
     pdfObject.FT = 'Btn';
   } else if (type === 'combo') {
     pdfObject.FT = 'Ch';
-    pdfObject.combo = true;
+    flags |= FIELD_FLAGS.combo;
   } else if (type === 'list') {
     pdfObject.FT = 'Ch';
-  } else {
+  } else if (type) {
     throw new Error(`Invalid form annotation type '${type}'`);
   }
-  return pdfObject;
-}
 
-function mapFlags(userOptions, pdfObject) {
-  let result = userOptions.Ff ?? 0;
   Object.keys(userOptions).forEach((key) => {
-    if (FIELD_FLAGS[key]) {
-      if (userOptions[key]) {
-        result |= FIELD_FLAGS[key];
-      }
-    }
-  });
-  Object.keys(pdfObject).forEach((key) => {
-    if (FIELD_FLAGS[key]) {
-      if (pdfObject[key]) {
-        result |= FIELD_FLAGS[key];
-      }
-      delete pdfObject[key];
+    if (FIELD_FLAGS[key] && userOptions[key]) {
+      flags |= FIELD_FLAGS[key];
     }
   });
 
-  if (result !== 0) {
-    pdfObject.Ff = result;
+  if (flags !== 0) {
+    pdfObject.Ff = flags;
   }
 }
 
@@ -315,11 +303,7 @@ export default {
     }
     const pdfObject = {};
 
-    if (type) {
-      mapType(type, pdfObject);
-    }
-
-    mapFlags(options, pdfObject);
+    mapTypeAndFlags(type, options, pdfObject);
     mapJustify(options, pdfObject);
     this._mapFont(options, pdfObject);
     mapStrings(options, pdfObject);