@e-mc/document 0.11.7 → 0.12.0

package/README.md

@@ -1,7 +1,7 @@
 # @e-mc/document
 
-* NodeJS 16 LTS
-* ES2021
+* NodeJS 18
+* ES2022
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.0/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -61,7 +61,7 @@ interface IDocument extends IClient<IFileManager, DocumentModule, TransformCallb
     cloudUpload?(state: IScopeOrigin<IFileManager, ICloud>, file: ExternalAsset, url: string, active: boolean): Promise<boolean>;
     cloudFinalize?(state: IScopeOrigin<IFileManager, ICloud>): Promise<unknown[]>;
     watchInit?(watch: IFileGroup<ExternalAsset>, assets: ExternalAsset[], sanitize?: boolean): WatchInitResult | undefined;
-    watchModified?(watch: IFileGroup<ExternalAsset>, assets?: ExternalAsset[]): PostFinalizeCallback;
+    watchModified?(watch: IFileGroup<ExternalAsset>, assets?: ExternalAsset[], recursive?: [string, string[]][]): PostFinalizeCallback;
     set dataSource(value: DataSource[]);
     get dataSource(): DataSource[];
     set imports(value);
@@ -185,14 +185,14 @@ NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. *
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.0/lib/watch.d.ts
 
 ## LICENSE
 

package/index.js

@@ -11,6 +11,7 @@ const db_1 = require("@e-mc/db");
 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 kDocument = Symbol.for('document:constructor');
 const CACHE_PACKAGE = {};
 const CACHE_TEMPLATE = {};
 const CACHE_EXTERNAL = {};
@@ -54,19 +55,23 @@ const fixHint = (warningCount, errorCount, value) => warningCount > 0 || errorCo
 const compareValue = (value) => value.replace(/["'()]/g, '').trim();
 const toPath = (uri, hostname) => path.resolve(hostname[1], uri.substring(normalizeDir(hostname[0]).length).split('?')[0]);
 const toBase64 = (value) => 'data:application/json;base64,' + Buffer.from(value).toString('base64');
-const toPosix = (value) => value.replace(/(?:^\\|\\+)/g, '/');
+const toPosix = (value) => core_1.Client.PLATFORM_WIN32 ? value.trim().replace(/(?:^\\|\\+)/g, '/') : value;
 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 isFunction = (value) => typeof value === 'function';
 class TransformCache {
+    config;
+    cacheData;
+    cacheDir;
+    encoding;
+    formatKey;
+    formatType = 0;
+    hashKey = '';
     constructor(config, cacheData, cacheDir, encoding, formatKey) {
         this.config = config;
         this.cacheData = cacheData;
         this.cacheDir = cacheDir;
         this.encoding = encoding;
         this.formatKey = formatKey;
-        this.formatType = 0;
-        this.hashKey = '';
     }
     set(type, data) {
         let pathname;
@@ -151,15 +156,16 @@ class TransformCache {
     }
 }
 class TransformConfig {
+    moduleName;
+    algorithm = undefined;
+    etag = false;
+    expires = 0;
+    renew = false;
+    limit = Infinity;
+    exclude = {};
+    include = {};
     constructor(moduleName) {
         this.moduleName = moduleName;
-        this.algorithm = undefined;
-        this.etag = false;
-        this.expires = 0;
-        this.renew = false;
-        this.limit = Infinity;
-        this.exclude = {};
-        this.include = {};
     }
     init(options) {
         let enabled = false, algorithm, etag, expires, renew, limit, include, exclude;
@@ -326,6 +332,7 @@ class TransformConfig {
     }
 }
 class Document extends core_1.Client {
+    static [kDocument] = true;
     static async purgeMemory(percent = 1, limit = 0, parent) {
         if (limit > 0 && CACHE_TOTAL < limit) {
             return 0;
@@ -377,7 +384,7 @@ class Document extends core_1.Client {
             }
             try {
                 const args = [instance];
-                if (ext["__cjs__"]) {
+                if ((0, types_1.isFunction)(ext, true)) {
                     args.push(__dirname);
                 }
                 else if (core_1.Client.enabled("node.require.inline")) {
@@ -427,7 +434,7 @@ class Document extends core_1.Client {
                     }
                 }
             }
-            let code = data.code.replace(transform_1.SourceMap.RE_SOURCE_MAPPING_URL, (...capture) => {
+            let code = data.code.replace(transform_1.SourceMap.SOURCE_MAPPING_URL, (...capture) => {
                 flags |= 1;
                 if (capture[2] && capture[5]) {
                     css = true;
@@ -598,14 +605,14 @@ class Document extends core_1.Client {
         }
         return result;
     }
+    Db = null;
+    _assets = null;
+    _dataSource = null;
+    _transformConfig = null;
+    _mimeMap = null;
+    _imports = null;
     constructor(data) {
         super(data);
-        this.Db = null;
-        this._assets = null;
-        this._dataSource = null;
-        this._transformConfig = null;
-        this._mimeMap = null;
-        this._imports = null;
         const transform = this.settingsOf('transform', 'cache');
         if (transform !== undefined) {
             this.customize({ transform });
@@ -678,9 +685,9 @@ class Document extends core_1.Client {
             let instance;
             if (handler && handler !== "@e-mc/db") {
                 try {
-                    const Handler = require(handler);
-                    if (isFunction(Handler) && Handler.prototype instanceof core_1.ClientDb) {
-                        instance = new Handler(db, database);
+                    const Module = require(handler);
+                    if (core_1.Client.constructorOf(Module, 'clientdb')) {
+                        instance = new Module(db, database);
                     }
                     else {
                         throw (0, types_1.errorMessage)(this.moduleName, "Not a Db constructor", handler);
@@ -710,7 +717,7 @@ class Document extends core_1.Client {
         if (!ignoreExtensions) {
             return this;
         }
-        if (ignoreExtensions === true || ignoreExtensions === this.moduleName || (0, types_1.isArray)(ignoreExtensions) && ignoreExtensions.includes(this.moduleName)) {
+        if (ignoreExtensions === true || ignoreExtensions === this.moduleName || Array.isArray(ignoreExtensions) && ignoreExtensions.includes(this.moduleName)) {
             this._extensions = [];
         }
         else {
@@ -730,7 +737,10 @@ class Document extends core_1.Client {
         if (this.aborted || (0, types_1.isString)(name) && this.settingsOf(name, 'abort') !== true) {
             return;
         }
-        super.abort(reason || (name instanceof Error ? name : undefined));
+        if (name instanceof Error) {
+            reason ||= name;
+        }
+        super.abort(reason);
     }
     customize(options) {
         const transform = options.transform;
@@ -793,25 +803,24 @@ class Document extends core_1.Client {
     }
     resolveDir(name, ...paths) {
         let baseDir = this.settings.directory?.[name];
-        if (!baseDir) {
-            return;
-        }
-        try {
-            baseDir = path.resolve(baseDir);
-            const username = this.host?.username;
-            let result;
-            if (username) {
-                const leading = path.join(baseDir, 'users', username);
-                if (fs.existsSync(result = path.join(leading, ...paths))) {
+        if (baseDir) {
+            try {
+                baseDir = path.resolve(baseDir);
+                const username = this.host?.username;
+                let result;
+                if (username) {
+                    const leading = path.join(baseDir, 'users', username);
+                    if (fs.existsSync(result = path.join(leading, ...paths))) {
+                        return result;
+                    }
+                }
+                if (fs.existsSync(result = path.join(baseDir, ...paths))) {
                     return result;
                 }
             }
-            if (fs.existsSync(result = path.join(baseDir, ...paths))) {
-                return result;
+            catch {
             }
         }
-        catch {
-        }
     }
     asSourceFile(value, options) {
         let encoding, cache;
@@ -854,7 +863,7 @@ class Document extends core_1.Client {
                 catch {
                 }
             }
-            if ((0, types_1.isObject)(result) || typeof result === 'function' && (result["__cjs__"] || this.hasEval('function'))) {
+            if ((0, types_1.isObject)(result) || (0, types_1.isFunction)(result, true) || typeof result === 'function' && this.hasEval('function')) {
                 return result;
             }
         }
@@ -864,8 +873,8 @@ class Document extends core_1.Client {
         return null;
     }
     findVersion(name, fallback = '') {
-        let result;
         const versions = this.module.versions;
+        let result;
         if (versions) {
             if (Array.isArray(name)) {
                 for (const value of name) {
@@ -900,34 +909,33 @@ class Document extends core_1.Client {
         }
         const importsStrict = this.getUserSettings()?.imports_strict ?? this.settings.imports_strict;
         const scopes = (importsStrict ? this.findSourceScope(uri, imports) : []).concat([imports]);
-        const isDir = /[\\/]$/;
+        const protocol = core_1.Client.isURL(uri);
         let result;
         for (const scope of scopes) {
             for (const url in scope) {
                 if (uri === url && (0, types_1.isString)(result = scope[url])) {
                     if (importsStrict) {
-                        if (isDir.test(url) || !core_1.Client.isPath(result)) {
-                            continue;
+                        if (core_1.Client.isPath(result) && !(protocol ? url : toPosix(url)).endsWith('/')) {
+                            return toPosix(result);
                         }
-                        return toPosix(result);
+                        continue;
                     }
                     return result;
                 }
             }
         }
-        const remote = toPosix(uri);
         const found = [];
         if (importsStrict) {
-            const protocol = core_1.Client.isURL(remote);
+            const remote = protocol ? uri : toPosix(uri);
             for (const scope of scopes) {
                 for (const url in scope) {
                     const local = protocol ? url : toPosix(url);
-                    if (isDir.test(local) && remote.startsWith(local) && (result = scope[url]) && isDir.test(result)) {
+                    if (local.endsWith('/') && remote.startsWith(local) && (result = scope[url]) && result.endsWith('/')) {
                         if (protocol) {
                             found.push([url, result]);
                         }
                         else if (core_1.Client.isPath(result = path.join(result, remote.substring(local.length)))) {
-                            return core_1.Client.PLATFORM_WIN32 ? toPosix(result) : result;
+                            return toPosix(result);
                         }
                     }
                 }
@@ -962,7 +970,7 @@ class Document extends core_1.Client {
                 result = toPath(uri, found[0]);
             }
             if (result) {
-                return core_1.Client.PLATFORM_WIN32 ? toPosix(result) : result;
+                return toPosix(result);
             }
         }
     }
@@ -990,7 +998,7 @@ class Document extends core_1.Client {
                         if (item.bundleIndex === 0) {
                             const localUri = item.localUri;
                             try {
-                                source = fs.readFileSync(localUri, file.encoding ||= 'utf-8');
+                                source = fs.readFileSync(localUri, file.encoding ||= 'utf8');
                                 if (this.resolveUri && (0, types_1.isArray)(file.trailingContent)) {
                                     let trailing;
                                     [source, trailing] = this.resolveUri(file, source, (0, util_1.concatString)(file.trailingContent));
@@ -1014,7 +1022,7 @@ class Document extends core_1.Client {
                     }
                 }
             }
-            if (sourceFile.length > 0 && (sourceFile[0] && (mainFile = sourceFile[0][0]) || !invalid) && (!this.hasOwnPermission() || !sourceFile.some(item => item[0] && !this.canRead(item[0])))) {
+            if (sourceFile.length > 0 && (sourceFile[0] && (mainFile = sourceFile[0][0]) || !invalid) && (!this.hasPermission('fs') && !process.permission || !sourceFile.some(item => item[0] && !this.canRead(item[0])))) {
                 return { code, sourceFile: !invalid ? sourceFile : undefined, sourcesRelativeTo: mainFile && path.dirname(mainFile) };
             }
         };
@@ -1091,20 +1099,18 @@ class Document extends core_1.Client {
         else {
             target = viewEngine;
         }
-        if (!((0, types_1.isPlainObject)(target) && target.name)) {
+        if (!(0, types_1.isPlainObject)(target) || !(0, types_1.isString)(target.name)) {
             this.abort('view_engine');
             const from = typeof viewEngine === 'string' ? viewEngine : this.moduleName;
             this.writeFail(["Unable to load configuration", from], (0, types_1.errorMessage)('view-engine', from, "Unknown"));
             return null;
         }
-        const length = data.length;
-        if (length === 0 && !target.outputEmpty) {
+        if (data.length === 0 && !target.outputEmpty) {
             return '';
         }
         try {
             const context = require(target.name);
-            let { singleRow, expires, options = {} } = target;
-            const { compile, output } = options;
+            const { compile, output } = target.options || {};
             if (this.settingsOf('view_engine', 'coerce') === true) {
                 if (compile) {
                     (0, types_1.coerceObject)(compile, stored);
@@ -1113,13 +1119,10 @@ 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[target.name] ||= {};
             const cacheKey = (username ? username + ':' : '') + (0, types_1.hashKey)(template + (compile ? core_1.Client.asString(compile) : ''));
-            let result = '', render, valid = false;
+            let result = '', valid = false, expires = typeof target.expires === 'string' ? (0, types_1.parseExpires)(target.expires) : target.expires, render;
             if (expires !== 0) {
                 render = cache[cacheKey];
             }
@@ -1127,11 +1130,16 @@ class Document extends core_1.Client {
                 delete cache[cacheKey];
             }
             if (!render) {
-                render = await context.compile(template, compile);
+                if ((0, types_1.isArray)(compile)) {
+                    render = typeof context.compileSync === 'function' ? context.compileSync(template, ...compile) : await context.compile(template, ...compile);
+                }
+                else {
+                    render = typeof context.compileSync === 'function' ? context.compileSync(template, compile) : await context.compile(template, compile);
+                }
                 if (expires !== 0) {
                     cache[cacheKey] = render;
-                    if (core_1.Client.enabled("memory.settings.users", username)) {
-                        expires = typeof expires === 'number' && expires !== Infinity ? expires : 0;
+                    if (this.hasPermission('memory')) {
+                        expires = typeof expires === 'number' && expires !== Infinity ? Math.min(expires, core_1.Client.MAX_TIMEOUT) : 0;
                     }
                     else {
                         expires = 60000;
@@ -1148,7 +1156,8 @@ class Document extends core_1.Client {
                     valid = true;
                 }
             };
-            for (let i = 0, j = 0; i < length; ++i) {
+            const singleRow = !!target.singleRow;
+            for (let i = 0, j = 0; i < data.length; ++i) {
                 let row = data[i];
                 if ((0, types_1.isPlainObject)(row)) {
                     row.__index__ ??= ++j;
@@ -1157,7 +1166,7 @@ class Document extends core_1.Client {
                     }
                 }
                 else if (!(0, types_1.isObject)(row)) {
-                    this.addLog(types_1.STATUS_TYPE.WARN, joinString('view engine', target.name, `row #${i + 1}`, core_1.Client.asString(row) || "Unknown"));
+                    this.addLog(types_1.STATUS_TYPE.WARN, joinString('view engine', target.name, core_1.Client.asString(row) || "Unknown"), { source: `row #${i + 1}` });
                     continue;
                 }
                 if (!singleRow) {
@@ -1177,16 +1186,18 @@ class Document extends core_1.Client {
     }
     async transform(type, code, format, options = {}) {
         let transform = this.settings.transform, data;
-        if (!(transform && (0, types_1.isObject)(data = transform[type]))) {
+        if (!(0, types_1.isObject)(transform) || !(0, types_1.isObject)(data = transform[type])) {
             return;
         }
-        format = typeof format === 'string' ? format.trim().split(/\s*\+\s*/) : format.map(item => typeof item === 'string' ? item.trim() : '');
+        if (typeof format === 'string') {
+            format = format.trim().split(/\s*\+\s*/);
+        }
         const username = this.host?.username || '';
         const config = this._transformConfig;
         const cacheData = config && options.cacheData;
         let cache = null, excludeKey;
         if (cacheData) {
-            const cacheDir = username && core_1.Client.enabled("memory.settings.users", username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users");
+            const cacheDir = this.hasPermission('memory.user') || this.cacheDir || this.hasPermission('memory');
             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);
@@ -1219,9 +1230,8 @@ class Document extends core_1.Client {
         series.init(this, __dirname);
         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)) {
-                userData = undefined;
+            if ((0, types_1.isObject)(transform[type])) {
+                userData = transform[type];
             }
             userImports = transform.imports;
         }
@@ -1234,9 +1244,6 @@ class Document extends core_1.Client {
                 break;
             }
             const name = format[i];
-            if (!name) {
-                continue;
-            }
             let [plugin, baseConfig, outputConfig, baseSettings] = this.findConfig(data, name, type);
             if (userData) {
                 const [a, b, c, d] = this.findConfig(userData, name, type);
@@ -1278,7 +1285,7 @@ class Document extends core_1.Client {
                     }
                     const out = series.out;
                     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 }))) {
+                    if (typeof value !== 'string' || (0, types_1.isArray)(out.sourceFiles) && (this.hasPermission('fs') || process.permission) && out.sourceFiles.some(item => !this.canRead(item, { ownPermissionOnly: true }))) {
                         failed = true;
                         ignoreCache = true;
                         this.writeFail(["Unable to transform document", plugin], (0, types_1.errorMessage)(plugin, name, typeof value === 'string' ? "Unsupported access" : "Empty"), { type: 4, startTime });
@@ -1333,7 +1340,7 @@ class Document extends core_1.Client {
                     series.packageName = plugin;
                     if (typeof baseConfig === 'function') {
                         series.baseConfig = outputConfig;
-                        if (baseConfig["__cjs__"]) {
+                        if ((0, types_1.isFunction)(baseConfig, true)) {
                             next(await baseConfig(context, source, series));
                         }
                         else {
@@ -1386,7 +1393,7 @@ class Document extends core_1.Client {
                                 }
                                 else {
                                     transformer = context;
-                                    context = this;
+                                    context = null;
                                 }
                                 if ((0, types_1.isObject)(transformer) && typeof transformer.default === 'function') {
                                     transformer = transformer.default;
@@ -1405,7 +1412,7 @@ class Document extends core_1.Client {
                             }
                         }
                         series.baseConfig = baseConfig;
-                        next(await transformer(context, source, series));
+                        next(await transformer(context || this, source, series));
                     }
                 }
                 catch (err) {
@@ -1416,7 +1423,7 @@ class Document extends core_1.Client {
                     }
                 }
             }
-            else {
+            else if (name) {
                 abortTransform();
                 if (plugin) {
                     this.writeFail("Unable to load configuration", (0, types_1.errorMessage)(plugin, name, "Invalid config"), 4);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.11.7",
+  "version": "0.12.0",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,13 +20,13 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.11.7",
-    "@e-mc/db": "0.11.7",
-    "@e-mc/types": "0.11.7",
+    "@e-mc/core": "0.12.0",
+    "@e-mc/db": "0.12.0",
+    "@e-mc/types": "0.12.0",
     "chalk": "4.1.2",
-    "domhandler": "^5.0.3",
-    "domutils": "^3.2.2",
-    "htmlparser2": "^9.1.0",
+    "domhandler": "*",
+    "domutils": "*",
+    "htmlparser2": "^10.0.0",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.2"
   }

package/parse/dom.js

@@ -20,10 +20,10 @@ class DomWriter extends index_1.XmlWriter {
         }
         return !TAG_VOID.includes(tagName);
     }
-    static normalize(source, newline, ignoreChar = '', escapeEntities) {
-        let ignoreTagGroup;
-        if ((0, types_1.isObject)(newline)) {
-            ({ newline, ignoreChar = '', ignoreTagGroup, escapeEntities } = newline);
+    static normalize(source, options) {
+        let newline, ignoreChar = '', ignoreTagGroup, escapeEntities;
+        if (options) {
+            ({ 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));
@@ -101,20 +101,14 @@ class DomWriter extends index_1.XmlWriter {
     static getElementsByTagName(tagName, nodes, recurse, limit) {
         return domutils.getElementsByTagName(tagName, nodes, recurse, limit);
     }
-    constructor(documentName, source, elements, options, escapeEntities, parser) {
-        let normalize, stripComments, ignoreTagGroup;
-        if ((0, types_1.isObject)(options)) {
-            ({ normalize, escapeEntities, stripComments, ignoreTagGroup, parser } = options);
-        }
-        else {
-            options = { normalize: options, escapeEntities, parser };
-        }
-        parser ||= { ...PARSER_OPTIONS };
+    documentElement = null;
+    ignoreTagName = "title|style|script";
+    initOpts;
+    rootName = "html";
+    ignoreCaseTagName = true;
+    constructor(documentName, source, elements, options = {}) {
+        const { normalize, escapeEntities, stripComments, ignoreTagGroup, parser = { ...PARSER_OPTIONS } } = options;
         super(documentName, source, elements, { parser });
-        this.documentElement = null;
-        this.ignoreTagName = "title|style|script";
-        this.rootName = "html";
-        this.ignoreCaseTagName = true;
         const items = [];
         let outerXml = '', documentElement, offsetMap, startIndex = -1;
         for (const item of elements) {
@@ -226,10 +220,10 @@ class DomWriter extends index_1.XmlWriter {
 }
 exports.DomWriter = DomWriter;
 class HtmlElement extends index_1.XmlElement {
+    _documentType = "HTML";
     constructor(documentName, node, attributes, options = {}) {
         options.parser ||= { ...PARSER_OPTIONS };
         super(documentName, node, attributes, { ...options, tagVoid: TAG_VOID.includes(node.tagName) });
-        this._documentType = "HTML";
     }
     getTagOffset(source) {
         switch (this.node.append?.tagName || this.tagName) {

package/parse/index.js

@@ -107,6 +107,9 @@ const isCount = (value) => typeof value === 'number' && value > 0 && value !== I
 const hasId = (id, source, startIndex, endIndex) => source.substring(startIndex, endIndex).indexOf(id) !== -1;
 const escapeTagName = (value) => value.replace(/[-.]/g, capture => capture === '-' ? '\\x2d' : '\\' + capture);
 class XmlWriter {
+    documentName;
+    _source;
+    elements;
     static get PATTERN_ATTRNAME() {
         return PATTERN_ATTRNAME;
     }
@@ -129,12 +132,16 @@ class XmlWriter {
         return PATTERN_TRAILINGSPACE;
     }
     static replaceMatch(match, source, content = '', options) {
+        let pattern;
         if (typeof content === 'number') {
             content = match[content] || '';
         }
+        else if (content instanceof RegExp) {
+            pattern = content;
+            content = '';
+        }
         let index = match.index, leading = index > 0 ? source.substring(0, index) : '', trailing = source.substring(index + match[0].length);
         if (options) {
-            let pattern;
             if ((0, types_1.isPlainObject)(options)) {
                 if (options.trimLeading) {
                     const length = leading.length;
@@ -144,14 +151,14 @@ class XmlWriter {
                 if (options.trimTrailing) {
                     trailing = trailing.trimStart();
                 }
-                pattern = options.pattern;
+                pattern ||= options.pattern;
             }
             else {
                 pattern = options;
             }
-            if (pattern) {
-                pattern.lastIndex = index + content.length;
-            }
+        }
+        if (pattern) {
+            pattern.lastIndex = index + content.length;
         }
         return leading + content + trailing;
     }
@@ -397,16 +404,17 @@ class XmlWriter {
         while (match = pattern.exec(source)) {
             if (stripXml) {
                 source = this.replaceMatch(match, source, '', { pattern, trimLeading: true });
-                continue;
             }
-            const type = match[1] && 'comment' || match[2] && 'cdata' || 'node';
-            const startIndex = match.index;
-            let endIndex = startIndex + match[0].length;
-            if (type !== 'node') {
-                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 });
+            else {
+                const type = match[1] && 'comment' || match[2] && 'cdata' || 'node';
+                const startIndex = match.index;
+                let endIndex = startIndex + match[0].length;
+                if (type !== 'node') {
+                    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 });
+                }
             }
         }
         if (stripXml) {
@@ -450,25 +458,26 @@ class XmlWriter {
     static isSpace(ch) {
         return ch === ' ' || ch === '\n' || ch === '\t' || ch === '\f' || ch === '\r' || ch === '\v';
     }
-    constructor(documentName, source, elements, options) {
+    modifyCount = 0;
+    failCount = 0;
+    errors = [];
+    newline = '\n';
+    ignoreTagName = '';
+    ignoreTagGroup = undefined;
+    parser;
+    ignoreCaseTagName = false;
+    rootName = '';
+    _tagCount = Object.create(null);
+    _hasInvalidContent = true;
+    _ignoreFlag = 0;
+    _appendCount = 0;
+    _invalidContent = null;
+    #patternIgnore = null;
+    #writeStartIndex = -1;
+    constructor(documentName, _source, elements, options) {
         this.documentName = documentName;
+        this._source = _source;
         this.elements = elements;
-        this.modifyCount = 0;
-        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;
-        this._appendCount = 0;
-        this._invalidContent = null;
-        this._patternIgnore = null;
-        this._writeStartIndex = -1;
-        this._source = source;
         this.parser = options?.parser;
     }
     init(offsetMap) {
@@ -496,7 +505,7 @@ class XmlWriter {
     }
     getInvalidArea() {
         if ((this._ignoreFlag & IGNORE_FLAG.INTERIOR) === 0 && this._hasInvalidContent) {
-            const startIndex = this._writeStartIndex;
+            const startIndex = this.#writeStartIndex;
             if (isIndex(startIndex) && this._invalidContent && !this._invalidContent.some(item => item.startIndex >= startIndex)) {
                 return this._invalidContent;
             }
@@ -626,12 +635,12 @@ class XmlWriter {
                 this.renameTag(node, element.tagName);
             }
             this.update(node, outerXml, append, element.tagOffset);
-            if (element.innerXml && !element.remove && (element.hasModifiedContent() || this.patternIgnore?.test(element.tagName))) {
+            if (element.innerXml && !element.remove && (element.hasModifiedContent() || this.#patternIgnore?.test(element.tagName))) {
                 this._hasInvalidContent = true;
-                this._writeStartIndex = -1;
+                this.#writeStartIndex = -1;
             }
             else {
-                this._writeStartIndex = node.startIndex;
+                this.#writeStartIndex = node.startIndex;
             }
             element.reset();
             return true;
@@ -943,7 +952,7 @@ class XmlWriter {
             value = value.substring(1);
         }
         this.ignoreTagName = tagName + value;
-        this._patternIgnore = null;
+        this.#patternIgnore = null;
     }
     resetPosition(startIndex = -1) {
         const rootName = this.rootName;
@@ -1044,7 +1053,7 @@ class XmlWriter {
         return XmlWriter.getNameOfId(this.documentName);
     }
     get patternIgnore() {
-        return this.ignoreTagName ? this._patternIgnore ||= new RegExp(`^(?:${this.ignoreTagName})$`, this.ignoreCaseTagName ? 'i' : '') : null;
+        return this.ignoreTagName ? this.#patternIgnore ||= new RegExp(`^(?:${this.ignoreTagName})$`, this.ignoreCaseTagName ? 'i' : '') : null;
     }
     set source(value) {
         if (value !== this._source) {
@@ -1061,6 +1070,8 @@ class XmlWriter {
 }
 exports.XmlWriter = XmlWriter;
 class XmlElement {
+    documentName;
+    node;
     static writeAttributes(attrs, escapeEntities) {
         let result = '';
         for (const [key, value] of attrs) {
@@ -1075,24 +1086,24 @@ class XmlElement {
         }
         return result;
     }
-    constructor(documentName, node, attributes, tagVoid, parser) {
+    newline = '\n';
+    parser;
+    _modified = true;
+    _tagName = '';
+    _nameOfId;
+    _innerXml = '';
+    _remove = false;
+    _tagVoid = null;
+    _prevTagName = null;
+    _prevInnerXml = null;
+    _append = undefined;
+    _tagOffset = undefined;
+    _ignoreCase;
+    _documentType = '';
+    _attributes = new Map();
+    constructor(documentName, node, attributes, { parser, tagVoid } = {}) {
         this.documentName = documentName;
         this.node = node;
-        this.newline = '\n';
-        this._modified = true;
-        this._tagName = '';
-        this._innerXml = '';
-        this._remove = false;
-        this._tagVoid = null;
-        this._prevTagName = null;
-        this._prevInnerXml = null;
-        this._append = undefined;
-        this._tagOffset = undefined;
-        this._documentType = '';
-        this._attributes = new Map();
-        if ((0, types_1.isObject)(tagVoid)) {
-            ({ tagVoid, parser } = tagVoid);
-        }
         if (parser) {
             this.parser = parser;
         }

package/parse/types/index.d.ts

@@ -150,6 +150,7 @@ export interface XmlWriterConstructor {
     readonly PATTERN_QUOTEVALUE: string;
     readonly PATTERN_COMMENT: string;
     readonly PATTERN_TRAILINGSPACE: string;
+    replaceMatch(match: RegExpMatchArray, source: string, 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;
@@ -168,8 +169,8 @@ export interface XmlWriterConstructor {
     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: number | undefined): value is number;
-    isCount(value: number | undefined): value is number;
+    isIndex(value: unknown): value is number;
+    isCount(value: unknown): value is number;
     isSpace(ch: string): boolean;
     readonly prototype: IXmlWriter;
     new(documentName: string, source: string, elements: XmlTagNode[], options?: XmlWriterOptions): IXmlWriter;
@@ -214,7 +215,6 @@ export interface XmlElementConstructor {
     writeAttributes(attrs: AttributeMap | AttributeList, escapeEntities?: boolean): string;
     readonly prototype: IXmlElement;
     new(documentName: string, node: XmlTagNode, attributes?: PlainObject, options?: XmlElementOptions): IXmlElement;
-    new(documentName: string, node: XmlTagNode, attributes?: PlainObject, tagVoid?: boolean, parser?: ParserOptions): IXmlElement;
 }
 
 export class IDomWriter extends IXmlWriter {
@@ -224,13 +224,11 @@ export class IDomWriter extends IXmlWriter {
 
 export interface DomWriterConstructor extends XmlWriterConstructor {
     hasInnerXml(tagName: string, ignoreCase?: boolean): boolean;
-    normalize(source: string, options: NormalizeOptions): string;
-    normalize(source: string, newline?: string, ignoreChar?: string, escapeEntities?: boolean): string;
+    normalize(source: string, options?: NormalizeOptions): string;
     getDocumentElement(source: string, parser?: ParserOptions): ParserResult;
     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;
 }
 
 export class IHtmlElement extends IXmlElement {}

package/transform/index.js

@@ -1,18 +1,9 @@
 "use strict";
-var _a, _b, _c, _d;
 exports.SourceMap = exports.TransformSeries = void 0;
 const path = require("node:path");
 const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
-const kCode = Symbol('code');
-const kMap = Symbol('map');
-const kOut = Symbol('out');
-const kOptions = Symbol('options');
-const kSourceMap = Symbol('sourceMap');
-const kMetadata = Symbol('metadata');
-const kModulesDir = Symbol('modulesDir');
-const kUsername = Symbol('username');
-const kProductionRelease = Symbol('productionRelease');
+const kTransformSeries = Symbol.for('transformseries:constructor');
 function parseMap(data, value) {
     let [mimeType, encoding] = data.split(';');
     if (!encoding && !mimeType.includes('/')) {
@@ -31,6 +22,11 @@ function toJSON(data) {
     }
 }
 class Out {
+    sourceFiles;
+    ignoreCache;
+    messageAppend;
+    logAppend;
+    logQueued;
     reset() {
         this.sourceFiles = undefined;
         this.ignoreCache = undefined;
@@ -40,30 +36,37 @@ class Out {
     }
 }
 class TransformSeries extends core_1.Module {
+    type;
+    static [kTransformSeries] = true;
+    baseConfig = {};
+    outputConfig = {};
+    supplementChunks = [];
+    _threadable = true;
+    #code;
+    #modulesDir = '';
+    #username = '';
+    #sourceMap;
+    #out;
+    #options;
+    #metadata = {};
+    #productionRelease;
     constructor(type, code, options) {
         super();
         this.type = type;
-        this.baseConfig = {};
-        this.outputConfig = {};
-        this.supplementChunks = [];
-        this._threadable = true;
-        this[_a] = {};
-        this[_b] = '';
-        this[_c] = '';
-        this[kCode] = code;
-        this[kOut] = new Out();
-        this[kOptions] = options;
-        this[kProductionRelease] = !!options.productionRelease;
+        this.#code = code;
+        this.#out = new Out();
+        this.#options = options;
+        this.#productionRelease = !!options.productionRelease;
         if (SourceMap.isRaw(options.sourceMap)) {
             const series = new SourceMap(code);
             series.map = options.sourceMap;
-            this[kSourceMap] = series;
+            this.#sourceMap = series;
         }
         else {
-            this[kSourceMap] = options.sourceMap instanceof SourceMap ? options.sourceMap : this.createSourceMap(code);
+            this.#sourceMap = options.sourceMap instanceof SourceMap ? options.sourceMap : this.createSourceMap(code);
         }
         if (options.metadata) {
-            this[kMetadata] = (0, types_1.isPlainObject)(options.metadata) ? { ...options.metadata } : options.metadata;
+            this.#metadata = (0, types_1.isPlainObject)(options.metadata) ? { ...options.metadata } : options.metadata;
         }
     }
     reset() {
@@ -72,21 +75,21 @@ class TransformSeries extends core_1.Module {
         this.outputConfig = {};
         this.version = '';
         this.packageName = '';
-        this[kOut].reset();
+        this.#out.reset();
     }
     init(instance, dirname) {
-        if (instance.hasOwnPermission()) {
+        if (instance.hasPermission('fs')) {
             this.permission = core_1.Permission.clone(instance.permission, true);
         }
         this.abortable = instance.abortable;
         this._moduleName = instance.moduleName + ':transform:' + this.type;
         if (dirname) {
-            this[kModulesDir] = dirname;
+            this.#modulesDir = dirname;
         }
         const host = instance.host;
         if (host) {
             host.retain(this);
-            this[kUsername] = host.username;
+            this.#username = host.username;
         }
         core_1.AbortComponent.attach(instance, this.signal);
         return this;
@@ -104,6 +107,13 @@ class TransformSeries extends core_1.Module {
             return this.options.getSourceFiles(imports);
         }
     }
+    getTempDir(pathname, filename, createDir) {
+        if (arguments.length === 0) {
+            pathname = this.packageName || true;
+            createDir = true;
+        }
+        return super.getTempDir(pathname, filename, createDir);
+    }
     toBaseConfig(all = true) {
         const { outputConfig, external } = this;
         const baseConfig = this.baseConfig;
@@ -163,25 +173,25 @@ class TransformSeries extends core_1.Module {
         this.host?.release(this);
     }
     set code(value) {
-        this[kCode] = value;
+        this.#code = value;
     }
     get code() {
-        return this[kCode];
+        return this.#code;
     }
     get sourceMap() {
-        return this[kSourceMap];
+        return this.#sourceMap;
     }
     get metadata() {
-        return this[kMetadata];
+        return this.#metadata;
     }
     get out() {
-        return this[kOut];
+        return this.#out;
     }
     get options() {
-        return this[kOptions];
+        return this.#options;
     }
     get productionRelease() {
-        return this[kProductionRelease];
+        return this.#productionRelease;
     }
     get imported() {
         return !!this.options.imported;
@@ -224,7 +234,7 @@ class TransformSeries extends core_1.Module {
     }
     get packageVersion() {
         const packageName = this.packageName;
-        return packageName ? core_1.Module.getPackageVersion(packageName, this[kModulesDir]) : '0.0.0';
+        return packageName ? core_1.Module.getPackageVersion(packageName, { startDir: this.#modulesDir }) : '0.0.0';
     }
     set host(value) {
         this._host = value;
@@ -233,15 +243,17 @@ class TransformSeries extends core_1.Module {
         return this._host;
     }
     get username() {
-        return this[kUsername];
+        return this.#username;
     }
 }
 exports.TransformSeries = TransformSeries;
-_a = kMetadata, _b = kModulesDir, _c = kUsername;
 class SourceMap {
+    static get SOURCE_MAPPING_URL() {
+        return /[\r\n]*(?:(\/\/)|(\/\*))\s*[#@][ ]+sourceMappingURL=(data:[^,]+,)?(\S+)\s*(\*\/)?\r?\n?/g;
+    }
     static findSourceMap(code, uri) {
         if (code ||= uri && core_1.Module.readText(uri)) {
-            const pattern = this.RE_SOURCE_MAPPING_URL;
+            const pattern = this.SOURCE_MAPPING_URL;
             pattern.lastIndex = 0;
             let match;
             while (match = pattern.exec(code)) {
@@ -261,7 +273,7 @@ class SourceMap {
         }
     }
     static removeSourceMappingURL(value) {
-        const pattern = this.RE_SOURCE_MAPPING_URL;
+        const pattern = this.SOURCE_MAPPING_URL;
         pattern.lastIndex = 0;
         const match = pattern.exec(value);
         return match ? [value.substring(0, match.index) + value.substring(match.index + match[0].length), (match[3] || '') + match[4], match[3] && toJSON(parseMap(match[3], match[4])) || null] : [value];
@@ -269,10 +281,12 @@ class SourceMap {
     static isRaw(map) {
         return (0, types_1.isObject)(map) && (0, types_1.isString)(map.mappings);
     }
+    code;
+    output = new Map();
+    sourceMappingURL = '';
+    #map = undefined;
+    #start;
     constructor(code, uri, remove) {
-        this.output = new Map();
-        this.sourceMappingURL = '';
-        this[_d] = undefined;
         if (typeof uri === 'boolean') {
             remove = uri;
             uri = undefined;
@@ -288,12 +302,12 @@ class SourceMap {
         if (SourceMap.isRaw(map)) {
             this.nextMap('unknown', code, map);
         }
-        this[kCode] = code;
+        this.#start = code;
         this.code = code;
     }
     reset(restore) {
         if (restore) {
-            this.code = this[kCode];
+            this.code = this.#start;
         }
         this.map = undefined;
         this.sourceMappingURL = '';
@@ -302,7 +316,7 @@ class SourceMap {
     nextMap(name, code, map, sourceMappingURL = '', emptySources) {
         if (!SourceMap.isRaw(map)) {
             try {
-                map = JSON.parse(Buffer.isBuffer(map) ? map.toString('utf-8') : map.toString());
+                map = JSON.parse(Buffer.isBuffer(map) ? map.toString('utf8') : map.toString());
             }
             catch {
             }
@@ -310,6 +324,10 @@ class SourceMap {
                 return false;
             }
         }
+        if (typeof sourceMappingURL === 'boolean') {
+            emptySources = sourceMappingURL;
+            sourceMappingURL = '';
+        }
         if (emptySources) {
             map.sources = [""];
         }
@@ -327,16 +345,14 @@ class SourceMap {
     }
     set map(value) {
         if (!value) {
-            this[kMap] = undefined;
+            this.#map = undefined;
         }
         else if (SourceMap.isRaw(value)) {
-            this[kMap] = value;
+            this.#map = value;
         }
     }
     get map() {
-        return this[kMap];
+        return this.#map;
     }
 }
 exports.SourceMap = SourceMap;
-_d = kMap;
-SourceMap.RE_SOURCE_MAPPING_URL = /[\r\n]*(?:(\/\/)|(\/\*))\s*[#@][ ]+sourceMappingURL=(data:[^,]+,)?(\S+)\s*(\*\/)?\r?\n?/g;

package/util.d.ts

@@ -1,13 +1,13 @@
 declare namespace util {
-    /** @deprecated Types.IMPORT_MAP */
-    const IMPORTS: Record<string, string | undefined>;
     const PATTERN_PARENTHESIS: string;
-    function loadPlugins<T = unknown>(plugins: string | unknown[]): T[];
+    function loadPlugins<T = unknown>(plugins: string | unknown[], map?: AnyObject): 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;
     function spliceMatch(source: string, match: RegExpExecArray, content: string, pattern?: RegExp): string;
     function splitEnclosing(value: string, pattern?: string | RegExp, options?: { trim?: boolean; start?: number; startWith?: number; count?: number } | boolean | number, opening?: string, closing?: string): string[];
+    function trimQuote(value: string): string;
+    function wrapQuote(value: string, quote?: string): string;
     function appendSuffix(filename: string, value: string, separator?: string): string;
     function getIndent(value: string, spaces?: number): string;
     function getNewline(value: string): string;

package/util.js

@@ -1,11 +1,13 @@
 "use strict";
-exports.isObject = exports.IMPORTS = exports.PATTERN_PARENTHESIS = void 0;
+exports.isObject = exports.PATTERN_PARENTHESIS = void 0;
 exports.loadPlugins = loadPlugins;
 exports.replaceAll = replaceAll;
 exports.concatString = concatString;
 exports.spliceString = spliceString;
 exports.spliceMatch = spliceMatch;
 exports.splitEnclosing = splitEnclosing;
+exports.trimQuote = trimQuote;
+exports.wrapQuote = wrapQuote;
 exports.appendSuffix = appendSuffix;
 exports.getIndent = getIndent;
 exports.getNewline = getNewline;
@@ -13,11 +15,10 @@ 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(plugins) {
+function loadPlugins(plugins, map) {
     const result = [];
     const items = (Array.isArray(plugins) ? plugins : [plugins]).map(value => {
         let name, options;
@@ -33,7 +34,11 @@ function loadPlugins(plugins) {
         else if (typeof value === 'function') {
             return [value];
         }
-        return name ? [name, options] : null;
+        if (name) {
+            const method = map?.[name];
+            return [typeof method === 'function' ? method : name, options];
+        }
+        return null;
     });
     for (const plugin of items) {
         if (plugin) {
@@ -178,6 +183,15 @@ function splitEnclosing(value, pattern, options, opening = '(', closing = ')') {
     }
     return result;
 }
+function trimQuote(value) {
+    value = value.trim();
+    const first = value[0];
+    const last = value[value.length - 1];
+    return first === last && (first === '"' || first === "'") ? value.substring(1, value.length - 1).trim() : value;
+}
+function wrapQuote(value, quote = '"') {
+    return quote + value.replace(new RegExp(`(?<!\\\\)${quote}`, 'g'), `\\${quote}`) + quote;
+}
 function appendSuffix(filename, value, separator = '-') {
     const ext = path.extname(filename);
     return ext && value ? filename.substring(0, filename.length - ext.length) + separator + value + ext : filename;
@@ -212,7 +226,7 @@ function hasValue(target, ...values) {
     return false;
 }
 function getModuleName(err) {
-    const match = err instanceof Error && /Cannot find module '([^']+)'/.exec(err.message);
+    const match = err instanceof Error && /Cannot find (?:module|package) '([^']+)'/.exec(err.message);
     if (match) {
         return match[1];
     }
@@ -220,7 +234,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];