cluaupp 0.1.2 → 0.1.5

package/package.json

@@ -1,65 +1,66 @@
-{
-	"name": "cluaupp",
-	"version": "0.1.2",
-	"description": "Cluaupp — the definitive merge of C++ and modern Luau. Source-to-source transpiler with first-class Roblox APIs.",
-	"author": "KartzDev",
-	"license": "MIT",
-	"bin": {
-		"cluaupp": "bin/cluaupp.js",
-		"cluau": "bin/cluaupp.js"
-	},
-	"main": "src/compile.js",
-	"exports": {
-		".": "./src/compile.js",
-		"./package.json": "./package.json"
-	},
-	"files": [
-		"bin",
-		"src",
-		"include",
-		"templates",
-		"runtime",
-		"README.md",
-		"LICENSE",
-		"CHANGELOG.md",
-		"docs"
-	],
-	"scripts": {
-		"cluaupp": "node bin/cluaupp.js",
-		"cluau": "node bin/cluaupp.js",
-		"build": "node bin/cluaupp.js build",
-		"watch": "node bin/cluaupp.js watch",
-		"test": "node test/leaderstats.test.js && node test/understand.test.js && node test/datatypes.test.js && node test/headers.test.js && node test/libs.test.js && node test/runtime-libs.test.js && node test/intellisense.test.js && node test/dataservice.test.js && node test/prune.test.js && node test/hold.test.js",
-		"generate-api": "node scripts/generate-api.js",
-		"check-highlight": "node scripts/check-highlight.js",
-		"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",
-		"dev": "node scripts/dev.js",
-		"stop": "node scripts/stop.js",
-		"prepublishOnly": "npm test"
-	},
-	"engines": {
-		"node": ">=18"
-	},
-	"keywords": [
-		"luau",
-		"roblox",
-		"cpp",
-		"c++",
-		"transpiler",
-		"compiler",
-		"rojo",
-		"cluaupp",
-		"cluau"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/KartzRbx/Cluaupp.git"
-	},
-	"bugs": {
-		"url": "https://github.com/KartzRbx/Cluaupp/issues"
-	},
-	"homepage": "https://github.com/KartzRbx/Cluaupp#readme"
-}
+{
+	"name": "cluaupp",
+	"version": "0.1.5",
+	"description": "Cluaupp — the definitive merge of C++ and modern Luau. Source-to-source transpiler with first-class Roblox APIs.",
+	"author": "KartzDev",
+	"license": "MIT",
+	"bin": {
+		"cluaupp": "bin/cluaupp.js",
+		"cluau": "bin/cluaupp.js"
+	},
+	"main": "src/compile.js",
+	"exports": {
+		".": "./src/compile.js",
+		"./package.json": "./package.json"
+	},
+	"files": [
+		"bin",
+		"src",
+		"include",
+		"templates",
+		"editors",
+		"runtime",
+		"README.md",
+		"LICENSE",
+		"CHANGELOG.md",
+		"docs"
+	],
+	"scripts": {
+		"cluaupp": "node bin/cluaupp.js",
+		"cluau": "node bin/cluaupp.js",
+		"build": "node bin/cluaupp.js build",
+		"watch": "node bin/cluaupp.js watch",
+		"test": "node test/leaderstats.test.js && node test/understand.test.js && node test/datatypes.test.js && node test/headers.test.js && node test/libs.test.js && node test/runtime-libs.test.js && node test/intellisense.test.js && node test/intellisense-complete.test.js && node test/dataservice.test.js && node test/datacontroller-signal.test.js && node test/cout.test.js && node test/prune.test.js && node test/hold.test.js && node test/vendor-stable.test.js && node test/switch.test.js && node test/qualified.test.js && node test/module-require.test.js",
+		"generate-api": "node scripts/generate-api.js",
+		"check-highlight": "node scripts/check-highlight.js",
+		"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",
+		"dev": "node scripts/dev.js",
+		"stop": "node scripts/stop.js",
+		"prepublishOnly": "npm test"
+	},
+	"engines": {
+		"node": ">=18"
+	},
+	"keywords": [
+		"luau",
+		"roblox",
+		"cpp",
+		"c++",
+		"transpiler",
+		"compiler",
+		"rojo",
+		"cluaupp",
+		"cluau"
+	],
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/KartzRbx/Cluaupp.git"
+	},
+	"bugs": {
+		"url": "https://github.com/KartzRbx/Cluaupp/issues"
+	},
+	"homepage": "https://github.com/KartzRbx/Cluaupp#readme"
+}

package/runtime/Janitor/init.luau

@@ -1,45 +1,15 @@
 --!strict
 -- Cluaupp Janitor — typed border. Engine: howmanysmall/Janitor (_impl).
--- Requires the sibling CluauppLibs.Promise module, never a nested stub.
+-- Public type and return value are the implementation. Promise is required
+-- inside _impl as CluauppLibs.Promise (`script.Parent.Parent.Promise`).
 
 --[=[
 	@class Janitor
 	Cleans up connections, instances, promises, and threads.
 ]=]
 
-local PromiseMod = require(script.Parent.Promise)
-type Promise<T...> = PromiseMod.Promise<T...>
-
 local Impl = require(script._impl)
 
-export type Janitor = {
-	CurrentlyCleaning: boolean,
-	SuppressInstanceReDestroy: boolean,
-	UnsafeThreadCleanup: boolean,
-	Add: <T>(self: Janitor, object: T, methodName: (boolean | string)?, index: string?) -> T,
-	AddObject: <T, A...>(
-		self: Janitor,
-		constructor: { new: (A...) -> T },
-		methodName: (boolean | string)?,
-		index: string?,
-		A...
-	) -> T,
-	AddPromise: <T...>(self: Janitor, promiseObject: Promise<T...>, index: string?) -> Promise<T...>,
-	Remove: (self: Janitor, index: string) -> Janitor,
-	RemoveNoClean: (self: Janitor, index: string) -> Janitor,
-	RemoveList: (self: Janitor, ...string) -> Janitor,
-	Get: <T>(self: Janitor, index: string) -> T?,
-	GetAll: (self: Janitor) -> { [string]: unknown },
-	Has: (self: Janitor, index: string) -> boolean,
-	Cleanup: (self: Janitor) -> (),
-	Destroy: (self: Janitor) -> (),
-	LinkToInstance: (self: Janitor, object: Instance, allowMultiple: boolean?) -> RBXScriptConnection,
-	LinkToInstances: (self: Janitor, ...Instance) -> Janitor,
-}
-
-type JanitorStatic = {
-	new: () -> Janitor,
-	Is: (value: unknown) -> boolean,
-}
+export type Janitor = Impl.Janitor
 
-return Impl :: JanitorStatic
+return Impl

package/src/architecture.js

@@ -2,16 +2,23 @@
 
 const path = require("path");
 const { emit } = require("./emit");
-const { collectLibraries, insertRequires, requireCluauppLib } = require("./libs");
+const { requireCluauppLib } = require("./libs");
+const { organizeDecls, janitorNames, emitSection, joinBlocks, SECTION, ENTRY_FN } = require("./layout");
 const {
 	VALUE_CLASSES,
 	analyze,
 	toPascalServiceName,
 	legacyOutName,
+	modernScriptOutName,
 } = require("./understand");
+const { implOutName } = require("./preprocess");
 
 function header(plan) {
-	const lines = ["--!strict", "-- Compiled by Cluaupp — C++ × Luau"];
+	const lines = [];
+	if (plan && plan.strict) {
+		lines.push("--!strict");
+	}
+	lines.push("-- Compiled by Cluaupp — C++ × Luau");
 	if (plan && plan.reasoning) {
 		for (const line of plan.reasoning) {
 			lines.push(`-- ${line}`);
@@ -27,9 +34,9 @@ function cluauppLib(name) {
 
 function emitTypes(plan) {
 	const lines = [header(plan).trimEnd(), ""];
-	lines.push('local ReplicatedStorage = game:GetService("ReplicatedStorage")');
-	lines.push(`local Occlude = ${cluauppLib("Occlude")}`);
-	lines.push(`local ArrayIndexer = ${cluauppLib("ArrayIndexer")}`);
+	lines.push('const ReplicatedStorage = game:GetService("ReplicatedStorage")');
+	lines.push(`const Occlude = ${cluauppLib("Occlude")}`);
+	lines.push(`const ArrayIndexer = ${cluauppLib("ArrayIndexer")}`);
 	lines.push("");
 
 	if (plan.stats.length > 0) {
@@ -60,6 +67,7 @@ function emitTypes(plan) {
 		manifest.push("		Get: (player: Player) -> PlayerCache?,");
 		manifest.push("		Ensure: (player: Player) -> PlayerCache,");
 		manifest.push("		Clear: (player: Player) -> (),");
+		manifest.push("		ClearAll: () -> (),");
 		manifest.push("	},");
 	}
 	if (plan.roles.players) {
@@ -100,23 +108,26 @@ function emitTypes(plan) {
 }
 
 function emitPlayersManager(plan) {
-	return `${header(plan)}
-local Players = game:GetService("Players")
-local ReplicatedStorage = game:GetService("ReplicatedStorage")
-local Janitor = ${cluauppLib("Janitor")}
-type Janitor = Janitor.Janitor
+	return `${header(plan).trimEnd()}
+
+const Players = game:GetService("Players")
+const ReplicatedStorage = game:GetService("ReplicatedStorage")
+const Janitor = ${cluauppLib("Janitor")}
 
+type Janitor = Janitor.Janitor
 export type PlayerHandler = (player: Player) -> ()
 
 local PlayersManager = {}
 local lifetime: Janitor? = nil
+local leaveHandler: PlayerHandler? = nil
 
 function PlayersManager.Start(onPlayer: PlayerHandler, onLeave: PlayerHandler?)
 	PlayersManager.Stop()
 	local janitor = Janitor.new()
 	lifetime = janitor
+	leaveHandler = onLeave
 
-	local function accept(player: Player)
+	const function accept(player: Player)
 		onPlayer(player)
 	end
 
@@ -134,6 +145,13 @@ function PlayersManager.Stop()
 	if lifetime == nil then
 		return
 	end
+	local onLeave = leaveHandler
+	leaveHandler = nil
+	if onLeave then
+		for _, player in Players:GetPlayers() do
+			onLeave(player)
+		end
+	end
 	lifetime:Cleanup()
 	lifetime = nil
 end
@@ -146,11 +164,11 @@ function emitCacheController(plan) {
 	const types = plan.typesName;
 	const folder = plan.folderName || "leaderstats";
 	const lines = [header(plan).trimEnd(), ""];
-	lines.push(`local Types = require(script.Parent.${types})`);
+	lines.push(`const Types = require(script.Parent.${types})`);
 	lines.push("");
-	lines.push(`local FOLDER_NAME = "${folder}"`);
-	lines.push("local cache: { [Player]: Types.PlayerCache } = {}");
+	lines.push(`const FOLDER_NAME = "${folder}"`);
 	lines.push("");
+	lines.push("local cache: { [Player]: Types.PlayerCache } = {}");
 	lines.push("local CacheController = {}");
 	lines.push("");
 	lines.push("function CacheController.Get(player: Player): Types.PlayerCache?");
@@ -201,6 +219,10 @@ function emitCacheController(plan) {
 	lines.push("	cache[player] = nil");
 	lines.push("end");
 	lines.push("");
+	lines.push("function CacheController.ClearAll()");
+	lines.push("	table.clear(cache)");
+	lines.push("end");
+	lines.push("");
 	lines.push("return CacheController");
 	lines.push("");
 	return lines.join("\n");
@@ -209,13 +231,13 @@ function emitCacheController(plan) {
 function emitMain(plan) {
 	const lines = [header(plan).trimEnd(), ""];
 	if (plan.roles.players) {
-		lines.push("local PlayersManager = require(script.Parent.PlayersManager)");
+		lines.push("const PlayersManager = require(script.Parent.PlayersManager)");
 	}
 	if (plan.roles.cache) {
-		lines.push("local CacheController = require(script.Parent.CacheController)");
+		lines.push("const CacheController = require(script.Parent.CacheController)");
 	}
 	if (plan.roles.domain) {
-		lines.push(`local ${plan.roles.domain} = require(script.Parent.${plan.roles.domain})`);
+		lines.push(`const ${plan.roles.domain} = require(script.Parent.${plan.roles.domain})`);
 	}
 	lines.push("");
 	lines.push("local Main = {}");
@@ -242,9 +264,15 @@ function emitMain(plan) {
 	if (plan.roles.domain) {
 		lines.push(`	${plan.roles.domain}.Stop()`);
 	}
+	if (plan.roles.cache) {
+		lines.push("	CacheController.ClearAll()");
+	}
 	if (plan.roles.players) {
 		lines.push("	PlayersManager.Stop()");
 	}
+	if (!plan.roles.domain && !plan.roles.cache && !plan.roles.players) {
+		lines.push("	return");
+	}
 	lines.push("end");
 	lines.push("");
 	lines.push("return Main");
@@ -258,6 +286,10 @@ function emitBootstrap(plan) {
 }
 
 function emitConfig(plan, ast, options) {
+	const owned = (ast.body || []).some((decl) => decl.owner);
+	if (owned) {
+		return `${header(plan).trimEnd()}\n\n${emit(ast, { ...options, skipHeader: true, skipInit: true }).trimEnd()}\n`;
+	}
 	const lines = [];
 	if (plan.onlyConsts) {
 		lines.push(header(plan).trimEnd());
@@ -282,59 +314,86 @@ function emitConfig(plan, ast, options) {
 	}
 	if ((ast.body || []).some((decl) => decl.type === "function" && decl.name === "init")) {
 		lines.push("	Start = init,");
+		lines.push("	Init = init,");
+		lines.push("	init = init,");
 	}
 	lines.push("}");
 	lines.push("");
 	return lines.join("\n");
 }
 
+function emitDecls(decls, options) {
+	if (!decls || decls.length === 0) {
+		return "";
+	}
+	return emit({ type: "program", body: decls }, { ...options, skipHeader: true, skipInit: true }).trimEnd();
+}
+
 function emitDomainController(plan, ast, options) {
-	const absorbCache = plan.roles.cache;
 	const keep = (ast.body || []).filter((decl) => {
-		if (decl.type === "decl" || decl.type === "proto") {
-			return true;
-		}
-		if (decl.type !== "function") {
-			return false;
-		}
-		if (decl.name === "init") {
-			return true;
-		}
-		const classified = plan.functions.find((item) => item.name === decl.name);
-		if (absorbCache && classified && classified.absorb === "cache") {
-			return false;
-		}
-		return true;
+		return decl.type === "decl" || decl.type === "proto" || decl.type === "function" || decl.type === "expr";
 	});
-	const subset = { type: "program", body: keep };
-	const code = emit(subset, { ...options, skipHeader: true, skipInit: true }).trimEnd();
+	const groups = organizeDecls(keep);
 	const name = plan.roles.domain;
-	const libs = collectLibraries(options.source || "", subset);
-	const body = `${header(plan)}${code}
-
-local ${name} = {}
-
-function ${name}.Start()
-	${keep.some((decl) => decl.type === "function" && decl.name === "init") ? "init()" : "return"}
-end
-
-function ${name}.Stop()
-	return
-end
-
-return ${name}
-`;
-	return insertRequires(body, libs);
+	const entry = keep.find((decl) => decl.type === "function" && ENTRY_FN.test(decl.name || ""));
+	const bootExprs = keep.filter((decl) => decl.type === "expr");
+	const janitors = janitorNames(keep);
+	const closer = keep.find((decl) => decl.type === "function" && /^(OnClose|Cleanup|Shutdown)$/i.test(decl.name));
+	const stopLines = [];
+	if (janitors.length > 0) {
+		for (const janitor of janitors) {
+			stopLines.push(`	${janitor}:Cleanup()`);
+		}
+	} else if (closer) {
+		stopLines.push(`	${closer.name}()`);
+	} else {
+		stopLines.push("	return");
+	}
+	const boot = entry
+		? `	${entry.name}()`
+		: bootExprs.length
+			? emitDecls(bootExprs, options)
+					.split("\n")
+					.map((line) => (line ? `\t${line}` : line))
+					.join("\n")
+			: "	return";
+	const startFn = `function ${name}.Start()\n	${name}.Stop()\n${boot}\nend`;
+	const stopFn = `function ${name}.Stop()\n${stopLines.join("\n")}\nend`;
+	const body = `${header(plan).trimEnd()}\n\n${emitSection(SECTION.api, emitDecls(groups.api, options))}${emitSection(SECTION.constants, emitDecls(groups.constants, options))}${emitSection(SECTION.variables, joinBlocks([emitDecls(groups.variables, options), `local ${name} = {}`]))}${emitSection(SECTION.support, emitDecls(groups.support, options))}${emitSection(SECTION.principal, joinBlocks([emitDecls(groups.principal, options), startFn]))}${emitSection(SECTION.cleanup, joinBlocks([emitDecls(groups.cleanup, options), stopFn]))}${emitSection(SECTION.returns, `return ${name}`)}`;
+	return body;
 }
 
 function emitModule(plan, ast, options) {
 	return emitConfig(plan, ast, options);
 }
 
+function emitScriptMeta(runContext) {
+	return `${JSON.stringify(
+		{
+			properties: {
+				RunContext: `Enum.RunContext.${runContext}`,
+			},
+		},
+		null,
+		"\t",
+	)}\n`;
+}
+
+function serviceBootName(plan) {
+	if (plan.isClient) {
+		return "init.client.luau";
+	}
+	return "init.server.luau";
+}
+
 function serviceFiles(plan, ast, options, dir) {
 	const folder = `${dir}/${plan.serviceName}`;
-	const boot = plan.isClient ? "init.client.luau" : "init.server.luau";
-	const files = [{ name: `${folder}/${boot}`, contents: emitBootstrap(plan) }, { name: `${folder}/Main.luau`, contents: emitMain(plan) }];
+	const boot = serviceBootName(plan);
+	const files = [{ name: `${folder}/${boot}`, contents: emitBootstrap(plan) }];
+	if (!plan.isClient && plan.runContext) {
+		files.push({ name: `${folder}/init.meta.json`, contents: emitScriptMeta(plan.runContext) });
+	}
+	files.push({ name: `${folder}/Main.luau`, contents: emitMain(plan) });
 	if (plan.roles.players) {
 		files.push({ name: `${folder}/PlayersManager.luau`, contents: emitPlayersManager(plan) });
 	}
@@ -348,29 +407,75 @@ function serviceFiles(plan, ast, options, dir) {
 	return files;
 }
 
+function serviceFolderStale(plan, rel) {
+	const dir = path.posix.dirname(rel).replace(/^\.$/, "");
+	const serviceDir = dir && dir !== "." ? dir : plan.isClient ? "client" : "server";
+	const folder = `${serviceDir}/${plan.serviceName}`;
+	return [
+		folder,
+		`${folder}/init.luau`,
+		`${folder}/init.server.luau`,
+		`${folder}/init.client.luau`,
+		`${folder}/init.meta.json`,
+		`${folder}/Main.luau`,
+		`${folder}/PlayersManager.luau`,
+		`${folder}/CacheController.luau`,
+		`${folder}/${plan.typesName}.luau`,
+		plan.roles && plan.roles.domain ? `${folder}/${plan.roles.domain}.luau` : null,
+	].filter(Boolean);
+}
+
 function planOutput(ast, fileName, options = {}) {
 	const plan = analyze(ast, fileName);
+	plan.strict = options.strict === true;
 	const rel = (options.relativeName || fileName).replace(/\\/g, "/");
 	const dir = path.dirname(rel).replace(/^\.$/, "");
 	const outDir = dir && dir !== "." ? dir : "";
 	const prefix = outDir ? `${outDir}/` : "";
+	const stale = serviceFolderStale(plan, rel);
 
-	if (options.architecture === false) {
-		return { kind: "flat", plan, files: null };
+	if (options.siblingHeader) {
+		return {
+			kind: "module",
+			plan,
+			files: [{ name: implOutName(rel), contents: emitModule(plan, ast, { ...options, skipInit: true }) }],
+			stale: [],
+		};
 	}
 
-	if (plan.kind === "legacy") {
-		return { kind: "legacy", plan, files: null, stale: [], outName: legacyOutName(rel) };
+	if (options.architecture === true) {
+		if (plan.kind === "legacy") {
+			return { kind: "legacy", plan, files: null, stale: [], outName: legacyOutName(rel) };
+		}
+
+		if (plan.kind === "service") {
+			const serviceDir = outDir || (plan.isClient ? "client" : "server");
+			const folder = `${serviceDir}/${plan.serviceName}`;
+			const serviceStale = plan.isClient
+				? [`${folder}/init.luau`, `${folder}/init.server.luau`, `${folder}/init.meta.json`]
+				: [`${folder}/init.luau`, `${folder}/init.client.luau`];
+			return {
+				kind: "service",
+				plan,
+				files: serviceFiles(plan, ast, options, serviceDir),
+				stale: serviceStale,
+			};
+		}
+
+		if (plan.kind === "config" || plan.kind === "module") {
+			return {
+				kind: plan.kind,
+				plan,
+				files: [{ name: `${prefix}${plan.serviceName}.luau`, contents: emitModule(plan, ast, options) }],
+				stale: [rel.replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau")],
+			};
+		}
+
+		return { kind: "flat", plan, files: null, stale: [], outName: modernScriptOutName(rel) };
 	}
 
-	if (plan.kind === "service") {
-		const serviceDir = outDir || (plan.isClient ? "client" : "server");
-		return {
-			kind: "service",
-			plan,
-			files: serviceFiles(plan, ast, options, serviceDir),
-			stale: [rel.replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau")],
-		};
+	if (plan.kind === "legacy") {
+		return { kind: "legacy", plan, files: null, stale, outName: legacyOutName(rel) };
 	}
 
 	if (plan.kind === "config" || plan.kind === "module") {
@@ -378,11 +483,14 @@ function planOutput(ast, fileName, options = {}) {
 			kind: plan.kind,
 			plan,
 			files: [{ name: `${prefix}${plan.serviceName}.luau`, contents: emitModule(plan, ast, options) }],
-			stale: [rel.replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau")],
+			stale: [rel.replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau"), ...stale],
 		};
 	}
 
-	return { kind: "flat", plan, files: null, stale: [] };
+	const outName = modernScriptOutName(rel);
+	const stripped = rel.replace(/\.(server|client|plugin)\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau");
+	const extraStale = stripped !== outName ? [stripped] : [];
+	return { kind: "flat", plan, files: null, stale: [...stale, ...extraStale], outName };
 }
 
 module.exports = {