@e-mc/document 0.11.8 → 0.11.10

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.8/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.10/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.11.8/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.8/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.8/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.8/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.8/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.8/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.8/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.8/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.10/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.10/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.10/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.10/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.10/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.10/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.10/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.10/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 CACHE_PACKAGE = {};
 const CACHE_TEMPLATE = {};
+const CACHE_VIEWENGINE = new Map();
 const CACHE_EXTERNAL = {};
 const CACHE_ETAG = {};
 const CACHE_CODE = {};
@@ -347,6 +348,7 @@ class Document extends core_1.Client {
                     delete cache[name];
                 }
             }
+            CACHE_VIEWENGINE.clear();
             CACHE_PICOMATCH.clear();
             CACHE_TOTAL = 0;
         }
@@ -1078,8 +1080,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 });
+                    CACHE_VIEWENGINE.set(userConfig, target);
                 }
                 else {
                     target = userConfig;
@@ -1090,7 +1096,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"));
@@ -1101,7 +1107,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);
+            }
             let { singleRow, expires, options = {} } = target;
             const { compile, output } = options;
             if (this.settingsOf('view_engine', 'coerce') === true) {

package/package.json

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