@e-mc/document 0.10.11 → 0.10.13

package/LICENSE

@@ -1,11 +1,7 @@
 Copyright 2024 An Pham
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.11/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.13/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -183,15 +183,15 @@ NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. *
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.11/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.11/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.11/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.11/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.11/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.11/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.11/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.11/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.13/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.13/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.13/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.13/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.13/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.13/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.13/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.13/lib/watch.d.ts
 
 ## LICENSE
 
-BSD 3-Clause
+MIT

package/index.js

@@ -16,6 +16,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;
@@ -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 spliceSource = (source, startIndex, endIndex, content) => source.substring(0, startIndex) + content + source.substring(endIndex);
@@ -348,6 +349,7 @@ class Document extends core_1.Client {
                     delete cache[name];
                 }
             }
+            CACHE_VIEWENGINE.clear();
             CACHE_PICOMATCH.clear();
             CACHE_TOTAL = 0;
         }
@@ -909,34 +911,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);
                         }
                     }
                 }
@@ -971,7 +972,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);
             }
         }
     }
@@ -1088,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 });
+                    CACHE_VIEWENGINE.set(userConfig, target);
                 }
                 else {
                     target = userConfig;
@@ -1100,7 +1105,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.10.11",
+  "version": "0.10.13",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,12 +17,12 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.10.11",
-    "@e-mc/db": "0.10.11",
-    "@e-mc/types": "0.10.11",
+    "@e-mc/core": "0.10.13",
+    "@e-mc/db": "0.10.13",
+    "@e-mc/types": "0.10.13",
     "chalk": "4.1.2",
     "domhandler": "^5.0.3",
     "domutils": "^3.1.0",

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];
     }