@e-mc/document 0.13.6 → 0.13.8

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/document
 
-* NodeJS 18.20.5 LTS
+* NodeJS 18.20 LTS
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.6/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.8/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -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.13.6/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.6/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/watch.d.ts
 
 ## LICENSE
 

package/index.js

@@ -12,21 +12,28 @@ 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_PACKAGE = new Map();
 const CACHE_CONFIG = new Map();
-const CACHE_TEMPLATE = {};
+const CACHE_TEMPLATE = new Map();
 const CACHE_VIEWENGINE = new Map();
-const CACHE_EXTERNAL = {};
-const CACHE_ETAG = {};
-const CACHE_CODE = {};
-const CACHE_HASH = {};
-const CACHE_PICOMATCH = new Map();
+let CACHE_ETAG;
+let CACHE_CODE;
+let CACHE_HASH;
+let CACHE_EXTERNAL;
+let CACHE_PICOMATCH;
 let CACHE_TOTAL = 0;
+function initCache() {
+    CACHE_ETAG = Object.create(null);
+    CACHE_CODE = Object.create(null);
+    CACHE_HASH = Object.create(null);
+    CACHE_PICOMATCH = Object.create(null);
+    CACHE_EXTERNAL = Object.create(null);
+}
 function deleteTransform(map, key, timeout) {
     if (timeout) {
         clearTimeout(timeout);
     }
-    delete map[key];
+    map.delete(key);
     --CACHE_TOTAL;
 }
 function getSourceMappingURL(value, css) {
@@ -83,13 +90,13 @@ class TransformCache {
         return data;
     }
     get(stored) {
-        const location = stored.format[this.formatKey];
+        const location = stored.format.get(this.formatKey);
         if (typeof location === 'string') {
             try {
                 return JSON.parse(fs.readFileSync(location, this.encoding));
             }
             catch {
-                delete stored.format[this.formatKey];
+                stored.format.delete(this.formatKey);
                 fs.unlink(location, () => { });
                 return;
             }
@@ -99,46 +106,48 @@ class TransformCache {
     save(type, code, formatData) {
         const lastAccessed = Date.now();
         const config = this.config;
+        const create = () => new Map([[this.formatKey, this.set(type, formatData)]]);
+        const update = (stored) => {
+            stored.format.set(this.formatKey, this.set(type, formatData));
+            stored.lastAccessed = lastAccessed;
+        };
         if (this.formatType === 1) {
             const { uri, etag } = this.cacheData;
             const etagMap = CACHE_ETAG[config.moduleName];
-            const stored = etagMap[uri];
+            const stored = etagMap.get(uri);
             if (stored) {
-                if (stored.etag === etag) {
-                    stored.format[this.formatKey] = this.set(type, formatData);
-                    stored.lastAccessed = lastAccessed;
+                if (stored.hashKey === etag) {
+                    update(stored);
                     return;
                 }
                 deleteTransform(etagMap, uri, stored.timeout);
             }
-            etagMap[uri] = { lastAccessed, etag, timeout: config.renewSession(etagMap, uri), format: { [this.formatKey]: this.set(type, formatData) } };
+            etagMap.set(uri, { lastAccessed, timeout: config.renewSession(etagMap, uri), format: create(), hashKey: etag });
             ++CACHE_TOTAL;
         }
         else if (this.formatType === 2) {
             const hashMap = CACHE_HASH[config.moduleName];
             const key = this.hashKey;
-            const stored = hashMap[key];
+            const stored = hashMap.get(key);
             if (stored) {
-                stored.format[this.formatKey] = this.set(type, formatData);
-                stored.lastAccessed = lastAccessed;
+                update(stored);
                 return;
             }
-            hashMap[key] = { lastAccessed, timeout: config.renewSession(hashMap, key), format: { [this.formatKey]: this.set(type, formatData) } };
+            hashMap.set(key, { lastAccessed, timeout: config.renewSession(hashMap, key), format: create() });
             ++CACHE_TOTAL;
         }
         else {
             const uri = this.cacheData.uri;
             const codeMap = CACHE_CODE[config.moduleName];
-            const stored = codeMap[uri];
+            const stored = codeMap.get(uri);
             if (stored) {
-                if (stored.code === code) {
-                    stored.format[this.formatKey] = this.set(type, formatData);
-                    stored.lastAccessed = lastAccessed;
+                if (stored.hashKey === code) {
+                    update(stored);
                     return;
                 }
                 deleteTransform(codeMap, uri, stored.timeout);
             }
-            codeMap[uri] = { lastAccessed, code, timeout: config.renewSession(codeMap, uri), format: { [this.formatKey]: this.set(type, formatData) } };
+            codeMap.set(uri, { lastAccessed, timeout: config.renewSession(codeMap, uri), format: create(), hashKey: code });
             ++CACHE_TOTAL;
         }
     }
@@ -174,7 +183,7 @@ class TransformConfig {
             algorithm = options;
             enabled = true;
         }
-        else if ((0, types_1.isPlainObject)(options)) {
+        else if ((0, types_1.isObject)(options)) {
             ({ enabled = true, algorithm, etag, expires, renew, limit, include, exclude } = options);
         }
         if (!enabled) {
@@ -268,19 +277,17 @@ class TransformConfig {
     }
     renewSession(map, key) {
         if (this.expires > 0) {
-            return setTimeout(() => {
-                deleteTransform(map, key);
-            }, this.expires);
+            return setTimeout(() => deleteTransform(map, key), this.expires);
         }
         return null;
     }
     useETag(cache, etag, uri) {
-        const etagMap = CACHE_ETAG[this.moduleName] ||= {};
-        const stored = etagMap[uri];
+        const etagMap = CACHE_ETAG[this.moduleName] ||= new Map();
+        const stored = etagMap.get(uri);
         cache.formatType = 1;
         if (stored) {
             let result;
-            if (stored.etag !== etag) {
+            if (stored.hashKey !== etag) {
                 deleteTransform(etagMap, uri, stored.timeout);
             }
             else if (result = cache.get(stored)) {
@@ -293,8 +300,8 @@ class TransformConfig {
     useHash(cache, code) {
         let key;
         if (this.withinLimit(code, cache.encoding) && (key = core_1.Client.asHash(code, this.algorithm, { encoding: cache.encoding }))) {
-            const hashMap = CACHE_HASH[this.moduleName] ||= {};
-            const stored = hashMap[key];
+            const hashMap = CACHE_HASH[this.moduleName] ||= new Map();
+            const stored = hashMap.get(key);
             let result;
             cache.formatType ||= 2;
             cache.hashKey = key;
@@ -307,12 +314,12 @@ class TransformConfig {
     }
     useUri(cache, code, uri) {
         if (this.withinLimit(code, cache.encoding)) {
-            const codeMap = CACHE_CODE[this.moduleName] ||= {};
-            const stored = codeMap[uri];
+            const codeMap = CACHE_CODE[this.moduleName] ||= new Map();
+            const stored = codeMap.get(uri);
             cache.formatType ||= 3;
             if (stored) {
                 let result;
-                if (stored.code !== code) {
+                if (stored.hashKey !== code) {
                     deleteTransform(codeMap, uri, stored.timeout);
                 }
                 else if (result = cache.get(stored)) {
@@ -339,20 +346,19 @@ class Document extends core_1.Client {
             for (const cache of [CACHE_ETAG, CACHE_CODE, CACHE_HASH]) {
                 for (const name in cache) {
                     const map = cache[name];
-                    for (const key in map) {
-                        deleteTransform(map, key, map[key].timeout);
+                    for (const [key, data] of map) {
+                        deleteTransform(map, key, data.timeout);
                         ++result;
                     }
-                    delete cache[name];
                 }
             }
-            for (const cache of [CACHE_PACKAGE, CACHE_EXTERNAL, CACHE_TEMPLATE]) {
-                for (const name in cache) {
-                    delete cache[name];
-                }
+            initCache();
+            for (const item of CACHE_TEMPLATE.values()) {
+                item.clear();
             }
+            CACHE_PACKAGE.clear();
+            CACHE_TEMPLATE.clear();
             CACHE_VIEWENGINE.clear();
-            CACHE_PICOMATCH.clear();
             CACHE_TOTAL = 0;
         }
         else if (percent > 0) {
@@ -360,16 +366,16 @@ class Document extends core_1.Client {
             for (const cache of [CACHE_ETAG, CACHE_CODE, CACHE_HASH]) {
                 for (const name in cache) {
                     const map = cache[name];
-                    for (const key in map) {
-                        stored.push([map, key]);
+                    for (const [key, data] of map) {
+                        stored.push([map, key, data]);
                     }
                 }
             }
-            stored.sort(([a1, a2], [b1, b2]) => a1[a2].lastAccessed - b1[b2].lastAccessed);
+            stored.sort((a, b) => a[2].lastAccessed - b[2].lastAccessed);
             result = Math.floor(stored.length * percent);
             for (let i = 0; i < result; ++i) {
-                const [map, key] = stored[i];
-                deleteTransform(map, key, map[key].timeout);
+                const [map, key, data] = stored[i];
+                deleteTransform(map, key, data.timeout);
             }
             CACHE_TOTAL = stored.length - result;
         }
@@ -645,10 +651,7 @@ class Document extends core_1.Client {
                                     items.push(item);
                                 }
                                 else if ((0, types_1.hasGlob)(pattern)) {
-                                    let isMatch = CACHE_PICOMATCH.get(pattern);
-                                    if (!isMatch) {
-                                        CACHE_PICOMATCH.set(pattern, isMatch = pm(pattern, { matchBase: true }));
-                                    }
+                                    const isMatch = CACHE_PICOMATCH[pattern] ||= pm(pattern, { matchBase: true });
                                     if (isMatch(baseUrl)) {
                                         items.push(item);
                                     }
@@ -758,13 +761,13 @@ class Document extends core_1.Client {
             const cache = CACHE_CONFIG.get(data);
             cacheKey = type ? `${name}::${type}` : name;
             if (cache) {
-                const items = cache[username]?.[name];
+                const items = cache[username]?.[cacheKey];
                 if (items) {
                     return cloneConfigItems(items);
                 }
             }
             else {
-                CACHE_CONFIG.set(data, {});
+                CACHE_CONFIG.set(data, Object.create(null));
             }
         }
         for (const plugin in data) {
@@ -776,7 +779,7 @@ class Document extends core_1.Client {
                     if (options || output) {
                         const result = [plugin, options, output, true];
                         if (cacheKey) {
-                            const cache = CACHE_CONFIG.get(data)[username] ||= {};
+                            const cache = CACHE_CONFIG.get(data)[username] ||= Object.create(null);
                             cache[cacheKey] = cloneConfigItems(result);
                         }
                         return result;
@@ -1065,7 +1068,12 @@ class Document extends core_1.Client {
                 case 'xml':
                     return new (require('fast-xml-parser').XMLParser)(options).parse(source);
                 case 'toml':
-                    return require('toml').parse(source);
+                    try {
+                        return require('smol-toml').parse(source, options);
+                    }
+                    catch {
+                        return require('toml').parse(source);
+                    }
                 default:
                     return JSON.parse(source);
             }
@@ -1118,7 +1126,7 @@ class Document extends core_1.Client {
             this.writeFail(["Unable to load configuration", from], (0, types_1.errorMessage)('view-engine', from, "Unknown"));
             return null;
         }
-        if (data.length === 0 && !target.outputEmpty) {
+        if (!target.outputEmpty && !(0, types_1.isArray)(data)) {
             return '';
         }
         try {
@@ -1138,15 +1146,19 @@ class Document extends core_1.Client {
                     (0, types_1.coerceObject)(output, stored);
                 }
             }
+            let cache = CACHE_TEMPLATE.get(target.name);
+            if (!cache) {
+                cache = new Map();
+                CACHE_TEMPLATE.set(target.name, cache);
+            }
             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 = '', valid = false, expires = typeof target.expires === 'string' ? (0, types_1.parseExpires)(target.expires) : target.expires, render;
             if (expires !== 0) {
-                render = cache[cacheKey];
+                render = cache.get(cacheKey);
             }
-            else if (username && cacheKey in cache) {
-                delete cache[cacheKey];
+            else if (username && cache.has(cacheKey)) {
+                cache.delete(cacheKey);
             }
             if (!render) {
                 if ((0, types_1.isArray)(compile)) {
@@ -1156,7 +1168,7 @@ class Document extends core_1.Client {
                     render = typeof context.compileSync === 'function' ? context.compileSync(template, compile) : await context.compile(template, compile);
                 }
                 if (expires !== 0) {
-                    cache[cacheKey] = render;
+                    cache.set(cacheKey, render);
                     if (this.hasPermission('memory')) {
                         expires = typeof expires === 'number' && expires !== Infinity ? Math.min(expires, core_1.Client.MAX_TIMEOUT) : 0;
                     }
@@ -1164,14 +1176,14 @@ class Document extends core_1.Client {
                         expires = 60000;
                     }
                     if (expires > 0) {
-                        setTimeout(() => delete cache[cacheKey], expires);
+                        setTimeout(() => cache.delete(cacheKey), expires);
                     }
                 }
             }
             const writeRow = async (row) => {
                 const content = await render.call(context, row);
                 if (content != null) {
-                    result += content;
+                    result += typeof content === 'string' ? content : JSON.stringify(content);
                     valid = true;
                 }
             };
@@ -1204,8 +1216,9 @@ class Document extends core_1.Client {
         return null;
     }
     async transform(type, code, format, options = {}) {
-        let transform = this.settings.transform, data;
-        if (!(0, types_1.isObject)(transform) || !(0, types_1.isObject)(data = transform[type])) {
+        let transform = this.settings.transform;
+        const data = transform?.[type];
+        if (!(0, types_1.isObject)(data)) {
             return;
         }
         if (typeof format === 'string') {
@@ -1218,13 +1231,13 @@ class Document extends core_1.Client {
         if (cacheData) {
             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 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) : ''));
                 let result, cacheName;
-                if (config.etag && etag && uri) {
-                    [result, cacheName] = config.useETag(cache, etag, uri);
+                if (config.etag && cacheData.etag && uri) {
+                    [result, cacheName] = config.useETag(cache, cacheData.etag, uri);
                 }
                 if (!result) {
                     if (config.algorithm) {
@@ -1235,14 +1248,12 @@ class Document extends core_1.Client {
                     }
                 }
                 if (result) {
-                    result.log?.forEach(log => {
-                        this.addLog(log);
-                    });
+                    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 });
                     return result;
                 }
             }
-            delete options.cacheData;
+            options.cacheData = undefined;
         }
         const imports = transform.imports ||= {};
         const series = new transform_1.TransformSeries(type, code, options);
@@ -1371,7 +1382,7 @@ class Document extends core_1.Client {
                         }
                     }
                     else {
-                        let transformer = CACHE_PACKAGE[target + username];
+                        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];
@@ -1408,7 +1419,7 @@ class Document extends core_1.Client {
                                     throw (0, types_1.errorMessage)(plugin, "Invalid function", pkg || name);
                                 }
                                 if (pkg) {
-                                    CACHE_PACKAGE[target + username] = transformer;
+                                    CACHE_PACKAGE.set(target + username, transformer);
                                 }
                             }
                             catch (err) {
@@ -1525,4 +1536,5 @@ class Document extends core_1.Client {
         return this.assets.some(item => item.watch);
     }
 }
+initCache();
 module.exports = Document;

package/package.json

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

package/parse/dom.js

@@ -169,9 +169,9 @@ class DomWriter extends index_1.XmlWriter {
                     const textContent = trailing.reduce((a, b) => a + b.textContent, '');
                     offsetMap = index_1.XmlWriter.getTagOffset(textContent, { ignoreCase: this.ignoreCaseTagName, ignoreTagName: this.ignoreTagName, parser: this.parser });
                     source = source.substring(0, match.index) + textContent + source.substring(match.index);
-                    trailing.forEach(item => {
+                    for (const item of trailing) {
                         delete item.textContent;
-                    });
+                    }
                 }
             }
         }

package/parse/index.js

@@ -499,9 +499,9 @@ class XmlWriter {
         }
     }
     ignoreFlag(...values) {
-        values.forEach(value => {
+        for (const value of values) {
             this._ignoreFlag |= value;
-        });
+        }
     }
     getInvalidArea() {
         if ((this._ignoreFlag & IGNORE_FLAG.INTERIOR) === 0 && this._hasInvalidContent) {
@@ -820,9 +820,9 @@ class XmlWriter {
         const revised = this.decrement(node);
         if (revised.includes(node)) {
             if (tagName in this._tagCount) {
-                revised.forEach(item => {
+                for (const item of revised) {
                     updateTagName(item, tagName);
-                });
+                }
                 this.indexTag(tagName);
                 this.increment(revised);
             }

package/transform/index.js

@@ -22,6 +22,19 @@ function toJSON(data) {
     catch {
     }
 }
+function parseModuleArgs(startDir, packageName, version) {
+    if ((0, types_1.isObject)(startDir)) {
+        ({ startDir, packageName, version } = startDir);
+    }
+    if (!startDir && packageName && version && version !== 'latest') {
+        try {
+            startDir = path.dirname(require.resolve(packageName));
+        }
+        catch {
+        }
+    }
+    return [startDir, packageName, version];
+}
 class Out {
     sourceFiles;
     ignoreCache;
@@ -127,9 +140,7 @@ class TransformSeries extends core_1.Module {
         return baseConfig;
     }
     upgrade(context, startDir, packageName, version) {
-        if ((0, types_1.isObject)(startDir)) {
-            ({ startDir, packageName, version } = startDir);
-        }
+        [startDir, packageName, version] = parseModuleArgs(startDir, packageName, version);
         try {
             const pathname = startDir && this.findModule(startDir, packageName, version || this.version) || packageName;
             if (pathname) {
@@ -141,9 +152,7 @@ class TransformSeries extends core_1.Module {
         return context;
     }
     async upgradeESM(context, startDir, packageName, version) {
-        if ((0, types_1.isObject)(startDir)) {
-            ({ startDir, packageName, version } = startDir);
-        }
+        [startDir, packageName, version] = parseModuleArgs(startDir, packageName, version);
         try {
             const pathname = startDir && this.findModule(startDir, packageName, version || this.version);
             let result;

package/util.js

@@ -187,7 +187,7 @@ function trimQuote(value) {
     value = value.trim();
     const first = value[0];
     const last = value.at(-1);
-    return first === last && (first === '"' || first === "'") ? value.substring(1, value.length - 1).trim() : value;
+    return first === last && (first === '"' || first === "'") ? value.slice(1, -1).trim() : value;
 }
 function wrapQuote(value, quote = '"') {
     return quote + value.replace(new RegExp(`(?<!\\\\)${quote}`, 'g'), `\\${quote}`) + quote;