easy-template-x 3.2.0 → 4.0.0

package/dist/types/xml/xmlNode.d.ts

@@ -1,49 +1,58 @@
-import { IMap } from '../types';
-export declare enum XmlNodeType {
-    Text = "Text",
-    General = "General"
-}
-export declare type XmlNode = XmlTextNode | XmlGeneralNode;
-export interface XmlNodeBase {
-    nodeType: XmlNodeType;
-    nodeName: string;
-    parentNode?: XmlNode;
-    childNodes?: XmlNode[];
-    nextSibling?: XmlNode;
-}
-export declare const TEXT_NODE_NAME = "#text";
-export interface XmlTextNode extends XmlNodeBase {
-    nodeType: XmlNodeType.Text;
-    nodeName: typeof TEXT_NODE_NAME;
-    textContent: string;
-}
-export interface XmlGeneralNode extends XmlNodeBase {
-    nodeType: XmlNodeType.General;
-    attributes?: IMap<string>;
-}
-export declare const XmlNode: {
-    createTextNode(text?: string): XmlTextNode;
-    createGeneralNode(name: string): XmlGeneralNode;
-    encodeValue(str: string): string;
-    serialize(node: XmlNode): string;
-    fromDomNode(domNode: Node): XmlNode;
-    isTextNode(node: XmlNode): node is XmlTextNode;
-    cloneNode<T extends XmlNode>(node: T, deep: boolean): T;
-    insertBefore(newNode: XmlNode, referenceNode: XmlNode): void;
-    insertAfter(newNode: XmlNode, referenceNode: XmlNode): void;
-    insertChild(parent: XmlNode, child: XmlNode, childIndex: number): void;
-    appendChild(parent: XmlNode, child: XmlNode): void;
-    remove(node: XmlNode): void;
-    removeChild: typeof removeChild;
-    lastTextChild(node: XmlNode): XmlTextNode;
-    removeSiblings(from: XmlNode, to: XmlNode): XmlNode[];
-    splitByChild(parent: XmlNode, child: XmlNode, removeChild: boolean): [XmlNode, XmlNode];
-    findParent(node: XmlNode, predicate: (node: XmlNode) => boolean): XmlNode;
-    findParentByName(node: XmlNode, nodeName: string): XmlNode;
-    findChildByName(node: XmlNode, childName: string): XmlNode;
-    siblingsInRange(firstNode: XmlNode, lastNode: XmlNode): XmlNode[];
-    removeEmptyTextNodes(node: XmlNode): void;
-};
-declare function removeChild(parent: XmlNode, child: XmlNode): XmlNode;
-declare function removeChild(parent: XmlNode, childIndex: number): XmlNode;
-export {};
+import { IMap } from '../types';
+export declare enum XmlNodeType {
+    Text = "Text",
+    General = "General",
+    Comment = "Comment"
+}
+export type XmlNode = XmlTextNode | XmlGeneralNode | XmlCommentNode;
+export interface XmlNodeBase {
+    nodeType: XmlNodeType;
+    nodeName: string;
+    parentNode?: XmlNode;
+    childNodes?: XmlNode[];
+    nextSibling?: XmlNode;
+}
+export declare const TEXT_NODE_NAME = "#text";
+export declare const COMMENT_NODE_NAME = "#comment";
+export interface XmlTextNode extends XmlNodeBase {
+    nodeType: XmlNodeType.Text;
+    nodeName: typeof TEXT_NODE_NAME;
+    textContent: string;
+}
+export interface XmlCommentNode extends XmlNodeBase {
+    nodeType: XmlNodeType.Comment;
+    nodeName: typeof COMMENT_NODE_NAME;
+    commentContent: string;
+}
+export interface XmlGeneralNode extends XmlNodeBase {
+    nodeType: XmlNodeType.General;
+    attributes?: IMap<string>;
+}
+export declare const XmlNode: {
+    createTextNode(text?: string): XmlTextNode;
+    createGeneralNode(name: string): XmlGeneralNode;
+    createCommentNode(text?: string): XmlCommentNode;
+    encodeValue(str: string): string;
+    serialize(node: XmlNode): string;
+    fromDomNode(domNode: Node): XmlNode;
+    isTextNode(node: XmlNode): node is XmlTextNode;
+    isCommentNode(node: XmlNode): node is XmlCommentNode;
+    cloneNode<T extends XmlNode>(node: T, deep: boolean): T;
+    insertBefore(newNode: XmlNode, referenceNode: XmlNode): void;
+    insertAfter(newNode: XmlNode, referenceNode: XmlNode): void;
+    insertChild(parent: XmlNode, child: XmlNode, childIndex: number): void;
+    appendChild(parent: XmlNode, child: XmlNode): void;
+    remove(node: XmlNode): void;
+    removeChild: typeof removeChild;
+    lastTextChild(node: XmlNode): XmlTextNode;
+    removeSiblings(from: XmlNode, to: XmlNode): XmlNode[];
+    splitByChild(parent: XmlNode, child: XmlNode, removeChild: boolean): [XmlNode, XmlNode];
+    findParent(node: XmlNode, predicate: (node: XmlNode) => boolean): XmlNode;
+    findParentByName(node: XmlNode, nodeName: string): XmlNode;
+    findChildByName(node: XmlNode, childName: string): XmlNode;
+    siblingsInRange(firstNode: XmlNode, lastNode: XmlNode): XmlNode[];
+    removeEmptyTextNodes(node: XmlNode): void;
+};
+declare function removeChild(parent: XmlNode, child: XmlNode): XmlNode;
+declare function removeChild(parent: XmlNode, childIndex: number): XmlNode;
+export {};

package/dist/types/xml/xmlParser.d.ts

@@ -1,8 +1,8 @@
-import { XmlNode } from './xmlNode';
-export declare class XmlParser {
-    private static xmlHeader;
-    private static readonly parser;
-    parse(str: string): XmlNode;
-    domParse(str: string): Document;
-    serialize(xmlNode: XmlNode): string;
-}
+import { XmlNode } from './xmlNode';
+export declare class XmlParser {
+    private static xmlHeader;
+    private static readonly parser;
+    parse(str: string): XmlNode;
+    domParse(str: string): Document;
+    serialize(xmlNode: XmlNode): string;
+}

package/dist/types/zip/index.d.ts

@@ -1,2 +1,2 @@
-export * from './zip';
-export * from './zipObject';
+export * from './zip';
+export * from './zipObject';

package/dist/types/zip/jsZipHelper.d.ts

@@ -1,7 +1,7 @@
-import * as JSZip from 'jszip';
-import { Constructor } from '../types';
-import { Binary } from '../utils';
-export declare class JsZipHelper {
-    static toJsZipOutputType(binary: Binary): JSZip.OutputType;
-    static toJsZipOutputType(binaryType: Constructor<Binary>): JSZip.OutputType;
-}
+import * as JSZip from 'jszip';
+import { Constructor } from '../types';
+import { Binary } from '../utils';
+export declare class JsZipHelper {
+    static toJsZipOutputType(binary: Binary): JSZip.OutputType;
+    static toJsZipOutputType(binaryType: Constructor<Binary>): JSZip.OutputType;
+}

package/dist/types/zip/zip.d.ts

@@ -1,13 +1,13 @@
-import { Constructor } from '../types';
-import { Binary } from '../utils';
-import { ZipObject } from './zipObject';
-export declare class Zip {
-    private readonly zip;
-    static load(file: Binary): Promise<Zip>;
-    private constructor();
-    getFile(path: string): ZipObject;
-    setFile(path: string, content: string | Binary): void;
-    isFileExist(path: string): boolean;
-    listFiles(): string[];
-    export<T extends Binary>(outputType: Constructor<T>): Promise<T>;
-}
+import { Constructor } from '../types';
+import { Binary } from '../utils';
+import { ZipObject } from './zipObject';
+export declare class Zip {
+    private readonly zip;
+    static load(file: Binary): Promise<Zip>;
+    private constructor();
+    getFile(path: string): ZipObject;
+    setFile(path: string, content: string | Binary): void;
+    isFileExist(path: string): boolean;
+    listFiles(): string[];
+    export<T extends Binary>(outputType: Constructor<T>): Promise<T>;
+}

package/dist/types/zip/zipObject.d.ts

@@ -1,13 +1,13 @@
-import * as JSZip from 'jszip';
-import { Constructor } from '../types';
-import { Binary } from '../utils';
-export declare class ZipObject {
-    private readonly zipObject;
-    get name(): string;
-    set name(value: string);
-    get isDirectory(): boolean;
-    constructor(zipObject: JSZip.JSZipObject);
-    getContentText(): Promise<string>;
-    getContentBase64(): Promise<string>;
-    getContentBinary<T extends Binary>(outputType: Constructor<T>): Promise<T>;
-}
+import * as JSZip from 'jszip';
+import { Constructor } from '../types';
+import { Binary } from '../utils';
+export declare class ZipObject {
+    private readonly zipObject;
+    get name(): string;
+    set name(value: string);
+    get isDirectory(): boolean;
+    constructor(zipObject: JSZip.JSZipObject);
+    getContentText(): Promise<string>;
+    getContentBase64(): Promise<string>;
+    getContentBinary<T extends Binary>(outputType: Constructor<T>): Promise<T>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-template-x",
-  "version": "3.2.0",
+  "version": "4.0.0",
   "description": "Generate docx documents from templates, in Node or in the browser.",
   "keywords": [
     "docx",
@@ -20,6 +20,7 @@
   "bugs": {
     "url": "https://github.com/alonrbar/easy-template-x/issues"
   },
+  "type": "module",
   "main": "dist/cjs/easy-template-x.js",
   "module": "dist/es/easy-template-x.js",
   "typings": "dist/types/index.d.ts",
@@ -38,39 +39,44 @@
     "build": "yarn build-types && yarn build-src",
     "release": "yarn clean && yarn quality && yarn build"
   },
+  "packageManager": "yarn@4.3.1",
   "dependencies": {
-    "@xmldom/xmldom": "0.8.7",
+    "@xmldom/xmldom": "0.8.10",
+    "json5": "2.2.3",
     "jszip": "3.10.1",
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "7.18.6",
+    "@babel/core": "7.24.7",
     "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "7.18.6",
     "@babel/plugin-proposal-optional-catch-binding": "7.18.6",
     "@babel/plugin-proposal-optional-chaining": "7.18.6",
-    "@babel/plugin-transform-modules-commonjs": "7.18.6",
-    "@babel/preset-typescript": "7.18.6",
-    "@rollup/plugin-replace": "4.0.0",
-    "@types/jest": "28.1.4",
+    "@babel/plugin-transform-modules-commonjs": "7.24.7",
+    "@babel/preset-typescript": "7.24.7",
+    "@eslint/js": "9.6.0",
+    "@rollup/plugin-replace": "5.0.7",
+    "@types/eslint__js": "8.42.3",
+    "@types/jest": "29.5.12",
     "@types/jszip": "3.4.1",
-    "@types/node": "18.0.1",
-    "@types/ts-nameof": "4.2.1",
-    "@typescript-eslint/eslint-plugin": "5.30.4",
-    "@typescript-eslint/parser": "5.30.4",
-    "babel-jest": "28.1.2",
-    "babel-loader": "8.2.5",
+    "@types/node": "20.14.9",
+    "@types/ts-nameof": "4.2.5",
+    "babel-jest": "29.7.0",
+    "babel-loader": "9.1.3",
     "babel-plugin-ts-nameof": "4.2.1",
-    "eslint": "8.19.0",
-    "jest": "28.1.2",
-    "jest-junit": "14.0.0",
+    "eslint": "9.6.0",
+    "globals": "15.8.0",
+    "jest": "29.7.0",
+    "jest-html-reporters": "3.1.7",
+    "jest-junit": "16.0.0",
     "lorem-ipsum": "2.0.8",
-    "rimraf": "3.0.2",
-    "rollup": "2.75.7",
+    "rimraf": "5.0.7",
+    "rollup": "4.18.0",
     "rollup-plugin-auto-external": "2.0.0",
     "rollup-plugin-babel": "4.4.0",
     "rollup-plugin-node-resolve": "5.2.0",
-    "typescript": "4.7.4"
+    "typescript": "5.5.3",
+    "typescript-eslint": "7.15.0"
   }
 }

package/src/compilation/tag.ts

@@ -1,3 +1,4 @@
+import { IMap } from '../types';
 import { XmlTextNode } from '../xml';
 
 export enum TagDisposition {
@@ -6,12 +7,13 @@ export enum TagDisposition {
     SelfClosed = "SelfClosed"
 }
 
-export interface Tag {    
+export interface Tag {
     name: string;
+    options?: IMap<any>;
     /**
      * The full tag text, for instance: "{#my-tag}".
      */
     rawText: string;
     disposition: TagDisposition;
     xmlTextNode: XmlTextNode;
-}
+}

package/src/compilation/tagParser.ts

@@ -1,7 +1,8 @@
+import * as JSON5 from 'json5';
 import { Delimiters } from '../delimiters';
-import { MissingArgumentError, MissingCloseDelimiterError, MissingStartDelimiterError } from '../errors';
+import { MissingArgumentError, MissingCloseDelimiterError, MissingStartDelimiterError, TagOptionsParseError } from '../errors';
 import { DocxParser } from '../office';
-import { Regex } from '../utils';
+import { normalizeDoubleQuotes, Regex } from '../utils';
 import { DelimiterMark } from './delimiterMark';
 import { Tag, TagDisposition } from './tag';
 
@@ -18,7 +19,8 @@ export class TagParser {
         if (!delimiters)
             throw new MissingArgumentError(nameof(delimiters));
 
-        this.tagRegex = new RegExp(`^${Regex.escape(delimiters.tagStart)}(.*?)${Regex.escape(delimiters.tagEnd)}`, 'm');
+        const tagOptionsRegex = `${Regex.escape(delimiters.tagOptionsStart)}(?<tagOptions>.*?)${Regex.escape(delimiters.tagOptionsEnd)}`;
+        this.tagRegex = new RegExp(`^${Regex.escape(delimiters.tagStart)}(?<tagName>.*?)(${tagOptionsRegex})?${Regex.escape(delimiters.tagEnd)}`, 'm');
     }
 
     public parse(delimiters: DelimiterMark[]): Tag[] {
@@ -136,23 +138,40 @@ export class TagParser {
         tag.rawText = tag.xmlTextNode.textContent;
 
         const tagParts = this.tagRegex.exec(tag.rawText);
-        const tagContent = (tagParts[1] || '').trim();
-        if (!tagContent || !tagContent.length) {
+        const tagName = (tagParts.groups?.["tagName"] || '').trim();
+
+        // Ignoring empty tags.
+        if (!tagName?.length) {
             tag.disposition = TagDisposition.SelfClosed;
             return;
         }
 
-        if (tagContent.startsWith(this.delimiters.containerTagOpen)) {
+        // Tag options.
+        const tagOptionsText = (tagParts.groups?.["tagOptions"] || '').trim();
+        if (tagOptionsText) {
+            try {
+                tag.options = JSON5.parse("{" + normalizeDoubleQuotes(tagOptionsText) + "}");
+            } catch (e) {
+                throw new TagOptionsParseError(tag.rawText, e);
+            }
+        }
+
+        // Container open tag.
+        if (tagName.startsWith(this.delimiters.containerTagOpen)) {
             tag.disposition = TagDisposition.Open;
-            tag.name = tagContent.slice(this.delimiters.containerTagOpen.length).trim();
+            tag.name = tagName.slice(this.delimiters.containerTagOpen.length).trim();
+            return;
+        }
 
-        } else if (tagContent.startsWith(this.delimiters.containerTagClose)) {
+        // Container close tag.
+        if (tagName.startsWith(this.delimiters.containerTagClose)) {
             tag.disposition = TagDisposition.Close;
-            tag.name = tagContent.slice(this.delimiters.containerTagClose.length).trim();
-
-        } else {
-            tag.disposition = TagDisposition.SelfClosed;
-            tag.name = tagContent;
+            tag.name = tagName.slice(this.delimiters.containerTagClose.length).trim();
+            return;
         }
+
+        // Self-closed tag.
+        tag.disposition = TagDisposition.SelfClosed;
+        tag.name = tagName;
     }
 }

package/src/delimiters.ts

@@ -5,6 +5,8 @@ export class Delimiters {
     public tagEnd = "}";
     public containerTagOpen = "#";
     public containerTagClose = "/";
+    public tagOptionsStart = "[";
+    public tagOptionsEnd = "]";
 
     constructor(initial?: Partial<Delimiters>) {
         Object.assign(this, initial);
@@ -27,4 +29,4 @@ export class Delimiters {
                 throw new Error(`${key} can not contain leading or trailing whitespace.`);
         }
     }
-}
+}

package/src/errors/index.ts

@@ -3,6 +3,7 @@ export * from './maxXmlDepthError';
 export * from './missingArgumentError';
 export * from './missingCloseDelimiterError';
 export * from './missingStartDelimiterError';
+export * from './tagOptionsParseError';
 export * from './unclosedTagError';
 export * from './unidentifiedFileTypeError';
 export * from './unknownContentTypeError';

package/src/errors/malformedFileError.ts

@@ -6,8 +6,5 @@ export class MalformedFileError extends Error {
         super(`Malformed file detected. Make sure the file is a valid ${expectedFileType} file.`);
 
         this.expectedFileType = expectedFileType;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, MalformedFileError.prototype);
     }
-}
+}

package/src/errors/maxXmlDepthError.ts

@@ -6,8 +6,5 @@ export class MaxXmlDepthError extends Error {
         super(`XML maximum depth reached (max depth: ${maxDepth}).`);
 
         this.maxDepth = maxDepth;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, MaxXmlDepthError.prototype);
     }
-}
+}

package/src/errors/missingArgumentError.ts

@@ -6,8 +6,5 @@ export class MissingArgumentError extends Error {
         super(`Argument '${argName}' is missing.`);
 
         this.argName = argName;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, MissingArgumentError.prototype);
     }
-}
+}

package/src/errors/missingCloseDelimiterError.ts

@@ -6,8 +6,5 @@ export class MissingCloseDelimiterError extends Error {
         super(`Close delimiter is missing from '${openDelimiterText}'.`);
 
         this.openDelimiterText = openDelimiterText;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, MissingCloseDelimiterError.prototype);
     }
-}
+}

package/src/errors/missingStartDelimiterError.ts

@@ -6,8 +6,5 @@ export class MissingStartDelimiterError extends Error {
         super(`Open delimiter is missing from '${closeDelimiterText}'.`);
 
         this.closeDelimiterText = closeDelimiterText;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, MissingStartDelimiterError.prototype);
     }
-}
+}

package/src/errors/tagOptionsParseError.ts

@@ -0,0 +1,12 @@
+export class TagOptionsParseError extends Error {
+
+    public readonly tagRawText: string;
+    public readonly parseError: Error;
+
+    constructor(tagRawText: string, parseError: Error) {
+        super(`Failed to parse tag options of '${tagRawText}': ${parseError.message}.`);
+
+        this.tagRawText = tagRawText;
+        this.parseError = parseError;
+    }
+}

package/src/errors/unclosedTagError.ts

@@ -6,8 +6,5 @@ export class UnclosedTagError extends Error {
         super(`Tag '${tagName}' is never closed.`);
 
         this.tagName = tagName;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, UnclosedTagError.prototype);
     }
-}
+}

package/src/errors/unidentifiedFileTypeError.ts

@@ -1,8 +1,5 @@
 export class UnidentifiedFileTypeError extends Error {
     constructor() {
         super(`The filetype for this file could not be identified, is this file corrupted?`);
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, UnidentifiedFileTypeError.prototype);
     }
-}
+}

package/src/errors/unknownContentTypeError.ts

@@ -10,8 +10,5 @@ export class UnknownContentTypeError extends Error {
         this.contentType = contentType;
         this.tagRawText = tagRawText;
         this.path = path;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, UnknownContentTypeError.prototype);
     }
-}
+}

package/src/errors/unopenedTagError.ts

@@ -6,8 +6,5 @@ export class UnopenedTagError extends Error {
         super(`Tag '${tagName}' is closed but was never opened.`);
 
         this.tagName = tagName;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, UnopenedTagError.prototype);
     }
-}
+}

package/src/errors/unsupportedFileTypeError.ts

@@ -6,8 +6,5 @@ export class UnsupportedFileTypeError extends Error {
         super(`Filetype "${fileType}" is not supported.`);
 
         this.fileType = fileType;
-
-        // typescript hack: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-        Object.setPrototypeOf(this, UnsupportedFileTypeError.prototype);
     }
-}
+}

package/src/office/docx.ts

@@ -114,7 +114,10 @@ export class Docx {
         // find the last section properties
         // see: http://officeopenxml.com/WPsection.php
         const docRoot = await this.mainDocument.xmlRoot();
-        const body = docRoot.childNodes[0];
+        const body = docRoot.childNodes.find(node => node.nodeName == 'w:body');
+        if (body == null)
+            return null;
+
         const sectionProps = last(body.childNodes.filter(node => node.nodeType === XmlNodeType.General));
         if (sectionProps.nodeName != 'w:sectPr')
             return null;

package/src/office/docxParser.ts

@@ -208,8 +208,10 @@ export class DocxParser {
             }
             while (curWordTextNode) {
 
-                if (curWordTextNode.nodeName !== DocxParser.TEXT_NODE)
+                if (curWordTextNode.nodeName !== DocxParser.TEXT_NODE) {
+                    curWordTextNode = curWordTextNode.nextSibling;
                     continue;
+                }
 
                 // move text to first node
                 const curXmlTextNode = XmlNode.lastTextChild(curWordTextNode);

package/src/plugins/loop/loopPlugin.ts

@@ -29,7 +29,7 @@ export class LoopPlugin extends TemplatePlugin {
         // Non array value - treat as a boolean condition.
         const isCondition = !Array.isArray(value);
         if (isCondition) {
-            if (!!value) {
+            if (value) {
                 value = [{}];
             } else {
                 value = [];

package/src/plugins/loop/loopTagOptions.ts

@@ -0,0 +1,14 @@
+export enum LoopOver {
+    /**
+     * Loop over the entire row.
+     */
+    Row = 'row',
+    /**
+     * Loop over the content enclosed between the opening and closing tag.
+     */
+    Content = 'content'
+}
+
+export class LoopTagOptions {
+    public loopOver = LoopOver.Content;
+}

package/src/plugins/loop/strategy/loopTableStrategy.ts

@@ -1,6 +1,7 @@
 import { Tag } from '../../../compilation';
 import { XmlNode } from '../../../xml';
 import { PluginUtilities } from '../../templatePlugin';
+import { LoopOver, LoopTagOptions } from '../loopTagOptions';
 import { ILoopStrategy, SplitBeforeResult } from './iLoopStrategy';
 
 export class LoopTableStrategy implements ILoopStrategy {
@@ -12,10 +13,28 @@ export class LoopTableStrategy implements ILoopStrategy {
     }
 
     public isApplicable(openTag: Tag, closeTag: Tag): boolean {
-        const containingParagraph = this.utilities.docxParser.containingParagraphNode(openTag.xmlTextNode);
-        if (!containingParagraph.parentNode)
+        const openParagraph = this.utilities.docxParser.containingParagraphNode(openTag.xmlTextNode);
+        if (!openParagraph.parentNode)
             return false;
-        return this.utilities.docxParser.isTableCellNode(containingParagraph.parentNode);
+
+        if (!this.utilities.docxParser.isTableCellNode(openParagraph.parentNode))
+            return false;
+
+        const closeParagraph = this.utilities.docxParser.containingParagraphNode(closeTag.xmlTextNode);
+        if (!closeParagraph.parentNode)
+            return false;
+
+        if (!this.utilities.docxParser.isTableCellNode(closeParagraph.parentNode))
+            return false;
+
+        const options = openTag.options as LoopTagOptions;
+        const forceRowLoop = options?.loopOver === LoopOver.Row;
+
+        // If both tags are in the same cell, assume it's a paragraph loop (iterate content, not rows).
+        if (!forceRowLoop && openParagraph.parentNode === closeParagraph.parentNode)
+            return false;
+
+        return true;
     }
 
     public splitBefore(openTag: Tag, closeTag: Tag): SplitBeforeResult {

package/src/plugins/templatePlugin.ts

@@ -8,8 +8,6 @@ export interface PluginUtilities {
     xmlParser: XmlParser;
 }
 
-/* eslint-disable @typescript-eslint/member-ordering */
-
 export abstract class TemplatePlugin {
 
     /**

package/src/types.ts

@@ -1,7 +1,5 @@
 
-export interface IMap<T> {
-    [key: string]: T;
-}
+export type IMap<T> = Record<string, T>;
 
 export interface Constructor<T> {
     new(...args: any[]): T;