cluaupp 0.2.2 → 1.0.0

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

@@ -1,10 +1,10 @@
 #pragma once
 
 // evaera/Cmdr — vendored into CluauppLibs.Cmdr (server). Client: Cmdr.CmdrClient
-class CmdrType {};
-class CmdrCommand {};
-class CmdrRegistry {};
-class CmdrDispatcher {};
+struct CmdrType {};
+struct CmdrCommand {};
+struct CmdrRegistry {};
+struct CmdrDispatcher {};
 
 namespace Cmdr {
 	void RegisterDefaultCommands();

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

@@ -3,14 +3,11 @@
 // KartzRbx/DataServiceV2 — https://github.com/KartzRbx/DataServiceV2
 // Runtime: CluauppLibs.DataService
 //
-// Real surface (not Get(player, path)):
-//   DataService.Server / DataService.Client / DataService.Paths / DataService.Enum
-//   local data = Server:WaitFor(player)
-//   data:Get(Paths.Currencies.Coins)
-//   data:GetChangedSignal(path):Connect(function(newValue, oldValue) end)
+// Real surface:
+//   DataService:Server / DataService:Client / DataService:Paths / DataService:Enum
 
-class DataPath {};
-class DataProfile {};
+struct DataPath {};
+struct DataProfile {};
 
 struct DataBufferStats {
 	double Bytes;
@@ -45,8 +42,7 @@ struct DataServiceOptions {
 	bool AutoCreateMissingTables;
 };
 
-class Data {
-public:
+struct Data {
 	RBXScriptSignal Changed;
 	bool Destroyed;
 
@@ -112,8 +108,7 @@ public:
 	void Destroy();
 };
 
-class DataServiceServer {
-public:
+struct DataServiceServer {
 	DataPath Paths;
 	template <typename T>
 	DataServiceServer* Init(DataServiceOptions<T> options);
@@ -126,8 +121,7 @@ public:
 	void Destroy();
 };
 
-class DataServiceClient {
-public:
+struct DataServiceClient {
 	DataPath Paths;
 	Data* Init();
 	Data* WaitForData();
@@ -136,8 +130,7 @@ public:
 	void Destroy();
 };
 
-class DataService {
-public:
+struct DataService {
 	static DataServiceServer Server;
 	static DataServiceClient Client;
 	static DataPath Paths;

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

@@ -1,8 +1,7 @@
 #pragma once
 
 // nightcycle/display — pretty-print Luau values (Rust Display-style).
-// Vendored into CluauppLibs.Display with nightcycle/option bundled.
-class DisplayBuilder {};
+struct DisplayBuilder {};
 
 namespace Display {
 	DisplayBuilder* builder();

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

@@ -1,9 +1,7 @@
 #pragma once
 
 // arxkdev/ezVisualz — EasyVisuals, vendored into CluauppLibs.EzVisualz
-// Effect.new(gui, "Rainbow", speed, size)
-class EzVisualz {
-public:
+struct EzVisualz {
 	static EzVisualz* new_(GuiObject* target, string effectType);
 	static EzVisualz* new_(GuiObject* target, string effectType, double speed, double size);
 	void Play();

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

@@ -1,9 +1,8 @@
 #pragma once
 
 // Blockzez/RobloxFormatNumber — vendored into CluauppLibs.FormatNumber
-// Abbreviate / Comma / Compact are Cluaupp helpers over Simple.FormatCompact.
-class FormatNumberMain {};
-class FormatNumberSimple {};
+struct FormatNumberMain {};
+struct FormatNumberSimple {};
 
 namespace FormatNumber {
 	string Abbreviate(double value);

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

@@ -1,11 +1,11 @@
 #pragma once
 
 // dphfox/Fusion 0.4 — vendored into CluauppLibs.Fusion
-class FusionScope {};
-class FusionState {};
-class FusionKey {};
-class FusionObserver {};
-class FusionContextual {};
+struct FusionScope {};
+struct FusionState {};
+struct FusionKey {};
+struct FusionObserver {};
+struct FusionContextual {};
 
 namespace Fusion {
 	FusionScope scoped();

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

@@ -1,8 +1,8 @@
 #pragma once
 
 // SirMallard/Iris — vendored into CluauppLibs.Iris
-class IrisWidget {};
-class IrisState {};
+struct IrisWidget {};
+struct IrisState {};
 
 namespace Iris {
 	void Init();

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

@@ -1,8 +1,7 @@
 #pragma once
 
 // howmanysmall/Janitor — vendored into CluauppLibs.Janitor
-class Janitor {
-public:
+struct Janitor {
 	bool CurrentlyCleaning;
 	bool SuppressInstanceReDestroy;
 	bool UnsafeThreadCleanup;

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

@@ -1,8 +1,7 @@
 #pragma once
 
 // TheNexusAvenger/Module3D — ViewportFrame adorn, vendored into CluauppLibs.Module3D
-class Model3D {
-public:
+struct Model3D {
 	Model* Object3D;
 	GuiObject* AdornFrame;
 	Camera* Camera;
@@ -18,8 +17,7 @@ public:
 	void End();
 };
 
-class Module3D {
-public:
+struct Module3D {
 	static Model3D* new_(Instance* model);
 	static Model3D* Attach3D(GuiObject* frame, Instance* model);
 };

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

@@ -1,8 +1,7 @@
 #pragma once
 
 // Buffer-packed RemoteEvent / RemoteFunction. Names are unique per game.
-class NetEvent {
-public:
+struct NetEvent {
 	void Fire(Player* player);
 	template <typename A>
 	void Fire(Player* player, A a);
@@ -23,8 +22,7 @@ public:
 	void On(void (*callback)());
 };
 
-class NetFunction {
-public:
+struct NetFunction {
 	void On(void (*callback)());
 	template <typename R>
 	R Invoke(Player* player);

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

@@ -1,9 +1,6 @@
 #pragma once
-
 // evaera/roblox-lua-promise — vendored into CluauppLibs.Promise
-// C++ Then/Catch/Await/Cancel map onto andThen/catch/await/cancel.
-class Promise {
-public:
+struct Promise {
 	Promise(void (*executor)());
 	template <typename T>
 	static Promise* resolve(T value);

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

@@ -1,8 +1,7 @@
 #pragma once
 
 // nightcycle/spring — Fraktality-style damped spring, vendored into CluauppLibs.Spring
-class Spring {
-public:
+struct Spring {
 	double Damping;
 	double Frequency;
 	double Goal;

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

@@ -1,10 +1,9 @@
 #pragma once
 
 // Prooheckcp/RobloxStateMachine — vendored into CluauppLibs.StateMachine
-class StateData {};
+struct StateData {};
 
-class StateMachine {
-public:
+struct StateMachine {
 	static StateMachine* new_(string initial);
 	static StateData* LoadDirectory(Instance* directory);
 	void ChangeState(string name);

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

@@ -1,8 +1,7 @@
 #pragma once
 
 // Cluaupp StickyBillboard — BillboardGui that stays on an adornee.
-class StickyBillboard {
-public:
+struct StickyBillboard {
 	static StickyBillboard* new_(Instance* adornee, GuiObject* gui);
 	void SetText(string text);
 	void SetEnabled(bool enabled);

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.2",
-	"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,13 +34,15 @@
 		"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": "node scripts/check-highlight.js",
+		"check-highlight": "tsx web/src/check-content.ts",
 		"vendor-libs": "node scripts/vendor-libs.js",
 		"docs": "moonwave dev",
 		"docs:build": "moonwave build",
-		"site": "node scripts/generate-api.js && node scripts/check-highlight.js",
+		"site": "vite build --config web/vite.config.mts && npm run check-highlight",
+		"site:dev": "vite --config web/vite.config.mts",
 		"dev": "node scripts/dev.js",
 		"stop": "node scripts/stop.js",
 		"prepublishOnly": "tsc && npm test"
@@ -51,13 +53,12 @@
 	"keywords": [
 		"luau",
 		"roblox",
-		"cpp",
-		"c++",
+		"clpp",
+		"cl++",
 		"transpiler",
 		"compiler",
 		"rojo",
-		"cluaupp",
-		"cluau"
+		"cluaupp"
 	],
 	"repository": {
 		"type": "git",
@@ -70,18 +71,21 @@
 	"dependencies": {
 		"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",
+		"@types/react-dom": "^19.3.0",
+		"@vitejs/plugin-react": "^6.0.1",
+		"@vitejs/plugin-vue": "^6.0.1",
+		"react": "^19.1.1",
+		"react-dom": "^19.1.1",
+		"react-router-dom": "^7.8.2",
 		"tsx": "^4.23.13",
-		"typescript": "^7.0.2"
+		"typescript": "^7.0.2",
+		"vite": "^8.0.0",
+		"vue": "^3.5.21"
 	}
 }

package/src/api.ts

@@ -45,9 +45,23 @@ export function luauType(name: string | null | undefined): string | null {
 	if (!name) {
 		return null;
 	}
-	const cleaned = String(name).replace(/\*+$/, "").replace(/^const\s+/, "").replace(/^Enum::/, "Enum.");
+	const cleaned = String(name)
+		.replace(/\*+$/, "")
+		.replace(/^const\s+/, "")
+		.replace(/^Enum::/, "Enum.")
+		.replace(/\s+/g, " ")
+		.trim();
 	if (cleaned in LUAU_TYPES) {
 		return LUAU_TYPES[cleaned];
 	}
+	const generic = cleaned.match(/^(?:std::)?(?:vector|array|span|LuaArray)\s*<\s*([^>]+)\s*>$/);
+	if (generic) {
+		const inner = luauType(generic[1]) || generic[1];
+		return `{${inner}}`;
+	}
+	const optional = cleaned.match(/^(?:std::)?optional\s*<\s*([^>]+)\s*>$/);
+	if (optional) {
+		return `${luauType(optional[1]) || optional[1]}?`;
+	}
 	return cleaned;
 }

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";