cluaupp 0.2.3 → 1.0.0

package/src/transpile.ts

@@ -1,64 +1,21 @@
 import path from "node:path";
-import type { CompileOptions, CompileServiceResult, TranspilerState } from "./types.js";
-import { ASTCollector } from "./parser/collector.js";
-import { parseCpp } from "./parser/index.js";
-import { LuauCodeEmitter } from "./emitter/luau-codegen.js";
+import type { CompileOptions, CompileServiceResult } from "./types.js";
 import { compileService } from "./compile.js";
-import { determineArchitecture } from "./system-understander.js";
 import type { RojoMapper } from "./utils/rojo-mapper.js";
 
-function shouldMerge(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();
-	return !(trimmed.startsWith("{") || trimmed.startsWith("["));
-}
-
-export function collectState(source: string, mapper: RojoMapper, options: CompileOptions): TranspilerState {
-	const tree = parseCpp(source);
-	if (!tree) {
-		const state = LuauCodeEmitter.emptyState(options.strict === true);
-		return state;
-	}
-	const collector = new ASTCollector(mapper, {
-		fileName: options.relativeName || options.filePath || "input.cpp",
-		sourcePath: options.filePath,
-		srcDir: options.srcDir,
-		outDir: options.outDir,
-		strict: options.strict,
-	});
-	const state = collector.collect(tree.rootNode);
-	const report = determineArchitecture(options.relativeName || options.filePath || "input.cpp", null, tree.rootNode);
-	for (const service of report.injectedServices) {
-		state.robloxServices.add(service);
-	}
-	for (const line of report.reasoning) {
-		state.headerLines.push(`-- ${line}`);
-	}
-	return state;
-}
-
-export function transpileSource(source: string, fileName: string, options: CompileOptions, mapper: RojoMapper): CompileServiceResult {
-	const state = collectState(source, mapper, options);
-	if (state.strict) {
-		options.strict = true;
-	}
-	const compiled = compileService(source, fileName, options);
-	return {
-		...compiled,
-		files: compiled.files.map((file) => ({
-			...file,
-			contents: shouldMerge(file.name, file.contents) ? LuauCodeEmitter.merge(state, file.contents) : file.contents,
-		})),
-	};
+export function transpileSource(
+	source: string,
+	fileName: string,
+	options: CompileOptions,
+	_mapper?: RojoMapper,
+): CompileServiceResult {
+	return compileService(source, fileName, options);
 }
 
 export function outputNameFor(inputFile: string, outputPath: string): string {
 	if (/\.luau$/i.test(outputPath)) {
 		return outputPath;
 	}
-	const base = path.basename(inputFile).replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau");
+	const base = path.basename(inputFile).replace(/\.(clpp|clp|clh)$/i, ".luau");
 	return path.join(outputPath, base);
 }

package/src/utils/project.ts

@@ -2,8 +2,8 @@ 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";
@@ -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, "/")])];
 }
@@ -256,7 +247,7 @@ function createMapper(root: string, config: ProjectConfig, rojoPath?: string): R
 
 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 }> = [];
 
@@ -350,8 +341,8 @@ export function build(root: string, options: BuildOptions = {}): BuildResult {
 		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 (!fs.existsSync(srcDir) || collectSources(srcDir).length === 0) {
+		console.error("no .clpp/.clp/.clh files in", config.rootDir);
 		if (!holdOnError) {
 			pruneOut(root, config, new Set(), []);
 		}
@@ -412,18 +403,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 {

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

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

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

package/templates/game/src/client/init.client.clpp

@@ -0,0 +1,6 @@
+#pragma strict
+#include <clpp/roblox.clh>
+
+void init() {
+	post("Cluaupp client ok");
+}

package/templates/game/src/server/leaderstats.server.clpp

@@ -0,0 +1,29 @@
+#pragma strict
+#include <clpp/roblox.clh>
+
+void CreateLeaderstats(Player* player) {
+	if (player::FindFirstChild("leaderstats") != null) {
+		return;
+	}
+
+	Folder* leaderstats = new Folder(player);
+	leaderstats.Name = "leaderstats";
+
+	IntValue* coins = new IntValue(leaderstats);
+	coins.Name = "Coins";
+	coins.Value = 0;
+
+	IntValue* level = new IntValue(leaderstats);
+	level.Name = "Level";
+	level.Value = 0;
+}
+
+void init() {
+	Players* players = GetService<Players>();
+
+	for (Player* player : players::GetPlayers()) {
+		CreateLeaderstats(player);
+	}
+
+	players::PlayerAdded::Connect(CreateLeaderstats);
+}

package/templates/game/src/shared/config.clp

@@ -0,0 +1,6 @@
+#pragma once
+#include <clpp/roblox.clh>
+
+const int STARTING_COINS = 0;
+const string REMOTE_COINS = "Coins";
+const string LEADERSTATS_FOLDER = "leaderstats";

package/examples/game/.clangd

@@ -1,25 +0,0 @@
-CompileFlags:
-  CompilationDatabase: .
-  Add:
-    - -xc++
-    - -std=c++20
-    - -ferror-limit=0
-    - -Iinclude
-    - -Isrc
-    - -I../../include
-
-Diagnostics:
-  Suppress: '*'
-
----
-If:
-  PathMatch: .*\.(cpp|cc|cxx|c|h|hpp|hh)$
-CompileFlags:
-  Add:
-    - -xc++
-
----
-If:
-  PathMatch: (out|libs)/.*
-Index:
-  Background: Skip

package/examples/game/compile_flags.txt

@@ -1,6 +0,0 @@
--xc++
--std=c++20
--ferror-limit=0
--Iinclude
--Isrc
--I../../include

package/examples/game/src/client/hud.client.cpp

@@ -1,12 +0,0 @@
-#pragma strict
-#include <cluaupp/roblox.hpp>
-
-void init() {
-	auto* playerGui = GetService<Players>()->LocalPlayer->FindFirstChild("PlayerGui");
-	auto* screen = new ScreenGui();
-	screen->Name = "Hud";
-	auto* coins = new TextLabel();
-	coins->Name = "Coins";
-	coins->Parent = screen;
-	print("hud ready");
-}

package/examples/game/src/client/init.client.cpp

@@ -1,6 +0,0 @@
-#pragma strict
-#include <cluaupp/roblox.hpp>
-
-void init() {
-	print("Cluaupp client ok");
-}

package/examples/game/src/server/combat.server.cpp

@@ -1,23 +0,0 @@
-#pragma strict
-#include <cluaupp/roblox.hpp>
-
-void ApplyDamage(Player* player, int amount) {
-	auto* character = player->Character;
-	if (character == nullptr) {
-		return;
-	}
-	auto* humanoid = character->FindFirstChildOfClass("Humanoid");
-	if (humanoid == nullptr) {
-		return;
-	}
-	humanoid->TakeDamage(amount);
-}
-
-void OnPlayer(Player* player) {
-	ApplyDamage(player, 0);
-}
-
-void init() {
-	auto* players = GetService<Players>();
-	players->PlayerAdded.Connect(OnPlayer);
-}

package/examples/game/src/server/leaderstats.server.cpp

@@ -1,29 +0,0 @@
-#pragma strict
-#include <cluaupp/roblox.hpp>
-
-void CreateLeaderstats(Player* player) {
-	if (player->FindFirstChild("leaderstats") != nullptr) {
-		return;
-	}
-
-	auto* leaderstats = new Folder(player);
-	leaderstats->Name = "leaderstats";
-
-	auto* coins = new IntValue(leaderstats);
-	coins->Name = "Coins";
-	coins->Value = 0;
-
-	auto* level = new IntValue(leaderstats);
-	level->Name = "Level";
-	level->Value = 0;
-}
-
-void init() {
-	auto* players = GetService<Players>();
-
-	for (auto* player : players->GetPlayers()) {
-		CreateLeaderstats(player);
-	}
-
-	players->PlayerAdded.Connect(CreateLeaderstats);
-}

package/examples/game/src/shared/config.cpp

@@ -1,5 +0,0 @@
-#include "config.h"
-
-int startingCoins() {
-	return STARTING_COINS;
-}

package/examples/game/src/shared/config.h

@@ -1,5 +0,0 @@
-#include <cluaupp/roblox.hpp>
-
-const int STARTING_COINS = 0;
-
-int startingCoins();

package/include/cluaupp/libs.hpp

@@ -1,25 +0,0 @@
-#pragma once
-// Cluaupp libraries — C++ IntelliSense. The compiler ignores these headers
-// and emits require(ReplicatedStorage.CluauppLibs.*). Full Luau systems live
-// in runtime/ (vendored from GitHub + Cluaupp originals).
-
-#include <cluaupp/generated/instances.hpp>
-#include <cluaupp/libs/janitor.hpp>
-#include <cluaupp/libs/promise.hpp>
-#include <cluaupp/libs/net.hpp>
-#include <cluaupp/libs/math.hpp>
-#include <cluaupp/libs/formatnumber.hpp>
-#include <cluaupp/libs/module3d.hpp>
-#include <cluaupp/libs/twinkle.hpp>
-#include <cluaupp/libs/dataservice.hpp>
-#include <cluaupp/libs/ezvisual.hpp>
-#include <cluaupp/libs/spring.hpp>
-#include <cluaupp/libs/display.hpp>
-#include <cluaupp/libs/stickybillboard.hpp>
-#include <cluaupp/libs/topbarplus.hpp>
-#include <cluaupp/libs/cmdr.hpp>
-#include <cluaupp/libs/chrono.hpp>
-#include <cluaupp/libs/iris.hpp>
-#include <cluaupp/libs/fusion.hpp>
-#include <cluaupp/libs/statemachine.hpp>
-#include <cluaupp/libs/vfx.hpp>

package/include/cluaupp/roblox.hpp

@@ -1,47 +0,0 @@
-#pragma once
-// Cluaupp — full Roblox API for IntelliSense.
-// Source: official client dump + datatypes from create.roblox.com
-// The compiler ignores #include and emits real Luau (Vector3.new, Instance.new, :GetPlayers, ...).
-
-#include <cluaupp/generated/enums.hpp>
-#include <cluaupp/datatypes.hpp>
-#include <cluaupp/generated/instances.hpp>
-#include <cluaupp/libs.hpp>
-
-template <typename T>
-T* GetService();
-
-template <typename T>
-T* GetService(Instance* game_);
-
-extern DataModel* game;
-extern Workspace* workspace;
-extern LuaSourceContainer* script;
-
-void print(string message);
-void warn(string message);
-void error(string message);
-
-struct cout {
-	static void print(string message);
-	static void warn(string message);
-	static void error(string message);
-	static void ping(string message);
-	static void endl();
-	cout& operator<<(string value);
-	cout& operator<<(int value);
-	cout& operator<<(double value);
-	cout& operator<<(bool value);
-} cout;
-
-struct cerr {
-	cerr& operator<<(string value);
-	cerr& operator<<(int value);
-} cerr;
-
-const int endl = 0;
-double tick();
-double time();
-void wait(double seconds = 0);
-void spawn(void (*callback)());
-void delay(double seconds, void (*callback)());