effect-cloudflare-r2-layer 1.0.2 → 1.0.3

package/README.md

@@ -10,6 +10,8 @@ An effect layer to interact with Cloudware R2 storage service.
 
 ## ⚡ Quick start
 
+### 🔶 Install
+
 ```bash
 npm i effect-cloudflare-r2-layer
 # or
@@ -18,6 +20,34 @@ pnpm i effect-cloudflare-r2-layer
 bun i effect-cloudflare-r2-layer
 ```
 
+### 🔶 Use the layer
+
+```typescript
+import { FetchHttpClient } from '@effect/platform';
+import { Effect, Layer, pipe } from 'effect';
+import {
+  CloudflareR2StorageLayerLive,
+  FileStorageLayer,
+} from 'effect-cloudflare-r2-layer';
+
+const task = pipe(
+  FileStorageLayer.readAsText('my-bucket', 'some-file.txt'),
+  Effect.scoped,
+  Effect.provide(
+    Layer.mergeAll(CloudflareR2StorageLayerLive, FetchHttpClient.layer)
+  )
+);
+
+/* task is of type
+
+  Effect.Effect<
+    string, 
+    ConfigError | HttpClientError | FileStorageError, 
+    never
+  >
+*/
+```
+
 ## ⚡ Env variables
 
 The layer requires the following env variables:
@@ -30,6 +60,14 @@ R2_DOCUMENTS_SECRET_ACCESS_KEY=""
 
 ## ⚡ API
 
+| function                                          | description                                                                               |
+| ------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| [`uploadFile`](./README.md#-uploadfile)           | Adds a file to the specified bucket                                                       |
+| [`getFileUrl`](./README.md#-getfileurl)           | Gets a pre-signed url to fetch a ressource by its `filename` from the specified `bucket`. |
+| [`readAsJson`](./README.md#-readasjson)           | Fetches a file, expecting a content extending `Record<string, unknown>`.                  |
+| [`readAsText`](./README.md#-readastext)           | Fetches a file as a string.                                                               |
+| [`readAsRawBinary`](./README.md#-readasrawbinary) | Fetches a file as raw binary (ArrayBuffer).                                               |
+
 ### 🔶 `uploadFile`
 
 Adds a file to the specified bucket.
@@ -42,12 +80,15 @@ interface UploadFileInput<TBucket extends string> {
   contentType: string | undefined;
 }
 
-type uploadFile = <TBucket extends string>(
-  input: UploadFileInput<TBucket>
-) => Effect.Effect<
-  void,
-  FileStorageError | ConfigError.ConfigError,
-  FileStorage
+type uploadFile = <TBucket extends string>({
+  bucketName,
+  documentKey,
+  data,
+  contentType,
+}: UploadFileInput<TBucket>) => Effect.Effect<
+  PutObjectCommandOutput,
+  FileStorageError | ConfigError,
+  never
 >;
 ```
 
@@ -74,7 +115,7 @@ const task = pipe(
 
     yield* FileStorageLayer.uploadFile<Buckets>({
       bucketName: 'assets',
-      key: fileName,
+      documentKey: fileName,
       data: fileData,
       contentType: 'image/jpeg',
     });

package/cjs/dts/index.d.ts

@@ -3,3 +3,4 @@ import { FileStorageLayer } from './layer/file-storage.layer.js';
 export { FileStorageLayer };
 export type { FileStorage };
 export * from './r2/r2-file-storage.layer.js';
+export type { PutObjectCommandOutput } from '@aws-sdk/client-s3';

package/cjs/dts/layer/file-storage.layer.d.ts

@@ -1,22 +1,23 @@
 import { HttpClientError } from '@effect/platform/HttpClientError';
 import type { ConfigError, Effect } from 'effect';
 import { Context } from 'effect';
+import { PutObjectCommandOutput } from '@aws-sdk/client-s3';
 import { HttpClient } from '@effect/platform';
 import { Scope } from 'effect/Scope';
 import type { FileStorageError } from '../errors/file-storage.error.js';
-import type { UploadFileInput } from '../r2/implementations/upload-file.effect.js';
+import type { UploadFileInput } from '../r2/implementations/index.js';
 export interface FileStorage {
     readonly getFileUrl: <TBucket extends string>(fileName: string, bucket: TBucket) => Effect.Effect<string, FileStorageError | ConfigError.ConfigError>;
     readonly readAsRawBinary: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<ArrayBuffer, ConfigError.ConfigError | HttpClientError | FileStorageError, Scope | HttpClient.HttpClient.Service>;
     readonly readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucketName: TBucket, documentKey: string) => Effect.Effect<TShape, ConfigError.ConfigError | HttpClientError | FileStorageError, Scope | HttpClient.HttpClient.Service>;
     readonly readAsText: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<string, ConfigError.ConfigError | HttpClientError | FileStorageError, Scope | HttpClient.HttpClient.Service>;
-    readonly uploadFile: <TBucket extends string>(input: UploadFileInput<TBucket>) => Effect.Effect<void, FileStorageError | ConfigError.ConfigError>;
+    readonly uploadFile: <TBucket extends string>({ bucketName, documentKey, data, contentType, }: UploadFileInput<TBucket>) => Effect.Effect<PutObjectCommandOutput, ConfigError.ConfigError | FileStorageError, never>;
 }
 export declare const FileStorageLayerContext: Context.Tag<FileStorage, FileStorage>;
 export declare const FileStorageLayer: {
     getFileUrl: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<string, FileStorageError | ConfigError.ConfigError, FileStorage>;
-    readAsRawBinary: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<ArrayBuffer, FileStorageError | ConfigError.ConfigError | HttpClientError, FileStorage | Scope | HttpClient.HttpClient.Service>;
-    readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucket: TBucket, fileName: string) => Effect.Effect<TShape, FileStorageError | ConfigError.ConfigError | HttpClientError, FileStorage | Scope | HttpClient.HttpClient.Service>;
-    readAsText: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<string, FileStorageError | ConfigError.ConfigError | HttpClientError, FileStorage | Scope | HttpClient.HttpClient.Service>;
-    uploadFile: <TBucket extends string>(input: UploadFileInput<TBucket>) => Effect.Effect<void, FileStorageError | ConfigError.ConfigError, FileStorage>;
+    readAsRawBinary: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<ArrayBuffer, FileStorageError | ConfigError.ConfigError | HttpClientError, Scope | HttpClient.HttpClient.Service | FileStorage>;
+    readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucket: TBucket, fileName: string) => Effect.Effect<TShape, FileStorageError | ConfigError.ConfigError | HttpClientError, Scope | HttpClient.HttpClient.Service | FileStorage>;
+    readAsText: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<string, FileStorageError | ConfigError.ConfigError | HttpClientError, Scope | HttpClient.HttpClient.Service | FileStorage>;
+    uploadFile: <TBucket extends string>(input: UploadFileInput<TBucket>) => Effect.Effect<PutObjectCommandOutput, FileStorageError | ConfigError.ConfigError, FileStorage>;
 };

package/cjs/dts/r2/implementations/index.d.ts

@@ -1,2 +1,5 @@
 export * from './get-file-url.effect.js';
 export * from './upload-file.effect.js';
+export * from './read-as-json.effect.js';
+export * from './read-as-raw-binary.effect.js';
+export * from './read-as-text.effect.js';

package/cjs/dts/r2/implementations/internal/fetch-file.effect.d.ts

@@ -0,0 +1,3 @@
+import { HttpClient } from '@effect/platform';
+import { Effect } from 'effect';
+export declare const fetchFile: (bucketName: string, documentKey: string) => Effect.Effect<import("@effect/platform/HttpClientResponse").HttpClientResponse, import("../../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | HttpClient.HttpClient.Service>;

package/cjs/dts/r2/implementations/{get-url.effect.d.ts → internal/get-url.effect.d.ts}

@@ -1,4 +1,4 @@
 import type { S3Client } from '@aws-sdk/client-s3';
 import { Effect } from 'effect';
-import { FileStorageError } from '../../errors/file-storage.error.js';
+import { FileStorageError } from '../../../errors/file-storage.error.js';
 export declare const getUrl: <TBucket extends string>(provider: S3Client, bucketName: TBucket, documentKey: TBucket) => Effect.Effect<string, FileStorageError, never>;

package/cjs/dts/r2/implementations/internal/index.d.ts

@@ -0,0 +1,2 @@
+export * from './fetch-file.effect.js';
+export * from './get-url.effect.js';

package/cjs/dts/r2/implementations/read-as-json.effect.d.ts

@@ -1,3 +1,2 @@
-import { HttpClient } from '@effect/platform';
 import { Effect } from 'effect';
-export declare const readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucketName: TBucket, documentKey: string) => Effect.Effect<TShape, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | HttpClient.HttpClient.Service>;
+export declare const readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucketName: TBucket, documentKey: string) => Effect.Effect<TShape, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | import("@effect/platform/HttpClient").HttpClient.Service>;

package/cjs/dts/r2/implementations/read-as-raw-binary.effect.d.ts

@@ -1,3 +1,2 @@
-import { HttpClient } from '@effect/platform';
 import { Effect } from 'effect';
-export declare const readAsRawBinary: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<ArrayBuffer, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | HttpClient.HttpClient.Service>;
+export declare const readAsRawBinary: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<ArrayBuffer, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | import("@effect/platform/HttpClient").HttpClient.Service>;

package/cjs/dts/r2/implementations/read-as-text.effect.d.ts

@@ -1,3 +1,2 @@
-import { HttpClient } from '@effect/platform';
 import { Effect } from 'effect';
-export declare const readAsText: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<string, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | HttpClient.HttpClient.Service>;
+export declare const readAsText: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<string, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | import("@effect/platform/HttpClient").HttpClient.Service>;

package/cjs/dts/r2/implementations/upload-file.effect.d.ts

@@ -2,8 +2,8 @@ import { Effect } from 'effect';
 import { FileStorageError } from '../../errors/file-storage.error.js';
 export interface UploadFileInput<TBucket extends string> {
     bucketName: TBucket;
-    key: string;
+    documentKey: string;
     data: Buffer;
     contentType: string | undefined;
 }
-export declare const uploadFile: <TBucket extends string>({ bucketName, key, data, contentType, }: UploadFileInput<TBucket>) => Effect.Effect<import("@aws-sdk/client-s3").PutObjectCommandOutput, FileStorageError | import("effect/ConfigError").ConfigError, never>;
+export declare const uploadFile: <TBucket extends string>({ bucketName, documentKey, data, contentType, }: UploadFileInput<TBucket>) => Effect.Effect<import("@aws-sdk/client-s3").PutObjectCommandOutput, FileStorageError | import("effect/ConfigError").ConfigError, never>;

package/cjs/layer/file-storage.layer.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-storage.layer.js","sourceRoot":"","sources":["../../../src/layer/file-storage.layer.ts"],"names":[],"mappings":";;;AAEA,mCAAiC;AAMjC,wEAA2D;AAuC9C,QAAA,uBAAuB,GAClC,gBAAO,CAAC,UAAU,CAAc,cAAc,CAAC,CAAC;AAErC,QAAA,gBAAgB,GAAG;IAC9B,UAAU,EAAE,CAAyB,MAAe,EAAE,QAAgB,EAAE,EAAE,CACxE,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7B;IACH,eAAe,EAAE,CACf,MAAe,EACf,QAAgB,EAChB,EAAE,CACF,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CACxD,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAClC;IACH,UAAU,EAAE,CACV,MAAe,EACf,QAAgB,EAChB,EAAE,CACF,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAkB,MAAM,EAAE,QAAQ,CAAC,CAC9C;IACH,UAAU,EAAE,CAAyB,MAAe,EAAE,QAAgB,EAAE,EAAE,CACxE,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7B;IACH,UAAU,EAAE,CAAyB,KAA+B,EAAE,EAAE,CACtE,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;CAC3E,CAAC"}
+{"version":3,"file":"file-storage.layer.js","sourceRoot":"","sources":["../../../src/layer/file-storage.layer.ts"],"names":[],"mappings":";;;AAEA,mCAAiC;AAOjC,wEAA2D;AA8C9C,QAAA,uBAAuB,GAClC,gBAAO,CAAC,UAAU,CAAc,cAAc,CAAC,CAAC;AAErC,QAAA,gBAAgB,GAAG;IAC9B,UAAU,EAAE,CAAyB,MAAe,EAAE,QAAgB,EAAE,EAAE,CACxE,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7B;IACH,eAAe,EAAE,CACf,MAAe,EACf,QAAgB,EAChB,EAAE,CACF,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CACxD,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAClC;IACH,UAAU,EAAE,CACV,MAAe,EACf,QAAgB,EAChB,EAAE,CACF,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAkB,MAAM,EAAE,QAAQ,CAAC,CAC9C;IACH,UAAU,EAAE,CAAyB,MAAe,EAAE,QAAgB,EAAE,EAAE,CACxE,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7B;IACH,UAAU,EAAE,CAAyB,KAA+B,EAAE,EAAE,CACtE,IAAA,6BAAQ,EAAC,+BAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;CAC3E,CAAC"}

package/cjs/r2/implementations/get-file-url.effect.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileUrl = void 0;
 const effect_1 = require("effect");
 const r2_file_storage_provider_js_1 = require("../providers/r2-file-storage.provider.js");
-const get_url_effect_js_1 = require("./get-url.effect.js");
+const get_url_effect_js_1 = require("./internal/get-url.effect.js");
 const getFileUrl = (bucketName, documentKey) => effect_1.Effect.withSpan('get-file-url', { attributes: { bucketName, documentKey } })((0, effect_1.pipe)(r2_file_storage_provider_js_1.cloudflareR2StorageProvider, effect_1.Effect.flatMap((provider) => (0, get_url_effect_js_1.getUrl)(provider, bucketName, documentKey))));
 exports.getFileUrl = getFileUrl;
 //# sourceMappingURL=get-file-url.effect.js.map

package/cjs/r2/implementations/get-file-url.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-file-url.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/get-file-url.effect.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,0FAAuF;AACvF,2DAA6C;AAEtC,MAAM,UAAU,GAAG,CACxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CAC1E,IAAA,aAAI,EACF,yDAA2B,EAC3B,eAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,0BAAM,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC,CACxE,CACF,CAAC;AATS,QAAA,UAAU,cASnB"}
+{"version":3,"file":"get-file-url.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/get-file-url.effect.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,0FAAuF;AACvF,oEAAsD;AAE/C,MAAM,UAAU,GAAG,CACxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CAC1E,IAAA,aAAI,EACF,yDAA2B,EAC3B,eAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,0BAAM,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC,CACxE,CACF,CAAC;AATS,QAAA,UAAU,cASnB"}

package/cjs/r2/implementations/index.js

@@ -16,4 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./get-file-url.effect.js"), exports);
 __exportStar(require("./upload-file.effect.js"), exports);
+__exportStar(require("./read-as-json.effect.js"), exports);
+__exportStar(require("./read-as-raw-binary.effect.js"), exports);
+__exportStar(require("./read-as-text.effect.js"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/r2/implementations/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/r2/implementations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,0DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/r2/implementations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,0DAAwC;AACxC,2DAAyC;AACzC,iEAA+C;AAC/C,2DAAyC"}

package/cjs/r2/implementations/internal/fetch-file.effect.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchFile = void 0;
+const platform_1 = require("@effect/platform");
+const effect_1 = require("effect");
+const r2_file_storage_provider_js_1 = require("../../providers/r2-file-storage.provider.js");
+const get_url_effect_js_1 = require("./get-url.effect.js");
+const fetchFile = (bucketName, documentKey) => effect_1.Effect.gen(function* () {
+    const provider = yield* r2_file_storage_provider_js_1.cloudflareR2StorageProvider;
+    const url = yield* (0, get_url_effect_js_1.getUrl)(provider, bucketName, documentKey);
+    const client = yield* platform_1.HttpClient.HttpClient;
+    return yield* client.get(url);
+});
+exports.fetchFile = fetchFile;
+//# sourceMappingURL=fetch-file.effect.js.map

package/cjs/r2/implementations/internal/fetch-file.effect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-file.effect.js","sourceRoot":"","sources":["../../../../../src/r2/implementations/internal/fetch-file.effect.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAC9C,mCAAgC;AAEhC,6FAA0F;AAC1F,2DAA6C;AAEtC,MAAM,SAAS,GAAG,CAAC,UAAkB,EAAE,WAAmB,EAAE,EAAE,CACnE,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,yDAA2B,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,IAAA,0BAAM,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC;IAC5C,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAPQ,QAAA,SAAS,aAOjB"}

package/cjs/r2/implementations/{get-url.effect.js → internal/get-url.effect.js}

@@ -4,7 +4,7 @@ exports.getUrl = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
 const effect_1 = require("effect");
-const file_storage_error_js_1 = require("../../errors/file-storage.error.js");
+const file_storage_error_js_1 = require("../../../errors/file-storage.error.js");
 const oneHourDuration = 60 * 60;
 const getUrl = (provider, bucketName, documentKey) => effect_1.Effect.withSpan('get-url', { attributes: { bucketName, documentKey } })(effect_1.Effect.tryPromise({
     try: () => (0, s3_request_presigner_1.getSignedUrl)(provider, new client_s3_1.GetObjectCommand({

package/cjs/r2/implementations/internal/get-url.effect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-url.effect.js","sourceRoot":"","sources":["../../../../../src/r2/implementations/internal/get-url.effect.ts"],"names":[],"mappings":";;;AACA,kDAAsD;AACtD,wEAAgF;AAChF,mCAAgC;AAEhC,iFAAyE;AAEzE,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,CAAC;AAEzB,MAAM,MAAM,GAAG,CACpB,QAAkB,EAClB,UAAmB,EACnB,WAAoB,EACpB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CACrE,eAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CACR,IAAA,mCAAe,EACb,QAAQ,EACR,IAAI,4BAAgB,CAAC;QACnB,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,WAAW;KACjB,CAAC,EACF;QACE,SAAS,EAAE,eAAe;KAC3B,CACF;IACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,wCAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;CACjD,CAAC,CACH,CAAC;AApBS,QAAA,MAAM,UAoBf"}

package/cjs/r2/implementations/internal/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./fetch-file.effect.js"), exports);
+__exportStar(require("./get-url.effect.js"), exports);
+//# sourceMappingURL=index.js.map

package/cjs/r2/implementations/internal/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/r2/implementations/internal/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,sDAAoC"}

package/cjs/r2/implementations/read-as-json.effect.js

@@ -1,19 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAsJson = void 0;
-const platform_1 = require("@effect/platform");
 const effect_1 = require("effect");
-const r2_file_storage_provider_js_1 = require("../providers/r2-file-storage.provider.js");
-const get_url_effect_js_1 = require("./get-url.effect.js");
+const index_js_1 = require("./internal/index.js");
 const readAsJson = (bucketName, documentKey) => effect_1.Effect.withSpan('read-as-json', {
     attributes: { bucketName, documentKey },
-})(effect_1.Effect.gen(function* () {
-    const provider = yield* r2_file_storage_provider_js_1.cloudflareR2StorageProvider;
-    const url = yield* (0, get_url_effect_js_1.getUrl)(provider, bucketName, documentKey);
-    const client = yield* platform_1.HttpClient.HttpClient;
-    const response = yield* client.get(url);
-    const json = yield* response.json;
-    return json;
-}));
+})((0, effect_1.pipe)((0, index_js_1.fetchFile)(bucketName, documentKey), effect_1.Effect.flatMap((response) => response.json), effect_1.Effect.map((json) => json)));
 exports.readAsJson = readAsJson;
 //# sourceMappingURL=read-as-json.effect.js.map

package/cjs/r2/implementations/read-as-json.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-as-json.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-json.effect.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAC9C,mCAAgC;AAEhC,0FAAuF;AACvF,2DAA6C;AAEtC,MAAM,UAAU,GAAG,CAIxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;IAC9B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,yDAA2B,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,IAAA,0BAAM,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAExC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAElC,OAAO,IAAc,CAAC;AACxB,CAAC,CAAC,CACH,CAAC;AArBS,QAAA,UAAU,cAqBnB"}
+{"version":3,"file":"read-as-json.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-json.effect.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,kDAAgD;AAEzC,MAAM,UAAU,GAAG,CAIxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;IAC9B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,IAAA,aAAI,EACF,IAAA,oBAAS,EAAC,UAAU,EAAE,WAAW,CAAC,EAClC,eAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC3C,eAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CAAC,CACrC,CACF,CAAC;AAfS,QAAA,UAAU,cAenB"}

package/cjs/r2/implementations/read-as-raw-binary.effect.js

@@ -1,18 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAsRawBinary = void 0;
-const platform_1 = require("@effect/platform");
 const effect_1 = require("effect");
-const r2_file_storage_provider_js_1 = require("../providers/r2-file-storage.provider.js");
-const get_url_effect_js_1 = require("./get-url.effect.js");
+const index_js_1 = require("./internal/index.js");
 const readAsRawBinary = (bucketName, documentKey) => effect_1.Effect.withSpan('read-as-raw-binary', {
     attributes: { bucketName, documentKey },
-})(effect_1.Effect.gen(function* () {
-    const provider = yield* r2_file_storage_provider_js_1.cloudflareR2StorageProvider;
-    const url = yield* (0, get_url_effect_js_1.getUrl)(provider, bucketName, documentKey);
-    const client = yield* platform_1.HttpClient.HttpClient;
-    const response = yield* client.get(url);
-    return yield* response.arrayBuffer;
-}));
+})((0, effect_1.pipe)((0, index_js_1.fetchFile)(bucketName, documentKey), effect_1.Effect.flatMap((response) => response.arrayBuffer)));
 exports.readAsRawBinary = readAsRawBinary;
 //# sourceMappingURL=read-as-raw-binary.effect.js.map

package/cjs/r2/implementations/read-as-raw-binary.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-as-raw-binary.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-raw-binary.effect.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAC9C,mCAAgC;AAEhC,0FAAuF;AACvF,2DAA6C;AAEtC,MAAM,eAAe,GAAG,CAC7B,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE;IACpC,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,yDAA2B,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,IAAA,0BAAM,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAExC,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;AACrC,CAAC,CAAC,CACH,CAAC;AAhBS,QAAA,eAAe,mBAgBxB"}
+{"version":3,"file":"read-as-raw-binary.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-raw-binary.effect.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,kDAAgD;AAEzC,MAAM,eAAe,GAAG,CAC7B,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE;IACpC,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,IAAA,aAAI,EACF,IAAA,oBAAS,EAAC,UAAU,EAAE,WAAW,CAAC,EAClC,eAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CACnD,CACF,CAAC;AAXS,QAAA,eAAe,mBAWxB"}

package/cjs/r2/implementations/read-as-text.effect.js

@@ -1,18 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAsText = void 0;
-const platform_1 = require("@effect/platform");
 const effect_1 = require("effect");
-const r2_file_storage_provider_js_1 = require("../providers/r2-file-storage.provider.js");
-const get_url_effect_js_1 = require("./get-url.effect.js");
+const index_js_1 = require("./internal/index.js");
 const readAsText = (bucketName, documentKey) => effect_1.Effect.withSpan('read-as-text', {
     attributes: { bucketName, documentKey },
-})(effect_1.Effect.gen(function* () {
-    const provider = yield* r2_file_storage_provider_js_1.cloudflareR2StorageProvider;
-    const url = yield* (0, get_url_effect_js_1.getUrl)(provider, bucketName, documentKey);
-    const client = yield* platform_1.HttpClient.HttpClient;
-    const response = yield* client.get(url);
-    return yield* response.text;
-}));
+})((0, effect_1.pipe)((0, index_js_1.fetchFile)(bucketName, documentKey), effect_1.Effect.flatMap((response) => response.text)));
 exports.readAsText = readAsText;
 //# sourceMappingURL=read-as-text.effect.js.map

package/cjs/r2/implementations/read-as-text.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-as-text.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-text.effect.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAC9C,mCAAgC;AAEhC,0FAAuF;AACvF,2DAA6C;AAEtC,MAAM,UAAU,GAAG,CACxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;IAC9B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,eAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,yDAA2B,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,IAAA,0BAAM,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAExC,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;AAC9B,CAAC,CAAC,CACH,CAAC;AAhBS,QAAA,UAAU,cAgBnB"}
+{"version":3,"file":"read-as-text.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-text.effect.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,kDAAgD;AAEzC,MAAM,UAAU,GAAG,CACxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;IAC9B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,IAAA,aAAI,EACF,IAAA,oBAAS,EAAC,UAAU,EAAE,WAAW,CAAC,EAClC,eAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC5C,CACF,CAAC;AAXS,QAAA,UAAU,cAWnB"}

package/cjs/r2/implementations/upload-file.effect.js

@@ -5,13 +5,13 @@ const client_s3_1 = require("@aws-sdk/client-s3");
 const effect_1 = require("effect");
 const file_storage_error_js_1 = require("../../errors/file-storage.error.js");
 const r2_file_storage_provider_js_1 = require("../providers/r2-file-storage.provider.js");
-const uploadFile = ({ bucketName, key, data, contentType, }) => effect_1.Effect.withSpan('upload-file', {
-    attributes: { bucketName, key, contentType },
+const uploadFile = ({ bucketName, documentKey, data, contentType, }) => effect_1.Effect.withSpan('upload-file', {
+    attributes: { bucketName, documentKey, contentType },
 })((0, effect_1.pipe)(r2_file_storage_provider_js_1.cloudflareR2StorageProvider, effect_1.Effect.flatMap((provider) => effect_1.Effect.tryPromise({
     try: () => provider.send(new client_s3_1.PutObjectCommand({
         Body: data,
         ContentType: contentType,
-        Key: key,
+        Key: documentKey,
         Bucket: bucketName,
     })),
     catch: (e) => new file_storage_error_js_1.FileStorageError({ cause: e }),

package/cjs/r2/implementations/upload-file.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-file.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/upload-file.effect.ts"],"names":[],"mappings":";;;AAAA,kDAAsD;AACtD,mCAAsC;AAEtC,8EAAsE;AACtE,0FAAuF;AAShF,MAAM,UAAU,GAAG,CAAyB,EACjD,UAAU,EACV,GAAG,EACH,IAAI,EACJ,WAAW,GACc,EAAE,EAAE,CAC7B,eAAM,CAAC,QAAQ,CAAC,aAAa,EAAE;IAC7B,UAAU,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE;CAC7C,CAAC,CACA,IAAA,aAAI,EACF,yDAA2B,EAC3B,eAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC1B,eAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CACR,QAAQ,CAAC,IAAI,CACX,IAAI,4BAAgB,CAAC;QACnB,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,WAAqB;QAClC,GAAG,EAAE,GAAG;QACR,MAAM,EAAE,UAAU;KACnB,CAAC,CACH;IACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,wCAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;CACjD,CAAC,CACH,CACF,CACF,CAAC;AA1BS,QAAA,UAAU,cA0BnB"}
+{"version":3,"file":"upload-file.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/upload-file.effect.ts"],"names":[],"mappings":";;;AAAA,kDAAsD;AACtD,mCAAsC;AAEtC,8EAAsE;AACtE,0FAAuF;AAShF,MAAM,UAAU,GAAG,CAAyB,EACjD,UAAU,EACV,WAAW,EACX,IAAI,EACJ,WAAW,GACc,EAAE,EAAE,CAC7B,eAAM,CAAC,QAAQ,CAAC,aAAa,EAAE;IAC7B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE;CACrD,CAAC,CACA,IAAA,aAAI,EACF,yDAA2B,EAC3B,eAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC1B,eAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CACR,QAAQ,CAAC,IAAI,CACX,IAAI,4BAAgB,CAAC;QACnB,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,WAAqB;QAClC,GAAG,EAAE,WAAW;QAChB,MAAM,EAAE,UAAU;KACnB,CAAC,CACH;IACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,wCAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;CACjD,CAAC,CACH,CACF,CACF,CAAC;AA1BS,QAAA,UAAU,cA0BnB"}

package/cjs/r2/r2-file-storage.layer.js

@@ -4,14 +4,11 @@ exports.CloudflareR2StorageLayerLive = void 0;
 const effect_1 = require("effect");
 const file_storage_layer_js_1 = require("../layer/file-storage.layer.js");
 const index_js_1 = require("./implementations/index.js");
-const read_as_json_effect_js_1 = require("./implementations/read-as-json.effect.js");
-const read_as_raw_binary_effect_js_1 = require("./implementations/read-as-raw-binary.effect.js");
-const read_as_text_effect_js_1 = require("./implementations/read-as-text.effect.js");
 exports.CloudflareR2StorageLayerLive = effect_1.Layer.succeed(file_storage_layer_js_1.FileStorageLayerContext, file_storage_layer_js_1.FileStorageLayerContext.of({
     getFileUrl: index_js_1.getFileUrl,
     uploadFile: index_js_1.uploadFile,
-    readAsText: read_as_text_effect_js_1.readAsText,
-    readAsJson: read_as_json_effect_js_1.readAsJson,
-    readAsRawBinary: read_as_raw_binary_effect_js_1.readAsRawBinary,
+    readAsText: index_js_1.readAsText,
+    readAsJson: index_js_1.readAsJson,
+    readAsRawBinary: index_js_1.readAsRawBinary,
 }));
 //# sourceMappingURL=r2-file-storage.layer.js.map

package/cjs/r2/r2-file-storage.layer.js.map

@@ -1 +1 @@
-{"version":3,"file":"r2-file-storage.layer.js","sourceRoot":"","sources":["../../../src/r2/r2-file-storage.layer.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAE/B,0EAAyE;AACzE,yDAAoE;AACpE,qFAAsE;AACtE,iGAAiF;AACjF,qFAAsE;AAEzD,QAAA,4BAA4B,GAAG,cAAK,CAAC,OAAO,CACvD,+CAAuB,EACvB,+CAAuB,CAAC,EAAE,CAAC;IACzB,UAAU,EAAV,qBAAU;IACV,UAAU,EAAV,qBAAU;IACV,UAAU,EAAV,mCAAU;IACV,UAAU,EAAV,mCAAU;IACV,eAAe,EAAf,8CAAe;CAChB,CAAC,CACH,CAAC"}
+{"version":3,"file":"r2-file-storage.layer.js","sourceRoot":"","sources":["../../../src/r2/r2-file-storage.layer.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAE/B,0EAAyE;AACzE,yDAMoC;AAEvB,QAAA,4BAA4B,GAAG,cAAK,CAAC,OAAO,CACvD,+CAAuB,EACvB,+CAAuB,CAAC,EAAE,CAAC;IACzB,UAAU,EAAV,qBAAU;IACV,UAAU,EAAV,qBAAU;IACV,UAAU,EAAV,qBAAU;IACV,UAAU,EAAV,qBAAU;IACV,eAAe,EAAf,0BAAe;CAChB,CAAC,CACH,CAAC"}

package/esm/dts/index.d.ts

@@ -3,3 +3,4 @@ import { FileStorageLayer } from './layer/file-storage.layer.js';
 export { FileStorageLayer };
 export type { FileStorage };
 export * from './r2/r2-file-storage.layer.js';
+export type { PutObjectCommandOutput } from '@aws-sdk/client-s3';

package/esm/dts/layer/file-storage.layer.d.ts

@@ -1,22 +1,23 @@
 import { HttpClientError } from '@effect/platform/HttpClientError';
 import type { ConfigError, Effect } from 'effect';
 import { Context } from 'effect';
+import { PutObjectCommandOutput } from '@aws-sdk/client-s3';
 import { HttpClient } from '@effect/platform';
 import { Scope } from 'effect/Scope';
 import type { FileStorageError } from '../errors/file-storage.error.js';
-import type { UploadFileInput } from '../r2/implementations/upload-file.effect.js';
+import type { UploadFileInput } from '../r2/implementations/index.js';
 export interface FileStorage {
     readonly getFileUrl: <TBucket extends string>(fileName: string, bucket: TBucket) => Effect.Effect<string, FileStorageError | ConfigError.ConfigError>;
     readonly readAsRawBinary: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<ArrayBuffer, ConfigError.ConfigError | HttpClientError | FileStorageError, Scope | HttpClient.HttpClient.Service>;
     readonly readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucketName: TBucket, documentKey: string) => Effect.Effect<TShape, ConfigError.ConfigError | HttpClientError | FileStorageError, Scope | HttpClient.HttpClient.Service>;
     readonly readAsText: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<string, ConfigError.ConfigError | HttpClientError | FileStorageError, Scope | HttpClient.HttpClient.Service>;
-    readonly uploadFile: <TBucket extends string>(input: UploadFileInput<TBucket>) => Effect.Effect<void, FileStorageError | ConfigError.ConfigError>;
+    readonly uploadFile: <TBucket extends string>({ bucketName, documentKey, data, contentType, }: UploadFileInput<TBucket>) => Effect.Effect<PutObjectCommandOutput, ConfigError.ConfigError | FileStorageError, never>;
 }
 export declare const FileStorageLayerContext: Context.Tag<FileStorage, FileStorage>;
 export declare const FileStorageLayer: {
     getFileUrl: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<string, FileStorageError | ConfigError.ConfigError, FileStorage>;
-    readAsRawBinary: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<ArrayBuffer, FileStorageError | ConfigError.ConfigError | HttpClientError, FileStorage | Scope | HttpClient.HttpClient.Service>;
-    readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucket: TBucket, fileName: string) => Effect.Effect<TShape, FileStorageError | ConfigError.ConfigError | HttpClientError, FileStorage | Scope | HttpClient.HttpClient.Service>;
-    readAsText: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<string, FileStorageError | ConfigError.ConfigError | HttpClientError, FileStorage | Scope | HttpClient.HttpClient.Service>;
-    uploadFile: <TBucket extends string>(input: UploadFileInput<TBucket>) => Effect.Effect<void, FileStorageError | ConfigError.ConfigError, FileStorage>;
+    readAsRawBinary: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<ArrayBuffer, FileStorageError | ConfigError.ConfigError | HttpClientError, Scope | HttpClient.HttpClient.Service | FileStorage>;
+    readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucket: TBucket, fileName: string) => Effect.Effect<TShape, FileStorageError | ConfigError.ConfigError | HttpClientError, Scope | HttpClient.HttpClient.Service | FileStorage>;
+    readAsText: <TBucket extends string>(bucket: TBucket, fileName: string) => Effect.Effect<string, FileStorageError | ConfigError.ConfigError | HttpClientError, Scope | HttpClient.HttpClient.Service | FileStorage>;
+    uploadFile: <TBucket extends string>(input: UploadFileInput<TBucket>) => Effect.Effect<PutObjectCommandOutput, FileStorageError | ConfigError.ConfigError, FileStorage>;
 };

package/esm/dts/r2/implementations/index.d.ts

@@ -1,2 +1,5 @@
 export * from './get-file-url.effect.js';
 export * from './upload-file.effect.js';
+export * from './read-as-json.effect.js';
+export * from './read-as-raw-binary.effect.js';
+export * from './read-as-text.effect.js';

package/esm/dts/r2/implementations/internal/fetch-file.effect.d.ts

@@ -0,0 +1,3 @@
+import { HttpClient } from '@effect/platform';
+import { Effect } from 'effect';
+export declare const fetchFile: (bucketName: string, documentKey: string) => Effect.Effect<import("@effect/platform/HttpClientResponse").HttpClientResponse, import("../../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | HttpClient.HttpClient.Service>;

package/esm/dts/r2/implementations/{get-url.effect.d.ts → internal/get-url.effect.d.ts}

@@ -1,4 +1,4 @@
 import type { S3Client } from '@aws-sdk/client-s3';
 import { Effect } from 'effect';
-import { FileStorageError } from '../../errors/file-storage.error.js';
+import { FileStorageError } from '../../../errors/file-storage.error.js';
 export declare const getUrl: <TBucket extends string>(provider: S3Client, bucketName: TBucket, documentKey: TBucket) => Effect.Effect<string, FileStorageError, never>;

package/esm/dts/r2/implementations/internal/index.d.ts

@@ -0,0 +1,2 @@
+export * from './fetch-file.effect.js';
+export * from './get-url.effect.js';

package/esm/dts/r2/implementations/read-as-json.effect.d.ts

@@ -1,3 +1,2 @@
-import { HttpClient } from '@effect/platform';
 import { Effect } from 'effect';
-export declare const readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucketName: TBucket, documentKey: string) => Effect.Effect<TShape, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | HttpClient.HttpClient.Service>;
+export declare const readAsJson: <TBucket extends string, TShape extends Record<string, unknown>>(bucketName: TBucket, documentKey: string) => Effect.Effect<TShape, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | import("@effect/platform/HttpClient").HttpClient.Service>;

package/esm/dts/r2/implementations/read-as-raw-binary.effect.d.ts

@@ -1,3 +1,2 @@
-import { HttpClient } from '@effect/platform';
 import { Effect } from 'effect';
-export declare const readAsRawBinary: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<ArrayBuffer, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | HttpClient.HttpClient.Service>;
+export declare const readAsRawBinary: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<ArrayBuffer, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | import("@effect/platform/HttpClient").HttpClient.Service>;

package/esm/dts/r2/implementations/read-as-text.effect.d.ts

@@ -1,3 +1,2 @@
-import { HttpClient } from '@effect/platform';
 import { Effect } from 'effect';
-export declare const readAsText: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<string, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | HttpClient.HttpClient.Service>;
+export declare const readAsText: <TBucket extends string>(bucketName: TBucket, documentKey: string) => Effect.Effect<string, import("../../errors/file-storage.error.js").FileStorageError | import("effect/ConfigError").ConfigError | import("@effect/platform/HttpClientError").HttpClientError, import("effect/Scope").Scope | import("@effect/platform/HttpClient").HttpClient.Service>;

package/esm/dts/r2/implementations/upload-file.effect.d.ts

@@ -2,8 +2,8 @@ import { Effect } from 'effect';
 import { FileStorageError } from '../../errors/file-storage.error.js';
 export interface UploadFileInput<TBucket extends string> {
     bucketName: TBucket;
-    key: string;
+    documentKey: string;
     data: Buffer;
     contentType: string | undefined;
 }
-export declare const uploadFile: <TBucket extends string>({ bucketName, key, data, contentType, }: UploadFileInput<TBucket>) => Effect.Effect<import("@aws-sdk/client-s3").PutObjectCommandOutput, FileStorageError | import("effect/ConfigError").ConfigError, never>;
+export declare const uploadFile: <TBucket extends string>({ bucketName, documentKey, data, contentType, }: UploadFileInput<TBucket>) => Effect.Effect<import("@aws-sdk/client-s3").PutObjectCommandOutput, FileStorageError | import("effect/ConfigError").ConfigError, never>;

package/esm/layer/file-storage.layer.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-storage.layer.js","sourceRoot":"","sources":["../../../src/layer/file-storage.layer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAMjC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAuC3D,MAAM,CAAC,MAAM,uBAAuB,GAClC,OAAO,CAAC,UAAU,CAAc,cAAc,CAAC,CAAC;AAElD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,UAAU,EAAE,CAAyB,MAAe,EAAE,QAAgB,EAAE,EAAE,CACxE,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7B;IACH,eAAe,EAAE,CACf,MAAe,EACf,QAAgB,EAChB,EAAE,CACF,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CACxD,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAClC;IACH,UAAU,EAAE,CACV,MAAe,EACf,QAAgB,EAChB,EAAE,CACF,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAkB,MAAM,EAAE,QAAQ,CAAC,CAC9C;IACH,UAAU,EAAE,CAAyB,MAAe,EAAE,QAAgB,EAAE,EAAE,CACxE,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7B;IACH,UAAU,EAAE,CAAyB,KAA+B,EAAE,EAAE,CACtE,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;CAC3E,CAAC"}
+{"version":3,"file":"file-storage.layer.js","sourceRoot":"","sources":["../../../src/layer/file-storage.layer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAOjC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AA8C3D,MAAM,CAAC,MAAM,uBAAuB,GAClC,OAAO,CAAC,UAAU,CAAc,cAAc,CAAC,CAAC;AAElD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,UAAU,EAAE,CAAyB,MAAe,EAAE,QAAgB,EAAE,EAAE,CACxE,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7B;IACH,eAAe,EAAE,CACf,MAAe,EACf,QAAgB,EAChB,EAAE,CACF,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CACxD,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAClC;IACH,UAAU,EAAE,CACV,MAAe,EACf,QAAgB,EAChB,EAAE,CACF,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAkB,MAAM,EAAE,QAAQ,CAAC,CAC9C;IACH,UAAU,EAAE,CAAyB,MAAe,EAAE,QAAgB,EAAE,EAAE,CACxE,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CACnD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAC7B;IACH,UAAU,EAAE,CAAyB,KAA+B,EAAE,EAAE,CACtE,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;CAC3E,CAAC"}

package/esm/r2/implementations/get-file-url.effect.js

@@ -1,5 +1,5 @@
 import { Effect, pipe } from 'effect';
 import { cloudflareR2StorageProvider } from '../providers/r2-file-storage.provider.js';
-import { getUrl } from './get-url.effect.js';
+import { getUrl } from './internal/get-url.effect.js';
 export const getFileUrl = (bucketName, documentKey) => Effect.withSpan('get-file-url', { attributes: { bucketName, documentKey } })(pipe(cloudflareR2StorageProvider, Effect.flatMap((provider) => getUrl(provider, bucketName, documentKey))));
 //# sourceMappingURL=get-file-url.effect.js.map

package/esm/r2/implementations/get-file-url.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-file-url.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/get-file-url.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CAC1E,IAAI,CACF,2BAA2B,EAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC,CACxE,CACF,CAAC"}
+{"version":3,"file":"get-file-url.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/get-file-url.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CAC1E,IAAI,CACF,2BAA2B,EAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC,CACxE,CACF,CAAC"}

package/esm/r2/implementations/index.js

@@ -1,3 +1,6 @@
 export * from './get-file-url.effect.js';
 export * from './upload-file.effect.js';
+export * from './read-as-json.effect.js';
+export * from './read-as-raw-binary.effect.js';
+export * from './read-as-text.effect.js';
 //# sourceMappingURL=index.js.map

package/esm/r2/implementations/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/r2/implementations/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/r2/implementations/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC"}

package/esm/r2/implementations/internal/fetch-file.effect.js

@@ -0,0 +1,11 @@
+import { HttpClient } from '@effect/platform';
+import { Effect } from 'effect';
+import { cloudflareR2StorageProvider } from '../../providers/r2-file-storage.provider.js';
+import { getUrl } from './get-url.effect.js';
+export const fetchFile = (bucketName, documentKey) => Effect.gen(function* () {
+    const provider = yield* cloudflareR2StorageProvider;
+    const url = yield* getUrl(provider, bucketName, documentKey);
+    const client = yield* HttpClient.HttpClient;
+    return yield* client.get(url);
+});
+//# sourceMappingURL=fetch-file.effect.js.map

package/esm/r2/implementations/internal/fetch-file.effect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-file.effect.js","sourceRoot":"","sources":["../../../../../src/r2/implementations/internal/fetch-file.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,2BAA2B,EAAE,MAAM,6CAA6C,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,UAAkB,EAAE,WAAmB,EAAE,EAAE,CACnE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,2BAA2B,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;IAC5C,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC"}

package/esm/r2/implementations/{get-url.effect.js → internal/get-url.effect.js}

@@ -1,7 +1,7 @@
 import { GetObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl as awsGetSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { Effect } from 'effect';
-import { FileStorageError } from '../../errors/file-storage.error.js';
+import { FileStorageError } from '../../../errors/file-storage.error.js';
 const oneHourDuration = 60 * 60;
 export const getUrl = (provider, bucketName, documentKey) => Effect.withSpan('get-url', { attributes: { bucketName, documentKey } })(Effect.tryPromise({
     try: () => awsGetSignedUrl(provider, new GetObjectCommand({

package/esm/r2/implementations/internal/get-url.effect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-url.effect.js","sourceRoot":"","sources":["../../../../../src/r2/implementations/internal/get-url.effect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,IAAI,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,CAAC;AAEhC,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,QAAkB,EAClB,UAAmB,EACnB,WAAoB,EACpB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CACrE,MAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CACR,eAAe,CACb,QAAQ,EACR,IAAI,gBAAgB,CAAC;QACnB,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,WAAW;KACjB,CAAC,EACF;QACE,SAAS,EAAE,eAAe;KAC3B,CACF;IACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;CACjD,CAAC,CACH,CAAC"}

package/esm/r2/implementations/internal/index.js

@@ -0,0 +1,3 @@
+export * from './fetch-file.effect.js';
+export * from './get-url.effect.js';
+//# sourceMappingURL=index.js.map

package/esm/r2/implementations/internal/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/r2/implementations/internal/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC"}

package/esm/r2/implementations/read-as-json.effect.js

@@ -1,15 +1,6 @@
-import { HttpClient } from '@effect/platform';
-import { Effect } from 'effect';
-import { cloudflareR2StorageProvider } from '../providers/r2-file-storage.provider.js';
-import { getUrl } from './get-url.effect.js';
+import { Effect, pipe } from 'effect';
+import { fetchFile } from './internal/index.js';
 export const readAsJson = (bucketName, documentKey) => Effect.withSpan('read-as-json', {
     attributes: { bucketName, documentKey },
-})(Effect.gen(function* () {
-    const provider = yield* cloudflareR2StorageProvider;
-    const url = yield* getUrl(provider, bucketName, documentKey);
-    const client = yield* HttpClient.HttpClient;
-    const response = yield* client.get(url);
-    const json = yield* response.json;
-    return json;
-}));
+})(pipe(fetchFile(bucketName, documentKey), Effect.flatMap((response) => response.json), Effect.map((json) => json)));
 //# sourceMappingURL=read-as-json.effect.js.map

package/esm/r2/implementations/read-as-json.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-as-json.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-json.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,CAAC,MAAM,UAAU,GAAG,CAIxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;IAC9B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,2BAA2B,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAExC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAElC,OAAO,IAAc,CAAC;AACxB,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"read-as-json.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-json.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,CAIxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;IAC9B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,IAAI,CACF,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC3C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CAAC,CACrC,CACF,CAAC"}

package/esm/r2/implementations/read-as-raw-binary.effect.js

@@ -1,14 +1,6 @@
-import { HttpClient } from '@effect/platform';
-import { Effect } from 'effect';
-import { cloudflareR2StorageProvider } from '../providers/r2-file-storage.provider.js';
-import { getUrl } from './get-url.effect.js';
+import { Effect, pipe } from 'effect';
+import { fetchFile } from './internal/index.js';
 export const readAsRawBinary = (bucketName, documentKey) => Effect.withSpan('read-as-raw-binary', {
     attributes: { bucketName, documentKey },
-})(Effect.gen(function* () {
-    const provider = yield* cloudflareR2StorageProvider;
-    const url = yield* getUrl(provider, bucketName, documentKey);
-    const client = yield* HttpClient.HttpClient;
-    const response = yield* client.get(url);
-    return yield* response.arrayBuffer;
-}));
+})(pipe(fetchFile(bucketName, documentKey), Effect.flatMap((response) => response.arrayBuffer)));
 //# sourceMappingURL=read-as-raw-binary.effect.js.map

package/esm/r2/implementations/read-as-raw-binary.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-as-raw-binary.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-raw-binary.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE;IACpC,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,2BAA2B,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAExC,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;AACrC,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"read-as-raw-binary.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-raw-binary.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE;IACpC,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,IAAI,CACF,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CACnD,CACF,CAAC"}

package/esm/r2/implementations/read-as-text.effect.js

@@ -1,14 +1,6 @@
-import { HttpClient } from '@effect/platform';
-import { Effect } from 'effect';
-import { cloudflareR2StorageProvider } from '../providers/r2-file-storage.provider.js';
-import { getUrl } from './get-url.effect.js';
+import { Effect, pipe } from 'effect';
+import { fetchFile } from './internal/index.js';
 export const readAsText = (bucketName, documentKey) => Effect.withSpan('read-as-text', {
     attributes: { bucketName, documentKey },
-})(Effect.gen(function* () {
-    const provider = yield* cloudflareR2StorageProvider;
-    const url = yield* getUrl(provider, bucketName, documentKey);
-    const client = yield* HttpClient.HttpClient;
-    const response = yield* client.get(url);
-    return yield* response.text;
-}));
+})(pipe(fetchFile(bucketName, documentKey), Effect.flatMap((response) => response.text)));
 //# sourceMappingURL=read-as-text.effect.js.map

package/esm/r2/implementations/read-as-text.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-as-text.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-text.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;IAC9B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,2BAA2B,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAExC,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;AAC9B,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"read-as-text.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/read-as-text.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,UAAmB,EACnB,WAAmB,EACnB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;IAC9B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;CACxC,CAAC,CACA,IAAI,CACF,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC5C,CACF,CAAC"}

package/esm/r2/implementations/upload-file.effect.js

@@ -2,13 +2,13 @@ import { PutObjectCommand } from '@aws-sdk/client-s3';
 import { Effect, pipe } from 'effect';
 import { FileStorageError } from '../../errors/file-storage.error.js';
 import { cloudflareR2StorageProvider } from '../providers/r2-file-storage.provider.js';
-export const uploadFile = ({ bucketName, key, data, contentType, }) => Effect.withSpan('upload-file', {
-    attributes: { bucketName, key, contentType },
+export const uploadFile = ({ bucketName, documentKey, data, contentType, }) => Effect.withSpan('upload-file', {
+    attributes: { bucketName, documentKey, contentType },
 })(pipe(cloudflareR2StorageProvider, Effect.flatMap((provider) => Effect.tryPromise({
     try: () => provider.send(new PutObjectCommand({
         Body: data,
         ContentType: contentType,
-        Key: key,
+        Key: documentKey,
         Bucket: bucketName,
     })),
     catch: (e) => new FileStorageError({ cause: e }),

package/esm/r2/implementations/upload-file.effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-file.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/upload-file.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AASvF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAyB,EACjD,UAAU,EACV,GAAG,EACH,IAAI,EACJ,WAAW,GACc,EAAE,EAAE,CAC7B,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE;IAC7B,UAAU,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE;CAC7C,CAAC,CACA,IAAI,CACF,2BAA2B,EAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC1B,MAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CACR,QAAQ,CAAC,IAAI,CACX,IAAI,gBAAgB,CAAC;QACnB,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,WAAqB;QAClC,GAAG,EAAE,GAAG;QACR,MAAM,EAAE,UAAU;KACnB,CAAC,CACH;IACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;CACjD,CAAC,CACH,CACF,CACF,CAAC"}
+{"version":3,"file":"upload-file.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/upload-file.effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AASvF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAyB,EACjD,UAAU,EACV,WAAW,EACX,IAAI,EACJ,WAAW,GACc,EAAE,EAAE,CAC7B,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE;IAC7B,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE;CACrD,CAAC,CACA,IAAI,CACF,2BAA2B,EAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC1B,MAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CACR,QAAQ,CAAC,IAAI,CACX,IAAI,gBAAgB,CAAC;QACnB,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,WAAqB;QAClC,GAAG,EAAE,WAAW;QAChB,MAAM,EAAE,UAAU;KACnB,CAAC,CACH;IACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;CACjD,CAAC,CACH,CACF,CACF,CAAC"}

package/esm/r2/r2-file-storage.layer.js

@@ -1,9 +1,6 @@
 import { Layer } from 'effect';
 import { FileStorageLayerContext } from '../layer/file-storage.layer.js';
-import { getFileUrl, uploadFile } from './implementations/index.js';
-import { readAsJson } from './implementations/read-as-json.effect.js';
-import { readAsRawBinary } from './implementations/read-as-raw-binary.effect.js';
-import { readAsText } from './implementations/read-as-text.effect.js';
+import { getFileUrl, readAsJson, readAsRawBinary, readAsText, uploadFile, } from './implementations/index.js';
 export const CloudflareR2StorageLayerLive = Layer.succeed(FileStorageLayerContext, FileStorageLayerContext.of({
     getFileUrl,
     uploadFile,

package/esm/r2/r2-file-storage.layer.js.map

@@ -1 +1 @@
-{"version":3,"file":"r2-file-storage.layer.js","sourceRoot":"","sources":["../../../src/r2/r2-file-storage.layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAEtE,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,CAAC,OAAO,CACvD,uBAAuB,EACvB,uBAAuB,CAAC,EAAE,CAAC;IACzB,UAAU;IACV,UAAU;IACV,UAAU;IACV,UAAU;IACV,eAAe;CAChB,CAAC,CACH,CAAC"}
+{"version":3,"file":"r2-file-storage.layer.js","sourceRoot":"","sources":["../../../src/r2/r2-file-storage.layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,UAAU,EACV,UAAU,GACX,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,CAAC,OAAO,CACvD,uBAAuB,EACvB,uBAAuB,CAAC,EAAE,CAAC;IACzB,UAAU;IACV,UAAU;IACV,UAAU;IACV,UAAU;IACV,eAAe;CAChB,CAAC,CACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cloudflare-r2-layer",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "jpb06 <jp.bois.06@outlook.fr>",
   "description": "An effect layer to interact with Cloudware R2 storage service",
   "keywords": [

package/cjs/r2/implementations/get-url.effect.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-url.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/get-url.effect.ts"],"names":[],"mappings":";;;AACA,kDAAsD;AACtD,wEAAgF;AAChF,mCAAgC;AAEhC,8EAAsE;AAEtE,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,CAAC;AAEzB,MAAM,MAAM,GAAG,CACpB,QAAkB,EAClB,UAAmB,EACnB,WAAoB,EACpB,EAAE,CACF,eAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CACrE,eAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CACR,IAAA,mCAAe,EACb,QAAQ,EACR,IAAI,4BAAgB,CAAC;QACnB,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,WAAW;KACjB,CAAC,EACF;QACE,SAAS,EAAE,eAAe;KAC3B,CACF;IACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,wCAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;CACjD,CAAC,CACH,CAAC;AApBS,QAAA,MAAM,UAoBf"}

package/esm/r2/implementations/get-url.effect.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-url.effect.js","sourceRoot":"","sources":["../../../../src/r2/implementations/get-url.effect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,IAAI,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,CAAC;AAEhC,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,QAAkB,EAClB,UAAmB,EACnB,WAAoB,EACpB,EAAE,CACF,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CACrE,MAAM,CAAC,UAAU,CAAC;IAChB,GAAG,EAAE,GAAG,EAAE,CACR,eAAe,CACb,QAAQ,EACR,IAAI,gBAAgB,CAAC;QACnB,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,WAAW;KACjB,CAAC,EACF;QACE,SAAS,EAAE,eAAe;KAC3B,CACF;IACH,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;CACjD,CAAC,CACH,CAAC"}