@e-mc/cloud 0.12.15 → 0.12.16

package/README.md

@@ -9,10 +9,10 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.15/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.16/lib/index.d.ts)
 
 ```typescript
-import type { IHost, IScopeOrigin } from "./index";
+import type { IFileManager, IHost, IScopeOrigin } from "./index";
 import type { ExternalAsset } from "./asset";
 import type { BucketWebsiteOptions, CloudDatabase, CloudFeatures, CloudFunctions, CloudService, CloudStorage, CloudStorageDownload, CloudStorageUpload, DeleteObjectsOptions, UploadAssetOptions } from "./cloud";
 import type { ClientDbConstructor, IClientDb } from "./core";
@@ -175,12 +175,12 @@ const rows = await instance.getDatabaseRows({ service: "aws-v3", credential: "ma
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/cloud.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/cloud.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/settings.d.ts
 
 ## LICENSE
 

package/index.js

@@ -483,34 +483,32 @@ class Cloud extends core_1.ClientDb {
             const current = storage[i];
             for (const data of current.cloudStorage) {
                 const trailing = data.upload;
-                if (!trailing) {
-                    continue;
-                }
-                renamed: {
+                if (trailing) {
                     const basename = trailing.filename;
                     const filename = basename || current.filename;
                     const trailingFolder = trailing.pathname || '';
                     const trailingName = this.joinPath(trailingFolder, filename);
-                    for (let j = 0; j < length - 1; ++j) {
-                        const previous = storage[j];
-                        if (current === previous) {
-                            continue;
-                        }
-                        for (const other of previous.cloudStorage) {
-                            const leading = other.upload;
-                            if (leading && hasSameBucket(data, other)) {
-                                const leadingFolder = leading.pathname || '';
-                                if (basename && basename === leading.filename && leadingFolder === trailingFolder) {
-                                    renameTrailing(nameIndex, trailing, trailingFolder, basename);
-                                    break renamed;
-                                }
-                                const leadingName = this.joinPath(leadingFolder, leading.filename || previous.filename);
-                                if (trailingName === leadingName) {
-                                    if (!trailing.overwrite || leading.overwrite) {
-                                        renameTrailing(nameIndex, trailing, trailingFolder, filename);
-                                        break renamed;
+                    renamed: {
+                        for (let j = 0; j < length - 1; ++j) {
+                            const previous = storage[j];
+                            if (current !== previous) {
+                                for (const other of previous.cloudStorage) {
+                                    const leading = other.upload;
+                                    if (leading && hasSameBucket(data, other)) {
+                                        const leadingFolder = leading.pathname || '';
+                                        if (basename && basename === leading.filename && leadingFolder === trailingFolder) {
+                                            renameTrailing(nameIndex, trailing, trailingFolder, basename);
+                                            break renamed;
+                                        }
+                                        const leadingName = this.joinPath(leadingFolder, leading.filename || previous.filename);
+                                        if (trailingName === leadingName) {
+                                            if (!trailing.overwrite || leading.overwrite) {
+                                                renameTrailing(nameIndex, trailing, trailingFolder, filename);
+                                                break renamed;
+                                            }
+                                            leading.filename = assignFilename(leading.filename || previous.filename);
+                                        }
                                     }
-                                    leading.filename = assignFilename(leading.filename || previous.filename);
                                 }
                             }
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/cloud",
-  "version": "0.12.15",
+  "version": "0.12.16",
   "description": "Cloud constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,9 +19,9 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.12.15",
-    "@e-mc/db": "0.12.15",
-    "@e-mc/types": "0.12.15",
+    "@e-mc/core": "0.12.16",
+    "@e-mc/db": "0.12.16",
+    "@e-mc/types": "0.12.16",
     "mime-types": "^2.1.35"
   }
 }

package/types/index.d.ts

@@ -33,7 +33,7 @@ export interface CloudScopeOrigin<T extends IFileManager<U>, U extends CloudAsse
 }
 
 export type ServiceHost<T, U = unknown> = (this: IModule, credential: U, service?: string, sdk?: string) => T;
-export type UploadCallback = (data: UploadData, callback: (err: unknown, value?: string) => void) => void;
-export type DownloadCallback = (data: DownloadData, callback: (err: unknown, value?: string | Buffer | null) => void) => void;
+export type UploadCallback<T = any> = (data: UploadData<T, any, any, any, any, any, any>, callback: (err: unknown, value?: string) => void) => void;
+export type DownloadCallback<T = any> = (data: DownloadData<T, any>, callback: (err: unknown, value?: string | Buffer | null) => void) => void;
 export type UploadHost = ServiceHost<UploadCallback>;
 export type DownloadHost = ServiceHost<DownloadCallback>;

package/util.d.ts

@@ -4,8 +4,19 @@ import type { AuthValue } from '@e-mc/types/lib/http';
 import type { Readable } from 'node:stream';
 
 declare namespace util {
+    interface CreateKeyAndBodyOptions {
+        errorCallback?: FunctionType<void>;
+        descendantsGroup?: string[];
+        flags?: number;
+        chunkSize?: number;
+        mimeType?: string;
+    }
+
     function readableAsBuffer(from: Readable): Promise<Buffer | null>;
-    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], chunkSize?: number | string | FunctionType<void>, errorCallback?: FunctionType<void> | number, flags?: number): [string[], T[], string[]];
+    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], options: CreateKeyAndBodyOptions): [string[], T[], string[]];
+    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], errorCallback: FunctionType<void>, flags?: number): [string[], T[], string[]];
+    /** @deprecated options */
+    function createKeyAndBody<T = Buffer>(filename: string, items: UploadContent[], chunkSize?: number | string | FunctionType<void>, errorCallback?: FunctionType<void> | number, flags?: number, descendantsGroup?: string[]): [string[], T[], string[]];
     function generateFilename(filename: string): (i: number) => [string, boolean];
     function getBasicAuth(auth: AuthValue): string;
     function getBasicAuth(username: unknown, password?: unknown): string;

package/util.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "hasBasicAuth", { enumerable: true, get: function
 async function readableAsBuffer(from) {
     return new Promise((resolve, reject) => {
         let result = null;
-        from.on('data', chunk => {
+        from.on('data', (chunk) => {
             if (!Buffer.isBuffer(chunk)) {
                 chunk = Buffer.from(chunk);
             }
@@ -28,21 +28,26 @@ async function readableAsBuffer(from) {
             .read();
     });
 }
-function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags = 0) {
+function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags = 0, descendantsGroup = ['.map']) {
     let mimeType;
-    switch (typeof chunkSize) {
-        case 'function':
-            errorCallback = chunkSize;
-            chunkSize = 0;
-            break;
-        case 'string':
-            mimeType = chunkSize;
-            chunkSize = 0;
-            break;
+    if ((0, types_1.isPlainObject)(chunkSize)) {
+        ({ errorCallback, mimeType, chunkSize = 0, flags = 0, descendantsGroup } = chunkSize);
     }
-    if (typeof errorCallback === 'number') {
-        flags = errorCallback;
-        errorCallback = undefined;
+    else {
+        switch (typeof chunkSize) {
+            case 'function':
+                errorCallback = chunkSize;
+                chunkSize = 0;
+                break;
+            case 'string':
+                mimeType = chunkSize;
+                chunkSize = 0;
+                break;
+        }
+        if (typeof errorCallback === 'number') {
+            flags = errorCallback;
+            errorCallback = undefined;
+        }
     }
     const key = [];
     const body = [];
@@ -103,9 +108,10 @@ function createKeyAndBody(filename, items, chunkSize = 0, errorCallback, flags =
             }
             if (target) {
                 const output = filename + ext;
-                key.push(ext === '.map' && localFile ? path.basename(localFile) : output);
+                const descendant = Array.isArray(descendantsGroup) && descendantsGroup.includes(ext);
+                key.push(descendant && localFile ? path.basename(localFile) : output);
                 body.push(target);
-                type.push(ext !== '.map' && mime.lookup(output) || mimeType || "application/octet-stream");
+                type.push(!descendant && mime.lookup(output) || mimeType || "application/octet-stream");
             }
         }
         catch (err) {