Fixed incorrect path resolution with context PWD (fixes #263)

Fixed `bindContext` copying from the created child context instead of assigning to it
Fixed `resolveMount` not resolving paths using context PWD
`normalizePath` now passed through `this` to `path.resolve`
Anti-regression tests now have the issue number in the test name

Author: james-pre

src/context.ts

@@ -28,8 +28,7 @@ export function bindContext(this: V_Context, init: ContextInit = {}): BoundConte
 
 	const ctx = createChildContext($, init);
 
-	const bound = {
-		...ctx,
+	const bound = Object.assign(ctx, {
 		fs: {
 			...bindFunctions(fs, ctx),
 			promises: bindFunctions(fs.promises, ctx),
@@ -41,7 +40,7 @@ export function bindContext(this: V_Context, init: ContextInit = {}): BoundConte
 			ctx.children.push(child);
 			return child;
 		},
-	} satisfies BoundContext;
+	}) satisfies BoundContext;
 
 	boundContexts.set(ctx.id, bound);
 

src/node/sync.ts

@@ -540,7 +540,7 @@ export function realpathSync(this: V_Context, path: fs.PathLike, options: fs.Buf
 export function realpathSync(this: V_Context, path: fs.PathLike, options?: fs.EncodingOption): string;
 export function realpathSync(this: V_Context, path: fs.PathLike, options?: fs.EncodingOption | fs.BufferEncodingOption): string | Buffer {
 	const encoding = typeof options == 'string' ? options : (options?.encoding ?? 'utf8');
-	path = normalizePath(path);
+	path = normalizePath(path, true);
 
 	const { fullPath } = _sync.resolve(this, path);
 	if (encoding == 'utf8' || encoding == 'utf-8') return fullPath;

src/path.ts

@@ -347,7 +347,8 @@ export function format(pathObject: ParsedPath): string {
 }
 
 export function parse(path: string): ParsedPath {
-	const isAbsolute = path.startsWith('/');
+	const isAbsolute = path[0] === '/';
+
 	const ret = { root: isAbsolute ? '/' : '', dir: '', base: '', ext: '', name: '' };
 	if (path.length === 0) return ret;
 

src/utils.ts

@@ -4,6 +4,7 @@ import type * as fs from 'node:fs';
 import type { Worker as NodeWorker } from 'node:worker_threads';
 import { decodeUTF8, encodeUTF8, type OptionalTuple } from 'utilium';
 import { resolve } from './path.js';
+import type { V_Context } from './internal/contexts.js';
 
 declare global {
 	function atob(data: string): string;
@@ -67,8 +68,9 @@ export function normalizeTime(time: fs.TimeLike): number {
 /**
  * Normalizes a path
  * @internal
+ * @todo clean this up and make it so `path.resolve` is only called when an explicit context is passed (i.e. `normalizePath(..., $)` to use `path.resolve`)
  */
-export function normalizePath(p: fs.PathLike, noResolve: boolean = false): string {
+export function normalizePath(this: V_Context, p: fs.PathLike, noResolve: boolean = false): string {
 	if (p instanceof URL) {
 		if (p.protocol != 'file:') throw withErrno('EINVAL', 'URLs must use the file: protocol');
 		p = p.pathname;
@@ -80,7 +82,7 @@ export function normalizePath(p: fs.PathLike, noResolve: boolean = false): strin
 	p = p.replaceAll(/[/\\]+/g, '/');
 
 	// Note: PWD is not resolved here, it is resolved later.
-	return noResolve ? p : resolve(p);
+	return noResolve ? p : resolve.call(this, p);
 }
 
 /**

src/vfs/async.ts

@@ -23,6 +23,8 @@ import { emitChange } from './watchers.js';
  * @internal @hidden
  */
 export async function resolve($: V_Context, path: string, preserveSymlinks?: boolean, extra?: ExceptionExtra): Promise<ResolvedPath> {
+	path = resolvePath.call($, path);
+
 	if (preserveSymlinks) {
 		const resolved = resolveMount(path, $, extra);
 		const stats = await resolved.fs.stat(resolved.path).catch(() => undefined);

src/vfs/shared.ts

@@ -92,7 +92,8 @@ export interface ResolvedPath extends ResolvedMount {
 export function resolveMount(path: string, ctx: V_Context, extra?: ExceptionExtra): ResolvedMount {
 	const { root } = contextOf(ctx);
 	const _exceptionContext = { path, ...extra };
-	path = normalizePath(join(root, path));
+	path = normalizePath(join(root, path), true);
+	path = resolve.call(ctx, path);
 	const sortedMounts = [...mounts].sort((a, b) => (a[0].length > b[0].length ? -1 : 1)); // descending order of the string length
 	for (const [mountPoint, fs] of sortedMounts) {
 		// We know path is normalized, so it would be a substring of the mount point.

src/vfs/sync.ts

@@ -25,6 +25,7 @@ import { emitChange } from './watchers.js';
  * @internal @hidden
  */
 export function resolve($: V_Context, path: string, preserveSymlinks?: boolean, extra?: ExceptionExtra): ResolvedPath {
+	path = resolvePath.call($, path);
 	/* Try to resolve it directly. If this works,
 	that means we don't need to perform any resolution for parent directories. */
 	try {

tests/common/context.test.ts

@@ -60,8 +60,7 @@ suite('Context', () => {
 		await promise;
 	});
 
-	test('Path resolution of / with context root and mount point being the same', async () => {
-		// @zenfs/core#226
+	test('Path resolution of / with context root and mount point being the same #226', async () => {
 		await configure({
 			mounts: { '/bananas': InMemory },
 		});
@@ -73,8 +72,7 @@ suite('Context', () => {
 		assert.deepEqual(bananas.fs.readdirSync('/'), ['yellow']);
 	});
 
-	test('Different working directory', { todo: true }, () => {
-		// @zenfs/core#263
+	test('Different working directory #263', () => {
 		ctx.mkdirSync('/test');
 		context.pwd = '/test';
 

tests/fs/links.test.ts

@@ -19,8 +19,7 @@ suite('Links', () => {
 		assert(stats.isSymbolicLink());
 	});
 
-	test('lstat file inside symlinked directory', async () => {
-		// @zenfs/core#241
+	test('lstat file inside symlinked directory #241', async () => {
 		await fs.promises.mkdir('/a');
 		await fs.promises.writeFile('/a/hello.txt', 'hello world');
 		await fs.promises.symlink('/a', '/b');

tests/fs/read.test.ts

@@ -70,8 +70,7 @@ suite('read', () => {
 		assert.equal(bytesRead, expected.length);
 	});
 
-	test('read using callback API', async () => {
-		// @zenfs/core#239
+	test('read using callback API #239', async () => {
 		const path = '/text.txt';
 
 		fs.writeFileSync(path, 'hello world');