easy-template-x 6.2.0 → 6.2.1

package/README.md

@@ -14,7 +14,7 @@ Generate docx documents from templates, in Node or in the browser.
 >
 > ✓ PDF support  
 > ✓ REST API integration  
-> ✓ Zapier integration  
+> ✓ Zapier and Make integration  
 > ✓ Live preview functionality  
 > ✓ Easy-to-use UI  
 >

package/dist/cjs/easy-template-x.cjs

@@ -491,6 +491,71 @@ const XmlNodeType = Object.freeze({
 const TEXT_NODE_NAME = '#text'; // see: https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeName
 const COMMENT_NODE_NAME = '#comment';
 
+class XmlDepthTracker {
+  depth = 0;
+  constructor(maxDepth) {
+    this.maxDepth = maxDepth;
+  }
+  increment() {
+    this.depth++;
+    if (this.depth > this.maxDepth) {
+      throw new MaxXmlDepthError(this.maxDepth);
+    }
+  }
+  decrement() {
+    this.depth--;
+  }
+}
+
+class XmlTreeIterator {
+  get node() {
+    return this._current;
+  }
+  constructor(initial, maxDepth) {
+    if (!initial) {
+      throw new InternalError("Initial node is required");
+    }
+    if (!maxDepth) {
+      throw new InternalError("Max depth is required");
+    }
+    this._current = initial;
+    this.depthTracker = new XmlDepthTracker(maxDepth);
+  }
+  next() {
+    if (!this._current) {
+      return null;
+    }
+    this._current = this.findNextNode(this._current);
+    return this._current;
+  }
+  setCurrent(node) {
+    this._current = node;
+  }
+  findNextNode(node) {
+    // Children
+    if (node.childNodes && node.childNodes.length) {
+      this.depthTracker.increment();
+      return node.childNodes[0];
+    }
+
+    // Siblings
+    if (node.nextSibling) return node.nextSibling;
+
+    // Parent sibling
+    while (node.parentNode) {
+      if (node.parentNode.nextSibling) {
+        this.depthTracker.decrement();
+        return node.parentNode.nextSibling;
+      }
+
+      // Go up
+      this.depthTracker.decrement();
+      node = node.parentNode;
+    }
+    return null;
+  }
+}
+
 class XmlUtils {
   parser = new Parser();
   create = new Create();
@@ -690,16 +755,19 @@ let Query$1 = class Query {
   isTextNode(node) {
     if (node.nodeType === XmlNodeType.Text || node.nodeName === TEXT_NODE_NAME) {
       if (!(node.nodeType === XmlNodeType.Text && node.nodeName === TEXT_NODE_NAME)) {
-        throw new Error(`Invalid text node. Type: '${node.nodeType}', Name: '${node.nodeName}'.`);
+        throw new InternalError(`Invalid text node. Type: '${node.nodeType}', Name: '${node.nodeName}'.`);
       }
       return true;
     }
     return false;
   }
+  isGeneralNode(node) {
+    return node.nodeType === XmlNodeType.General;
+  }
   isCommentNode(node) {
     if (node.nodeType === XmlNodeType.Comment || node.nodeName === COMMENT_NODE_NAME) {
       if (!(node.nodeType === XmlNodeType.Comment && node.nodeName === COMMENT_NODE_NAME)) {
-        throw new Error(`Invalid comment node. Type: '${node.nodeType}', Name: '${node.nodeName}'.`);
+        throw new InternalError(`Invalid comment node. Type: '${node.nodeType}', Name: '${node.nodeName}'.`);
       }
       return true;
     }
@@ -778,6 +846,17 @@ let Query$1 = class Query {
     range.push(lastNode);
     return range;
   }
+  descendants(node, maxDepth, predicate) {
+    const result = [];
+    const it = new XmlTreeIterator(node, maxDepth);
+    while (it.node) {
+      if (predicate(it.node)) {
+        result.push(it.node);
+      }
+      it.next();
+    }
+    return result;
+  }
 };
 let Modify$1 = class Modify {
   /**
@@ -1030,22 +1109,6 @@ function recursiveRemoveEmptyTextNodes(node) {
 }
 const xml = new XmlUtils();
 
-class XmlDepthTracker {
-  depth = 0;
-  constructor(maxDepth) {
-    this.maxDepth = maxDepth;
-  }
-  increment() {
-    this.depth++;
-    if (this.depth > this.maxDepth) {
-      throw new MaxXmlDepthError(this.maxDepth);
-    }
-  }
-  decrement() {
-    this.depth--;
-  }
-}
-
 /**
  * The types of relationships that can be created in a docx file.
  * A non-comprehensive list.
@@ -1149,14 +1212,18 @@ class ContentTypesFile {
     this.zip = zip;
   }
   async ensureContentType(mime) {
-    // parse the content types file
+    // Parse the content types file
     await this.parseContentTypesFile();
 
-    // already exists
+    // Mime type already exists
     if (this.contentTypes[mime]) return;
 
-    // add new
+    // Extension already exists
+    // Unfortunately, this can happen in real life so we need to handle it.
     const extension = MimeTypeHelper.getDefaultExtension(mime);
+    if (Object.values(this.contentTypes).includes(extension)) return;
+
+    // Add new node
     const typeNode = xml.create.generalNode('Default');
     typeNode.attributes = {
       "Extension": extension,
@@ -1164,9 +1231,9 @@ class ContentTypesFile {
     };
     this.root.childNodes.push(typeNode);
 
-    // update state
+    // Update state
     this.addedNew = true;
-    this.contentTypes[mime] = true;
+    this.contentTypes[mime] = extension;
   }
   async count() {
     await this.parseContentTypesFile();
@@ -1178,7 +1245,7 @@ class ContentTypesFile {
    * Called automatically by the holding `Docx` before exporting.
    */
   async save() {
-    // not change - no need to save
+    // Not change - no need to save
     if (!this.addedNew) return;
     const xmlContent = xml.parser.serializeFile(this.root);
     this.zip.setFile(ContentTypesFile.contentTypesFilePath, xmlContent);
@@ -1197,7 +1264,9 @@ class ContentTypesFile {
       const genNode = node;
       const contentTypeAttribute = genNode.attributes['ContentType'];
       if (!contentTypeAttribute) continue;
-      this.contentTypes[contentTypeAttribute] = true;
+      const extensionAttribute = genNode.attributes['Extension'];
+      if (!extensionAttribute) continue;
+      this.contentTypes[contentTypeAttribute] = extensionAttribute;
     }
   }
 }
@@ -2168,30 +2237,30 @@ class DelimiterSearcher {
 
     const delimiters = [];
     const match = new MatchState();
-    const depth = new XmlDepthTracker(this.maxXmlDepth);
+    const it = new XmlTreeIterator(node, this.maxXmlDepth);
     let lookForOpenDelimiter = true;
-    while (node) {
+    while (it.node) {
       // Reset state on paragraph transition
-      if (officeMarkup.query.isParagraphNode(node)) {
+      if (officeMarkup.query.isParagraphNode(it.node)) {
         match.reset();
       }
 
       // Skip irrelevant nodes
-      if (!this.shouldSearchNode(node)) {
-        node = this.findNextNode(node, depth);
+      if (!this.shouldSearchNode(it)) {
+        it.next();
         continue;
       }
 
       // Search delimiters in text nodes
-      match.openNodes.push(node);
+      match.openNodes.push(it.node);
       let textIndex = 0;
-      while (textIndex < node.textContent.length) {
+      while (textIndex < it.node.textContent.length) {
         const delimiterPattern = lookForOpenDelimiter ? this.startDelimiter : this.endDelimiter;
-        const char = node.textContent[textIndex];
+        const char = it.node.textContent[textIndex];
 
         // No match
         if (char !== delimiterPattern[match.delimiterIndex]) {
-          [node, textIndex] = this.noMatch(node, textIndex, match);
+          textIndex = this.noMatch(it, textIndex, match);
           textIndex++;
           continue;
         }
@@ -2209,14 +2278,14 @@ class DelimiterSearcher {
         }
 
         // Full delimiter match
-        [node, textIndex, lookForOpenDelimiter] = this.fullMatch(node, textIndex, lookForOpenDelimiter, match, delimiters);
+        [textIndex, lookForOpenDelimiter] = this.fullMatch(it, textIndex, lookForOpenDelimiter, match, delimiters);
         textIndex++;
       }
-      node = this.findNextNode(node, depth);
+      it.next();
     }
     return delimiters;
   }
-  noMatch(node, textIndex, match) {
+  noMatch(it, textIndex, match) {
     //
     // Go back to first open node
     //
@@ -2226,25 +2295,26 @@ class DelimiterSearcher {
     // Delimiter is '{!' and template text contains the string '{{!'
     //
     if (match.firstMatchIndex !== -1) {
-      node = first(match.openNodes);
+      const node = first(match.openNodes);
+      it.setCurrent(node);
       textIndex = match.firstMatchIndex;
     }
 
     // Update state
     match.reset();
-    if (textIndex < node.textContent.length - 1) {
-      match.openNodes.push(node);
+    if (textIndex < it.node.textContent.length - 1) {
+      match.openNodes.push(it.node);
     }
-    return [node, textIndex];
+    return textIndex;
   }
-  fullMatch(node, textIndex, lookForOpenDelimiter, match, delimiters) {
+  fullMatch(it, textIndex, lookForOpenDelimiter, match, delimiters) {
     // Move all delimiters characters to the same text node
     if (match.openNodes.length > 1) {
       const firstNode = first(match.openNodes);
       const lastNode = last(match.openNodes);
       officeMarkup.modify.joinTextNodesRange(firstNode, lastNode);
-      textIndex += firstNode.textContent.length - node.textContent.length;
-      node = firstNode;
+      textIndex += firstNode.textContent.length - it.node.textContent.length;
+      it.setCurrent(firstNode);
     }
 
     // Store delimiter
@@ -2254,41 +2324,18 @@ class DelimiterSearcher {
     // Update state
     lookForOpenDelimiter = !lookForOpenDelimiter;
     match.reset();
-    if (textIndex < node.textContent.length - 1) {
-      match.openNodes.push(node);
+    if (textIndex < it.node.textContent.length - 1) {
+      match.openNodes.push(it.node);
     }
-    return [node, textIndex, lookForOpenDelimiter];
+    return [textIndex, lookForOpenDelimiter];
   }
-  shouldSearchNode(node) {
-    if (!xml.query.isTextNode(node)) return false;
-    if (!node.textContent) return false;
-    if (!node.parentNode) return false;
-    if (!officeMarkup.query.isTextNode(node.parentNode)) return false;
+  shouldSearchNode(it) {
+    if (!xml.query.isTextNode(it.node)) return false;
+    if (!it.node.textContent) return false;
+    if (!it.node.parentNode) return false;
+    if (!officeMarkup.query.isTextNode(it.node.parentNode)) return false;
     return true;
   }
-  findNextNode(node, depth) {
-    // Children
-    if (node.childNodes && node.childNodes.length) {
-      depth.increment();
-      return node.childNodes[0];
-    }
-
-    // Siblings
-    if (node.nextSibling) return node.nextSibling;
-
-    // Parent sibling
-    while (node.parentNode) {
-      if (node.parentNode.nextSibling) {
-        depth.decrement();
-        return node.parentNode.nextSibling;
-      }
-
-      // Go up
-      depth.decrement();
-      node = node.parentNode;
-    }
-    return null;
-  }
   createDelimiterMark(match, isOpenDelimiter) {
     return {
       index: match.firstMatchIndex,
@@ -2529,17 +2576,6 @@ class TemplatePlugin {
   }
 }
 
-/**
- * Apparently it is not that important for the ID to be unique...
- * Word displays two images correctly even if they both have the same ID.
- * Further more, Word will assign each a unique ID upon saving (it assigns
- * consecutive integers starting with 1).
- *
- * Note: The same principal applies to image names.
- *
- * Tested in Word v1908
- */
-let nextImageId = 1;
 class ImagePlugin extends TemplatePlugin {
   contentType = 'image';
   async simpleTagReplacements(tag, data, context) {
@@ -2556,12 +2592,49 @@ class ImagePlugin extends TemplatePlugin {
     await context.docx.contentTypes.ensureContentType(content.format);
 
     // Create the xml markup
-    const imageId = nextImageId++;
+    const imageId = await this.getNextImageId(context);
     const imageXml = this.createMarkup(imageId, relId, content);
     const wordTextNode = officeMarkup.query.containingTextNode(tag.xmlTextNode);
     xml.modify.insertAfter(imageXml, wordTextNode);
     officeMarkup.modify.removeTag(tag.xmlTextNode);
   }
+  async getNextImageId(context) {
+    // Init plugin context.
+    if (!context.pluginContext[this.contentType]) {
+      context.pluginContext[this.contentType] = {};
+    }
+    if (!context.pluginContext[this.contentType]) {
+      context.pluginContext[this.contentType] = {};
+    }
+    const pluginContext = context.pluginContext[this.contentType];
+    if (!pluginContext.lastDrawingObjectId) {
+      pluginContext.lastDrawingObjectId = {};
+    }
+    const lastIdMap = pluginContext.lastDrawingObjectId;
+
+    // Get next image ID if already initialized.
+    if (lastIdMap[context.currentPart.path]) {
+      lastIdMap[context.currentPart.path]++;
+      return lastIdMap[context.currentPart.path];
+    }
+
+    // Init next image ID.
+    const partRoot = await context.currentPart.xmlRoot();
+    const maxDepth = context.options.maxXmlDepth;
+
+    // Get all existing doc props IDs
+    // (docPr stands for "Drawing Object Non-Visual Properties", which isn't
+    // exactly a good acronym but that's how it's called nevertheless)
+    const docProps = xml.query.descendants(partRoot, maxDepth, node => {
+      return xml.query.isGeneralNode(node) && node.nodeName === 'wp:docPr';
+    });
+
+    // Start counting from the current max
+    const ids = docProps.map(prop => parseInt(prop.attributes.id)).filter(isNumber);
+    const maxId = Math.max(...ids, 0);
+    lastIdMap[context.currentPart.path] = maxId + 1;
+    return lastIdMap[context.currentPart.path];
+  }
   createMarkup(imageId, relId, content) {
     // http://officeopenxml.com/drwPicInline.php
 
@@ -4618,7 +4691,7 @@ class TemplateHandler {
   /**
    * Version number of the `easy-template-x` library.
    */
-  version = "6.2.0" ;
+  version = "6.2.1" ;
   constructor(options) {
     this.options = new TemplateHandlerOptions(options);
 
@@ -4666,7 +4739,11 @@ class TemplateHandler {
     scopeData.scopeDataResolver = this.options.scopeDataResolver;
     const context = {
       docx,
-      currentPart: null
+      currentPart: null,
+      pluginContext: {},
+      options: {
+        maxXmlDepth: this.options.maxXmlDepth
+      }
     };
     const contentParts = await docx.getContentParts();
     for (const part of contentParts) {
@@ -4806,6 +4883,7 @@ exports.UnsupportedFileTypeError = UnsupportedFileTypeError;
 exports.Xlsx = Xlsx;
 exports.XmlDepthTracker = XmlDepthTracker;
 exports.XmlNodeType = XmlNodeType;
+exports.XmlTreeIterator = XmlTreeIterator;
 exports.XmlUtils = XmlUtils;
 exports.Zip = Zip;
 exports.ZipObject = ZipObject;