cluaupp 0.1.1 → 0.1.2

package/CHANGELOG.md

@@ -1,10 +1,17 @@
 # Changelog
 
+## 0.1.2
+
+- Watch does not write `out/` while any file fails to compile (Studio keeps the last good scripts).
+- Watch/build skip rewriting Luau whose contents did not change (a space in C++ no longer floods Rojo).
+- `libs/` is fill-only: missing files are restored, existing files are never overwritten or deleted. Fixes Rojo 7 crashing on `libs/ArrayIndexer` when watch/build raced a live serve.
+- Dropped `$optional` from `default.project.json` (Rojo 7.7 failed to deserialize it).
+
 ## 0.1.1
 
 - DataService: `DataServiceOptions<T>.Template` is the required player-data table (`T` matches the save struct). Also documents `Exclude`.
 - Compiler: C++ designated initializers (`Type { .Field = value }`) emit Luau tables, so `DataService.Server:Init({ Template = ... })` type-checks and compiles.
-- Watch/build: delete orphaned `out/` files when a source is removed. Never wipe `out/` or `libs/` as a whole — Rojo 7 crashes if `libs/ArrayIndexer` disappears mid-serve. Vendor/header sync only writes missing/changed files (no `rmSync` of `libs/`). Watch rebuilds skip recopying `libs/`. `default.project.json` marks `out/*`, `libs`, and `Packages` as `$optional`.
+- Watch/build: delete orphaned `out/` files when a source is removed. Never wipe `out/` or `libs/` as a whole — Rojo 7 crashes if `libs/ArrayIndexer` disappears mid-serve. Vendor files are only created if missing; existing `libs/` is never overwritten on watch/build. Watch skips writing `out/` when compile fails, and skips rewriting Luau whose contents did not change.
 
 ## 0.1.0
 

package/docs/cli.md

@@ -41,7 +41,7 @@ cluaupp build ./my-game
 
 ## `cluaupp watch [folder]`
 
-Runs a `build` and rebuilds when anything under `src/` changes, including deletes. Parse errors are printed; the watcher stays alive. Rebuilds are debounced and do **not** recopy `libs/` (Rojo is likely already serving those files). Deleted `.cpp` files prune their `out/` artifacts on the next tick.
+Runs a `build` and rebuilds when anything under `src/` changes, including deletes. Parse errors are printed; the watcher stays alive and **does not write `out/`** until the project compiles cleanly (Studio keeps the last good scripts). Rebuilds are debounced and do **not** recopy `libs/`. Deleted `.cpp` files prune their `out/` artifacts on the next successful compile.
 
 ## `cluaupp --version` / `cluaupp -v`
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cluaupp",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "Cluaupp — the definitive merge of C++ and modern Luau. Source-to-source transpiler with first-class Roblox APIs.",
 	"author": "KartzDev",
 	"license": "MIT",
@@ -29,7 +29,7 @@
 		"cluau": "node bin/cluaupp.js",
 		"build": "node bin/cluaupp.js build",
 		"watch": "node bin/cluaupp.js watch",
-		"test": "node test/leaderstats.test.js && node test/understand.test.js && node test/datatypes.test.js && node test/headers.test.js && node test/libs.test.js && node test/runtime-libs.test.js && node test/intellisense.test.js && node test/dataservice.test.js && node test/prune.test.js",
+		"test": "node test/leaderstats.test.js && node test/understand.test.js && node test/datatypes.test.js && node test/headers.test.js && node test/libs.test.js && node test/runtime-libs.test.js && node test/intellisense.test.js && node test/dataservice.test.js && node test/prune.test.js && node test/hold.test.js",
 		"generate-api": "node scripts/generate-api.js",
 		"check-highlight": "node scripts/check-highlight.js",
 		"vendor-libs": "node scripts/vendor-libs.js",

package/src/cli.js

@@ -47,8 +47,11 @@ function tryRm(target) {
 	}
 }
 
-function copyFileIfChanged(src, dest) {
-	if (fs.existsSync(dest)) {
+function copyFileIfChanged(src, dest, mode = "fill") {
+	if (mode === "fill" && fs.existsSync(dest)) {
+		return;
+	}
+	if (mode === "update" && fs.existsSync(dest)) {
 		const from = fs.statSync(src);
 		const to = fs.statSync(dest);
 		if (from.size === to.size && from.mtimeMs <= to.mtimeMs) {
@@ -67,7 +70,7 @@ function copyFileIfChanged(src, dest) {
 	}
 }
 
-function syncDir(from, to) {
+function syncDir(from, to, mode = "fill") {
 	if (!fs.existsSync(from)) {
 		return;
 	}
@@ -76,9 +79,9 @@ function syncDir(from, to) {
 		const src = path.join(from, entry.name);
 		const dest = path.join(to, entry.name);
 		if (entry.isDirectory()) {
-			syncDir(src, dest);
+			syncDir(src, dest, mode);
 		} else {
-			copyFileIfChanged(src, dest);
+			copyFileIfChanged(src, dest, mode);
 		}
 	}
 }
@@ -214,29 +217,13 @@ function pruneOut(root, config, written, failedPrefixes) {
 	removeEmptyOutDirs(outDir, root);
 }
 
-function build(root, options = {}) {
-	const exitOnError = options.exitOnError !== false;
-	const syncVendor = options.syncVendor !== false;
-	const config = loadConfig(root);
-	if (syncVendor) {
-		copyRuntime(root);
-		copyHeaders(root);
-	}
+function compileProject(root, config) {
 	const srcDir = path.join(root, config.rootDir);
 	const files = collectCpp(srcDir);
-	if (files.length === 0) {
-		console.error("no .cpp/.h/.hpp files in", config.rootDir);
-		pruneOut(root, config, new Set(), []);
-		if (exitOnError) {
-			process.exit(1);
-		}
-		return { failed: 0, written: new Set() };
-	}
-
 	const fileSet = new Set(files.map((file) => path.resolve(file)));
-	let failed = 0;
-	const written = new Set();
-	const failedPrefixes = [];
+	const jobs = [];
+	const errors = [];
+
 	for (const file of files) {
 		if (isHeaderFile(file) && fileSet.has(path.resolve(siblingCpp(file)))) {
 			continue;
@@ -252,32 +239,98 @@ function build(root, options = {}) {
 				architecture: config.architecture !== false,
 				includeDirs: [path.dirname(file), srcDir, path.join(root, "include")],
 			});
-			for (const artifact of result.files) {
-				const dest = path.join(root, config.outDir, artifact.name);
-				fs.mkdirSync(path.dirname(dest), { recursive: true });
-				fs.writeFileSync(dest, artifact.contents, "utf8");
-				written.add(resolveKey(dest));
-				console.log("cluaupp:", rel, "→", path.relative(root, dest));
+			jobs.push({ rel, files: result.files, stale: result.stale || [] });
+		} catch (err) {
+			errors.push({ rel, prefixes: sourcePrefixes(rel), message: err.message });
+		}
+	}
+
+	return { files, jobs, errors };
+}
+
+function writeTextIfChanged(dest, contents) {
+	if (fs.existsSync(dest) && fs.readFileSync(dest, "utf8") === contents) {
+		return false;
+	}
+	fs.mkdirSync(path.dirname(dest), { recursive: true });
+	fs.writeFileSync(dest, contents, "utf8");
+	return true;
+}
+
+function writeJobs(root, config, jobs) {
+	const written = new Set();
+	for (const job of jobs) {
+		for (const artifact of job.files) {
+			const dest = path.join(root, config.outDir, artifact.name);
+			const changed = writeTextIfChanged(dest, artifact.contents);
+			written.add(resolveKey(dest));
+			if (changed) {
+				console.log("cluaupp:", job.rel, "→", path.relative(root, dest));
 			}
-			for (const stale of result.stale || []) {
-				const dest = path.join(root, config.outDir, stale);
-				if (fs.existsSync(dest) && !written.has(resolveKey(dest))) {
-					if (tryRm(dest)) {
-						console.log("cluaupp: removed", path.relative(root, dest));
-					}
+		}
+		for (const stale of job.stale) {
+			const dest = path.join(root, config.outDir, stale);
+			if (fs.existsSync(dest) && !written.has(resolveKey(dest))) {
+				if (tryRm(dest)) {
+					console.log("cluaupp: removed", path.relative(root, dest));
 				}
 			}
-		} catch (err) {
-			failed += 1;
-			failedPrefixes.push(...sourcePrefixes(rel));
+		}
+	}
+	return written;
+}
+
+function libsPresent(root) {
+	const libs = path.join(root, "libs");
+	return fs.existsSync(libs) && fs.readdirSync(libs).length > 0;
+}
+
+function ensureVendor(root) {
+	copyRuntime(root);
+	copyHeaders(root);
+}
+
+function build(root, options = {}) {
+	const exitOnError = options.exitOnError !== false;
+	const holdOnError = options.holdOnError === true;
+	const syncVendor = options.syncVendor === true;
+	const config = loadConfig(root);
+	if (syncVendor) {
+		copyRuntime(root);
+		copyHeaders(root);
+	} else {
+		ensureVendor(root);
+	}
+	const srcDir = path.join(root, config.rootDir);
+	if (!fs.existsSync(srcDir) || collectCpp(srcDir).length === 0) {
+		console.error("no .cpp/.h/.hpp files in", config.rootDir);
+		if (!holdOnError) {
+			pruneOut(root, config, new Set(), []);
+		}
+		if (exitOnError) {
+			process.exit(1);
+		}
+		return { failed: 0, written: new Set() };
+	}
+
+	const compiled = compileProject(root, config);
+	if (compiled.errors.length > 0) {
+		for (const err of compiled.errors) {
 			console.error(err.message);
 		}
+		if (holdOnError) {
+			console.error(`cluaupp: out not updated (${compiled.errors.length} compile error${compiled.errors.length === 1 ? "" : "s"})`);
+			return { failed: compiled.errors.length, written: new Set() };
+		}
 	}
+
+	const written = writeJobs(root, config, compiled.jobs);
+	const failedPrefixes = compiled.errors.flatMap((err) => err.prefixes);
 	pruneOut(root, config, written, failedPrefixes);
-	if (failed > 0 && exitOnError) {
+	if (compiled.errors.length > 0 && exitOnError) {
 		process.exit(1);
 	}
-	return { failed, written };
+	return { failed: compiled.errors.length, written };
 }
 
 function init(dest) {
@@ -292,7 +345,7 @@ function init(dest) {
 }
 
 function watch(root) {
-	build(root, { exitOnError: false, syncVendor: true });
+	build(root, { exitOnError: false, syncVendor: false, holdOnError: true });
 	const config = loadConfig(root);
 	const dir = path.join(root, config.rootDir);
 	let timer = null;
@@ -306,7 +359,7 @@ function watch(root) {
 		}
 		running = true;
 		try {
-			build(root, { exitOnError: false, syncVendor: false });
+			build(root, { exitOnError: false, syncVendor: false, holdOnError: true });
 		} catch (err) {
 			console.error(err.message);
 		} finally {
@@ -324,24 +377,30 @@ function watch(root) {
 	}
 	fs.watch(dir, { recursive: true }, () => {
 		clearTimeout(timer);
-		timer = setTimeout(run, 200);
+		timer = setTimeout(run, 400);
 	});
 }
 
-const args = process.argv.slice(2);
-const cmd = args[0] || "help";
-const cwd = process.cwd();
-
-if (cmd === "init") {
-	init(path.resolve(cwd, args[1] || "."));
-} else if (cmd === "build") {
-	build(path.resolve(cwd, args[1] || "."));
-} else if (cmd === "watch") {
-	watch(path.resolve(cwd, args[1] || "."));
-} else if (cmd === "--version" || cmd === "-v" || cmd === "version") {
-	console.log(pkg.version);
-} else {
-	printHelp();
+function dispatch(args) {
+	const cmd = args[0] || "help";
+	const cwd = process.cwd();
+	if (cmd === "init") {
+		init(path.resolve(cwd, args[1] || "."));
+	} else if (cmd === "build") {
+		build(path.resolve(cwd, args[1] || "."));
+	} else if (cmd === "watch") {
+		watch(path.resolve(cwd, args[1] || "."));
+	} else if (cmd === "--version" || cmd === "-v" || cmd === "version") {
+		console.log(pkg.version);
+	} else {
+		printHelp();
+	}
+}
+
+const launchedAsCli =
+	require.main && ["cli.js", "cluaupp.js", "cluau.js"].includes(path.basename(require.main.filename));
+if (launchedAsCli) {
+	dispatch(process.argv.slice(2));
 }
 
-module.exports = { build, watch };
+module.exports = { build, watch, dispatch };

package/templates/game/default.project.json

@@ -5,23 +5,19 @@
 		"ServerScriptService": {
 			"$className": "ServerScriptService",
 			"Cluaupp": {
-				"$path": "out/server",
-				"$optional": true
+				"$path": "out/server"
 			}
 		},
 		"ReplicatedStorage": {
 			"$className": "ReplicatedStorage",
 			"Cluaupp": {
-				"$path": "out/shared",
-				"$optional": true
+				"$path": "out/shared"
 			},
 			"CluauppLibs": {
-				"$path": "libs",
-				"$optional": true
+				"$path": "libs"
 			},
 			"Packages": {
-				"$path": "Packages",
-				"$optional": true
+				"$path": "Packages"
 			}
 		},
 		"StarterPlayer": {
@@ -29,8 +25,7 @@
 			"StarterPlayerScripts": {
 				"$className": "StarterPlayerScripts",
 				"Cluaupp": {
-					"$path": "out/client",
-					"$optional": true
+					"$path": "out/client"
 				}
 			}
 		},