@e-mc/document 0.7.1 → 0.8.0

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2023 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-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.
-
+Copyright 2023 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+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.

package/asset.d.ts

@@ -1,8 +1,8 @@
-import type { ExternalAsset, InitialValue } from '../types/lib/asset';
-
-declare namespace asset {
-    function isEqual(item: ExternalAsset, other: ExternalAsset): boolean;
-    function setInitialValue(file: ExternalAsset, cacheable?: boolean): InitialValue;
-}
-
+import type { ExternalAsset, InitialValue } from '../types/lib/asset';
+
+declare namespace asset {
+    function isEqual(item: ExternalAsset, other: ExternalAsset): boolean;
+    function setInitialValue(file: ExternalAsset, cacheable?: boolean): InitialValue;
+}
+
 export = asset;

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { DocumentConstructor, IFileManager } from '../types/lib';
-
-declare const Document: DocumentConstructor<IFileManager>;
-
+import type { DocumentConstructor, IFileManager } from '../types/lib';
+
+declare const Document: DocumentConstructor<IFileManager>;
+
 export = Document;

package/index.js

@@ -11,6 +11,7 @@ const db_1 = require("../db");
 const util_1 = require("./util");
 const transform_1 = require("./transform");
 const parse_1 = require("./parse");
+const PLATFORM_WIN32 = process.platform === 'win32';
 const CACHE_PACKAGE = {};
 const CACHE_REQUIRE = {};
 const CACHE_ETAG = {};
@@ -34,7 +35,7 @@ function deleteTransform(map, key, timeout) {
     --CACHE_TOTAL;
 }
 function getSourceMappingURL(value, css) {
-    if (value.indexOf(' ') !== -1) {
+    if (value.includes(' ')) {
         value = encodeURIComponent(value);
     }
     return css ? `\n/*# sourceMappingURL=${value} */\n` : `\n//# sourceMappingURL=${value}\n`;
@@ -329,14 +330,9 @@ class Document extends core_1.Client {
         if (config) {
             let baseUrl;
             ({ baseUrl, ignoreModules, ignoreExtensions } = config);
-            let username, users;
-            if (username = this.host?.username) {
-                if (!(0, types_1.isPlainObject)(users = this.settings.users?.[username])) {
-                    users = undefined;
-                }
-                else if (Array.isArray(users.extensions)) {
-                    this._extensions = users.extensions.slice(0);
-                }
+            const users = this.getUserSettings();
+            if (users && Array.isArray(users.extensions)) {
+                this._extensions = users.extensions.slice(0);
             }
             if (baseUrl) {
                 let pages = this.settings.pages;
@@ -445,11 +441,14 @@ class Document extends core_1.Client {
         }
         return this;
     }
-    abort(name) {
-        if (this.aborted || name && this.settingsOf(name, 'abort') !== true) {
+    abort(name, reason) {
+        if (name instanceof Error) {
+            reason || (reason = name);
+        }
+        if (this.aborted || (0, types_1.isString)(name) && this.settingsOf(name, 'abort') !== true) {
             return;
         }
-        super.abort();
+        super.abort(reason);
     }
     customize(options) {
         const transform = options.transform;
@@ -686,26 +685,98 @@ class Document extends core_1.Client {
         }
         return result || fallback;
     }
+    findSourceScope(uri, imports) {
+        const scopes = imports.scopes;
+        if ((0, types_1.isPlainObject)(scopes)) {
+            const qualified = [];
+            for (const qualifier in scopes) {
+                const item = scopes[qualifier];
+                if (uri.includes(qualifier) && (0, types_1.isPlainObject)(item)) {
+                    qualified.push([qualifier, item]);
+                }
+            }
+            return qualified.sort((a, b) => b[0].length - a[0].length).map(item => item[1]);
+        }
+        return [];
+    }
     findSourceRoot(uri, imports = this.imports) {
-        if (imports) {
-            const normalizeDir = (value) => {
-                const sep = value.includes('\\') && !value.includes('/') ? '\\' : '/';
-                return value + (value[value.length - 1] !== sep ? sep : '');
-            };
-            for (const url in imports) {
-                if (uri === url || normalizeDir(uri) === normalizeDir(url)) {
-                    return imports[url];
+        if (!(0, types_1.isPlainObject)(imports)) {
+            return;
+        }
+        const toPosix = (value) => value.replace(/(?:^\\|\\+)/g, '/');
+        const normalizeDir = (value, check) => {
+            const sep = !check && value.includes('\\') && !value.includes('/') ? '\\' : '/';
+            if (check) {
+                value = toPosix(value).toLowerCase();
+            }
+            return value.endsWith(sep) ? value : value + sep;
+        };
+        const importsStrict = this.getUserSettings()?.imports_strict ?? this.settings.imports_strict;
+        const scopes = (importsStrict ? this.findSourceScope(uri, imports) : []).concat([imports]);
+        const isDir = /[\\/]$/;
+        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;
+                        }
+                        return toPosix(result);
+                    }
+                    return result;
                 }
             }
-            const found = [];
-            for (const hostname in imports) {
-                if (uri.startsWith(normalizeDir(hostname)) && (0, types_1.isString)(imports[hostname])) {
-                    found.push(hostname);
+        }
+        const remote = toPosix(uri);
+        const found = [];
+        if (importsStrict) {
+            const protocol = core_1.Client.isURL(remote);
+            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 (protocol) {
+                            found.push([url, result]);
+                        }
+                        else if (core_1.Client.isPath(result = path.join(result, remote.substring(local.length)))) {
+                            return PLATFORM_WIN32 ? toPosix(result) : result;
+                        }
+                    }
                 }
             }
-            if (found.length) {
-                const hostname = found.sort((a, b) => b.length - a.length)[0];
-                return core_1.Client.toPosix(path.resolve(imports[hostname], uri.substring(normalizeDir(hostname).length).split('?')[0]));
+        }
+        else {
+            for (const scope of scopes) {
+                for (const url in scope) {
+                    const local = normalizeDir(url);
+                    if ((normalizeDir(uri) === local || PLATFORM_WIN32 && normalizeDir(uri, true) === local.toLowerCase()) && (0, types_1.isString)(result = scope[url])) {
+                        return result;
+                    }
+                }
+                for (const url in scope) {
+                    if (uri.startsWith(normalizeDir(url)) && (0, types_1.isString)(result = scope[url])) {
+                        found.push([url, result]);
+                    }
+                }
+            }
+        }
+        if (found.length) {
+            found.sort((a, b) => b[0].length - a[0].length);
+            const toPath = (hostname) => path.resolve(hostname[1], uri.substring(normalizeDir(hostname[0]).length).split('?')[0]);
+            if (importsStrict) {
+                for (const url of found) {
+                    if (core_1.Client.isPath(result = toPath(url))) {
+                        break;
+                    }
+                    result = '';
+                }
+            }
+            else {
+                result = toPath(found[0]);
+            }
+            if (result) {
+                return PLATFORM_WIN32 ? toPosix(result) : result;
             }
         }
     }
@@ -1212,7 +1283,7 @@ class Document extends core_1.Client {
                 let pathname;
                 if (typeof cacheType === 'string' && core_1.Client.createDir(pathname = path.join(cacheType, 'transform', type))) {
                     try {
-                        fs.writeFileSync(pathname = path.join(pathname, (0, types_1.generateUUID)()), JSON.stringify(formatData));
+                        fs.writeFileSync(pathname = path.join(pathname, (0, types_1.incrementUUID)()), JSON.stringify(formatData));
                         return pathname;
                     }
                     catch {
@@ -1298,8 +1369,7 @@ class Document extends core_1.Client {
             this._imports = Object.assign(imports, value);
         }
         else {
-            const username = this.host?.username;
-            imports = username && this.settings.users?.[username]?.imports || this.module.imports;
+            imports = this.getUserSettings()?.imports || this.module.imports;
             this._imports = Object.assign(this._imports || {}, (0, types_1.isPlainObject)(imports) ? imports : undefined, value);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "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.7.1",
-    "@e-mc/db": "0.7.1",
-    "@e-mc/types": "0.7.1",
+    "@e-mc/core": "0.8.0",
+    "@e-mc/db": "0.8.0",
+    "@e-mc/types": "0.8.0",
     "chalk": "4.1.2",
     "htmlparser2": "^9.0.0",
     "js-yaml": "^4.1.0",

package/parse/dom.d.ts

@@ -1,9 +1,9 @@
-import type { IGNORE_FLAG, DomWriterConstructor, HtmlElementConstructor } from './types';
-
-declare namespace dom {
-    const IGNORE_FLAG: IGNORE_FLAG;
-    const DomWriter: DomWriterConstructor;
-    const HtmlElement: HtmlElementConstructor;
-}
-
+import type { IGNORE_FLAG, DomWriterConstructor, HtmlElementConstructor } from './types';
+
+declare namespace dom {
+    const IGNORE_FLAG: IGNORE_FLAG;
+    const DomWriter: DomWriterConstructor;
+    const HtmlElement: HtmlElementConstructor;
+}
+
 export = dom;

package/parse/dom.js

@@ -30,7 +30,7 @@ class DomWriter extends index_1.XmlWriter {
         if (ignoreTagGroup) {
             for (let i = 0, length = ignoreTagGroup.length; i < length; i += 2) {
                 const start = ignoreTagGroup[i];
-                if (start[0] === '<') {
+                if (start.startsWith('<')) {
                     tagGroup.push(new RegExp('^' + (0, types_1.escapePattern)(start)));
                 }
                 const end = ignoreTagGroup[i + 1];

package/parse/index.d.ts

@@ -1,9 +1,9 @@
-import type { IGNORE_FLAG, XmlWriterConstructor, XmlElementConstructor } from './types';
-
-declare namespace parse {
-    const IGNORE_FLAG: IGNORE_FLAG;
-    const XmlWriter: XmlWriterConstructor;
-    const XmlElement: XmlElementConstructor;
-}
-
+import type { IGNORE_FLAG, XmlWriterConstructor, XmlElementConstructor } from './types';
+
+declare namespace parse {
+    const IGNORE_FLAG: IGNORE_FLAG;
+    const XmlWriter: XmlWriterConstructor;
+    const XmlElement: XmlElementConstructor;
+}
+
 export = parse;

package/parse/index.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint @typescript-eslint/prefer-includes: off */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XmlElement = exports.XmlWriter = exports.IGNORE_FLAG = void 0;
 const htmlparser2 = require("htmlparser2");
@@ -910,11 +911,11 @@ class XmlWriter {
         }
         let tagName = this.ignoreTagName || '';
         if (tagName) {
-            if (value[0] !== '|' && tagName[tagName.length - 1] !== '|') {
+            if (!value.startsWith('|') && !tagName.endsWith('|')) {
                 tagName += '|';
             }
         }
-        else if (value[0] === '|') {
+        else if (value.startsWith('|')) {
             value = value.substring(1);
         }
         this.ignoreTagName = tagName + value;

package/transform/index.d.ts

@@ -1,8 +1,8 @@
-import type { SourceMapConstructor, TransformSeriesConstructor } from '../../types/lib/document';
-
-declare namespace transform {
-    const TransformSeries: TransformSeriesConstructor;
-    const SourceMap: SourceMapConstructor;
-}
-
+import type { SourceMapConstructor, TransformSeriesConstructor } from '../../types/lib/document';
+
+declare namespace transform {
+    const TransformSeries: TransformSeriesConstructor;
+    const SourceMap: SourceMapConstructor;
+}
+
 export = transform;

package/transform/index.js

@@ -16,7 +16,7 @@ const kUsername = Symbol('username');
 const kProductionRelease = Symbol('productionRelease');
 function parseMap(data, value) {
     let [mimeType, encoding] = data.split(';');
-    if (!encoding && mimeType.indexOf('/') === -1) {
+    if (!encoding && !mimeType.includes('/')) {
         encoding = mimeType;
     }
     return encoding.includes('base64') ? Buffer.from(value, 'base64').toString() : value;

package/util.js

@@ -50,7 +50,7 @@ function replaceAll(source, valueOf, opening = '{{', closing = '}}') {
 exports.replaceAll = replaceAll;
 function concatString(values, newline) {
     if ((0, types_1.isArray)(values)) {
-        newline || (newline = values.find(item => item.indexOf('\r') !== -1) ? '\r\n' : '\n');
+        newline || (newline = values.find(item => item.indexOf('\r') !== -1) ? '\r\n' : '\n'); // eslint-disable-line @typescript-eslint/prefer-includes
         return values.reduce((a, b) => a + newline + b, '');
     }
     return typeof values === 'string' ? values : '';