typescript-virtual-container 1.4.3 → 1.4.5

package/src/commands/sh.ts

@@ -3,7 +3,7 @@ import type {
 	CommandResult,
 	ShellModule,
 } from "../types/commands";
-import { expandAsync } from "../utils/expand";
+import { evalArith, expandAsync, expandBraces } from "../utils/expand";
 import { ifFlag } from "./command-helpers";
 import { resolvePath } from "./helpers";
 import { runCommand } from "./runtime";
@@ -319,8 +319,7 @@ async function runBlocks(
 			ctx.env.vars[`__func_${block.name}`] = block.body.join("\n");
 		} else if (block.type === "arith") {
 			// (( expr )) — evaluate arithmetic, update vars
-			const { expandSync } = await import("../utils/expand");
-			const expr = expandSync(block.expr, ctx.env.vars, ctx.env.lastExitCode);
+			const expr = block.expr.trim();
 			// Handle i++ / i-- / i+=N / i-=N
 			const incMatch = expr.match(/^(\w+)\s*(\+\+|--)$/);
 			if (incMatch) {
@@ -333,6 +332,11 @@ async function runBlocks(
 					const rhs = parseInt(assignMatch[3]!, 10);
 					const ops: Record<string, number> = { "+": lhs + rhs, "-": lhs - rhs, "*": lhs * rhs, "/": Math.floor(lhs / rhs) };
 					ctx.env.vars[assignMatch[1]!] = String(ops[assignMatch[2]!] ?? lhs);
+				} else {
+					const value = evalArith(expr, ctx.env.vars);
+					if (!Number.isNaN(value)) {
+						ctx.env.lastExitCode = value === 0 ? 1 : 0;
+					}
 				}
 			}
 		} else if (block.type === "for") {
@@ -343,7 +347,6 @@ async function runBlocks(
 				ctx,
 			);
 			// Apply brace expansion to each token in the list
-			const { expandBraces } = await import("../utils/expand");
 			const items = listExpanded.trim().split(/\s+/).flatMap(expandBraces);
 			for (const item of items) {
 				ctx.env.vars[block.var] = item;

package/src/commands/test.ts

@@ -1,4 +1,6 @@
 import type { ShellModule } from "../types/commands";
+import type { VfsFileNode } from "../types/vfs";
+import type { VirtualShell } from "../VirtualShell";
 
 /**
  * Evaluate a POSIX test expression.
@@ -8,7 +10,7 @@ import type { ShellModule } from "../types/commands";
  */
 function evalTest(
 	tokens: string[],
-	shell: import("../VirtualShell").VirtualShell,
+	shell: VirtualShell,
 	cwd: string,
 ): boolean {
 	// When called via [ command, ] is the last arg — strip it
@@ -68,7 +70,7 @@ function evalTest(
 				return (
 					shell.vfs.exists(path) &&
 					shell.vfs.stat(path).type === "file" &&
-					(shell.vfs.stat(path) as import("../types/vfs").VfsFileNode).size > 0
+					(shell.vfs.stat(path) as VfsFileNode).size > 0
 				);
 			case "-z":
 				return operand.length === 0;

package/src/commands/wc.ts

@@ -20,7 +20,7 @@ export const wcCommand: ShellModule = {
 		const positionals = args.filter((a) => !a.startsWith("-"));
 
 		const count = (content: string, label: string): string => {
-			const l = content.split("\n").length - (content.endsWith("\n") ? 1 : 0);
+			const l = content.length === 0 ? 0 : content.trim().split("\n").length;
 			const w = content.trim().split(/\s+/).filter(Boolean).length;
 			const c = Buffer.byteLength(content, "utf8");
 			const parts: string[] = [];