cluaupp 0.1.4 → 0.1.5

package/src/libs.js

@@ -299,17 +299,64 @@ function collectLibraries(source, ast) {
 	return unique;
 }
 
+const ROJO_ROOTS = {
+	shared: { service: "ReplicatedStorage", expr: "ReplicatedStorage.Cluaupp" },
+	server: { service: "ServerScriptService", expr: "ServerScriptService.Cluaupp" },
+	client: { service: "StarterPlayer", expr: "StarterPlayer.StarterPlayerScripts.Cluaupp" },
+};
+
+const SERVICE_ORDER = ["ReplicatedStorage", "ServerScriptService", "StarterPlayer"];
+
+const SERVICE_GET = {
+	ReplicatedStorage: 'const ReplicatedStorage = game:GetService("ReplicatedStorage")',
+	ServerScriptService: 'const ServerScriptService = game:GetService("ServerScriptService")',
+	StarterPlayer: 'const StarterPlayer = game:GetService("StarterPlayer")',
+};
+
 function requireCluauppLib(name) {
 	return `require(ReplicatedStorage.CluauppLibs.${name})`;
 }
 
-function emitRequireParts(libraries) {
+function parseOutRel(toOutRel) {
+	const posix = String(toOutRel || "module.luau")
+		.replace(/\\/g, "/")
+		.replace(/\.luau$/i, "");
+	const parts = posix.split("/").filter(Boolean);
+	const tree = parts[0];
+	const root = ROJO_ROOTS[tree] || null;
+	const rest = root ? parts.slice(1) : parts;
+	return { tree, root, rest, posix };
+}
+
+function robloxRequireFrom(_fromOutRel, toOutRel) {
+	const { root, rest } = parseOutRel(toOutRel);
+	if (root) {
+		const tail = rest.join(".");
+		return tail ? `require(${root.expr}.${tail})` : `require(${root.expr})`;
+	}
+	const fromDir = path.posix.dirname(String(_fromOutRel || "module.luau").replace(/\\/g, "/"));
+	const toMod = String(toOutRel || "module.luau")
+		.replace(/\\/g, "/")
+		.replace(/\.luau$/i, "");
+	let rel = path.posix.relative(fromDir, toMod);
+	if (!rel || rel === ".") {
+		rel = path.posix.basename(toMod);
+	}
+	const parts = rel.split("/");
+	let expr = "script.Parent";
+	for (const part of parts) {
+		if (part === "..") {
+			expr += ".Parent";
+		} else if (part && part !== ".") {
+			expr += `.${part}`;
+		}
+	}
+	return `require(${expr})`;
+}
+
+function emitLibraryLines(libraries) {
 	const api = [];
 	const types = [];
-	if (!libraries.length) {
-		return { api: "", types: "" };
-	}
-	api.push('const ReplicatedStorage = game:GetService("ReplicatedStorage")');
 	for (const spec of libraries) {
 		api.push(`const ${spec.bind} = ${requireCluauppLib(spec.file)}`);
 		const exported = TYPE_EXPORTS[spec.bind];
@@ -323,6 +370,15 @@ function emitRequireParts(libraries) {
 			}
 		}
 	}
+	return { api, types };
+}
+
+function emitRequireParts(libraries) {
+	if (!libraries.length) {
+		return { api: "", types: "" };
+	}
+	const { api, types } = emitLibraryLines(libraries);
+	api.unshift(SERVICE_GET.ReplicatedStorage);
 	return {
 		api: `${api.join("\n")}\n`,
 		types: types.length ? `${types.join("\n")}\n` : "",
@@ -339,34 +395,7 @@ function insertRequires(luau, libraries) {
 	if (!block) {
 		return luau;
 	}
-	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 robloxRequireFrom(fromOutRel, toOutRel) {
-	const fromDir = path.posix.dirname(String(fromOutRel || "module.luau").replace(/\\/g, "/"));
-	const toMod = String(toOutRel || "module.luau")
-		.replace(/\\/g, "/")
-		.replace(/\.luau$/i, "");
-	let rel = path.posix.relative(fromDir, toMod);
-	if (!rel || rel === ".") {
-		rel = path.posix.basename(toMod);
-	}
-	const parts = rel.split("/");
-	let expr = "script.Parent";
-	for (const part of parts) {
-		if (part === "..") {
-			expr += ".Parent";
-		} else if (part && part !== ".") {
-			expr += `.${part}`;
-		}
-	}
-	return `require(${expr})`;
+	return insertBlock(luau, block);
 }
 
 function moduleIsUsed(luau, spec) {
@@ -377,13 +406,11 @@ function moduleIsUsed(luau, spec) {
 	return exported.some((name) => String(luau).includes(name));
 }
 
-function insertModuleRequires(luau, modules, fromOutRel) {
-	if (!modules || modules.length === 0) {
-		return luau;
-	}
+function moduleRequireLines(modules, fromOutRel, luau) {
 	const lines = [];
+	const services = new Set();
 	const seen = new Set();
-	for (const spec of modules) {
+	for (const spec of modules || []) {
 		if (!spec || !spec.name || seen.has(spec.name)) {
 			continue;
 		}
@@ -391,20 +418,60 @@ function insertModuleRequires(luau, modules, fromOutRel) {
 			continue;
 		}
 		seen.add(spec.name);
+		const { root } = parseOutRel(spec.outRel);
+		if (root) {
+			services.add(root.service);
+		}
 		lines.push(`const ${spec.name} = ${robloxRequireFrom(fromOutRel, spec.outRel)}`);
 		for (const name of (spec.exports && spec.exports.consts) || []) {
 			if (name !== spec.name) {
 				lines.push(`const ${name} = ${spec.name}.${name}`);
 			}
 		}
-		if ((spec.exports && spec.exports.structs || []).includes(spec.name) && !spec.impl) {
-			lines.push(`type ${spec.name} = typeof(${spec.name}())`);
+		if (((spec.exports && spec.exports.structs) || []).includes(spec.name) || (spec.exports && spec.exports.hasProtos)) {
+			lines.push(`type ${spec.name} = ${spec.name}.${spec.name}`);
+		}
+	}
+	return { lines, services };
+}
+
+function insertModuleRequires(luau, modules, fromOutRel) {
+	return insertPreamble(luau, modules, [], fromOutRel);
+}
+
+function stripServiceGets(luau, services) {
+	let next = String(luau);
+	for (const name of services) {
+		const line = SERVICE_GET[name];
+		if (!line) {
+			continue;
 		}
+		next = next.replace(new RegExp(`^${line.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\n?`, "m"), "");
 	}
-	if (lines.length === 0) {
+	return next;
+}
+
+function insertPreamble(luau, modules, libraries, fromOutRel) {
+	const { lines: moduleLines, services } = moduleRequireLines(modules, fromOutRel, luau);
+	const libList = libraries || [];
+	if (libList.length) {
+		services.add("ReplicatedStorage");
+	}
+	if (moduleLines.length === 0 && libList.length === 0) {
 		return luau;
 	}
-	return insertBlock(luau, lines.join("\n"));
+	const { api: libApi, types: libTypes } = emitLibraryLines(libList);
+	const blockLines = [];
+	for (const name of SERVICE_ORDER) {
+		if (services.has(name)) {
+			blockLines.push(SERVICE_GET[name]);
+		}
+	}
+	blockLines.push(...moduleLines);
+	blockLines.push(...libApi);
+	blockLines.push(...libTypes);
+	const body = stripServiceGets(luau, services);
+	return insertBlock(body, blockLines.join("\n"));
 }
 
 function insertBlock(luau, block) {
@@ -431,4 +498,5 @@ module.exports = {
 	emitRequires,
 	insertRequires,
 	insertModuleRequires,
+	insertPreamble,
 };

package/src/preprocess.js

@@ -52,6 +52,28 @@ function siblingImplementation(headerPath) {
 	return null;
 }
 
+function siblingHeader(implPath) {
+	if (!implPath || isHeaderFile(implPath)) {
+		return null;
+	}
+	const base = String(implPath).replace(/\.(cpp|cc|cxx|c)$/i, "");
+	if (base === String(implPath)) {
+		return null;
+	}
+	for (const ext of [".h", ".hpp", ".hh"]) {
+		if (fs.existsSync(base + ext)) {
+			return base + ext;
+		}
+	}
+	return null;
+}
+
+function implOutName(rel) {
+	return String(rel)
+		.replace(/\\/g, "/")
+		.replace(/\.(cpp|cc|cxx|c)$/i, "Impl.luau");
+}
+
 function resolveInclude(name, fromFile, includeDirs) {
 	const bases = [path.dirname(fromFile), ...(includeDirs || [])];
 	for (const base of bases) {
@@ -78,7 +100,8 @@ function scanHeaderExports(source) {
 			structs.push(match[1]);
 		}
 	}
-	return { consts, structs };
+	const hasProtos = /\b(?:void|int|bool|float|double|auto|string|[\w:]+)\s+\w+\s*\([^;]*\)\s*;/.test(String(source));
+	return { consts, structs, hasProtos };
 }
 
 function pushModuleInclude(options, resolved, impl) {
@@ -96,7 +119,28 @@ function pushModuleInclude(options, resolved, impl) {
 	});
 }
 
+function applyPragmas(source, options) {
+	let nstrict = false;
+	let strict = false;
+	for (const line of String(source).split(/\r?\n/)) {
+		if (/^\s*#\s*pragma\s+nstrict\b/i.test(line)) {
+			nstrict = true;
+		} else if (/^\s*#\s*pragma\s+strict\b/i.test(line)) {
+			strict = true;
+		}
+	}
+	if (nstrict) {
+		options.strict = false;
+	} else if (strict) {
+		options.strict = true;
+	}
+}
+
 function preprocess(source, filePath, options = {}) {
+	if (!options.pragmaResolved) {
+		options.pragmaResolved = true;
+		applyPragmas(source, options);
+	}
 	const seen = options.seen || new Set();
 	const includeDirs = options.includeDirs || [];
 	const resolvedSelf = filePath ? path.resolve(filePath) : null;
@@ -140,9 +184,12 @@ module.exports = {
 	isSourceFile,
 	isHeaderFile,
 	toLuauPath,
+	applyPragmas,
 	preprocess,
 	scanHeaderExports,
 	isEngineStub,
 	siblingImplementation,
+	siblingHeader,
+	implOutName,
 	resolveInclude,
 };

package/src/understand.js

@@ -482,9 +482,11 @@ function analyze(ast, fileName) {
 }
 
 function modernScriptOutName(relativeName) {
-	return String(relativeName)
-		.replace(/\\/g, "/")
-		.replace(/\.(server|client|plugin)\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau");
+	const rel = String(relativeName).replace(/\\/g, "/");
+	if (/\.plugin\.(cpp|cc|cxx|c|h|hpp|hh)$/i.test(rel)) {
+		return rel.replace(/\.plugin\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau");
+	}
+	return rel.replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau");
 }
 
 function legacyOutName(relativeName) {

package/templates/game/cluaupp.config.json

@@ -1,6 +1,6 @@
 {
 	"rootDir": "src",
 	"outDir": "out",
-	"strict": true,
-	"architecture": true
+	"strict": false,
+	"architecture": false
 }

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

@@ -1,3 +1,4 @@
+#pragma strict
 #include <cluaupp/roblox.hpp>
 
 void init() {

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

@@ -1,3 +1,4 @@
+#pragma strict
 #include <cluaupp/roblox.hpp>
 
 void CreateLeaderstats(Player* player) {