@e-mc/document 0.13.9 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.13.9",
+  "version": "0.14.0",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,14 +19,14 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.13.9",
-    "@e-mc/db": "0.13.9",
-    "@e-mc/types": "0.13.9",
+    "@e-mc/core": "0.14.0",
+    "@e-mc/db": "0.14.0",
+    "@e-mc/types": "0.14.0",
     "chalk": "4.1.2",
     "domhandler": "^5.0.3",
     "domutils": "^3.2.2",
-    "htmlparser2": "^10.0.0",
+    "htmlparser2": "^10.1.0",
     "js-yaml": "^4.1.1",
-    "picomatch": "^4.0.3"
+    "picomatch": "^4.0.4"
   }
 }

package/parse/dom.js

@@ -1,19 +1,16 @@
 "use strict";
-exports.IGNORE_FLAG = exports.HtmlElement = exports.DomWriter = void 0;
-const htmlparser2 = require("htmlparser2");
-const domhandler = require("domhandler");
-const domutils = require("domutils");
-const types_1 = require("@e-mc/types");
-const index_1 = require("@e-mc/document/parse");
-Object.defineProperty(exports, "IGNORE_FLAG", { enumerable: true, get: function () { return index_1.IGNORE_FLAG; } });
-const util_1 = require("@e-mc/document/util");
-const Parser = htmlparser2.Parser;
-const DomHandler = domhandler.DomHandler;
+
+const { Parser } = require('htmlparser2');
+const { DomHandler } = require('domhandler');
+const { findOne, getElementsByTagName } = require('domutils');
+const { escapePattern } = require('@e-mc/types');
+const { IGNORE_FLAG, XmlElement, XmlWriter } = require('@e-mc/document/parse');
+const { getNewline } = require('@e-mc/document/util');
 const TAG_VOID = ['area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'isindex', 'keygen', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
-const REGEXP_VOID = TAG_VOID.map(tagName => new RegExp(`(\\s*)</${tagName}\\s*>` + index_1.XmlWriter.PATTERN_TRAILINGSPACE, 'gi'));
-const REGEXP_TAGNAME = new RegExp(`^${index_1.XmlWriter.PATTERN_TAGNAME}$`);
-const PARSER_OPTIONS = Object.freeze({ xmlMode: false, decodeEntities: false });
-class DomWriter extends index_1.XmlWriter {
+const REGEXP_VOID = TAG_VOID.map(tagName => new RegExp(`(\\s*)</${tagName}\\s*>` + XmlWriter.PATTERN_TRAILINGSPACE, 'gi'));
+const REGEXP_TAGNAME = new RegExp(`^${XmlWriter.PATTERN_TAGNAME}$`);
+const parserOptions = () => ({ xmlMode: false, decodeEntities: false });
+class DomWriter extends XmlWriter {
     static hasInnerXml(tagName, ignoreCase) {
         if (ignoreCase) {
             tagName = tagName.toLowerCase();
@@ -26,21 +23,21 @@ class DomWriter extends index_1.XmlWriter {
             ({ newline, ignoreTagGroup, escapeEntities, ignoreChar = '' } = options);
         }
         for (const tag of REGEXP_VOID) {
-            source = source.replace(tag, (...capture) => index_1.XmlWriter.getNewlineString(capture[1], capture[2], newline));
+            source = source.replace(tag, (...capture) => XmlWriter.getNewlineString(capture[1], capture[2], newline));
         }
         const tagGroup = [];
         if (ignoreTagGroup) {
             for (let i = 0, length = ignoreTagGroup.length; i < length; i += 2) {
                 const start = ignoreTagGroup[i];
                 if (start.startsWith('<')) {
-                    tagGroup.push(new RegExp('^' + (0, types_1.escapePattern)(start)));
+                    tagGroup.push(new RegExp('^' + escapePattern(start)));
                 }
                 if (ignoreTagGroup[i + 1]?.at(-1) === '>') {
-                    tagGroup.push(new RegExp((0, types_1.escapePattern)(start) + '$'));
+                    tagGroup.push(new RegExp(escapePattern(start) + '$'));
                 }
             }
         }
-        const pattern = new RegExp(`<(?:!--.*?--|([^\\s<>/${ignoreChar}]+)(${index_1.XmlWriter.PATTERN_TAGOPEN}*?)(\\s*\\/?\\s*)|\\/([^\\s>]+)(\\s*))>`, 'gs');
+        const pattern = new RegExp(`<(?:!--.*?--|([^\\s<>/${ignoreChar}]+)(${XmlWriter.PATTERN_TAGOPEN}*?)(\\s*\\/?\\s*)|\\/([^\\s>]+)(\\s*))>`, 'gs');
         let match;
         while (match = pattern.exec(source)) {
             let tag;
@@ -50,17 +47,17 @@ class DomWriter extends index_1.XmlWriter {
                         if (match[1].toUpperCase() === '!DOCTYPE') {
                             continue;
                         }
-                        tag = '<!--' + match[1].substring(1) + match[2] + '-->';
+                        tag = '<!--' + match[1].slice(1) + match[2] + '-->';
                     }
                     else if (tagGroup.length === 0 || !tagGroup.some(item => item.test(match[0]))) {
-                        tag = index_1.XmlWriter.escapeXmlString(match[0]);
+                        tag = XmlWriter.escapeXmlString(match[0]);
                     }
                 }
                 else {
                     const trailing = match[match.length - 3];
                     if (escapeEntities) {
                         const outerTag = '<' + match[1] + match[2] + '>';
-                        tag = index_1.XmlWriter.escapeAttributes(outerTag);
+                        tag = XmlWriter.escapeAttributes(outerTag);
                         if (!trailing && tag === outerTag) {
                             continue;
                         }
@@ -79,7 +76,7 @@ class DomWriter extends index_1.XmlWriter {
                 }
             }
             if (tag) {
-                source = source.substring(0, match.index) + tag + source.substring(match.index + match[0].length);
+                source = source.slice(0, match.index) + tag + source.slice(match.index + match[0].length);
                 pattern.lastIndex += tag.length - match[0].length;
             }
         }
@@ -89,7 +86,7 @@ class DomWriter extends index_1.XmlWriter {
         const result = { element: null, error: null };
         new Parser(new DomHandler((err, dom) => {
             if (!err) {
-                result.element = domutils.findOne(elem => elem.tagName === "html", dom);
+                result.element = findOne(elem => elem.tagName === "html", dom);
             }
             else {
                 result.error = err;
@@ -98,7 +95,7 @@ class DomWriter extends index_1.XmlWriter {
         return result;
     }
     static getElementsByTagName(tagName, nodes, recurse, limit) {
-        return domutils.getElementsByTagName(tagName, nodes, recurse, limit);
+        return getElementsByTagName(tagName, nodes, recurse, limit);
     }
     documentElement = null;
     ignoreTagName = "title|style|script";
@@ -106,7 +103,7 @@ class DomWriter extends index_1.XmlWriter {
     rootName = "html";
     ignoreCaseTagName = true;
     constructor(documentName, source, elements, options = {}) {
-        const { normalize, escapeEntities, stripComments, ignoreTagGroup, parser = { ...PARSER_OPTIONS } } = options;
+        const { normalize, escapeEntities, stripComments, ignoreTagGroup, parser = parserOptions() } = options;
         super(documentName, source, elements, { parser });
         const items = [];
         let outerXml = '', documentElement, offsetMap, startIndex = -1;
@@ -128,7 +125,7 @@ class DomWriter extends index_1.XmlWriter {
                 source = DomWriter.normalize(source, { newline: this.newline, ignoreChar: typeof normalize === 'string' ? normalize : '', ignoreTagGroup, escapeEntities });
             }
             else if (escapeEntities) {
-                source = index_1.XmlWriter.escapeAttributes(source);
+                source = XmlWriter.escapeAttributes(source);
             }
         }
         else {
@@ -137,10 +134,10 @@ class DomWriter extends index_1.XmlWriter {
         const html = /^(\s*(?:<\?xml[^>]+>\s*)?(?:<!DOCTYPE[^>]+>\s*)?)<html[\s>]/i.exec(source) || /^(.*)<html[\s>]/is.exec(source);
         if (html) {
             const index = html[1] ? html[1].length : 0;
-            const endIndex = index_1.XmlWriter.findCloseTag(source, index);
+            const endIndex = XmlWriter.findCloseTag(source, index);
             if (endIndex !== -1) {
                 startIndex = index;
-                outerXml = source.substring(startIndex, endIndex + 1);
+                outerXml = source.slice(startIndex, endIndex + 1);
             }
         }
         if (documentElement) {
@@ -152,11 +149,11 @@ class DomWriter extends index_1.XmlWriter {
                 leading += outerXml;
             }
             else {
-                leading = source.substring(0, startIndex + outerXml.length);
+                leading = source.slice(0, startIndex + outerXml.length);
             }
             source = documentElement.innerXml;
             if (escapeEntities) {
-                source = index_1.XmlWriter.escapeAttributes(source);
+                source = XmlWriter.escapeAttributes(source);
             }
             source = leading + this.newline + source + this.newline + '</html>';
             this.documentElement = documentElement;
@@ -167,8 +164,8 @@ class DomWriter extends index_1.XmlWriter {
                 const match = /<\/body\s*>\s*<\/html\s*>.*$/is.exec(source) || /<\/body\s*>.*$/is.exec(source);
                 if (match) {
                     const textContent = trailing.reduce((a, b) => a + b.textContent, '');
-                    offsetMap = index_1.XmlWriter.getTagOffset(textContent, { ignoreCase: this.ignoreCaseTagName, ignoreTagName: this.ignoreTagName, parser: this.parser });
-                    source = source.substring(0, match.index) + textContent + source.substring(match.index);
+                    offsetMap = XmlWriter.getTagOffset(textContent, { ignoreCase: this.ignoreCaseTagName, ignoreTagName: this.ignoreTagName, parser: this.parser });
+                    source = source.slice(0, match.index) + textContent + source.slice(match.index);
                     for (const item of trailing) {
                         delete item.textContent;
                     }
@@ -195,8 +192,8 @@ class DomWriter extends index_1.XmlWriter {
             let innerXml;
             for (const item of this.elements) {
                 if (item.tagName === "html") {
-                    if (!innerXml && index_1.XmlWriter.isIndex(item.endIndex)) {
-                        innerXml = this.source.substring(item.endIndex + 1, this.source.length - 7).trim();
+                    if (!innerXml && XmlWriter.isIndex(item.endIndex)) {
+                        innerXml = this.source.slice(item.endIndex + 1, this.source.length - 7).trim();
                     }
                     item.innerXml = innerXml;
                 }
@@ -206,7 +203,7 @@ class DomWriter extends index_1.XmlWriter {
     }
     close() {
         if (this.documentElement || this._appendCount > 0) {
-            this.source = this.source.replace(new RegExp(index_1.XmlWriter.getPatternId(this.nameOfId), 'g'), '');
+            this.source = this.source.replace(new RegExp(XmlWriter.getPatternId(this.nameOfId), 'g'), '');
         }
         return super.close();
     }
@@ -214,14 +211,13 @@ class DomWriter extends index_1.XmlWriter {
         return new HtmlElement(this.documentName, node);
     }
     setNewline(value) {
-        this.newline = (0, util_1.getNewline)(value);
+        this.newline = getNewline(value);
     }
 }
-exports.DomWriter = DomWriter;
-class HtmlElement extends index_1.XmlElement {
+class HtmlElement extends XmlElement {
     _documentType = "HTML";
     constructor(documentName, node, attributes, options = {}) {
-        options.parser ||= { ...PARSER_OPTIONS };
+        options.parser ||= parserOptions();
         super(documentName, node, attributes, { ...options, tagVoid: TAG_VOID.includes(node.tagName) });
     }
     getTagOffset(source) {
@@ -236,15 +232,18 @@ class HtmlElement extends index_1.XmlElement {
         }
     }
     findIndexOf(source) {
-        const { element } = index_1.XmlWriter.findElement(source, this.node, { document: this.documentName, id: this.id, locatorAttr: 'id', parser: this.parser });
+        const { element } = XmlWriter.findElement(source, this.node, { document: this.documentName, id: this.id, locatorAttr: 'id', parser: this.parser });
         if (element) {
             return { startIndex: element.startIndex, endIndex: element.endIndex };
         }
     }
     get outerXml() {
         const [tagName, items, innerXml] = this.getOuterContent();
-        return '<' + tagName + HtmlElement.writeAttributes(items) + '>' + (DomWriter.hasInnerXml(tagName, this.ignoreCase) && tagName !== "html" ? (tagName === 'title' ? index_1.XmlWriter.escapeXmlString(innerXml) : innerXml) + `</${tagName}>` : '');
+        return '<' + tagName + HtmlElement.writeAttributes(items) + '>' + (DomWriter.hasInnerXml(tagName, this.ignoreCase) && tagName !== "html" ? (tagName === 'title' ? XmlWriter.escapeXmlString(innerXml) : innerXml) + `</${tagName}>` : '');
     }
 }
+XmlWriter.namesOfTagVoid("HTML", TAG_VOID);
+
+exports.DomWriter = DomWriter;
 exports.HtmlElement = HtmlElement;
-index_1.XmlWriter.namesOfTagVoid("HTML", TAG_VOID);
+exports.IGNORE_FLAG = IGNORE_FLAG;

package/parse/index.js

@@ -1,20 +1,18 @@
 "use strict";
-exports.XmlElement = exports.XmlWriter = exports.IGNORE_FLAG = void 0;
-const crypto = require("node:crypto");
-const htmlparser2 = require("htmlparser2");
-const domhandler = require("domhandler");
-const domutils = require("domutils");
-const types_1 = require("@e-mc/types");
-const module_1 = require("@e-mc/module");
-const util_1 = require("@e-mc/document/util");
-var IGNORE_FLAG;
+
+const { randomUUID } = require('node:crypto');
+const { Parser } = require('htmlparser2');
+const { DomHandler } = require('domhandler');
+const { findAll, getElementsByTagName } = require('domutils');
+const { errorValue, escapePattern, isArray, isObject, isPlainObject } = require('@e-mc/types');
+const Module = require('@e-mc/module');
+const { spliceMatch } = require('@e-mc/document/util');
+exports.IGNORE_FLAG = void 0;
 (function (IGNORE_FLAG) {
     IGNORE_FLAG[IGNORE_FLAG["NONE"] = 0] = "NONE";
     IGNORE_FLAG[IGNORE_FLAG["INTERIOR"] = 1] = "INTERIOR";
     IGNORE_FLAG[IGNORE_FLAG["LOCATOR"] = 2] = "LOCATOR";
-})(IGNORE_FLAG || (exports.IGNORE_FLAG = IGNORE_FLAG = {}));
-const Parser = htmlparser2.Parser;
-const DomHandler = domhandler.DomHandler;
+})(exports.IGNORE_FLAG || (exports.IGNORE_FLAG = {}));
 const CACHE_TAGNAME = {};
 const CACHE_TAGOFFSET = {};
 const CACHE_TAGVOID = {};
@@ -104,7 +102,7 @@ function getParserDOM(source, parser) {
 }
 const isIndex = (value) => typeof value === 'number' && value >= 0 && value !== Infinity;
 const isCount = (value) => typeof value === 'number' && value > 0 && value !== Infinity;
-const hasId = (id, source, startIndex, endIndex) => source.substring(startIndex, endIndex).indexOf(id) !== -1;
+const hasId = (id, source, startIndex, endIndex) => source.slice(startIndex, endIndex).indexOf(id) !== -1;
 const escapeTagName = (value) => value.replace(/[-.]/g, capture => capture === '-' ? '\\x2d' : '\\' + capture);
 class XmlWriter {
     documentName;
@@ -140,9 +138,9 @@ class XmlWriter {
             pattern = content;
             content = '';
         }
-        let index = match.index, leading = index > 0 ? source.substring(0, index) : '', trailing = source.substring(index + match[0].length);
+        let index = match.index, leading = index > 0 ? source.slice(0, index) : '', trailing = source.slice(index + match[0].length);
         if (options) {
-            if ((0, types_1.isPlainObject)(options)) {
+            if (isPlainObject(options)) {
                 if (options.trimLeading) {
                     const length = leading.length;
                     leading = leading.trimEnd();
@@ -179,13 +177,14 @@ class XmlWriter {
         });
     }
     static escapeAttributes(source) {
-        let escaped, match, attribute;
+        let match, attribute;
         while (match = REGEXP_TAGATTR.exec(source)) {
             let output = match[0], modified = false;
-            while (attribute = REGEXP_ATTRVALUE.exec(match[1])) {
+            while (attribute = REGEXP_ATTRVALUE.exec(output)) {
                 const value = attribute[2] || attribute[3] || attribute[4];
-                if (value && (escaped = this.escapeXmlString(value)) !== value) {
-                    output = (0, util_1.spliceMatch)(output, attribute, attribute[1] + `="${escaped}"`, REGEXP_ATTRVALUE);
+                const escaped = this.escapeXmlString(value);
+                if (value !== escaped) {
+                    output = spliceMatch(output, attribute, attribute[1] + `="${escaped}"`, REGEXP_ATTRVALUE);
                     modified = true;
                 }
             }
@@ -251,7 +250,7 @@ class XmlWriter {
     static findElement(source, node, options = {}) {
         const { document, id, tagCount = node.tagCount, locatorAttr, parser } = options;
         let outDom = options.outDom, error;
-        if (!(0, types_1.isArray)(outDom)) {
+        if (!isArray(outDom)) {
             ({ outDom, error } = getParserDOM(source, parser));
         }
         const result = { element: null, error: null };
@@ -259,7 +258,7 @@ class XmlWriter {
             result.error = error;
             return result;
         }
-        const nodes = domutils.getElementsByTagName(node.tagName, outDom, true);
+        const nodes = getElementsByTagName(node.tagName, outDom, true);
         if (!parser?.xmlMode) {
             nodes.filter(item => item.next && item.next.startIndex <= item.endIndex).forEach(item => {
                 for (let i = 0, length = nodes.length; i < length; ++i) {
@@ -279,7 +278,8 @@ class XmlWriter {
         let index = -1;
         if (document && id) {
             const documentId = this.getNameOfId(document);
-            if ((index = nodes.findIndex(elem => elem.attribs[documentId] === id)) !== -1) {
+            index = nodes.findIndex(elem => elem.attribs[documentId] === id);
+            if (index !== -1) {
                 result.element = nodes[index];
             }
         }
@@ -311,28 +311,28 @@ class XmlWriter {
     }
     static locateElement(source, locator, attr, options = {}) {
         let { parser, outDom } = options, error;
-        if (!(0, types_1.isArray)(outDom)) {
+        if (!isArray(outDom)) {
             ({ outDom, error } = getParserDOM(source, parser));
         }
         if (error) {
             return { element: null, error };
         }
         const { id, count = 1, index = 0 } = locator;
-        const nodes = domutils.findAll(elem => elem.attribs[attr] === id, outDom);
+        const nodes = findAll(elem => elem.attribs[attr] === id, outDom);
         const element = nodes.length === count && nodes[index] || null;
         return { element, parser, outDom, error: null };
     }
     static getTagOffset(source, replacement, options) {
-        if ((0, types_1.isObject)(replacement)) {
+        if (isObject(replacement)) {
             options = replacement;
             replacement = undefined;
         }
-        let parser;
+        const parser = { xmlMode: true, decodeEntities: false, lowerCaseAttributeNames: false };
         if (options) {
-            const { ignoreCase, ignoreTagName, ignoreTagGroup } = options;
+            const { ignoreTagName, ignoreTagGroup } = options;
             if (ignoreTagName) {
-                const flags = ignoreCase ? 'gi' : 'g';
-                source = source.replace(CACHE_TAGOFFSET[ignoreTagName + flags] ||= new RegExp(`<(?:${ignoreTagName.split('|').map(value => escapeTagName(value)).join('|')})${this.PATTERN_TAGOPEN}*>[\\S\\s]*?<\\/\\1\\s*>`, flags), '');
+                const flags = options.ignoreCase ? 'gsi' : 'gs';
+                source = source.replace(CACHE_TAGOFFSET[ignoreTagName + flags] ||= new RegExp(`<(?:${ignoreTagName.split('|').map(value => escapeTagName(value)).join('|')})${this.PATTERN_TAGOPEN}*>.*?<\\/\\1\\s*>`, flags), '');
             }
             if (ignoreTagGroup) {
                 for (let i = 0, length = ignoreTagGroup.length; i < length; i += 2) {
@@ -343,15 +343,17 @@ class XmlWriter {
                     }
                 }
             }
-            parser = options.parser;
+            if (options.parser) {
+                Object.assign(parser, options.parser);
+            }
         }
         const result = {};
         new Parser({
             onopentag(name) {
                 result[name] = (result[name] || 0) + 1;
             }
-        }, { xmlMode: true, decodeEntities: false, lowerCaseAttributeNames: false, ...parser }).end(source);
-        if ((0, types_1.isString)(replacement)) {
+        }, parser).end(source);
+        if (replacement) {
             const next = this.getTagOffset(replacement, options);
             let modified = false;
             for (const tagName of new Set([...Object.keys(result), ...Object.keys(next)])) {
@@ -379,7 +381,7 @@ class XmlWriter {
         return `data-${document}-id`;
     }
     static getPatternId(name) {
-        return CACHE_PATTERNID[name] ||= new RegExp(`\\s${(0, types_1.escapePattern)(name)}="([^"]+)"`);
+        return CACHE_PATTERNID[name] ||= new RegExp(`\\s${escapePattern(name)}="([^"]+)"`);
     }
     static getCommentsAndCDATA(source, tagPattern = '', ignoreCase, stripXml) {
         let tagGroup;
@@ -398,9 +400,8 @@ class XmlWriter {
             }
         }
         const result = [];
-        const flags = ignoreCase ? 'gi' : 'g';
-        let pattern = CACHE_TAGNAME[tagPattern + flags] ||= new RegExp(`<(?:(!--[\\S\\s]*?--)|(!\\[CDATA\\[[\\S\\s]*?\\]\\])` + (tagPattern ? '|' + `(${tagPattern})${this.PATTERN_TAGOPEN}*` : '') + ')>', flags), match;
-        pattern.lastIndex = 0;
+        const flags = ignoreCase ? 'gsi' : 'gs';
+        let pattern = CACHE_TAGNAME[tagPattern + flags] ||= new RegExp(`<(?:(!--.*?--)|(!\\[CDATA\\[.*?\\]\\])` + (tagPattern ? '|' + `(${tagPattern})${this.PATTERN_TAGOPEN}*` : '') + ')>', flags), match;
         while (match = pattern.exec(source)) {
             if (stripXml) {
                 source = this.replaceMatch(match, source, '', { pattern, trimLeading: true });
@@ -413,10 +414,11 @@ class XmlWriter {
                     result.push({ type, outerXml: match[0], startIndex, endIndex: endIndex - 1 });
                 }
                 else if ((endIndex = findCloseIndex(source, match[3], endIndex, ignoreCase)[0]) !== -1) {
-                    result.push({ type, outerXml: source.substring(startIndex, endIndex + 1), startIndex, endIndex });
+                    result.push({ type, outerXml: source.slice(startIndex, endIndex + 1), startIndex, endIndex });
                 }
             }
         }
+        pattern.lastIndex = 0;
         if (stripXml) {
             return source;
         }
@@ -504,7 +506,7 @@ class XmlWriter {
         }
     }
     getInvalidArea() {
-        if ((this._ignoreFlag & IGNORE_FLAG.INTERIOR) === 0 && this._hasInvalidContent) {
+        if ((this._ignoreFlag & exports.IGNORE_FLAG.INTERIOR) === 0 && this._hasInvalidContent) {
             const startIndex = this.#writeStartIndex;
             if (isIndex(startIndex) && this._invalidContent && !this._invalidContent.some(item => item.startIndex >= startIndex)) {
                 return this._invalidContent;
@@ -577,7 +579,7 @@ class XmlWriter {
                 this.elements.splice(index, 1);
             }
             ++this.failCount;
-            this.errors.push((0, types_1.errorValue)(`Unable to ${append.prepend ? 'prepend' : 'append'} element`, append.tagName.toUpperCase() + (isIndex(node.index) ? ' @ ' + node.index : '')));
+            this.errors.push(errorValue(`Unable to ${append.prepend ? 'prepend' : 'append'} element`, append.tagName.toUpperCase() + (isIndex(node.index) ? ' @ ' + node.index : '')));
         }
         return null;
     }
@@ -645,7 +647,7 @@ class XmlWriter {
             element.reset();
             return true;
         }
-        if (node.locator && (this._ignoreFlag & IGNORE_FLAG.LOCATOR)) {
+        if (node.locator && (this._ignoreFlag & exports.IGNORE_FLAG.LOCATOR)) {
             return true;
         }
         if (error) {
@@ -949,7 +951,7 @@ class XmlWriter {
             }
         }
         else if (value.startsWith('|')) {
-            value = value.substring(1);
+            value = value.slice(1);
         }
         this.ignoreTagName = tagName + value;
         this.#patternIgnore = null;
@@ -972,7 +974,7 @@ class XmlWriter {
             ({ tagName, tagVoid } = options);
         }
         const source = this.source;
-        const match = new RegExp(`<(${tagName && escapeTagName(tagName) || '[^\\s>]+'})${XmlWriter.PATTERN_TAGOPEN}+?${(0, types_1.escapePattern)(this.nameOfId)}="${(0, types_1.escapePattern)(id)}"`, ignoreCase ? 'i' : '').exec(source);
+        const match = new RegExp(`<(${tagName && escapeTagName(tagName) || '[^\\s>]+'})${XmlWriter.PATTERN_TAGOPEN}+?${escapePattern(this.nameOfId)}="${escapePattern(id)}"`, ignoreCase ? 'i' : '').exec(source);
         if (match) {
             tagName ||= match[1];
             const startIndex = match.index;
@@ -984,7 +986,7 @@ class XmlWriter {
                 endIndex = XmlWriter.findCloseTag(source, startIndex);
             }
             if (endIndex !== -1) {
-                return { tagName, id, outerXml: source.substring(startIndex, endIndex + 1), startIndex, endIndex, ignoreCase };
+                return { tagName, id, outerXml: source.slice(startIndex, endIndex + 1), startIndex, endIndex, ignoreCase };
             }
         }
     }
@@ -1007,7 +1009,7 @@ class XmlWriter {
                 if (!tagVoid) {
                     const [index, closeTag] = findCloseIndex(source, tagName, endIndex + 1, ignoreCase);
                     if (index !== -1) {
-                        outerXml = source.substring(startIndex, index + 1);
+                        outerXml = source.slice(startIndex, index + 1);
                         endIndex = index;
                     }
                     else if (closeTag > 0) {
@@ -1024,7 +1026,7 @@ class XmlWriter {
         return startIndex !== -1 ? this.spliceRawString({ startIndex, endIndex: startIndex + targetXml.length - 1, outerXml }) : '';
     }
     getRawString(index) {
-        return this.source.substring(index.startIndex, index.endIndex + 1);
+        return this.source.slice(index.startIndex, index.endIndex + 1);
     }
     spliceRawString(content, reset = true) {
         const { startIndex, endIndex, outerXml } = content;
@@ -1032,7 +1034,7 @@ class XmlWriter {
             this.resetPosition(startIndex);
         }
         ++this.modifyCount;
-        return this.source = this.source.substring(0, startIndex) + outerXml + this.source.substring(endIndex + 1);
+        return this.source = this.source.slice(0, startIndex) + outerXml + this.source.slice(endIndex + 1);
     }
     getComments() {
         return this._invalidContent ? this._invalidContent.filter(item => item.type === 'comment') : null;
@@ -1047,7 +1049,7 @@ class XmlWriter {
         this.resetPosition();
     }
     get newId() {
-        return crypto.randomUUID();
+        return randomUUID();
     }
     get nameOfId() {
         return XmlWriter.getNameOfId(this.documentName);
@@ -1068,7 +1070,6 @@ class XmlWriter {
         return this.modifyCount > 0;
     }
 }
-exports.XmlWriter = XmlWriter;
 class XmlElement {
     documentName;
     node;
@@ -1082,7 +1083,7 @@ class XmlElement {
             if (value === null) {
                 continue;
             }
-            result += '="' + (typeof value === 'string' ? escapeEntities ? XmlWriter.escapeXmlString(value) : value.replaceAll('"', '&quot;') : module_1.asString(value)) + '"';
+            result += '="' + (typeof value === 'string' ? escapeEntities ? XmlWriter.escapeXmlString(value) : value.replace(/"/g, '&quot;') : Module.asString(value)) + '"';
         }
         return result;
     }
@@ -1122,7 +1123,7 @@ class XmlElement {
                     if (!attrs.has(key)) {
                         attrs.set(key, match[2] || match[3] || match[4] || '');
                     }
-                    source = (0, util_1.spliceMatch)(source, match, '', REGEXP_ATTRVALUE);
+                    source = spliceMatch(source, match, '', REGEXP_ATTRVALUE);
                 }
                 for (const attr of source.matchAll(REGEXP_ATTRNAME)) {
                     const key = ignoreCase ? attr[1].toLowerCase() : attr[1];
@@ -1135,7 +1136,6 @@ class XmlElement {
                 }
                 this._tagVoid = isVoid;
                 REGEXP_ATTRVALUE.lastIndex = 0;
-                REGEXP_ATTRNAME.lastIndex = 0;
             }
             else if (tagVoid) {
                 this._tagVoid = true;
@@ -1160,10 +1160,10 @@ class XmlElement {
                 }
                 let lastIndex = -1;
                 if (tagVoid === true || (lastIndex = value.lastIndexOf('<')) && lastIndex < endIndex) {
-                    return [value.substring(0, endIndex), '', true];
+                    return [value.slice(0, endIndex), '', true];
                 }
-                tagStart = value.substring(0, endIndex);
-                innerXml = value.substring(endIndex, lastIndex);
+                tagStart = value.slice(0, endIndex);
+                innerXml = value.slice(endIndex, lastIndex);
             }
         }
         return [tagStart || `<${this.tagName}>`, innerXml || '', false];
@@ -1198,7 +1198,7 @@ class XmlElement {
             if (outerXml) {
                 const index = XmlWriter.findCloseTag(outerXml);
                 if (index !== -1) {
-                    return XmlWriter.getPatternId(this.nameOfId).exec(outerXml.substring(0, index))?.[1] || '';
+                    return XmlWriter.getPatternId(this.nameOfId).exec(outerXml.slice(0, index))?.[1] || '';
                 }
             }
         }
@@ -1279,7 +1279,7 @@ class XmlElement {
             node.startIndex = startIndex + leading.length;
             node.endIndex = node.startIndex + outerXml.length - 1;
         }
-        return [source.substring(0, startIndex) + leading + outerXml + trailing + source.substring(endIndex), outerXml];
+        return [source.slice(0, startIndex) + leading + outerXml + trailing + source.slice(endIndex), outerXml];
     }
     write(source, invalid) {
         if (!this._modified) {
@@ -1380,7 +1380,7 @@ class XmlElement {
             }
             return this.replace(source, position);
         }
-        return ['', '', (0, types_1.errorValue)('Element was not found', tagName.toUpperCase() + (isIndex(tagIndex) ? ' @ ' + tagIndex : ''))];
+        return ['', '', errorValue('Element was not found', tagName.toUpperCase() + (isIndex(tagIndex) ? ' @ ' + tagIndex : ''))];
     }
     save(source, invalid) {
         const [output, outerXml, error] = this.write(source, invalid || XmlWriter.getCommentsAndCDATA(source));
@@ -1502,4 +1502,6 @@ class XmlElement {
         return this._modified;
     }
 }
+
 exports.XmlElement = XmlElement;
+exports.XmlWriter = XmlWriter;