cluaupp 1.5.0 → 1.5.1

package/generated/clpp/rewrite-janitor.js

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rewriteSweepJanitor = rewriteSweepJanitor;
+const HEADER = /^(?:const function |function )([A-Za-z0-9_]+)(?::([A-Za-z0-9_]+))?\(([^)]*)\)[^\n]*\n/gm;
+const INSTANCE_TYPES = new Set([
+    "Instance",
+    "Part",
+    "BasePart",
+    "Model",
+    "Player",
+    "ScreenGui",
+    "GuiObject",
+    "TextButton",
+    "TextLabel",
+    "ImageLabel",
+    "Frame",
+    "Tool",
+    "Humanoid",
+    "Folder",
+    "ValueBase",
+    "IntValue",
+    "StringValue",
+    "BoolValue",
+]);
+function parseParams(sig) {
+    const out = [];
+    for (const piece of String(sig).split(",")) {
+        const match = piece.trim().match(/^([A-Za-z_][A-Za-z0-9_]*)\s*:\s*([A-Za-z_][A-Za-z0-9_]*)/);
+        if (match) {
+            out.push({ name: match[1], type: match[2] });
+        }
+    }
+    return out;
+}
+function connectRoots(body) {
+    const roots = [];
+    const seen = new Set();
+    const re = /__janitor:Add\(([A-Za-z_][A-Za-z0-9_]*)/g;
+    let match = re.exec(body);
+    while (match) {
+        const name = match[1];
+        if (!seen.has(name)) {
+            seen.add(name);
+            roots.push(name);
+        }
+        match = re.exec(body);
+    }
+    return roots;
+}
+function linkTarget(params, body) {
+    const roots = connectRoots(body);
+    for (const root of roots) {
+        const param = params.find((item) => item.name === root && INSTANCE_TYPES.has(item.type));
+        if (param) {
+            return param.name;
+        }
+    }
+    const fallback = params.find((item) => INSTANCE_TYPES.has(item.type));
+    return fallback ? fallback.name : null;
+}
+function splitSelfGuard(body) {
+    const match = body.match(/^(\tif not \(self[\s\S]*?\n\tend\n)/);
+    if (!match) {
+        return { guard: "", rest: body };
+    }
+    return { guard: match[1], rest: body.slice(match[1].length) };
+}
+function hoistSelf() {
+    return [
+        "\tlocal __janitor = self.janitor",
+        "\tif not __janitor then",
+        "\t\t__janitor = Janitor.new()",
+        "\t\tself.janitor = __janitor",
+        "\tend",
+        "",
+    ].join("\n");
+}
+function hoistLink(name) {
+    return ["\tlocal __janitor = Janitor.new()", `\t__janitor:LinkToInstance(${name})`, ""].join("\n");
+}
+function hoistModule() {
+    return [
+        "\tif not __cluauppSweep then",
+        "\t\t__cluauppSweep = Janitor.new()",
+        "\tend",
+        "\tlocal __janitor = __cluauppSweep",
+        "",
+    ].join("\n");
+}
+function rewriteBody(params, body, isMethod) {
+    if (!/^[ \t]*local __janitor = Janitor\.new\(\)\s*\n/m.test(body)) {
+        return { body, moduleSweep: false };
+    }
+    if (/__janitor:LinkToInstance\(/.test(body)) {
+        return { body, moduleSweep: false };
+    }
+    const stripped = body.replace(/^[ \t]*local __janitor = Janitor\.new\(\)\s*\n/m, "");
+    const parsed = parseParams(params);
+    const link = linkTarget(parsed, stripped);
+    if (link) {
+        const pieces = splitSelfGuard(stripped);
+        return { body: `${pieces.guard}${hoistLink(link)}${pieces.rest}`, moduleSweep: false };
+    }
+    if (isMethod) {
+        const pieces = splitSelfGuard(stripped);
+        return { body: `${pieces.guard}${hoistSelf()}${pieces.rest}`, moduleSweep: false };
+    }
+    const pieces = splitSelfGuard(stripped);
+    return { body: `${pieces.guard}${hoistModule()}${pieces.rest}`, moduleSweep: true };
+}
+function rewriteSweepJanitor(luau) {
+    const source = String(luau);
+    HEADER.lastIndex = 0;
+    const matches = [...source.matchAll(HEADER)];
+    if (matches.length === 0) {
+        return source;
+    }
+    let out = source.slice(0, matches[0].index);
+    let needsModule = false;
+    for (let i = 0; i < matches.length; i += 1) {
+        const match = matches[i];
+        const header = match[0];
+        const method = match[2];
+        const params = match[3] || "";
+        const isMethod = Boolean(method);
+        const bodyStart = (match.index || 0) + header.length;
+        const bodyEnd = i + 1 < matches.length ? matches[i + 1].index : source.length;
+        const rawBody = source.slice(bodyStart, bodyEnd);
+        const rewritten = rewriteBody(params, rawBody, isMethod);
+        if (rewritten.moduleSweep) {
+            needsModule = true;
+        }
+        out += header + rewritten.body;
+    }
+    if (needsModule && !/\blocal __cluauppSweep\b/.test(out)) {
+        const inject = "local __cluauppSweep = nil\n";
+        if (/const Janitor = require[^\n]*\n/.test(out)) {
+            out = out.replace(/const Janitor = require[^\n]*\n/, (line) => `${line}${inject}`);
+        }
+        else {
+            out = inject + out;
+        }
+    }
+    return out;
+}

package/generated/clpp/runner.js

@@ -29,10 +29,10 @@ function cmpSemver(a, b) {
     return a.major - b.major || a.minor - b.minor || a.patch - b.patch;
 }
 function minClpp() {
-    return parseSemver(contract_js_1.MIN_CLPP_VERSION) || { major: 0, minor: 3, patch: 2 };
+    return parseSemver(contract_js_1.MIN_CLPP_VERSION) || { major: 0, minor: 8, patch: 0 };
 }
 function tooOldMessage(bin, version) {
-    return `cluaupp: clpp ${version || "unknown"} is too old (${bin}). Need CL++ ${contract_js_1.MIN_CLPP_VERSION}+. Install https://github.com/KartzRbx/CLPP/releases/download/v0.3.2/clpp-setup.exe or set CLPP / CLPP_PATH.`;
+    return `cluaupp: clpp ${version || "unknown"} is too old (${bin}). Need CL++ ${contract_js_1.MIN_CLPP_VERSION}+. Install https://github.com/KartzRbx/CLPP/releases or set CLPP / CLPP_PATH.`;
 }
 function probeVersion(bin) {
     const result = (0, node_child_process_1.spawnSync)(bin, ["--version"], { encoding: "utf8", windowsHide: true });
@@ -170,6 +170,12 @@ function compileViaClpp(request) {
         source: request.source,
         fileName: request.fileName,
         strict: request.strict ?? null,
+        optimize: request.optimize ?? true,
+        targetProfilePath: request.targetProfilePath ?? null,
+        targetCacheDir: request.targetCacheDir ?? null,
+        runContext: request.runContext ?? null,
+        capabilityProfilePath: request.capabilityProfilePath ?? null,
+        datamodelProfilePath: request.datamodelProfilePath ?? null,
     });
     const result = (0, node_child_process_1.spawnSync)(bin, ["api", "compile"], {
         input: payload,
@@ -222,6 +228,12 @@ function compileViaClppAsync(request) {
             source: request.source,
             fileName: request.fileName,
             strict: request.strict ?? null,
+            optimize: request.optimize ?? true,
+            targetProfilePath: request.targetProfilePath ?? null,
+            targetCacheDir: request.targetCacheDir ?? null,
+            runContext: request.runContext ?? null,
+            capabilityProfilePath: request.capabilityProfilePath ?? null,
+            datamodelProfilePath: request.datamodelProfilePath ?? null,
         }));
     });
 }

package/generated/compile.js

@@ -7,28 +7,106 @@ exports.compileSource = compileSource;
 exports.compileService = compileService;
 exports.compileServiceAsync = compileServiceAsync;
 const node_path_1 = __importDefault(require("node:path"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const runner_js_1 = require("./clpp/runner.js");
 const postprocess_js_1 = require("./clpp/postprocess.js");
 const paths_js_1 = require("./clpp/paths.js");
+const package_info_js_1 = require("./package-info.js");
+const roblox_js_1 = require("./target/roblox.js");
+const capability_profile_js_1 = require("./target/capability-profile.js");
+const context_check_js_1 = require("./target/context-check.js");
+const datamodel_js_1 = require("./target/datamodel.js");
+const datamodel_check_js_1 = require("./target/datamodel-check.js");
+const datamodel_generate_js_1 = require("./target/datamodel-generate.js");
+const parallel_check_js_1 = require("./target/parallel-check.js");
+const authority_check_js_1 = require("./target/authority-check.js");
+const get_service_js_1 = require("./target/get-service.js");
+function defaultTargetProfilePath() {
+    const cached = node_path_1.default.join(package_info_js_1.projectRoot, "api", "normalized", "roblox-target.profile.json");
+    if (node_fs_1.default.existsSync(cached)) {
+        return cached.replace(/\\/g, "/");
+    }
+    return undefined;
+}
+function ensureCapabilityProfile() {
+    const file = (0, capability_profile_js_1.capabilityProfilePath)();
+    if (!node_fs_1.default.existsSync(file)) {
+        (0, capability_profile_js_1.writeCapabilityProfile)();
+    }
+    return file.replace(/\\/g, "/");
+}
+function resolveGameRoot(options) {
+    const start = options.rootDir
+        ? node_path_1.default.resolve(options.rootDir)
+        : options.filePath
+            ? node_path_1.default.dirname(node_path_1.default.resolve(options.filePath))
+            : process.cwd();
+    let dir = start;
+    for (let i = 0; i < 8; i++) {
+        if (node_fs_1.default.existsSync(node_path_1.default.join(dir, "default.project.json")) || node_fs_1.default.existsSync(node_path_1.default.join(dir, "default.project.jsonc"))) {
+            return dir;
+        }
+        const parent = node_path_1.default.dirname(dir);
+        if (parent === dir) {
+            break;
+        }
+        dir = parent;
+    }
+    return options.rootDir ? node_path_1.default.resolve(options.rootDir) : process.cwd();
+}
+function ensureDatamodel(options) {
+    const root = resolveGameRoot(options);
+    const written = (0, datamodel_generate_js_1.writeDatamodelArtifacts)(root);
+    if (written) {
+        return { profilePath: written.profilePath.replace(/\\/g, "/"), profile: written.profile };
+    }
+    return { profile: (0, datamodel_js_1.buildDatamodelProfile)(root) };
+}
 function compileArgs(source, fileName, options) {
     const relative = (options.relativeName || fileName || "input.clpp").replace(/\\/g, "/");
     const outName = options.outName || (0, paths_js_1.toLuauPath)(relative);
     const header = options.filePath ? (0, paths_js_1.siblingHeader)(options.filePath) : null;
     const skipInit = options.skipInit === true || (0, postprocess_js_1.shouldSkipInit)(relative, Boolean(header));
     const diskPath = options.filePath ? node_path_1.default.resolve(options.filePath) : null;
+    const runContext = (0, roblox_js_1.runContextFromFileName)(relative);
+    const dm = ensureDatamodel(options);
+    const gameRoot = resolveGameRoot(options);
     return {
         request: {
             source,
             fileName: diskPath ? diskPath.replace(/\\/g, "/") : relative,
             strict: options.strict,
+            optimize: options.optimize !== false,
             cwd: diskPath ? node_path_1.default.dirname(diskPath) : options.srcDir,
+            targetProfilePath: defaultTargetProfilePath(),
+            targetCacheDir: node_path_1.default.join(package_info_js_1.projectRoot, "api", ".cache").replace(/\\/g, "/"),
+            runContext,
+            capabilityProfilePath: ensureCapabilityProfile(),
+            datamodelProfilePath: dm.profilePath,
         },
         relative,
         outName,
         skipInit,
         options,
+        datamodel: dm.profile,
+        gameRoot,
+        policy: (0, authority_check_js_1.loadPlatformPolicy)(gameRoot),
     };
 }
+function enforcePlatform(source, relative, args) {
+    const profile = (0, capability_profile_js_1.loadCapabilityProfile)();
+    (0, context_check_js_1.assertContextSafe)(source, relative, profile);
+    const warnings = (0, context_check_js_1.listContextWarnings)(source, relative, profile);
+    if (warnings.length) {
+        console.warn((0, context_check_js_1.formatContextViolations)(relative, warnings));
+    }
+    if (args.datamodel) {
+        (0, datamodel_check_js_1.assertDatamodelSafe)(source, args.datamodel);
+    }
+    (0, parallel_check_js_1.assertParallelSafe)(source, relative);
+    (0, authority_check_js_1.assertAuthoritySafe)(source, relative, args.policy);
+    (0, get_service_js_1.assertGetServiceSafe)(source, relative);
+}
 function finishArtifact(artifact, relative, outName, options, skipInit, source) {
     const luau = (0, postprocess_js_1.clppLuauToGame)(artifact, {
         relativeName: relative,
@@ -38,6 +116,8 @@ function finishArtifact(artifact, relative, outName, options, skipInit, source)
         strict: options.strict,
         skipInit,
         source,
+        nativeHints: artifact.nativeHints,
+        layoutHints: artifact.layoutHints,
     });
     return {
         kind: (0, paths_js_1.emitKind)(relative),
@@ -51,11 +131,13 @@ function compileSource(source, fileName, options = {}) {
 }
 function compileService(source, fileName, options = {}) {
     const args = compileArgs(source, fileName, options);
+    enforcePlatform(source, args.relative, args);
     const artifact = (0, runner_js_1.compileViaClpp)(args.request);
     return finishArtifact(artifact, args.relative, args.outName, args.options, args.skipInit, source);
 }
 async function compileServiceAsync(source, fileName, options = {}) {
     const args = compileArgs(source, fileName, options);
+    enforcePlatform(source, args.relative, args);
     const artifact = await (0, runner_js_1.compileViaClppAsync)(args.request);
     return finishArtifact(artifact, args.relative, args.outName, args.options, args.skipInit, source);
 }

package/generated/flare/parse.js

@@ -72,6 +72,7 @@ function parseSide(raw, file, line) {
 function parseFlare(source, filePath, defaultName) {
     const file = filePath.replace(/\\/g, "/");
     let name = defaultName;
+    let version;
     const packets = [];
     const queries = [];
     let packetId = 1;
@@ -83,6 +84,11 @@ function parseFlare(source, filePath, defaultName) {
         if (!line || line.startsWith("#") || line.startsWith("//")) {
             continue;
         }
+        const verStmt = line.match(/^version\s+(\d+)\s*;?$/i);
+        if (verStmt) {
+            version = Number(verStmt[1]);
+            continue;
+        }
         const opt = line.match(/^opt\s+name\s*=\s*(.+)$/i);
         if (opt) {
             const value = opt[1].trim().replace(/^["']|["']$/g, "");
@@ -92,6 +98,11 @@ function parseFlare(source, filePath, defaultName) {
             name = value;
             continue;
         }
+        const optVer = line.match(/^opt\s+version\s*=\s*(\d+)\s*;?$/i);
+        if (optVer) {
+            version = Number(optVer[1]);
+            continue;
+        }
         const packet = line.match(new RegExp(`^packet\\s+(${exports.FLARE_IDENT})\\s*\\((.*)\\)\\s+from\\s+(Client|Server)(?:\\s+(unreliable|reliable))?\\s*$`, "i"));
         if (packet) {
             const reliable = String(packet[4] || "reliable").toLowerCase() !== "unreliable";
@@ -127,5 +138,5 @@ function parseFlare(source, filePath, defaultName) {
     if (packets.length === 0 && queries.length === 0) {
         fail(file, 1, "schema is empty — add a packet or query");
     }
-    return { name, sourcePath: file, packets, queries };
+    return { name, sourcePath: file, version, packets, queries };
 }

package/generated/intellisense.js

@@ -16,6 +16,7 @@ const package_info_js_1 = require("./package-info.js");
 const contract_js_1 = require("./clpp/contract.js");
 const runner_js_1 = require("./clpp/runner.js");
 const paths_js_1 = require("./clpp/paths.js");
+const editor_install_js_1 = require("./editor-install.js");
 function copyDir(from, to) {
     node_fs_1.default.mkdirSync(to, { recursive: true });
     for (const entry of node_fs_1.default.readdirSync(from, { withFileTypes: true })) {
@@ -82,10 +83,24 @@ function writeVscode(root) {
         "*.client.clpp": "clpp",
         "*.plugin.clpp": "clpp",
         "*.flare": "flare",
+        "*.hive": "hive",
+        "*.mint": "mint",
+        "*.bloom": "bloom",
+        "*.helm": "helm",
+        "*.shift": "shift",
+        "*.axiom": "axiom",
     };
     writeJson(settingsPath, {
         ...current,
         "files.associations": associations,
+        "[luau]": {
+            ...((current["[luau]"] && typeof current["[luau]"] === "object" && !Array.isArray(current["[luau]"]))
+                ? current["[luau]"]
+                : {}),
+            "editor.insertSpaces": false,
+            "editor.tabSize": 4,
+            "editor.detectIndentation": false,
+        },
     });
     const extensionsPath = node_path_1.default.join(root, ".vscode", "extensions.json");
     const extensions = readJsonObject(extensionsPath);
@@ -100,8 +115,31 @@ function diagnosticsFor(_source, _fileName) {
     // from the editor — that duplicates source=clpp and freezes on every keystroke.
     return [];
 }
+function writeStylua(root) {
+    const dest = node_path_1.default.join(root, "stylua.toml");
+    const body = `# cluaupp roblox luau
+syntax = "Luau"
+column_width = 120
+line_endings = "Unix"
+indent_type = "Tabs"
+indent_width = 4
+quote_style = "AutoPreferDouble"
+call_parentheses = "Always"
+collapse_simple_statement = "Never"
+`;
+    if (node_fs_1.default.existsSync(dest)) {
+        const existing = node_fs_1.default.readFileSync(dest, "utf8");
+        if (!existing.includes("cluaupp roblox luau") && existing.trim() !== "") {
+            return;
+        }
+    }
+    if (!node_fs_1.default.existsSync(dest) || node_fs_1.default.readFileSync(dest, "utf8") !== body) {
+        node_fs_1.default.writeFileSync(dest, body, "utf8");
+    }
+}
 function syncEditorSupport(root, _config = {}) {
     writeVscode(root);
+    writeStylua(root);
 }
 function installEditorExtension(cluauppRoot = package_info_js_1.projectRoot) {
     const from = node_path_1.default.join(cluauppRoot, "editors", "vscode");
@@ -116,6 +154,16 @@ function installEditorExtension(cluauppRoot = package_info_js_1.projectRoot) {
             continue;
         }
         node_fs_1.default.mkdirSync(home, { recursive: true });
+        try {
+            for (const name of node_fs_1.default.readdirSync(home)) {
+                if (name.startsWith("kartzdev.cluaupp-flare-") && name !== id) {
+                    node_fs_1.default.rmSync(node_path_1.default.join(home, name), { recursive: true, force: true });
+                }
+            }
+        }
+        catch {
+            // ignore prune errors
+        }
         const dest = node_path_1.default.join(home, id);
         copyDir(from, dest);
         node_fs_1.default.writeFileSync(node_path_1.default.join(dest, "cluaupp.root"), node_path_1.default.resolve(cluauppRoot), "utf8");
@@ -132,12 +180,20 @@ function installEditorExtension(cluauppRoot = package_info_js_1.projectRoot) {
         }
         installed.push(dest);
     }
+    const bin = (0, editor_install_js_1.editorBin)();
+    if (bin && installed[0]) {
+        (0, node_child_process_1.spawnSync)(bin, ["--install-extension", installed[0], "--force"], {
+            encoding: "utf8",
+            windowsHide: true,
+            timeout: 120000,
+        });
+    }
     return installed;
 }
 async function installEditorSupport() {
     const local = installEditorExtension();
     if (local.length > 0) {
-        console.log("cluaupp: Flare IntelliSense installed");
+        console.log("cluaupp: schema IntelliSense installed (.flare .hive .mint .bloom .helm .shift .axiom)");
         for (const dest of local) {
             console.log(" ", dest);
         }