@e-mc/document 0.10.6 → 0.11.1

package/LICENSE

@@ -8,4 +8,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,7 +1,7 @@
 # @e-mc/document
 
-* NodeJS 16
-* ES2020
+* NodeJS 16 LTS
+* ES2021
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.6/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.1/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -67,6 +67,8 @@ interface IDocument extends IClient<IFileManager, DocumentModule, TransformCallb
     set imports(value);
     get imports(): Record<string, string | undefined>;
     get watching(): boolean;
+    set host(value);
+    get host(): IFileManager | null;
 }
 
 interface DocumentConstructor extends ModuleConstructor {
@@ -183,15 +185,15 @@ NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. *
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/watch.d.ts
 
 ## LICENSE
 
-BSD 3-Clause
+BSD 3-Clause

package/index.js

@@ -1,9 +1,10 @@
 "use strict";
-const path = require("path");
-const fs = require("fs");
+const path = require("node:path");
+const fs = require("node:fs");
 const pm = require("picomatch");
 const yaml = require("js-yaml");
 const chalk = require("chalk");
+const node_util_1 = require("node:util");
 const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
 const db_1 = require("@e-mc/db");
@@ -11,12 +12,11 @@ const transform_1 = require("@e-mc/document/transform");
 const parse_1 = require("@e-mc/document/parse");
 const util_1 = require("@e-mc/document/util");
 const CACHE_PACKAGE = {};
-const CACHE_REQUIRE = {};
+const CACHE_TEMPLATE = {};
+const CACHE_EXTERNAL = {};
 const CACHE_ETAG = {};
 const CACHE_CODE = {};
 const CACHE_HASH = {};
-const CACHE_TEMPLATE = {};
-const CACHE_EXTERNAL = {};
 const CACHE_PICOMATCH = new Map();
 let CACHE_TOTAL = 0;
 function deleteTransform(map, key, timeout) {
@@ -28,7 +28,7 @@ function deleteTransform(map, key, timeout) {
 }
 function getSourceMappingURL(value, css) {
     if (value.includes(' ')) {
-        value = encodeURIComponent(value);
+        value = encodeURIComponent((0, node_util_1.toUSVString)(value));
     }
     return css ? `\n/*# sourceMappingURL=${value} */\n` : `\n//# sourceMappingURL=${value}\n`;
 }
@@ -57,7 +57,6 @@ const toBase64 = (value) => 'data:application/json;base64,' + Buffer.from(value)
 const toPosix = (value) => value.replace(/(?:^\\|\\+)/g, '/');
 const joinString = (name, ...values) => (name ? name + ': ' : '') + values.reduce((a, b) => b ? a + (a ? ' -> ' : '') + b : a, '');
 const truncateString = (value, width) => value.length > width ? value.substring(0, width - 3) + '...' : value.padStart(width);
-const spliceSource = (source, startIndex, endIndex, content) => source.substring(0, startIndex) + content + source.substring(endIndex);
 const isFunction = (value) => typeof value === 'function';
 class TransformCache {
     constructor(config, cacheData, cacheDir, encoding, formatKey) {
@@ -163,7 +162,7 @@ class TransformConfig {
         this.include = {};
     }
     init(options) {
-        let enabled, algorithm, etag, expires, renew, limit, exclude, include;
+        let enabled = false, algorithm, etag, expires, renew, limit, include, exclude;
         if (options === true || options === 'etag') {
             etag = true;
             enabled = true;
@@ -173,7 +172,7 @@ class TransformConfig {
             enabled = true;
         }
         else if ((0, types_1.isPlainObject)(options)) {
-            ({ enabled = true, algorithm, etag, expires, renew, limit, exclude, include } = options);
+            ({ enabled = true, algorithm, etag, expires, renew, limit, include, exclude } = options);
         }
         if (!enabled) {
             return false;
@@ -202,25 +201,25 @@ class TransformConfig {
         if (renew) {
             this.renew = true;
         }
-        if ((0, types_1.isPlainObject)(exclude)) {
-            for (const type in exclude) {
-                const item = exclude[type];
+        if ((0, types_1.isPlainObject)(include)) {
+            for (const type in include) {
+                const item = include[type];
                 if (item === '*') {
-                    this.exclude[type] = true;
+                    this.include[type] = true;
                 }
                 else if ((0, types_1.isArray)(item)) {
-                    this.exclude[type] = item;
+                    this.include[type] = item;
                 }
             }
         }
-        if ((0, types_1.isPlainObject)(include)) {
-            for (const type in include) {
-                const item = include[type];
+        if ((0, types_1.isPlainObject)(exclude)) {
+            for (const type in exclude) {
+                const item = exclude[type];
                 if (item === '*') {
-                    this.include[type] = true;
+                    this.exclude[type] = true;
                 }
                 else if ((0, types_1.isArray)(item)) {
-                    this.include[type] = item;
+                    this.exclude[type] = item;
                 }
             }
         }
@@ -343,7 +342,7 @@ class Document extends core_1.Client {
                     delete cache[name];
                 }
             }
-            for (const cache of [CACHE_PACKAGE, CACHE_REQUIRE, CACHE_EXTERNAL, CACHE_TEMPLATE]) {
+            for (const cache of [CACHE_PACKAGE, CACHE_EXTERNAL, CACHE_TEMPLATE]) {
                 for (const name in cache) {
                     delete cache[name];
                 }
@@ -515,7 +514,7 @@ class Document extends core_1.Client {
                     lastIndex = match.index + match[0].length;
                 }
             }
-            return spliceSource(source, lastIndex, lastIndex, ident.repeat(length) + replacement + newline);
+            return (0, util_1.spliceString)(source, lastIndex, lastIndex, ident.repeat(length) + replacement + newline);
         }
         if (updateOnly) {
             return source;
@@ -530,7 +529,7 @@ class Document extends core_1.Client {
             trailing += ident.repeat(i) + '}' + newline;
         }
         const content = leading + ident.repeat(length) + replacement + newline + trailing;
-        return lastIndex > 0 ? spliceSource(source, lastIndex, lastIndex, content) : source.trimEnd() + newline + newline + content;
+        return lastIndex > 0 ? (0, util_1.spliceString)(source, lastIndex, lastIndex, content) : source.trimEnd() + newline + newline + content;
     }
     static generateLintTable(messages, options) {
         const { leadingText, trailingText, pathname, filename, ruleWidth = 30, messageWidth = 60 } = options;
@@ -566,7 +565,7 @@ class Document extends core_1.Client {
             if (fatal) {
                 ++fatalErrorCount;
             }
-            const [type, errorColor] = typeof error === 'boolean' ? error ? [types_1.STATUS_TYPE.ERROR, 'red'] : [types_1.STATUS_TYPE.WARN, 'yellow'] : [types_1.STATUS_TYPE.INFO, 'white'];
+            const [type, errorColor] = error === true ? [types_1.STATUS_TYPE.ERROR, 'red'] : error === false ? [types_1.STATUS_TYPE.WARN, 'yellow'] : [types_1.STATUS_TYPE.INFO, 'white'];
             maxWidth = Math.max(1 + 0 + 1 + 0 + 1 + 2 + Math.min(Math.max(ruleId.length, ruleWidth), ruleWidth) + 2 + Math.min(Math.max(message.length, messageWidth), messageWidth), maxWidth);
             result.push({
                 type,
@@ -708,32 +707,30 @@ class Document extends core_1.Client {
         }
         this.assets = assets;
         super.init();
-        if (ignoreExtensions) {
-            if (ignoreExtensions === true || ignoreExtensions === this.moduleName || (0, types_1.isArray)(ignoreExtensions) && ignoreExtensions.includes(this.moduleName)) {
-                this._extensions = [];
-            }
-            else {
-                const extensions = this._extensions;
-                if ((0, types_1.isArray)(extensions)) {
-                    if (typeof ignoreExtensions === 'string') {
-                        this._extensions = extensions.filter(value => value !== ignoreExtensions);
-                    }
-                    else if ((0, types_1.isArray)(ignoreExtensions)) {
-                        this._extensions = extensions.filter(value => !ignoreExtensions.includes(value));
-                    }
+        if (!ignoreExtensions) {
+            return this;
+        }
+        if (ignoreExtensions === true || ignoreExtensions === this.moduleName || (0, types_1.isArray)(ignoreExtensions) && ignoreExtensions.includes(this.moduleName)) {
+            this._extensions = [];
+        }
+        else {
+            const extensions = this._extensions;
+            if ((0, types_1.isArray)(extensions)) {
+                if (typeof ignoreExtensions === 'string') {
+                    this._extensions = extensions.filter(value => value !== ignoreExtensions);
+                }
+                else if ((0, types_1.isArray)(ignoreExtensions)) {
+                    this._extensions = extensions.filter(value => !ignoreExtensions.includes(value));
                 }
             }
         }
         return this;
     }
     abort(name, reason) {
-        if (name instanceof Error) {
-            reason ||= name;
-        }
         if (this.aborted || (0, types_1.isString)(name) && this.settingsOf(name, 'abort') !== true) {
             return;
         }
-        super.abort(reason);
+        super.abort(reason || (name instanceof Error ? name : undefined));
     }
     customize(options) {
         const transform = options.transform;
@@ -817,12 +814,12 @@ class Document extends core_1.Client {
         }
     }
     asSourceFile(value, options) {
-        let encoding, persist, cache;
+        let encoding, cache;
         if (typeof options === 'boolean') {
             cache = options;
         }
         else if ((0, types_1.isObject)(options)) {
-            ({ encoding, persist, cache } = options);
+            ({ encoding, cache } = options);
         }
         let result;
         if ((value = value.trim()).startsWith('npm:')) {
@@ -830,15 +827,9 @@ class Document extends core_1.Client {
                 return null;
             }
             const pkgName = value.substring(4);
-            if (persist) {
-                result = CACHE_REQUIRE[pkgName];
-            }
             if (!result) {
                 try {
                     result = require(pkgName);
-                    if (persist && result) {
-                        CACHE_REQUIRE[pkgName] = result;
-                    }
                     if (typeof result === 'function') {
                         return Object.defineProperty(result, "__cjs__", { value: true });
                     }
@@ -979,7 +970,7 @@ class Document extends core_1.Client {
         return (imports = this.imports) => {
             const href = file.uri;
             const sourceFile = [];
-            let mainFile, invalid;
+            let mainFile, invalid = false;
             if (Document.isFile(href, 'unc') || path.isAbsolute(href)) {
                 sourceFile.push([href]);
             }
@@ -1009,7 +1000,7 @@ class Document extends core_1.Client {
                                 }
                             }
                             catch (err) {
-                                this.writeFail(["Unable to read file", localUri && path.basename(localUri)], 32);
+                                this.writeFail(["Unable to read file", localUri && path.basename(localUri)], err, 32);
                             }
                         }
                         else if (bundleContent) {
@@ -1083,7 +1074,7 @@ class Document extends core_1.Client {
         }
     }
     async parseTemplate(viewEngine, template, data) {
-        let target, stored;
+        let target, stored = false;
         if (typeof viewEngine === 'string') {
             target = this.settings.view_engine?.[viewEngine];
             const userConfig = this.getUserSettings()?.view_engine?.[viewEngine];
@@ -1111,13 +1102,9 @@ class Document extends core_1.Client {
             return '';
         }
         try {
-            const name = target.name;
-            const context = require(name);
-            const { singleRow, options = {} } = target;
-            let { compile, output } = options;
-            if (!(0, types_1.isPlainObject)(output)) {
-                output = undefined;
-            }
+            const context = require(target.name);
+            let { singleRow, expires, options = {} } = target;
+            const { compile, output } = options;
             if (this.settingsOf('view_engine', 'coerce') === true) {
                 if (compile) {
                     (0, types_1.coerceObject)(compile, stored);
@@ -1126,20 +1113,37 @@ class Document extends core_1.Client {
                     (0, types_1.coerceObject)(output, stored);
                 }
             }
+            if (typeof expires === 'string') {
+                expires = (0, types_1.parseExpires)(expires);
+            }
             const username = this.host?.username || '';
-            const cache = CACHE_TEMPLATE[name] ||= {};
+            const cache = CACHE_TEMPLATE[target.name] ||= {};
             const cacheKey = (username ? username + ':' : '') + (0, types_1.hashKey)(template + (compile ? core_1.Client.asString(compile) : ''));
-            let result = '', render = cache[cacheKey], valid;
+            let result = '', render, valid = false;
+            if (expires !== 0) {
+                render = cache[cacheKey];
+            }
+            else if (username && cacheKey in cache) {
+                delete cache[cacheKey];
+            }
             if (!render) {
                 render = await context.compile(template, compile);
-                cache[cacheKey] = render;
-                if (!core_1.Client.enabled("memory.settings.users", username)) {
-                    setTimeout(() => delete cache[cacheKey], 60000);
+                if (expires !== 0) {
+                    cache[cacheKey] = render;
+                    if (core_1.Client.enabled("memory.settings.users", username)) {
+                        expires = typeof expires === 'number' && expires !== Infinity ? expires : 0;
+                    }
+                    else {
+                        expires = 60000;
+                    }
+                    if (expires > 0) {
+                        setTimeout(() => delete cache[cacheKey], expires);
+                    }
                 }
             }
             const writeRow = async (row) => {
                 const content = await render.call(context, row);
-                if (content !== undefined && content !== null) {
+                if (content != null) {
                     result += content;
                     valid = true;
                 }
@@ -1153,7 +1157,7 @@ class Document extends core_1.Client {
                     }
                 }
                 else if (!(0, types_1.isObject)(row)) {
-                    this.addLog(types_1.STATUS_TYPE.WARN, joinString('view engine', name, `row #${i + 1}`, core_1.Client.asString(row) || "Unknown"));
+                    this.addLog(types_1.STATUS_TYPE.WARN, joinString('view engine', target.name, `row #${i + 1}`, core_1.Client.asString(row) || "Unknown"));
                     continue;
                 }
                 if (!singleRow) {
@@ -1180,9 +1184,9 @@ class Document extends core_1.Client {
         const username = this.host?.username || '';
         const config = this._transformConfig;
         const cacheData = config && options.cacheData;
-        let cache = null, cacheDir = false, excludeKey;
+        let cache = null, excludeKey;
         if (cacheData) {
-            cacheDir = username && core_1.Client.enabled("memory.settings.users", username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users");
+            const cacheDir = username && core_1.Client.enabled("memory.settings.users", username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users");
             if (cacheDir && !CACHE_EXTERNAL[excludeKey = this.moduleName + '_' + type + '_' + format] && config.valid(type, format)) {
                 const { uri, etag } = cacheData;
                 const encoding = (0, types_1.getEncoding)(cacheData.encoding);
@@ -1213,7 +1217,7 @@ class Document extends core_1.Client {
         const imports = transform.imports ||= {};
         const series = new transform_1.TransformSeries(type, code, options);
         series.init(this, __dirname);
-        let valid, excluded, userData, userImports, ignoreCache, storedLog, sourceFiles;
+        let valid = false, excluded = false, userData, userImports, ignoreCache = false, storedLog, sourceFiles;
         if (username && (0, types_1.isObject)(transform = this.getUserSettings()?.transform)) {
             userData = transform[type];
             if (!(0, types_1.isObject)(userData)) {
@@ -1265,7 +1269,7 @@ class Document extends core_1.Client {
             if (plugin && baseConfig) {
                 series.outputConfig = outputConfig;
                 const source = series.code;
-                const startTime = process.hrtime();
+                const startTime = process.hrtime.bigint();
                 const hint = plugin + ':' + name;
                 const next = (value) => {
                     if (this.aborted) {
@@ -1273,7 +1277,7 @@ class Document extends core_1.Client {
                         return;
                     }
                     const out = series.out;
-                    let bypassLog, failed;
+                    let bypassLog = false, failed = false;
                     if (typeof value !== 'string' || (0, types_1.isArray)(out.sourceFiles) && this.hasOwnPermission() && out.sourceFiles.some(item => !this.canRead(item, { ownPermissionOnly: true }))) {
                         failed = true;
                         ignoreCache = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.10.6",
+  "version": "0.11.1",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,9 +20,9 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.10.6",
-    "@e-mc/db": "0.10.6",
-    "@e-mc/types": "0.10.6",
+    "@e-mc/core": "0.11.1",
+    "@e-mc/db": "0.11.1",
+    "@e-mc/types": "0.11.1",
     "chalk": "4.1.2",
     "domhandler": "^5.0.3",
     "domutils": "^3.1.0",

package/parse/dom.js

@@ -14,7 +14,10 @@ const REGEXP_VOID = TAG_VOID.map(tagName => new RegExp(`(\\s*)</${tagName}\\s*>`
 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 {
-    static hasInnerXml(tagName) {
+    static hasInnerXml(tagName, ignoreCase) {
+        if (ignoreCase) {
+            tagName = tagName.toLowerCase();
+        }
         return !TAG_VOID.includes(tagName);
     }
     static normalize(source, newline, ignoreChar = '', escapeEntities) {
@@ -247,7 +250,7 @@ class HtmlElement extends index_1.XmlElement {
     }
     get outerXml() {
         const [tagName, items, innerXml] = this.getOuterContent();
-        return '<' + tagName + HtmlElement.writeAttributes(items) + '>' + (DomWriter.hasInnerXml(tagName) && 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' ? index_1.XmlWriter.escapeXmlString(innerXml) : innerXml) + `</${tagName}>` : '');
     }
 }
 exports.HtmlElement = HtmlElement;

package/parse/index.js

@@ -1,9 +1,9 @@
 "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 crypto = require("crypto");
 const types_1 = require("@e-mc/types");
 const module_1 = require("@e-mc/module");
 const util_1 = require("@e-mc/document/util");
@@ -29,14 +29,13 @@ const PATTERN_TRAILINGSPACE = '[ \\t]*((?:\\r?\\n)*)';
 const REGEXP_ATTRNAME = new RegExp('\\s+' + PATTERN_ATTRNAME, 'g');
 const REGEXP_ATTRVALUE = new RegExp(PATTERN_ATTRNAME + '\\s*' + PATTERN_ATTRVALUE, 'g');
 const REGEXP_TAGATTR = new RegExp(`<${PATTERN_TAGNAME}\\s+(${PATTERN_TAGOPEN}*)>`, 'g');
-const REGEXP_ESCAPECHAR = /[-|\\{}()[\]^$+*?.]/g;
 function applyAttributes(attrs, data, ignoreCase) {
     for (const key in data) {
         attrs.set(ignoreCase && typeof key === 'string' ? key.toLowerCase() : key.toString(), data[key]);
     }
 }
 function deletePosition(item, rootName, startIndex) {
-    if (isIndex(item.startIndex) && (!isIndex(startIndex) || item.startIndex >= startIndex) && item.tagName !== rootName) {
+    if (isIndex(item.startIndex) && (startIndex === -1 || item.startIndex >= startIndex) && item.tagName !== rootName) {
         item.startIndex = undefined;
         item.endIndex = undefined;
     }
@@ -52,8 +51,16 @@ function resetTagPosition(item) {
 }
 function findCloseIndex(source, tagName, lastIndex, ignoreCase) {
     const flags = ignoreCase ? 'gi' : 'g';
-    const pattern = CACHE_TAGNAME[tagName + flags + '0'] ||= new RegExp(`<(?:${escapeTagName(tagName)}\\s*|/${escapeTagName(tagName)}\\s*>)`, flags);
-    pattern.lastIndex = lastIndex;
+    const key = tagName + flags + '0';
+    let pattern = CACHE_TAGNAME[key];
+    if (pattern) {
+        pattern.lastIndex = lastIndex;
+    }
+    else {
+        const tag = escapeTagName(tagName);
+        pattern = new RegExp(`<(?:${tag}\\s*|/${tag}\\s*>)`, flags);
+        CACHE_TAGNAME[key] = pattern;
+    }
     let openTag = 1, closeTag = 0, match;
     while (match = pattern.exec(source)) {
         if (match[0][1] !== '/') {
@@ -98,7 +105,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 escapeTagName = (value) => value.replace(REGEXP_ESCAPECHAR, capture => capture === '-' ? '\\x2d' : '\\' + capture);
+const escapeTagName = (value) => value.replace(/[-.]/g, capture => capture === '-' ? '\\x2d' : '\\' + capture);
 class XmlWriter {
     static get PATTERN_ATTRNAME() {
         return PATTERN_ATTRNAME;
@@ -129,16 +136,15 @@ class XmlWriter {
         if (options) {
             let pattern;
             if ((0, types_1.isPlainObject)(options)) {
-                let trimLeading, trimTrailing;
-                ({ pattern, trimLeading, trimTrailing } = options);
-                if (trimLeading) {
+                if (options.trimLeading) {
                     const length = leading.length;
                     leading = leading.trimEnd();
                     index -= length - leading.length;
                 }
-                if (trimTrailing) {
+                if (options.trimTrailing) {
                     trailing = trailing.trimStart();
                 }
+                pattern = options.pattern;
             }
             else {
                 pattern = options;
@@ -168,7 +174,7 @@ class XmlWriter {
     static escapeAttributes(source) {
         let escaped, match, attribute;
         while (match = REGEXP_TAGATTR.exec(source)) {
-            let output = match[0], modified;
+            let output = match[0], modified = false;
             while (attribute = REGEXP_ATTRVALUE.exec(match[1])) {
                 const value = attribute[2] || attribute[3] || attribute[4];
                 if (value && (escaped = this.escapeXmlString(value)) !== value) {
@@ -340,7 +346,7 @@ class XmlWriter {
         }, { xmlMode: true, decodeEntities: false, lowerCaseAttributeNames: false, ...parser }).end(source);
         if ((0, types_1.isString)(replacement)) {
             const next = this.getTagOffset(replacement, options);
-            let modified;
+            let modified = false;
             for (const tagName of new Set([...Object.keys(result), ...Object.keys(next)])) {
                 if (result[tagName] !== next[tagName]) {
                     result[tagName] = (next[tagName] || 0) - (result[tagName] || 0);
@@ -451,6 +457,10 @@ class XmlWriter {
         this.failCount = 0;
         this.errors = [];
         this.newline = '\n';
+        this.ignoreTagName = '';
+        this.ignoreTagGroup = undefined;
+        this.ignoreCaseTagName = false;
+        this.rootName = '';
         this._tagCount = Object.create(null);
         this._hasInvalidContent = true;
         this._ignoreFlag = 0;
@@ -473,7 +483,7 @@ class XmlWriter {
                 item.tagCount += offsetMap?.[tagName] || 0;
                 this._tagCount[tagName] = item.tagCount;
             }
-            deletePosition(item, rootName);
+            deletePosition(item, rootName, -1);
         }
         if (appending.length > 0) {
             this.insertNodes(appending);
@@ -641,7 +651,7 @@ class XmlWriter {
     }
     update(node, outerXml, append, offsetMap) {
         const { elements, documentName, rootName } = this;
-        const { tagName, startIndex, endIndex } = node;
+        const { tagName, startIndex = -1, endIndex } = node;
         const items = [];
         const updateMap = offsetMap && Object.keys(offsetMap).length > 0;
         const index = isIndex(node.index) ? node.index : -1;
@@ -660,7 +670,7 @@ class XmlWriter {
                     item.endIndex = endIndex;
                 }
                 else {
-                    deletePosition(item, rootName);
+                    deletePosition(item, rootName, -1);
                 }
             }
             else {
@@ -935,11 +945,11 @@ class XmlWriter {
         this.ignoreTagName = tagName + value;
         this._patternIgnore = null;
     }
-    resetPosition(startIndex) {
+    resetPosition(startIndex = -1) {
         const rootName = this.rootName;
-        this.elements.forEach(item => {
+        for (const item of this.elements) {
             deletePosition(item, rootName, startIndex);
-        });
+        }
     }
     close() {
         const source = this.source;
@@ -1215,7 +1225,7 @@ class XmlElement {
         }
         else {
             if (options.append) {
-                let i = startIndex - 1, ch, newline;
+                let i = startIndex - 1, ch, newline = false;
                 while (XmlWriter.isSpace(ch = source[i--])) {
                     if (ch === '\n') {
                         newline = true;
@@ -1298,10 +1308,17 @@ class XmlElement {
         }
         else if (id || isIndex(tagIndex) && isCount(tagCount)) {
             complete: {
-                const pattern = CACHE_TAGNAME[tagName + flags + '2'] ||= new RegExp(`<(?:${escapeTagName(tagName)}[\\s|>]|/${escapeTagName(tagName)}\\s*>)`, flags);
                 const openTag = [];
-                let openCount = 0, found, match;
-                pattern.lastIndex = 0;
+                const key = tagName + flags + '2';
+                let pattern = CACHE_TAGNAME[key], openCount = 0, found = false, match;
+                if (pattern) {
+                    pattern.lastIndex = 0;
+                }
+                else {
+                    const tag = escapeTagName(tagName);
+                    pattern = new RegExp(`<(?:${tag}[\\s|>]|/${escapeTagName(tag)}\\s*>)`, flags);
+                    CACHE_TAGNAME[key] = pattern;
+                }
                 while (match = pattern.exec(source)) {
                     const startIndex = match.index;
                     if (match[0][1] === '/') {
@@ -1332,7 +1349,7 @@ class XmlElement {
                                     ++tag[2];
                                 }
                             }
-                            openCount = openTag.push([startIndex, -1, 1, id && !found && hasId(id, source, startIndex, endIndex) ? (found = true) && 1 : 0]);
+                            openCount = openTag.push([startIndex, -1, 1, id && !found && hasId(id, source, startIndex, endIndex) ? (found = true, 1) : 0]);
                         }
                         pattern.lastIndex = endIndex;
                     }

package/parse/types/index.d.ts

@@ -33,14 +33,14 @@ export interface XmlTagNode extends IXmlTagNode, Partial<SourceIndex> {}
 
 export type AttributeMap = Map<string, unknown>;
 export type AttributeList = [string, unknown][];
-export type TagOffsetMap = ObjectMap<Undef<number>>;
-export type WriteResult = [string, string, Null<Error>?];
-export type SaveResult = [string, Null<Error>?];
+export type TagOffsetMap = ObjectMap<number | undefined>;
+export type WriteResult = [string, string, (Error | null)?];
+export type SaveResult = [string, (Error | null)?];
 export type XmlWriterOptions = ParserAction;
 
 export interface ParserResult extends Partial<TagData>, ParserAction {
-    element: Null<Element>;
-    error: Null<Error>;
+    element: Element | null;
+    error: Error | null;
 }
 
 export interface ReplaceOptions extends SourceIndex {
@@ -106,38 +106,38 @@ export class IXmlWriter extends IXmlBase {
     failCount: number;
     elements: XmlTagNode[];
     errors: Error[];
+    ignoreTagName: string;
+    ignoreTagGroup: string[] | undefined;
     parser?: ParserOptions;
-    ignoreTagName?: string;
-    ignoreTagGroup?: string[];
-    readonly rootName?: string;
-    readonly ignoreCaseTagName?: boolean;
+    readonly rootName: string;
+    readonly ignoreCaseTagName: boolean;
     init(offsetMap?: TagOffsetMap): void;
-    getInvalidArea(): Undef<SourceContent[]>;
+    getInvalidArea(): SourceContent[] | undefined;
     ignoreFlag(...values: number[]): void;
     insertNodes(nodes?: XmlTagNode[]): void;
     fromNode(node: XmlTagNode, append?: TagAppend): IXmlElement;
     newElement(node: XmlTagNode): IXmlElement;
-    append(node: XmlTagNode): Null<IXmlElement>;
+    append(node: XmlTagNode): IXmlElement | null;
     write(element: IXmlElement): boolean;
     save(): string;
     close(): string;
-    update(node: XmlTagNode, outerXml: string, append?: TagAppend, offsetMap?: Null<TagOffsetMap>): void;
+    update(node: XmlTagNode, outerXml: string, append?: TagAppend, offsetMap?: TagOffsetMap | null): void;
     increment(nodes: XmlTagNode[], offset?: number): void;
     decrement(node: XmlTagNode, offset?: number, remove?: boolean): XmlTagNode[];
     renameTag(node: XmlTagNode, tagName: string): void;
     indexTag(tagName: string, append?: TagAppend, offset?: number): void;
     resetTag(tagName: string): void;
-    ignoreTag(value: ArrayOf<string>): void;
+    ignoreTag(value: string | string[]): void;
     resetPosition(startIndex?: number): void;
-    getElementById(id: string, ignoreCase?: boolean, options?: TagNodeByIdOptions): Undef<SourceTagNode>;
+    getElementById(id: string, ignoreCase?: boolean, options?: TagNodeByIdOptions): SourceTagNode | undefined;
     getElementsByTagName(tagName: string, ignoreCase?: boolean, options?: TagNodeOptions): SourceTagNode[];
     setRawString(targetXml: string, outerXml: string): string;
     getRawString(index: SourceIndex): string;
     spliceRawString(content: SourceContent, reset?: boolean): string;
-    getComments(): Null<SourceContent[]>;
+    getComments(): SourceContent[] | null;
     hasErrors(): boolean;
     get newId(): string;
-    get patternIgnore(): Null<RegExp>;
+    get patternIgnore(): RegExp | null;
     set source(value);
     get source(): string;
 }
@@ -150,8 +150,8 @@ export interface XmlWriterConstructor {
     readonly PATTERN_QUOTEVALUE: string;
     readonly PATTERN_COMMENT: string;
     readonly PATTERN_TRAILINGSPACE: string;
-    replaceMatch(match: RegExpMatchArray, source: string, content: NumString, options: ReplaceMatchOptions): string;
-    replaceMatch(match: RegExpMatchArray, source: string, content?: NumString, pattern?: RegExp): string;
+    replaceMatch(match: RegExpMatchArray, source: string, content: number | string, options: ReplaceMatchOptions): string;
+    replaceMatch(match: RegExpMatchArray, source: string, content?: number | string, pattern?: RegExp): string;
     escapeXmlString(value: string, ampersand?: boolean): string;
     escapeAttributes(source: string): string;
     getNewlineString(leading: string, trailing: string, newline?: string): string;
@@ -165,11 +165,11 @@ export interface XmlWriterConstructor {
     getNameOfId(document: string): string;
     getPatternId(name: string): RegExp;
     getCommentsAndCDATA(source: string, tagPattern: unknown, ignoreCase: boolean, stripXml: true): string;
-    getCommentsAndCDATA(source: string, tagPattern?: ArrayOf<string> | [Undef<string>, Undef<string[]>], ignoreCase?: boolean, stripXml?: boolean): SourceContent[];
+    getCommentsAndCDATA(source: string, tagPattern?: string | string[] | [string | undefined, string[] | undefined], ignoreCase?: boolean, stripXml?: boolean): SourceContent[];
     isEqual(node: XmlTagNode, other: XmlTagNode, ignoreCase: boolean): boolean;
     isEqual(node: XmlTagNode, other: XmlTagNode, documentName?: string, ignoreCase?: boolean): boolean;
-    isIndex(value: Undef<number>): value is number;
-    isCount(value: Undef<number>): value is number;
+    isIndex(value: number | undefined): value is number;
+    isCount(value: number | undefined): value is number;
     isSpace(ch: string): boolean;
     readonly prototype: IXmlWriter;
     new(documentName: string, source: string, elements: XmlTagNode[], options?: XmlWriterOptions): IXmlWriter;
@@ -180,7 +180,7 @@ export class IXmlElement extends IXmlBase {
     readonly node: XmlTagNode;
     setAppend(value?: TagAppend): void;
     parseOuterXml(value?: string, tagVoid?: boolean): [string, string, boolean];
-    getTagOffset(replacement?: string, options?: TagOffsetOptions): Undef<TagOffsetMap>;
+    getTagOffset(replacement?: string, options?: TagOffsetOptions): TagOffsetMap | undefined;
     setAttribute(name: string, value: string): void;
     getAttribute(name: string): string;
     removeAttribute(...names: string[]): void;
@@ -189,7 +189,7 @@ export class IXmlElement extends IXmlBase {
     write(source: string, invalid?: SourceIndex[]): WriteResult;
     save(source: string, invalid?: SourceIndex[]): SaveResult;
     replace(source: string, options: ReplaceOptions): WriteResult;
-    findIndexOf(source: string): Undef<SourceIndex>;
+    findIndexOf(source: string): SourceIndex | undefined;
     getOuterContent(): [string, AttributeList, string];
     getInnerOffset(tagName: string): number;
     hasPosition(): boolean;
@@ -204,9 +204,9 @@ export class IXmlElement extends IXmlBase {
     get outerXml(): string;
     set remove(value);
     get remove(): boolean;
-    get append(): Undef<TagAppend>;
-    set tagOffset(value: Undef<TagOffsetMap>);
-    get tagOffset(): Undef<TagOffsetMap>;
+    get append(): TagAppend | undefined;
+    set tagOffset(value: TagOffsetMap | undefined);
+    get tagOffset(): TagOffsetMap | undefined;
     get ignoreCase(): boolean;
 }
 
@@ -218,16 +218,16 @@ export interface XmlElementConstructor {
 }
 
 export class IDomWriter extends IXmlWriter {
-    documentElement: Null<XmlTagNode>;
+    documentElement: XmlTagNode | null;
     readonly initOpts: DomWriterOptions;
 }
 
 export interface DomWriterConstructor extends XmlWriterConstructor {
-    hasInnerXml(tagName: string): boolean;
+    hasInnerXml(tagName: string, ignoreCase?: boolean): boolean;
     normalize(source: string, options: NormalizeOptions): string;
     normalize(source: string, newline?: string, ignoreChar?: string, escapeEntities?: boolean): string;
     getDocumentElement(source: string, parser?: ParserOptions): ParserResult;
-    getElementsByTagName(tagName: string | ((name: string) => boolean), nodes: ArrayOf<AnyNode>, recurse?: boolean, limit?: number): Element[];
+    getElementsByTagName(tagName: string | ((name: string) => boolean), nodes: AnyNode | AnyNode[], recurse?: boolean, limit?: number): Element[];
     readonly prototype: IDomWriter;
     new(documentName: string, source: string, elements: XmlTagNode[], options?: DomWriterOptions): IDomWriter;
     new(documentName: string, source: string, elements: XmlTagNode[], normalize?: boolean | string, escapeEntities?: boolean, parser?: ParserOptions): IDomWriter;

package/transform/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a, _b, _c, _d;
 exports.SourceMap = exports.TransformSeries = void 0;
-const path = require("path");
+const path = require("node:path");
 const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
 const kCode = Symbol('code');

package/util.d.ts

@@ -2,7 +2,7 @@ declare namespace util {
     /** @deprecated Types.IMPORT_MAP */
     const IMPORTS: Record<string, string | undefined>;
     const PATTERN_PARENTHESIS: string;
-    function loadPlugins<T = unknown>(name: string | unknown[], plugins?: unknown[]): T[];
+    function loadPlugins<T = unknown>(plugins: string | unknown[]): T[];
     function replaceAll(source: string, valueOf: (name: string) => string, opening?: string, closing?: string): string;
     function concatString(values: string[] | string | undefined, newline?: string): string;
     function spliceString(source: string, startIndex: number, endIndex: number, content: string, pattern?: RegExp): string;

package/util.js

@@ -13,13 +13,13 @@ exports.getHashData = getHashData;
 exports.hasValue = hasValue;
 exports.getModuleName = getModuleName;
 exports.removeInternalProperties = removeInternalProperties;
-const path = require("path");
+const path = require("node:path");
 const types_1 = require("@e-mc/types");
 Object.defineProperty(exports, "IMPORTS", { enumerable: true, get: function () { return types_1.IMPORT_MAP; } });
 Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
-function loadPlugins(name, plugins = []) {
-    if (Array.isArray(name)) {
-        plugins = name;
+function loadPlugins(plugins) {
+    if (!Array.isArray(plugins)) {
+        plugins = [plugins];
     }
     const result = [];
     for (const plugin of plugins.map(item => (0, types_1.isString)(item) ? [item, undefined] : Array.isArray(item) && (0, types_1.isString)(item[0]) ? item : null)) {
@@ -207,7 +207,7 @@ function getModuleName(err) {
 function removeInternalProperties(value, retaining) {
     if ((0, types_1.isObject)(value)) {
         for (const prop in value) {
-            if (Object.prototype.hasOwnProperty.call(value, prop)) {
+            if (Object.hasOwn(value, prop)) {
                 if (retaining) {
                     if (!retaining.includes(prop)) {
                         delete value[prop];