@travetto/model-s3 5.0.0 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
     "s3",
@@ -25,13 +25,13 @@
     "directory": "module/model-s3"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.631.0",
+    "@aws-sdk/client-s3": "^3.637.0",
     "@aws-sdk/credential-provider-ini": "^3.609.0",
-    "@travetto/config": "^5.0.0",
-    "@travetto/model": "^5.0.0"
+    "@travetto/config": "^5.0.1",
+    "@travetto/model": "^5.0.1"
   },
   "peerDependencies": {
-    "@travetto/command": "^5.0.0"
+    "@travetto/command": "^5.0.1"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/service.ts

@@ -92,9 +92,13 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   async * #iterateBucket(cls?: string | Class): AsyncIterable<{ Key: string, id: string }[]> {
     let Marker: string | undefined;
     for (; ;) {
-      const obs = await this.client.listObjects({ Bucket: this.config.bucket, Prefix: cls ? this.#resolveKey(cls) : undefined, Marker });
-      if (obs.Contents && obs.Contents.length) {
-        yield (obs.Contents ?? []).map(o => ({ Key: o.Key!, id: o.Key!.split(':').pop()! }));
+      const obs = await this.client.listObjects({
+        Bucket: this.config.bucket,
+        Prefix: cls ? this.#resolveKey(cls) : this.config.namespace,
+        Marker
+      });
+      if (obs.Contents?.length) {
+        yield obs.Contents.map(o => ({ Key: o.Key!, id: o.Key!.split(':').pop()! }));
       }
       if (obs.NextMarker) {
         Marker = obs.NextMarker;
@@ -148,19 +152,12 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   }
 
   async #deleteKeys(items: { Key: string }[]): Promise<void> {
-    if (this.config.endpoint.includes('localhost')) {
-      await Promise.all(items.map(item => this.client.deleteObject({
-        Bucket: this.config.bucket,
-        Key: item.Key
-      })));
-    } else {
-      await this.client.deleteObjects({
-        Bucket: this.config.bucket,
-        Delete: {
-          Objects: items
-        }
-      });
-    }
+    await this.client.deleteObjects({
+      Bucket: this.config.bucket,
+      Delete: {
+        Objects: items
+      }
+    });
   }
 
   async postConstruct(): Promise<void> {
@@ -263,7 +260,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   async updatePartial<T extends ModelType>(cls: Class<T>, item: Partial<T> & { id: string }, view?: string): Promise<T> {
     ModelCrudUtil.ensureNotSubType(cls);
     const id = item.id;
-    const prepped = await ModelCrudUtil.naivePartialUpdate(cls, item, view, (): Promise<T> => this.get(cls, id));
+    const prepped = await ModelCrudUtil.naivePartialUpdate(cls, () => this.get(cls, id), item, view);
     return this.store<T>(cls, prepped, false);
   }
 
@@ -395,7 +392,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
 
   async deleteStorage(): Promise<void> {
     if (this.config.namespace) {
-      for await (const items of this.#iterateBucket('')) {
+      for await (const items of this.#iterateBucket()) {
         await this.#deleteKeys(items);
       }
     } else {