@e-mc/document 0.13.10 → 0.14.0

package/index.js

@@ -1,16 +1,17 @@
 "use strict";
-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");
-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 path = require('node:path');
+const fs = require('node:fs');
+const pm = require('picomatch');
+const chalk = require('chalk');
+const { toUSVString } = require('node:util');
+const { load } = require('js-yaml');
+const { IMPORT_MAP, asExt, asFunction, cloneObject, coerceObject, createAbortError, errorMessage, errorValue, escapePattern, formatSize, getEncoding, hasGlob, hashKey, importESM, incrementUUID, isArray, isEmpty, isError, isFunction, isObject, isPlainObject, isString, parseExpires, requireESM } = require('@e-mc/types');
+const { Client } = require('@e-mc/core');
+const Db = require('@e-mc/db');
+const { SourceMap, TransformSeries } = require('@e-mc/document/transform');
+const { XmlWriter } = require('@e-mc/document/parse');
+const { PATTERN_PARENTHESIS, appendSuffix, concatString, getHashData, getIndent, getModuleName, getNewline, spliceString } = require('@e-mc/document/util');
 const kDocument = Symbol.for('document:constructor');
 const CACHE_PACKAGE = new Map();
 const CACHE_CONFIG = new Map();
@@ -38,7 +39,7 @@ function deleteTransform(map, key, timeout) {
 }
 function getSourceMappingURL(value, css) {
     if (value.includes(' ')) {
-        value = encodeURIComponent((0, node_util_1.toUSVString)(value));
+        value = encodeURIComponent(toUSVString(value));
     }
     return css ? `\n/*# sourceMappingURL=${value} */\n` : `\n//# sourceMappingURL=${value}\n`;
 }
@@ -47,21 +48,21 @@ function normalizeDir(value, check) {
     if (check) {
         value = toPosix(value).toLowerCase();
     }
-    return value.endsWith(sep) ? value : value + sep;
+    return value.at(-1) === sep ? value : value + sep;
 }
 function cloneConfigItems(items) {
     const [a, b, c] = items;
-    return [a, (typeof b === 'object' ? (0, types_1.cloneObject)(b, true) : b), typeof c === 'object' ? (0, types_1.cloneObject)(c, true) : c];
+    return [a, (typeof b === 'object' ? cloneObject(b, true) : b), typeof c === 'object' ? cloneObject(c, true) : c];
 }
 const isExcluded = (type, name, config, cacheData) => !(config?.hasType(type, name) || cacheData?.override === true);
 const wrapCount = (value) => chalk.grey('(') + value + chalk.grey(')');
 const fixHint = (warningCount, errorCount, value) => warningCount > 0 || errorCount > 0 ? ':' + value : '';
 const compareValue = (value) => value.replace(/["'()]/g, '').trim();
-const toPath = (uri, hostname) => path.resolve(hostname[1], uri.substring(normalizeDir(hostname[0]).length).split('?')[0]);
+const toPath = (uri, hostname) => path.resolve(hostname[1], uri.slice(normalizeDir(hostname[0]).length).split('?')[0]);
 const toBase64 = (value) => 'data:application/json;base64,' + Buffer.from(value).toString('base64');
-const toPosix = (value) => core_1.Client.PLATFORM_WIN32 ? value.trim().replace(/(?:^\\|\\+)/g, '/') : value;
+const toPosix = (value) => 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 truncateString = (value, width) => value.length > width ? value.slice(0, width - 3) + '...' : value.padStart(width);
 class TransformCache {
     config;
     cacheData;
@@ -79,9 +80,9 @@ class TransformCache {
     }
     set(type, data) {
         let pathname;
-        if (typeof this.cacheDir === 'string' && core_1.Client.createDir(pathname = path.join(this.cacheDir, 'transform', type))) {
+        if (typeof this.cacheDir === 'string' && Client.createDir(pathname = path.join(this.cacheDir, 'transform', type))) {
             try {
-                fs.writeFileSync(pathname = path.join(pathname, (0, types_1.incrementUUID)()), JSON.stringify(data));
+                fs.writeFileSync(pathname = path.join(pathname, incrementUUID()), JSON.stringify(data));
                 return pathname;
             }
             catch {
@@ -183,7 +184,7 @@ class TransformConfig {
             algorithm = options;
             enabled = true;
         }
-        else if ((0, types_1.isObject)(options)) {
+        else if (options) {
             ({ enabled = true, algorithm, etag, expires, renew, limit, include, exclude } = options);
         }
         if (!enabled) {
@@ -207,32 +208,28 @@ class TransformConfig {
         if (typeof etag === 'boolean') {
             this.etag = etag;
         }
-        if (expires && (expires = (0, types_1.parseExpires)(expires)) >= 0) {
-            this.expires = Math.min(expires, core_1.Client.MAX_TIMEOUT);
+        if (expires && (expires = parseExpires(expires)) >= 0) {
+            this.expires = Math.min(expires, Client.MAX_TIMEOUT);
         }
         if (renew) {
             this.renew = true;
         }
-        if ((0, types_1.isPlainObject)(include)) {
-            for (const type in include) {
-                const item = include[type];
-                if (item === '*') {
-                    this.include[type] = true;
-                }
-                else if ((0, types_1.isArray)(item)) {
-                    this.include[type] = item;
-                }
+        for (const type in include) {
+            const item = include[type];
+            if (item === '*') {
+                this.include[type] = true;
+            }
+            else if (isArray(item)) {
+                this.include[type] = item;
             }
         }
-        if ((0, types_1.isPlainObject)(exclude)) {
-            for (const type in exclude) {
-                const item = exclude[type];
-                if (item === '*') {
-                    this.exclude[type] = true;
-                }
-                else if ((0, types_1.isArray)(item)) {
-                    this.exclude[type] = item;
-                }
+        for (const type in exclude) {
+            const item = exclude[type];
+            if (item === '*') {
+                this.exclude[type] = true;
+            }
+            else if (isArray(item)) {
+                this.exclude[type] = item;
             }
         }
         if (limit !== undefined) {
@@ -241,7 +238,7 @@ class TransformConfig {
                 if (parseFloat(limit) === 0) {
                     value = 0;
                 }
-                else if ((value = (0, types_1.formatSize)(limit)) === 0) {
+                else if ((value = formatSize(limit)) === 0) {
                     return;
                 }
             }
@@ -299,7 +296,7 @@ class TransformConfig {
     }
     useHash(cache, code) {
         let key;
-        if (this.withinLimit(code, cache.encoding) && (key = core_1.Client.asHash(code, this.algorithm, { encoding: cache.encoding }))) {
+        if (this.withinLimit(code, cache.encoding) && (key = Client.asHash(code, this.algorithm, { encoding: cache.encoding }))) {
             const hashMap = CACHE_HASH[this.moduleName] ||= new Map();
             const stored = hashMap.get(key);
             let result;
@@ -335,7 +332,7 @@ class TransformConfig {
         return limit === Infinity || limit > 0 && Buffer.byteLength(code, encoding) <= limit;
     }
 }
-class Document extends core_1.Client {
+class Document extends Client {
     static [kDocument] = true;
     static async purgeMemory(percent = 1, limit = 0, parent) {
         if (limit > 0 && CACHE_TOTAL < limit) {
@@ -384,14 +381,11 @@ class Document extends core_1.Client {
     static async finalize(instance) {
         for (const ext of instance.extensions) {
             if (instance.aborted) {
-                return (0, types_1.createAbortError)(true);
+                return createAbortError(true);
             }
             try {
                 const args = [instance];
-                if ((0, types_1.isFunction)(ext, true)) {
-                    args.push(__dirname);
-                }
-                else if (core_1.Client.enabled("node.require.inline")) {
+                if (!isFunction(ext, true) && Client.enabled("node.require.inline")) {
                     args.push(require);
                 }
                 await ext.apply(this, args);
@@ -429,16 +423,16 @@ class Document extends core_1.Client {
                     sourceMappingURL += '.map';
                 }
                 if (hash) {
-                    const [algorithm, length] = (0, util_1.getHashData)(hash);
+                    const [algorithm, length] = getHashData(hash);
                     if (algorithm) {
                         const value = this.asHash(output, algorithm);
                         if (value) {
-                            sourceMappingURL = (0, util_1.appendSuffix)(sourceMappingURL, length ? value.substring(0, length) : value);
+                            sourceMappingURL = appendSuffix(sourceMappingURL, length ? value.slice(0, length) : value);
                         }
                     }
                 }
             }
-            let code = data.code.replace(transform_1.SourceMap.SOURCE_MAPPING_URL, (...capture) => {
+            let code = data.code.replace(SourceMap.SOURCE_MAPPING_URL, (...capture) => {
                 flags |= 1;
                 if (capture[2] && capture[5]) {
                     css = true;
@@ -469,10 +463,19 @@ class Document extends core_1.Client {
         }
     }
     static createSourceMap(code, uri, remove) {
-        return new transform_1.SourceMap(code, uri, remove);
+        return new SourceMap(code, uri, remove);
     }
-    static updateGradle(source, namespaces, value, options) {
-        const local = /^([\w.]+)(?:\((.+)\)|\s*(=)?\s*(".+"|'.+'|\(.+\)||\[.+\]|\S+))$/s.exec(value = value.trim());
+    static updateGradle(source, namespaces, values, options) {
+        let value;
+        if (Array.isArray(values)) {
+            values = values.slice(0);
+            value = values.pop().trim();
+        }
+        else {
+            value = values.trim();
+            values = [];
+        }
+        const local = /^([\w.]+)(?:\((.+)\)|\s*(=)?\s*(".+"|'.+'|\(.+\)||\[.+\]|\S+))$/s.exec(value);
         if (!local) {
             return source;
         }
@@ -485,28 +488,44 @@ class Document extends core_1.Client {
         }
         const replacement = addendum ? value + ' ' + addendum : value;
         const length = namespaces.length;
-        let ident, lastIndex = 0, i = 0;
+        let ident, lastMatch = null, lastIndex = 0, i = 0;
         while (i < length) {
-            const pattern = new RegExp(`([\\t ]*)${(0, types_1.escapePattern)(namespaces[i])}\\s*\\{` + parse_1.XmlWriter.PATTERN_TRAILINGSPACE);
+            const item = namespaces[i];
+            const pattern = new RegExp(`([\\t ]*)${item instanceof RegExp ? item.source : escapePattern(item)}\\s*\\{[ \\t]*(?:\\r?\\n)*`);
             pattern.lastIndex = lastIndex;
-            const match = pattern.exec(source);
-            if (!match) {
-                break;
+            if (lastMatch = pattern.exec(source)) {
+                if (i > 0 && !ident && lastMatch[1]) {
+                    ident = lastMatch[1];
+                }
+                lastIndex = lastMatch.index + lastMatch[0].length;
             }
-            if (i > 0 && !ident && match[1]) {
-                ident = match[1];
+            else {
+                break;
             }
-            lastIndex = match.index + match[0].length;
             ++i;
         }
-        const newline = (0, util_1.getNewline)(source);
-        ident ||= (0, util_1.getIndent)(source);
-        if (i === length) {
-            const pattern = new RegExp(`\\b(${(0, types_1.escapePattern)(local[1])}` + (local[2] ? `\\(${util_1.PATTERN_PARENTHESIS}\\)` : '\\b' + (local[3] ? '\\s*=\\s*' : '\\s*') + `("[^"]+"|'[^']+'|\\(${util_1.PATTERN_PARENTHESIS}\\)|\\S+)?`) + ')' + (addendum ? '[^\\r\\n]*' : '[^\\w\\r\\n]*'), 'g');
+        const newline = getNewline(source);
+        ident ||= getIndent(source);
+        if (lastMatch) {
+            if (lastMatch[2]) {
+                let block = lastMatch[0];
+                for (let j = 0; j < values.length; ++j) {
+                    const group = lastMatch[j + 2];
+                    if (group) {
+                        block = block.replace(group, values[j]);
+                    }
+                    else {
+                        return source;
+                    }
+                }
+                source = spliceString(source, lastMatch.index, lastMatch.index + lastMatch[0].length, block);
+                lastIndex = lastMatch.index + block.length;
+            }
+            const pattern = new RegExp(`\\b(${escapePattern(local[1])}` + (local[2] ? `\\(${PATTERN_PARENTHESIS}\\)` : '\\b' + (local[3] ? '\\s*=\\s*' : '\\s*') + `("[^"]+"|'[^']+'|\\(${PATTERN_PARENTHESIS}\\)|\\S+)?`) + ')' + (addendum ? '[^\\r\\n]*' : '[^\\w\\r\\n]*'), 'g');
             pattern.lastIndex = lastIndex;
-            let match;
+            let match, found = false;
             while (match = pattern.exec(source)) {
-                const preceding = source.substring(lastIndex, match.index);
+                const preceding = source.slice(lastIndex, match.index);
                 let opening = 0, closing = 0;
                 for (let j = 0, q = preceding.length; j < q; ++j) {
                     switch (preceding[j]) {
@@ -519,15 +538,16 @@ class Document extends core_1.Client {
                     }
                 }
                 if (opening === closing) {
+                    found = true;
                     if (!multiple || local[2] && local[1].includes('.') || match[2] && local[4] && compareValue(match[2]) === compareValue(local[4])) {
-                        return upgrade && match[1] !== value ? parse_1.XmlWriter.replaceMatch(match, source, replacement, pattern) : source;
+                        return upgrade && match[1] !== value ? XmlWriter.replaceMatch(match, source, replacement, pattern) : source;
                     }
                     lastIndex = match.index + match[0].length;
                 }
             }
-            return (0, util_1.spliceString)(source, lastIndex, lastIndex, ident.repeat(length) + replacement + newline);
+            return found && updateOnly ? source : spliceString(source, lastIndex, lastIndex, ident.repeat(length) + replacement + newline);
         }
-        if (updateOnly) {
+        if (updateOnly || namespaces.some(item => item instanceof RegExp)) {
             return source;
         }
         const j = i;
@@ -540,7 +560,7 @@ class Document extends core_1.Client {
             trailing += ident.repeat(i) + '}' + newline;
         }
         const content = leading + ident.repeat(length) + replacement + newline + trailing;
-        return lastIndex > 0 ? (0, util_1.spliceString)(source, lastIndex, lastIndex, content) : source.trimEnd() + newline + newline + content;
+        return lastIndex > 0 ? spliceString(source, lastIndex, lastIndex, content) : source.trimEnd() + newline + newline + content;
     }
     static generateLintTable(messages, options) {
         const { leadingText, trailingText, pathname, filename, ruleWidth = 30, messageWidth = 60 } = options;
@@ -624,9 +644,8 @@ class Document extends core_1.Client {
     }
     restart() { }
     init(assets, config) {
-        let ignoreModules, ignoreExtensions;
+        let baseUrl, ignoreModules, ignoreExtensions;
         if (config) {
-            let baseUrl;
             ({ baseUrl, ignoreModules, ignoreExtensions } = config);
             const users = this.getUserSettings();
             if (Array.isArray(users?.extensions)) {
@@ -646,11 +665,11 @@ class Document extends core_1.Client {
                         const items = [];
                         for (const pattern in pages) {
                             const item = pages[pattern];
-                            if ((0, types_1.isObject)(item)) {
+                            if (isObject(item)) {
                                 if (pattern === baseUrl) {
                                     items.push(item);
                                 }
-                                else if ((0, types_1.hasGlob)(pattern)) {
+                                else if (hasGlob(pattern)) {
                                     const isMatch = CACHE_PICOMATCH[pattern] ||= pm(pattern, { matchBase: true });
                                     if (isMatch(baseUrl)) {
                                         items.push(item);
@@ -669,7 +688,7 @@ class Document extends core_1.Client {
                     if (mimeMap) {
                         for (const item of assets) {
                             const merge = item.mimeType && mimeMap[item.mimeType];
-                            if ((0, types_1.isObject)(merge)) {
+                            if (isObject(merge)) {
                                 Object.assign(item, merge);
                             }
                         }
@@ -685,12 +704,12 @@ class Document extends core_1.Client {
             let instance = null;
             if (handler && handler !== "@e-mc/db") {
                 try {
-                    const Module = (0, types_1.requireESM)(handler);
-                    if (core_1.Client.constructorOf(Module, 'clientdb')) {
+                    const Module = requireESM(handler);
+                    if (Client.constructorOf(Module, 'clientdb')) {
                         instance = new Module(db, database);
                     }
                     else {
-                        throw (0, types_1.errorMessage)(this.moduleName, "Not a Db constructor", handler);
+                        throw errorMessage(this.moduleName, "Not a Db constructor", handler);
                     }
                 }
                 catch (err) {
@@ -698,7 +717,7 @@ class Document extends core_1.Client {
                 }
             }
             else {
-                instance = new db_1(db, database);
+                instance = new Db(db, database);
             }
             if (instance) {
                 const host = this.host;
@@ -721,11 +740,11 @@ class Document extends core_1.Client {
             }
             else {
                 const extensions = this._extensions;
-                if ((0, types_1.isArray)(extensions)) {
+                if (isArray(extensions)) {
                     if (typeof ignoreExtensions === 'string') {
                         this._extensions = extensions.filter(value => value !== ignoreExtensions);
                     }
-                    else if ((0, types_1.isArray)(ignoreExtensions)) {
+                    else if (isArray(ignoreExtensions)) {
                         this._extensions = extensions.filter(value => !ignoreExtensions.includes(value));
                     }
                 }
@@ -734,10 +753,10 @@ class Document extends core_1.Client {
         return this;
     }
     abort(name, reason) {
-        if (this.aborted || (0, types_1.isString)(name) && this.settingsOf(name, 'abort') !== true) {
+        if (this.aborted || isString(name) && this.settingsOf(name, 'abort') !== true) {
             return;
         }
-        if (name instanceof Error) {
+        if (isError(name)) {
             reason ||= name;
         }
         super.abort(reason);
@@ -807,7 +826,7 @@ class Document extends core_1.Client {
                     }
                     this.#addConfigError("\"output\" can only be a plain object");
                 }
-                else if ((0, types_1.isPlainObject)(result)) {
+                else if (isPlainObject(result)) {
                     return this.#getConfigObject(data, name, result, false);
                 }
                 else if (path.isAbsolute(value)) {
@@ -854,28 +873,28 @@ class Document extends core_1.Client {
         let result, pkgName;
         try {
             if (value.startsWith('npm:')) {
-                if (!core_1.Client.enabled("node.require.npm")) {
+                if (!Client.enabled("node.require.npm")) {
                     return null;
                 }
-                pkgName = value.substring(4);
-                result = options?.default ? (0, types_1.requireESM)(pkgName, options.url) : require(pkgName);
+                pkgName = value.slice(4);
+                result = options?.default ? requireESM(pkgName, options.url) : require(pkgName);
                 if (typeof result === 'function') {
-                    return Object.defineProperty(result, "__cjs__", { value: true });
+                    return Object.defineProperty(result, "__cjs__", { value: true, writable: false, enumerable: false });
                 }
                 return result;
             }
-            const source = this.readFile(value, { ownPermissionOnly: true, absolutePath: this.hasEval('absolute'), requireExt: true, encoding: (0, types_1.getEncoding)(encoding), cache }) || value;
+            const source = this.readFile(value, { ownPermissionOnly: true, absolutePath: this.hasEval('absolute'), requireExt: true, encoding: getEncoding(encoding), cache }) || value;
             if (typeof source !== 'string') {
                 result = source;
             }
-            else if (!(result = (0, types_1.asFunction)(source))) {
+            else if (!(result = asFunction(source))) {
                 try {
-                    result = this.tryParse(source, path.extname(value).substring(1));
+                    result = this.tryParse(source, asExt(value));
                 }
                 catch {
                 }
             }
-            if ((0, types_1.isObject)(result) || (0, types_1.isFunction)(result, true) || typeof result === 'function' && this.hasEval('function')) {
+            if (isObject(result) || isFunction(result, true) || typeof result === 'function' && this.hasEval('function')) {
                 return result;
             }
         }
@@ -905,11 +924,11 @@ class Document extends core_1.Client {
     }
     findSourceScope(uri, imports) {
         const scopes = imports.scopes;
-        if ((0, types_1.isPlainObject)(scopes)) {
+        if (isPlainObject(scopes)) {
             const qualified = [];
             for (const qualifier in scopes) {
                 const item = scopes[qualifier];
-                if (uri.includes(qualifier) && (0, types_1.isPlainObject)(item)) {
+                if (uri.includes(qualifier) && isPlainObject(item)) {
                     qualified.push([qualifier, item]);
                 }
             }
@@ -918,23 +937,23 @@ class Document extends core_1.Client {
         return [];
     }
     findSourceRoot(uri, imports = this.imports) {
-        if (!(0, types_1.isPlainObject)(imports)) {
+        if (!isPlainObject(imports)) {
             return;
         }
         const importsStrict = this.getUserSettings()?.imports_strict ?? this.settings.imports_strict;
-        const scopes = (importsStrict ? this.findSourceScope(uri, imports) : []).concat([imports]);
-        const protocol = core_1.Client.isURL(uri);
-        let result;
+        const scopes = (importsStrict ? this.findSourceScope(uri, imports) : []).concat([isPlainObject(imports.imports) ? imports.imports : imports]);
+        const integrity = isPlainObject(imports.integrity) ? imports.integrity : undefined;
+        const protocol = Client.isURL(uri);
+        let result = '', target;
         for (const scope of scopes) {
             for (const url in scope) {
-                if (uri === url && (0, types_1.isString)(result = scope[url])) {
-                    if (importsStrict) {
-                        if (core_1.Client.isPath(result) && !(protocol ? url : toPosix(url)).endsWith('/')) {
-                            return toPosix(result);
-                        }
-                        continue;
+                if (uri === url && isString(target = scope[url])) {
+                    if (!importsStrict) {
+                        return target;
+                    }
+                    if (Client.isPath(target) && !(protocol ? url : toPosix(url)).endsWith('/') && this.#checkIntegrity(integrity, url, target)) {
+                        return toPosix(target);
                     }
-                    return result;
                 }
             }
         }
@@ -944,11 +963,11 @@ class Document extends core_1.Client {
             for (const scope of scopes) {
                 for (const url in scope) {
                     const local = protocol ? url : toPosix(url);
-                    if (local.endsWith('/') && remote.startsWith(local) && (result = scope[url]) && result.endsWith('/')) {
+                    if (local.endsWith('/') && remote.startsWith(local) && isString(target = scope[url]) && target.endsWith('/')) {
                         if (protocol) {
-                            found.push([url, result]);
+                            found.push([url, target]);
                         }
-                        else if (core_1.Client.isPath(result = path.join(result, remote.substring(local.length)))) {
+                        else if (Client.isPath(result = path.join(target, remote.slice(local.length))) && this.#checkIntegrity(integrity, url, target)) {
                             return toPosix(result);
                         }
                     }
@@ -959,13 +978,13 @@ class Document extends core_1.Client {
             for (const scope of scopes) {
                 for (const url in scope) {
                     const local = normalizeDir(url);
-                    if ((normalizeDir(uri) === local || core_1.Client.PLATFORM_WIN32 && normalizeDir(uri, true) === local.toLowerCase()) && (0, types_1.isString)(result = scope[url])) {
-                        return result;
+                    if ((normalizeDir(uri) === local || Client.PLATFORM_WIN32 && normalizeDir(uri, true) === local.toLowerCase()) && isString(target = scope[url])) {
+                        return target;
                     }
                 }
                 for (const url in scope) {
-                    if (uri.startsWith(normalizeDir(url)) && (0, types_1.isString)(result = scope[url])) {
-                        found.push([url, result]);
+                    if (uri.startsWith(normalizeDir(url)) && isString(target = scope[url])) {
+                        found.push([url, target]);
                     }
                 }
             }
@@ -974,7 +993,7 @@ class Document extends core_1.Client {
             found.sort((a, b) => b[0].length - a[0].length);
             if (importsStrict) {
                 for (const url of found) {
-                    if (core_1.Client.isPath(result = toPath(uri, url))) {
+                    if (Client.isPath(result = toPath(uri, url)) && this.#checkIntegrity(integrity, url[1], result)) {
                         break;
                     }
                     result = '';
@@ -998,31 +1017,31 @@ class Document extends core_1.Client {
             }
             else if (Object.keys(imports).length > 0) {
                 const bundleId = file.bundleId;
-                const assets = !(0, types_1.isEmpty)(bundleId) ? this.assets.filter(item => item.bundleId === bundleId).sort((a, b) => a.bundleIndex - b.bundleIndex) : [file];
+                const assets = !isEmpty(bundleId) ? this.assets.filter(item => item.bundleId === bundleId).sort((a, b) => a.bundleIndex - b.bundleIndex) : [file];
                 if (!Array.isArray(bundleContent) || bundleContent.length !== assets.length - 1) {
                     bundleContent = undefined;
                 }
                 for (const item of assets) {
                     const localFile = !item.exported && item.uri ? this.findSourceRoot(item.uri, imports) : undefined;
-                    if (localFile && core_1.Client.isPath(localFile) && !item.trailingContent) {
+                    if (localFile && Client.isPath(localFile) && !item.trailingContent) {
                         sourceFile.push([localFile]);
                     }
                     else {
+                        const localUri = item.localUri;
                         let source;
-                        if (item.bundleIndex === 0) {
-                            const localUri = item.localUri;
+                        if (item.bundleIndex === 0 && localUri) {
                             try {
                                 source = fs.readFileSync(localUri, file.encoding ||= 'utf8');
-                                if (this.resolveUri && (0, types_1.isArray)(file.trailingContent)) {
+                                if (this.resolveUri && isArray(file.trailingContent)) {
                                     let trailing;
-                                    [source, trailing] = this.resolveUri(file, source, (0, util_1.concatString)(file.trailingContent));
+                                    [source, trailing] = this.resolveUri(file, source, concatString(file.trailingContent));
                                     if (trailing) {
                                         source += trailing;
                                     }
                                 }
                             }
                             catch (err) {
-                                this.writeFail(["Unable to read file", localUri && path.basename(localUri)], err, 32);
+                                this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
                             }
                         }
                         else if (bundleContent) {
@@ -1064,26 +1083,21 @@ class Document extends core_1.Client {
             switch (format.toLowerCase()) {
                 case 'yml':
                 case 'yaml':
-                    return yaml.load(source, options);
+                    return load(source, options);
                 case 'json5':
                     return require('json5').parse(source);
                 case 'xml':
                     return new (require('fast-xml-parser').XMLParser)(options).parse(source);
                 case 'toml':
-                    try {
-                        return require('smol-toml').parse(source, options);
-                    }
-                    catch {
-                        return require('toml').parse(source);
-                    }
+                    return require('toml').parse(source);
                 default:
                     return JSON.parse(source);
             }
         }
         catch (err) {
-            const name = (0, util_1.getModuleName)(err);
+            const name = getModuleName(err);
             if (name) {
-                this.checkPackage(err, (0, util_1.getModuleName)(err), "Unknown");
+                this.checkPackage(err, getModuleName(err), "Unknown");
             }
             throw err;
         }
@@ -1096,7 +1110,7 @@ class Document extends core_1.Client {
     }
     settingsOf(name, option) {
         const options = this.settings.options?.[name];
-        if ((0, types_1.isObject)(options)) {
+        if (isObject(options)) {
             return options[option];
         }
     }
@@ -1105,12 +1119,12 @@ class Document extends core_1.Client {
         if (typeof viewEngine === 'string') {
             target = this.settings.view_engine?.[viewEngine];
             const userConfig = this.getUserSettings()?.view_engine?.[viewEngine];
-            if ((0, types_1.isPlainObject)(userConfig)) {
+            if (isObject(userConfig)) {
                 if (CACHE_VIEWENGINE.has(userConfig)) {
                     target = CACHE_VIEWENGINE.get(userConfig);
                 }
-                else if ((0, types_1.isPlainObject)(target)) {
-                    target = (0, types_1.cloneObject)(userConfig, { target: { ...target }, deep: true, preserve: true, structured: true });
+                else if (isObject(target)) {
+                    target = cloneObject(userConfig, { target: { ...target }, deep: true, preserve: true, structured: true });
                     CACHE_VIEWENGINE.set(userConfig, target);
                 }
                 else {
@@ -1122,13 +1136,13 @@ class Document extends core_1.Client {
         else {
             target = viewEngine;
         }
-        if (!((0, types_1.isPlainObject)(target) && (0, types_1.isString)(target.name))) {
+        if (!(isObject(target) && 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"));
+            this.writeFail(["Unable to load configuration", from], errorMessage('view-engine', from, "Unknown"));
             return null;
         }
-        if (!target.outputEmpty && !(0, types_1.isArray)(data)) {
+        if (!target.outputEmpty && !isArray(data)) {
             return '';
         }
         try {
@@ -1137,15 +1151,15 @@ class Document extends core_1.Client {
                 context = require(target.name);
             }
             catch {
-                context = await (0, types_1.importESM)(target.name);
+                context = await importESM(target.name);
             }
             const { compile, output } = target.options || {};
             if (this.settingsOf('view_engine', 'coerce') === true) {
                 if (compile) {
-                    (0, types_1.coerceObject)(compile, stored);
+                    coerceObject(compile, stored);
                 }
                 if (output) {
-                    (0, types_1.coerceObject)(output, stored);
+                    coerceObject(output, stored);
                 }
             }
             let cache = CACHE_TEMPLATE.get(target.name);
@@ -1154,8 +1168,8 @@ class Document extends core_1.Client {
                 CACHE_TEMPLATE.set(target.name, cache);
             }
             const username = this.host?.username || '';
-            const cacheKey = (username ? username + ':' : '') + (0, types_1.hashKey)(template + (compile ? core_1.Client.asString(compile) : ''));
-            let result = '', valid = false, expires = typeof target.expires === 'string' ? (0, types_1.parseExpires)(target.expires) : target.expires, render;
+            const cacheKey = (username ? username + ':' : '') + hashKey(template + (compile ? Client.asString(compile) : ''));
+            let result = '', valid = false, expires = typeof target.expires === 'string' ? parseExpires(target.expires) : target.expires, render;
             if (expires !== 0) {
                 render = cache.get(cacheKey);
             }
@@ -1163,7 +1177,7 @@ class Document extends core_1.Client {
                 cache.delete(cacheKey);
             }
             if (!render) {
-                if ((0, types_1.isArray)(compile)) {
+                if (isArray(compile)) {
                     render = typeof context.compileSync === 'function' ? context.compileSync(template, ...compile) : await context.compile(template, ...compile);
                 }
                 else {
@@ -1172,7 +1186,7 @@ class Document extends core_1.Client {
                 if (expires !== 0) {
                     cache.set(cacheKey, render);
                     if (this.hasPermission('memory')) {
-                        expires = typeof expires === 'number' && expires !== Infinity ? Math.min(expires, core_1.Client.MAX_TIMEOUT) : 0;
+                        expires = typeof expires === 'number' && expires !== Infinity ? Math.min(expires, Client.MAX_TIMEOUT) : 0;
                     }
                     else {
                         expires = 60000;
@@ -1192,14 +1206,14 @@ class Document extends core_1.Client {
             const singleRow = !!target.singleRow;
             for (let i = 0, j = 0; i < data.length; ++i) {
                 let row = data[i];
-                if ((0, types_1.isPlainObject)(row)) {
+                if (isPlainObject(row)) {
                     row.__index__ ??= ++j;
                     if (output) {
                         row = { ...output, ...row };
                     }
                 }
-                else if (!(0, types_1.isObject)(row)) {
-                    this.addLog(3, joinString('view engine', target.name, core_1.Client.asString(row) || "Unknown"), { source: `row #${i + 1}` });
+                else if (!isObject(row)) {
+                    this.addLog(3, joinString('view engine', target.name, Client.asString(row) || "Unknown"), { source: `row #${i + 1}` });
                     continue;
                 }
                 if (!singleRow) {
@@ -1220,7 +1234,7 @@ class Document extends core_1.Client {
     async transform(type, code, format, options = {}) {
         let transform = this.settings.transform;
         const data = transform?.[type];
-        if (!(0, types_1.isObject)(data)) {
+        if (!isObject(data)) {
             return;
         }
         if (typeof format === 'string') {
@@ -1234,9 +1248,9 @@ class Document extends core_1.Client {
             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 = cacheData.uri;
-                const encoding = (0, types_1.getEncoding)(cacheData.encoding);
-                const hashOpts = core_1.Client.asString(options.external) + core_1.Client.asString(options.metadata);
-                cache = new TransformCache(config, cacheData, cacheDir, encoding, (username ? username + ':' : '') + type + '_' + format + '_' + encoding + (hashOpts ? '_' + (0, types_1.hashKey)(hashOpts) : ''));
+                const encoding = getEncoding(cacheData.encoding);
+                const hashOpts = Client.asString(options.external) + Client.asString(options.metadata);
+                cache = new TransformCache(config, cacheData, cacheDir, encoding, (username ? username + ':' : '') + type + '_' + format + '_' + encoding + (hashOpts ? '_' + hashKey(hashOpts) : ''));
                 let result, cacheName;
                 if (config.etag && cacheData.etag && uri) {
                     [result, cacheName] = config.useETag(cache, cacheData.etag, uri);
@@ -1251,18 +1265,18 @@ class Document extends core_1.Client {
                 }
                 if (result) {
                     result.log?.forEach(log => this.addLog(log));
-                    this.formatMessage(4, type, [joinString(cacheName, format.filter(value => value).join(' | '), options.filename), 'cache'], uri, { ...core_1.Client.LOG_STYLE_NOTICE, hintBold: true });
+                    this.formatMessage(4, type, [joinString(cacheName, format.filter(value => value).join(' | '), options.filename), 'cache'], uri, { ...Client.LOG_STYLE_NOTICE, hintBold: true });
                     return result;
                 }
             }
             options.cacheData = undefined;
         }
         const imports = transform.imports ||= {};
-        const series = new transform_1.TransformSeries(type, code, options);
+        const series = new TransformSeries(type, code, options);
         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)) {
-            if ((0, types_1.isObject)(transform[type])) {
+        if (username && isObject(transform = this.getUserSettings()?.transform)) {
+            if (isObject(transform[type])) {
                 userData = transform[type];
             }
             userImports = transform.imports;
@@ -1282,7 +1296,7 @@ class Document extends core_1.Client {
                 if (!plugin || a === plugin) {
                     if (b) {
                         if (baseConfig) {
-                            (0, types_1.cloneObject)(b, { target: baseConfig, deep: true, preserve: true });
+                            cloneObject(b, { target: baseConfig, deep: true, preserve: true });
                         }
                         else {
                             baseConfig = b;
@@ -1290,7 +1304,7 @@ class Document extends core_1.Client {
                     }
                     if (c) {
                         if (outputConfig) {
-                            (0, types_1.cloneObject)(c, { target: outputConfig, deep: true, preserve: true });
+                            cloneObject(c, { target: outputConfig, deep: true, preserve: true });
                         }
                         else {
                             outputConfig = c;
@@ -1317,10 +1331,10 @@ 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.hasPermission('fs') || process.permission) && out.sourceFiles.some(item => !this.canRead(item, { ownPermissionOnly: true }))) {
+                    if (typeof value !== 'string' || 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 });
+                        this.writeFail(["Unable to transform document", plugin], errorMessage(plugin, name, typeof value === 'string' ? "Unsupported access" : "Empty"), { type: 4, startTime });
                     }
                     else if (source !== value) {
                         series.code = value;
@@ -1328,16 +1342,16 @@ class Document extends core_1.Client {
                         if (out.ignoreCache && isExcluded(type, name, config, cacheData)) {
                             ignoreCache = true;
                         }
-                        if ((0, types_1.isArray)(out.sourceFiles)) {
+                        if (isArray(out.sourceFiles)) {
                             sourceFiles = sourceFiles ? sourceFiles.concat(out.sourceFiles.filter(item => !sourceFiles.includes(item))) : out.sourceFiles.slice(0);
                         }
                     }
-                    if ((0, types_1.isArray)(out.logAppend)) {
+                    if (isArray(out.logAppend)) {
                         out.logAppend.forEach(log => this.addLog(log));
                         storedLog = (storedLog || []).concat(out.logAppend);
                         bypassLog = true;
                     }
-                    if ((0, types_1.isArray)(out.logQueued)) {
+                    if (isArray(out.logQueued)) {
                         out.logQueued.forEach(log => this.writeLog(log, true));
                         storedLog = (storedLog || []).concat(out.logQueued);
                         bypassLog = true;
@@ -1354,17 +1368,17 @@ class Document extends core_1.Client {
                         context = require(plugin);
                     }
                     catch {
-                        context = await (0, types_1.importESM)(plugin);
+                        context = await importESM(plugin);
                     }
                     series.packageName = plugin;
                     if (typeof baseConfig === 'function') {
                         series.baseConfig = outputConfig;
-                        if ((0, types_1.isFunction)(baseConfig, true)) {
+                        if (isFunction(baseConfig, true)) {
                             next(await baseConfig(context, source, series));
                         }
                         else {
-                            const thisArg = core_1.Client.enabled("node.process.inline") ? process : null;
-                            const inlineArg = core_1.Client.enabled("node.require.inline");
+                            const thisArg = Client.enabled("node.process.inline") ? process : null;
+                            const inlineArg = Client.enabled("node.require.inline");
                             const args = [context, source, series];
                             if (baseConfig.toString().startsWith('async')) {
                                 if (inlineArg) {
@@ -1387,7 +1401,7 @@ class Document extends core_1.Client {
                         let transformer = CACHE_PACKAGE.get(target + username);
                         if (!transformer) {
                             try {
-                                let pkg = this.resolveDir('package', plugin + '.js') || this.resolveDir('package', plugin + '.cjs') || this.resolveDir('package', plugin + '.mjs') || userImports?.[plugin] || imports[plugin] || types_1.IMPORT_MAP[plugin];
+                                let pkg = this.resolveDir('package', plugin + '.js') || this.resolveDir('package', plugin + '.cjs') || this.resolveDir('package', plugin + '.mjs') || userImports?.[plugin] || imports[plugin] || IMPORT_MAP[plugin];
                                 if (pkg) {
                                     const match = /^(@?\S+)[@:](\d+(?:\.\d+(?:[.-]\S+)?)?|[a-z]+)$/.exec(pkg);
                                     if (match) {
@@ -1396,7 +1410,7 @@ class Document extends core_1.Client {
                                     }
                                     const ext = path.extname(pkg);
                                     if (ext === '.mjs') {
-                                        transformer = await (0, types_1.importESM)(pkg, false, true);
+                                        transformer = await importESM(pkg, false, true);
                                     }
                                     else if (ext === '.cjs') {
                                         transformer = require(pkg);
@@ -1406,7 +1420,7 @@ class Document extends core_1.Client {
                                             transformer = require(pkg);
                                         }
                                         catch {
-                                            transformer = await (0, types_1.importESM)(pkg, false, true);
+                                            transformer = await importESM(pkg, false, true);
                                         }
                                     }
                                 }
@@ -1414,11 +1428,11 @@ class Document extends core_1.Client {
                                     transformer = context;
                                     context = null;
                                 }
-                                if ((0, types_1.isObject)(transformer)) {
-                                    transformer = typeof transformer[name] === 'function' ? transformer[name] : typeof transformer[name.replaceAll('-', '_')] === 'function' ? transformer[name.replaceAll('-', '_')] : transformer.default;
+                                if (isObject(transformer)) {
+                                    transformer = typeof transformer[name] === 'function' ? transformer[name] : typeof transformer[name.replace(/-/g, '_')] === 'function' ? transformer[name.replace(/-/g, '_')] : transformer.default;
                                 }
                                 if (typeof transformer !== 'function') {
-                                    throw (0, types_1.errorMessage)(plugin, "Invalid function", pkg || name);
+                                    throw errorMessage(plugin, "Invalid function", pkg || name);
                                 }
                                 if (pkg) {
                                     CACHE_PACKAGE.set(target + username, transformer);
@@ -1436,7 +1450,7 @@ class Document extends core_1.Client {
                 }
                 catch (err) {
                     abortTransform();
-                    this.checkPackage(err, (0, util_1.getModuleName)(err), ["Unable to transform document", target], { type: 4, startTime });
+                    this.checkPackage(err, getModuleName(err), ["Unable to transform document", target], { type: 4, startTime });
                     if (i < length - 1) {
                         series.reset();
                     }
@@ -1445,10 +1459,10 @@ class Document extends core_1.Client {
             else if (name) {
                 abortTransform();
                 if (plugin) {
-                    this.writeFail("Unable to load configuration", (0, types_1.errorMessage)(plugin, name, "Invalid config"), 4);
+                    this.writeFail("Unable to load configuration", errorMessage(plugin, name, "Invalid config"), 4);
                 }
                 else {
-                    this.writeFail("Format method was not found", (0, types_1.errorValue)(name, "Unknown"), 4);
+                    this.writeFail("Format method was not found", errorValue(name, "Unknown"), 4);
                 }
             }
         }
@@ -1468,7 +1482,7 @@ class Document extends core_1.Client {
         if (sourceMap.map && sourceMap.code === output.code) {
             output.map = sourceMap.map;
         }
-        if ((0, types_1.isArray)(series.supplementChunks)) {
+        if (isArray(series.supplementChunks)) {
             output.chunks = series.supplementChunks.map(item => ({ code: item.code, map: output.map && item.sourceMap?.map, entryPoint: item.entryPoint, filename: item.filename }));
         }
         if (sourceFiles) {
@@ -1479,11 +1493,28 @@ class Document extends core_1.Client {
         }
         return output;
     }
+    #checkIntegrity(metadata, url, localUri) {
+        const integrity = metadata?.[url];
+        if (!isString(integrity)) {
+            return true;
+        }
+        try {
+            const match = /^(sha(?:256|384|512))-(.+)$/i.exec(integrity);
+            if (match && hashKey(fs.readFileSync(localUri), match[1], 'base64') === match[2]) {
+                return true;
+            }
+            this.addLog(3, joinString('checksum', url, integrity), 'imports', path.basename(localUri));
+        }
+        catch (err) {
+            this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
+        }
+        return false;
+    }
     #getConfigObject(data, name, target, cache) {
         if (this.settingsOf('transform', 'coerce') === true) {
-            (0, types_1.coerceObject)(target, cache);
+            coerceObject(target, cache);
         }
-        return (0, types_1.cloneObject)(data[name] = target, true);
+        return cloneObject(data[name] = target, true);
     }
     #addConfigError(...message) {
         this.addLog(2, joinString('config', ...message));
@@ -1515,17 +1546,17 @@ class Document extends core_1.Client {
         return [];
     }
     set imports(value) {
-        if (!(0, types_1.isPlainObject)(value)) {
-            this._imports = null;
-            return;
-        }
-        let imports = this._imports;
-        if (imports) {
-            this._imports = Object.assign(imports, value);
+        if (isPlainObject(value)) {
+            if (this._imports) {
+                this._imports = Object.assign(this._imports, value);
+            }
+            else {
+                const imports = this.getUserSettings()?.imports || this.module.imports;
+                this._imports = Object.assign({}, isPlainObject(imports) ? imports : undefined, value);
+            }
         }
         else {
-            imports = this.getUserSettings()?.imports || this.module.imports;
-            this._imports = Object.assign(this._imports || {}, (0, types_1.isPlainObject)(imports) ? imports : undefined, value);
+            this._imports = null;
         }
     }
     get imports() {
@@ -1539,4 +1570,5 @@ class Document extends core_1.Client {
     }
 }
 initCache();
+
 module.exports = Document;