@e-mc/file-manager 0.4.2 → 0.5.1

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /* eslint @typescript-eslint/no-explicit-any: "off" */
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
@@ -640,7 +640,6 @@ class FileManager extends core_1.Host {
     }
     constructor(baseDirectory, config, permission, postFinalize) {
         super(config);
-        this.archiving = false;
         this.finalizeState = 0 /* FINALIZE_STATE.READY */;
         this.processTimeout = PROCESS_TIMEOUT.filemanager;
         this.Document = [];
@@ -665,33 +664,26 @@ class FileManager extends core_1.Host {
         this.emptyDir = new Set();
         this._moduleName = 'filemanager';
         this._pendingResult = null;
-        this[_c] = 'none';
-        this[_d] = false;
-        this[_e] = 0;
-        this[_f] = false;
-        this[_g] = null;
-        this[_h] = RECURSION_LIMIT;
-        this[_j] = {};
-        this[_k] = [[0, 0], [0, 0], [0, 0]];
-        this[_l] = {};
-        if (typeof permission === 'boolean') {
-            this.archiving = permission;
-            permission = undefined;
-        }
-        else if (isFunction(permission)) {
+        this[_c] = false;
+        this[_d] = 0;
+        this[_e] = false;
+        this[_f] = null;
+        this[_g] = RECURSION_LIMIT;
+        this[_h] = {};
+        this[_j] = [[0, 0], [0, 0], [0, 0]];
+        this[_k] = {};
+        if (isFunction(permission)) {
             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 = [], dataSource, timeout } = config;
+        const { assets = [], incremental, dataSource, timeout } = config;
         let targeted;
         for (let i = 0, length = assets.length; i < length; ++i) {
             const item = assets[i];
@@ -722,6 +714,7 @@ class FileManager extends core_1.Host {
             item.id || (item.id = ++ASSET_ID);
         }
         this._assets = assets.slice(0);
+        this[kIncremental] = incremental === 'staging' ? 'staging' : 'none';
         if (targeted) {
             this.using(...targeted);
         }
@@ -758,7 +751,7 @@ class FileManager extends core_1.Host {
             }
         }
     }
-    *[(_b = Symbol.toStringTag, _c = kIncremental, _d = kRestarting, _e = kDelayed, _f = kCleared, _g = KTimerMain, _h = kRecursionLimit, _j = kProcessTimeout, _k = kDownloadStats, _l = kReplaceMap, Symbol.iterator)]() {
+    *[(_b = Symbol.toStringTag, _c = kRestarting, _d = kDelayed, _e = kCleared, _f = KTimerMain, _g = kRecursionLimit, _h = kProcessTimeout, _j = kDownloadStats, _k = kReplaceMap, Symbol.iterator)]() {
         for (const file of this.files) {
             yield file;
         }
@@ -2178,24 +2171,28 @@ 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;
-        const cacheable = initial && !this.archiving;
-        const cacheOpen = cacheable && hasIncremental(incremental);
-        const cacheEtag = cacheable && incremental === 'etag';
-        if (cacheOpen) {
-            this[kIncremental] = incremental;
-        }
-        else if (!initial) {
-            this[kIncremental] = 'none';
+        let cacheable = false, cacheOpen = false, cacheEtag = false;
+        if (!staging) {
+            cacheable = this[kRecursionLimit] === RECURSION_LIMIT;
+            if (cacheable) {
+                if (cacheOpen = hasIncremental(incremental)) {
+                    this[kIncremental] = incremental;
+                }
+                cacheEtag = incremental === 'etag';
+            }
+            else {
+                this[kIncremental] = 'none';
+            }
         }
         const targeting = this._usingObjects.size > 0;
         const isCacheable = (file) => file.initialValue?.cacheable !== false;
@@ -2207,6 +2204,7 @@ class FileManager extends core_1.Host {
                 case false:
                 case 'none':
                 case 'exists':
+                case 'staging':
                     return false;
                 case 'etag':
                     return true;
@@ -2234,14 +2232,14 @@ class FileManager extends core_1.Host {
             }
         };
         const checkQueue = (file, localUri, pathname, content) => {
-            var _m;
+            var _l;
             if (!createFolder(file, pathname)) {
                 return true;
             }
             const { bundleId, bundleIndex = -1 } = file;
             if (!(0, types_1.isEmpty)(bundleId) && bundleIndex >= 0) {
                 const items = appending[localUri] || (appending[localUri] = []);
-                bundling[_m = file.uri] || (bundling[_m] = []);
+                bundling[_l = file.uri] || (bundling[_l] = []);
                 if (bundleIndex > 0) {
                     items[bundleIndex - 1] = file;
                     const url = file.url;
@@ -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;
             }
@@ -2782,7 +2780,7 @@ class FileManager extends core_1.Host {
                 }
             }
             else if (uri = item.uri) {
-                const checkDest = (src) => this.archiving || !(0, lib_v4_1.hasSameStat)(src, localUri);
+                const checkDest = (src) => staging || !(0, lib_v4_1.hasSameStat)(src, localUri);
                 const type = item.fetchType;
                 const bundleMain = !(0, types_1.isEmpty)(item.bundleId) && item.bundleIndex === 0;
                 let isHttp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.4.2",
+  "version": "0.5.1",
   "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.4.2",
-    "@e-mc/compress": "0.4.2",
-    "@e-mc/core": "0.4.2",
-    "@e-mc/document": "0.4.2",
-    "@e-mc/image": "0.4.2",
-    "@e-mc/request": "0.4.2",
-    "@e-mc/task": "0.4.2",
-    "@e-mc/types": "0.4.2",
-    "@e-mc/watch": "0.4.2"
+    "@e-mc/cloud": "0.5.1",
+    "@e-mc/compress": "0.5.1",
+    "@e-mc/core": "0.5.1",
+    "@e-mc/document": "0.5.1",
+    "@e-mc/image": "0.5.1",
+    "@e-mc/request": "0.5.1",
+    "@e-mc/task": "0.5.1",
+    "@e-mc/types": "0.5.1",
+    "@e-mc/watch": "0.5.1"
   }
 }