cluaupp 0.2.3 → 1.0.0

package/include/{cluaupp/libs/topbarplus.hpp → clpp/libs/topbarplus.clh}

@@ -1,10 +1,9 @@
 #pragma once
 
-// 1ForeverHD/TopbarPlus — vendored into CluauppLibs.TopbarPlus (class Icon)
-class IconTheme {};
+// 1ForeverHD/TopbarPlus — vendored into CluauppLibs.TopbarPlus (struct Icon)
+struct IconTheme {};
 
-class Icon {
-public:
+struct Icon {
 	static Icon* new_();
 	Icon* setName(string name);
 	Icon* setLabel(string text);

package/include/clpp/libs.clh

@@ -0,0 +1,24 @@
+#pragma once
+// Cluaupp libraries — CL++ IntelliSense. clpp emits
+// require(ReplicatedStorage.CluauppLibs.*). Runtime lives in runtime/.
+
+#include <clpp/generated/instances.clh>
+#include <clpp/libs/janitor.clh>
+#include <clpp/libs/promise.clh>
+#include <clpp/libs/net.clh>
+#include <clpp/libs/math.clh>
+#include <clpp/libs/formatnumber.clh>
+#include <clpp/libs/module3d.clh>
+#include <clpp/libs/twinkle.clh>
+#include <clpp/libs/dataservice.clh>
+#include <clpp/libs/ezvisual.clh>
+#include <clpp/libs/spring.clh>
+#include <clpp/libs/display.clh>
+#include <clpp/libs/stickybillboard.clh>
+#include <clpp/libs/topbarplus.clh>
+#include <clpp/libs/cmdr.clh>
+#include <clpp/libs/chrono.clh>
+#include <clpp/libs/iris.clh>
+#include <clpp/libs/fusion.clh>
+#include <clpp/libs/statemachine.clh>
+#include <clpp/libs/vfx.clh>

package/include/clpp/roblox.clh

@@ -0,0 +1,31 @@
+#pragma once
+// Cluaupp — Roblox API stubs for CL++ IntelliSense.
+// Source: official client dump + datatypes from create.roblox.com
+// clpp emits Luau (Vector3.new, Instance.new, :GetPlayers, ...).
+
+#include <clpp/generated/enums.clh>
+#include <clpp/datatypes.clh>
+#include <clpp/generated/instances.clh>
+#include <clpp/libs.clh>
+
+template <typename T>
+T* GetService();
+
+template <typename T>
+T* GetService(Instance* game_);
+
+extern DataModel* game;
+extern Workspace* workspace;
+extern LuaSourceContainer* script;
+
+void post(string message);
+void warn(string message);
+void report(string message);
+void print(string message);
+void error(string message);
+
+double tick();
+double time();
+void wait(double seconds = 0);
+void spawn(void (*callback)());
+void delay(double seconds, void (*callback)());

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cluaupp",
-	"version": "0.2.3",
-	"description": "Cluaupp — the definitive merge of C++ and modern Luau. Source-to-source transpiler with first-class Roblox APIs.",
+	"version": "1.0.0",
+	"description": "Cluaupp toolchain — compile CL++ to Luau with Rojo and CluauppLibs.",
 	"author": "KartzDev",
 	"license": "MIT",
 	"bin": {
@@ -34,7 +34,8 @@
 		"build:cli": "tsc",
 		"dev:cli": "tsx src/cli.ts",
 		"prepare": "tsc",
-		"test": "node test/out.test.js && node test/types.test.js && node test/modules.test.js && node test/security.test.js && node test/understander.test.js",
+		"test": "node test/security.test.js && node test/understander.test.js && node test/out.test.js && node test/types.test.js && node test/modules.test.js && node test/clpp.test.js",
+		"test:clpp-contract": "node test/clpp.test.js",
 		"generate-api": "node scripts/generate-api.js",
 		"check-highlight": "tsx web/src/check-content.ts",
 		"vendor-libs": "node scripts/vendor-libs.js",
@@ -52,13 +53,12 @@
 	"keywords": [
 		"luau",
 		"roblox",
-		"cpp",
-		"c++",
+		"clpp",
+		"cl++",
 		"transpiler",
 		"compiler",
 		"rojo",
-		"cluaupp",
-		"cluau"
+		"cluaupp"
 	],
 	"repository": {
 		"type": "git",
@@ -69,18 +69,11 @@
 	},
 	"homepage": "https://github.com/KartzRbx/Cluaupp#readme",
 	"dependencies": {
-		"cluaupp": "^0.2.2",
 		"commander": "^15.0.0",
 		"comment-json": "^5.0.0",
-		"tree-sitter": "0.21.1",
-		"tree-sitter-c": "0.23.2",
-		"tree-sitter-cpp": "0.23.4",
 		"vscode-languageserver": "^10.1.1",
 		"vscode-languageserver-textdocument": "^1.0.14"
 	},
-	"overrides": {
-		"tree-sitter-c": "0.23.2"
-	},
 	"devDependencies": {
 		"@types/node": "^22.20.3",
 		"@types/react": "^19.3.0",

package/src/cli.ts

@@ -3,11 +3,13 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { pkg } from "./package-info.js";
 import { start as startLsp } from "./lsp.js";
-import { toLuauPath } from "./preprocess.js";
+import { collectSources, toLuauPath } from "./clpp/paths.js";
+import { CLPP_INSTALL_HINT } from "./clpp/contract.js";
+import { clppManifest, clppVersion, hasClpp, resolveClppBinary } from "./clpp/runner.js";
 import { installEditorSupport, syncEditorSupport } from "./intellisense.js";
 import { RojoMapper } from "./utils/rojo-mapper.js";
 import { ProcessOrchestrator } from "./utils/process-orchestrator.js";
-import { build as buildProject, init, loadConfig, watch, collectCpp } from "./utils/project.js";
+import { build as buildProject, init, loadConfig, watch } from "./utils/project.js";
 import { transpileSource } from "./transpile.js";
 import type { BuildOptions, BuildResult } from "./types.js";
 
@@ -15,7 +17,7 @@ const program = new Command();
 
 program
 	.name("cluaupp")
-	.description("Definitive transpiler from C++ subset to structured Luau")
+	.description("Cluaupp toolchain — compile CL++ to Luau, Rojo, and CluauppLibs")
 	.version(pkg.version, "-v, --version", "print version")
 	.showHelpAfterError()
 	.action(() => {
@@ -37,14 +39,14 @@ program
 
 program
 	.command("build")
-	.description("Transpila um arquivo, diretório ou projeto C++ para Luau")
+	.description("Compile a CL++ file, directory, or project to Luau")
 	.argument("[folder]", "project folder", ".")
-	.option("-i, --input <path>", "Arquivo ou diretório C++ de entrada")
-	.option("-o, --output <path>", "Arquivo ou diretório Luau de saída")
-	.option("-r, --rojo <path>", "Caminho para o default.project.json do Rojo", "./default.project.json")
-	.option("--strict", "Emitir --!strict")
-	.option("--format", "Rodar StyLua no output")
-	.option("--analyze", "Rodar luau-analyze no output")
+	.option("-i, --input <path>", "CL++ file or directory")
+	.option("-o, --output <path>", "Luau file or directory")
+	.option("-r, --rojo <path>", "Path to Rojo default.project.json", "./default.project.json")
+	.option("--strict", "Emit --!strict")
+	.option("--format", "Run StyLua on output")
+	.option("--analyze", "Run luau-analyze on output")
 	.action(async (folder: string, options: {
 		input?: string;
 		output?: string;
@@ -73,8 +75,8 @@ program
 	.command("watch")
 	.description("rebuild on save")
 	.argument("[folder]", "project folder", ".")
-	.option("-r, --rojo <path>", "Caminho para o default.project.json do Rojo", "./default.project.json")
-	.option("--format", "Rodar StyLua no output")
+	.option("-r, --rojo <path>", "Path to Rojo default.project.json", "./default.project.json")
+	.option("--format", "Run StyLua on output")
 	.action((folder: string, options: { rojo?: string; format?: boolean }) => {
 		try {
 			watch(path.resolve(process.cwd(), folder), {
@@ -89,7 +91,7 @@ program
 
 program
 	.command("lsp")
-	.description("Cluaupp subset diagnostics over stdio (JSON-RPC). C++ completion is clangd.")
+	.description("Language server stdio (JSON-RPC). Use `clpp install` for CL++ IntelliSense.")
 	.argument("[folder]", "project folder", ".")
 	.action((folder: string) => {
 		startLsp({ projectRoot: path.resolve(process.cwd(), folder) });
@@ -98,18 +100,32 @@ program
 program
 	.command("intellisense")
 	.alias("intelisense")
-	.description("install LLVM clangd and write compile_commands.json")
+	.description("Point the editor at CL++ (`clpp install`)")
 	.argument("[folder]", "project folder", ".")
 	.action(async (folder: string) => {
 		try {
 			const root = path.resolve(process.cwd(), folder);
 			syncEditorSupport(root, loadConfig(root));
-			const installed = await installEditorSupport();
-			console.log("cluaupp: compile_commands.json, .clangd, and .vscode updated in", root);
-			console.log("cluaupp: C++ completion is clangd (include/cluaupp/roblox.hpp)");
-			if (installed.clangd || installed.llvm) {
-				console.log("cluaupp: reload Cursor (Ctrl+Shift+P → Developer: Reload Window)");
+			await installEditorSupport();
+			console.log("cluaupp: editor associations written in", root);
+			console.log("cluaupp:", CLPP_INSTALL_HINT);
+		} catch (err) {
+			console.error(err instanceof Error ? err.message : err);
+			process.exit(1);
+		}
+	});
+
+program
+	.command("language")
+	.description("CL++ manifest (`clpp api manifest`)")
+	.action(() => {
+		try {
+			resolveClppBinary();
+			const version = clppVersion();
+			if (version) {
+				console.log("clpp", version);
 			}
+			console.log(JSON.stringify(clppManifest(), null, "\t"));
 		} catch (err) {
 			console.error(err instanceof Error ? err.message : err);
 			process.exit(1);
@@ -139,17 +155,15 @@ async function buildInput(options: {
 		process.exit(1);
 	}
 
-	console.log("🏁 Inicializando Pipeline do Compilador Cluaupp V2...");
-
 	const mapper = new RojoMapper(path.resolve(options.rojo), path.dirname(inputPath));
 	await mapper.load();
 
 	const inputs = (await fs.stat(inputPath)).isDirectory()
-		? collectCpp(inputPath)
+		? collectSources(inputPath)
 		: [inputPath];
 
 	if (inputs.length === 0) {
-		console.error("no .cpp/.h/.hpp files in", inputPath);
+		console.error("no .clpp/.clp/.clh files in", inputPath);
 		process.exit(1);
 	}
 
@@ -184,7 +198,7 @@ async function buildInput(options: {
 				console.log("\nRelatório de Análise Estática do Luau:\n", analysisReport);
 			}
 		}
-		console.log(`Transpilação concluída! ${file} → ${dest}`);
+		console.log(`Compiled ${file} → ${dest}`);
 	}
 }
 
@@ -192,7 +206,7 @@ export function build(root: string, options: BuildOptions = {}): BuildResult {
 	return buildProject(root, options);
 }
 
-export { watch, init, program };
+export { watch, init, program, hasClpp };
 
 export function dispatch(args: string[]): Promise<Command> {
 	return program.parseAsync(["node", "cluaupp", ...args]);

package/src/clpp/contract.ts

@@ -0,0 +1,39 @@
+/** Stable CL++ ↔ Cluaupp contract. Cluaupp invokes the `clpp` binary. */
+
+export interface CompileRequest {
+	source: string;
+	fileName: string;
+	strict?: boolean;
+	cwd?: string;
+}
+
+export interface CompileArtifact {
+	ok: boolean;
+	luau: string;
+	fileName: string;
+	outputHint: string;
+	scriptKind: "server" | "client" | "plugin" | null;
+	isScript: boolean;
+	isHeader: boolean;
+	rojoClass: "Script" | "LocalScript" | "ModuleScript";
+	libraries: string[];
+	error?: string;
+}
+
+export interface LanguageManifest {
+	name: "CL++";
+	id: "clpp";
+	version: string;
+	extensions: string[];
+	tags: Array<{
+		pattern: string;
+		scriptKind: string;
+		rojoClass: string;
+	}>;
+	builtins: string[];
+	operators: Array<{ clpp: string; luau: string; meaning: string }>;
+	io: Array<{ clpp: string; luau: string }>;
+}
+
+export const CLPP_INSTALL_HINT =
+	"Install CL++ and put `clpp` on PATH: https://github.com/KartzRbx/CLPP (`cargo install --path .` then `clpp install`). Override with CLPP_PATH.";

package/src/clpp/index.ts

@@ -0,0 +1,18 @@
+export type { CompileArtifact, CompileRequest, LanguageManifest } from "./contract.js";
+export { CLPP_INSTALL_HINT } from "./contract.js";
+export { compileViaClpp, clppManifest, clppVersion, hasClpp, resolveClppBinary } from "./runner.js";
+export { clppLuauToGame, shouldSkipInit } from "./postprocess.js";
+export {
+	SOURCE_EXTS,
+	collectSources,
+	emitKind,
+	fileStem,
+	isEngineStub,
+	isHeaderFile,
+	isImplFile,
+	isSourceFile,
+	isTaggedScript,
+	scriptKind,
+	siblingHeader,
+	toLuauPath,
+} from "./paths.js";

package/src/clpp/paths.ts

@@ -0,0 +1,117 @@
+import fs from "node:fs";
+import path from "node:path";
+
+export const SOURCE_EXTS = [".clpp", ".clp", ".clh"];
+
+export function isSourceFile(fileName: string): boolean {
+	return SOURCE_EXTS.includes(path.extname(fileName).toLowerCase());
+}
+
+export function isEngineStub(filePath: string): boolean {
+	const normalized = filePath.replace(/\\/g, "/").toLowerCase();
+	return (
+		normalized.includes("/include/cluaupp/") ||
+		normalized.includes("/include/clpp/") ||
+		normalized.includes("/include/cluau/") ||
+		normalized.includes("/stdlib/") ||
+		normalized.endsWith("/roblox.hpp") ||
+		normalized.endsWith("/roblox.h") ||
+		normalized.endsWith("/roblox.clh")
+	);
+}
+
+export function isHeaderFile(fileName: string): boolean {
+	return path.extname(fileName).toLowerCase() === ".clh";
+}
+
+export function isImplFile(fileName: string): boolean {
+	const ext = path.extname(fileName).toLowerCase();
+	return ext === ".clp" || ext === ".clpp";
+}
+
+export function toLuauPath(filePath: string): string {
+	return String(filePath).replace(/\.(clpp|clp|clh)$/i, ".luau");
+}
+
+export function fileStem(fileName: string): string {
+	let name = path.basename(fileName);
+	const lower = name.toLowerCase();
+	for (const ext of [".clpp", ".clp", ".clh"]) {
+		if (lower.endsWith(ext)) {
+			name = name.slice(0, -ext.length);
+			break;
+		}
+	}
+	const tagged = name.toLowerCase();
+	for (const tag of [".legacy.server", ".legacy.client", ".legacy", ".server", ".client", ".plugin"]) {
+		if (tagged.endsWith(tag)) {
+			name = name.slice(0, -tag.length);
+			break;
+		}
+	}
+	return name;
+}
+
+export function scriptKind(fileName: string): "server" | "client" | "plugin" | "legacy" | "module" | "header" {
+	const name = path.basename(fileName).toLowerCase();
+	if (name.endsWith(".clh")) {
+		return "header";
+	}
+	if (name.includes(".legacy.")) {
+		return "legacy";
+	}
+	if (name.includes(".server.")) {
+		return "server";
+	}
+	if (name.includes(".client.")) {
+		return "client";
+	}
+	if (name.includes(".plugin.")) {
+		return "plugin";
+	}
+	return "module";
+}
+
+export function emitKind(fileName: string): "flat" | "module" | "legacy" {
+	const kind = scriptKind(fileName);
+	if (kind === "legacy") {
+		return "legacy";
+	}
+	if (kind === "module" || kind === "header") {
+		return "module";
+	}
+	return "flat";
+}
+
+export function isTaggedScript(fileName: string): boolean {
+	const kind = scriptKind(fileName);
+	return kind === "server" || kind === "client" || kind === "plugin" || kind === "legacy";
+}
+
+export function siblingHeader(implPath: string | null | undefined): string | null {
+	if (!implPath || isHeaderFile(implPath)) {
+		return null;
+	}
+	const dir = path.dirname(implPath);
+	const stem = fileStem(implPath);
+	const candidate = path.join(dir, `${stem}.clh`);
+	if (fs.existsSync(candidate)) {
+		return candidate;
+	}
+	return null;
+}
+
+export function collectSources(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()) {
+			collectSources(full, files);
+		} else if (isSourceFile(entry.name)) {
+			files.push(full);
+		}
+	}
+	return files;
+}

package/src/clpp/postprocess.ts

@@ -0,0 +1,93 @@
+import { insertPreamble, MODULES, requireCluauppLib } from "../libs.js";
+import type { CompileArtifact } from "./contract.js";
+import { isTaggedScript } from "./paths.js";
+
+export type PostprocessOptions = {
+	relativeName: string;
+	outName: string;
+	srcDir?: string;
+	rootDir?: string;
+	strict?: boolean;
+	skipInit?: boolean;
+};
+
+function insertAfterHeader(luau: string, block: string): string {
+	const match = String(luau).match(/^(?:--[^\n]*\n)+/);
+	if (!match) {
+		return `${block}\n${luau}`;
+	}
+	const insertAt = match[0].length;
+	const rest = luau.slice(insertAt).replace(/^\n*/, "\n");
+	return `${luau.slice(0, insertAt)}\n${block}\n${rest}`;
+}
+
+function rewriteClppLibs(luau: string): string {
+	return String(luau).replace(/require\(\s*ClppLibs\.([A-Za-z0-9_]+)\s*\)/g, (_all, name: string) => {
+		return requireCluauppLib(name);
+	});
+}
+
+function ensureReplicatedStorage(luau: string): string {
+	if (!luau.includes("CluauppLibs")) {
+		return luau;
+	}
+	if (/GetService\(\s*"ReplicatedStorage"\s*\)/.test(luau)) {
+		return luau;
+	}
+	return insertAfterHeader(luau, 'const ReplicatedStorage = game:GetService("ReplicatedStorage")');
+}
+
+function stripInitCall(luau: string): string {
+	return String(luau).replace(/\ninit\(\)\s*\n?$/m, "\n");
+}
+
+function ensureStrict(luau: string, strict?: boolean): string {
+	if (!strict || /^\s*--!strict\b/m.test(luau)) {
+		return luau;
+	}
+	if (luau.startsWith("--")) {
+		return `--!strict\n${luau}`;
+	}
+	return `--!strict\n${luau}`;
+}
+
+function librarySpecs(names: string[] | undefined) {
+	const specs: Array<{ file: string; bind: string }> = [];
+	const seen = new Set<string>();
+	for (const name of names || []) {
+		const spec = (MODULES as Record<string, { file: string; bind: string }>)[name];
+		if (!spec || seen.has(spec.bind)) {
+			continue;
+		}
+		seen.add(spec.bind);
+		specs.push(spec);
+	}
+	return specs;
+}
+
+function missingLibraries(luau: string, names: string[] | undefined) {
+	return librarySpecs(names).filter((spec) => {
+		return !luau.includes(`CluauppLibs.${spec.file}`) && !new RegExp(`\\bconst ${spec.bind}\\b`).test(luau);
+	});
+}
+
+export function shouldSkipInit(fileName: string, hasSiblingHeader: boolean): boolean {
+	if (!hasSiblingHeader) {
+		return false;
+	}
+	return !isTaggedScript(fileName);
+}
+
+export function clppLuauToGame(artifact: CompileArtifact, options: PostprocessOptions): string {
+	let luau = rewriteClppLibs(artifact.luau || "");
+	luau = ensureReplicatedStorage(luau);
+	if (options.skipInit) {
+		luau = stripInitCall(luau);
+	}
+	luau = ensureStrict(luau, options.strict);
+	const missing = missingLibraries(luau, artifact.libraries);
+	if (missing.length > 0) {
+		luau = insertPreamble(luau, [], missing, options.outName);
+	}
+	return luau;
+}

package/src/clpp/runner.ts

@@ -0,0 +1,102 @@
+import { spawnSync } from "node:child_process";
+import { CLPP_INSTALL_HINT, type CompileArtifact, type CompileRequest, type LanguageManifest } from "./contract.js";
+
+const MISSING_CLPP = `cluaupp: clpp not found. ${CLPP_INSTALL_HINT}`;
+
+function whichClpp(): string | null {
+	if (process.env.CLPP_PATH) {
+		return process.env.CLPP_PATH;
+	}
+	const finder = process.platform === "win32" ? "where" : "which";
+	const found = spawnSync(finder, ["clpp"], { encoding: "utf8", windowsHide: true });
+	if (found.status !== 0) {
+		return null;
+	}
+	const line = String(found.stdout || "")
+		.split(/\r?\n/)
+		.map((item) => item.trim())
+		.find((item) => item.length > 0);
+	return line || "clpp";
+}
+
+export function hasClpp(): boolean {
+	return Boolean(whichClpp());
+}
+
+export function resolveClppBinary(): string {
+	const bin = whichClpp();
+	if (!bin) {
+		throw new Error(MISSING_CLPP);
+	}
+	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 compileViaClpp(request: CompileRequest): CompileArtifact {
+	const bin = resolveClppBinary();
+	const payload = JSON.stringify({
+		source: request.source,
+		fileName: request.fileName,
+		strict: request.strict,
+	});
+	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(artifact.error || stderr || `clpp failed (${result.status})`);
+	}
+	return artifact;
+}
+
+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;
+	}
+	const result = spawnSync(bin, ["--version"], { encoding: "utf8", windowsHide: true });
+	if (result.status !== 0) {
+		return null;
+	}
+	return String(result.stdout || "").trim() || null;
+}