@genoacms/adapter-gcp 0.3.8 → 0.3.9

package/dist/services/storage/index.js

@@ -28,18 +28,25 @@ const deleteObject = async ({ bucket, name }) => {
 };
 const listDirectory = async ({ bucket, name }, listingParams = {}) => {
     const bucketInstance = getBucket(bucket);
-    const [files] = await bucketInstance.getFiles({
+    const options = {
+        autoPaginate: false,
         prefix: name,
         maxResults: listingParams?.limit,
-        startOffset: listingParams?.startAfter
-    });
-    return files.map((file) => {
-        return {
-            name: file.name,
-            size: file.metadata.size ? parseInt(file.metadata.size) : 0,
-            lastModified: new Date(file.metadata.updated)
-        };
-    });
+        startOffset: listingParams?.startAfter,
+        delimiter: '/'
+    };
+    const [files, , apiResponse] = (await bucketInstance.getFiles(options));
+    return {
+        files: files.map((file) => {
+            return {
+                name: file.name,
+                // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+                size: file.metadata.size ? parseInt(file.metadata.size) : 0,
+                lastModified: new Date(file.metadata.updated)
+            };
+        }),
+        directories: apiResponse?.prefixes ?? []
+    };
 };
 const createDirectory = async ({ bucket, name }) => {
     const bucketInstance = getBucket(bucket);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
     "type": "git",
@@ -17,9 +17,9 @@
   "homepage": "https://github.com/GenoaCMS/adapter-gcp#readme",
   "type": "module",
   "dependencies": {
-    "@genoacms/cloudabstraction": "^0.3.8",
+    "@genoacms/cloudabstraction": "^0.3.9",
     "@google-cloud/firestore": "^7.1.0",
-    "@google-cloud/storage": "^7.4.0"
+    "@google-cloud/storage": "^7.7.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.9.0",
@@ -38,16 +38,16 @@
   ],
   "exports": {
     "./auth": {
-      "import": "./dist/auth/index.js",
-      "types": "./dist/auth/index.d.ts"
+      "import": "./dist/services/auth/index.js",
+      "types": "./dist/services/auth/index.d.ts"
     },
     "./database": {
-      "import": "./dist/database/index.js",
-      "types": "./dist/database/index.d.ts"
+      "import": "./dist/services/database/index.js",
+      "types": "./dist/services/database/index.d.ts"
     },
     "./storage": {
-      "import": "./dist/storage/index.js",
-      "types": "./dist/storage/index.d.ts"
+      "import": "./dist/services/storage/index.js",
+      "types": "./dist/services/storage/index.d.ts"
     }
   },
   "scripts": {

package/src/services/storage/index.ts

@@ -1,7 +1,7 @@
 import type {
   storage as storageT
 } from '@genoacms/cloudabstraction'
-import { type Bucket, Storage } from '@google-cloud/storage'
+import { type Bucket, Storage, type File } from '@google-cloud/storage'
 import config from '../../config.js'
 
 const storage = new Storage({
@@ -37,18 +37,26 @@ const deleteObject: storageT.deleteObject = async ({ bucket, name }) => {
 
 const listDirectory: storageT.listDirectory = async ({ bucket, name }, listingParams = {}) => {
   const bucketInstance = getBucket(bucket)
-  const [files] = await bucketInstance.getFiles({
+  const options = {
+    autoPaginate: false,
     prefix: name,
     maxResults: listingParams?.limit,
-    startOffset: listingParams?.startAfter
-  })
-  return files.map((file) => {
-    return {
-      name: file.name,
-      size: file.metadata.size ? parseInt(file.metadata.size as string) : 0,
-      lastModified: new Date(file.metadata.updated as string)
-    } satisfies storageT.StorageObject
-  })
+    startOffset: listingParams?.startAfter,
+    delimiter: '/'
+  }
+  const [files, , apiResponse] =
+      (await bucketInstance.getFiles(options)) as [File[], object, { prefixes: string[] } | undefined ]
+  return {
+    files: files.map((file) => {
+      return {
+        name: file.name,
+        // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+        size: file.metadata.size ? parseInt(file.metadata.size as string) : 0,
+        lastModified: new Date(file.metadata.updated as string)
+      } satisfies storageT.StorageObject
+    }),
+    directories: apiResponse?.prefixes ?? []
+  }
 }
 
 const createDirectory: storageT.createDirectory = async ({ bucket, name }) => {