@e-mc/file-manager 0.5.0 → 0.5.2

package/index.js

@@ -9,6 +9,7 @@ const util_1 = require("../request/util");
 const asset_1 = require("../document/asset");
 const util_2 = require("../document/util");
 const types_1 = require("../types");
+const core_1 = require("../core");
 const request_1 = require("../request");
 const document_1 = require("../document");
 const task_1 = require("../task");
@@ -16,7 +17,6 @@ const image_1 = require("../image");
 const watch_1 = require("../watch");
 const compress_1 = require("../compress");
 const cloud_1 = require("../cloud");
-const core_1 = require("../core");
 const kBaseDirectory = Symbol('baseDirectory');
 const kIncremental = Symbol('incremental');
 const kRestarting = Symbol('restarting');
@@ -676,14 +676,12 @@ class FileManager extends core_1.Host {
             postFinalize = permission;
             permission = undefined;
         }
-        else if (!core_1.Host.isPermission(permission)) {
-            permission = undefined;
-        }
         if (LOG_TIMEPROCESS) {
             setCpuUsage.call(this);
         }
-        this[kBaseDirectory] = path.normalize(baseDirectory[baseDirectory.length - 1] === path.sep ? baseDirectory.substring(0, baseDirectory.length - 1) : baseDirectory);
-        this.permission = permission || core_1.Host.getPermissionFromSettings();
+        const index = baseDirectory.length - 1;
+        this[kBaseDirectory] = path.normalize(baseDirectory[index] === path.sep ? baseDirectory.substring(0, index) : baseDirectory);
+        this.permission = permission && core_1.Host.isPermission(permission) ? permission : core_1.Host.getPermissionFromSettings();
         this.sessionId = (++SESSION_ID === SESSION_LIMIT ? SESSION_ID = 1 : SESSION_ID).toString();
         const { assets = [], incremental, dataSource, timeout } = config;
         let targeted;
@@ -995,7 +993,7 @@ class FileManager extends core_1.Host {
                         else {
                             try {
                                 const Handler = require(target);
-                                if (isFunction(Handler) && Handler.prototype instanceof cloud_1.default) {
+                                if (isFunction(Handler) && Handler.prototype instanceof core_1.ClientDb) {
                                     instance = new Handler(module, database);
                                 }
                                 else {
@@ -2173,20 +2171,20 @@ class FileManager extends core_1.Host {
         }, types_1.THRESHOLD.FILEMANAGER_INTERVAL);
         const hasIncremental = (value) => value === 'etag' || value === 'exists';
         const { assets, cacheToDisk, cacheToMemory, fetchedAssets, Watch: watch } = this;
-        const initial = this[kRecursionLimit] === RECURSION_LIMIT;
-        const downloadble = new Map();
+        const downloadable = new Map();
         const completed = Object.create(null);
         const processing = Object.create(null);
         const downloading = Object.create(null);
-        const appending = {};
-        const bundling = {};
-        const originCount = {};
+        const appending = Object.create(null);
+        const bundling = Object.create(null);
+        const originCount = Object.create(null);
         const emptied = [this.baseDirectory];
         const staging = this[kIncremental] === 'staging';
         const incremental = this.config.incremental;
         let cacheable = false, cacheOpen = false, cacheEtag = false;
         if (!staging) {
-            if (cacheable = initial) {
+            cacheable = this[kRecursionLimit] === RECURSION_LIMIT;
+            if (cacheable) {
                 if (cacheOpen = hasIncremental(incremental)) {
                     this[kIncremental] = incremental;
                 }
@@ -2668,7 +2666,7 @@ class FileManager extends core_1.Host {
                                     item.invalid = true;
                                 }
                                 else if (target.localUri) {
-                                    downloadble.set(item, download);
+                                    downloadable.set(item, download);
                                 }
                                 else {
                                     childDownload = download;
@@ -2706,7 +2704,7 @@ class FileManager extends core_1.Host {
                             }
                         }
                         else if (childBundle) {
-                            downloadble.set(childBundle, childDownload);
+                            downloadable.set(childBundle, childDownload);
                         }
                         else if (cached) {
                             try {
@@ -2741,16 +2739,16 @@ class FileManager extends core_1.Host {
                     }
                 }
             }
-            downloadble.set(item, download);
+            downloadable.set(item, download);
         }
-        if (downloadble.size > 1 && this.Request.httpVersion !== 1) {
-            for (const { url } of downloadble.keys()) {
+        if (downloadable.size > 1 && this.Request.httpVersion !== 1) {
+            for (const { url } of downloadable.keys()) {
                 if (url?.protocol === 'https:') {
                     originCount[url.origin] = (originCount[url.origin] || 0) + 1;
                 }
             }
         }
-        for (const [item, download] of downloadble) {
+        for (const [item, download] of downloadable) {
             if (this.aborted) {
                 break;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,14 +20,14 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.5.0",
-    "@e-mc/compress": "0.5.0",
-    "@e-mc/core": "0.5.0",
-    "@e-mc/document": "0.5.0",
-    "@e-mc/image": "0.5.0",
-    "@e-mc/request": "0.5.0",
-    "@e-mc/task": "0.5.0",
-    "@e-mc/types": "0.5.0",
-    "@e-mc/watch": "0.5.0"
+    "@e-mc/cloud": "0.5.2",
+    "@e-mc/compress": "0.5.2",
+    "@e-mc/core": "0.5.2",
+    "@e-mc/document": "0.5.2",
+    "@e-mc/image": "0.5.2",
+    "@e-mc/request": "0.5.2",
+    "@e-mc/task": "0.5.2",
+    "@e-mc/types": "0.5.2",
+    "@e-mc/watch": "0.5.2"
   }
 }