@e-mc/document 0.12.9 → 0.13.1

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/document
 
-* NodeJS 18
+* NodeJS 18.20.5 LTS
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.9/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.1/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -30,7 +30,7 @@ interface IDocument extends IClient<IFileManager, DocumentModule, TransformCallb
     init(assets: ExternalAsset[], config?: HostInitConfig): this;
     customize(options?: CustomizeOptions): void;
     findConfig(data: object, name: string, type?: string): PluginConfig;
-    loadConfig(data: object, name: string): ConfigOrTransformer | null | undefined;
+    loadConfig(data: object, name: string): ConfigOrTransformer | undefined;
     asSourceFile(value: string, cache: boolean): unknown;
     asSourceFile(value: string, options?: AsSourceFileOptions): unknown;
     findVersion(name: string | string[], fallback?: string): string;
@@ -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.12.9/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.9/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.9/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.9/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.9/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.9/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.9/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.9/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/watch.d.ts
 
 ## LICENSE
 

package/index.js

@@ -13,6 +13,7 @@ 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_CONFIG = new Map();
 const CACHE_TEMPLATE = {};
 const CACHE_VIEWENGINE = new Map();
 const CACHE_EXTERNAL = {};
@@ -41,14 +42,9 @@ function normalizeDir(value, check) {
     }
     return value.endsWith(sep) ? value : value + sep;
 }
-function getConfigObject(instance, data, name, target, cache) {
-    if (instance.settingsOf('transform', 'coerce') === true) {
-        (0, types_1.coerceObject)(target, cache);
-    }
-    return (0, types_1.cloneObject)(data[name] = target, true);
-}
-function errorConfig(instance, ...message) {
-    instance.addLog(2, joinString('config', ...message));
+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];
 }
 const isExcluded = (type, name, config, cacheData) => !(config?.hasType(type, name) || cacheData?.override === true);
 const wrapCount = (value) => chalk.grey('(') + value + chalk.grey(')');
@@ -231,7 +227,7 @@ class TransformConfig {
             }
         }
         if (limit !== undefined) {
-            let value;
+            let value = NaN;
             if (typeof limit === 'string') {
                 if (parseFloat(limit) === 0) {
                     value = 0;
@@ -632,19 +628,19 @@ class Document extends core_1.Client {
             }
             if (baseUrl) {
                 let pages = this.settings.pages;
-                if ((0, types_1.isPlainObject)(users?.pages)) {
-                    pages = (0, types_1.isPlainObject)(pages) ? { ...pages, ...users.pages } : users.pages;
+                if (users?.pages) {
+                    pages = pages ? { ...pages, ...users.pages } : users.pages;
                 }
-                if ((0, types_1.isPlainObject)(pages)) {
-                    let mimeMap;
-                    if ((0, types_1.isPlainObject)(mimeMap = pages[baseUrl])) {
+                if (pages) {
+                    let mimeMap = pages[baseUrl];
+                    if (mimeMap) {
                         mimeMap = { ...mimeMap };
                     }
                     else {
                         const items = [];
                         for (const pattern in pages) {
                             const item = pages[pattern];
-                            if ((0, types_1.isPlainObject)(item)) {
+                            if ((0, types_1.isObject)(item)) {
                                 if (pattern === baseUrl) {
                                     items.push(item);
                                 }
@@ -668,10 +664,9 @@ class Document extends core_1.Client {
                         }
                     }
                     if (mimeMap) {
-                        let merge;
                         for (const item of assets) {
-                            const mimeType = item.mimeType;
-                            if (mimeType && (0, types_1.isPlainObject)(merge = mimeMap[mimeType])) {
+                            const merge = item.mimeType && mimeMap[item.mimeType];
+                            if ((0, types_1.isObject)(merge)) {
                                 Object.assign(item, merge);
                             }
                         }
@@ -684,7 +679,7 @@ class Document extends core_1.Client {
             const db = this.module.db ||= {};
             const handler = db.handler;
             const database = this.dataSource.filter(this.forDb.bind(this));
-            let instance;
+            let instance = null;
             if (handler && handler !== "@e-mc/db") {
                 try {
                     const Module = require(handler);
@@ -711,25 +706,25 @@ class Document extends core_1.Client {
                 else {
                     instance.init();
                 }
+                instance.on('db:fail', (err, item) => this.addLog(3, err, { source: item.table ? `${item.source}@${item.table}` : item.source }));
                 this.Db = instance;
             }
         }
         this.assets = assets;
         super.init();
-        if (!ignoreExtensions) {
-            return this;
-        }
-        if (ignoreExtensions === true || ignoreExtensions === this.moduleName || Array.isArray(ignoreExtensions) && ignoreExtensions.includes(this.moduleName)) {
-            this._extensions = [];
-        }
-        else {
-            const extensions = this._extensions;
-            if ((0, types_1.isArray)(extensions)) {
-                if (typeof ignoreExtensions === 'string') {
-                    this._extensions = extensions.filter(value => value !== ignoreExtensions);
-                }
-                else if ((0, types_1.isArray)(ignoreExtensions)) {
-                    this._extensions = extensions.filter(value => !ignoreExtensions.includes(value));
+        if (ignoreExtensions) {
+            if (ignoreExtensions === true || ignoreExtensions === this.moduleName || Array.isArray(ignoreExtensions) && ignoreExtensions.includes(this.moduleName)) {
+                this._extensions = [];
+            }
+            else {
+                const extensions = this._extensions;
+                if ((0, types_1.isArray)(extensions)) {
+                    if (typeof ignoreExtensions === 'string') {
+                        this._extensions = extensions.filter(value => value !== ignoreExtensions);
+                    }
+                    else if ((0, types_1.isArray)(ignoreExtensions)) {
+                        this._extensions = extensions.filter(value => !ignoreExtensions.includes(value));
+                    }
                 }
             }
         }
@@ -757,6 +752,21 @@ class Document extends core_1.Client {
         }
     }
     findConfig(data, name, type) {
+        const username = this.host?.username;
+        let cacheKey;
+        if (username) {
+            const cache = CACHE_CONFIG.get(data);
+            cacheKey = type ? `${name}::${type}` : name;
+            if (cache) {
+                const items = cache[username]?.[name];
+                if (items) {
+                    return cloneConfigItems(items);
+                }
+            }
+            else {
+                CACHE_CONFIG.set(data, {});
+            }
+        }
         for (const plugin in data) {
             const settings = data[plugin];
             for (const attr in settings) {
@@ -764,7 +774,12 @@ class Document extends core_1.Client {
                     const options = this.loadConfig(settings, attr);
                     const output = this.loadConfig(settings, attr + '-output');
                     if (options || output) {
-                        return [plugin, options, output, true];
+                        const result = [plugin, options, output, true];
+                        if (cacheKey) {
+                            const cache = CACHE_CONFIG.get(data)[username] ||= {};
+                            cache[cacheKey] = cloneConfigItems(result);
+                        }
+                        return result;
                     }
                 }
             }
@@ -778,7 +793,7 @@ class Document extends core_1.Client {
                 return value;
             case 'object':
                 if (value) {
-                    return getConfigObject(this, data, name, value, true);
+                    return this.#getConfigObject(data, name, value, true);
                 }
                 break;
             case 'string': {
@@ -787,16 +802,16 @@ class Document extends core_1.Client {
                     if (!name.endsWith('-output')) {
                         return data[name] = result;
                     }
-                    errorConfig(this, "\"output\" can only be a plain object");
+                    this.#addConfigError("\"output\" can only be a plain object");
                 }
                 else if ((0, types_1.isPlainObject)(result)) {
-                    return getConfigObject(this, data, name, result, false);
+                    return this.#getConfigObject(data, name, result, false);
                 }
                 else if (path.isAbsolute(value)) {
-                    errorConfig(this, name, "Unsupported access", value);
+                    this.#addConfigError(name, "Unsupported access", value);
                 }
                 else {
-                    errorConfig(this, name, "Unknown");
+                    this.#addConfigError(name, "Unknown");
                 }
                 break;
             }
@@ -832,29 +847,19 @@ class Document extends core_1.Client {
         else if ((0, types_1.isObject)(options)) {
             ({ encoding, cache } = options);
         }
-        let result;
-        if ((value = value.trim()).startsWith('npm:')) {
-            if (!core_1.Client.enabled("node.require.npm")) {
-                return null;
-            }
-            const pkgName = value.substring(4);
-            if (!result) {
-                try {
-                    result = require(pkgName);
-                    if (typeof result === 'function') {
-                        return Object.defineProperty(result, "__cjs__", { value: true });
-                    }
-                }
-                catch (err) {
-                    this.checkPackage(err, pkgName, "Unknown");
-                }
-                if (!result) {
+        let result, pkgName;
+        try {
+            if (value.startsWith('npm:')) {
+                if (!core_1.Client.enabled("node.require.npm")) {
                     return null;
                 }
+                result = require(pkgName = value.substring(4));
+                if (typeof result === 'function') {
+                    return Object.defineProperty(result, "__cjs__", { value: true });
+                }
+                return result;
             }
-        }
-        try {
-            const source = (result || 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: (0, types_1.getEncoding)(encoding), cache }) || value;
             if (typeof source !== 'string') {
                 result = source;
             }
@@ -870,7 +875,9 @@ class Document extends core_1.Client {
             }
         }
         catch (err) {
-            this.writeFail(["Unable to read file", path.basename(value)], err, 8192);
+            if (!pkgName || this.checkPackage(err, pkgName)) {
+                this.writeFail(["Unable to read file", path.basename(value)], err, 8192);
+            }
         }
         return null;
     }
@@ -1289,7 +1296,7 @@ class Document extends core_1.Client {
                 series.outputConfig = outputConfig;
                 const source = series.code;
                 const startTime = process.hrtime.bigint();
-                const hint = plugin + ':' + name;
+                const target = plugin + ':' + name;
                 const next = (value) => {
                     if (this.aborted) {
                         valid = false;
@@ -1309,30 +1316,17 @@ class Document extends core_1.Client {
                             ignoreCache = true;
                         }
                         if ((0, types_1.isArray)(out.sourceFiles)) {
-                            if (!sourceFiles) {
-                                sourceFiles = out.sourceFiles.slice(0);
-                            }
-                            else {
-                                out.sourceFiles.forEach(item => {
-                                    if (!sourceFiles.includes(item)) {
-                                        sourceFiles.push(item);
-                                    }
-                                });
-                            }
+                            sourceFiles = sourceFiles ? sourceFiles.concat(out.sourceFiles.filter(item => !sourceFiles.includes(item))) : out.sourceFiles.slice(0);
                         }
                     }
                     if ((0, types_1.isArray)(out.logAppend)) {
-                        out.logAppend.forEach(log => {
-                            this.addLog(log);
-                        });
-                        (storedLog ||= []).push(...out.logAppend);
+                        out.logAppend.forEach(log => this.addLog(log));
+                        storedLog = (storedLog || []).concat(out.logAppend);
                         bypassLog = true;
                     }
                     if ((0, types_1.isArray)(out.logQueued)) {
-                        out.logQueued.forEach(log => {
-                            this.writeLog(log, true);
-                        });
-                        (storedLog ||= []).push(...out.logQueued);
+                        out.logQueued.forEach(log => this.writeLog(log, true));
+                        storedLog = (storedLog || []).concat(out.logQueued);
                         bypassLog = true;
                     }
                     if (i < length - 1) {
@@ -1340,7 +1334,7 @@ class Document extends core_1.Client {
                     }
                     this.writeTimeProcess(failed ? 'CHECK' : type, joinString(plugin, name, options.filename) + (series.out.messageAppend || ''), startTime, { failed, bypassLog });
                 };
-                this.formatMessage(4, type, ["Transforming source...", hint], options.filename, { hintColor: 'cyan' });
+                this.formatMessage(4, type, ["Transforming source...", target], options.filename, { hintColor: 'cyan' });
                 try {
                     let context;
                     try {
@@ -1377,7 +1371,7 @@ class Document extends core_1.Client {
                         }
                     }
                     else {
-                        let transformer = CACHE_PACKAGE[plugin + username];
+                        let transformer = CACHE_PACKAGE[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];
@@ -1389,7 +1383,7 @@ class Document extends core_1.Client {
                                     }
                                     const ext = path.extname(pkg);
                                     if (ext === '.mjs') {
-                                        transformer = await (0, types_1.importESM)(pkg, true, true);
+                                        transformer = await (0, types_1.importESM)(pkg, false, true);
                                     }
                                     else if (ext === '.cjs') {
                                         transformer = require(pkg);
@@ -1399,7 +1393,7 @@ class Document extends core_1.Client {
                                             transformer = require(pkg);
                                         }
                                         catch {
-                                            transformer = await (0, types_1.importESM)(pkg, true, true);
+                                            transformer = await (0, types_1.importESM)(pkg, false, true);
                                         }
                                     }
                                 }
@@ -1407,19 +1401,19 @@ class Document extends core_1.Client {
                                     transformer = context;
                                     context = null;
                                 }
-                                if ((0, types_1.isObject)(transformer) && typeof transformer.default === 'function') {
-                                    transformer = transformer.default;
+                                if ((0, types_1.isObject)(transformer)) {
+                                    transformer = typeof transformer[name] === 'function' ? transformer[name] : typeof transformer[name.replaceAll('-', '_')] === 'function' ? transformer[name.replaceAll('-', '_')] : transformer.default;
                                 }
-                                else if (typeof transformer !== 'function') {
-                                    throw (0, types_1.errorMessage)(plugin, pkg || name, "Invalid function");
+                                if (typeof transformer !== 'function') {
+                                    throw (0, types_1.errorMessage)(plugin, "Invalid function", pkg || name);
                                 }
                                 if (pkg) {
-                                    CACHE_PACKAGE[plugin + username] = transformer;
+                                    CACHE_PACKAGE[target + username] = transformer;
                                 }
                             }
                             catch (err) {
                                 abortTransform();
-                                this.writeFail(["Unknown", username ? plugin + ':' + username : hint], err, { type: 4, startTime });
+                                this.writeFail(["Unknown", username ? target + ':' + username : target], err, { type: 4, startTime });
                                 continue;
                             }
                         }
@@ -1429,7 +1423,7 @@ class Document extends core_1.Client {
                 }
                 catch (err) {
                     abortTransform();
-                    this.checkPackage(err, (0, util_1.getModuleName)(err), ["Unable to transform document", hint], { type: 4, startTime });
+                    this.checkPackage(err, (0, util_1.getModuleName)(err), ["Unable to transform document", target], { type: 4, startTime });
                     if (i < length - 1) {
                         series.reset();
                     }
@@ -1472,6 +1466,15 @@ class Document extends core_1.Client {
         }
         return output;
     }
+    #getConfigObject(data, name, target, cache) {
+        if (this.settingsOf('transform', 'coerce') === true) {
+            (0, types_1.coerceObject)(target, cache);
+        }
+        return (0, types_1.cloneObject)(data[name] = target, true);
+    }
+    #addConfigError(...message) {
+        this.addLog(2, joinString('config', ...message));
+    }
     set assets(value) {
         this._assets = value;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.12.9",
+  "version": "0.13.1",
   "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.12.9",
-    "@e-mc/db": "0.12.9",
-    "@e-mc/types": "0.12.9",
+    "@e-mc/core": "0.13.1",
+    "@e-mc/db": "0.13.1",
+    "@e-mc/types": "0.13.1",
     "chalk": "4.1.2",
     "domhandler": "^5.0.3",
     "domutils": "^3.2.2",

package/parse/index.js

@@ -31,7 +31,7 @@ const REGEXP_ATTRVALUE = new RegExp(PATTERN_ATTRNAME + '\\s*' + PATTERN_ATTRVALU
 const REGEXP_TAGATTR = new RegExp(`<${PATTERN_TAGNAME}\\s+(${PATTERN_TAGOPEN}*)>`, 'g');
 function applyAttributes(attrs, data, ignoreCase) {
     for (const key in data) {
-        attrs.set(ignoreCase && typeof key === 'string' ? key.toLowerCase() : key.toString(), data[key]);
+        attrs.set(ignoreCase && typeof key === 'string' ? key.toLowerCase() : key, data[key]);
     }
 }
 function deletePosition(item, rootName, startIndex) {

package/transform/index.js

@@ -1,9 +1,10 @@
 "use strict";
 exports.SourceMap = exports.TransformSeries = void 0;
+const fs = require("node:fs");
 const path = require("node:path");
 const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
-const kTransformSeries = Symbol.for('transformseries:constructor');
+const kTransformSeries = Symbol.for('document:transform:series:constructor');
 function parseMap(data, value) {
     let [mimeType, encoding] = data.split(';');
     if (!encoding && !mimeType.includes('/')) {
@@ -125,47 +126,75 @@ class TransformSeries extends core_1.Module {
         }
         return baseConfig;
     }
-    upgrade(context, dirname, pkgname) {
-        if (this.version === 'latest') {
-            try {
-                const pathname = dirname && this.findModule(dirname, pkgname) || pkgname;
-                if (pathname) {
-                    return require(pathname);
-                }
-            }
-            catch {
+    upgrade(context, startDir, packageName, version) {
+        if ((0, types_1.isObject)(startDir)) {
+            ({ startDir, packageName, version } = startDir);
+        }
+        try {
+            const pathname = startDir && this.findModule(startDir, packageName, version || this.version) || packageName;
+            if (pathname) {
+                return require(pathname);
             }
         }
+        catch {
+        }
         return context;
     }
-    async upgradeESM(context, dirname, pkgname) {
-        if (this.version === 'latest') {
-            try {
-                const pathname = dirname && this.findModule(dirname, pkgname);
-                let result;
-                if (pathname) {
-                    result = await (0, types_1.importESM)(pathname, false, true);
-                }
-                else if (pkgname) {
-                    result = await (0, types_1.importESM)(pkgname);
-                }
-                if (result) {
-                    return result;
-                }
+    async upgradeESM(context, startDir, packageName, version) {
+        if ((0, types_1.isObject)(startDir)) {
+            ({ startDir, packageName, version } = startDir);
+        }
+        try {
+            const pathname = startDir && this.findModule(startDir, packageName, version || this.version);
+            let result;
+            if (pathname) {
+                result = await (0, types_1.importESM)(pathname, false, true);
             }
-            catch {
+            else if (packageName) {
+                result = await (0, types_1.importESM)(packageName);
             }
-            return this.upgrade(context, dirname, pkgname);
-        }
-        return context;
-    }
-    findModule(dirname, pkgname) {
-        if (path.isAbsolute(dirname)) {
-            const pathname = path.join(dirname, 'node_modules', pkgname || this.packageName);
-            if (core_1.Module.isDir(pathname)) {
-                return pathname;
+            if (result) {
+                return result;
             }
         }
+        catch {
+        }
+        return this.upgrade(context, startDir, packageName);
+    }
+    findModule(startDir, packageName, version) {
+        if (path.isAbsolute(startDir)) {
+            version ||= 'latest';
+            do {
+                try {
+                    const pathname = path.join(startDir, 'node_modules', packageName || this.packageName);
+                    if (fs.statSync(pathname).isDirectory()) {
+                        if (version === 'latest') {
+                            return pathname;
+                        }
+                        const data = require(path.join(pathname, 'package.json'));
+                        if ((0, types_1.isString)(data?.version)) {
+                            if (version === data.version) {
+                                return pathname;
+                            }
+                            if (version.startsWith('^') || version.endsWith('$')) {
+                                if (new RegExp(version).test(data.version)) {
+                                    return pathname;
+                                }
+                            }
+                            else if (version.endsWith('.') && data.version.startsWith(version)) {
+                                return pathname;
+                            }
+                        }
+                    }
+                }
+                catch (err) {
+                    if ((0, types_1.isErrorCode)(err, 'EACCES')) {
+                        return '';
+                    }
+                }
+                startDir = path.dirname(startDir);
+            } while (startDir.length > 1);
+        }
         return '';
     }
     close(instance) {