@e-mc/document 0.11.7 → 0.11.9

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.9/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.7/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.7/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.9/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.9/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.9/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.9/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.9/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.9/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.9/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.9/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 = {};
@@ -54,7 +55,7 @@ const fixHint = (warningCount, errorCount, value) => warningCount > 0 || errorCo
 const compareValue = (value) => value.replace(/["'()]/g, '').trim();
 const toPath = (uri, hostname) => path.resolve(hostname[1], uri.substring(normalizeDir(hostname[0]).length).split('?')[0]);
 const toBase64 = (value) => 'data:application/json;base64,' + Buffer.from(value).toString('base64');
-const toPosix = (value) => value.replace(/(?:^\\|\\+)/g, '/');
+const toPosix = (value) => core_1.Client.PLATFORM_WIN32 ? value.trim().replace(/(?:^\\|\\+)/g, '/') : value;
 const joinString = (name, ...values) => (name ? name + ': ' : '') + values.reduce((a, b) => b ? a + (a ? ' -> ' : '') + b : a, '');
 const truncateString = (value, width) => value.length > width ? value.substring(0, width - 3) + '...' : value.padStart(width);
 const isFunction = (value) => typeof value === 'function';
@@ -347,6 +348,7 @@ class Document extends core_1.Client {
                     delete cache[name];
                 }
             }
+            CACHE_VIEWENGINE.clear();
             CACHE_PICOMATCH.clear();
             CACHE_TOTAL = 0;
         }
@@ -900,34 +902,33 @@ class Document extends core_1.Client {
         }
         const importsStrict = this.getUserSettings()?.imports_strict ?? this.settings.imports_strict;
         const scopes = (importsStrict ? this.findSourceScope(uri, imports) : []).concat([imports]);
-        const isDir = /[\\/]$/;
+        const protocol = core_1.Client.isURL(uri);
         let result;
         for (const scope of scopes) {
             for (const url in scope) {
                 if (uri === url && (0, types_1.isString)(result = scope[url])) {
                     if (importsStrict) {
-                        if (isDir.test(url) || !core_1.Client.isPath(result)) {
-                            continue;
+                        if (core_1.Client.isPath(result) && !(protocol ? url : toPosix(url)).endsWith('/')) {
+                            return toPosix(result);
                         }
-                        return toPosix(result);
+                        continue;
                     }
                     return result;
                 }
             }
         }
-        const remote = toPosix(uri);
         const found = [];
         if (importsStrict) {
-            const protocol = core_1.Client.isURL(remote);
+            const remote = protocol ? uri : toPosix(uri);
             for (const scope of scopes) {
                 for (const url in scope) {
                     const local = protocol ? url : toPosix(url);
-                    if (isDir.test(local) && remote.startsWith(local) && (result = scope[url]) && isDir.test(result)) {
+                    if (local.endsWith('/') && remote.startsWith(local) && (result = scope[url]) && result.endsWith('/')) {
                         if (protocol) {
                             found.push([url, result]);
                         }
                         else if (core_1.Client.isPath(result = path.join(result, remote.substring(local.length)))) {
-                            return core_1.Client.PLATFORM_WIN32 ? toPosix(result) : result;
+                            return toPosix(result);
                         }
                     }
                 }
@@ -962,7 +963,7 @@ class Document extends core_1.Client {
                 result = toPath(uri, found[0]);
             }
             if (result) {
-                return core_1.Client.PLATFORM_WIN32 ? toPosix(result) : result;
+                return toPosix(result);
             }
         }
     }
@@ -1079,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;
@@ -1091,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"));
@@ -1131,7 +1136,7 @@ class Document extends core_1.Client {
                 if (expires !== 0) {
                     cache[cacheKey] = render;
                     if (core_1.Client.enabled("memory.settings.users", username)) {
-                        expires = typeof expires === 'number' && expires !== Infinity ? expires : 0;
+                        expires = typeof expires === 'number' && expires !== Infinity ? Math.min(expires, core_1.Client.MAX_TIMEOUT) : 0;
                     }
                     else {
                         expires = 60000;

package/package.json

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

package/util.js

@@ -212,7 +212,7 @@ function hasValue(target, ...values) {
     return false;
 }
 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];
     }