easy-template-x 7.2.3 → 7.2.4

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

@@ -543,7 +543,13 @@ class Parser {
       return '';
     });
   }
-  serializeNode(node) {
+  serializeNode(node, options) {
+    return this._serializeNode(node, 0, options);
+  }
+  serializeFile(xmlNode) {
+    return Parser.xmlFileHeader + xml.parser.serializeNode(xmlNode);
+  }
+  _serializeNode(node, depth, options) {
     if (!node) return '';
     if (xml.query.isTextNode(node)) return xml.parser.encodeValue(node.textContent || '');
     if (xml.query.isCommentNode(node)) {
@@ -563,21 +569,27 @@ class Parser {
     const hasChildren = (node.childNodes || []).length > 0;
     const suffix = hasChildren ? '' : '/';
     const openTag = `<${node.nodeName}${attributes}${suffix}>`;
-    let xmlString;
-    if (hasChildren) {
-      // child nodes
-      const childrenXml = node.childNodes.map(child => xml.parser.serializeNode(child)).join('');
-
-      // close tag
-      const closeTag = `</${node.nodeName}>`;
-      xmlString = openTag + childrenXml + closeTag;
-    } else {
-      xmlString = openTag;
+
+    // No children
+    if (!hasChildren) {
+      return openTag;
     }
-    return xmlString;
-  }
-  serializeFile(xmlNode) {
-    return Parser.xmlFileHeader + xml.parser.serializeNode(xmlNode);
+
+    // Close tag
+    const closeTag = `</${node.nodeName}>`;
+
+    // Children without indentation
+    const indentSize = options?.indent ?? 0;
+    if (!indentSize || node.childNodes.every(xml.query.isTextNode)) {
+      const childrenXml = node.childNodes.map(child => this._serializeNode(child, depth + 1, options)).join('');
+      return openTag + childrenXml + closeTag;
+    }
+
+    // Children with indentation
+    const childIndent = "\n" + " ".repeat((depth + 1) * indentSize);
+    const childrenXml = node.childNodes.map(child => `${childIndent}${this._serializeNode(child, depth + 1, options)}`).join("");
+    const closeIndent = "\n" + " ".repeat(depth * indentSize);
+    return openTag + childrenXml + closeIndent + closeTag;
   }
 }
 class Create {
@@ -908,19 +920,19 @@ let Modify$1 = class Modify {
   removeChild(parent, childOrIndex) {
     if (!parent) throw new InternalArgumentMissingError("parent");
     if (childOrIndex === null || childOrIndex === undefined) throw new InternalArgumentMissingError("childOrIndex");
-    if (!parent.childNodes || !parent.childNodes.length) throw new Error('Parent node has node children');
+    if (!parent.childNodes || !parent.childNodes.length) throw new Error('Parent node has no children');
 
-    // get child index
+    // Get child index
     let childIndex;
     if (typeof childOrIndex === 'number') {
       childIndex = childOrIndex;
     } else {
       childIndex = parent.childNodes.indexOf(childOrIndex);
-      if (childIndex === -1) throw new Error('Specified child node is not a child of the specified parent');
+      if (childIndex === -1) throw new Error('Selected child node is not a child of the specified parent');
     }
     if (childIndex >= parent.childNodes.length) throw new RangeError(`Child index ${childIndex} is out of range. Parent has only ${parent.childNodes.length} child nodes.`);
 
-    // update references
+    // Update references
     const child = parent.childNodes[childIndex];
     if (childIndex > 0) {
       const beforeChild = parent.childNodes[childIndex - 1];
@@ -929,7 +941,7 @@ let Modify$1 = class Modify {
     child.parentNode = null;
     child.nextSibling = null;
 
-    // remove and return
+    // Remove and return
     return parent.childNodes.splice(childIndex, 1)[0];
   }
   removeChildren(parent, predicate) {
@@ -5312,7 +5324,7 @@ class TemplateHandler {
   /**
    * Version number of the `easy-template-x` library.
    */
-  version = "7.2.3" ;
+  version = "7.2.4" ;
   constructor(options) {
     this.options = new TemplateHandlerOptions(options);
     const delimiters = this.options.delimiters;

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

@@ -541,7 +541,13 @@ class Parser {
       return '';
     });
   }
-  serializeNode(node) {
+  serializeNode(node, options) {
+    return this._serializeNode(node, 0, options);
+  }
+  serializeFile(xmlNode) {
+    return Parser.xmlFileHeader + xml.parser.serializeNode(xmlNode);
+  }
+  _serializeNode(node, depth, options) {
     if (!node) return '';
     if (xml.query.isTextNode(node)) return xml.parser.encodeValue(node.textContent || '');
     if (xml.query.isCommentNode(node)) {
@@ -561,21 +567,27 @@ class Parser {
     const hasChildren = (node.childNodes || []).length > 0;
     const suffix = hasChildren ? '' : '/';
     const openTag = `<${node.nodeName}${attributes}${suffix}>`;
-    let xmlString;
-    if (hasChildren) {
-      // child nodes
-      const childrenXml = node.childNodes.map(child => xml.parser.serializeNode(child)).join('');
-
-      // close tag
-      const closeTag = `</${node.nodeName}>`;
-      xmlString = openTag + childrenXml + closeTag;
-    } else {
-      xmlString = openTag;
+
+    // No children
+    if (!hasChildren) {
+      return openTag;
     }
-    return xmlString;
-  }
-  serializeFile(xmlNode) {
-    return Parser.xmlFileHeader + xml.parser.serializeNode(xmlNode);
+
+    // Close tag
+    const closeTag = `</${node.nodeName}>`;
+
+    // Children without indentation
+    const indentSize = options?.indent ?? 0;
+    if (!indentSize || node.childNodes.every(xml.query.isTextNode)) {
+      const childrenXml = node.childNodes.map(child => this._serializeNode(child, depth + 1, options)).join('');
+      return openTag + childrenXml + closeTag;
+    }
+
+    // Children with indentation
+    const childIndent = "\n" + " ".repeat((depth + 1) * indentSize);
+    const childrenXml = node.childNodes.map(child => `${childIndent}${this._serializeNode(child, depth + 1, options)}`).join("");
+    const closeIndent = "\n" + " ".repeat(depth * indentSize);
+    return openTag + childrenXml + closeIndent + closeTag;
   }
 }
 class Create {
@@ -906,19 +918,19 @@ let Modify$1 = class Modify {
   removeChild(parent, childOrIndex) {
     if (!parent) throw new InternalArgumentMissingError("parent");
     if (childOrIndex === null || childOrIndex === undefined) throw new InternalArgumentMissingError("childOrIndex");
-    if (!parent.childNodes || !parent.childNodes.length) throw new Error('Parent node has node children');
+    if (!parent.childNodes || !parent.childNodes.length) throw new Error('Parent node has no children');
 
-    // get child index
+    // Get child index
     let childIndex;
     if (typeof childOrIndex === 'number') {
       childIndex = childOrIndex;
     } else {
       childIndex = parent.childNodes.indexOf(childOrIndex);
-      if (childIndex === -1) throw new Error('Specified child node is not a child of the specified parent');
+      if (childIndex === -1) throw new Error('Selected child node is not a child of the specified parent');
     }
     if (childIndex >= parent.childNodes.length) throw new RangeError(`Child index ${childIndex} is out of range. Parent has only ${parent.childNodes.length} child nodes.`);
 
-    // update references
+    // Update references
     const child = parent.childNodes[childIndex];
     if (childIndex > 0) {
       const beforeChild = parent.childNodes[childIndex - 1];
@@ -927,7 +939,7 @@ let Modify$1 = class Modify {
     child.parentNode = null;
     child.nextSibling = null;
 
-    // remove and return
+    // Remove and return
     return parent.childNodes.splice(childIndex, 1)[0];
   }
   removeChildren(parent, predicate) {
@@ -5310,7 +5322,7 @@ class TemplateHandler {
   /**
    * Version number of the `easy-template-x` library.
    */
-  version = "7.2.3" ;
+  version = "7.2.4" ;
   constructor(options) {
     this.options = new TemplateHandlerOptions(options);
     const delimiters = this.options.delimiters;

package/dist/types/compilation/tag.d.ts

@@ -1,4 +1,3 @@
-import type { IMap } from "src/types";
 import type { XmlGeneralNode, XmlTextNode } from "src/xml";
 export declare const TagDisposition: Readonly<{
     readonly Open: "Open";
@@ -14,7 +13,7 @@ export type TagPlacement = typeof TagPlacement[keyof typeof TagPlacement];
 export type Tag = TextNodeTag | AttributeTag;
 export interface BaseTag {
     name: string;
-    options?: IMap<any>;
+    options?: Record<string, any>;
     rawText: string;
     disposition: TagDisposition;
 }

package/dist/types/types.d.ts

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

package/dist/types/utils/array.d.ts

@@ -1,6 +1,5 @@
-import { IMap } from '../types';
 export type ItemMapper<TIn, TOut = string> = (item: TIn, index: number) => TOut;
 export declare function pushMany<T>(destArray: T[], items: T[]): void;
 export declare function first<T>(array: T[]): T;
 export declare function last<T>(array: T[]): T;
-export declare function toDictionary<TIn, TOut = TIn>(array: TIn[], keySelector: ItemMapper<TIn>, valueSelector?: ItemMapper<TIn, TOut>): IMap<TOut>;
+export declare function toDictionary<TIn, TOut = TIn>(array: TIn[], keySelector: ItemMapper<TIn>, valueSelector?: ItemMapper<TIn, TOut>): Record<string, TOut>;

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

@@ -1,7 +1,6 @@
 import { XmlGeneralNode, XmlNode, XmlNodeType } from "./xmlNode";
 import { XmlCommentNode } from "./xmlNode";
 import { XmlTextNode } from "./xmlNode";
-import type { IMap } from "src/types";
 export type NodeTypeToNode<T extends XmlNodeType> = T extends typeof XmlNodeType.Text ? XmlTextNode : T extends typeof XmlNodeType.Comment ? XmlCommentNode : T extends typeof XmlNodeType.General ? XmlGeneralNode : XmlNode;
 export type XmlNodePredicate = (node: XmlNode) => boolean;
 export declare class XmlUtils {
@@ -10,17 +9,21 @@ export declare class XmlUtils {
     readonly query: Query;
     readonly modify: Modify;
 }
+export interface XmlSerializationOptions {
+    indent?: number;
+}
 declare class Parser {
     private static xmlFileHeader;
     private static readonly parser;
     parse(str: string): XmlNode;
     domParse(str: string): Document;
     encodeValue(str: string): string;
-    serializeNode(node: XmlNode): string;
+    serializeNode(node: XmlNode, options?: XmlSerializationOptions): string;
     serializeFile(xmlNode: XmlNode): string;
+    private _serializeNode;
 }
 interface XmlGeneralNodeInit {
-    attributes?: IMap<string>;
+    attributes?: Record<string, string>;
     childNodes?: XmlNode[];
 }
 declare class Create {

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

@@ -1,4 +1,3 @@
-import { IMap } from "src/types";
 export declare const XmlNodeType: Readonly<{
     readonly Text: "Text";
     readonly General: "General";
@@ -27,5 +26,5 @@ export interface XmlCommentNode extends XmlNodeBase {
 }
 export interface XmlGeneralNode extends XmlNodeBase {
     nodeType: typeof XmlNodeType.General;
-    attributes?: IMap<string>;
+    attributes?: Record<string, string>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-template-x",
-  "version": "7.2.3",
+  "version": "7.2.4",
   "description": "Generate docx documents from templates, in Node or in the browser.",
   "keywords": [
     "docx",
@@ -49,6 +49,7 @@
     "build-src": "rollup -c",
     "build-types": "tsc -p tsconfig.types.json --emitDeclarationOnly",
     "build": "yarn build-types && yarn build-src",
+    "push-both": "git push && git checkout master && git merge develop && git push && git checkout develop",
     "release": "yarn clean && yarn quality && yarn build && yarn dist-verify",
     "dist-verify": "yarn dist-verify-cjs && yarn dist-verify-es",
     "dist-verify-cjs": "cd dist-verify/cjs && npm install && node main.js",
@@ -59,7 +60,7 @@
   },
   "packageManager": "yarn@4.3.1",
   "dependencies": {
-    "@xmldom/xmldom": "0.8.12",
+    "@xmldom/xmldom": "0.8.13",
     "json5": "2.2.3",
     "jszip": "3.10.1",
     "lodash.get": "4.4.2"

package/src/compilation/tag.ts

@@ -1,4 +1,3 @@
-import type { IMap } from "src/types";
 import type { XmlGeneralNode, XmlTextNode } from "src/xml";
 
 export const TagDisposition = Object.freeze({
@@ -20,7 +19,7 @@ export type Tag = TextNodeTag | AttributeTag;
 
 export interface BaseTag {
     name: string;
-    options?: IMap<any>;
+    options?: Record<string, any>;
     /**
      * The full tag text, for instance: "{#my-tag}".
      */

package/src/compilation/templateCompiler.ts

@@ -1,6 +1,5 @@
 import { UnclosedTagError, UnknownContentTypeError, UnopenedTagError } from '../errors';
 import { PluginContent, TemplatePlugin } from '../plugins';
-import { IMap } from '../types';
 import { isPromiseLike, stringValue, toDictionary } from '../utils';
 import { XmlNode } from '../xml';
 import { DelimiterSearcher } from './delimiters';
@@ -27,7 +26,7 @@ export interface TemplateCompilerOptions {
  */
 export class TemplateCompiler {
 
-    private readonly pluginsLookup: IMap<TemplatePlugin>;
+    private readonly pluginsLookup: Record<string, TemplatePlugin>;
     private readonly delimiterSearcher: DelimiterSearcher;
     private readonly tagParser: TagParser;
     private readonly options: TemplateCompilerOptions;

package/src/office/mediaFiles.ts

@@ -1,5 +1,4 @@
 import { MimeType, MimeTypeHelper } from '../mimeType';
-import { IMap } from '../types';
 import { Binary, Path, sha1 } from '../utils';
 import { Zip } from '../zip';
 
@@ -10,7 +9,7 @@ export class MediaFiles {
 
     private static readonly mediaDir = 'word/media';
 
-    private hashes: IMap<string>;
+    private hashes: Record<string, string>;
     private readonly files = new Map<Binary, string>();
     private nextFileId = 0;
 

package/src/office/openXmlPart.ts

@@ -1,4 +1,4 @@
-import { Constructor, IMap } from "src/types";
+import { Constructor } from "src/types";
 import { Binary } from "src/utils";
 import { xml, XmlNode } from "src/xml";
 import { Zip } from "src/zip";
@@ -18,7 +18,7 @@ export class OpenXmlPart {
     public readonly path: string;
 
     private root: XmlNode;
-    private readonly openedParts: IMap<OpenXmlPart> = {};
+    private readonly openedParts: Record<string, OpenXmlPart> = {};
     private readonly zip: Zip;
 
     constructor(path: string, zip: Zip) {

package/src/office/relsFile.ts

@@ -1,4 +1,3 @@
-import { IMap } from "src/types";
 import { Path } from "src/utils";
 import { xml, XmlGeneralNode, XmlNode } from "src/xml";
 import { Zip } from "src/zip";
@@ -11,8 +10,8 @@ import { Relationship, RelTargetMode } from "./relationship";
  */
 export class RelsFile {
 
-    private rels: IMap<Relationship>;
-    private relTargets: IMap<string>;
+    private rels: Record<string, Relationship>;
+    private relTargets: Record<string, string>;
     private nextRelId = 0;
 
     private readonly partDir: string;

package/src/office/xlsx.ts

@@ -1,5 +1,5 @@
 import { MalformedFileError } from "src/errors";
-import { Constructor, IMap } from "src/types";
+import { Constructor } from "src/types";
 import { Binary } from "src/utils";
 import { Zip } from "src/zip";
 import { OpenXmlPart } from "./openXmlPart";
@@ -53,7 +53,7 @@ export class Xlsx {
 
     public readonly mainDocument: OpenXmlPart;
 
-    private readonly _parts: IMap<OpenXmlPart> = {};
+    private readonly _parts: Record<string, OpenXmlPart> = {};
 
     private readonly zip: Zip;
 

package/src/plugins/chart/updateChart.ts

@@ -1,6 +1,5 @@
 import { MalformedFileError, TemplateSyntaxError } from "src/errors";
 import { OmlAttribute, OpenXmlPart, RelType, Xlsx } from "src/office";
-import { IMap } from "src/types";
 import { xml, XmlGeneralNode, XmlNode } from "src/xml";
 import { ChartColors } from "./chartColors";
 import {
@@ -580,7 +579,7 @@ async function updateEmbeddedExcelFile(existingChart: ExistingChart, chartData:
     await xlsxPart.save(newXlsxBinary);
 }
 
-async function updateSharedStringsPart(workbookPart: OpenXmlPart, chartData: ChartData): Promise<IMap<number>> {
+async function updateSharedStringsPart(workbookPart: OpenXmlPart, chartData: ChartData): Promise<Record<string, number>> {
 
     // Get the shared strings part
     const sharedStringsPart = await workbookPart.getFirstPartByType(RelType.SharedStrings);
@@ -595,7 +594,7 @@ async function updateSharedStringsPart(workbookPart: OpenXmlPart, chartData: Cha
     root.childNodes = [];
 
     let count = 0;
-    const sharedStrings: IMap<number> = {};
+    const sharedStrings: Record<string, number> = {};
 
     function addString(str: string) {
         xml.modify.appendChild(root, xml.create.generalNode("si", {
@@ -643,7 +642,7 @@ async function updateSharedStringsPart(workbookPart: OpenXmlPart, chartData: Cha
     return sharedStrings;
 }
 
-async function updateSheetPart(workbookPart: OpenXmlPart, sheetName: string, sharedStrings: IMap<number>, chartData: ChartData): Promise<OpenXmlPart> {
+async function updateSheetPart(workbookPart: OpenXmlPart, sheetName: string, sharedStrings: Record<string, number>, chartData: ChartData): Promise<OpenXmlPart> {
 
     // Get the sheet rel ID
     const root = await workbookPart.xmlRoot();
@@ -679,7 +678,7 @@ async function updateSheetPart(workbookPart: OpenXmlPart, sheetName: string, sha
     return sheetPart;
 }
 
-async function updateSheetRootStandard(workbookPart: OpenXmlPart, sheetRoot: XmlNode, chartData: StandardChartData, sharedStrings: IMap<number>): Promise<XmlNode[]> {
+async function updateSheetRootStandard(workbookPart: OpenXmlPart, sheetRoot: XmlNode, chartData: StandardChartData, sharedStrings: Record<string, number>): Promise<XmlNode[]> {
 
     // Create first row
     const firstRow = `
@@ -728,7 +727,7 @@ async function updateSheetRootStandard(workbookPart: OpenXmlPart, sheetRoot: Xml
     ];
 }
 
-async function updateSheetRootScatter(workbookPart: OpenXmlPart, sheetRoot: XmlNode, chartData: ScatterChartData, sharedStrings: IMap<number>): Promise<XmlNode[]> {
+async function updateSheetRootScatter(workbookPart: OpenXmlPart, sheetRoot: XmlNode, chartData: ScatterChartData, sharedStrings: Record<string, number>): Promise<XmlNode[]> {
 
     const isBubbleChart = isBubbleChartData(chartData);
 

package/src/types.ts

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

package/src/utils/array.ts

@@ -1,4 +1,3 @@
-import { IMap } from '../types';
 
 export type ItemMapper<TIn, TOut = string> = (item: TIn, index: number) => TOut;
 
@@ -18,11 +17,11 @@ export function last<T>(array: T[]): T {
     return array[array.length - 1];
 }
 
-export function toDictionary<TIn, TOut = TIn>(array: TIn[], keySelector: ItemMapper<TIn>, valueSelector?: ItemMapper<TIn, TOut>): IMap<TOut> {
+export function toDictionary<TIn, TOut = TIn>(array: TIn[], keySelector: ItemMapper<TIn>, valueSelector?: ItemMapper<TIn, TOut>): Record<string, TOut> {
     if (!array.length)
         return {};
 
-    const res: IMap<any> = {};
+    const res: Record<string, any> = {};
     array.forEach((item, index) => {
         const key = keySelector(item, index);
         const value = (valueSelector ? valueSelector(item, index) : item);

package/src/xml/xml.tests.ts

@@ -39,6 +39,12 @@ describe(XmlUtils, () => {
             const str = xml.parser.serializeNode(node);
             expect(str).toEqual('<!-- comment -->');
         });
+
+        it('serializes a node with indentation', () => {
+            const node = parseXml('<node><child>hello</child></node>', true);
+            const str = xml.parser.serializeNode(node, { indent: 2 });
+            expect(str).toEqual('<node>\n  <child>hello</child>\n</node>');
+        });
     });
 
     describe(xml.create.fromDomNode, () => {

package/src/xml/xml.ts

@@ -5,7 +5,6 @@ import { COMMENT_NODE_NAME, XmlGeneralNode, XmlNode, XmlNodeType } from "./xmlNo
 import { TEXT_NODE_NAME, XmlCommentNode } from "./xmlNode";
 import { XmlTextNode } from "./xmlNode";
 import { XmlTreeIterator } from "./xmlTreeIterator";
-import type { IMap } from "src/types";
 
 export type NodeTypeToNode<T extends XmlNodeType> =
     T extends typeof XmlNodeType.Text ? XmlTextNode :
@@ -23,6 +22,15 @@ export class XmlUtils {
     public readonly modify = new Modify();
 }
 
+export interface XmlSerializationOptions {
+    /**
+     * If specified, the XML will be serialized pretty-printed with the
+     * specified number of spaces for each level of indentation. Otherwise, the
+     * XML will be serialized in a compact format (single line).
+     */
+    indent?: number;
+}
+
 class Parser {
 
     private static xmlFileHeader = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
@@ -75,7 +83,15 @@ class Parser {
         });
     }
 
-    public serializeNode(node: XmlNode): string {
+    public serializeNode(node: XmlNode, options?: XmlSerializationOptions): string {
+        return this._serializeNode(node, 0, options);
+    }
+
+    public serializeFile(xmlNode: XmlNode): string {
+        return Parser.xmlFileHeader + xml.parser.serializeNode(xmlNode);
+    }
+
+    private _serializeNode(node: XmlNode, depth: number, options?: XmlSerializationOptions): string {
         if (!node)
             return '';
 
@@ -102,33 +118,38 @@ class Parser {
         const suffix = hasChildren ? '' : '/';
         const openTag = `<${node.nodeName}${attributes}${suffix}>`;
 
-        let xmlString: string;
+        // No children
+        if (!hasChildren) {
+            return openTag;
+        }
+
+        // Close tag
+        const closeTag = `</${node.nodeName}>`;
 
-        if (hasChildren) {
+        // Children without indentation
+        const indentSize = options?.indent ?? 0;
+        if (!indentSize || node.childNodes.every(xml.query.isTextNode)) {
 
-            // child nodes
             const childrenXml = node.childNodes
-                .map(child => xml.parser.serializeNode(child))
+                .map(child => this._serializeNode(child, depth + 1, options))
                 .join('');
 
-            // close tag
-            const closeTag = `</${node.nodeName}>`;
-
-            xmlString = openTag + childrenXml + closeTag;
-        } else {
-            xmlString = openTag;
+            return openTag + childrenXml + closeTag;
         }
 
-        return xmlString;
-    }
+        // Children with indentation
+        const childIndent = "\n" + " ".repeat((depth + 1) * indentSize);
+        const childrenXml = node.childNodes
+            .map(child => `${childIndent}${this._serializeNode(child, depth + 1, options)}`)
+            .join("");
 
-    public serializeFile(xmlNode: XmlNode): string {
-        return Parser.xmlFileHeader + xml.parser.serializeNode(xmlNode);
+        const closeIndent = "\n" + " ".repeat(depth * indentSize);
+        return openTag + childrenXml + closeIndent + closeTag;
     }
 }
 
 interface XmlGeneralNodeInit {
-    attributes?: IMap<string>;
+    attributes?: Record<string, string>;
     childNodes?: XmlNode[];
 }
 
@@ -358,7 +379,7 @@ class Query {
                 return null;
             }
         }
-        
+
         if (curNode.nodeType !== nodeType) {
             return null;
         }
@@ -533,22 +554,22 @@ class Modify {
             throw new InternalArgumentMissingError("childOrIndex");
 
         if (!parent.childNodes || !parent.childNodes.length)
-            throw new Error('Parent node has node children');
+            throw new Error('Parent node has no children');
 
-        // get child index
+        // Get child index
         let childIndex: number;
         if (typeof childOrIndex === 'number') {
             childIndex = childOrIndex;
         } else {
             childIndex = parent.childNodes.indexOf(childOrIndex);
             if (childIndex === -1)
-                throw new Error('Specified child node is not a child of the specified parent');
+                throw new Error('Selected child node is not a child of the specified parent');
         }
 
         if (childIndex >= parent.childNodes.length)
             throw new RangeError(`Child index ${childIndex} is out of range. Parent has only ${parent.childNodes.length} child nodes.`);
 
-        // update references
+        // Update references
         const child = parent.childNodes[childIndex];
         if (childIndex > 0) {
             const beforeChild = parent.childNodes[childIndex - 1];
@@ -557,7 +578,7 @@ class Modify {
         child.parentNode = null;
         child.nextSibling = null;
 
-        // remove and return
+        // Remove and return
         return parent.childNodes.splice(childIndex, 1)[0];
     }
 

package/src/xml/xmlNode.ts

@@ -1,4 +1,3 @@
-import { IMap } from "src/types";
 
 export const XmlNodeType = Object.freeze({
     Text: "Text",
@@ -35,5 +34,5 @@ export interface XmlCommentNode extends XmlNodeBase {
 
 export interface XmlGeneralNode extends XmlNodeBase {
     nodeType: typeof XmlNodeType.General;
-    attributes?: IMap<string>;
+    attributes?: Record<string, string>;
 }