Fix lazy content lookups for dir resources

Author: brandonpayton

packages/php-wasm/universal/src/lib/write-files.ts

@@ -45,16 +45,18 @@ export async function writeFiles(
 			await php.rmdir(root, { recursive: true });
 		}
 	}
-	for (const [relativePath, content] of Object.entries(newFiles)) {
+	newFiles = await newFiles;
+	for (const relativePath of Object.keys(newFiles)) {
+		const content = await newFiles[relativePath];
+
 		const filePath = joinPaths(root, relativePath);
 		if (!(await php.fileExists(dirname(filePath)))) {
 			await php.mkdir(dirname(filePath));
 		}
 		if (content instanceof Uint8Array || typeof content === 'string') {
 			await php.writeFile(filePath, content);
 		} else {
-			const fileTreeContent = content as MaybePromise<FileTree>;
-			await writeFiles(php, filePath, fileTreeContent);
+			await writeFiles(php, filePath, content);
 		}
 	}
 }

packages/playground/blueprints/src/lib/resources.ts

@@ -353,33 +353,34 @@ export class BlueprintAssetDirectoryResource extends VFSDirectoryResource {
 async function createLazyVFSFileTree(
 	path: string,
 	playground: UniversalPHP
-): Promise<FileTree> {
-	const keys = await playground.listFiles(path);
-	const keySet = new Set(keys);
+): Promise<FileTreeAsync> {
+	const lazyFileTree: FileTreeAsync = {};
+
+	if (!(await playground.isDir(path))) {
+		throw new Error(`Path "${path}" is not a directory`);
+	}
+
+	for (const fileName of await playground.listFiles(path)) {
+		Object.defineProperty(lazyFileTree, fileName, {
+			configurable: false,
+			enumerable: true,
+			async get() {
+				const fullPath = joinPaths(path, fileName);
 
-	return new Proxy<FileTree>(
-		{},
-		{
-			ownKeys() {
-				return keys;
-			},
-			async get(target, prop: string) {
-				if (!keySet.has(prop)) {
-					return undefined;
-				}
-				const fullPath = joinPaths(path, prop);
 				if (!(await playground.fileExists(fullPath))) {
 					return undefined;
 				}
 
 				if (await playground.isDir(fullPath)) {
 					return createLazyVFSFileTree(fullPath, playground);
 				} else {
-					return playground.readFileAsBuffer(joinPaths(path, prop));
+					return playground.readFileAsBuffer(fullPath);
 				}
 			},
-		}
-	);
+		});
+	}
+
+	return lazyFileTree;
 }
 
 /**