@naturalcycles/cloud-storage-lib 1.1.0 → 1.2.0

package/dist/commonStorageBucket.d.ts

@@ -50,8 +50,12 @@ export declare class CommonStorageBucket {
      * Important difference between `prefix` and `path` is that `prefix` will
      * return all files from sub-directories too!
      */
-    getFileNames(prefix: string): Promise<string[]>;
-    getFileNamesStream(prefix: string, opt?: CommonStorageGetOptions): ReadableTyped<string>;
+    getFileNames(prefix: string, opt?: {
+        fullPath?: boolean;
+    }): Promise<string[]>;
+    getFileNamesStream(prefix: string, opt?: CommonStorageGetOptions & {
+        fullPath?: boolean;
+    }): ReadableTyped<string>;
     getFilesStream(prefix: string, opt?: CommonStorageGetOptions): ReadableTyped<FileEntry>;
     getFileReadStream(filePath: string): Readable;
     getFileWriteStream(filePath: string): Writable;

package/dist/commonStorageBucket.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonStorageBucket = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 /**
  * Convenience wrapper around CommonStorage for a given Bucket.
  *
@@ -106,11 +107,24 @@ class CommonStorageBucket {
      * Important difference between `prefix` and `path` is that `prefix` will
      * return all files from sub-directories too!
      */
-    async getFileNames(prefix) {
-        return await this.cfg.storage.getFileNames(this.cfg.bucketName, prefix);
-    }
-    getFileNamesStream(prefix, opt) {
-        return this.cfg.storage.getFileNamesStream(this.cfg.bucketName, prefix, opt);
+    async getFileNames(prefix, opt = {}) {
+        const { fullPath = true } = opt;
+        const names = await this.cfg.storage.getFileNames(this.cfg.bucketName, prefix);
+        if (!fullPath && prefix) {
+            const start = `${prefix}/`.length;
+            return names.map(n => n.slice(start));
+        }
+        return names;
+    }
+    getFileNamesStream(prefix, opt = {}) {
+        const { fullPath = true } = opt;
+        if (fullPath || !prefix) {
+            return this.cfg.storage.getFileNamesStream(this.cfg.bucketName, prefix, opt);
+        }
+        const start = `${prefix}/`.length;
+        return this.cfg.storage
+            .getFileNamesStream(this.cfg.bucketName, prefix, opt)
+            .pipe((0, nodejs_lib_1.transformMapSimple)(f => f.slice(start)));
     }
     getFilesStream(prefix, opt) {
         return this.cfg.storage.getFilesStream(this.cfg.bucketName, prefix, opt);

package/package.json

@@ -34,7 +34,7 @@
   "engines": {
     "node": ">=14.16.0"
   },
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "",
   "author": "Natural Cycles Team",
   "license": "MIT"

package/src/commonStorageBucket.ts

@@ -1,6 +1,6 @@
 import { Readable, Writable } from 'stream'
 import { AppError, pMap } from '@naturalcycles/js-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { ReadableTyped, transformMapSimple } from '@naturalcycles/nodejs-lib'
 import { CommonStorage, CommonStorageGetOptions, FileEntry } from './commonStorage'
 
 export interface CommonStorageBucketCfg {
@@ -145,12 +145,32 @@ export class CommonStorageBucket {
    * Important difference between `prefix` and `path` is that `prefix` will
    * return all files from sub-directories too!
    */
-  async getFileNames(prefix: string): Promise<string[]> {
-    return await this.cfg.storage.getFileNames(this.cfg.bucketName, prefix)
+  async getFileNames(prefix: string, opt: { fullPath?: boolean } = {}): Promise<string[]> {
+    const { fullPath = true } = opt
+    const names = await this.cfg.storage.getFileNames(this.cfg.bucketName, prefix)
+
+    if (!fullPath && prefix) {
+      const start = `${prefix}/`.length
+      return names.map(n => n.slice(start))
+    }
+
+    return names
   }
 
-  getFileNamesStream(prefix: string, opt?: CommonStorageGetOptions): ReadableTyped<string> {
-    return this.cfg.storage.getFileNamesStream(this.cfg.bucketName, prefix, opt)
+  getFileNamesStream(
+    prefix: string,
+    opt: CommonStorageGetOptions & { fullPath?: boolean } = {},
+  ): ReadableTyped<string> {
+    const { fullPath = true } = opt
+
+    if (fullPath || !prefix) {
+      return this.cfg.storage.getFileNamesStream(this.cfg.bucketName, prefix, opt)
+    }
+
+    const start = `${prefix}/`.length
+    return this.cfg.storage
+      .getFileNamesStream(this.cfg.bucketName, prefix, opt)
+      .pipe(transformMapSimple<string, string>(f => f.slice(start)))
   }
 
   getFilesStream(prefix: string, opt?: CommonStorageGetOptions): ReadableTyped<FileEntry> {