Fix cross-device mv by switching to copy

nx.json

@@ -9,6 +9,9 @@
 			}
 		}
 	},
+	"affected": {
+		"defaultBase": "trunk"
+	},
 	"pluginsConfig": {
 		"@nx/js": {
 			"analyzeSourceFiles": true

packages/php-wasm/node/src/test/php.spec.ts

@@ -77,7 +77,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 					$pipes
 				);
 
-				// Yields back to JS event loop to capture and process the 
+				// Yields back to JS event loop to capture and process the
 				// child_process output. This is fine. Regular PHP scripts
 				// typically wait for the child process to finish.
 				sleep(1);
@@ -122,7 +122,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 		// This test fails
 		if (!['7.0', '7.1', '7.2', '7.3'].includes(phpVersion)) {
 			/*
-			There is a race condition in this variant of the test which 
+			There is a race condition in this variant of the test which
 			causes the following failure (but only sometimes):
 
 				src/test/php.spec.ts > PHP 8.2 > proc_open() > cat – stdin=pipe, stdout=file, stderr=file
@@ -142,7 +142,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 			);
 			fwrite($pipes[0], 'WordPress\n');
 
-			// Yields back to JS event loop to capture and process the 
+			// Yields back to JS event loop to capture and process the
 			// child_process output. This is fine. Regular PHP scripts
 			// typically wait for the child process to finish.
 			sleep(1);
@@ -173,7 +173,7 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 					$pipes
 				);
 
-				// Yields back to JS event loop to capture and process the 
+				// Yields back to JS event loop to capture and process the
 				// child_process output. This is fine. Regular PHP scripts
 				// typically wait for the child process to finish.
 				sleep(1);
@@ -324,6 +324,76 @@ describe.each(SupportedPHPVersions)('PHP %s', (phpVersion) => {
 			);
 		});
 
+		it('cp() should copy a file', () => {
+			php.mkdir(testDirPath);
+			const file1 = testDirPath + '/1.txt';
+			const file2 = testDirPath + '/2.txt';
+			php.writeFile(file1, '1');
+			php.cp(file1, file2);
+			expect(php.fileExists(file1)).toEqual(true);
+			expect(php.fileExists(file2)).toEqual(true);
+			expect(php.readFileAsText(file2)).toEqual('1');
+		});
+
+		it('cp() should copy a directory', () => {
+			const testDirPath1 = testDirPath;
+			const testDirPath2 = '/__test987654322';
+			php.mkdir(testDirPath1);
+			php.writeFile(testDirPath1 + '/1.txt', '1');
+			php.writeFile(testDirPath1 + '/2.txt', '2');
+			php.cp(testDirPath1, testDirPath2, { recursive: true });
+			expect(php.fileExists(testDirPath2 + '/1.txt')).toEqual(true);
+			expect(php.fileExists(testDirPath2 + '/2.txt')).toEqual(true);
+			expect(php.readFileAsText(testDirPath2 + '/1.txt')).toEqual('1');
+			expect(php.readFileAsText(testDirPath2 + '/2.txt')).toEqual('2');
+		});
+
+		it('cp() should copy a file into a directory', () => {
+			const testDirPath1 = testDirPath;
+			const testDirPath2 = '/__test987654322';
+			php.mkdir(testDirPath1);
+			php.mkdir(testDirPath2);
+			php.writeFile(testDirPath1 + '/1.txt', '1');
+			php.cp(testDirPath1 + '/1.txt', testDirPath2);
+			expect(php.fileExists(testDirPath2 + '/1.txt')).toEqual(true);
+			expect(php.readFileAsText(testDirPath2 + '/1.txt')).toEqual('1');
+		});
+
+		it('cp() should replace target file if it exists', () => {
+			php.mkdir(testDirPath);
+			const file1 = testDirPath + '/1.txt';
+			const file2 = testDirPath + '/2.txt';
+			php.writeFile(file1, '1');
+			php.writeFile(file2, '2');
+			php.cp(file1, file2);
+			expect(php.fileExists(file1)).toEqual(true);
+			expect(php.fileExists(file2)).toEqual(true);
+			expect(php.readFileAsText(file2)).toEqual('1');
+		});
+
+		it('cp() should throw a useful error when source file does not exist', () => {
+			php.mkdir(testDirPath);
+			const file1 = testDirPath + '/1.txt';
+			const file2 = testDirPath + '/2.txt';
+			expect(() => {
+				php.cp(file1, file2);
+			}).toThrowError(
+				`Could not copy "${testDirPath}/1.txt": There is no such file or directory OR the parent directory does not exist.`
+			);
+		});
+
+		it('cp() should throw a useful error when target directory does not exist', () => {
+			php.mkdir(testDirPath);
+			const file1 = testDirPath + '/1.txt';
+			const file2 = testDirPath + '/nowhere/2.txt';
+			php.writeFile(file1, '1');
+			expect(() => {
+				php.cp(file1, file2);
+			}).toThrowError(
+				`Could not copy "${testDirPath}/1.txt": There is no such file or directory OR the parent directory does not exist.`
+			);
+		});
+
 		it('mkdir() should create a directory', () => {
 			php.mkdir(testDirPath);
 			expect(php.fileExists(testDirPath)).toEqual(true);

packages/php-wasm/universal/src/lib/base-php.ts

@@ -19,13 +19,14 @@ import {
 	SpawnHandler,
 	PHPEventListener,
 	PHPEvent,
+	CpOptions,
 } from './universal-php';
 import {
 	getFunctionsMaybeMissingFromAsyncify,
 	improveWASMErrorReporting,
 	UnhandledRejectionsTarget,
 } from './wasm-error-reporting';
-import { Semaphore } from '@php-wasm/util';
+import { Semaphore, joinPaths, basename } from '@php-wasm/util';
 
 const STRING = 'string';
 const NUMBER = 'number';
@@ -616,6 +617,77 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		this[__private__dont__use].FS.rename(fromPath, toPath);
 	}
 
+	/** @inheritDoc */
+	@rethrowFileSystemError('Could not copy "{path}"')
+	cp(
+		sourcePath: string,
+		destinationPath: string,
+		options: CpOptions = { recursive: false }
+	) {
+		const FS = this[__private__dont__use].FS;
+
+		const sourceStat = FS.stat(sourcePath);
+
+		// The FILEMODE tells us things about the file, like
+		// permissions, whether its a file, link, or directory
+		// as well as its access and exec permissions.
+		//
+		// The 15th bit of the FILEMODE is the sticky-bit.
+		// Emscripten directories will have the sticky-bit set.
+		//
+		// We'll use a binary literal (0b...) with a logical
+		// and (&) to check for that.
+		const stickyBit = 0b100000000000000;
+		const sourceIsDir = sourceStat.mode & stickyBit;
+
+		let destinationExists: boolean;
+		let destinationIsDir = false;
+
+		try {
+			const destinationStat = FS.stat(destinationPath);
+			destinationExists = true;
+			// Similar check to above but testing if DESTINATION is a directory.
+			destinationIsDir = !!(destinationStat.mode & stickyBit);
+		} catch {
+			destinationExists = false;
+		}
+
+		if (!sourceIsDir) {
+			const file = this.readFileAsBuffer(sourcePath);
+
+			if (destinationIsDir) {
+				FS.writeFile(
+					joinPaths(destinationPath, basename(sourcePath)),
+					file
+				);
+			} else {
+				FS.writeFile(destinationPath, file);
+			}
+
+			return;
+		}
+
+		if (!options.recursive) {
+			throw new Error(
+				`Cannot use non-recurive copy on directory: ${sourcePath}`
+			);
+		}
+
+		if (!destinationExists) {
+			FS.mkdir(destinationPath);
+		}
+
+		const files = this.listFiles(sourcePath);
+
+		files.forEach((file: string) =>
+			this.cp(
+				joinPaths(sourcePath, file),
+				joinPaths(destinationPath, file),
+				options
+			)
+		);
+	}
+
 	/** @inheritDoc */
 	@rethrowFileSystemError('Could not remove directory "{path}"')
 	rmdir(path: string, options: RmDirOptions = { recursive: true }) {

packages/php-wasm/universal/src/lib/index.ts

@@ -7,6 +7,7 @@ export type {
 	PHPRunOptions,
 	UniversalPHP,
 	ListFilesOptions,
+	CpOptions,
 	RmDirOptions,
 	PHPEvent,
 	PHPEventListener,

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

@@ -256,6 +256,25 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 */
 	mv(oldPath: string, newPath: string): void;
 
+	/**
+	 * Copies a file or directory in the PHP filesystem to a
+	 * new location. The target directory's parent must be a
+	 * valid location in the filesystem prior to copying.
+	 *
+	 * If the target path is a file that already exists,
+	 * it will be overwritten.
+	 *
+	 * If the target path is a directory that already exists,
+	 * the file or directory will be copied into it.
+	 *
+	 * If the target path's parent directory does not exist,
+	 * an error will be thrown.
+	 *
+	 * @param oldPath The file or directory to be copied.
+	 * @param newPath The new, full path to copy the file or directory to.
+	 */
+	cp(oldPath: string, newPath: string, options?: CpOptions): void;
+
 	/**
 	 * Removes a directory from the PHP filesystem.
 	 *
@@ -542,6 +561,14 @@ export interface FileInfo {
 	data: Uint8Array;
 }
 
+export interface CpOptions {
+	/**
+	 * If true, recursively copies the directory and all its contents.
+	 * Default: false.
+	 */
+	recursive?: boolean;
+}
+
 export interface RmDirOptions {
 	/**
 	 * If true, recursively removes the directory and all its contents.

packages/php-wasm/web/src/lib/web-php-endpoint.ts

@@ -6,6 +6,7 @@ import type {
 	PHPRequest,
 	PHPResponse,
 	PHPRunOptions,
+	CpOptions,
 	RmDirOptions,
 	SpawnHandler,
 	PHPEventListener,
@@ -89,6 +90,11 @@ export class WebPHPEndpoint implements IsomorphicLocalPHP {
 		return _private.get(this)!.php.mv(fromPath, toPath);
 	}
 
+	/** @inheritDoc @php-wasm/universal!IsomorphicLocalPHP.cp  */
+	cp(fromPath: string, toPath: string, options?: CpOptions) {
+		return _private.get(this)!.php.cp(fromPath, toPath, options);
+	}
+
 	/** @inheritDoc @php-wasm/universal!IsomorphicLocalPHP.rmdir  */
 	rmdir(path: string, options?: RmDirOptions) {
 		return _private.get(this)!.php.rmdir(path, options);

packages/playground/blueprints/src/lib/steps/install-asset.ts

@@ -83,7 +83,7 @@ export async function installAsset(
 
 		// Move asset folder to target path
 		const assetFolderPath = `${targetPath}/${assetFolderName}`;
-		await playground.mv(tmpAssetPath, assetFolderPath);
+		await playground.cp(tmpAssetPath, assetFolderPath, { recursive: true });
 		await cleanup();
 
 		return {