docx 8.5.0 → 8.6.0

package/build/index.mjs

@@ -10034,6 +10034,25 @@ const TextEffect = {
   SPARKLE: "sparkle",
   NONE: "none"
 };
+const HighlightColor = {
+  BLACK: "black",
+  BLUE: "blue",
+  CYAN: "cyan",
+  DARK_BLUE: "darkBlue",
+  DARK_CYAN: "darkCyan",
+  DARK_GRAY: "darkGray",
+  DARK_GREEN: "darkGreen",
+  DARK_MAGENTA: "darkMagenta",
+  DARK_RED: "darkRed",
+  DARK_YELLOW: "darkYellow",
+  GREEN: "green",
+  LIGHT_GRAY: "lightGray",
+  MAGENTA: "magenta",
+  NONE: "none",
+  RED: "red",
+  WHITE: "white",
+  YELLOW: "yellow"
+};
 class RunProperties extends IgnoreIfEmptyXmlComponent {
   constructor(options2) {
     var _a, _b;
@@ -10181,11 +10200,9 @@ class Text extends XmlComponent {
     if (typeof options2 === "string") {
       this.root.push(new TextAttributes({ space: SpaceType.PRESERVE }));
       this.root.push(options2);
-      return this;
     } else {
       this.root.push(new TextAttributes({ space: (_a = options2.space) != null ? _a : SpaceType.DEFAULT }));
       this.root.push(options2.text);
-      return this;
     }
   }
 }
@@ -10425,26 +10442,47 @@ class GraphicDataAttributes extends XmlAttributeComponent {
     });
   }
 }
-class BlipAttributes extends XmlAttributeComponent {
-  constructor() {
-    super(...arguments);
-    __publicField(this, "xmlKeys", {
-      embed: "r:embed",
-      cstate: "cstate"
-    });
-  }
-}
-class Blip extends XmlComponent {
-  constructor(mediaData) {
-    super("a:blip");
-    this.root.push(
-      new BlipAttributes({
-        embed: `rId{${mediaData.fileName}}`,
-        cstate: "none"
-      })
-    );
+const createSvgBlip = (mediaData) => new BuilderElement({
+  name: "asvg:svgBlip",
+  attributes: {
+    asvg: {
+      key: "xmlns:asvg",
+      value: "http://schemas.microsoft.com/office/drawing/2016/SVG/main"
+    },
+    embed: {
+      key: "r:embed",
+      value: `rId{${mediaData.fileName}}`
+    }
   }
-}
+});
+const createExtention = (mediaData) => new BuilderElement({
+  name: "a:ext",
+  attributes: {
+    uri: {
+      key: "uri",
+      value: "{96DAC541-7B7A-43D3-8B79-37D633B846F1}"
+    }
+  },
+  children: [createSvgBlip(mediaData)]
+});
+const createExtentionList = (mediaData) => new BuilderElement({
+  name: "a:extLst",
+  children: [createExtention(mediaData)]
+});
+const createBlip = (mediaData) => new BuilderElement({
+  name: "a:blip",
+  attributes: {
+    embed: {
+      key: "r:embed",
+      value: `rId{${mediaData.type === "svg" ? mediaData.fallback.fileName : mediaData.fileName}}`
+    },
+    cstate: {
+      key: "cstate",
+      value: "none"
+    }
+  },
+  children: mediaData.type === "svg" ? [createExtentionList(mediaData)] : []
+});
 class SourceRectangle extends XmlComponent {
   constructor() {
     super("a:srcRect");
@@ -10464,7 +10502,7 @@ class Stretch extends XmlComponent {
 class BlipFill extends XmlComponent {
   constructor(mediaData) {
     super("pic:blipFill");
-    this.root.push(new Blip(mediaData));
+    this.root.push(createBlip(mediaData));
     this.root.push(new SourceRectangle());
     this.root.push(new Stretch());
   }
@@ -11114,28 +11152,57 @@ class Drawing extends XmlComponent {
     }
   }
 }
+const convertDataURIToBinary = (dataURI) => {
+  if (typeof atob === "function") {
+    const BASE64_MARKER = ";base64,";
+    const base64Index = dataURI.indexOf(BASE64_MARKER);
+    const base64IndexWithOffset = base64Index === -1 ? 0 : base64Index + BASE64_MARKER.length;
+    return new Uint8Array(
+      atob(dataURI.substring(base64IndexWithOffset)).split("").map((c) => c.charCodeAt(0))
+    );
+  } else {
+    const b = require("buffer");
+    return new b.Buffer(dataURI, "base64");
+  }
+};
+const standardizeData = (data) => typeof data === "string" ? convertDataURIToBinary(data) : data;
+const createImageData = (options2, key) => ({
+  data: standardizeData(options2.data),
+  fileName: key,
+  transformation: {
+    pixels: {
+      x: Math.round(options2.transformation.width),
+      y: Math.round(options2.transformation.height)
+    },
+    emus: {
+      x: Math.round(options2.transformation.width * 9525),
+      y: Math.round(options2.transformation.height * 9525)
+    },
+    flip: options2.transformation.flip,
+    rotation: options2.transformation.rotation ? options2.transformation.rotation * 6e4 : void 0
+  }
+});
 class ImageRun extends Run {
   constructor(options2) {
     super({});
-    __publicField(this, "key", `${uniqueId()}.png`);
+    __publicField(this, "key");
+    __publicField(this, "fallbackKey", `${uniqueId()}.png`);
     __publicField(this, "imageData");
-    const newData = typeof options2.data === "string" ? this.convertDataURIToBinary(options2.data) : options2.data;
-    this.imageData = {
-      stream: newData,
-      fileName: this.key,
-      transformation: {
-        pixels: {
-          x: Math.round(options2.transformation.width),
-          y: Math.round(options2.transformation.height)
-        },
-        emus: {
-          x: Math.round(options2.transformation.width * 9525),
-          y: Math.round(options2.transformation.height * 9525)
-        },
-        flip: options2.transformation.flip,
-        rotation: options2.transformation.rotation ? options2.transformation.rotation * 6e4 : void 0
-      }
-    };
+    this.key = `${uniqueId()}.${options2.type}`;
+    this.imageData = options2.type === "svg" ? __spreadProps(__spreadValues({
+      type: options2.type
+    }, createImageData(options2, this.key)), {
+      fallback: __spreadValues({
+        type: options2.fallback.type
+      }, createImageData(
+        __spreadProps(__spreadValues({}, options2.fallback), {
+          transformation: options2.transformation
+        }),
+        this.fallbackKey
+      ))
+    }) : __spreadValues({
+      type: options2.type
+    }, createImageData(options2, this.key));
     const drawing = new Drawing(this.imageData, {
       floating: options2.floating,
       docProperties: options2.altText,
@@ -11145,20 +11212,10 @@ class ImageRun extends Run {
   }
   prepForXml(context) {
     context.file.Media.addImage(this.key, this.imageData);
-    return super.prepForXml(context);
-  }
-  convertDataURIToBinary(dataURI) {
-    if (typeof atob === "function") {
-      const BASE64_MARKER = ";base64,";
-      const base64Index = dataURI.indexOf(BASE64_MARKER);
-      const base64IndexWithOffset = base64Index === -1 ? 0 : base64Index + BASE64_MARKER.length;
-      return new Uint8Array(
-        atob(dataURI.substring(base64IndexWithOffset)).split("").map((c) => c.charCodeAt(0))
-      );
-    } else {
-      const b = require("buffer");
-      return new b.Buffer(dataURI, "base64");
+    if (this.imageData.type === "svg") {
+      context.file.Media.addImage(this.fallbackKey, this.imageData.fallback);
     }
+    return super.prepForXml(context);
   }
 }
 class SequentialIdentifierInstruction extends XmlComponent {
@@ -12487,6 +12544,8 @@ class ParagraphProperties extends IgnoreIfEmptyXmlComponent {
         instance: (_a = options2.numbering.instance) != null ? _a : 0
       });
       this.push(new NumberProperties(`${options2.numbering.reference}-${(_b = options2.numbering.instance) != null ? _b : 0}`, options2.numbering.level));
+    } else if (options2.numbering === false) {
+      this.push(new NumberProperties(0, 0));
     }
     if (options2.border) {
       this.push(new Border(options2.border));
@@ -12671,9 +12730,9 @@ class MathLimitLocationAttributes extends XmlAttributeComponent {
   }
 }
 class MathLimitLocation extends XmlComponent {
-  constructor() {
+  constructor(value) {
     super("m:limLoc");
-    this.root.push(new MathLimitLocationAttributes({ value: "undOvr" }));
+    this.root.push(new MathLimitLocationAttributes({ value: value || "undOvr" }));
   }
 }
 class MathSubScriptHideAttributes extends XmlAttributeComponent {
@@ -12701,12 +12760,12 @@ class MathSuperScriptHide extends XmlComponent {
   }
 }
 class MathNAryProperties extends XmlComponent {
-  constructor(accent, hasSuperScript, hasSubScript) {
+  constructor(accent, hasSuperScript, hasSubScript, limitLocationVal) {
     super("m:naryPr");
     if (!!accent) {
       this.root.push(new MathAccentCharacter(accent));
     }
-    this.root.push(new MathLimitLocation());
+    this.root.push(new MathLimitLocation(limitLocationVal));
     if (!hasSuperScript) {
       this.root.push(new MathSuperScriptHide());
     }
@@ -12747,7 +12806,7 @@ class MathSum extends XmlComponent {
 class MathIntegral extends XmlComponent {
   constructor(options2) {
     super("m:nary");
-    this.root.push(new MathNAryProperties("", !!options2.superScript, !!options2.subScript));
+    this.root.push(new MathNAryProperties("", !!options2.superScript, !!options2.subScript, "subSup"));
     if (!!options2.subScript) {
       this.root.push(new MathSubScriptElement(options2.subScript));
     }
@@ -12757,6 +12816,28 @@ class MathIntegral extends XmlComponent {
     this.root.push(new MathBase(options2.children));
   }
 }
+class MathLimit extends XmlComponent {
+  constructor(children) {
+    super("m:lim");
+    for (const child of children) {
+      this.root.push(child);
+    }
+  }
+}
+class MathLimitUpper extends XmlComponent {
+  constructor(options2) {
+    super("m:limUpp");
+    this.root.push(new MathBase(options2.children));
+    this.root.push(new MathLimit(options2.limit));
+  }
+}
+class MathLimitLower extends XmlComponent {
+  constructor(options2) {
+    super("m:limLow");
+    this.root.push(new MathBase(options2.children));
+    this.root.push(new MathLimit(options2.limit));
+  }
+}
 class MathSuperScriptProperties extends XmlComponent {
   constructor() {
     super("m:sSupPr");
@@ -13571,6 +13652,7 @@ class ContentTypes extends XmlComponent {
     this.root.push(new Default("image/jpeg", "jpg"));
     this.root.push(new Default("image/bmp", "bmp"));
     this.root.push(new Default("image/gif", "gif"));
+    this.root.push(new Default("image/svg+xml", "svg"));
     this.root.push(new Default("application/vnd.openxmlformats-package.relationships+xml", "rels"));
     this.root.push(new Default("application/xml", "xml"));
     this.root.push(new Default("application/vnd.openxmlformats-officedocument.obfuscatedFont", "odttf"));
@@ -15450,7 +15532,7 @@ class File {
       defaultTabStop: options2.defaultTabStop
     });
     this.media = new Media();
-    if (options2.externalStyles) {
+    if (options2.externalStyles !== void 0) {
       const stylesFactory = new ExternalStylesFactory();
       this.styles = stylesFactory.newInstance(options2.externalStyles);
     } else if (options2.styles) {
@@ -18891,8 +18973,13 @@ class Compiler {
         zip.file(obj.path, obj.data);
       }
     }
-    for (const { stream, fileName } of file.Media.Array) {
-      zip.file(`word/media/${fileName}`, stream);
+    for (const data of file.Media.Array) {
+      if (data.type !== "svg") {
+        zip.file(`word/media/${data.fileName}`, data.data);
+      } else {
+        zip.file(`word/media/${data.fileName}`, data.data);
+        zip.file(`word/media/${data.fallback.fileName}`, data.fallback.data);
+      }
     }
     for (const { data: buffer2, name, fontKey } of file.FontTable.fontOptionsWithKey) {
       const [nameWithoutExtension] = name.split(".");
@@ -19477,64 +19564,6 @@ const splitRunElement = (runElement, token) => {
   });
   return { left: leftRunElement, right: rightRunElement };
 };
-const formatter = new Formatter();
-const SPLIT_TOKEN = "ɵ";
-const replacer = (json, patch, patchText, renderedParagraphs, context, keepOriginalStyles = false) => {
-  for (const renderedParagraph of renderedParagraphs) {
-    const textJson = patch.children.map((c) => toJson(xml$1(formatter.format(c, context)))).map((c) => c.elements[0]);
-    switch (patch.type) {
-      case PatchType.DOCUMENT: {
-        const parentElement = goToParentElementFromPath(json, renderedParagraph.path);
-        const elementIndex = getLastElementIndexFromPath(renderedParagraph.path);
-        parentElement.elements.splice(elementIndex, 1, ...textJson);
-        break;
-      }
-      case PatchType.PARAGRAPH:
-      default: {
-        const paragraphElement = goToElementFromPath(json, renderedParagraph.path);
-        replaceTokenInParagraphElement({
-          paragraphElement,
-          renderedParagraph,
-          originalText: patchText,
-          replacementText: SPLIT_TOKEN
-        });
-        const index = findRunElementIndexWithToken(paragraphElement, SPLIT_TOKEN);
-        const runElementToBeReplaced = paragraphElement.elements[index];
-        const { left, right } = splitRunElement(runElementToBeReplaced, SPLIT_TOKEN);
-        let newRunElements = textJson;
-        let patchedRightElement = right;
-        if (keepOriginalStyles) {
-          const runElementNonTextualElements = runElementToBeReplaced.elements.filter(
-            (e) => e.type === "element" && e.name !== "w:t"
-          );
-          newRunElements = textJson.map((e) => __spreadProps(__spreadValues({}, e), {
-            elements: [...runElementNonTextualElements, ...e.elements]
-          }));
-          patchedRightElement = __spreadProps(__spreadValues({}, right), {
-            elements: [...runElementNonTextualElements, ...right.elements]
-          });
-        }
-        paragraphElement.elements.splice(index, 1, left, ...newRunElements, patchedRightElement);
-        break;
-      }
-    }
-  }
-  return json;
-};
-const goToElementFromPath = (json, path) => {
-  let element2 = json;
-  for (let i = 1; i < path.length; i++) {
-    const index = path[i];
-    const nextElements = element2.elements;
-    if (!nextElements) {
-      throw new Error("Could not find element");
-    }
-    element2 = nextElements[index];
-  }
-  return element2;
-};
-const goToParentElementFromPath = (json, path) => goToElementFromPath(json, path.slice(0, path.length - 1));
-const getLastElementIndexFromPath = (path) => path[path.length - 1];
 const renderParagraphNode = (node) => {
   if (node.element.name !== "w:p") {
     throw new Error(`Invalid node type: ${node.element.name}`);
@@ -19544,7 +19573,7 @@ const renderParagraphNode = (node) => {
       text: "",
       runs: [],
       index: -1,
-      path: []
+      pathToParagraph: []
     };
   }
   let currentRunStringLength = 0;
@@ -19552,13 +19581,13 @@ const renderParagraphNode = (node) => {
     const renderedRunNode = renderRunNode(element2, i, currentRunStringLength);
     currentRunStringLength += renderedRunNode.text.length;
     return renderedRunNode;
-  }).filter((e) => !!e).map((e) => e);
+  }).filter((e) => !!e);
   const text = runs.reduce((acc, curr) => acc + curr.text, "");
   return {
     text,
     runs,
     index: node.index,
-    path: buildNodePath(node)
+    pathToParagraph: buildNodePath(node)
   };
 };
 const renderRunNode = (node, index, currentRunStringIndex) => {
@@ -19605,7 +19634,7 @@ const elementsToWrapper = (wrapper) => {
     parent: wrapper
   }))) != null ? _b : [];
 };
-const findLocationOfText = (node, text) => {
+const traverse = (node) => {
   let renderedParagraphs = [];
   const queue2 = [
     ...elementsToWrapper({
@@ -19623,8 +19652,74 @@ const findLocationOfText = (node, text) => {
       queue2.push(...elementsToWrapper(currentNode));
     }
   }
-  return renderedParagraphs.filter((p) => p.text.includes(text));
+  return renderedParagraphs;
+};
+const findLocationOfText = (node, text) => traverse(node).filter((p) => p.text.includes(text));
+const formatter = new Formatter();
+const SPLIT_TOKEN = "ɵ";
+const replacer = ({
+  json,
+  patch,
+  patchText,
+  context,
+  keepOriginalStyles = true
+}) => {
+  const renderedParagraphs = findLocationOfText(json, patchText);
+  if (renderedParagraphs.length === 0) {
+    throw new Error(`Could not find text ${patchText}`);
+  }
+  for (const renderedParagraph of renderedParagraphs) {
+    const textJson = patch.children.map((c) => toJson(xml$1(formatter.format(c, context)))).map((c) => c.elements[0]);
+    switch (patch.type) {
+      case PatchType.DOCUMENT: {
+        const parentElement = goToParentElementFromPath(json, renderedParagraph.pathToParagraph);
+        const elementIndex = getLastElementIndexFromPath(renderedParagraph.pathToParagraph);
+        parentElement.elements.splice(elementIndex, 1, ...textJson);
+        break;
+      }
+      case PatchType.PARAGRAPH:
+      default: {
+        const paragraphElement = goToElementFromPath(json, renderedParagraph.pathToParagraph);
+        replaceTokenInParagraphElement({
+          paragraphElement,
+          renderedParagraph,
+          originalText: patchText,
+          replacementText: SPLIT_TOKEN
+        });
+        const index = findRunElementIndexWithToken(paragraphElement, SPLIT_TOKEN);
+        const runElementToBeReplaced = paragraphElement.elements[index];
+        const { left, right } = splitRunElement(runElementToBeReplaced, SPLIT_TOKEN);
+        let newRunElements = textJson;
+        let patchedRightElement = right;
+        if (keepOriginalStyles) {
+          const runElementNonTextualElements = runElementToBeReplaced.elements.filter(
+            (e) => e.type === "element" && e.name !== "w:t"
+          );
+          newRunElements = textJson.map((e) => __spreadProps(__spreadValues({}, e), {
+            elements: [...runElementNonTextualElements, ...e.elements]
+          }));
+          patchedRightElement = __spreadProps(__spreadValues({}, right), {
+            elements: [...runElementNonTextualElements, ...right.elements]
+          });
+        }
+        paragraphElement.elements.splice(index, 1, left, ...newRunElements, patchedRightElement);
+        break;
+      }
+    }
+  }
+  return json;
+};
+const goToElementFromPath = (json, path) => {
+  let element2 = json;
+  for (let i = 1; i < path.length; i++) {
+    const index = path[i];
+    const nextElements = element2.elements;
+    element2 = nextElements[index];
+  }
+  return element2;
 };
+const goToParentElementFromPath = (json, path) => goToElementFromPath(json, path.slice(0, path.length - 1));
+const getLastElementIndexFromPath = (path) => path[path.length - 1];
 const getIdFromRelationshipId = (relationshipId) => {
   const output = parseInt(relationshipId.substring(3), 10);
   return isNaN(output) ? 0 : output;
@@ -19675,7 +19770,12 @@ const PatchType = {
   PARAGRAPH: "paragraph"
 };
 const imageReplacer = new ImageReplacer();
-const patchDocument = (data, options2) => __async(void 0, null, function* () {
+const patchDocument = (_0) => __async(void 0, [_0], function* ({
+  outputType,
+  data,
+  patches,
+  keepOriginalStyles
+}) {
   var _a, _b;
   const zipContent = yield JSZip.loadAsync(data);
   const contexts = /* @__PURE__ */ new Map();
@@ -19712,34 +19812,38 @@ const patchDocument = (data, options2) => __async(void 0, null, function* () {
         stack: []
       };
       contexts.set(key, context);
-      for (const [patchKey, patchValue] of Object.entries(options2.patches)) {
+      for (const [patchKey, patchValue] of Object.entries(patches)) {
         const patchText = `{{${patchKey}}}`;
-        const renderedParagraphs = findLocationOfText(json, patchText);
-        replacer(
-          json,
-          __spreadProps(__spreadValues({}, patchValue), {
-            children: patchValue.children.map((element2) => {
-              if (element2 instanceof ExternalHyperlink) {
-                const concreteHyperlink = new ConcreteHyperlink(element2.options.children, uniqueId());
-                hyperlinkRelationshipAdditions.push({
-                  key,
-                  hyperlink: {
-                    id: concreteHyperlink.linkId,
-                    link: element2.options.link
+        while (true) {
+          try {
+            replacer({
+              json,
+              patch: __spreadProps(__spreadValues({}, patchValue), {
+                children: patchValue.children.map((element2) => {
+                  if (element2 instanceof ExternalHyperlink) {
+                    const concreteHyperlink = new ConcreteHyperlink(element2.options.children, uniqueId());
+                    hyperlinkRelationshipAdditions.push({
+                      key,
+                      hyperlink: {
+                        id: concreteHyperlink.linkId,
+                        link: element2.options.link
+                      }
+                    });
+                    return concreteHyperlink;
+                  } else {
+                    return element2;
                   }
-                });
-                return concreteHyperlink;
-              } else {
-                return element2;
-              }
-            })
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          }),
-          patchText,
-          renderedParagraphs,
-          context,
-          options2.keepOriginalStyles
-        );
+                })
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              }),
+              patchText,
+              context,
+              keepOriginalStyles
+            });
+          } catch (e) {
+            break;
+          }
+        }
       }
       const mediaDatas = imageReplacer.getMediaData(JSON.stringify(json), context.file.Media);
       if (mediaDatas.length > 0) {
@@ -19791,6 +19895,7 @@ const patchDocument = (data, options2) => __async(void 0, null, function* () {
     appendContentType(contentTypesJson, "image/jpeg", "jpg");
     appendContentType(contentTypesJson, "image/bmp", "bmp");
     appendContentType(contentTypesJson, "image/gif", "gif");
+    appendContentType(contentTypesJson, "image/svg+xml", "svg");
   }
   const zip = new JSZip();
   for (const [key, value] of map) {
@@ -19800,11 +19905,11 @@ const patchDocument = (data, options2) => __async(void 0, null, function* () {
   for (const [key, value] of binaryContentMap) {
     zip.file(key, value);
   }
-  for (const { stream, fileName } of file.Media.Array) {
+  for (const { data: stream, fileName } of file.Media.Array) {
     zip.file(`word/media/${fileName}`, stream);
   }
   return zip.generateAsync({
-    type: "uint8array",
+    type: outputType,
     mimeType: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
     compression: "DEFLATE"
   });
@@ -19832,6 +19937,25 @@ const createRelationshipFile = () => ({
     }
   ]
 });
+const patchDetector = (_0) => __async(void 0, [_0], function* ({ data }) {
+  const zipContent = yield JSZip.loadAsync(data);
+  const patches = /* @__PURE__ */ new Set();
+  for (const [key, value] of Object.entries(zipContent.files)) {
+    if (!key.endsWith(".xml") && !key.endsWith(".rels")) {
+      continue;
+    }
+    if (key.startsWith("word/") && !key.endsWith(".xml.rels")) {
+      const json = toJson(yield value.async("text"));
+      traverse(json).forEach((p) => findPatchKeys(p.text).forEach((patch) => patches.add(patch)));
+    }
+  }
+  return Array.from(patches);
+});
+const findPatchKeys = (text) => {
+  var _a;
+  const pattern = new RegExp("(?<=\\{\\{).+?(?=\\}\\})", "gs");
+  return (_a = text.match(pattern)) != null ? _a : [];
+};
 export {
   AbstractNumbering,
   Alignment,
@@ -19886,6 +20010,7 @@ export {
   EndnoteReference,
   ExternalHyperlink,
   File,
+  FileChild,
   FootNoteReferenceRunAttributes,
   FootNotes,
   Footer2 as Footer,
@@ -19903,6 +20028,7 @@ export {
   HeaderWrapper,
   HeadingLevel,
   HeightRule,
+  HighlightColor,
   HorizontalPosition,
   HorizontalPositionAlign,
   HorizontalPositionRelativeFrom,
@@ -19938,7 +20064,10 @@ export {
   MathFunctionName,
   MathFunctionProperties,
   MathIntegral,
+  MathLimit,
   MathLimitLocation,
+  MathLimitLower,
+  MathLimitUpper,
   MathNAryProperties,
   MathNumerator,
   MathPreSubSuperScript,
@@ -20093,6 +20222,7 @@ export {
   hpsMeasureValue,
   longHexNumber,
   measurementOrPercentValue,
+  patchDetector,
   patchDocument,
   percentageValue,
   pointMeasureValue,