@e-mc/cloud 0.7.3 → 0.7.4

package/index.js

@@ -23,13 +23,14 @@ function hasSameBucket({ upload, service, bucket }, other) {
     return (service && other.service || endpoint && endpoint === other.upload.endpoint) && bucket === other.bucket;
 }
 function getFiles(file, data) {
+    var _a, _b;
     const grouped = file.localUri ? [file.localUri] : [];
     if (data.all) {
         const individual = new Set();
         if (!file.cloudUrl) {
-            file.transforms?.forEach(value => individual.add(value));
+            (_a = file.transforms) === null || _a === void 0 ? void 0 : _a.forEach(value => individual.add(value));
         }
-        file.torrentFiles?.forEach(value => individual.add(value));
+        (_b = file.torrentFiles) === null || _b === void 0 ? void 0 : _b.forEach(value => individual.add(value));
         if (file.descendants) {
             grouped.push(...file.descendants);
         }
@@ -48,7 +49,8 @@ class Cloud extends core_1.ClientDb {
         this.downloaded = [];
     }
     static async finalize(instance) {
-        var _a, _b;
+        var _a, _b, _c, _d;
+        var _e, _f;
         if (instance.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -65,7 +67,7 @@ class Cloud extends core_1.ClientDb {
             instance.writeTimeElapsed(instance.moduleName, "Transactions were committed", startTime, { type: 64, ...Cloud.LOG_STYLE_SUCCESS });
         }
         for (const { instance: document } of this.Document) {
-            document.cloudInit?.(state);
+            (_a = document.cloudInit) === null || _a === void 0 ? void 0 : _a.call(document, state);
         }
         for (const item of this.assets) {
             const cloudStorage = item.cloudStorage;
@@ -77,7 +79,7 @@ class Cloud extends core_1.ClientDb {
                 ignore: {
                     if (item.localUri || item.torrentFiles) {
                         for (const { instance: document } of this.Document) {
-                            if (document.cloudObject?.(state, item)) {
+                            if ((_b = document.cloudObject) === null || _b === void 0 ? void 0 : _b.call(document, state, item)) {
                                 break ignore;
                             }
                         }
@@ -90,9 +92,9 @@ class Cloud extends core_1.ClientDb {
                 for (const storage of cloudStorage) {
                     const { admin, bucket } = storage;
                     if (admin && bucket && instance.hasCredential('storage', storage)) {
-                        const policy = admin.configBucket?.policy;
+                        const policy = (_c = admin.configBucket) === null || _c === void 0 ? void 0 : _c.policy;
                         if (admin.emptyBucket) {
-                            const service = bucketDelete[_a = storage.service] || (bucketDelete[_a] = {});
+                            const service = bucketDelete[_e = storage.service] || (bucketDelete[_e] = {});
                             const items = service[bucket];
                             if (!items) {
                                 service[bucket] = [instance.getCredential(storage), admin.recursive];
@@ -102,7 +104,7 @@ class Cloud extends core_1.ClientDb {
                             }
                         }
                         if (policy) {
-                            const service = bucketPolicy[_b = storage.service] || (bucketPolicy[_b] = {});
+                            const service = bucketPolicy[_f = storage.service] || (bucketPolicy[_f] = {});
                             service[bucket] = [storage.service, instance.getCredential(storage), bucket, policy];
                         }
                     }
@@ -186,7 +188,7 @@ class Cloud extends core_1.ClientDb {
                         }
                     }
                     else {
-                        downloadUri = pathname ? path.join(this.baseDirectory, pathname.replace(/^([A-Z]:)?[\\/]+/i, ''), filename) : path.join(data.admin?.preservePath && localUri ? path.dirname(localUri) : this.baseDirectory, filename);
+                        downloadUri = pathname ? path.join(this.baseDirectory, pathname.replace(/^([A-Z]:)?[\\/]+/i, ''), filename) : path.join(((_d = data.admin) === null || _d === void 0 ? void 0 : _d.preservePath) && localUri ? path.dirname(localUri) : this.baseDirectory, filename);
                     }
                     const destDir = path.dirname(downloadUri);
                     if (Cloud.isPath(downloadUri)) {
@@ -298,9 +300,10 @@ class Cloud extends core_1.ClientDb {
                 const credential = instance.getCredential(storage, true);
                 const uploading = [];
                 getFiles(file, upload).forEach((group, index) => {
+                    var _a;
                     let fileGroup;
                     if (index === 0 && group.length > 1) {
-                        if (SERVICE_CLIENT.get(service)?.CLOUD_UPLOAD_FROMDISK) {
+                        if ((_a = SERVICE_CLIENT.get(service)) === null || _a === void 0 ? void 0 : _a.CLOUD_UPLOAD_FROMDISK) {
                             fileGroup = group.slice(1).filter(value => this.isPath(value)).map(value => [value, path.extname(value), value]);
                         }
                         else {
@@ -358,6 +361,7 @@ class Cloud extends core_1.ClientDb {
         return tasks;
     }
     static sanitizeAssets(assets) {
+        var _a;
         const storage = [];
         for (const item of assets) {
             const cloudStorage = item.cloudStorage;
@@ -368,7 +372,7 @@ class Cloud extends core_1.ClientDb {
                         if (upload.filename) {
                             setUploadFilename(upload, this.toPosix(upload.filename));
                         }
-                        const pathname = upload.pathname || data.admin?.preservePath && item.pathname;
+                        const pathname = upload.pathname || ((_a = data.admin) === null || _a === void 0 ? void 0 : _a.preservePath) && item.pathname;
                         if (pathname) {
                             upload.pathname = this.toPosix(pathname).replace(/^\/+/, '') + '/';
                         }
@@ -436,6 +440,7 @@ class Cloud extends core_1.ClientDb {
         return super.setQueryResult(service, credential, queryString, result, sessionKey);
     }
     async createBucket(service, credential, bucket, publicRead, options) {
+        var _a, _b;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -443,13 +448,13 @@ class Cloud extends core_1.ClientDb {
             const client = this.getClient(service);
             try {
                 if (publicRead === undefined || typeof publicRead === 'boolean') {
-                    const handler = client.createBucket?.bind(this);
+                    const handler = (_a = client.createBucket) === null || _a === void 0 ? void 0 : _a.bind(this);
                     if (handler) {
                         return handler.call(this, credential, bucket, publicRead);
                     }
                 }
                 else {
-                    const handler = client.createBucketV2?.bind(this);
+                    const handler = (_b = client.createBucketV2) === null || _b === void 0 ? void 0 : _b.bind(this);
                     if (handler) {
                         return handler.call(this, credential, bucket, publicRead, options);
                     }
@@ -466,11 +471,12 @@ class Cloud extends core_1.ClientDb {
         }
     }
     async setBucketPolicy(service, credential, bucket, options) {
+        var _a;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
         try {
-            const handler = this.getClient(service).setBucketPolicy?.bind(this);
+            const handler = (_a = this.getClient(service).setBucketPolicy) === null || _a === void 0 ? void 0 : _a.bind(this);
             if (handler) {
                 try {
                     return handler.call(this, credential, bucket, options);
@@ -487,11 +493,12 @@ class Cloud extends core_1.ClientDb {
         }
     }
     async setBucketWebsite(service, credential, bucket, options) {
+        var _a;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
         try {
-            const handler = this.getClient(service).setBucketWebsite?.bind(this);
+            const handler = (_a = this.getClient(service).setBucketWebsite) === null || _a === void 0 ? void 0 : _a.bind(this);
             if (handler) {
                 try {
                     return handler.call(this, credential, bucket, options);
@@ -508,17 +515,18 @@ class Cloud extends core_1.ClientDb {
         }
     }
     async deleteObjects(service, credential, bucket, recursive = true) {
+        var _a, _b;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
         try {
             const errorResponse = (err) => this.formatMessage(64, service, ["Unable to empty bucket", bucket], err, { ...Cloud.LOG_CLOUD_WARN });
             const client = this.getClient(service);
-            const handlerV2 = client.deleteObjectsV2?.bind(this);
+            const handlerV2 = (_a = client.deleteObjectsV2) === null || _a === void 0 ? void 0 : _a.bind(this);
             if (handlerV2) {
                 return handlerV2.call(this, credential, bucket, recursive, service).catch(err => errorResponse(err));
             }
-            const handlerV1 = client.deleteObjects?.bind(this);
+            const handlerV1 = (_b = client.deleteObjects) === null || _b === void 0 ? void 0 : _b.bind(this);
             if (handlerV1) {
                 return handlerV1.call(this, credential, bucket, service, undefined, recursive).catch(err => errorResponse(err));
             }
@@ -618,7 +626,7 @@ class Cloud extends core_1.ClientDb {
         const service = item.service;
         let client;
         if (this.hasCredential('database', item) && (client = this.getClient(item.service))) {
-            if (client?.executeQuery) {
+            if (client === null || client === void 0 ? void 0 : client.executeQuery) {
                 const credential = this.getCredential(item);
                 if (item.options && this.hasCoerce(service, 'options', null, credential)) {
                     (0, types_1.coerceObject)(item.options);
@@ -650,7 +658,7 @@ class Cloud extends core_1.ClientDb {
         const service = data.service;
         let client;
         if (this.hasCredential('database', data) && (client = this.getClient(service))) {
-            if (client?.executeBatchQuery) {
+            if (client === null || client === void 0 ? void 0 : client.executeBatchQuery) {
                 const credential = this.getCredential(data);
                 if (this.hasCoerce(service, 'options', null, credential)) {
                     batch.forEach(item => item.options && (0, types_1.coerceObject)(item.options));
@@ -739,9 +747,10 @@ class Cloud extends core_1.ClientDb {
         return (SERVICE_DOWNLOAD[service] || (SERVICE_DOWNLOAD[service] = require(this.resolveService(service, 'download')))).call(this, credential, service);
     }
     resolveService(service, folder) {
+        var _a;
         let result;
         if (!service.startsWith('@')) {
-            result = this.settings.imports?.[service] || util_1.IMPORTS[service];
+            result = ((_a = this.settings.imports) === null || _a === void 0 ? void 0 : _a[service]) || util_1.IMPORTS[service];
         }
         else if (!folder && !service.startsWith("@squared-functions/")) {
             folder = 'client';
@@ -749,7 +758,8 @@ class Cloud extends core_1.ClientDb {
         return (result || service) + (folder ? '/' + folder : '');
     }
     settingsOf(service, name, component) {
-        const result = this.settings[service]?.[name];
+        var _a;
+        const result = (_a = this.settings[service]) === null || _a === void 0 ? void 0 : _a[name];
         return component ? (0, types_1.isObject)(result) ? result[component] : undefined : result;
     }
     commit() {
@@ -757,7 +767,8 @@ class Cloud extends core_1.ClientDb {
             return Promise.reject((0, types_1.createAbortError)());
         }
         const items = this.pending.filter(item => !item.document).map(async (data) => {
-            data.ignoreCache ?? (data.ignoreCache = true);
+            var _a;
+            (_a = data.ignoreCache) !== null && _a !== void 0 ? _a : (data.ignoreCache = true);
             return this.getDatabaseRows(data, true);
         });
         return items.length === 0 ? Promise.resolve(false) : this.allSettled(items, ["Execute unassigned queries", this.moduleName]).then(result => result.length > 0).catch(() => false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.7.3",
-    "@e-mc/db": "0.7.3",
-    "@e-mc/types": "0.7.3"
+    "@e-mc/core": "0.7.4",
+    "@e-mc/db": "0.7.4",
+    "@e-mc/types": "0.7.4"
   }
 }