@e-mc/document 0.5.3 → 0.7.0

package/asset.d.ts

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

package/asset.js

@@ -6,6 +6,6 @@ function isEqual(item, other) {
 }
 exports.isEqual = isEqual;
 function setInitialValue(file, cacheable = true) {
-    file.initialValue || (file.initialValue = { pathname: file.pathname, filename: file.filename, mimeType: file.mimeType, localUri: file.localUri, inlineFilename: file.inlineFilename, cacheable });
+    return file.initialValue || (file.initialValue = { pathname: file.pathname, filename: file.filename, mimeType: file.mimeType, localUri: file.localUri, inlineFilename: file.inlineFilename, cacheable });
 }
 exports.setInitialValue = setInitialValue;

package/index.js

@@ -11,24 +11,6 @@ const db_1 = require("../db");
 const util_1 = require("./util");
 const transform_1 = require("./transform");
 const parse_1 = require("./parse");
-const PIR_PLUGINS = Object.freeze({
-    "@babel/core": "@pi-r/babel",
-    "clean-css": "@pi-r/clean-css",
-    "csso": "@pi-r/csso",
-    "eslint": "@pi-r/eslint",
-    "html-minifier": "@pi-r/html-minifier",
-    "html-minifier-terser": "@pi-r/html-minifier-terser",
-    "html-validate": "@pi-r/html-validate",
-    "postcss": "@pi-r/postcss",
-    "posthtml": "@pi-r/posthtml",
-    "prettier": "@pi-r/prettier",
-    "rollup": "@pi-r/rollup",
-    "sass": "@pi-r/sass",
-    "stylelint": "@pi-r/stylelint",
-    "svgo": "@pi-r/svgo",
-    "terser": "@pi-r/terser",
-    "uglify-js": "@pi-r/uglify-js"
-});
 const CACHE_PACKAGE = {};
 const CACHE_REQUIRE = {};
 const CACHE_ETAG = {};
@@ -334,6 +316,7 @@ class Document extends core_1.Client {
         this._dataSource = null;
         this._transformConfig = null;
         this._mimeMap = null;
+        this._imports = null;
         const transform = this.settingsOf('transform', 'cache');
         if (transform !== undefined) {
             this.customize({ transform });
@@ -342,30 +325,30 @@ class Document extends core_1.Client {
     restart() { }
     init(assets, config) {
         var _a;
-        let ignoreModules;
+        let ignoreModules, ignoreExtensions;
         if (config) {
-            const { baseUrl, ignoreExtensions } = config;
-            if (ignoreExtensions === true) {
-                this._extensions = [];
-            }
-            else if (typeof ignoreExtensions === 'string') {
-                this._extensions = ignoreExtensions === this.moduleName ? [] : this._extensions.filter(value => value !== ignoreExtensions);
-            }
-            else if (Array.isArray(ignoreExtensions)) {
-                this._extensions = ignoreExtensions.includes(this.moduleName) ? [] : this._extensions.filter(value => !ignoreExtensions.includes(value));
+            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);
+                }
             }
             if (baseUrl) {
-                const username = this.host?.username;
                 let pages = this.settings.pages;
-                if (username) {
-                    const users = this.settings.users?.[username]?.pages;
-                    if ((0, types_1.isPlainObject)(users)) {
-                        pages = (0, types_1.isPlainObject)(pages) ? { ...pages, ...users } : users;
-                    }
+                if (users && (0, types_1.isPlainObject)(users.pages)) {
+                    pages = (0, types_1.isPlainObject)(pages) ? { ...pages, ...users.pages } : users.pages;
                 }
                 if ((0, types_1.isPlainObject)(pages)) {
                     let mimeMap;
-                    if (!(0, types_1.isPlainObject)(mimeMap = pages[baseUrl])) {
+                    if ((0, types_1.isPlainObject)(mimeMap = pages[baseUrl])) {
+                        mimeMap = { ...mimeMap };
+                    }
+                    else {
                         const items = [];
                         for (const pattern in pages) {
                             const item = pages[pattern];
@@ -390,8 +373,8 @@ class Document extends core_1.Client {
                             items.sort((a, b) => typeof a.ordinal === 'number' && typeof b.ordinal === 'number' ? a.ordinal - b.ordinal : 0);
                             mimeMap = items.reduce((a, b) => Object.assign(a, b), {});
                         }
-                        else {
-                            mimeMap = items[0];
+                        else if (items.length) {
+                            mimeMap = { ...items[0] };
                         }
                     }
                     if (mimeMap) {
@@ -406,7 +389,6 @@ class Document extends core_1.Client {
                     }
                 }
             }
-            ignoreModules = config.ignoreModules;
         }
         if (this.dataSource.length && !ignoreModules?.includes('db')) {
             const db = (_a = this.module).db || (_a.db = {});
@@ -417,6 +399,7 @@ class Document extends core_1.Client {
                 try {
                     const Handler = require(handler);
                     if (isFunction(Handler) && Handler.prototype instanceof core_1.ClientDb) {
+                        // @ts-ignore
                         instance = new Handler(db, database);
                     }
                     else {
@@ -443,7 +426,24 @@ class Document extends core_1.Client {
             }
         }
         this.assets = assets;
-        return super.init();
+        super.init();
+        if (ignoreExtensions) {
+            if (ignoreExtensions === true || ignoreExtensions === this.moduleName || (0, types_1.isArray)(ignoreExtensions) && ignoreExtensions.includes(this.moduleName)) {
+                this._extensions = [];
+            }
+            else {
+                const extensions = this._extensions;
+                if ((0, types_1.isArray)(extensions)) {
+                    if (typeof ignoreExtensions === 'string') {
+                        this._extensions = extensions.filter(value => value !== ignoreExtensions);
+                    }
+                    else if ((0, types_1.isArray)(ignoreExtensions)) {
+                        this._extensions = extensions.filter(value => !ignoreExtensions.includes(value));
+                    }
+                }
+            }
+        }
+        return this;
     }
     abort(name) {
         if (this.aborted || name && this.settingsOf(name, 'abort') !== true) {
@@ -874,7 +874,7 @@ class Document extends core_1.Client {
             }
             for (let i = 0, j = 0, row; i < length; ++i) {
                 if ((0, types_1.isPlainObject)(row = data[i])) {
-                    row['__index__'] ?? (row['__index__'] = ++j);
+                    row.__index__ ?? (row.__index__ = ++j);
                     if (output) {
                         row = { ...output, ...row };
                     }
@@ -900,10 +900,8 @@ class Document extends core_1.Client {
         return null;
     }
     async transform(type, code, format, options = {}) {
-        var _a;
-        let transform = this.settings.transform;
-        const data = transform?.[type];
-        if (!(0, types_1.isObject)(data)) {
+        let transform = this.settings.transform, data;
+        if (!transform || !(0, types_1.isObject)(data = transform[type])) {
             return;
         }
         format = typeof format === 'string' ? format.trim().split(/\s*\+\s*/) : format.map(item => typeof item === 'string' ? item.trim() : '');
@@ -994,7 +992,7 @@ class Document extends core_1.Client {
         if (cacheData) {
             delete options.cacheData;
         }
-        const imports = (_a = transform).imports || (_a.imports = {});
+        const imports = transform.imports || (transform.imports = {});
         const series = new transform_1.TransformSeries(type, code, options);
         series.init(this, __dirname);
         let valid, excluded, userData, userImports, ignoreCache, storedLog, sourceFiles;
@@ -1132,7 +1130,7 @@ class Document extends core_1.Client {
                         let transformer = CACHE_PACKAGE[plugin + username];
                         if (!transformer) {
                             try {
-                                let pkg = this.resolveDir('package', plugin + '.js') || userImports?.[plugin] || imports[plugin] || PIR_PLUGINS[plugin];
+                                let pkg = this.resolveDir('package', plugin + '.js') || userImports?.[plugin] || imports[plugin] || util_1.IMPORTS[plugin];
                                 if ((0, types_1.isString)(pkg)) {
                                     const match = /^(@?\S+)@(\d+(?:\.\d+(?:\.\S+)?)?|[a-z]+)$/.exec(pkg);
                                     if (match) {
@@ -1143,10 +1141,13 @@ class Document extends core_1.Client {
                                 }
                                 else {
                                     transformer = context;
-                                    context = this;
+                                    context = this; // eslint-disable-line @typescript-eslint/no-this-alias
                                     pkg = undefined;
                                 }
-                                if (typeof transformer !== 'function' && typeof (transformer = transformer?.['default']) !== 'function') {
+                                if (transformer && typeof transformer !== 'function') {
+                                    transformer = transformer.default;
+                                }
+                                if (typeof transformer !== 'function') {
                                     throw (0, types_1.errorMessage)(plugin, pkg || name, 'Invalid function');
                                 }
                                 if (pkg) {
@@ -1287,6 +1288,27 @@ class Document extends core_1.Client {
         }
         return this._dataSource || [];
     }
+    set imports(value) {
+        if (!(0, types_1.isPlainObject)(value)) {
+            this._imports = null;
+            return;
+        }
+        let imports = this._imports;
+        if (imports) {
+            this._imports = Object.assign(imports, value);
+        }
+        else {
+            const username = this.host?.username;
+            imports = username && this.settings.users?.[username]?.imports || this.module.imports;
+            this._imports = Object.assign(this._imports || {}, (0, types_1.isPlainObject)(imports) ? imports : undefined, value);
+        }
+    }
+    get imports() {
+        if (!this._imports) {
+            this.imports = {};
+        }
+        return this._imports;
+    }
     get watching() {
         return this.assets.some(item => item.watch);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.5.3",
+  "version": "0.7.0",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,12 +20,12 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.5.3",
-    "@e-mc/db": "0.5.3",
-    "@e-mc/types": "0.5.3",
+    "@e-mc/core": "0.7.0",
+    "@e-mc/db": "0.7.0",
+    "@e-mc/types": "0.7.0",
     "chalk": "4.1.2",
     "htmlparser2": "^9.0.0",
     "js-yaml": "^4.1.0",
-    "picomatch": "^2.3.1"
+    "picomatch": "^3.0.1"
   }
 }

package/parse/index.js

@@ -11,7 +11,7 @@ var IGNORE_FLAG;
     IGNORE_FLAG[IGNORE_FLAG["NONE"] = 0] = "NONE";
     IGNORE_FLAG[IGNORE_FLAG["INTERIOR"] = 1] = "INTERIOR";
     IGNORE_FLAG[IGNORE_FLAG["LOCATOR"] = 2] = "LOCATOR";
-})(IGNORE_FLAG = exports.IGNORE_FLAG || (exports.IGNORE_FLAG = {}));
+})(IGNORE_FLAG || (exports.IGNORE_FLAG = IGNORE_FLAG = {}));
 const Parser = htmlparser2.Parser;
 const DomHandler = domhandler.DomHandler;
 const CACHE_TAGNAME = {};

package/transform/index.js

@@ -186,20 +186,20 @@ class TransformSeries extends core_1.Module {
     }
     set version(value) {
         // @ts-ignore
-        this.metadata['__version__'] = value;
+        this.metadata.__version__ = value;
     }
     get version() {
         // @ts-ignore
-        return this.metadata['__version__'] || '';
+        return this.metadata.__version__ || '';
     }
     set packageName(value) {
         // @ts-ignore
-        this.metadata['__packagename__'] = value;
+        this.metadata.__packagename__ = value;
         this.version = 'latest';
     }
     get packageName() {
         // @ts-ignore
-        return this.metadata['__packagename__'] || '';
+        return this.metadata.__packagename__ || '';
     }
     get packageVersion() {
         const packageName = this.packageName;
@@ -316,6 +316,6 @@ class SourceMap {
         return this[kMap];
     }
 }
+exports.SourceMap = SourceMap;
 _d = kMap;
 SourceMap.RE_SOURCE_MAPPING_URL = /(?:\r\n|\n)*(?:(\/\/)|(\/\*))\s*[#@][ ]+sourceMappingURL=(data:[^,]+,)?(\S+)\s*(\*\/)?\r?\n?/g;
-exports.SourceMap = SourceMap;

package/util.d.ts

@@ -1,4 +1,5 @@
 declare namespace util {
+    const IMPORTS: Record<string, string | undefined>;
     function loadPlugins<T = unknown>(name: string | unknown[], plugins?: unknown[]): T[];
     function replaceAll(source: string, valueOf: (name: string) => string, opening?: string, closing?: string): string;
     function concatString(values: string[] | string | undefined, newline?: string): string;

package/util.js

@@ -1,9 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObject = exports.removeInternalProperties = exports.getModuleName = exports.hasValue = exports.getHashData = exports.getNewline = exports.getIndent = exports.appendSuffix = exports.splitEnclosing = exports.concatString = exports.replaceAll = exports.loadPlugins = void 0;
+exports.isObject = exports.removeInternalProperties = exports.getModuleName = exports.hasValue = exports.getHashData = exports.getNewline = exports.getIndent = exports.appendSuffix = exports.splitEnclosing = exports.concatString = exports.replaceAll = exports.loadPlugins = exports.IMPORTS = void 0;
 const path = require("path");
 const types_1 = require("../types");
 Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
+exports.IMPORTS = {
+    "@babel/core": "@pi-r/babel",
+    "clean-css": "@pi-r/clean-css",
+    "csso": "@pi-r/csso",
+    "eslint": "@pi-r/eslint",
+    "html-minifier": "@pi-r/html-minifier",
+    "html-minifier-terser": "@pi-r/html-minifier-terser",
+    "html-validate": "@pi-r/html-validate",
+    "postcss": "@pi-r/postcss",
+    "posthtml": "@pi-r/posthtml",
+    "prettier": "@pi-r/prettier",
+    "rollup": "@pi-r/rollup",
+    "sass": "@pi-r/sass",
+    "stylelint": "@pi-r/stylelint",
+    "svgo": "@pi-r/svgo",
+    "terser": "@pi-r/terser",
+    "uglify-js": "@pi-r/uglify-js"
+};
 function loadPlugins(name, plugins = []) {
     if (Array.isArray(name)) {
         plugins = name;