@isentinel/jest-roblox 0.1.5 → 0.2.1

package/bin/jest-roblox.js

@@ -5,9 +5,10 @@ import { fileURLToPath } from "node:url";
 
 const sourceEntry = resolve(dirname(fileURLToPath(import.meta.url)), "../src/cli.ts");
 
+const { register } = await import("node:module");
+register("../loaders/luau-raw.mjs", import.meta.url);
+
 if (existsSync(sourceEntry)) {
-	const { register } = await import("node:module");
-	register("../loaders/luau-raw.mjs", import.meta.url);
 	const { main } = await import("../src/cli.ts");
 	main();
 } else {

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { A as hashBuffer, C as resolveNestedProjects, D as createStudioBackend, F as VALID_BACKENDS, P as ROOT_ONLY_KEYS, R as isValidBackend, S as collectPaths, _ as formatResult, a as formatAnnotations, b as formatBanner, c as execute, d as findFormatterOptions, g as formatMultiProjectResult, i as runTypecheck, k as createOpenCloudBackend, l as formatExecuteOutput, m as formatAgentMultiProject, n as parseGameOutput, o as formatJobSummary, p as writeJsonFile, r as writeGameOutput, s as resolveGitHubActionsOptions, t as formatGameOutputNotice, u as loadCoverageManifest, w as loadConfig$1, x as rojoProjectSchema, y as formatTypecheckSummary, z as LuauScriptError } from "./game-output-71ciORUU.mjs";
+import { A as createOpenCloudBackend, B as LuauScriptError, C as formatTypecheckSummary, F as ROOT_ONLY_KEYS, I as VALID_BACKENDS, O as createStudioBackend, T as loadConfig$1, _ as writeJsonFile, a as formatAnnotations, b as formatMultiProjectResult, c as execute, d as resolveTsconfigDirectories, f as collectPaths, h as findFormatterOptions, i as runTypecheck, j as hashBuffer, l as formatExecuteOutput, m as rojoProjectSchema, n as parseGameOutput, o as formatJobSummary, p as resolveNestedProjects, r as writeGameOutput, s as resolveGitHubActionsOptions, t as formatGameOutputNotice, u as loadCoverageManifest, v as formatAgentMultiProject, w as formatBanner, x as formatResult, z as isValidBackend } from "./game-output-C0KykXIi.mjs";
 import { createRequire } from "node:module";
 import { type } from "arktype";
 import assert from "node:assert";
@@ -14,16 +14,16 @@ import { WebSocketServer } from "ws";
 import { loadConfig } from "c12";
 import * as os from "node:os";
 import { Buffer } from "node:buffer";
+import { getTsconfig } from "get-tsconfig";
+import { TraceMap, originalPositionFor } from "@jridgewell/trace-mapping";
 import * as cp from "node:child_process";
 import { RojoResolver } from "@roblox-ts/rojo-resolver";
-import { TraceMap, originalPositionFor } from "@jridgewell/trace-mapping";
-import { getTsconfig } from "get-tsconfig";
 import picomatch from "picomatch";
 import istanbulCoverage from "istanbul-lib-coverage";
 import istanbulReport from "istanbul-lib-report";
 import istanbulReports from "istanbul-reports";
 //#region package.json
-var version = "0.1.5";
+var version = "0.2.1";
 //#endregion
 //#region src/backends/auto.ts
 var StudioWithFallback = class {
@@ -156,7 +156,7 @@ function evalTable(entries) {
 }
 //#endregion
 //#region src/luau/parse-ast.luau
-var parse_ast_default = "local fs = require(\"@std/fs\")\nlocal json = require(\"@std/json\")\nlocal process = require(\"@std/process\")\nlocal syntax = require(\"@std/syntax\")\n\nlocal rawArgs = process.args\nlocal userArgs: { string } = {}\nlocal pastSeparator = false\n\nfor _, arg in rawArgs do\n	if pastSeparator then\n		table.insert(userArgs, arg)\n	elseif arg == \"--\" then\n		pastSeparator = true\n	end\nend\n\nlocal luauRoot = userArgs[1]\nif not luauRoot then\n	error(\"Usage: lute run parse-ast.luau -- <file.luau | luau-root> [output-dir]\")\nend\n\nluauRoot = string.gsub(luauRoot, \"\\\\\", \"/\")\n\n-- Fields to keep per AST tag (beyond tag/kind/location which are always kept).\n-- Tags shared by stat/expr variants are merged — nil fields are harmless.\nlocal KEEP: { [string]: { string } } = {\n	assign = { \"values\", \"variables\" },\n	binary = { \"lhsoperand\", \"rhsoperand\" },\n	block = { \"statements\" },\n	boolean = { \"value\" },\n	call = { \"arguments\", \"func\" },\n	cast = { \"operand\" },\n	compoundassign = { \"value\", \"variable\" },\n	conditional = { \"condition\", \"thenblock\", \"elseifs\", \"elseblock\", \"thenexpr\", \"elseexpr\" },\n	[\"do\"] = { \"body\" },\n	expression = { \"expression\" },\n	[\"for\"] = { \"body\", \"from\", \"to\", \"step\" },\n	forin = { \"body\", \"values\" },\n	[\"function\"] = { \"body\", \"name\", \"func\" },\n	global = { \"name\" },\n	group = { \"expression\" },\n	index = { \"expression\", \"index\" },\n	indexname = { \"expression\", \"accessor\", \"index\" },\n	instantiate = { \"expr\" },\n	interpolatedstring = { \"expressions\" },\n	[\"local\"] = { \"values\", \"variables\" },\n	localfunction = { \"name\", \"func\" },\n	number = { \"value\" },\n	[\"repeat\"] = { \"body\", \"condition\" },\n	[\"return\"] = { \"expressions\" },\n	string = { \"text\" },\n	table = { \"entries\" },\n	unary = { \"operand\" },\n	[\"while\"] = { \"body\", \"condition\" },\n}\n\nlocal function strip(value: any): any\n	if type(value) ~= \"table\" then\n		return value\n	end\n\n	-- LuauSpan — has beginline, no tag\n	if value.beginline ~= nil then\n		return value\n	end\n\n	-- Token — has text but no tag, reduce to {text}\n	if value.text ~= nil and value.tag == nil then\n		return { text = value.text }\n	end\n\n	-- AST node — has tag, keep only allowlisted fields\n	if value.tag ~= nil then\n		local result = { tag = value.tag, kind = value.kind, location = value.location }\n		local fields = KEEP[value.tag :: string]\n		if fields then\n			for _, field in fields do\n				if value[field] ~= nil then\n					result[field] = strip(value[field])\n				end\n			end\n		end\n\n		return result\n	end\n\n	-- Other tables (arrays, Pairs, ElseIf structs) — recurse all fields\n	local result: any = {}\n	for k, v in value do\n		result[k] = strip(v)\n	end\n\n	return result\nend\n\n-- Single-file mode: parse one file, print stripped AST to stdout\nif string.sub(luauRoot, -5) == \".luau\" or string.sub(luauRoot, -4) == \".lua\" then\n	local source = fs.readfiletostring(luauRoot)\n	local parseResult = syntax.parse(source)\n	print(json.serialize(strip(parseResult.root)))\n	return\nend\n\nlocal outputDir = userArgs[2]\nif not outputDir then\n	error(\"Usage: lute run parse-ast.luau -- <luau-root> <output-dir>\")\nend\n\noutputDir = string.gsub(outputDir, \"\\\\\", \"/\")\n\n-- Discover .luau files recursively, skipping node_modules, dot dirs, spec/test files\nlocal function discoverFiles(directory: string, relativeTo: string, results: { string })\n	local entries = fs.listdirectory(directory)\n	for _, entry in entries do\n		local fullPath = directory .. \"/\" .. entry.name\n		if entry.type == \"dir\" then\n			if entry.name == \"node_modules\" or entry.name == \".jest-roblox-coverage\" then\n				continue\n			end\n\n			if string.sub(entry.name, 1, 1) == \".\" then\n				continue\n			end\n\n			discoverFiles(fullPath, relativeTo, results)\n		elseif\n			entry.type == \"file\"\n			and (string.sub(entry.name, -5) == \".luau\" or string.sub(entry.name, -4) == \".lua\")\n		then\n			if\n				string.sub(entry.name, -10) == \".spec.luau\"\n				or string.sub(entry.name, -10) == \".test.luau\"\n				or string.sub(entry.name, -9) == \".spec.lua\"\n				or string.sub(entry.name, -9) == \".test.lua\"\n				or string.sub(entry.name, -10) == \".snap.luau\"\n				or string.sub(entry.name, -9) == \".snap.lua\"\n			then\n				continue\n			end\n\n			-- Compute relative path\n			local relative = string.sub(fullPath, #relativeTo + 2)\n			table.insert(results, relative)\n		end\n	end\nend\n\nlocal function dirname(filepath: string): string\n	local pos = string.find(filepath, \"/[^/]*$\")\n	if pos then\n		return string.sub(filepath, 1, pos - 1)\n	end\n\n	return \"\"\nend\n\nlocal files: { string } = {}\ndiscoverFiles(luauRoot, luauRoot, files)\n\n-- Parse, strip, and write per-file AST JSON\nfor _, relativePath in files do\n	local fullPath = luauRoot .. \"/\" .. relativePath\n	local source = fs.readfiletostring(fullPath)\n	local parseResult = syntax.parse(source)\n	local stripped = strip(parseResult.root)\n\n	local outPath = outputDir .. \"/\" .. relativePath .. \".json\"\n	local dir = dirname(outPath)\n	if dir ~= \"\" then\n		fs.createdirectory(dir, { makeparents = true })\n	end\n\n	fs.writestringtofile(outPath, json.serialize(stripped))\nend\n\n-- Print file list to stdout (tiny — just paths)\nprint(json.serialize(files :: json.array))\n";
+var parse_ast_default = "local fs = require(\"@std/fs\")\nlocal json = require(\"@std/json\")\nlocal process = require(\"@std/process\")\nlocal syntax = require(\"@std/syntax\")\n\nlocal rawArgs = process.args\nlocal userArgs: { string } = {}\nlocal pastSeparator = false\n\nfor _, arg in rawArgs do\n	if pastSeparator then\n		table.insert(userArgs, arg)\n	elseif arg == \"--\" then\n		pastSeparator = true\n	end\nend\n\nlocal luauRoot = userArgs[1]\nif not luauRoot then\n	error(\"Usage: lute run parse-ast.luau -- <file.luau | luau-root> [output-dir]\")\nend\n\nluauRoot = string.gsub(luauRoot, \"\\\\\", \"/\")\n\n-- Fields to keep per AST tag (beyond tag/kind/location which are always kept).\n-- Tags shared by stat/expr variants are merged — nil fields are harmless.\nlocal KEEP: { [string]: { string } } = {\n	assign = { \"values\", \"variables\" },\n	binary = { \"lhsOperand\", \"rhsOperand\" },\n	block = { \"statements\" },\n	boolean = { \"value\" },\n	call = { \"arguments\", \"func\" },\n	cast = { \"operand\" },\n	compoundassign = { \"value\", \"variable\" },\n	conditional = { \"condition\", \"thenBlock\", \"elseifs\", \"elseBlock\", \"thenExpr\", \"elseExpr\" },\n	[\"do\"] = { \"body\" },\n	expression = { \"expression\" },\n	[\"for\"] = { \"body\", \"from\", \"to\", \"step\" },\n	forin = { \"body\", \"values\" },\n	[\"function\"] = { \"body\", \"name\", \"func\" },\n	global = { \"name\" },\n	group = { \"expression\" },\n	index = { \"expression\", \"index\" },\n	indexname = { \"expression\", \"accessor\", \"index\" },\n	instantiate = { \"expr\" },\n	interpolatedstring = { \"expressions\" },\n	[\"local\"] = { \"values\", \"variables\" },\n	localfunction = { \"name\", \"func\" },\n	number = { \"value\" },\n	[\"repeat\"] = { \"body\", \"condition\" },\n	[\"return\"] = { \"expressions\" },\n	string = { \"text\" },\n	table = { \"entries\" },\n	unary = { \"operand\" },\n	[\"while\"] = { \"body\", \"condition\" },\n}\n\nlocal function strip(value: any): any\n	if type(value) ~= \"table\" then\n		return value\n	end\n\n	-- LuauSpan — has beginLine, no tag\n	if value.beginLine ~= nil then\n		return value\n	end\n\n	-- Token — has text but no tag, reduce to {text}\n	if value.text ~= nil and value.tag == nil then\n		return { text = value.text }\n	end\n\n	-- AST node — has tag, keep only allowlisted fields\n	if value.tag ~= nil then\n		local result = { tag = value.tag, kind = value.kind, location = value.location }\n		local fields = KEEP[value.tag :: string]\n		if fields then\n			for _, field in fields do\n				if value[field] ~= nil then\n					result[field] = strip(value[field])\n				end\n			end\n		end\n\n		return result\n	end\n\n	-- Other tables (arrays, Pairs, ElseIf structs) — recurse all fields\n	local result: any = {}\n	for k, v in value do\n		result[k] = strip(v)\n	end\n\n	return result\nend\n\n-- Single-file mode: parse one file, print stripped AST to stdout\nif string.sub(luauRoot, -5) == \".luau\" or string.sub(luauRoot, -4) == \".lua\" then\n	local source = fs.readfiletostring(luauRoot)\n	local parseResult = syntax.parse(source)\n	print(json.serialize(strip(parseResult.root)))\n	return\nend\n\nlocal outputDir = userArgs[2]\nif not outputDir then\n	error(\"Usage: lute run parse-ast.luau -- <luau-root> <output-dir>\")\nend\n\noutputDir = string.gsub(outputDir, \"\\\\\", \"/\")\n\n-- Discover .luau files recursively, skipping node_modules, dot dirs, spec/test files\nlocal function discoverFiles(directory: string, relativeTo: string, results: { string })\n	local entries = fs.listdirectory(directory)\n	for _, entry in entries do\n		local fullPath = directory .. \"/\" .. entry.name\n		if entry.type == \"dir\" then\n			if entry.name == \"node_modules\" or entry.name == \".jest-roblox-coverage\" then\n				continue\n			end\n\n			if string.sub(entry.name, 1, 1) == \".\" then\n				continue\n			end\n\n			discoverFiles(fullPath, relativeTo, results)\n		elseif\n			entry.type == \"file\"\n			and (string.sub(entry.name, -5) == \".luau\" or string.sub(entry.name, -4) == \".lua\")\n		then\n			if\n				string.sub(entry.name, -10) == \".spec.luau\"\n				or string.sub(entry.name, -10) == \".test.luau\"\n				or string.sub(entry.name, -9) == \".spec.lua\"\n				or string.sub(entry.name, -9) == \".test.lua\"\n				or string.sub(entry.name, -10) == \".snap.luau\"\n				or string.sub(entry.name, -9) == \".snap.lua\"\n			then\n				continue\n			end\n\n			-- Compute relative path\n			local relative = string.sub(fullPath, #relativeTo + 2)\n			table.insert(results, relative)\n		end\n	end\nend\n\nlocal function dirname(filepath: string): string\n	local pos = string.find(filepath, \"/[^/]*$\")\n	if pos then\n		return string.sub(filepath, 1, pos - 1)\n	end\n\n	return \"\"\nend\n\nlocal files: { string } = {}\ndiscoverFiles(luauRoot, luauRoot, files)\n\n-- Parse, strip, and write per-file AST JSON\nfor _, relativePath in files do\n	local fullPath = luauRoot .. \"/\" .. relativePath\n	local source = fs.readfiletostring(fullPath)\n	local parseResult = syntax.parse(source)\n	local stripped = strip(parseResult.root)\n\n	local outPath = outputDir .. \"/\" .. relativePath .. \".json\"\n	local dir = dirname(outPath)\n	if dir ~= \"\" then\n		fs.createdirectory(dir, { makeparents = true })\n	end\n\n	fs.writestringtofile(outPath, json.serialize(stripped))\nend\n\n-- Print file list to stdout (tiny — just paths)\nprint(json.serialize(files :: json.array))\n";
 //#endregion
 //#region src/config/luau-config-loader.ts
 let cachedTemporaryDirectory$1;
@@ -326,6 +326,7 @@ async function loadProjectConfigFile(filePath, cwd) {
 	}
 	const { config } = result;
 	if ((typeof config.displayName === "string" ? config.displayName : config.displayName.name) === "") throw new Error(`Project config file "${filePath}" must have a displayName`);
+	deriveIncludeFromTestMatch(config, path$1.posix.dirname(filePath), resolveTsconfigDirectories(cwd));
 	return config;
 }
 async function resolveAllProjects(entries, rootConfig, rojoTree, cwd) {
@@ -348,6 +349,25 @@ function mergeProjectConfig(rootConfig, project) {
 	for (const [key, value] of Object.entries(project)) if (!PROJECT_ONLY_KEYS.has(key) && value !== void 0) merged[key] = value;
 	return merged;
 }
+/**
+* When a project config provides `testMatch` but not `include`, derive
+* `include` by appending `.ts` and `.tsx` extensions.  This lets users
+* write project configs with the standard Jest `testMatch` field without
+* needing the CLI-specific `include`.
+*/
+function deriveIncludeFromTestMatch(config, configDirectory, tsconfig) {
+	const raw = config;
+	if (raw["include"] !== void 0) return;
+	if (!Array.isArray(raw["testMatch"])) return;
+	config.include = raw["testMatch"].flatMap((pattern) => {
+		return (/\.(tsx?|luau?)$/.test(pattern) ? [pattern] : [`${pattern}.ts`, `${pattern}.tsx`]).map((extension) => path$1.posix.join(configDirectory, extension));
+	});
+	const { outDir, rootDir } = tsconfig;
+	if (raw["outDir"] === void 0 && rootDir !== void 0 && outDir !== void 0) {
+		const rootPrefix = `${rootDir}/`;
+		if (configDirectory.startsWith(rootPrefix)) config.outDir = `${outDir}/${configDirectory.slice(rootPrefix.length)}`;
+	}
+}
 const LUAU_BOOLEAN_KEYS = [
 	"automock",
 	"clearMocks",
@@ -527,6 +547,28 @@ function findShadowStubs(directory) {
 	return results;
 }
 //#endregion
+//#region src/coverage/derive-coverage-from.ts
+/**
+* Derives `collectCoverageFrom` glob patterns from project `include` patterns.
+*
+* Extracts the static root directory from each include pattern and generates
+* coverage globs that match all `.ts` source files within those roots, excluding
+* test files. Returns `undefined` when no roots can be extracted (preserving
+* default all-files behavior).
+*/
+function deriveCoverageFromIncludes(projects) {
+	const roots = /* @__PURE__ */ new Set();
+	for (const project of projects) for (const pattern of project.include) try {
+		const { root } = extractStaticRoot(pattern);
+		roots.add(root);
+	} catch {}
+	if (roots.size === 0) return;
+	const patterns = [];
+	for (const root of roots) patterns.push(`${root}/**/*.ts`);
+	patterns.push("!**/*.spec.ts", "!**/*.test.ts");
+	return patterns;
+}
+//#endregion
 //#region src/coverage/mapper.ts
 const positionSchema = type({
 	column: "number",
@@ -569,6 +611,7 @@ function mapCoverageToTypeScript(coverageData, manifest) {
 		} else {
 			const mapped = {
 				coverageMap: resources.coverageMap,
+				sourceMapDirectory: resources.sourceMapDirectory,
 				traceMap: resources.traceMap
 			};
 			mapFileFunctions(mapped, fileCoverage, pendingFunctions, mapFileStatements(mapped, fileCoverage, pendingStatements));
@@ -590,9 +633,11 @@ function loadFileResources(record) {
 	try {
 		traceMap = new TraceMap(fs$1.readFileSync(record.sourceMapPath, "utf-8"));
 	} catch {}
+	const sourceMapDirectory = path$1.posix.dirname(record.sourceMapPath);
 	return {
 		coverageMap: parsed,
 		sourceKey: record.key,
+		sourceMapDirectory,
 		traceMap
 	};
 }
@@ -689,7 +734,19 @@ function passthroughFileBranches(resources, fileCoverage, pendingBranches) {
 		});
 	}
 }
-function mapStatement(traceMap, span) {
+/**
+* Resolves a source path from a source map against the source map's directory.
+* Source maps produce paths relative to the .map file (e.g.,
+* `../../../packages/src/file.ts` from `out/packages/src/file.lua.map`).
+* Joining with the map directory normalizes these to cwd-relative paths.
+* Paths that are already cwd-relative (no `..` prefix) pass through unchanged.
+*/
+function resolveSourcePath(source, sourceMapDirectory) {
+	const normalized = source.replaceAll("\\", "/");
+	if (!normalized.startsWith("..")) return normalized;
+	return path$1.posix.normalize(path$1.posix.join(sourceMapDirectory, normalized));
+}
+function mapStatement(traceMap, span, sourceMapDirectory) {
 	const mappedStart = originalPositionFor(traceMap, {
 		column: Math.max(0, span.start.column - 1),
 		line: span.start.line
@@ -699,16 +756,17 @@ function mapStatement(traceMap, span) {
 		line: span.end.line
 	});
 	if (mappedStart.source === null || mappedEnd.source === null || mappedStart.source !== mappedEnd.source) return;
+	const resolvedSource = resolveSourcePath(mappedStart.source, sourceMapDirectory);
 	return {
 		end: {
 			column: mappedEnd.column,
 			line: mappedEnd.line,
-			source: mappedEnd.source
+			source: resolvedSource
 		},
 		start: {
 			column: mappedStart.column,
 			line: mappedStart.line,
-			source: mappedStart.source
+			source: resolvedSource
 		}
 	};
 }
@@ -750,7 +808,7 @@ function mapFileStatements(resources, fileCoverage, pending) {
 		const span = spanSchema(rawSpan);
 		if (span instanceof type.errors) continue;
 		const hitCount = fileCoverage.s[statementId] ?? 0;
-		const mapped = mapStatement(resources.traceMap, span);
+		const mapped = mapStatement(resources.traceMap, span, resources.sourceMapDirectory);
 		if (mapped === void 0) continue;
 		resolvedTsPaths.add(mapped.start.source);
 		addOrCoalesce(pending, mapped.start, mapped.end, hitCount);
@@ -763,7 +821,7 @@ function mapFileFunctions(resources, fileCoverage, pendingFunctions, resolvedTsP
 		const entry = functionEntrySchema(rawEntry);
 		if (entry instanceof type.errors) continue;
 		const hitCount = fileCoverage.f?.[functionId] ?? 0;
-		const mapped = mapStatement(resources.traceMap, entry.location);
+		const mapped = mapStatement(resources.traceMap, entry.location, resources.sourceMapDirectory);
 		if (mapped !== void 0) {
 			const tsPath = mapped.start.source;
 			let fileFunctions = pendingFunctions.get(tsPath);
@@ -810,13 +868,13 @@ function mapFileFunctions(resources, fileCoverage, pendingFunctions, resolvedTsP
 		});
 	}
 }
-function mapBranchArmLocations(traceMap, rawLocations) {
+function mapBranchArmLocations(traceMap, rawLocations, sourceMapDirectory) {
 	const mappedLocations = [];
 	let tsPath;
 	for (const rawLocation of rawLocations) {
 		const location = spanSchema(rawLocation);
 		if (location instanceof type.errors) return;
-		const mapped = mapStatement(traceMap, location);
+		const mapped = mapStatement(traceMap, location, sourceMapDirectory);
 		if (mapped === void 0) return;
 		if (tsPath === void 0) tsPath = mapped.start.source;
 		else if (tsPath !== mapped.start.source) return;
@@ -843,7 +901,7 @@ function mapFileBranches(resources, fileCoverage, pendingBranches) {
 		const entry = branchEntrySchema(rawEntry);
 		if (entry instanceof type.errors) continue;
 		const armHitCounts = fileCoverage.b?.[branchId] ?? [];
-		const result = mapBranchArmLocations(resources.traceMap, entry.locations);
+		const result = mapBranchArmLocations(resources.traceMap, entry.locations, resources.sourceMapDirectory);
 		if (result === void 0) continue;
 		let fileBranches = pendingBranches.get(result.tsPath);
 		if (fileBranches === void 0) {
@@ -1113,13 +1171,13 @@ function visitStatDo(node, visitor) {
 function visitStatIf(node, visitor) {
 	if (visitor.visitStatIf?.(node) === false) return;
 	visitExpression(node.condition, visitor);
-	visitStatBlock(node.thenblock, visitor);
+	visitStatBlock(node.thenBlock, visitor);
 	for (const elseif of node.elseifs) visitElseIfStat(elseif, visitor);
-	if (node.elseblock) visitStatBlock(node.elseblock, visitor);
+	if (node.elseBlock) visitStatBlock(node.elseBlock, visitor);
 }
 function visitElseIfStat(node, visitor) {
 	visitExpression(node.condition, visitor);
-	visitStatBlock(node.thenblock, visitor);
+	visitStatBlock(node.thenBlock, visitor);
 }
 function visitStatWhile(node, visitor) {
 	if (visitor.visitStatWhile?.(node) === false) return;
@@ -1190,8 +1248,8 @@ function visitExprUnary(node, visitor) {
 }
 function visitExprBinary(node, visitor) {
 	if (visitor.visitExprBinary?.(node) === false) return;
-	visitExpression(node.lhsoperand, visitor);
-	visitExpression(node.rhsoperand, visitor);
+	visitExpression(node.lhsOperand, visitor);
+	visitExpression(node.rhsOperand, visitor);
 }
 function visitExprTable(node, visitor) {
 	if (visitor.visitExprTable?.(node) === false) return;
@@ -1226,13 +1284,13 @@ function visitExprTypeAssertion(node, visitor) {
 function visitExprIfElse(node, visitor) {
 	if (visitor.visitExprIfElse?.(node) === false) return;
 	visitExpression(node.condition, visitor);
-	visitExpression(node.thenexpr, visitor);
+	visitExpression(node.thenExpr, visitor);
 	for (const elseif of node.elseifs) visitElseIfExpr(elseif, visitor);
-	visitExpression(node.elseexpr, visitor);
+	visitExpression(node.elseExpr, visitor);
 }
 function visitElseIfExpr(node, visitor) {
 	visitExpression(node.condition, visitor);
-	visitExpression(node.thenexpr, visitor);
+	visitExpression(node.thenExpr, visitor);
 }
 function visitExprInstantiate(node, visitor) {
 	if (visitor.visitExprInstantiate?.(node) === false) return;
@@ -1292,36 +1350,36 @@ function collectCoverage(root) {
 			branch.arms.push({
 				bodyFirstColumn: 0,
 				bodyFirstLine: 0,
-				location: { ...node.thenexpr.location }
+				location: { ...node.thenExpr.location }
 			});
 			exprIfProbes.push({
 				armIndex,
 				branchIndex,
-				exprLocation: { ...node.thenexpr.location }
+				exprLocation: { ...node.thenExpr.location }
 			});
 			armIndex++;
 			for (const elseif of node.elseifs) {
 				branch.arms.push({
 					bodyFirstColumn: 0,
 					bodyFirstLine: 0,
-					location: { ...elseif.thenexpr.location }
+					location: { ...elseif.thenExpr.location }
 				});
 				exprIfProbes.push({
 					armIndex,
 					branchIndex,
-					exprLocation: { ...elseif.thenexpr.location }
+					exprLocation: { ...elseif.thenExpr.location }
 				});
 				armIndex++;
 			}
 			branch.arms.push({
 				bodyFirstColumn: 0,
 				bodyFirstLine: 0,
-				location: { ...node.elseexpr.location }
+				location: { ...node.elseExpr.location }
 			});
 			exprIfProbes.push({
 				armIndex,
 				branchIndex,
-				exprLocation: { ...node.elseexpr.location }
+				exprLocation: { ...node.elseExpr.location }
 			});
 			branches.push(branch);
 			branchIndex++;
@@ -1357,21 +1415,21 @@ function collectCoverage(root) {
 				branchType: "if",
 				index: branchIndex
 			};
-			const thenFirst = getBodyFirstStatement(node.thenblock);
+			const thenFirst = getBodyFirstStatement(node.thenBlock);
 			branch.arms.push({
 				bodyFirstColumn: thenFirst.column,
 				bodyFirstLine: thenFirst.line,
-				location: { ...node.thenblock.location }
+				location: { ...node.thenBlock.location }
 			});
 			for (const elseif of node.elseifs) {
-				const elseifFirst = getBodyFirstStatement(elseif.thenblock);
+				const elseifFirst = getBodyFirstStatement(elseif.thenBlock);
 				branch.arms.push({
 					bodyFirstColumn: elseifFirst.column,
 					bodyFirstLine: elseifFirst.line,
-					location: { ...elseif.thenblock.location }
+					location: { ...elseif.thenBlock.location }
 				});
 			}
-			const elseBlock = node.elseblock;
+			const { elseBlock } = node;
 			const hasExplicitElse = elseBlock !== void 0 && elseBlock.statements.length > 0;
 			if (hasExplicitElse) {
 				const elseFirst = getBodyFirstStatement(elseBlock);
@@ -1386,17 +1444,17 @@ function collectCoverage(root) {
 					bodyFirstColumn: 0,
 					bodyFirstLine: 0,
 					location: {
-						begincolumn: node.location.begincolumn,
-						beginline: node.location.beginline,
-						endcolumn: node.location.begincolumn,
-						endline: node.location.beginline
+						beginColumn: node.location.beginColumn,
+						beginLine: node.location.beginLine,
+						endColumn: node.location.beginColumn,
+						endLine: node.location.beginLine
 					}
 				});
 				implicitElseProbes.push({
 					armIndex: branch.arms.length,
 					branchIndex,
-					endColumn: node.location.endcolumn - END_KEYWORD_LENGTH,
-					endLine: node.location.endline
+					endColumn: node.location.endColumn - END_KEYWORD_LENGTH,
+					endLine: node.location.endLine
 				});
 			}
 			branches.push(branch);
@@ -1429,12 +1487,12 @@ function collectCoverage(root) {
 function getBodyFirstStatement(block) {
 	const first = block.statements[0];
 	if (first !== void 0) return {
-		column: first.location.begincolumn,
-		line: first.location.beginline
+		column: first.location.beginColumn,
+		line: first.location.beginLine
 	};
 	return {
-		column: block.location.begincolumn,
-		line: block.location.beginline
+		column: block.location.beginColumn,
+		line: block.location.beginLine
 	};
 }
 function extractExprName(expr) {
@@ -1451,12 +1509,12 @@ function buildCoverageMap$1(result) {
 	const statementMap = {};
 	for (const statement of result.statements) statementMap[String(statement.index)] = {
 		end: {
-			column: statement.location.endcolumn,
-			line: statement.location.endline
+			column: statement.location.endColumn,
+			line: statement.location.endLine
 		},
 		start: {
-			column: statement.location.begincolumn,
-			line: statement.location.beginline
+			column: statement.location.beginColumn,
+			line: statement.location.beginLine
 		}
 	};
 	const functionMap = {};
@@ -1464,12 +1522,12 @@ function buildCoverageMap$1(result) {
 		name: func.name,
 		location: {
 			end: {
-				column: func.location.endcolumn,
-				line: func.location.endline
+				column: func.location.endColumn,
+				line: func.location.endLine
 			},
 			start: {
-				column: func.location.begincolumn,
-				line: func.location.beginline
+				column: func.location.beginColumn,
+				line: func.location.beginLine
 			}
 		}
 	};
@@ -1478,12 +1536,12 @@ function buildCoverageMap$1(result) {
 		locations: branch.arms.map((arm) => {
 			return {
 				end: {
-					column: arm.location.endcolumn,
-					line: arm.location.endline
+					column: arm.location.endColumn,
+					line: arm.location.endLine
 				},
 				start: {
-					column: arm.location.begincolumn,
-					line: arm.location.beginline
+					column: arm.location.beginColumn,
+					line: arm.location.beginLine
 				}
 			};
 		}),
@@ -1505,8 +1563,8 @@ function insertProbes(source, result, fileKey) {
 function collectProbes(result) {
 	const probes = [];
 	for (const stmt of result.statements) probes.push({
-		column: stmt.location.begincolumn,
-		line: stmt.location.beginline,
+		column: stmt.location.beginColumn,
+		line: stmt.location.beginLine,
 		text: `__cov_s[${stmt.index}] += 1; `
 	});
 	for (const func of result.functions) if (func.bodyFirstLine > 0) probes.push({
@@ -1528,12 +1586,12 @@ function collectProbes(result) {
 		text: `else __cov_b[${probe.branchIndex}][${probe.armIndex}] += 1 `
 	});
 	for (const probe of result.exprIfProbes) probes.push({
-		column: probe.exprLocation.begincolumn,
-		line: probe.exprLocation.beginline,
+		column: probe.exprLocation.beginColumn,
+		line: probe.exprLocation.beginLine,
 		text: `__cov_br(${probe.branchIndex}, ${probe.armIndex}, `
 	}, {
-		column: probe.exprLocation.endcolumn,
-		line: probe.exprLocation.endline,
+		column: probe.exprLocation.endColumn,
+		line: probe.exprLocation.endLine,
 		text: ")"
 	});
 	probes.sort((a, b) => {
@@ -1753,10 +1811,30 @@ function walkTree(node, context) {
 //#endregion
 //#region src/coverage/prepare.ts
 const COVERAGE_DIR = ".jest-roblox-coverage";
+/**
+* Suffixes for files that are not instrumented for coverage but still need
+* syncing to the shadow directory. Matches parse-ast.luau:131-139.
+*/
+const NON_INSTRUMENTED_SUFFIXES = [
+	".spec.luau",
+	".test.luau",
+	".spec.lua",
+	".test.lua",
+	".snap.luau",
+	".snap.lua"
+];
+function isNonInstrumentedFile(filename) {
+	return NON_INSTRUMENTED_SUFFIXES.some((suffix) => filename.endsWith(suffix));
+}
 const previousManifestSchema = type({
 	"files": type({ "[string]": { sourceHash: "string" } }),
 	"instrumenterVersion": "number",
 	"luauRoots": "string[]",
+	"nonInstrumentedFiles?": type({ "[string]": {
+		shadowPath: "string",
+		sourceHash: "string",
+		sourcePath: "string"
+	} }),
 	"placeFilePath?": "string",
 	"shadowDir": "string",
 	"version": "number"
@@ -1782,12 +1860,14 @@ function prepareCoverage(config, beforeBuild) {
 	const useIncremental = canUseIncremental(previousManifest, config);
 	if (!useIncremental && fs$1.existsSync(COVERAGE_DIR)) fs$1.rmSync(COVERAGE_DIR, { recursive: true });
 	const allFiles = {};
+	const allNonInstrumented = {};
 	const roots = [];
 	let hasChanges = !useIncremental;
 	for (const luauRoot of luauRoots) {
 		const rootResult = instrumentRootWithCache(luauRoot, useIncremental, previousManifest);
 		if (rootResult.changed) hasChanges = true;
 		Object.assign(allFiles, rootResult.files);
+		Object.assign(allNonInstrumented, rootResult.nonInstrumentedFiles);
 		roots.push(rootResult.rootEntry);
 	}
 	if (useIncremental && previousManifest !== void 0) {
@@ -1799,7 +1879,13 @@ function prepareCoverage(config, beforeBuild) {
 		if (beforeBuild(COVERAGE_DIR)) hasChanges = true;
 	}
 	const placeFile = path$1.join(COVERAGE_DIR, "game.rbxl");
-	const manifest = writeManifest(manifestPath, allFiles, luauRoots, placeFile);
+	const manifest = writeManifest({
+		allFiles,
+		luauRoots,
+		manifestPath,
+		nonInstrumentedFiles: allNonInstrumented,
+		placeFile
+	});
 	if (!hasChanges && previousManifest?.placeFilePath !== void 0) return {
 		manifest,
 		placeFile: previousManifest.placeFilePath
@@ -1866,6 +1952,64 @@ function carryForwardRecords(luauRoot, previousManifest, allFiles, skipFiles) {
 		Object.assign(allFiles, { [fileKey]: previousManifest.files[fileKey] });
 	}
 }
+function discoverNonInstrumentedFiles(directory, relativeTo, results) {
+	const entries = fs$1.readdirSync(directory, { withFileTypes: true });
+	for (const entry of entries) {
+		const fullPath = path$1.join(directory, entry.name).replaceAll("\\", "/");
+		if (entry.isDirectory()) {
+			if (entry.name === "node_modules" || entry.name === COVERAGE_DIR) continue;
+			if (entry.name.startsWith(".")) continue;
+			discoverNonInstrumentedFiles(fullPath, relativeTo, results);
+		} else if (isNonInstrumentedFile(entry.name)) {
+			const relative = fullPath.slice(relativeTo.length + 1);
+			results.push(relative);
+		}
+	}
+}
+function pruneStaleNonInstrumented(posixRoot, previousNonInstrumented, currentFiles) {
+	if (previousNonInstrumented === void 0) return false;
+	let changed = false;
+	for (const [fileKey, record] of Object.entries(previousNonInstrumented)) {
+		if (!fileKey.startsWith(`${posixRoot}/`)) continue;
+		if (fileKey in currentFiles) continue;
+		try {
+			if (fs$1.existsSync(record.shadowPath)) fs$1.unlinkSync(record.shadowPath);
+		} catch {}
+		changed = true;
+	}
+	return changed;
+}
+function syncNonInstrumentedFiles(luauRoot, shadowDirectory, previousNonInstrumented) {
+	const posixRoot = luauRoot.replaceAll("\\", "/");
+	const discovered = [];
+	discoverNonInstrumentedFiles(posixRoot, posixRoot, discovered);
+	const files = {};
+	let changed = false;
+	for (const relativePath of discovered) {
+		const sourcePath = `${posixRoot}/${relativePath}`;
+		const shadowPath = `${shadowDirectory}/${relativePath}`;
+		const currentHash = hashBuffer(fs$1.readFileSync(path$1.resolve(sourcePath)));
+		const previousRecord = previousNonInstrumented?.[sourcePath];
+		if (previousRecord?.sourceHash === currentHash) {
+			files[sourcePath] = previousRecord;
+			continue;
+		}
+		const outputDirectory = path$1.dirname(shadowPath);
+		fs$1.mkdirSync(outputDirectory, { recursive: true });
+		fs$1.copyFileSync(path$1.resolve(sourcePath), shadowPath);
+		files[sourcePath] = {
+			shadowPath,
+			sourceHash: currentHash,
+			sourcePath
+		};
+		changed = true;
+	}
+	changed = pruneStaleNonInstrumented(posixRoot, previousNonInstrumented, files) || changed;
+	return {
+		changed,
+		files
+	};
+}
 function instrumentRootWithCache(luauRoot, useIncremental, previousManifest) {
 	const shadowDirectory = path$1.join(COVERAGE_DIR, luauRoot).replaceAll("\\", "/");
 	let changed = false;
@@ -1887,10 +2031,13 @@ function instrumentRootWithCache(luauRoot, useIncremental, previousManifest) {
 	if (Object.keys(files).length > 0) changed = true;
 	const allFiles = { ...files };
 	if (useIncremental && previousManifest !== void 0 && skipFiles !== void 0) carryForwardRecords(luauRoot, previousManifest, allFiles, skipFiles);
+	const syncResult = syncNonInstrumentedFiles(luauRoot, shadowDirectory, previousManifest?.nonInstrumentedFiles);
+	if (syncResult.changed) changed = true;
 	const relocatedShadowDirectory = path$1.relative(COVERAGE_DIR, shadowDirectory).replaceAll("\\", "/");
 	return {
 		changed,
 		files: allFiles,
+		nonInstrumentedFiles: syncResult.files,
 		rootEntry: {
 			luauRoot,
 			relocatedShadowDirectory,
@@ -1898,12 +2045,14 @@ function instrumentRootWithCache(luauRoot, useIncremental, previousManifest) {
 		}
 	};
 }
-function writeManifest(manifestPath, allFiles, luauRoots, placeFile) {
+function writeManifest(options) {
+	const { allFiles, luauRoots, manifestPath, nonInstrumentedFiles, placeFile } = options;
 	const manifest = {
 		files: allFiles,
 		generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
 		instrumenterVersion: 2,
 		luauRoots,
+		nonInstrumentedFiles,
 		placeFilePath: placeFile,
 		shadowDir: COVERAGE_DIR,
 		version: 1
@@ -1941,6 +2090,7 @@ function canUseIncremental(previousManifest, config) {
 	if (!config.cache) return false;
 	if (previousManifest === void 0) return false;
 	if (previousManifest.instrumenterVersion !== 2) return false;
+	if (previousManifest.nonInstrumentedFiles === void 0) return false;
 	return true;
 }
 function detectDeletedFiles(previousManifest, currentFiles) {
@@ -2720,7 +2870,10 @@ async function runMultiProject(cli, rootConfig, projectEntries) {
 		return 2;
 	}
 	if (projectResults.length === 0) return outputResults(rootConfig, typecheckResult, void 0, preCoverageMs);
-	return outputMultiProjectResults(rootConfig, projectResults, typecheckResult, preCoverageMs);
+	return outputMultiProjectResults({
+		...rootConfig,
+		collectCoverageFrom: rootConfig.collectCoverageFrom ?? deriveCoverageFromIncludes(projects)
+	}, projectResults, typecheckResult, preCoverageMs);
 }
 async function executeRuntimeTests(config, testFiles, totalFiles) {
 	if (!config.silent && !usesAgentFormatter(config) && !hasFormatter(config, "json") && testFiles.length !== totalFiles) process.stderr.write(`Running ${String(testFiles.length)} of ${String(totalFiles)} test files\n`);