@lafken/bucket 0.13.2 → 0.13.4

package/lib/service/repository/repository.js

@@ -37,10 +37,9 @@ const createRepository = (bucket) => {
             return bucketClient.send(command);
         },
         async moveObject(props) {
+            const source = (0, repository_utils_1.parseCopySource)(props.CopySource);
             await this.copyObject(props);
-            await this.deleteObject({
-                Key: props.Key,
-            });
+            await bucketClient.send(new client_s3_1.DeleteObjectCommand(source));
         },
         async listObjects(props) {
             let allContents = [];

package/lib/service/repository/repository.utils.d.ts

@@ -1,2 +1,12 @@
 import type { ClassResource } from '@lafken/common';
 export declare const getBucketInformation: <T>(bucket: ClassResource) => T;
+/**
+ * Splits a CopySource value (`/sourceBucket/sourceKey?versionId=id`) into the
+ * bucket, key and version of the object being copied. The key is URL decoded,
+ * as required by the S3 CopyObject API.
+ */
+export declare const parseCopySource: (copySource: string | undefined) => {
+    Bucket: string;
+    Key: string;
+    VersionId: string | undefined;
+};

package/lib/service/repository/repository.utils.js

@@ -1,9 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBucketInformation = void 0;
+exports.parseCopySource = exports.getBucketInformation = void 0;
 const bucket_1 = require("../../main/bucket");
 const getBucketInformation = (bucket) => {
     const bucketProps = Reflect.getMetadata(bucket_1.BucketMetadataKeys.bucket, bucket);
     return bucketProps;
 };
 exports.getBucketInformation = getBucketInformation;
+/**
+ * Splits a CopySource value (`/sourceBucket/sourceKey?versionId=id`) into the
+ * bucket, key and version of the object being copied. The key is URL decoded,
+ * as required by the S3 CopyObject API.
+ */
+const parseCopySource = (copySource) => {
+    const [source, query] = (copySource || '').replace(/^\//, '').split('?');
+    const separatorIndex = source.indexOf('/');
+    if (separatorIndex < 1 || separatorIndex === source.length - 1) {
+        throw new Error(`Invalid CopySource "${copySource}", expected format "sourceBucket/sourceKey"`);
+    }
+    return {
+        Bucket: source.slice(0, separatorIndex),
+        Key: decodeURIComponent(source.slice(separatorIndex + 1)),
+        VersionId: query
+            ? new URLSearchParams(query).get('versionId') || undefined
+            : undefined,
+    };
+};
+exports.parseCopySource = parseCopySource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/bucket",
-  "version": "0.13.2",
+  "version": "0.13.4",
   "private": false,
   "description": "Define S3 buckets using TypeScript decorators - automatic infrastructure generation with Lafken",
   "keywords": [
@@ -57,7 +57,7 @@
   ],
   "dependencies": {
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.13.2"
+    "@lafken/resolver": "0.13.4"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.1090.0",
@@ -71,13 +71,13 @@
     "typescript": "7.0.2",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.10",
-    "@lafken/common": "0.13.2"
+    "@lafken/common": "0.13.4"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",
     "cdktn": ">=0.22.0",
     "constructs": "^10.4.5",
-    "@lafken/common": "0.13.2"
+    "@lafken/common": "0.13.4"
   },
   "engines": {
     "node": ">=20.19"