fix

Author: coyotte508

packages/hub/src/lib/commit.ts

@@ -162,7 +162,7 @@ export async function* commitIter(params: CommitParams): AsyncGenerator<CommitPr
 						return { ...operation, content: operation.content };
 					}
 
-					const lazyBlobs = await createBlobs(operation.content, {
+					const lazyBlobs = await createBlobs(operation.content, operation.path, {
 						fetch: params.fetch,
 						maxFolderDepth: params.maxFolderDepth,
 					});
@@ -171,7 +171,8 @@ export async function* commitIter(params: CommitParams): AsyncGenerator<CommitPr
 
 					return lazyBlobs.map((blob) => ({
 						...operation,
-						content: blob,
+						content: blob.blob,
+						path: blob.path,
 					}));
 				})
 			)

packages/hub/src/lib/delete-files.spec.ts

@@ -78,4 +78,4 @@ describe("deleteFiles", () => {
 			});
 		}
 	});
-}, 10_000);
+});

packages/hub/src/utils/createBlobs.ts

@@ -12,9 +12,14 @@ import { isFrontend } from "./isFrontend";
  * From the frontend:
  *   - support http resources with absolute or relative URLs
  */
-export async function createBlobs(url: URL, opts?: { fetch?: typeof fetch; maxFolderDepth?: number }): Promise<Blob[]> {
+export async function createBlobs(
+	url: URL,
+	destPath: string,
+	opts?: { fetch?: typeof fetch; maxFolderDepth?: number }
+): Promise<Array<{ path: string; blob: Blob }>> {
 	if (url.protocol === "http:" || url.protocol === "https:") {
-		return [await WebBlob.create(url, { fetch: opts?.fetch })];
+		const blob = await WebBlob.create(url, { fetch: opts?.fetch });
+		return [{ path: destPath, blob }];
 	}
 
 	if (isFrontend) {
@@ -26,7 +31,17 @@ export async function createBlobs(url: URL, opts?: { fetch?: typeof fetch; maxFo
 		const { subPaths } = await import("./sub-paths");
 		const paths = await subPaths(url, opts?.maxFolderDepth);
 
-		return Promise.all(paths.map((path) => FileBlob.create(path)));
+		if (paths.length === 1 && paths[0].relativePath === ".") {
+			const blob = await FileBlob.create(url);
+			return [{ path: destPath, blob }];
+		}
+
+		return Promise.all(
+			paths.map(async (path) => ({
+				path: `${destPath}/${path.relativePath}`.replace(/\/[.]$/, "").replaceAll("//", "/"),
+				blob: await FileBlob.create(new URL(path.path)),
+			}))
+		);
 	}
 
 	throw new TypeError(`Unsupported URL protocol "${url.protocol}"`);

packages/hub/src/utils/sub-paths.ts

@@ -3,20 +3,33 @@ import { readdir, stat } from "node:fs/promises";
 /**
  * Recursively retrieves all sub-paths of a given directory up to a specified depth.
  */
-export async function subPaths(path: URL, maxDepth = 10): Promise<URL[]> {
+export async function subPaths(
+	path: URL,
+	maxDepth = 10
+): Promise<
+	Array<{
+		path: URL;
+		relativePath: string;
+	}>
+> {
 	const state = await stat(path);
 	if (!state.isDirectory()) {
-		return [path];
+		return [{ path, relativePath: "." }];
 	}
 
 	const files = await readdir(path, { withFileTypes: true });
-	const ret: URL[] = [];
+	const ret: Array<{ path: URL; relativePath: string }> = [];
 	for (const file of files) {
 		const filePath = new URL(file.name, path);
 		if (file.isDirectory()) {
-			ret.push(...(await subPaths(filePath, maxDepth - 1)));
+			ret.push(
+				...(await subPaths(filePath, maxDepth - 1)).map((subPath) => ({
+					...subPath,
+					relativePath: `${file.name}/${subPath.relativePath}`,
+				}))
+			);
 		} else {
-			ret.push(filePath);
+			ret.push({ path: filePath, relativePath: file.name });
 		}
 	}