cluaupp 0.2.3 → 1.3.0

package/src/clpp/runner.ts

@@ -0,0 +1,272 @@
+import { spawn, spawnSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import {
+	CLPP_INSTALL_HINT,
+	MIN_CLPP_VERSION,
+	type CompileArtifact,
+	type CompileDiagnostic,
+	type CompileRequest,
+	type LanguageManifest,
+} from "./contract.js";
+
+const MISSING_CLPP = `cluaupp: clpp not found. ${CLPP_INSTALL_HINT}`;
+
+type Semver = { major: number; minor: number; patch: number };
+
+let cachedBin: string | null | undefined;
+
+function parseSemver(text: string): Semver | null {
+	const match = String(text).match(/(\d+)\.(\d+)\.(\d+)/);
+	if (!match) {
+		return null;
+	}
+	return { major: Number(match[1]), minor: Number(match[2]), patch: Number(match[3]) };
+}
+
+function cmpSemver(a: Semver, b: Semver): number {
+	return a.major - b.major || a.minor - b.minor || a.patch - b.patch;
+}
+
+function minClpp(): Semver {
+	return parseSemver(MIN_CLPP_VERSION) || { major: 0, minor: 3, patch: 2 };
+}
+
+function tooOldMessage(bin: string, version: string | null): string {
+	return `cluaupp: clpp ${version || "unknown"} is too old (${bin}). Need CL++ ${MIN_CLPP_VERSION}+. Install https://github.com/KartzRbx/CLPP/releases/download/v0.3.2/clpp-setup.exe or set CLPP / CLPP_PATH.`;
+}
+
+function probeVersion(bin: string): string | null {
+	const result = spawnSync(bin, ["--version"], { encoding: "utf8", windowsHide: true });
+	if (result.status !== 0) {
+		return null;
+	}
+	return String(result.stdout || result.stderr || "").trim() || null;
+}
+
+function pushCandidate(out: string[], seen: Set<string>, item: string | undefined): void {
+	const value = String(item || "").trim();
+	if (!value) {
+		return;
+	}
+	const key = value.toLowerCase();
+	if (seen.has(key)) {
+		return;
+	}
+	seen.add(key);
+	out.push(value);
+}
+
+function existsBin(bin: string): boolean {
+	try {
+		return fs.existsSync(bin);
+	} catch {
+		return false;
+	}
+}
+
+function listClppCandidates(): string[] {
+	const seen = new Set<string>();
+	const override: string[] = [];
+	pushCandidate(override, seen, process.env.CLPP);
+	pushCandidate(override, seen, process.env.CLPP_PATH);
+	const overrideExisting = override.filter(existsBin);
+	if (overrideExisting.length > 0) {
+		return overrideExisting;
+	}
+
+	const out: string[] = [];
+	const finder = process.platform === "win32" ? "where" : "which";
+	const found = spawnSync(finder, ["clpp"], { encoding: "utf8", windowsHide: true });
+	if (found.status === 0) {
+		for (const line of String(found.stdout || "").split(/\r?\n/)) {
+			pushCandidate(out, seen, line);
+		}
+	}
+
+	if (process.platform === "win32") {
+		const local = process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
+		pushCandidate(out, seen, path.join(local, "Programs", "CLPP", "clpp.exe"));
+	}
+
+	return out.filter(existsBin);
+}
+
+function pickClppBinary(): string | null {
+	const candidates = listClppCandidates();
+	if (candidates.length === 0) {
+		return null;
+	}
+	let best: { bin: string; parsed: Semver } | null = null;
+	let fallback: string | null = null;
+	for (const bin of candidates) {
+		const version = probeVersion(bin);
+		const parsed = parseSemver(version || "");
+		if (!fallback) {
+			fallback = bin;
+		}
+		if (!parsed) {
+			continue;
+		}
+		if (!best || cmpSemver(parsed, best.parsed) > 0) {
+			best = { bin, parsed };
+		}
+	}
+	return best?.bin || fallback;
+}
+
+function whichClpp(): string | null {
+	if (cachedBin !== undefined) {
+		return cachedBin;
+	}
+	cachedBin = pickClppBinary();
+	return cachedBin;
+}
+
+export function hasClpp(): boolean {
+	return Boolean(whichClpp());
+}
+
+export function resolveClppBinary(): string {
+	const bin = whichClpp();
+	if (!bin) {
+		throw new Error(MISSING_CLPP);
+	}
+	const version = probeVersion(bin);
+	const parsed = parseSemver(version || "");
+	if (!parsed || cmpSemver(parsed, minClpp()) < 0) {
+		throw new Error(tooOldMessage(bin, version));
+	}
+	return bin;
+}
+
+function parseArtifact(stdout: string, fileName: string, fallbackError: string): CompileArtifact {
+	const text = String(stdout || "").trim();
+	try {
+		const parsed = JSON.parse(text) as CompileArtifact;
+		if (parsed && typeof parsed === "object") {
+			return parsed;
+		}
+	} catch {
+		// fall through
+	}
+	return {
+		ok: false,
+		luau: "",
+		fileName,
+		outputHint: "",
+		scriptKind: null,
+		isScript: false,
+		isHeader: false,
+		rojoClass: "ModuleScript",
+		libraries: [],
+		error: fallbackError || "clpp returned invalid JSON",
+	};
+}
+
+export function formatClppFailure(artifact: CompileArtifact, fallback: string): string {
+	const diags = Array.isArray(artifact.diagnostics) ? artifact.diagnostics : [];
+	if (diags.length > 0) {
+		return diags
+			.map((d: CompileDiagnostic) => {
+				const where = `${artifact.fileName || "clpp"}:${d.line}:${d.column}`;
+				return `${where}: ${d.message}`;
+			})
+			.join("\n");
+	}
+	return artifact.error || fallback;
+}
+
+export function compileViaClpp(request: CompileRequest): CompileArtifact {
+	const bin = resolveClppBinary();
+	const payload = JSON.stringify({
+		source: request.source,
+		fileName: request.fileName,
+		strict: request.strict ?? null,
+	});
+	const result = spawnSync(bin, ["api", "compile"], {
+		input: payload,
+		encoding: "utf8",
+		cwd: request.cwd,
+		maxBuffer: 16 * 1024 * 1024,
+		windowsHide: true,
+	});
+	const stderr = String(result.stderr || "").trim();
+	const artifact = parseArtifact(result.stdout, request.fileName, stderr || result.error?.message || "clpp api compile failed");
+	if (!artifact.ok) {
+		throw new Error(formatClppFailure(artifact, stderr || result.error?.message || `clpp failed (${result.status})`));
+	}
+	return artifact;
+}
+
+export function compileViaClppAsync(request: CompileRequest): Promise<CompileArtifact> {
+	return new Promise((resolve, reject) => {
+		let bin: string;
+		try {
+			bin = resolveClppBinary();
+		} catch (err) {
+			reject(err);
+			return;
+		}
+		const child = spawn(bin, ["api", "compile"], {
+			cwd: request.cwd,
+			windowsHide: true,
+		});
+		let stdout = "";
+		let stderr = "";
+		child.stdout.setEncoding("utf8");
+		child.stderr.setEncoding("utf8");
+		child.stdout.on("data", (chunk) => {
+			stdout += chunk;
+		});
+		child.stderr.on("data", (chunk) => {
+			stderr += chunk;
+		});
+		child.on("error", reject);
+		child.on("close", (code) => {
+			const artifact = parseArtifact(stdout, request.fileName, stderr.trim() || `clpp api compile failed (${code})`);
+			if (!artifact.ok) {
+				reject(new Error(formatClppFailure(artifact, stderr.trim() || `clpp failed (${code})`)));
+				return;
+			}
+			resolve(artifact);
+		});
+		child.stdin.end(
+			JSON.stringify({
+				source: request.source,
+				fileName: request.fileName,
+				strict: request.strict ?? null,
+			}),
+		);
+	});
+}
+
+export function clppManifest(): LanguageManifest {
+	const bin = resolveClppBinary();
+	const result = spawnSync(bin, ["api", "manifest"], {
+		encoding: "utf8",
+		windowsHide: true,
+	});
+	if (result.status !== 0) {
+		throw new Error(String(result.stderr || result.error?.message || "clpp api manifest failed"));
+	}
+	return JSON.parse(result.stdout) as LanguageManifest;
+}
+
+export function clppVersion(): string | null {
+	const bin = whichClpp();
+	if (!bin) {
+		return null;
+	}
+	return probeVersion(bin);
+}
+
+export function clppInstalls(): Array<{ bin: string; version: string | null; selected: boolean }> {
+	const selected = whichClpp();
+	return listClppCandidates().map((bin) => ({
+		bin,
+		version: probeVersion(bin),
+		selected: bin === selected,
+	}));
+}

package/src/compile.ts

@@ -1,160 +1,59 @@
-import fs from "node:fs";
 import path from "node:path";
-import { parse } from "./parse.js";
-import { emit } from "./emit.js";
-import { preprocess, isHeaderFile, toLuauPath, siblingImplementation, siblingHeader, implOutName } from "./preprocess.js";
-import { collectLibraries, insertPreamble } from "./libs.js";
-import { planOutput } from "./architecture.js";
-import { emitHeaderModule, primaryHeaderName } from "./headers.js";
-import type { AstNode, AstProgram, ModuleInclude, PreprocessOptions } from "./ast.js";
 import type { CompileOptions, CompileServiceResult } from "./types.js";
-
-function shouldAttachRequires(name: string, contents: string): boolean {
-	const file = String(name || "").replace(/\\/g, "/");
-	if (/\.json$/i.test(file) || /\.meta\.json$/i.test(file)) {
-		return false;
-	}
-	const trimmed = String(contents || "").trim();
-	if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
-		return false;
-	}
-	return true;
-}
-
-function attachRequires(contents: string, source: string, ast: AstProgram, options: PreprocessOptions, outName: string): string {
-	if (!shouldAttachRequires(outName, contents)) {
-		return contents;
-	}
-	const libraries = String(contents).includes("CluauppLibs") ? [] : collectLibraries(source, ast);
-	return insertPreamble(contents, options.moduleIncludes || [], libraries, outName);
-}
-
-function posixRel(from: string, file: string): string {
-	return path.relative(from, file).replace(/\\/g, "/");
-}
-
-function declKey(decl: AstNode): string {
-	return `${decl.owner || ""}::${decl.name}`;
-}
-
-function mergeSiblingImpl(ast: AstProgram, implPath: string, options: PreprocessOptions): void {
-	const implOptions: PreprocessOptions = {
-		...options,
-		moduleIncludes: [],
-		seen: new Set(),
-		pragmaResolved: false,
+import { compileViaClpp, compileViaClppAsync } from "./clpp/runner.js";
+import { clppLuauToGame, shouldSkipInit } from "./clpp/postprocess.js";
+import { emitKind, siblingHeader, toLuauPath } from "./clpp/paths.js";
+import type { CompileArtifact } from "./clpp/contract.js";
+
+function compileArgs(source: string, fileName: string | undefined, options: CompileOptions) {
+	const relative = (options.relativeName || fileName || "input.clpp").replace(/\\/g, "/");
+	const outName = options.outName || toLuauPath(relative);
+	const header = options.filePath ? siblingHeader(options.filePath) : null;
+	const skipInit = options.skipInit === true || shouldSkipInit(relative, Boolean(header));
+	const diskPath = options.filePath ? path.resolve(options.filePath) : null;
+	return {
+		request: {
+			source,
+			fileName: diskPath ? diskPath.replace(/\\/g, "/") : relative,
+			strict: options.strict,
+			cwd: diskPath ? path.dirname(diskPath) : options.srcDir,
+		},
+		relative,
+		outName,
+		skipInit,
+		options,
 	};
-	const prepared = preprocess(fs.readFileSync(implPath, "utf8"), implPath, implOptions);
-	const implAst = parse(prepared, path.basename(implPath)) as AstProgram;
-	if (!Array.isArray(ast.body)) {
-		ast.body = [];
-	}
-	const existing = new Set(
-		(ast.body || [])
-			.filter((decl) => decl && (decl.type === "function" || decl.type === "proto") && decl.name)
-			.map(declKey),
-	);
-	for (const decl of implAst.body || []) {
-		if ((decl.type !== "function" && decl.type !== "proto") || !decl.name) {
-			continue;
-		}
-		const key = declKey(decl);
-		if (existing.has(key)) {
-			continue;
-		}
-		existing.add(key);
-		ast.body.push({
-			type: "proto",
-			name: decl.name,
-			owner: decl.owner,
-			returnType: decl.returnType,
-			params: decl.params,
-		});
-	}
-}
-
-function wireHeaderImpl(ast: AstProgram, fileName: string, options: PreprocessOptions): void {
-	const headerPath = options.filePath || null;
-	const impl = headerPath ? siblingImplementation(headerPath) : null;
-	if (!impl) {
-		return;
-	}
-	mergeSiblingImpl(ast, impl, options);
-	const typeName = primaryHeaderName(ast, options.relativeName || fileName);
-	const implRel = options.srcDir ? posixRel(options.srcDir, impl) : path.basename(impl).replace(/\\/g, "/");
-	const implOut = implOutName(implRel);
-	options.headerImplName = `${typeName}Module`;
-	options.moduleIncludes = options.moduleIncludes || [];
-	if (!options.moduleIncludes.some((spec: ModuleInclude) => spec.name === options.headerImplName)) {
-		options.moduleIncludes.push({
-			name: options.headerImplName,
-			outRel: implOut,
-			exports: { consts: [], structs: [] },
-		});
-	}
 }
 
-function compileHeader(source: string, fileName: string, options: PreprocessOptions, ast: AstProgram): CompileServiceResult {
-	wireHeaderImpl(ast, fileName, options);
-	const rel = (options.relativeName || fileName || "header.h").replace(/\\/g, "/");
-	const outName = toLuauPath(rel);
-	const luau = attachRequires(emitHeaderModule(ast, options), source, ast, options, outName);
+function finishArtifact(artifact: CompileArtifact, relative: string, outName: string, options: CompileOptions, skipInit: boolean): CompileServiceResult {
+	const luau = clppLuauToGame(artifact, {
+		relativeName: relative,
+		outName,
+		srcDir: options.srcDir,
+		rootDir: options.rootDir,
+		strict: options.strict,
+		skipInit,
+	});
 	return {
-		kind: "module",
-		plan: { kind: "module", strict: options.strict === true },
+		kind: emitKind(relative),
+		plan: { kind: emitKind(relative), strict: options.strict === true },
 		files: [{ name: outName, contents: luau }],
 		stale: [],
 	};
 }
 
 export function compileSource(source: string, fileName?: string, options: CompileOptions = {}): string {
-	const opts = options as PreprocessOptions;
-	opts.moduleIncludes = opts.moduleIncludes || [];
-	const prepared = preprocess(source, opts.filePath || null, opts);
-	const ast = parse(prepared, fileName || "input.cpp");
-	if (isHeaderFile(fileName || "") || isHeaderFile(opts.filePath || "")) {
-		return compileHeader(source, fileName || "header.h", opts, ast).files[0].contents;
-	}
-	const luau = emit(ast, opts);
-	return attachRequires(luau, source, ast, opts, opts.outName || fileName || "input.cpp");
+	return compileService(source, fileName, options).files[0]?.contents ?? "";
 }
 
 export function compileService(source: string, fileName?: string, options: CompileOptions = {}): CompileServiceResult {
-	const opts = options as PreprocessOptions;
-	opts.moduleIncludes = opts.moduleIncludes || [];
-	const prepared = preprocess(source, opts.filePath || null, opts);
-	const ast = parse(prepared, fileName || "input.cpp");
-	if (isHeaderFile(fileName || "") || isHeaderFile(opts.filePath || "") || isHeaderFile(opts.relativeName || "")) {
-		return compileHeader(source, fileName || "header.h", opts, ast);
-	}
-	const implHeader = opts.filePath ? siblingHeader(opts.filePath) : null;
-	if (implHeader) {
-		opts.skipInit = true;
-	}
-	const planned = planOutput(ast, fileName || "input.cpp", {
-		...opts,
-		relativeName: opts.relativeName || fileName,
-		source: prepared,
-		siblingHeader: implHeader,
-	});
-	if (planned.files) {
-		return {
-			...planned,
-			files: planned.files.map((file: { name: string; contents: string }) => ({
-				...file,
-				contents: attachRequires(file.contents, source, ast, opts, file.name),
-			})),
-		};
-	}
-	const luau = attachRequires(emit(ast, opts), source, ast, opts, planned.outName || opts.outName || fileName || "input.cpp");
-	const name =
-		planned.outName ||
-		opts.outName ||
-		String(fileName || "input.cpp").replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau");
-	return {
-		kind: planned.kind || "flat",
-		plan: planned.plan,
-		files: [{ name, contents: luau }],
-		stale: planned.stale || [],
-	};
+	const args = compileArgs(source, fileName, options);
+	const artifact = compileViaClpp(args.request);
+	return finishArtifact(artifact, args.relative, args.outName, args.options, args.skipInit);
+}
+
+export async function compileServiceAsync(source: string, fileName?: string, options: CompileOptions = {}): Promise<CompileServiceResult> {
+	const args = compileArgs(source, fileName, options);
+	const artifact = await compileViaClppAsync(args.request);
+	return finishArtifact(artifact, args.relative, args.outName, args.options, args.skipInit);
 }