cluaupp 1.5.1 → 1.5.2-cf

package/README.md

@@ -17,7 +17,7 @@ Cluaupp is the **Roblox project host** for [CL++](https://kartzrbx.github.io/CLP
 Native PascalCase CluauppLibs: **Flare** net, **Sweep** zelador, **Spark** signal, **Keep** data, **Mint** numbers, **Axiom** math, **Roster** tables, **Gleam** UI, **Bloom** effects, **Lens** debug UI, **Crest** topbar, **Pin** billboard, **Stage** viewport 3D, **Coil** spring, **Helm** commands, **Shift** states, **Hive** ECS, **Ward** anti-cheat, **Ember** VFX, **Echo** replication, **Guide** tutorials, **Trace** pretty-print. Schemas pack u8 ids / ColorSequence / tables — never JSON on the hot path. Name map: [`runtime/SOURCES.md`](runtime/SOURCES.md).
 
 ```clpp
-#include <clpp/roblox.clh>
+link @clpp.roblox;
 
 struct HelloServer {
 	void Greet(Player player);

package/bin/cluaupp.js

@@ -1,4 +1,40 @@
 #!/usr/bin/env node
 "use strict";
 
+const fs = require("node:fs");
+const path = require("node:path");
+const { spawnSync } = require("node:child_process");
+
+function exeName() {
+	return process.platform === "win32" ? "cluaupp.exe" : "cluaupp";
+}
+
+function nativeCandidates(pkgRoot) {
+	const platform = process.platform;
+	const arch = process.arch;
+	return [
+		process.env.CLUAUPP_NATIVE_BIN,
+		path.join(pkgRoot, "native", "bin", exeName()),
+		path.join(pkgRoot, "native", `${platform}-${arch}`, exeName()),
+	].filter(Boolean);
+}
+
+function runNativeIfPresent() {
+	const pkgRoot = path.resolve(__dirname, "..");
+	process.env.CLUAUPP_HOME = process.env.CLUAUPP_HOME || pkgRoot;
+	for (const bin of nativeCandidates(pkgRoot)) {
+		if (!fs.existsSync(bin)) continue;
+		const result = spawnSync(bin, process.argv.slice(2), { stdio: "inherit", windowsHide: true });
+		if (typeof result.status === "number") {
+			process.exit(result.status);
+		}
+		if (result.error) {
+			console.warn("cluaupp: native failed, falling back to Node:", result.error.message);
+			break;
+		}
+	}
+	return false;
+}
+
+runNativeIfPresent();
 require("../generated/cli.js");

package/editors/vscode/syntaxes/clpp.tmLanguage.json

@@ -0,0 +1,90 @@
+{
+  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+  "name": "CL++",
+  "scopeName": "source.clpp",
+  "patterns": [
+    { "include": "#comments" },
+    { "include": "#directives" },
+    { "include": "#link" },
+    { "include": "#attributes" },
+    { "include": "#strings" },
+    { "include": "#receiver" },
+    { "include": "#keywords" },
+    { "include": "#types" },
+    { "include": "#constants" },
+    { "include": "#numbers" },
+    { "include": "#operators" },
+    { "include": "#properties" },
+    { "include": "#functions" }
+  ],
+  "repository": {
+    "comments": {
+      "patterns": [
+        { "name": "comment.line.double-slash.clpp", "match": "//.*$" },
+        { "name": "comment.block.clpp", "begin": "/\\*", "end": "\\*/" }
+      ]
+    },
+    "directives": {
+      "patterns": [
+        {
+          "match": "^\\s*(#(pragma|define|ifdef|ifndef|endif))\\b.*$",
+          "name": "meta.preprocessor.clpp",
+          "captures": { "1": { "name": "keyword.control.directive.clpp" } }
+        }
+      ]
+    },
+    "link": {
+      "patterns": [
+        { "name": "keyword.control.link.clpp", "match": "^\\s*\\blink\\b" },
+        { "name": "keyword.control.link.as.clpp", "match": "\\b(as|from)\\b" },
+        { "name": "support.namespace.clpp", "match": "@(clpp|game)(?:\\.[A-Za-z_][A-Za-z0-9_]*)*" }
+      ]
+    },
+    "attributes": {
+      "name": "support.type.annotation.clpp",
+      "match": "\\[\\[(server|client|shared)\\]\\]|@(server|client|parallel)\\b"
+    },
+    "strings": {
+      "patterns": [
+        { "name": "string.quoted.double.clpp", "begin": "\"", "end": "\"" },
+        { "name": "string.quoted.single.clpp", "begin": "'", "end": "'" },
+        { "name": "string.quoted.other.clpp", "begin": "`", "end": "`" }
+      ]
+    },
+    "keywords": {
+      "patterns": [
+        { "name": "keyword.control.clpp", "match": "\\b(if|else|guard|for|in|while|switch|case|default|break|return|match|spawn|parallel|async|await|link|as|from)\\b" },
+        { "name": "keyword.other.clpp", "match": "\\b(struct|class|namespace|using|template|typedef|enum|public|private|protected|static|const|constexpr|inline|extern|new)\\b" },
+        { "name": "storage.modifier.clpp", "match": "\\b(observable|signal|func)\\b" }
+      ]
+    },
+    "types": {
+      "patterns": [
+        { "name": "storage.type.clpp", "match": "\\b(void|int|float|double|bool|string|auto|func|array|dictionary|map|optional|Option|Result)\\b" }
+      ]
+    },
+    "constants": { "name": "constant.language.clpp", "match": "\\b(true|false|null|nullptr)\\b" },
+    "numbers": { "name": "constant.numeric.clpp", "match": "\\b\\d+(\\.\\d+)?\\b" },
+    "receiver": {
+      "patterns": [
+        { "name": "keyword.other.receiver.clpp", "match": "@this\\b" },
+        { "match": "(@)([A-Za-z_][A-Za-z0-9_]*)", "captures": { "1": { "name": "keyword.other.receiver.clpp" }, "2": { "name": "variable.other.property.receiver.clpp" } } }
+      ]
+    },
+    "operators": {
+      "patterns": [
+        { "name": "keyword.operator.concat.clpp", "match": "\\.:" },
+        { "name": "keyword.operator.cleanup.clpp", "match": "~>" },
+        { "name": "keyword.operator.scope.clpp", "match": "::" },
+        { "name": "keyword.operator.arrow.clpp", "match": "=>" },
+        { "name": "keyword.operator.assignment.clpp", "match": "\\+=|-=|\\*=|/=|=" }
+      ]
+    },
+    "properties": {
+      "patterns": [
+        { "match": "\\.(?![:.])([A-Za-z_][A-Za-z0-9_]*)", "captures": { "1": { "name": "variable.other.property.clpp" } } }
+      ]
+    },
+    "functions": { "name": "entity.name.function.clpp", "match": "\\b([A-Za-z_][A-Za-z0-9_]*)\\s*(?=\\()" }
+  }
+}

package/examples/game/cluaupp.config.json

@@ -1,5 +1,5 @@
 {
-	"rootDir": "src",
+	"rootDir": "Src",
 	"outDir": "out",
 	"strict": false,
 	"architecture": false

package/examples/game/default.project.json

@@ -2,18 +2,23 @@
 	"name": "cluaupp-game",
 	"tree": {
 		"$className": "DataModel",
-		"ReplicatedFirst": {
-			"$className": "ReplicatedFirst",
-			"$path": "out/ReplicatedFirst"
-		},
 		"ServerScriptService": {
 			"$className": "ServerScriptService",
-			"$path": "out/ServerScriptService"
+			"$path": "out/Server",
+			"Parallel": {
+				"$path": "out/Parallel"
+			}
 		},
 		"ReplicatedStorage": {
 			"$className": "ReplicatedStorage",
-			"Shared": {
-				"$path": "out/ReplicatedStorage/Shared"
+			"Declarations": {
+				"$path": "out/Declarations"
+			},
+			"Include": {
+				"$path": "out/Include"
+			},
+			"Modules": {
+				"$path": "out/Modules"
 			},
 			"CluauppLibs": {
 				"$path": "libs"
@@ -23,17 +28,9 @@
 			"$className": "StarterPlayer",
 			"StarterPlayerScripts": {
 				"$className": "StarterPlayerScripts",
-				"$path": "out/StarterPlayer/StarterPlayerScripts"
-			},
-			"StarterCharacterScripts": {
-				"$className": "StarterCharacterScripts",
-				"$path": "out/StarterPlayer/StarterCharacterScripts"
+				"$path": "out/Client"
 			}
 		},
-		"ServerStorage": {
-			"$className": "ServerStorage",
-			"$path": "out/ServerStorage"
-		},
 		"HttpService": {
 			"$className": "HttpService",
 			"$properties": {

package/examples/game/src/Client/Controllers/DataController.client.clpp

@@ -0,0 +1,7 @@
+#pragma strict
+link @clpp.roblox;
+link @clpp.libs.keep as Keep;
+
+void init() {
+	Keep.Client.Init();
+}

package/examples/game/src/Client/Main.client.clpp

@@ -0,0 +1,4 @@
+#pragma strict
+link @clpp.roblox;
+
+void init() {}

package/examples/game/src/Modules/Core/Guard.server.clpp

@@ -0,0 +1,7 @@
+#pragma strict
+link @clpp.roblox;
+link @clpp.libs.ward as Ward;
+
+void init() {
+	Ward.Start();
+}

package/examples/game/src/{ServerScriptService/Handlers → Modules/Core}/PlayerHandler.server.clpp

@@ -1,6 +1,6 @@
 #pragma strict
-#include <clpp/roblox.clh>
-#include <clpp/libs/keep.clh>
+link @clpp.roblox;
+link @clpp.libs.keep as Keep;
 
 void BindLeaderstats(Player player) {
 	auto data = Keep.Server.WaitFor(player);

package/examples/game/src/{ServerScriptService → Server}/Boot/DataBoot.server.clpp

@@ -1,7 +1,7 @@
 #pragma strict
-#include <clpp/roblox.clh>
-#include <clpp/libs/keep.clh>
-import { PlayerTemplate } from "../../ReplicatedStorage/Shared/Constants/Datas/TemplateData.clh";
+link @clpp.roblox;
+link @clpp.libs.keep as Keep;
+link "../../Include/GameTypes.clh" as GameTypes;
 
 void init() {
 	PlayerTemplate playerData = PlayerTemplate();

package/examples/game/src/Server/Main.server.clpp

@@ -0,0 +1,4 @@
+#pragma strict
+
+
+void init() {}

package/generated/clpp/modules.js

@@ -166,6 +166,11 @@ function rewriteGameRootedRequires(luau) {
         const re = new RegExp(`script(?:\\.Parent)+\\.${svc}\\.`, "g");
         next = next.replace(re, `${svc}.`);
     }
+    // Domain root folders are mapped under ReplicatedStorage by GenRojoTree.
+    for (const folder of ["Include", "Modules", "Declarations"]) {
+        const re = new RegExp(`script(?:\\.Parent)+\\.${folder}\\.`, "g");
+        next = next.replace(re, `ReplicatedStorage.${folder}.`);
+    }
     return next;
 }
 /** Ensure GetService lines exist for any game-rooted require used. */

package/generated/target/gen-rojo-tree.js

@@ -0,0 +1,118 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildRojoTree = buildRojoTree;
+exports.writeDefaultProject = writeDefaultProject;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+function walkFiles(dir, files = []) {
+    if (!node_fs_1.default.existsSync(dir)) {
+        return files;
+    }
+    for (const entry of node_fs_1.default.readdirSync(dir, { withFileTypes: true })) {
+        const full = node_path_1.default.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            walkFiles(full, files);
+            continue;
+        }
+        files.push(full);
+    }
+    return files;
+}
+function withPath(node, relPath) {
+    node.$path = relPath.replace(/\\/g, "/");
+}
+function ensureNode(root, parts) {
+    let current = root;
+    for (const part of parts) {
+        const next = current[part];
+        if (next && typeof next === "object") {
+            current = next;
+            continue;
+        }
+        const created = {};
+        current[part] = created;
+        current = created;
+    }
+    return current;
+}
+function fileStem(rel) {
+    return rel
+        .replace(/\.(server|client)\.luau$/i, "")
+        .replace(/\.(server|client)\.(clpp|clp|clh)$/i, "")
+        .replace(/\.(luau|lua|clpp|clp|clh|flare|hive|mint|bloom|helm|shift|axiom)$/i, "");
+}
+function mapModules(rootTree, rootAbs, modulesRoot) {
+    if (!node_fs_1.default.existsSync(modulesRoot)) {
+        return;
+    }
+    const files = walkFiles(modulesRoot).filter((file) => /\.(luau|lua|clpp|clp|clh)$/i.test(file));
+    for (const file of files) {
+        const rel = node_path_1.default.relative(rootAbs, file).replace(/\\/g, "/");
+        const moduleRel = node_path_1.default.relative(modulesRoot, file).replace(/\\/g, "/");
+        const stem = fileStem(moduleRel);
+        const parts = stem.split("/").filter(Boolean);
+        if (parts.length === 0) {
+            continue;
+        }
+        const isServer = /\.server\.(luau|lua|clpp|clp|clh)$/i.test(file);
+        const isClient = /\.client\.(luau|lua|clpp|clp|clh)$/i.test(file);
+        const rootParts = isServer
+            ? ["ServerScriptService", "Modules"]
+            : isClient
+                ? ["StarterPlayer", "StarterPlayerScripts", "Modules"]
+                : ["ReplicatedStorage", "Modules"];
+        const parent = ensureNode(rootTree, [...rootParts, ...parts.slice(0, -1)]);
+        const leaf = ensureNode(parent, [parts[parts.length - 1]]);
+        withPath(leaf, rel);
+    }
+}
+function baseTree() {
+    return {
+        $className: "DataModel",
+        ServerScriptService: {
+            $className: "ServerScriptService",
+        },
+        ReplicatedStorage: {
+            $className: "ReplicatedStorage",
+            CluauppLibs: { $path: "libs" },
+        },
+        StarterPlayer: {
+            $className: "StarterPlayer",
+            StarterPlayerScripts: {
+                $className: "StarterPlayerScripts",
+            },
+        },
+        HttpService: {
+            $className: "HttpService",
+            $properties: {
+                HttpEnabled: true,
+            },
+        },
+    };
+}
+function buildRojoTree(root, rootDir, outDir) {
+    const outRoot = node_path_1.default.join(root, outDir);
+    const srcRoot = node_path_1.default.join(root, rootDir);
+    const sourceRoot = node_fs_1.default.existsSync(outRoot) ? outRoot : srcRoot;
+    const tree = baseTree();
+    const relRoot = node_path_1.default.relative(root, sourceRoot).replace(/\\/g, "/");
+    withPath(ensureNode(tree, ["ServerScriptService"]), `${relRoot}/Server`);
+    withPath(ensureNode(tree, ["ServerScriptService", "Parallel"]), `${relRoot}/Parallel`);
+    withPath(ensureNode(tree, ["StarterPlayer", "StarterPlayerScripts"]), `${relRoot}/Client`);
+    withPath(ensureNode(tree, ["ReplicatedStorage", "Declarations"]), `${relRoot}/Declarations`);
+    withPath(ensureNode(tree, ["ReplicatedStorage", "Include"]), `${relRoot}/Include`);
+    mapModules(tree, root, node_path_1.default.join(sourceRoot, "Modules"));
+    return tree;
+}
+function writeDefaultProject(root, rootDir, outDir, projectJsonPath) {
+    const file = node_path_1.default.resolve(root, projectJsonPath || "default.project.json");
+    const body = {
+        name: "cluaupp-game",
+        tree: buildRojoTree(root, rootDir, outDir),
+    };
+    node_fs_1.default.writeFileSync(file, `${JSON.stringify(body, null, "\t")}\n`, "utf8");
+    return file;
+}

package/generated/utils/project.js

@@ -30,6 +30,7 @@ const flare_version_js_1 = require("../target/flare-version.js");
 const component_contracts_js_1 = require("../target/component-contracts.js");
 const authority_check_js_1 = require("../target/authority-check.js");
 const datamodel_js_1 = require("../target/datamodel.js");
+const gen_rojo_tree_js_1 = require("../target/gen-rojo-tree.js");
 const build_cache_js_1 = require("../target/build-cache.js");
 const modules_js_1 = require("../clpp/modules.js");
 function readProjectConfig(file) {
@@ -305,6 +306,9 @@ function createMapper(root, config, rojoPath) {
     mapper.loadSync();
     return mapper;
 }
+function syncRojoTree(root, config, rojoPath) {
+    (0, gen_rojo_tree_js_1.writeDefaultProject)(root, config.rootDir, config.outDir, rojoPath || "default.project.json");
+}
 function compileOptions(root, config, file, rel) {
     const srcDir = node_path_1.default.join(root, config.rootDir);
     return {
@@ -586,6 +590,7 @@ function finishBuild(root, config, compiled, options) {
         }
     }
     const written = writeJobs(root, config, compiled.jobs, format);
+    syncRojoTree(root, config, options.rojo);
     try {
         const soaPlans = (0, optimizer_soa_js_1.collectSoaPlansFromProject)(root, config.rootDir);
         if (soaPlans.length) {
@@ -625,6 +630,7 @@ function prepareBuild(root, options) {
     const exitOnError = options.exitOnError !== false;
     const holdOnError = options.holdOnError === true;
     const config = loadConfig(root);
+    syncRojoTree(root, config, options.rojo);
     if (options.strict === true) {
         config.strict = true;
     }
@@ -700,6 +706,8 @@ async function init(dest) {
         copyDir(skills, node_path_1.default.join(target, ".cursor", "skills"));
     }
     copyRuntime(target);
+    const initConfig = loadConfig(target);
+    syncRojoTree(target, initConfig);
     (0, intellisense_js_1.syncEditorSupport)(target);
     try {
         (0, intellisense_js_1.installEditorExtension)();

package/{examples/game/src/ReplicatedFirst/Loading → native/bin}/.gitkeep

@@ -1 +1 @@
-
+

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cluaupp",
-	"version": "1.5.1",
+	"version": "1.5.2-cf",
 	"description": "Cluaupp toolchain — compile CL++ to Luau with Rojo and CluauppLibs.",
 	"author": "KartzDev",
 	"license": "MIT",
@@ -17,6 +17,8 @@
 		"bin",
 		"src",
 		"generated",
+		"rust",
+		"native",
 		"include",
 		"templates",
 		"examples",
@@ -27,6 +29,7 @@
 		"data",
 		"plugins",
 		"scripts/postinstall-editor.js",
+		"scripts/postinstall-native.js",
 		"README.md",
 		"LICENSE",
 		"CHANGELOG.md",
@@ -40,10 +43,11 @@
 		"cluau": "node bin/cluaupp.js",
 		"build": "tsc",
 		"build:cli": "tsc",
+		"build:native": "cargo build --release --manifest-path rust/cluaupp/Cargo.toml",
 		"dev:cli": "tsx src/cli.ts",
 		"prepare": "tsc",
-		"postinstall": "node scripts/postinstall-editor.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/modules-import.test.js && node test/get-service.test.js && node test/clpp.test.js && node test/flare.test.js && node test/native.test.js && node test/postprocess.test.js && node test/api.test.js && node test/api-reuse.test.js && node test/context-safety.test.js && node test/datamodel.test.js && node test/platform-analyzers.test.js && node test/platform-extras.test.js && node test/generator.test.js && node test/studio/smoke.test.js",
+		"postinstall": "node scripts/postinstall-native.js && node scripts/postinstall-editor.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/modules-import.test.js && node test/gen-rojo-tree.test.js && node test/get-service.test.js && node test/clpp.test.js && node test/flare.test.js && node test/native.test.js && node test/postprocess.test.js && node test/api.test.js && node test/api-reuse.test.js && node test/context-safety.test.js && node test/datamodel.test.js && node test/platform-analyzers.test.js && node test/platform-extras.test.js && node test/generator.test.js && node test/studio/smoke.test.js",
 		"test:clpp-contract": "node test/clpp.test.js",
 		"generate-api": "node scripts/generate-api.js",
 		"vendor-libs": "node scripts/vendor-libs.js",