@e-mc/document 0.6.0 → 0.7.0

package/index.js

@@ -325,26 +325,23 @@ 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;
@@ -392,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 = {});
@@ -430,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.6.0",
+  "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.6.0",
-    "@e-mc/db": "0.6.0",
-    "@e-mc/types": "0.6.0",
+    "@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"
   }
 }