@e-mc/document 0.6.17 → 0.6.19

package/index.js

@@ -17,6 +17,7 @@ const CACHE_ETAG = {};
 const CACHE_CODE = {};
 const CACHE_HASH = {};
 const CACHE_TEMPLATE = {};
+const CACHE_VIEWENGINE = new Map();
 const CACHE_EXTERNAL = {};
 const CACHE_PICOMATCH = new Map();
 let CACHE_TOTAL = 0;
@@ -64,6 +65,7 @@ class Document extends core_1.Client {
                     delete cache[name];
                 }
             }
+            CACHE_VIEWENGINE.clear();
             CACHE_PICOMATCH.clear();
             CACHE_TOTAL = 0;
         }
@@ -817,8 +819,12 @@ class Document extends core_1.Client {
             const username = (_b = this.host) === null || _b === void 0 ? void 0 : _b.username;
             const userConfig = username && ((_e = (_d = (_c = this.settings.users) === null || _c === void 0 ? void 0 : _c[username]) === null || _d === void 0 ? void 0 : _d.view_engine) === null || _e === void 0 ? void 0 : _e[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 });
+                    CACHE_VIEWENGINE.set(userConfig, target);
                 }
                 else {
                     target = userConfig;
@@ -829,7 +835,7 @@ class Document extends core_1.Client {
         else {
             target = viewEngine;
         }
-        if (!((0, types_1.isPlainObject)(target) && target.name)) {
+        if (!((0, types_1.isPlainObject)(target) && (0, types_1.isString)(target.name))) {
             this.abort('view_engine');
             const from = typeof viewEngine === 'string' ? viewEngine : this.moduleName;
             this.writeFail(["Unable to load configuration", from], (0, types_1.errorMessage)('view-engine', from, "Unknown"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.6.17",
+  "version": "0.6.19",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.6.17",
-    "@e-mc/db": "0.6.17",
-    "@e-mc/types": "0.6.17",
+    "@e-mc/core": "0.6.19",
+    "@e-mc/db": "0.6.19",
+    "@e-mc/types": "0.6.19",
     "chalk": "4.1.2",
     "domhandler": "^5.0.3",
     "domutils": "^3.1.0",

package/util.js

@@ -216,7 +216,7 @@ function hasValue(target, ...values) {
 }
 exports.hasValue = hasValue;
 function getModuleName(err) {
-    const match = err instanceof Error && /Cannot find module '([^']+)'/.exec(err.message);
+    const match = err instanceof Error && /Cannot find (?:module|package) '([^']+)'/.exec(err.message);
     if (match) {
         return match[1];
     }