easy-template-x 6.2.2 → 6.2.3

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

@@ -202,8 +202,16 @@ function isNumber(value) {
 class Path {
   static getFilename(path) {
     const lastSlashIndex = path.lastIndexOf('/');
-    return path.substr(lastSlashIndex + 1);
+    return path.substring(lastSlashIndex + 1);
   }
+
+  /**
+   * Get the directory of a path. 
+   * Exclude the last slash.
+   * 
+   * Example:
+   * /folder/subfolder/file.txt -> /folder/subfolder
+   */
   static getDirectory(path) {
     const lastSlashIndex = path.lastIndexOf('/');
     return path.substring(0, lastSlashIndex);
@@ -461,6 +469,9 @@ class Zip {
     this.binaryFormat = binaryFormat;
   }
   getFile(path) {
+    if (path && path.startsWith('/')) {
+      path = path.substring(1);
+    }
     const internalZipObject = this.zip.files[path];
     if (!internalZipObject) return null;
     return new ZipObject(internalZipObject, this.binaryFormat);
@@ -872,7 +883,7 @@ let Modify$1 = class Modify {
   insertBefore(newNode, referenceNode) {
     if (!newNode) throw new InternalArgumentMissingError("newNode");
     if (!referenceNode) throw new InternalArgumentMissingError("referenceNode");
-    if (!referenceNode.parentNode) throw new Error(`'${"referenceNode"}' has no parent`);
+    if (!referenceNode.parentNode) throw new Error(`'referenceNode' has no parent`);
     const childNodes = referenceNode.parentNode.childNodes;
     const beforeNodeIndex = childNodes.indexOf(referenceNode);
     xml.modify.insertChild(referenceNode.parentNode, newNode, beforeNodeIndex);
@@ -887,7 +898,7 @@ let Modify$1 = class Modify {
   insertAfter(newNode, referenceNode) {
     if (!newNode) throw new InternalArgumentMissingError("newNode");
     if (!referenceNode) throw new InternalArgumentMissingError("referenceNode");
-    if (!referenceNode.parentNode) throw new Error(`'${"referenceNode"}' has no parent`);
+    if (!referenceNode.parentNode) throw new Error(`'referenceNode' has no parent`);
     const childNodes = referenceNode.parentNode.childNodes;
     const referenceNodeIndex = childNodes.indexOf(referenceNode);
     xml.modify.insertChild(referenceNode.parentNode, newNode, referenceNodeIndex + 1);
@@ -1024,7 +1035,7 @@ let Modify$1 = class Modify {
    * `false` then the original child node is the first child of `right`.
    */
   splitByChild(parent, child, removeChild) {
-    if (child.parentNode != parent) throw new Error(`Node '${"child"}' is not a direct child of '${"parent"}'.`);
+    if (child.parentNode != parent) throw new Error(`Node 'child' is not a direct child of 'parent'.`);
 
     // create childless clone 'left'
     const left = xml.create.cloneNode(parent, false);
@@ -1132,20 +1143,35 @@ const RelType = Object.freeze({
   Table: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table'
 });
 class Relationship {
-  static fromXml(xml) {
+  static fromXml(partDir, xml) {
     return new Relationship({
       id: xml.attributes?.['Id'],
       type: xml.attributes?.['Type'],
-      target: Relationship.normalizeRelTarget(xml.attributes?.['Target']),
+      target: Relationship.normalizeRelTarget(partDir, xml.attributes?.['Target']),
       targetMode: xml.attributes?.['TargetMode']
     });
   }
-  static normalizeRelTarget(target) {
+  static normalizeRelTarget(partDir, target) {
     if (!target) {
       return target;
     }
+
+    // Remove leading slashes from input
+    if (partDir.startsWith('/')) {
+      partDir = partDir.substring(1);
+    }
     if (target.startsWith('/')) {
-      return target.substring(1);
+      target = target.substring(1);
+    }
+
+    // Convert target to relative path
+    if (target.startsWith(partDir)) {
+      target = target.substring(partDir.length);
+    }
+
+    // Remove leading slashes from output
+    if (target.startsWith('/')) {
+      target = target.substring(1);
     }
     return target;
   }
@@ -1156,11 +1182,11 @@ class Relationship {
     const node = xml.create.generalNode('Relationship');
     node.attributes = {};
 
-    // set only non-empty attributes
+    // Set only non-empty attributes
     for (const propKey of Object.keys(this)) {
       const value = this[propKey];
       if (value && typeof value === 'string') {
-        const attrName = propKey[0].toUpperCase() + propKey.substr(1);
+        const attrName = propKey[0].toUpperCase() + propKey.substring(1);
         node.attributes[attrName] = value;
       }
     }
@@ -1365,20 +1391,20 @@ class RelsFile {
    * Returns the rel ID.
    */
   async add(relTarget, relType, relTargetMode) {
-    // if relTarget is an internal file it should be relative to the part dir
+    // If relTarget is an internal file it should be relative to the part dir
     if (this.partDir && relTarget.startsWith(this.partDir)) {
-      relTarget = relTarget.substr(this.partDir.length + 1);
+      relTarget = relTarget.substring(this.partDir.length + 1);
     }
 
-    // parse rels file
+    // Parse rels file
     await this.parseRelsFile();
 
-    // already exists?
+    // Already exists?
     const relTargetKey = this.getRelTargetKey(relType, relTarget);
     let relId = this.relTargets[relTargetKey];
     if (relId) return relId;
 
-    // create rel node
+    // Create rel node
     relId = this.getNextRelId();
     const rel = new Relationship({
       id: relId,
@@ -1387,11 +1413,11 @@ class RelsFile {
       targetMode: relTargetMode
     });
 
-    // update lookups
+    // Update lookups
     this.rels[relId] = rel;
     this.relTargets[relTargetKey] = relId;
 
-    // return
+    // Return
     return relId;
   }
   async list() {
@@ -1410,20 +1436,20 @@ class RelsFile {
    * Called automatically by the holding `Docx` before exporting.
    */
   async save() {
-    // not change - no need to save
+    // Not change - no need to save
     if (!this.rels) return;
 
-    // create rels xml
+    // Create rels xml
     const root = this.createRootNode();
     root.childNodes = Object.values(this.rels).map(rel => rel.toXml());
 
-    // serialize and save
+    // Serialize and save
     const xmlContent = xml.parser.serializeFile(root);
     this.zip.setFile(this.relsFilePath, xmlContent);
   }
 
   //
-  // private methods
+  // Private methods
   //
 
   getNextRelId() {
@@ -1435,10 +1461,10 @@ class RelsFile {
     return relId;
   }
   async parseRelsFile() {
-    // already parsed
+    // Already parsed
     if (this.rels) return;
 
-    // parse xml
+    // Parse xml
     let root;
     const relsFile = this.zip.getFile(this.relsFilePath);
     if (relsFile) {
@@ -1448,24 +1474,23 @@ class RelsFile {
       root = this.createRootNode();
     }
 
-    // parse relationship nodes
+    // Parse relationship nodes
     this.rels = {};
     this.relTargets = {};
     for (const relNode of root.childNodes) {
-      const attributes = relNode.attributes;
+      const genRelNode = relNode;
+      const attributes = genRelNode.attributes;
       if (!attributes) continue;
       const idAttr = attributes['Id'];
       if (!idAttr) continue;
 
-      // store rel
-      const rel = Relationship.fromXml(relNode);
+      // Store rel
+      const rel = Relationship.fromXml(this.partDir, genRelNode);
       this.rels[idAttr] = rel;
 
-      // create rel target lookup
-      const typeAttr = attributes['Type'];
-      const targetAttr = Relationship.normalizeRelTarget(attributes['Target']);
-      if (typeAttr && targetAttr) {
-        const relTargetKey = this.getRelTargetKey(typeAttr, targetAttr);
+      // Create rel target lookup
+      if (rel.type && rel.target) {
+        const relTargetKey = this.getRelTargetKey(rel.type, rel.target);
         this.relTargets[relTargetKey] = idAttr;
       }
     }
@@ -1521,7 +1546,7 @@ class OpenXmlPart {
   async getText() {
     const xmlDocument = await this.xmlRoot();
 
-    // ugly but good enough...
+    // Ugly but good enough...
     const xmlString = xml.parser.serializeFile(xmlDocument);
     const domDocument = xml.parser.domParse(xmlString);
     return domDocument.documentElement.textContent;
@@ -1836,7 +1861,7 @@ class Query {
    */
   containingTextNode(node) {
     if (!node) return null;
-    if (!xml.query.isTextNode(node)) throw new Error(`'Invalid argument ${"node"}. Expected a XmlTextNode.`);
+    if (!xml.query.isTextNode(node)) throw new Error(`'Invalid argument node. Expected a XmlTextNode.`);
     return xml.query.findParent(node, officeMarkup.query.isTextNode);
   }
 
@@ -1953,7 +1978,7 @@ class Modify {
   splitParagraphByTextNode(paragraph, textNode, removeTextNode) {
     // input validation
     const containingParagraph = officeMarkup.query.containingParagraphNode(textNode);
-    if (containingParagraph != paragraph) throw new Error(`Node '${"textNode"}' is not a descendant of '${"paragraph"}'.`);
+    if (containingParagraph != paragraph) throw new Error(`Node 'textNode' is not a contained in the specified paragraph.`);
     const runNode = officeMarkup.query.containingRunNode(textNode);
     const wordTextNode = officeMarkup.query.containingTextNode(textNode);
 
@@ -4654,7 +4679,7 @@ class Delimiters {
   constructor(initial) {
     Object.assign(this, initial);
     this.encodeAndValidate();
-    if (this.containerTagOpen === this.containerTagClose) throw new Error(`${"containerTagOpen"} can not be equal to ${"containerTagClose"}`);
+    if (this.containerTagOpen === this.containerTagClose) throw new Error(`containerTagOpen can not be equal to containerTagClose`);
   }
   encodeAndValidate() {
     const keys = ['tagStart', 'tagEnd', 'containerTagOpen', 'containerTagClose'];
@@ -4697,12 +4722,12 @@ class TemplateHandler {
   /**
    * Version number of the `easy-template-x` library.
    */
-  version = "6.2.2" ;
+  version = "6.2.3" ;
   constructor(options) {
     this.options = new TemplateHandlerOptions(options);
 
     //
-    // this is the library's composition root
+    // This is the library's composition root
     //
 
     const delimiterSearcher = new DelimiterSearcher();
@@ -4733,14 +4758,14 @@ class TemplateHandler {
   }
 
   //
-  // public methods
+  // Public methods
   //
 
   async process(templateFile, data) {
-    // load the docx file
+    // Load the docx file
     const docx = await Docx.load(templateFile);
 
-    // prepare context
+    // Prepare context
     const scopeData = new ScopeData(data);
     scopeData.scopeDataResolver = this.options.scopeDataResolver;
     const context = {
@@ -4755,18 +4780,18 @@ class TemplateHandler {
     for (const part of contentParts) {
       context.currentPart = part;
 
-      // extensions - before compilation
+      // Extensions - before compilation
       await this.callExtensions(this.options.extensions?.beforeCompilation, scopeData, context);
 
-      // compilation (do replacements)
+      // Compilation (do replacements)
       const xmlRoot = await part.xmlRoot();
       await this.compiler.compile(xmlRoot, scopeData, context);
 
-      // extensions - after compilation
+      // Extensions - after compilation
       await this.callExtensions(this.options.extensions?.afterCompilation, scopeData, context);
     }
 
-    // export the result
+    // Export the result
     return docx.export();
   }
   async parseTags(templateFile) {
@@ -4828,7 +4853,7 @@ class TemplateHandler {
   }
 
   //
-  // private methods
+  // Private methods
   //
 
   async callExtensions(extensions, scopeData, context) {

package/dist/es/easy-template-x.mjs

@@ -200,8 +200,16 @@ function isNumber(value) {
 class Path {
   static getFilename(path) {
     const lastSlashIndex = path.lastIndexOf('/');
-    return path.substr(lastSlashIndex + 1);
+    return path.substring(lastSlashIndex + 1);
   }
+
+  /**
+   * Get the directory of a path. 
+   * Exclude the last slash.
+   * 
+   * Example:
+   * /folder/subfolder/file.txt -> /folder/subfolder
+   */
   static getDirectory(path) {
     const lastSlashIndex = path.lastIndexOf('/');
     return path.substring(0, lastSlashIndex);
@@ -459,6 +467,9 @@ class Zip {
     this.binaryFormat = binaryFormat;
   }
   getFile(path) {
+    if (path && path.startsWith('/')) {
+      path = path.substring(1);
+    }
     const internalZipObject = this.zip.files[path];
     if (!internalZipObject) return null;
     return new ZipObject(internalZipObject, this.binaryFormat);
@@ -870,7 +881,7 @@ let Modify$1 = class Modify {
   insertBefore(newNode, referenceNode) {
     if (!newNode) throw new InternalArgumentMissingError("newNode");
     if (!referenceNode) throw new InternalArgumentMissingError("referenceNode");
-    if (!referenceNode.parentNode) throw new Error(`'${"referenceNode"}' has no parent`);
+    if (!referenceNode.parentNode) throw new Error(`'referenceNode' has no parent`);
     const childNodes = referenceNode.parentNode.childNodes;
     const beforeNodeIndex = childNodes.indexOf(referenceNode);
     xml.modify.insertChild(referenceNode.parentNode, newNode, beforeNodeIndex);
@@ -885,7 +896,7 @@ let Modify$1 = class Modify {
   insertAfter(newNode, referenceNode) {
     if (!newNode) throw new InternalArgumentMissingError("newNode");
     if (!referenceNode) throw new InternalArgumentMissingError("referenceNode");
-    if (!referenceNode.parentNode) throw new Error(`'${"referenceNode"}' has no parent`);
+    if (!referenceNode.parentNode) throw new Error(`'referenceNode' has no parent`);
     const childNodes = referenceNode.parentNode.childNodes;
     const referenceNodeIndex = childNodes.indexOf(referenceNode);
     xml.modify.insertChild(referenceNode.parentNode, newNode, referenceNodeIndex + 1);
@@ -1022,7 +1033,7 @@ let Modify$1 = class Modify {
    * `false` then the original child node is the first child of `right`.
    */
   splitByChild(parent, child, removeChild) {
-    if (child.parentNode != parent) throw new Error(`Node '${"child"}' is not a direct child of '${"parent"}'.`);
+    if (child.parentNode != parent) throw new Error(`Node 'child' is not a direct child of 'parent'.`);
 
     // create childless clone 'left'
     const left = xml.create.cloneNode(parent, false);
@@ -1130,20 +1141,35 @@ const RelType = Object.freeze({
   Table: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table'
 });
 class Relationship {
-  static fromXml(xml) {
+  static fromXml(partDir, xml) {
     return new Relationship({
       id: xml.attributes?.['Id'],
       type: xml.attributes?.['Type'],
-      target: Relationship.normalizeRelTarget(xml.attributes?.['Target']),
+      target: Relationship.normalizeRelTarget(partDir, xml.attributes?.['Target']),
       targetMode: xml.attributes?.['TargetMode']
     });
   }
-  static normalizeRelTarget(target) {
+  static normalizeRelTarget(partDir, target) {
     if (!target) {
       return target;
     }
+
+    // Remove leading slashes from input
+    if (partDir.startsWith('/')) {
+      partDir = partDir.substring(1);
+    }
     if (target.startsWith('/')) {
-      return target.substring(1);
+      target = target.substring(1);
+    }
+
+    // Convert target to relative path
+    if (target.startsWith(partDir)) {
+      target = target.substring(partDir.length);
+    }
+
+    // Remove leading slashes from output
+    if (target.startsWith('/')) {
+      target = target.substring(1);
     }
     return target;
   }
@@ -1154,11 +1180,11 @@ class Relationship {
     const node = xml.create.generalNode('Relationship');
     node.attributes = {};
 
-    // set only non-empty attributes
+    // Set only non-empty attributes
     for (const propKey of Object.keys(this)) {
       const value = this[propKey];
       if (value && typeof value === 'string') {
-        const attrName = propKey[0].toUpperCase() + propKey.substr(1);
+        const attrName = propKey[0].toUpperCase() + propKey.substring(1);
         node.attributes[attrName] = value;
       }
     }
@@ -1363,20 +1389,20 @@ class RelsFile {
    * Returns the rel ID.
    */
   async add(relTarget, relType, relTargetMode) {
-    // if relTarget is an internal file it should be relative to the part dir
+    // If relTarget is an internal file it should be relative to the part dir
     if (this.partDir && relTarget.startsWith(this.partDir)) {
-      relTarget = relTarget.substr(this.partDir.length + 1);
+      relTarget = relTarget.substring(this.partDir.length + 1);
     }
 
-    // parse rels file
+    // Parse rels file
     await this.parseRelsFile();
 
-    // already exists?
+    // Already exists?
     const relTargetKey = this.getRelTargetKey(relType, relTarget);
     let relId = this.relTargets[relTargetKey];
     if (relId) return relId;
 
-    // create rel node
+    // Create rel node
     relId = this.getNextRelId();
     const rel = new Relationship({
       id: relId,
@@ -1385,11 +1411,11 @@ class RelsFile {
       targetMode: relTargetMode
     });
 
-    // update lookups
+    // Update lookups
     this.rels[relId] = rel;
     this.relTargets[relTargetKey] = relId;
 
-    // return
+    // Return
     return relId;
   }
   async list() {
@@ -1408,20 +1434,20 @@ class RelsFile {
    * Called automatically by the holding `Docx` before exporting.
    */
   async save() {
-    // not change - no need to save
+    // Not change - no need to save
     if (!this.rels) return;
 
-    // create rels xml
+    // Create rels xml
     const root = this.createRootNode();
     root.childNodes = Object.values(this.rels).map(rel => rel.toXml());
 
-    // serialize and save
+    // Serialize and save
     const xmlContent = xml.parser.serializeFile(root);
     this.zip.setFile(this.relsFilePath, xmlContent);
   }
 
   //
-  // private methods
+  // Private methods
   //
 
   getNextRelId() {
@@ -1433,10 +1459,10 @@ class RelsFile {
     return relId;
   }
   async parseRelsFile() {
-    // already parsed
+    // Already parsed
     if (this.rels) return;
 
-    // parse xml
+    // Parse xml
     let root;
     const relsFile = this.zip.getFile(this.relsFilePath);
     if (relsFile) {
@@ -1446,24 +1472,23 @@ class RelsFile {
       root = this.createRootNode();
     }
 
-    // parse relationship nodes
+    // Parse relationship nodes
     this.rels = {};
     this.relTargets = {};
     for (const relNode of root.childNodes) {
-      const attributes = relNode.attributes;
+      const genRelNode = relNode;
+      const attributes = genRelNode.attributes;
       if (!attributes) continue;
       const idAttr = attributes['Id'];
       if (!idAttr) continue;
 
-      // store rel
-      const rel = Relationship.fromXml(relNode);
+      // Store rel
+      const rel = Relationship.fromXml(this.partDir, genRelNode);
       this.rels[idAttr] = rel;
 
-      // create rel target lookup
-      const typeAttr = attributes['Type'];
-      const targetAttr = Relationship.normalizeRelTarget(attributes['Target']);
-      if (typeAttr && targetAttr) {
-        const relTargetKey = this.getRelTargetKey(typeAttr, targetAttr);
+      // Create rel target lookup
+      if (rel.type && rel.target) {
+        const relTargetKey = this.getRelTargetKey(rel.type, rel.target);
         this.relTargets[relTargetKey] = idAttr;
       }
     }
@@ -1519,7 +1544,7 @@ class OpenXmlPart {
   async getText() {
     const xmlDocument = await this.xmlRoot();
 
-    // ugly but good enough...
+    // Ugly but good enough...
     const xmlString = xml.parser.serializeFile(xmlDocument);
     const domDocument = xml.parser.domParse(xmlString);
     return domDocument.documentElement.textContent;
@@ -1834,7 +1859,7 @@ class Query {
    */
   containingTextNode(node) {
     if (!node) return null;
-    if (!xml.query.isTextNode(node)) throw new Error(`'Invalid argument ${"node"}. Expected a XmlTextNode.`);
+    if (!xml.query.isTextNode(node)) throw new Error(`'Invalid argument node. Expected a XmlTextNode.`);
     return xml.query.findParent(node, officeMarkup.query.isTextNode);
   }
 
@@ -1951,7 +1976,7 @@ class Modify {
   splitParagraphByTextNode(paragraph, textNode, removeTextNode) {
     // input validation
     const containingParagraph = officeMarkup.query.containingParagraphNode(textNode);
-    if (containingParagraph != paragraph) throw new Error(`Node '${"textNode"}' is not a descendant of '${"paragraph"}'.`);
+    if (containingParagraph != paragraph) throw new Error(`Node 'textNode' is not a contained in the specified paragraph.`);
     const runNode = officeMarkup.query.containingRunNode(textNode);
     const wordTextNode = officeMarkup.query.containingTextNode(textNode);
 
@@ -4652,7 +4677,7 @@ class Delimiters {
   constructor(initial) {
     Object.assign(this, initial);
     this.encodeAndValidate();
-    if (this.containerTagOpen === this.containerTagClose) throw new Error(`${"containerTagOpen"} can not be equal to ${"containerTagClose"}`);
+    if (this.containerTagOpen === this.containerTagClose) throw new Error(`containerTagOpen can not be equal to containerTagClose`);
   }
   encodeAndValidate() {
     const keys = ['tagStart', 'tagEnd', 'containerTagOpen', 'containerTagClose'];
@@ -4695,12 +4720,12 @@ class TemplateHandler {
   /**
    * Version number of the `easy-template-x` library.
    */
-  version = "6.2.2" ;
+  version = "6.2.3" ;
   constructor(options) {
     this.options = new TemplateHandlerOptions(options);
 
     //
-    // this is the library's composition root
+    // This is the library's composition root
     //
 
     const delimiterSearcher = new DelimiterSearcher();
@@ -4731,14 +4756,14 @@ class TemplateHandler {
   }
 
   //
-  // public methods
+  // Public methods
   //
 
   async process(templateFile, data) {
-    // load the docx file
+    // Load the docx file
     const docx = await Docx.load(templateFile);
 
-    // prepare context
+    // Prepare context
     const scopeData = new ScopeData(data);
     scopeData.scopeDataResolver = this.options.scopeDataResolver;
     const context = {
@@ -4753,18 +4778,18 @@ class TemplateHandler {
     for (const part of contentParts) {
       context.currentPart = part;
 
-      // extensions - before compilation
+      // Extensions - before compilation
       await this.callExtensions(this.options.extensions?.beforeCompilation, scopeData, context);
 
-      // compilation (do replacements)
+      // Compilation (do replacements)
       const xmlRoot = await part.xmlRoot();
       await this.compiler.compile(xmlRoot, scopeData, context);
 
-      // extensions - after compilation
+      // Extensions - after compilation
       await this.callExtensions(this.options.extensions?.afterCompilation, scopeData, context);
     }
 
-    // export the result
+    // Export the result
     return docx.export();
   }
   async parseTags(templateFile) {
@@ -4826,7 +4851,7 @@ class TemplateHandler {
   }
 
   //
-  // private methods
+  // Private methods
   //
 
   async callExtensions(extensions, scopeData, context) {

package/dist/types/office/relationship.d.ts

@@ -15,8 +15,8 @@ export declare const RelType: Readonly<{
 }>;
 export type RelTargetMode = 'Internal' | 'External';
 export declare class Relationship {
-    static fromXml(xml: XmlGeneralNode): Relationship;
-    static normalizeRelTarget(target: string): string;
+    static fromXml(partDir: string, xml: XmlGeneralNode): Relationship;
+    static normalizeRelTarget(partDir: string, target: string): string;
     id: string;
     type: string;
     target: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-template-x",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "description": "Generate docx documents from templates, in Node or in the browser.",
   "keywords": [
     "docx",
@@ -42,7 +42,9 @@
     "clean": "rimraf .tmp dist test-reports && yarn clean-dist-verify",
     "typecheck": "tsc --noEmit",
     "lint": "eslint \"./{src,test}/**/!(*.d).ts\"",
-    "test": "jest --verbose",
+    "test": "vitest run",
+    "test-ui": "vitest --ui",
+    "test-watch": "vitest",
     "quality": "yarn typecheck && yarn lint && yarn test",
     "build-src": "rollup -c",
     "build-types": "tsc -p tsconfig.types.json --emitDeclarationOnly",
@@ -63,33 +65,28 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "7.26.10",
-    "@babel/preset-env": "7.26.9",
-    "@babel/preset-typescript": "7.26.0",
-    "@eslint/js": "9.22.0",
+    "@babel/core": "7.28.4",
+    "@babel/preset-env": "7.28.3",
+    "@babel/preset-typescript": "7.27.1",
+    "@eslint/js": "9.35.0",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-replace": "6.0.2",
     "@types/babel__preset-env": "7.10.0",
     "@types/eslint__js": "8.42.3",
-    "@types/jest": "29.5.14",
     "@types/jszip": "3.4.1",
-    "@types/node": "22.13.10",
-    "@types/ts-nameof": "4.2.5",
-    "babel-jest": "29.7.0",
+    "@types/node": "24.3.1",
+    "@vitest/ui": "2.1.8",
     "babel-loader": "10.0.0",
-    "babel-plugin-ts-nameof": "4.2.1",
-    "eslint": "9.22.0",
-    "globals": "16.0.0",
-    "jest": "29.7.0",
-    "jest-html-reporters": "3.1.7",
-    "jest-junit": "16.0.0",
+    "eslint": "9.35.0",
+    "globals": "16.3.0",
     "lorem-ipsum": "2.0.8",
     "rimraf": "6.0.1",
-    "rollup": "4.35.0",
+    "rollup": "4.50.1",
     "rollup-plugin-auto-external": "2.0.0",
     "rollup-plugin-babel": "4.4.0",
     "rollup-plugin-node-resolve": "5.2.0",
-    "typescript": "5.8.2",
-    "typescript-eslint": "8.26.1"
+    "typescript": "5.9.2",
+    "typescript-eslint": "8.42.0",
+    "vitest": "2.1.8"
   }
 }

package/src/compilation/tagParser.ts

@@ -13,7 +13,7 @@ export class TagParser {
 
     constructor(delimiters: Delimiters) {
         if (!delimiters)
-            throw new InternalArgumentMissingError(nameof(delimiters));
+            throw new InternalArgumentMissingError("delimiters");
 
         this.delimiters = delimiters;
 

package/src/delimiters.ts

@@ -14,7 +14,7 @@ export class Delimiters {
         this.encodeAndValidate();
 
         if (this.containerTagOpen === this.containerTagClose)
-            throw new Error(`${nameof(this.containerTagOpen)} can not be equal to ${nameof(this.containerTagClose)}`);
+            throw new Error(`containerTagOpen can not be equal to containerTagClose`);
     }
 
     private encodeAndValidate() {

package/src/office/officeMarkup.ts

@@ -116,7 +116,7 @@ class Query {
             return null;
 
         if (!xml.query.isTextNode(node))
-            throw new Error(`'Invalid argument ${nameof(node)}. Expected a XmlTextNode.`);
+            throw new Error(`'Invalid argument node. Expected a XmlTextNode.`);
 
         return xml.query.findParent(node, officeMarkup.query.isTextNode) as XmlGeneralNode;
     }
@@ -262,7 +262,7 @@ class Modify {
         // input validation
         const containingParagraph = officeMarkup.query.containingParagraphNode(textNode);
         if (containingParagraph != paragraph)
-            throw new Error(`Node '${nameof(textNode)}' is not a descendant of '${nameof(paragraph)}'.`);
+            throw new Error(`Node 'textNode' is not a contained in the specified paragraph.`);
 
         const runNode = officeMarkup.query.containingRunNode(textNode);
         const wordTextNode = officeMarkup.query.containingTextNode(textNode);

package/src/office/openXmlPart.ts

@@ -50,7 +50,7 @@ export class OpenXmlPart {
     public async getText(): Promise<string> {
         const xmlDocument = await this.xmlRoot();
 
-        // ugly but good enough...
+        // Ugly but good enough...
         const xmlString = xml.parser.serializeFile(xmlDocument);
         const domDocument = xml.parser.domParse(xmlString);
 

package/src/office/relationship.ts

@@ -23,22 +23,38 @@ export type RelTargetMode = 'Internal' | 'External';
 
 export class Relationship {
 
-    public static fromXml(xml: XmlGeneralNode): Relationship {
+    public static fromXml(partDir: string, xml: XmlGeneralNode): Relationship {
         return new Relationship({
             id: xml.attributes?.['Id'],
             type: xml.attributes?.['Type'],
-            target: Relationship.normalizeRelTarget(xml.attributes?.['Target']),
+            target: Relationship.normalizeRelTarget(partDir, xml.attributes?.['Target']),
             targetMode: xml.attributes?.['TargetMode'] as RelTargetMode,
         });
     }
 
-    public static normalizeRelTarget(target: string): string {
+    public static normalizeRelTarget(partDir: string, target: string): string {
         if (!target) {
             return target;
         }
+
+        // Remove leading slashes from input
+        if (partDir.startsWith('/')) {
+            partDir = partDir.substring(1);
+        }
+        if (target.startsWith('/')) {
+            target = target.substring(1);
+        }
+
+        // Convert target to relative path
+        if (target.startsWith(partDir)) {
+            target = target.substring(partDir.length);
+        }
+
+        // Remove leading slashes from output
         if (target.startsWith('/')) {
-            return target.substring(1);
+            target = target.substring(1);
         }
+
         return target;
     }
 
@@ -56,11 +72,11 @@ export class Relationship {
         const node = xml.create.generalNode('Relationship');
         node.attributes = {};
 
-        // set only non-empty attributes
+        // Set only non-empty attributes
         for (const propKey of Object.keys(this)) {
             const value = (this as any)[propKey];
             if (value && typeof value === 'string') {
-                const attrName = propKey[0].toUpperCase() + propKey.substr(1);
+                const attrName = propKey[0].toUpperCase() + propKey.substring(1);
                 node.attributes[attrName] = value;
             }
         }

package/src/office/relsFile.ts

@@ -31,21 +31,21 @@ export class RelsFile {
      */
     public async add(relTarget: string, relType: string, relTargetMode?: RelTargetMode): Promise<string> {
 
-        // if relTarget is an internal file it should be relative to the part dir
+        // If relTarget is an internal file it should be relative to the part dir
         if (this.partDir && relTarget.startsWith(this.partDir)) {
-            relTarget = relTarget.substr(this.partDir.length + 1);
+            relTarget = relTarget.substring(this.partDir.length + 1);
         }
 
-        // parse rels file
+        // Parse rels file
         await this.parseRelsFile();
 
-        // already exists?
+        // Already exists?
         const relTargetKey = this.getRelTargetKey(relType, relTarget);
         let relId = this.relTargets[relTargetKey];
         if (relId)
             return relId;
 
-        // create rel node
+        // Create rel node
         relId = this.getNextRelId();
         const rel = new Relationship({
             id: relId,
@@ -54,11 +54,11 @@ export class RelsFile {
             targetMode: relTargetMode
         });
 
-        // update lookups
+        // Update lookups
         this.rels[relId] = rel;
         this.relTargets[relTargetKey] = relId;
 
-        // return
+        // Return
         return relId;
     }
 
@@ -80,21 +80,21 @@ export class RelsFile {
      */
     public async save(): Promise<void> {
 
-        // not change - no need to save
+        // Not change - no need to save
         if (!this.rels)
             return;
 
-        // create rels xml
+        // Create rels xml
         const root = this.createRootNode();
         root.childNodes = Object.values(this.rels).map(rel => rel.toXml());
 
-        // serialize and save
+        // Serialize and save
         const xmlContent = xml.parser.serializeFile(root);
         this.zip.setFile(this.relsFilePath, xmlContent);
     }
 
     //
-    // private methods
+    // Private methods
     //
 
     private getNextRelId(): string {
@@ -110,11 +110,11 @@ export class RelsFile {
 
     private async parseRelsFile(): Promise<void> {
 
-        // already parsed
+        // Already parsed
         if (this.rels)
             return;
 
-        // parse xml
+        // Parse xml
         let root: XmlNode;
         const relsFile = this.zip.getFile(this.relsFilePath);
         if (relsFile) {
@@ -124,12 +124,13 @@ export class RelsFile {
             root = this.createRootNode();
         }
 
-        // parse relationship nodes
+        // Parse relationship nodes
         this.rels = {};
         this.relTargets = {};
         for (const relNode of root.childNodes) {
+            const genRelNode = relNode as XmlGeneralNode;
 
-            const attributes = (relNode as XmlGeneralNode).attributes;
+            const attributes = genRelNode.attributes;
             if (!attributes)
                 continue;
 
@@ -137,15 +138,13 @@ export class RelsFile {
             if (!idAttr)
                 continue;
 
-            // store rel
-            const rel = Relationship.fromXml(relNode as XmlGeneralNode);
+            // Store rel
+            const rel = Relationship.fromXml(this.partDir, genRelNode);
             this.rels[idAttr] = rel;
 
-            // create rel target lookup
-            const typeAttr = attributes['Type'];
-            const targetAttr = Relationship.normalizeRelTarget(attributes['Target']);
-            if (typeAttr && targetAttr) {
-                const relTargetKey = this.getRelTargetKey(typeAttr, targetAttr);
+            // Create rel target lookup
+            if (rel.type && rel.target) {
+                const relTargetKey = this.getRelTargetKey(rel.type, rel.target);
                 this.relTargets[relTargetKey] = idAttr;
             }
         }

package/src/templateHandler.ts

@@ -22,7 +22,7 @@ export class TemplateHandler {
         this.options = new TemplateHandlerOptions(options);
 
         //
-        // this is the library's composition root
+        // This is the library's composition root
         //
 
         const delimiterSearcher = new DelimiterSearcher();
@@ -64,15 +64,15 @@ export class TemplateHandler {
     }
 
     //
-    // public methods
+    // Public methods
     //
 
     public async process<T extends Binary>(templateFile: T, data: TemplateData): Promise<T> {
 
-        // load the docx file
+        // Load the docx file
         const docx = await Docx.load(templateFile);
 
-        // prepare context
+        // Prepare context
         const scopeData = new ScopeData(data);
         scopeData.scopeDataResolver = this.options.scopeDataResolver;
         const context: TemplateContext = {
@@ -89,18 +89,18 @@ export class TemplateHandler {
 
             context.currentPart = part;
 
-            // extensions - before compilation
+            // Extensions - before compilation
             await this.callExtensions(this.options.extensions?.beforeCompilation, scopeData, context);
 
-            // compilation (do replacements)
+            // Compilation (do replacements)
             const xmlRoot = await part.xmlRoot();
             await this.compiler.compile(xmlRoot, scopeData, context);
 
-            // extensions - after compilation
+            // Extensions - after compilation
             await this.callExtensions(this.options.extensions?.afterCompilation, scopeData, context);
         }
 
-        // export the result
+        // Export the result
         return docx.export();
     }
 
@@ -171,7 +171,7 @@ export class TemplateHandler {
     }
 
     //
-    // private methods
+    // Private methods
     //
 
     private async callExtensions(extensions: TemplateExtension[], scopeData: ScopeData, context: TemplateContext): Promise<void> {

package/src/utils/path.ts

@@ -2,9 +2,16 @@ export class Path {
 
     public static getFilename(path: string): string {
         const lastSlashIndex = path.lastIndexOf('/');
-        return path.substr(lastSlashIndex + 1);
+        return path.substring(lastSlashIndex + 1);
     }
 
+    /**
+     * Get the directory of a path. 
+     * Exclude the last slash.
+     * 
+     * Example:
+     * /folder/subfolder/file.txt -> /folder/subfolder
+     */
     public static getDirectory(path: string): string {
         const lastSlashIndex = path.lastIndexOf('/');
         return path.substring(0, lastSlashIndex);

package/src/xml/xml.ts

@@ -41,7 +41,7 @@ class Parser {
 
     public domParse(str: string): Document {
         if (str === null || str === undefined)
-            throw new InternalArgumentMissingError(nameof(str));
+            throw new InternalArgumentMissingError("str");
 
         return Parser.parser.parseFromString(str, "text/xml");
     }
@@ -53,7 +53,7 @@ class Parser {
      */
     public encodeValue(str: string): string {
         if (str === null || str === undefined)
-            throw new InternalArgumentMissingError(nameof(str));
+            throw new InternalArgumentMissingError("str");
         if (typeof str !== 'string')
             throw new TypeError(`Expected a string, got '${(str as any).constructor.name}'.`);
 
@@ -165,7 +165,7 @@ class Create {
 
     public cloneNode<T extends XmlNode>(node: T, deep: boolean): T {
         if (!node)
-            throw new InternalArgumentMissingError(nameof(node));
+            throw new InternalArgumentMissingError("node");
 
         if (!deep) {
             const clone = Object.assign({}, node);
@@ -339,9 +339,9 @@ class Query {
      */
     public siblingsInRange(firstNode: XmlNode, lastNode: XmlNode): XmlNode[] {
         if (!firstNode)
-            throw new InternalArgumentMissingError(nameof(firstNode));
+            throw new InternalArgumentMissingError("firstNode");
         if (!lastNode)
-            throw new InternalArgumentMissingError(nameof(lastNode));
+            throw new InternalArgumentMissingError("lastNode");
 
         const range: XmlNode[] = [];
         let curNode = firstNode;
@@ -380,12 +380,12 @@ class Modify {
      */
     public insertBefore(newNode: XmlNode, referenceNode: XmlNode): void {
         if (!newNode)
-            throw new InternalArgumentMissingError(nameof(newNode));
+            throw new InternalArgumentMissingError("newNode");
         if (!referenceNode)
-            throw new InternalArgumentMissingError(nameof(referenceNode));
+            throw new InternalArgumentMissingError("referenceNode");
 
         if (!referenceNode.parentNode)
-            throw new Error(`'${nameof(referenceNode)}' has no parent`);
+            throw new Error(`'referenceNode' has no parent`);
 
         const childNodes = referenceNode.parentNode.childNodes;
         const beforeNodeIndex = childNodes.indexOf(referenceNode);
@@ -400,12 +400,12 @@ class Modify {
      */
     public insertAfter(newNode: XmlNode, referenceNode: XmlNode): void {
         if (!newNode)
-            throw new InternalArgumentMissingError(nameof(newNode));
+            throw new InternalArgumentMissingError("newNode");
         if (!referenceNode)
-            throw new InternalArgumentMissingError(nameof(referenceNode));
+            throw new InternalArgumentMissingError("referenceNode");
 
         if (!referenceNode.parentNode)
-            throw new Error(`'${nameof(referenceNode)}' has no parent`);
+            throw new Error(`'referenceNode' has no parent`);
 
         const childNodes = referenceNode.parentNode.childNodes;
         const referenceNodeIndex = childNodes.indexOf(referenceNode);
@@ -414,11 +414,11 @@ class Modify {
 
     public insertChild(parent: XmlNode, child: XmlNode, childIndex: number): void {
         if (!parent)
-            throw new InternalArgumentMissingError(nameof(parent));
+            throw new InternalArgumentMissingError("parent");
         if (xml.query.isTextNode(parent))
             throw new Error('Appending children to text nodes is forbidden');
         if (!child)
-            throw new InternalArgumentMissingError(nameof(child));
+            throw new InternalArgumentMissingError("child");
 
         if (!parent.childNodes)
             parent.childNodes = [];
@@ -449,11 +449,11 @@ class Modify {
 
     public appendChild(parent: XmlNode, child: XmlNode): void {
         if (!parent)
-            throw new InternalArgumentMissingError(nameof(parent));
+            throw new InternalArgumentMissingError("parent");
         if (xml.query.isTextNode(parent))
             throw new Error('Appending children to text nodes is forbidden');
         if (!child)
-            throw new InternalArgumentMissingError(nameof(child));
+            throw new InternalArgumentMissingError("child");
 
         if (!parent.childNodes)
             parent.childNodes = [];
@@ -477,7 +477,7 @@ class Modify {
      */
     public remove(node: XmlNode): void {
         if (!node)
-            throw new InternalArgumentMissingError(nameof(node));
+            throw new InternalArgumentMissingError("node");
 
         if (!node.parentNode)
             throw new Error('Node has no parent');
@@ -497,9 +497,9 @@ class Modify {
     public removeChild(parent: XmlNode, childIndex: number): XmlNode;
     public removeChild(parent: XmlNode, childOrIndex: XmlNode | number): XmlNode {
         if (!parent)
-            throw new InternalArgumentMissingError(nameof(parent));
+            throw new InternalArgumentMissingError("parent");
         if (childOrIndex === null || childOrIndex === undefined)
-            throw new InternalArgumentMissingError(nameof(childOrIndex));
+            throw new InternalArgumentMissingError("childOrIndex");
 
         if (!parent.childNodes || !parent.childNodes.length)
             throw new Error('Parent node has node children');
@@ -579,7 +579,7 @@ class Modify {
     public splitByChild(parent: XmlNode, child: XmlNode, removeChild: boolean): [XmlNode, XmlNode] {
 
         if (child.parentNode != parent)
-            throw new Error(`Node '${nameof(child)}' is not a direct child of '${nameof(parent)}'.`);
+            throw new Error(`Node 'child' is not a direct child of 'parent'.`);
 
         // create childless clone 'left'
         const left = xml.create.cloneNode(parent, false);

package/src/zip/jsZipHelper.ts

@@ -10,7 +10,7 @@ export class JsZipHelper {
     public static toJsZipOutputType(binaryOrType: Binary | Constructor<Binary>): JSZip.OutputType {
 
         if (!binaryOrType)
-            throw new InternalArgumentMissingError(nameof(binaryOrType));
+            throw new InternalArgumentMissingError("binaryOrType");
 
         let binaryType: Constructor<Binary>;
         if (typeof binaryOrType === 'function') {

package/src/zip/zip.ts

@@ -19,6 +19,9 @@ export class Zip {
     }
 
     public getFile(path: string): ZipObject {
+        if (path && path.startsWith('/')) {
+            path = path.substring(1);
+        }
         const internalZipObject = this.zip.files[path];
         if (!internalZipObject)
             return null;