cluaupp 0.2.3 → 1.3.0

package/src/utils/project.ts

@@ -2,11 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import type { BuildOptions, BuildResult, ProjectConfig } from "../types.js";
 import { pkg } from "../package-info.js";
-import { isSourceFile, toLuauPath } from "../preprocess.js";
-import { installEditorSupport, syncEditorSupport } from "../intellisense.js";
+import { collectSources, toLuauPath } from "../clpp/paths.js";
+import { syncEditorSupport } from "../intellisense.js";
 import { ProcessOrchestrator } from "./process-orchestrator.js";
 import { RojoMapper } from "./rojo-mapper.js";
-import { transpileSource } from "../transpile.js";
+import { transpileSource, transpileSourceAsync } from "../transpile.js";
 import { assertInitDest, assertInside, isInside, safeProjectSubdir, safeRelPath } from "./safe-paths.js";
 
 function readProjectConfig(file: string): Partial<ProjectConfig> {
@@ -137,28 +137,19 @@ function copyRuntime(dest: string): void {
 }
 
 function copyHeaders(dest: string): void {
-	const from = path.join(__dirname, "..", "..", "include", "cluaupp");
+	const from = path.join(__dirname, "..", "..", "include", "clpp");
 	if (!fs.existsSync(from)) {
 		return;
 	}
-	syncDir(from, path.join(dest, "include", "cluaupp"));
+	syncDir(from, path.join(dest, "include", "clpp"));
 }
 
 export function collectCpp(dir: string, files: string[] = []): string[] {
-	if (!fs.existsSync(dir)) {
-		return files;
-	}
-	for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-		const full = path.join(dir, entry.name);
-		if (entry.isDirectory()) {
-			collectCpp(full, files);
-		} else if (isSourceFile(entry.name)) {
-			files.push(full);
-		}
-	}
-	return files;
+	return collectSources(dir, files);
 }
 
+export const collectSourcesFiles = collectSources;
+
 function collectFiles(dir: string, files: string[] = []): string[] {
 	if (!fs.existsSync(dir)) {
 		return files;
@@ -184,7 +175,7 @@ function posixRel(from: string, file: string): string {
 }
 
 function sourcePrefixes(rel: string): string[] {
-	const noExt = rel.replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, "");
+	const noExt = rel.replace(/\.(clpp|clp|clh)$/i, "");
 	const noTag = noExt.replace(/\.(server|client)$/i, "");
 	return [...new Set([noExt, noTag, toLuauPath(rel).replace(/\\/g, "/")])];
 }
@@ -254,9 +245,43 @@ function createMapper(root: string, config: ProjectConfig, rojoPath?: string): R
 	return mapper;
 }
 
+function compileOptions(root: string, config: ProjectConfig, file: string, rel: string) {
+	const srcDir = path.join(root, config.rootDir);
+	return {
+		...config,
+		filePath: file,
+		relativeName: rel,
+		outName: toLuauPath(rel),
+		architecture: config.architecture === true,
+		includeDirs: [path.dirname(file), srcDir, path.join(root, "include")],
+		srcDir,
+		outDir: config.outDir,
+	};
+}
+
 function compileProject(root: string, config: ProjectConfig, mapper: RojoMapper) {
 	const srcDir = path.join(root, config.rootDir);
-	const files = collectCpp(srcDir);
+	const files = collectSources(srcDir);
+	const jobs: Array<{ rel: string; files: Array<{ name: string; contents: string }>; stale: string[] }> = [];
+	const errors: Array<{ rel: string; prefixes: string[]; message: string }> = [];
+
+	for (const file of files) {
+		const source = fs.readFileSync(file, "utf8");
+		const rel = posixRel(srcDir, file);
+		try {
+			const result = transpileSource(source, rel, compileOptions(root, config, file, rel), mapper);
+			jobs.push({ rel, files: result.files, stale: result.stale || [] });
+		} catch (err) {
+			errors.push({ rel, prefixes: sourcePrefixes(rel), message: (err as Error).message });
+		}
+	}
+
+	return { files, jobs, errors };
+}
+
+async function compileProjectAsync(root: string, config: ProjectConfig, mapper: RojoMapper) {
+	const srcDir = path.join(root, config.rootDir);
+	const files = collectSources(srcDir);
 	const jobs: Array<{ rel: string; files: Array<{ name: string; contents: string }>; stale: string[] }> = [];
 	const errors: Array<{ rel: string; prefixes: string[]; message: string }> = [];
 
@@ -264,16 +289,7 @@ function compileProject(root: string, config: ProjectConfig, mapper: RojoMapper)
 		const source = fs.readFileSync(file, "utf8");
 		const rel = posixRel(srcDir, file);
 		try {
-			const result = transpileSource(source, rel, {
-				...config,
-				filePath: file,
-				relativeName: rel,
-				outName: toLuauPath(rel),
-				architecture: config.architecture === true,
-				includeDirs: [path.dirname(file), srcDir, path.join(root, "include")],
-				srcDir,
-				outDir: config.outDir,
-			}, mapper);
+			const result = await transpileSourceAsync(source, rel, compileOptions(root, config, file, rel), mapper);
 			jobs.push({ rel, files: result.files, stale: result.stale || [] });
 		} catch (err) {
 			errors.push({ rel, prefixes: sourcePrefixes(rel), message: (err as Error).message });
@@ -341,28 +357,15 @@ function ensureVendor(root: string): void {
 	copyHeaders(root);
 }
 
-export function build(root: string, options: BuildOptions = {}): BuildResult {
+function finishBuild(
+	root: string,
+	config: ProjectConfig,
+	compiled: { jobs: Array<{ rel: string; files: Array<{ name: string; contents: string }>; stale: string[] }>; errors: Array<{ rel: string; prefixes: string[]; message: string }> },
+	options: BuildOptions,
+): BuildResult {
 	const exitOnError = options.exitOnError !== false;
 	const holdOnError = options.holdOnError === true;
 	const format = options.format === true;
-	const config = loadConfig(root);
-	if (options.syncVendor !== false) {
-		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 mapper = createMapper(root, config, options.rojo);
-	const compiled = compileProject(root, config, mapper);
 	if (compiled.errors.length > 0) {
 		for (const err of compiled.errors) {
 			console.error(err.message);
@@ -404,6 +407,48 @@ export function build(root: string, options: BuildOptions = {}): BuildResult {
 	return { failed: compiled.errors.length, written };
 }
 
+function prepareBuild(root: string, options: BuildOptions) {
+	const exitOnError = options.exitOnError !== false;
+	const holdOnError = options.holdOnError === true;
+	const config = loadConfig(root);
+	if (options.strict === true) {
+		config.strict = true;
+	}
+	if (options.syncVendor !== false) {
+		ensureVendor(root);
+	}
+	const srcDir = path.join(root, config.rootDir);
+	if (!fs.existsSync(srcDir) || collectSources(srcDir).length === 0) {
+		console.error("no .clpp/.clp/.clh files in", config.rootDir);
+		if (!holdOnError) {
+			pruneOut(root, config, new Set(), []);
+		}
+		if (exitOnError) {
+			process.exit(1);
+		}
+		return null;
+	}
+	return { config, mapper: createMapper(root, config, options.rojo) };
+}
+
+export function build(root: string, options: BuildOptions = {}): BuildResult {
+	const prepared = prepareBuild(root, options);
+	if (!prepared) {
+		return { failed: 0, written: new Set() };
+	}
+	const compiled = compileProject(root, prepared.config, prepared.mapper);
+	return finishBuild(root, prepared.config, compiled, options);
+}
+
+export async function buildAsync(root: string, options: BuildOptions = {}): Promise<BuildResult> {
+	const prepared = prepareBuild(root, options);
+	if (!prepared) {
+		return { failed: 0, written: new Set() };
+	}
+	const compiled = await compileProjectAsync(root, prepared.config, prepared.mapper);
+	return finishBuild(root, prepared.config, compiled, options);
+}
+
 export async function init(dest: string): Promise<void> {
 	const target = assertInitDest(dest);
 	const template = path.join(__dirname, "..", "..", "templates", "game");
@@ -412,18 +457,11 @@ export async function init(dest: string): Promise<void> {
 	copyDir(include, path.join(target, "include"));
 	copyRuntime(target);
 	syncEditorSupport(target);
-	const installed = await installEditorSupport();
 	console.log("Cluaupp ready in", target);
+	console.log("  clpp install          (CL++ highlighting + IntelliSense)");
 	console.log("  rokit install");
 	console.log("  cluaupp build");
 	console.log("  rojo serve");
-	if (
-		installed.local.length ||
-		(installed.clangd && (installed.clangd.status === "installed" || installed.clangd.status === "already")) ||
-		(installed.llvm && (installed.llvm.status === "installed" || installed.llvm.status === "already"))
-	) {
-		console.log("  reload Cursor (Ctrl+Shift+P → Developer: Reload Window)");
-	}
 }
 
 function pidAlive(pid: number): boolean {
@@ -467,7 +505,6 @@ function acquireWatchLock(root: string): void {
 
 export function watch(root: string, options: BuildOptions = {}): void {
 	acquireWatchLock(root);
-	build(root, { exitOnError: false, syncVendor: false, holdOnError: true, format: options.format, rojo: options.rojo });
 	const config = loadConfig(root);
 	const dir = path.join(root, config.rootDir);
 	let timer: NodeJS.Timeout | null = null;
@@ -480,23 +517,24 @@ export function watch(root: string, options: BuildOptions = {}): void {
 			return;
 		}
 		running = true;
-		try {
-			build(root, { exitOnError: false, syncVendor: false, holdOnError: true, format: options.format, rojo: options.rojo });
-		} catch (err) {
-			console.error((err as Error).message);
-		} finally {
-			running = false;
-			if (queued) {
-				queued = false;
-				run();
-			}
-		}
+		void buildAsync(root, { exitOnError: false, syncVendor: false, holdOnError: true, format: options.format, rojo: options.rojo })
+			.catch((err) => {
+				console.error((err as Error).message);
+			})
+			.finally(() => {
+				running = false;
+				if (queued) {
+					queued = false;
+					run();
+				}
+			});
 	};
 
 	console.log("cluaupp", pkg.version, "watching", dir, "(libs untouched)");
 	if (!fs.existsSync(dir)) {
 		fs.mkdirSync(dir, { recursive: true });
 	}
+	run();
 	fs.watch(dir, { recursive: true }, () => {
 		if (timer) {
 			clearTimeout(timer);

package/templates/game/.vscode/extensions.json

@@ -1,8 +1,6 @@
 {
-	"recommendations": [
-		"llvm-vs-code-extensions.vscode-clangd"
-	],
 	"unwantedRecommendations": [
 		"ms-vscode.cpptools"
-	]
+	],
+	"recommendations": []
 }

package/templates/game/.vscode/settings.json

@@ -1,18 +1,10 @@
 {
-	"clangd.enable": true,
-	"clangd.arguments": [
-		"--compile-commands-dir=${workspaceFolder}",
-		"--header-insertion=never",
-		"--query-driver=**/clang++*,**/clang++.exe,**/g++*,**/g++.exe"
-	],
 	"files.associations": {
-		"*.hpp": "cpp",
-		"*.h": "cpp",
-		"*.server.cpp": "cpp",
-		"*.client.cpp": "cpp",
-		"*.plugin.cpp": "cpp",
-		"*.legacy.cpp": "cpp",
-		"*.legacy.server.cpp": "cpp",
-		"*.legacy.client.cpp": "cpp"
+		"*.clpp": "clpp",
+		"*.clp": "clpp",
+		"*.clh": "clpp",
+		"*.server.clpp": "clpp",
+		"*.client.clpp": "clpp",
+		"*.plugin.clpp": "clpp"
 	}
 }