@edgestore/server 0.1.5-alpha.0 → 0.1.5-alpha.2

package/dist/adapters/next/app/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var shared = require('../../../shared-306c1af2.js');
+var shared = require('../../../shared-5d1e7f43.js');
 var providers_edgestore_index = require('../../../providers/edgestore/index.js');
 require('@panva/hkdf');
 require('cookie');

package/dist/adapters/next/app/index.mjs

@@ -1,4 +1,4 @@
-import { i as init, r as requestUpload, a as requestUploadParts, c as completeMultipartUpload, b as confirmUpload, d as deleteFile, E as EdgeStoreError, e as EDGE_STORE_ERROR_CODES } from '../../../shared-6dea9e91.mjs';
+import { i as init, r as requestUpload, a as requestUploadParts, c as completeMultipartUpload, d as confirmUpload, e as deleteFile, E as EdgeStoreError, f as EDGE_STORE_ERROR_CODES } from '../../../shared-30b7a2ab.mjs';
 import { EdgeStoreProvider } from '../../../providers/edgestore/index.mjs';
 import '@panva/hkdf';
 import 'cookie';

package/dist/adapters/next/pages/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var shared = require('../../../shared-306c1af2.js');
+var shared = require('../../../shared-5d1e7f43.js');
 var providers_edgestore_index = require('../../../providers/edgestore/index.js');
 require('@panva/hkdf');
 require('cookie');

package/dist/adapters/next/pages/index.mjs

@@ -1,4 +1,4 @@
-import { i as init, r as requestUpload, a as requestUploadParts, c as completeMultipartUpload, b as confirmUpload, d as deleteFile, E as EdgeStoreError, e as EDGE_STORE_ERROR_CODES } from '../../../shared-6dea9e91.mjs';
+import { i as init, r as requestUpload, a as requestUploadParts, c as completeMultipartUpload, d as confirmUpload, e as deleteFile, E as EdgeStoreError, f as EDGE_STORE_ERROR_CODES } from '../../../shared-30b7a2ab.mjs';
 import { EdgeStoreProvider } from '../../../providers/edgestore/index.mjs';
 import '@panva/hkdf';
 import 'cookie';

package/dist/adapters/shared.d.ts

@@ -1,4 +1,4 @@
-import { type EdgeStoreRouter } from '../core/internals/bucketBuilder';
+import { type AnyBuilder, type EdgeStoreRouter } from '../core/internals/bucketBuilder';
 import { type Provider } from '../providers/types';
 export declare function init<TCtx>(params: {
     provider: Provider;
@@ -102,6 +102,24 @@ export declare function deleteFile<TCtx>(params: {
     ctxToken: string | undefined;
     body: DeleteFileBody;
 }): Promise<import("../providers/types").DeleteFileRes>;
+export declare function buildPath(params: {
+    fileInfo: RequestUploadBody['fileInfo'];
+    bucket: AnyBuilder;
+    pathAttrs: {
+        ctx: any;
+        input: any;
+    };
+}): {
+    key: string;
+    value: string;
+}[];
+export declare function parsePath(path: {
+    key: string;
+    value: string;
+}[]): {
+    parsedPath: Record<string, string>;
+    pathOrder: string[];
+};
 export type InitRes = Awaited<ReturnType<typeof init>>;
 export type RequestUploadRes = Awaited<ReturnType<typeof requestUpload>>;
 export type RequestUploadPartsRes = Awaited<ReturnType<typeof requestUploadParts>>;

package/dist/adapters/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/adapters/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/adapters/shared.ts"],"names":[],"mappings":"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"}

package/dist/core/client/index.d.ts

@@ -1,5 +1,6 @@
+import { type z, type ZodNever } from 'zod';
 import { type AnyRouter, type Comparison } from '..';
-import { type Simplify } from '../../types';
+import { type Prettify, type Simplify } from '../../types';
 import { type AnyBuilder, type InferBucketPathKeys, type InferBucketPathObject, type InferMetadataObject } from '../internals/bucketBuilder';
 export type GetFileRes<TBucket extends AnyBuilder> = {
     url: string;
@@ -8,6 +9,53 @@ export type GetFileRes<TBucket extends AnyBuilder> = {
     metadata: InferMetadataObject<TBucket>;
     path: InferBucketPathObject<TBucket>;
 };
+export type UploadOptions = {
+    /**
+     * e.g. 'my-file-name.jpg'
+     *
+     * By default, a unique file name will be generated for each upload.
+     * If you want to use a custom file name, you can use this option.
+     * If you use the same file name for multiple uploads, the previous file will be overwritten.
+     * But it might take some time for the CDN cache to be cleared.
+     * So maybe you will keep seeing the old file for a while.
+     *
+     * If you want to replace an existing file immediately leave the `manualFileName` option empty and use the `replaceTargetUrl` option.
+     */
+    manualFileName?: string;
+    /**
+     * Use this to replace an existing file.
+     * It will automatically delete the existing file when the upload is complete.
+     */
+    replaceTargetUrl?: string;
+    /**
+     * If true, the file needs to be confirmed by using the `confirmUpload` function.
+     * If the file is not confirmed within 24 hours, it will be deleted.
+     *
+     * This is useful for pages where the file is uploaded as soon as it is selected,
+     * but the user can leave the page without submitting the form.
+     *
+     * This avoids unnecessary zombie files in the bucket.
+     */
+    temporary?: boolean;
+};
+export type UploadFileRequest<TBucket extends AnyBuilder> = {
+    content: string | {
+        blob: Blob;
+        extension: string;
+    };
+    options?: UploadOptions;
+} & (TBucket['$config']['ctx'] extends Record<string, never> ? {} : {
+    ctx: TBucket['$config']['ctx'];
+}) & (TBucket['_def']['input'] extends ZodNever ? {} : {
+    input: z.infer<TBucket['_def']['input']>;
+});
+export type UploadFileRes<TBucket extends AnyBuilder> = {
+    url: string;
+    size: number;
+    metadata: InferMetadataObject<TBucket>;
+    path: InferBucketPathObject<TBucket>;
+    pathOrder: (keyof InferBucketPathObject<TBucket>)[];
+};
 type Filter<TBucket extends AnyBuilder> = {
     AND?: Filter<TBucket>[];
     OR?: Filter<TBucket>[];
@@ -52,6 +100,7 @@ type EdgeStoreClient<TRouter extends AnyRouter> = {
         getFile: (params: {
             url: string;
         }) => Promise<GetFileRes<TRouter['buckets'][K]>>;
+        upload: (params: UploadFileRequest<TRouter['buckets'][K]>) => Promise<Prettify<UploadFileRes<TRouter['buckets'][K]>>>;
         /**
          * Confirm a temporary file upload.
          */

package/dist/core/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/client/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/client/index.ts"],"names":[],"mappings":"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"}

package/dist/core/index.js

@@ -2,7 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var shared = require('../shared-5d1e7f43.js');
 var index = require('../index-50ab9e08.js');
+require('@panva/hkdf');
+require('cookie');
+require('jose');
+require('uuid');
+require('@swc/helpers/_/_define_property');
 
 function initEdgeStoreClient(config) {
     const sdk = index.initEdgeStoreSdk({
@@ -17,6 +23,82 @@ function initEdgeStoreClient(config) {
                 throw new Error(`Bucket ${bucketName} not found`);
             }
             const client = {
+                async upload (params) {
+                    const content = params.content;
+                    const ctx = 'ctx' in params ? params.ctx : {};
+                    const input = 'input' in params ? params.input : {};
+                    const { blob, extension } = (()=>{
+                        if (typeof content === 'string') {
+                            return {
+                                blob: new Blob([
+                                    content
+                                ], {
+                                    type: 'text/plain'
+                                }),
+                                extension: 'txt'
+                            };
+                        } else {
+                            return {
+                                blob: content.blob,
+                                extension: content.extension
+                            };
+                        }
+                    })();
+                    const path = shared.buildPath({
+                        bucket,
+                        pathAttrs: {
+                            ctx,
+                            input
+                        },
+                        fileInfo: {
+                            type: blob.type,
+                            size: blob.size,
+                            extension,
+                            temporary: false,
+                            fileName: params.options?.manualFileName,
+                            replaceTargetUrl: params.options?.replaceTargetUrl
+                        }
+                    });
+                    const metadata = await bucket._def.metadata({
+                        ctx,
+                        input
+                    });
+                    const requestUploadRes = await sdk.requestUpload({
+                        bucketName,
+                        bucketType: bucket._def.type,
+                        fileInfo: {
+                            fileName: params.options?.manualFileName,
+                            replaceTargetUrl: params.options?.replaceTargetUrl,
+                            type: blob.type,
+                            size: blob.size,
+                            extension,
+                            isPublic: bucket._def.accessControl === undefined,
+                            temporary: params.options?.temporary ?? false,
+                            path,
+                            metadata
+                        }
+                    });
+                    const { signedUrl, multipart } = requestUploadRes;
+                    if (multipart) {
+                        // TODO
+                        throw new Error('Multipart upload not implemented');
+                    } else if (signedUrl) {
+                        await fetch(signedUrl, {
+                            method: 'PUT',
+                            body: blob
+                        });
+                    } else {
+                        throw new Error('Missing signedUrl');
+                    }
+                    const { parsedPath, pathOrder } = shared.parsePath(path);
+                    return {
+                        url: requestUploadRes.accessUrl,
+                        size: blob.size,
+                        metadata,
+                        path: parsedPath,
+                        pathOrder
+                    };
+                },
                 async getFile (params) {
                     const res = await sdk.getFile(params);
                     return {
@@ -27,39 +109,6 @@ function initEdgeStoreClient(config) {
                         path: res.path
                     };
                 },
-                // TODO: Replace with `upload`
-                // async requestUpload(params) {
-                //   const { file, path, metadata, replaceTargetUrl } = params;
-                //   const fileExtension = file.name.includes('.')
-                //     ? file.name.split('.').pop()
-                //     : undefined;
-                //   if (!fileExtension) {
-                //     throw new Error('Missing file extension');
-                //   }
-                //   const parsedPath = Object.keys(bucket._def.path).map((key) => {
-                //     const value = path[key as keyof typeof path];
-                //     if (value === undefined) {
-                //       throw new Error(`Missing path param ${key}`);
-                //     }
-                //     return {
-                //       key,
-                //       value,
-                //     };
-                //   });
-                //   const fileInfo = {
-                //     size: file.size,
-                //     extension: fileExtension,
-                //     isPublic: bucket._def.accessControl === undefined,
-                //     path: parsedPath,
-                //     metadata,
-                //     replaceTargetUrl,
-                //   };
-                //   return await sdk.requestUpload({
-                //     bucketName,
-                //     bucketType: bucket._def.type,
-                //     fileInfo,
-                //   });
-                // },
                 async confirmUpload (params) {
                     return await sdk.confirmUpload(params);
                 },

package/dist/core/index.mjs

@@ -1,5 +1,11 @@
+import { b as buildPath, p as parsePath } from '../shared-30b7a2ab.mjs';
 import { i as initEdgeStoreSdk } from '../index-30a3741e.mjs';
 export { e as edgeStoreRawSdk, i as initEdgeStoreSdk } from '../index-30a3741e.mjs';
+import '@panva/hkdf';
+import 'cookie';
+import 'jose';
+import 'uuid';
+import '@swc/helpers/_/_define_property';
 
 function initEdgeStoreClient(config) {
     const sdk = initEdgeStoreSdk({
@@ -14,6 +20,82 @@ function initEdgeStoreClient(config) {
                 throw new Error(`Bucket ${bucketName} not found`);
             }
             const client = {
+                async upload (params) {
+                    const content = params.content;
+                    const ctx = 'ctx' in params ? params.ctx : {};
+                    const input = 'input' in params ? params.input : {};
+                    const { blob, extension } = (()=>{
+                        if (typeof content === 'string') {
+                            return {
+                                blob: new Blob([
+                                    content
+                                ], {
+                                    type: 'text/plain'
+                                }),
+                                extension: 'txt'
+                            };
+                        } else {
+                            return {
+                                blob: content.blob,
+                                extension: content.extension
+                            };
+                        }
+                    })();
+                    const path = buildPath({
+                        bucket,
+                        pathAttrs: {
+                            ctx,
+                            input
+                        },
+                        fileInfo: {
+                            type: blob.type,
+                            size: blob.size,
+                            extension,
+                            temporary: false,
+                            fileName: params.options?.manualFileName,
+                            replaceTargetUrl: params.options?.replaceTargetUrl
+                        }
+                    });
+                    const metadata = await bucket._def.metadata({
+                        ctx,
+                        input
+                    });
+                    const requestUploadRes = await sdk.requestUpload({
+                        bucketName,
+                        bucketType: bucket._def.type,
+                        fileInfo: {
+                            fileName: params.options?.manualFileName,
+                            replaceTargetUrl: params.options?.replaceTargetUrl,
+                            type: blob.type,
+                            size: blob.size,
+                            extension,
+                            isPublic: bucket._def.accessControl === undefined,
+                            temporary: params.options?.temporary ?? false,
+                            path,
+                            metadata
+                        }
+                    });
+                    const { signedUrl, multipart } = requestUploadRes;
+                    if (multipart) {
+                        // TODO
+                        throw new Error('Multipart upload not implemented');
+                    } else if (signedUrl) {
+                        await fetch(signedUrl, {
+                            method: 'PUT',
+                            body: blob
+                        });
+                    } else {
+                        throw new Error('Missing signedUrl');
+                    }
+                    const { parsedPath, pathOrder } = parsePath(path);
+                    return {
+                        url: requestUploadRes.accessUrl,
+                        size: blob.size,
+                        metadata,
+                        path: parsedPath,
+                        pathOrder
+                    };
+                },
                 async getFile (params) {
                     const res = await sdk.getFile(params);
                     return {
@@ -24,39 +106,6 @@ function initEdgeStoreClient(config) {
                         path: res.path
                     };
                 },
-                // TODO: Replace with `upload`
-                // async requestUpload(params) {
-                //   const { file, path, metadata, replaceTargetUrl } = params;
-                //   const fileExtension = file.name.includes('.')
-                //     ? file.name.split('.').pop()
-                //     : undefined;
-                //   if (!fileExtension) {
-                //     throw new Error('Missing file extension');
-                //   }
-                //   const parsedPath = Object.keys(bucket._def.path).map((key) => {
-                //     const value = path[key as keyof typeof path];
-                //     if (value === undefined) {
-                //       throw new Error(`Missing path param ${key}`);
-                //     }
-                //     return {
-                //       key,
-                //       value,
-                //     };
-                //   });
-                //   const fileInfo = {
-                //     size: file.size,
-                //     extension: fileExtension,
-                //     isPublic: bucket._def.accessControl === undefined,
-                //     path: parsedPath,
-                //     metadata,
-                //     replaceTargetUrl,
-                //   };
-                //   return await sdk.requestUpload({
-                //     bucketName,
-                //     bucketType: bucket._def.type,
-                //     fileInfo,
-                //   });
-                // },
                 async confirmUpload (params) {
                     return await sdk.confirmUpload(params);
                 },

package/dist/providers/aws/index.js

@@ -45,7 +45,7 @@ function AWSProvider(options) {
             const pathPrefix = `${esBucketName}${fileInfo.isPublic ? '/_public' : ''}`;
             const nameId = uuid.v4();
             const extension = fileInfo.extension ? `.${fileInfo.extension.replace('.', '')}` : '';
-            const fileName = `${nameId}${extension}`;
+            const fileName = fileInfo.fileName ?? `${nameId}${extension}`;
             const filePath = fileInfo.path.reduce((acc, item)=>{
                 return `${acc}/${item.value}`;
             }, '');

package/dist/providers/aws/index.mjs

@@ -41,7 +41,7 @@ function AWSProvider(options) {
             const pathPrefix = `${esBucketName}${fileInfo.isPublic ? '/_public' : ''}`;
             const nameId = v4();
             const extension = fileInfo.extension ? `.${fileInfo.extension.replace('.', '')}` : '';
-            const fileName = `${nameId}${extension}`;
+            const fileName = fileInfo.fileName ?? `${nameId}${extension}`;
             const filePath = fileInfo.path.reduce((acc, item)=>{
                 return `${acc}/${item.value}`;
             }, '');

package/dist/providers/types.d.ts

@@ -32,6 +32,7 @@ export type RequestUploadParams = {
         size: number;
         extension: string;
         isPublic: boolean;
+        fileName?: string;
         path: {
             key: string;
             value: string;

package/dist/providers/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/providers/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/providers/types.ts"],"names":[],"mappings":"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"}

package/dist/{shared-6dea9e91.mjs → shared-30b7a2ab.mjs}

@@ -149,11 +149,7 @@ async function requestUpload(params) {
             metadata
         }
     });
-    const parsedPath = path.reduce((acc, curr)=>{
-        acc[curr.key] = curr.value;
-        return acc;
-    }, {});
-    const pathOrder = path.map((p)=>p.key);
+    const { parsedPath, pathOrder } = parsePath(path);
     return {
         ...requestUploadRes,
         size: fileInfo.size,
@@ -297,6 +293,17 @@ function buildPath(params) {
     });
     return path;
 }
+function parsePath(path) {
+    const parsedPath = path.reduce((acc, curr)=>{
+        acc[curr.key] = curr.value;
+        return acc;
+    }, {});
+    const pathOrder = path.map((p)=>p.key);
+    return {
+        parsedPath,
+        pathOrder
+    };
+}
 async function getContext(token) {
     if (!token) {
         throw new Error('No token');
@@ -320,4 +327,4 @@ async function getContext(token) {
     return url;
 }
 
-export { EdgeStoreError as E, requestUploadParts as a, confirmUpload as b, completeMultipartUpload as c, deleteFile as d, EDGE_STORE_ERROR_CODES as e, init as i, requestUpload as r };
+export { EdgeStoreError as E, requestUploadParts as a, buildPath as b, completeMultipartUpload as c, confirmUpload as d, deleteFile as e, EDGE_STORE_ERROR_CODES as f, init as i, parsePath as p, requestUpload as r };

package/dist/{shared-306c1af2.js → shared-5d1e7f43.js}

@@ -151,11 +151,7 @@ async function requestUpload(params) {
             metadata
         }
     });
-    const parsedPath = path.reduce((acc, curr)=>{
-        acc[curr.key] = curr.value;
-        return acc;
-    }, {});
-    const pathOrder = path.map((p)=>p.key);
+    const { parsedPath, pathOrder } = parsePath(path);
     return {
         ...requestUploadRes,
         size: fileInfo.size,
@@ -299,6 +295,17 @@ function buildPath(params) {
     });
     return path;
 }
+function parsePath(path) {
+    const parsedPath = path.reduce((acc, curr)=>{
+        acc[curr.key] = curr.value;
+        return acc;
+    }, {});
+    const pathOrder = path.map((p)=>p.key);
+    return {
+        parsedPath,
+        pathOrder
+    };
+}
 async function getContext(token) {
     if (!token) {
         throw new Error('No token');
@@ -324,9 +331,11 @@ async function getContext(token) {
 
 exports.EDGE_STORE_ERROR_CODES = EDGE_STORE_ERROR_CODES;
 exports.EdgeStoreError = EdgeStoreError;
+exports.buildPath = buildPath;
 exports.completeMultipartUpload = completeMultipartUpload;
 exports.confirmUpload = confirmUpload;
 exports.deleteFile = deleteFile;
 exports.init = init;
+exports.parsePath = parsePath;
 exports.requestUpload = requestUpload;
 exports.requestUploadParts = requestUploadParts;

package/dist/{shared-9fad0d51.js → shared-88655ba7.js}

@@ -141,11 +141,7 @@ async function requestUpload(params) {
             metadata,
         },
     });
-    const parsedPath = path.reduce((acc, curr) => {
-        acc[curr.key] = curr.value;
-        return acc;
-    }, {});
-    const pathOrder = path.map((p) => p.key);
+    const { parsedPath, pathOrder } = parsePath(path);
     return {
         ...requestUploadRes,
         size: fileInfo.size,
@@ -293,6 +289,17 @@ function buildPath(params) {
     });
     return path;
 }
+function parsePath(path) {
+    const parsedPath = path.reduce((acc, curr) => {
+        acc[curr.key] = curr.value;
+        return acc;
+    }, {});
+    const pathOrder = path.map((p) => p.key);
+    return {
+        parsedPath,
+        pathOrder,
+    };
+}
 async function getContext(token) {
     if (!token) {
         throw new Error('No token');
@@ -317,4 +324,4 @@ function unproxyUrl(url) {
     return url;
 }
 
-export { EdgeStoreError as E, requestUploadParts as a, confirmUpload as b, completeMultipartUpload as c, deleteFile as d, EDGE_STORE_ERROR_CODES as e, init as i, requestUpload as r };
+export { EdgeStoreError as E, requestUploadParts as a, buildPath as b, completeMultipartUpload as c, confirmUpload as d, deleteFile as e, EDGE_STORE_ERROR_CODES as f, init as i, parsePath as p, requestUpload as r };

package/dist/types.d.ts

@@ -35,6 +35,12 @@ export type ThenArg<TType> = TType extends PromiseLike<infer U> ? ThenArg<U> : T
 export type Simplify<TType> = TType extends any[] | Date ? TType : {
     [K in keyof TType]: TType[K];
 };
+/**
+ * @internal
+ */
+export type Prettify<TType> = {
+    [K in keyof TType]: TType[K];
+} & {};
 /**
  * @public
  */

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgestore/server",
-  "version": "0.1.5-alpha.0",
+  "version": "0.1.5-alpha.2",
   "description": "Upload files with ease from React/Next.js",
   "homepage": "https://edgestore.dev",
   "repository": "https://github.com/edgestorejs/edgestore.git",
@@ -117,5 +117,5 @@
     "typescript": "^5.1.6",
     "zod": "^3.21.4"
   },
-  "gitHead": "bea31f57147499993eaf25c86f24c211dc86dd91"
+  "gitHead": "d14ccf9e6af38023cfab35d4b64bc75cc69052b4"
 }

package/src/adapters/shared.ts

@@ -162,12 +162,8 @@ export async function requestUpload<TCtx>(params: {
       metadata,
     },
   });
-  const parsedPath = path.reduce<Record<string, string>>((acc, curr) => {
-    acc[curr.key] = curr.value;
-    return acc;
-  }, {});
+  const { parsedPath, pathOrder } = parsePath(path);
 
-  const pathOrder = path.map((p) => p.key);
   return {
     ...requestUploadRes,
     size: fileInfo.size,
@@ -385,7 +381,7 @@ async function getDerivedEncryptionKey(secret: string) {
   );
 }
 
-function buildPath(params: {
+export function buildPath(params: {
   fileInfo: RequestUploadBody['fileInfo'];
   bucket: AnyBuilder;
   pathAttrs: {
@@ -418,6 +414,18 @@ function buildPath(params: {
   return path;
 }
 
+export function parsePath(path: { key: string; value: string }[]) {
+  const parsedPath = path.reduce<Record<string, string>>((acc, curr) => {
+    acc[curr.key] = curr.value;
+    return acc;
+  }, {});
+  const pathOrder = path.map((p) => p.key);
+  return {
+    parsedPath,
+    pathOrder,
+  };
+}
+
 async function getContext(token?: string) {
   if (!token) {
     throw new Error('No token');

package/src/core/client/index.ts

@@ -1,5 +1,8 @@
+/* eslint-disable @typescript-eslint/ban-types */
+import { type z, type ZodNever } from 'zod';
 import { type AnyRouter, type Comparison } from '..';
-import { type Simplify } from '../../types';
+import { buildPath, parsePath } from '../../adapters/shared';
+import { type Prettify, type Simplify } from '../../types';
 import {
   type AnyBuilder,
   type InferBucketPathKeys,
@@ -16,6 +19,63 @@ export type GetFileRes<TBucket extends AnyBuilder> = {
   path: InferBucketPathObject<TBucket>;
 };
 
+export type UploadOptions = {
+  /**
+   * e.g. 'my-file-name.jpg'
+   *
+   * By default, a unique file name will be generated for each upload.
+   * If you want to use a custom file name, you can use this option.
+   * If you use the same file name for multiple uploads, the previous file will be overwritten.
+   * But it might take some time for the CDN cache to be cleared.
+   * So maybe you will keep seeing the old file for a while.
+   *
+   * If you want to replace an existing file immediately leave the `manualFileName` option empty and use the `replaceTargetUrl` option.
+   */
+  manualFileName?: string;
+  /**
+   * Use this to replace an existing file.
+   * It will automatically delete the existing file when the upload is complete.
+   */
+  replaceTargetUrl?: string;
+  /**
+   * If true, the file needs to be confirmed by using the `confirmUpload` function.
+   * If the file is not confirmed within 24 hours, it will be deleted.
+   *
+   * This is useful for pages where the file is uploaded as soon as it is selected,
+   * but the user can leave the page without submitting the form.
+   *
+   * This avoids unnecessary zombie files in the bucket.
+   */
+  temporary?: boolean;
+};
+
+export type UploadFileRequest<TBucket extends AnyBuilder> = {
+  content:
+    | string
+    | {
+        blob: Blob;
+        extension: string;
+      };
+  options?: UploadOptions;
+} & (TBucket['$config']['ctx'] extends Record<string, never>
+  ? {}
+  : {
+      ctx: TBucket['$config']['ctx'];
+    }) &
+  (TBucket['_def']['input'] extends ZodNever
+    ? {}
+    : {
+        input: z.infer<TBucket['_def']['input']>;
+      });
+
+export type UploadFileRes<TBucket extends AnyBuilder> = {
+  url: string;
+  size: number;
+  metadata: InferMetadataObject<TBucket>;
+  path: InferBucketPathObject<TBucket>;
+  pathOrder: (keyof InferBucketPathObject<TBucket>)[];
+};
+
 type Filter<TBucket extends AnyBuilder> = {
   AND?: Filter<TBucket>[];
   OR?: Filter<TBucket>[];
@@ -65,18 +125,9 @@ type EdgeStoreClient<TRouter extends AnyRouter> = {
     getFile: (params: {
       url: string;
     }) => Promise<GetFileRes<TRouter['buckets'][K]>>;
-    // TODO: replace with `upload`
-    // requestUpload: (params: {
-    //   file: File;
-    //   path: {
-    //     [TKey in InferBucketPathKeys<TRouter['buckets'][K]>]: string;
-    //   };
-    //   metadata: InferMetadataObject<TRouter['buckets'][K]>;
-    //   replaceTargetUrl?: string;
-    // }) => Promise<{
-    //   uploadUrl: string;
-    //   accessUrl: string;
-    // }>;
+    upload: (
+      params: UploadFileRequest<TRouter['buckets'][K]>,
+    ) => Promise<Prettify<UploadFileRes<TRouter['buckets'][K]>>>;
     /**
      * Confirm a temporary file upload.
      */
@@ -124,6 +175,86 @@ export function initEdgeStoreClient<TRouter extends AnyRouter>(config: {
         throw new Error(`Bucket ${bucketName} not found`);
       }
       const client: EdgeStoreClient<TRouter>[string] = {
+        async upload(params) {
+          const content = params.content;
+          const ctx = 'ctx' in params ? params.ctx : {};
+          const input = 'input' in params ? params.input : {};
+
+          const { blob, extension } = (() => {
+            if (typeof content === 'string') {
+              return {
+                blob: new Blob([content], { type: 'text/plain' }),
+                extension: 'txt',
+              };
+            } else {
+              return {
+                blob: content.blob,
+                extension: content.extension,
+              };
+            }
+          })();
+
+          const path = buildPath({
+            bucket,
+            pathAttrs: {
+              ctx,
+              input,
+            },
+            fileInfo: {
+              type: blob.type,
+              size: blob.size,
+              extension,
+              temporary: false,
+              fileName: params.options?.manualFileName,
+              replaceTargetUrl: params.options?.replaceTargetUrl,
+            },
+          });
+          const metadata = await bucket._def.metadata({
+            ctx,
+            input,
+          });
+
+          const requestUploadRes = await sdk.requestUpload({
+            bucketName,
+            bucketType: bucket._def.type,
+            fileInfo: {
+              fileName: params.options?.manualFileName,
+              replaceTargetUrl: params.options?.replaceTargetUrl,
+              type: blob.type,
+              size: blob.size,
+              extension,
+              isPublic: bucket._def.accessControl === undefined,
+              temporary: params.options?.temporary ?? false,
+              path,
+              metadata,
+            },
+          });
+
+          const { signedUrl, multipart } = requestUploadRes;
+
+          if (multipart) {
+            // TODO
+            throw new Error('Multipart upload not implemented');
+          } else if (signedUrl) {
+            await fetch(signedUrl, {
+              method: 'PUT',
+              body: blob,
+            });
+          } else {
+            throw new Error('Missing signedUrl');
+          }
+          const { parsedPath, pathOrder } = parsePath(path);
+          return {
+            url: requestUploadRes.accessUrl,
+            size: blob.size,
+            metadata,
+            path: parsedPath,
+            pathOrder,
+          } satisfies UploadFileRes<typeof bucket> as UploadFileRes<
+            TRouter['buckets'][string]
+          >;
+        },
+
         async getFile(params) {
           const res = await sdk.getFile(params);
           return {
@@ -136,41 +267,6 @@ export function initEdgeStoreClient<TRouter extends AnyRouter>(config: {
             TRouter['buckets'][string]
           >;
         },
-        // TODO: Replace with `upload`
-        // async requestUpload(params) {
-        //   const { file, path, metadata, replaceTargetUrl } = params;
-        //   const fileExtension = file.name.includes('.')
-        //     ? file.name.split('.').pop()
-        //     : undefined;
-        //   if (!fileExtension) {
-        //     throw new Error('Missing file extension');
-        //   }
-        //   const parsedPath = Object.keys(bucket._def.path).map((key) => {
-        //     const value = path[key as keyof typeof path];
-        //     if (value === undefined) {
-        //       throw new Error(`Missing path param ${key}`);
-        //     }
-        //     return {
-        //       key,
-        //       value,
-        //     };
-        //   });
-
-        //   const fileInfo = {
-        //     size: file.size,
-        //     extension: fileExtension,
-        //     isPublic: bucket._def.accessControl === undefined,
-        //     path: parsedPath,
-        //     metadata,
-        //     replaceTargetUrl,
-        //   };
-
-        //   return await sdk.requestUpload({
-        //     bucketName,
-        //     bucketType: bucket._def.type,
-        //     fileInfo,
-        //   });
-        // },
 
         async confirmUpload(params) {
           return await sdk.confirmUpload(params);

package/src/providers/aws/index.ts

@@ -107,7 +107,7 @@ export function AWSProvider(options?: AWSProviderOptions): Provider {
       const extension = fileInfo.extension
         ? `.${fileInfo.extension.replace('.', '')}`
         : '';
-      const fileName = `${nameId}${extension}`;
+      const fileName = fileInfo.fileName ?? `${nameId}${extension}`;
       const filePath = fileInfo.path.reduce((acc, item) => {
         return `${acc}/${item.value}`;
       }, '');

package/src/providers/types.ts

@@ -41,6 +41,7 @@ export type RequestUploadParams = {
     size: number;
     extension: string;
     isPublic: boolean;
+    fileName?: string;
     path: {
       key: string;
       value: string;

package/src/types.ts

@@ -61,6 +61,14 @@ export type Simplify<TType> = TType extends any[] | Date
   ? TType
   : { [K in keyof TType]: TType[K] };
 
+/**
+ * @internal
+ */
+export type Prettify<TType> = {
+  [K in keyof TType]: TType[K];
+  // eslint-disable-next-line @typescript-eslint/ban-types
+} & {};
+
 /**
  * @public
  */