@e-mc/document 0.12.5 → 0.12.7

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.5/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.7/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.12.5/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.5/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.5/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.5/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.5/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.5/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.5/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.5/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/watch.d.ts
 
 ## LICENSE
 

package/index.js

@@ -14,6 +14,7 @@ const util_1 = require("@e-mc/document/util");
 const kDocument = Symbol.for('document:constructor');
 const CACHE_PACKAGE = {};
 const CACHE_TEMPLATE = {};
+const CACHE_VIEWENGINE = new Map();
 const CACHE_EXTERNAL = {};
 const CACHE_ETAG = {};
 const CACHE_CODE = {};
@@ -47,7 +48,7 @@ function getConfigObject(instance, data, name, target, cache) {
     return (0, types_1.cloneObject)(data[name] = target, true);
 }
 function errorConfig(instance, ...message) {
-    instance.addLog(types_1.STATUS_TYPE.ERROR, joinString('config', ...message));
+    instance.addLog(2, joinString('config', ...message));
 }
 const isExcluded = (type, name, config, cacheData) => !(config?.hasType(type, name) || cacheData?.override === true);
 const wrapCount = (value) => chalk.grey('(') + value + chalk.grey(')');
@@ -354,6 +355,7 @@ class Document extends core_1.Client {
                     delete cache[name];
                 }
             }
+            CACHE_VIEWENGINE.clear();
             CACHE_PICOMATCH.clear();
             CACHE_TOTAL = 0;
         }
@@ -572,7 +574,7 @@ class Document extends core_1.Client {
             if (fatal) {
                 ++fatalErrorCount;
             }
-            const [type, errorColor] = error === true ? [types_1.STATUS_TYPE.ERROR, 'red'] : error === false ? [types_1.STATUS_TYPE.WARN, 'yellow'] : [types_1.STATUS_TYPE.INFO, 'white'];
+            const [type, errorColor] = error === true ? [2, 'red'] : error === false ? [3, 'yellow'] : [4, 'white'];
             maxWidth = Math.max(1 + 0 + 1 + 0 + 1 + 2 + Math.min(Math.max(ruleId.length, ruleWidth), ruleWidth) + 2 + Math.min(Math.max(message.length, messageWidth), messageWidth), maxWidth);
             result.push({
                 type,
@@ -582,13 +584,13 @@ class Document extends core_1.Client {
         }
         maxWidth += maxLine + maxColumn;
         const title = (leadingText || '') + (pathname || filename ? (leadingText ? ': ' : '') + (pathname && filename ? path.join(pathname, filename) : pathname || filename) : '');
-        const divider = { type: types_1.STATUS_TYPE.INFO, value: '-'.repeat(maxWidth), timeStamp };
+        const divider = { type: 4, value: '-'.repeat(maxWidth), timeStamp };
         errorCount = ((Array.isArray(options.errorCount) ? (fixableErrorCount = options.errorCount[1], options.errorCount[0]) : options.errorCount) ?? errorCount).toString();
         warningCount = ((Array.isArray(options.warningCount) ? (fixableWarningCount = options.warningCount[1], options.warningCount[0]) : options.warningCount) ?? warningCount).toString();
         fatalErrorCount = (options.fatalErrorCount ?? fatalErrorCount).toString();
         const hasFatal = fatalErrorCount !== '0';
         result.unshift(divider, {
-            type: types_1.STATUS_TYPE.INFO,
+            type: 4,
             value: title + ' '.repeat(maxWidth - title.length - (hasFatal ? fatalErrorCount.length + 9 : 0)) + (hasFatal ? `fatal(${chalk.bold.bgRed.white(` ${fatalErrorCount} `)})` : ''),
             timeStamp,
             duration: currentTime - timeStamp
@@ -598,7 +600,7 @@ class Document extends core_1.Client {
             const errorHint = fixHint(fixableWarningCount, fixableErrorCount, fixableErrorCount);
             const warningHint = fixHint(fixableWarningCount, fixableErrorCount, fixableWarningCount);
             result.push({
-                type: types_1.STATUS_TYPE.INFO,
+                type: 4,
                 value: chalk.bold.red('error') + wrapCount(errorCount + errorHint) + ' / ' + chalk.bold.yellow('warning') + wrapCount(warningCount + warningHint) + ' '.repeat(maxWidth - trailingText.length - (7 + errorCount.length + errorHint.length + 3 + warningCount.length + warningHint.length + 9)) + trailingText,
                 timeStamp
             });
@@ -1087,8 +1089,12 @@ class Document extends core_1.Client {
             target = this.settings.view_engine?.[viewEngine];
             const userConfig = this.getUserSettings()?.view_engine?.[viewEngine];
             if ((0, types_1.isPlainObject)(userConfig)) {
-                if ((0, types_1.isPlainObject)(target)) {
-                    (0, types_1.cloneObject)(userConfig, { target, deep: true, preserve: true });
+                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 });
+                    CACHE_VIEWENGINE.set(userConfig, target);
                 }
                 else {
                     target = userConfig;
@@ -1099,7 +1105,7 @@ class Document extends core_1.Client {
         else {
             target = viewEngine;
         }
-        if (!(0, types_1.isPlainObject)(target) || !(0, types_1.isString)(target.name)) {
+        if (!((0, types_1.isPlainObject)(target) && (0, types_1.isString)(target.name))) {
             this.abort('view_engine');
             const from = typeof viewEngine === 'string' ? viewEngine : this.moduleName;
             this.writeFail(["Unable to load configuration", from], (0, types_1.errorMessage)('view-engine', from, "Unknown"));
@@ -1109,7 +1115,13 @@ class Document extends core_1.Client {
             return '';
         }
         try {
-            const context = require(target.name);
+            let context;
+            try {
+                context = require(target.name);
+            }
+            catch {
+                context = await (0, types_1.importESM)(target.name);
+            }
             const { compile, output } = target.options || {};
             if (this.settingsOf('view_engine', 'coerce') === true) {
                 if (compile) {
@@ -1166,7 +1178,7 @@ class Document extends core_1.Client {
                     }
                 }
                 else if (!(0, types_1.isObject)(row)) {
-                    this.addLog(types_1.STATUS_TYPE.WARN, joinString('view engine', target.name, core_1.Client.asString(row) || "Unknown"), { source: `row #${i + 1}` });
+                    this.addLog(3, joinString('view engine', target.name, core_1.Client.asString(row) || "Unknown"), { source: `row #${i + 1}` });
                     continue;
                 }
                 if (!singleRow) {

package/package.json

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