@e-mc/document 0.9.17 → 0.9.18

package/README.md

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

package/index.js

@@ -1215,11 +1215,11 @@ class Document extends core_1.Client {
                                     transformer = context;
                                     context = this;
                                 }
-                                if (typeof transformer !== 'function') {
-                                    transformer &&= transformer.default;
-                                    if (typeof transformer !== 'function') {
-                                        throw (0, types_1.errorMessage)(plugin, pkg || name, 'Invalid function');
-                                    }
+                                if ((0, types_1.isObject)(transformer) && typeof transformer.default === 'function') {
+                                    transformer = transformer.default;
+                                }
+                                else if (typeof transformer !== 'function') {
+                                    throw (0, types_1.errorMessage)(plugin, pkg || name, 'Invalid function');
                                 }
                                 if (pkg) {
                                     CACHE_PACKAGE[plugin + username] = transformer;

package/package.json

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

package/util.js

@@ -22,13 +22,26 @@ exports.IMPORTS = {
     "uglify-js": "@pi-r/uglify-js"
 };
 function loadPlugins(name, plugins = []) {
-    if (Array.isArray(name)) {
-        plugins = name;
-    }
     const result = [];
-    for (const plugin of plugins.map(item => (0, types_1.isString)(item) ? [item, undefined] : Array.isArray(item) && (0, types_1.isString)(item[0]) ? item : null)) {
+    const items = (Array.isArray(name) ? name : plugins).map(value => {
+        let pkg, options;
+        if ((0, types_1.isString)(value)) {
+            pkg = value;
+        }
+        else if (Array.isArray(value)) {
+            [pkg, options] = value;
+            if (!(0, types_1.isString)(pkg)) {
+                return null;
+            }
+        }
+        else if (typeof value === 'function') {
+            return [value];
+        }
+        return pkg ? [pkg, options] : null;
+    });
+    for (const plugin of items) {
         if (plugin) {
-            let method = require(plugin[0]), options = plugin[1];
+            let method = typeof plugin[0] === 'function' ? plugin[0] : require(plugin[0]), options = plugin[1];
             if ((0, types_1.isPlainObject)(method)) {
                 const attr = options?.__default__;
                 if ((0, types_1.isString)(attr)) {