cluaupp 0.2.3 → 1.3.0

package/generated/compile.js

@@ -5,149 +5,56 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSource = compileSource;
 exports.compileService = compileService;
-const node_fs_1 = __importDefault(require("node:fs"));
+exports.compileServiceAsync = compileServiceAsync;
 const node_path_1 = __importDefault(require("node:path"));
-const parse_js_1 = require("./parse.js");
-const emit_js_1 = require("./emit.js");
-const preprocess_js_1 = require("./preprocess.js");
-const libs_js_1 = require("./libs.js");
-const architecture_js_1 = require("./architecture.js");
-const headers_js_1 = require("./headers.js");
-function shouldAttachRequires(name, contents) {
-    const file = String(name || "").replace(/\\/g, "/");
-    if (/\.json$/i.test(file) || /\.meta\.json$/i.test(file)) {
-        return false;
-    }
-    const trimmed = String(contents || "").trim();
-    if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
-        return false;
-    }
-    return true;
-}
-function attachRequires(contents, source, ast, options, outName) {
-    if (!shouldAttachRequires(outName, contents)) {
-        return contents;
-    }
-    const libraries = String(contents).includes("CluauppLibs") ? [] : (0, libs_js_1.collectLibraries)(source, ast);
-    return (0, libs_js_1.insertPreamble)(contents, options.moduleIncludes || [], libraries, outName);
-}
-function posixRel(from, file) {
-    return node_path_1.default.relative(from, file).replace(/\\/g, "/");
-}
-function declKey(decl) {
-    return `${decl.owner || ""}::${decl.name}`;
-}
-function mergeSiblingImpl(ast, implPath, options) {
-    const implOptions = {
-        ...options,
-        moduleIncludes: [],
-        seen: new Set(),
-        pragmaResolved: false,
+const runner_js_1 = require("./clpp/runner.js");
+const postprocess_js_1 = require("./clpp/postprocess.js");
+const paths_js_1 = require("./clpp/paths.js");
+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;
+    return {
+        request: {
+            source,
+            fileName: diskPath ? diskPath.replace(/\\/g, "/") : relative,
+            strict: options.strict,
+            cwd: diskPath ? node_path_1.default.dirname(diskPath) : options.srcDir,
+        },
+        relative,
+        outName,
+        skipInit,
+        options,
     };
-    const prepared = (0, preprocess_js_1.preprocess)(node_fs_1.default.readFileSync(implPath, "utf8"), implPath, implOptions);
-    const implAst = (0, parse_js_1.parse)(prepared, node_path_1.default.basename(implPath));
-    if (!Array.isArray(ast.body)) {
-        ast.body = [];
-    }
-    const existing = new Set((ast.body || [])
-        .filter((decl) => decl && (decl.type === "function" || decl.type === "proto") && decl.name)
-        .map(declKey));
-    for (const decl of implAst.body || []) {
-        if ((decl.type !== "function" && decl.type !== "proto") || !decl.name) {
-            continue;
-        }
-        const key = declKey(decl);
-        if (existing.has(key)) {
-            continue;
-        }
-        existing.add(key);
-        ast.body.push({
-            type: "proto",
-            name: decl.name,
-            owner: decl.owner,
-            returnType: decl.returnType,
-            params: decl.params,
-        });
-    }
 }
-function wireHeaderImpl(ast, fileName, options) {
-    const headerPath = options.filePath || null;
-    const impl = headerPath ? (0, preprocess_js_1.siblingImplementation)(headerPath) : null;
-    if (!impl) {
-        return;
-    }
-    mergeSiblingImpl(ast, impl, options);
-    const typeName = (0, headers_js_1.primaryHeaderName)(ast, options.relativeName || fileName);
-    const implRel = options.srcDir ? posixRel(options.srcDir, impl) : node_path_1.default.basename(impl).replace(/\\/g, "/");
-    const implOut = (0, preprocess_js_1.implOutName)(implRel);
-    options.headerImplName = `${typeName}Module`;
-    options.moduleIncludes = options.moduleIncludes || [];
-    if (!options.moduleIncludes.some((spec) => spec.name === options.headerImplName)) {
-        options.moduleIncludes.push({
-            name: options.headerImplName,
-            outRel: implOut,
-            exports: { consts: [], structs: [] },
-        });
-    }
-}
-function compileHeader(source, fileName, options, ast) {
-    wireHeaderImpl(ast, fileName, options);
-    const rel = (options.relativeName || fileName || "header.h").replace(/\\/g, "/");
-    const outName = (0, preprocess_js_1.toLuauPath)(rel);
-    const luau = attachRequires((0, headers_js_1.emitHeaderModule)(ast, options), source, ast, options, outName);
+function finishArtifact(artifact, relative, outName, options, skipInit) {
+    const luau = (0, postprocess_js_1.clppLuauToGame)(artifact, {
+        relativeName: relative,
+        outName,
+        srcDir: options.srcDir,
+        rootDir: options.rootDir,
+        strict: options.strict,
+        skipInit,
+    });
     return {
-        kind: "module",
-        plan: { kind: "module", strict: options.strict === true },
+        kind: (0, paths_js_1.emitKind)(relative),
+        plan: { kind: (0, paths_js_1.emitKind)(relative), strict: options.strict === true },
         files: [{ name: outName, contents: luau }],
         stale: [],
     };
 }
 function compileSource(source, fileName, options = {}) {
-    const opts = options;
-    opts.moduleIncludes = opts.moduleIncludes || [];
-    const prepared = (0, preprocess_js_1.preprocess)(source, opts.filePath || null, opts);
-    const ast = (0, parse_js_1.parse)(prepared, fileName || "input.cpp");
-    if ((0, preprocess_js_1.isHeaderFile)(fileName || "") || (0, preprocess_js_1.isHeaderFile)(opts.filePath || "")) {
-        return compileHeader(source, fileName || "header.h", opts, ast).files[0].contents;
-    }
-    const luau = (0, emit_js_1.emit)(ast, opts);
-    return attachRequires(luau, source, ast, opts, opts.outName || fileName || "input.cpp");
+    return compileService(source, fileName, options).files[0]?.contents ?? "";
 }
 function compileService(source, fileName, options = {}) {
-    const opts = options;
-    opts.moduleIncludes = opts.moduleIncludes || [];
-    const prepared = (0, preprocess_js_1.preprocess)(source, opts.filePath || null, opts);
-    const ast = (0, parse_js_1.parse)(prepared, fileName || "input.cpp");
-    if ((0, preprocess_js_1.isHeaderFile)(fileName || "") || (0, preprocess_js_1.isHeaderFile)(opts.filePath || "") || (0, preprocess_js_1.isHeaderFile)(opts.relativeName || "")) {
-        return compileHeader(source, fileName || "header.h", opts, ast);
-    }
-    const implHeader = opts.filePath ? (0, preprocess_js_1.siblingHeader)(opts.filePath) : null;
-    if (implHeader) {
-        opts.skipInit = true;
-    }
-    const planned = (0, architecture_js_1.planOutput)(ast, fileName || "input.cpp", {
-        ...opts,
-        relativeName: opts.relativeName || fileName,
-        source: prepared,
-        siblingHeader: implHeader,
-    });
-    if (planned.files) {
-        return {
-            ...planned,
-            files: planned.files.map((file) => ({
-                ...file,
-                contents: attachRequires(file.contents, source, ast, opts, file.name),
-            })),
-        };
-    }
-    const luau = attachRequires((0, emit_js_1.emit)(ast, opts), source, ast, opts, planned.outName || opts.outName || fileName || "input.cpp");
-    const name = planned.outName ||
-        opts.outName ||
-        String(fileName || "input.cpp").replace(/\.(cpp|cc|cxx|c|h|hpp|hh)$/i, ".luau");
-    return {
-        kind: planned.kind || "flat",
-        plan: planned.plan,
-        files: [{ name, contents: luau }],
-        stale: planned.stale || [],
-    };
+    const args = compileArgs(source, fileName, options);
+    const artifact = (0, runner_js_1.compileViaClpp)(args.request);
+    return finishArtifact(artifact, args.relative, args.outName, args.options, args.skipInit);
+}
+async function compileServiceAsync(source, fileName, options = {}) {
+    const args = compileArgs(source, fileName, options);
+    const artifact = await (0, runner_js_1.compileViaClppAsync)(args.request);
+    return finishArtifact(artifact, args.relative, args.outName, args.options, args.skipInit);
 }

package/generated/intellisense.js

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clangPath = clangPath;
-exports.writeCompileCommands = writeCompileCommands;
-exports.writeClangd = writeClangd;
+exports.isClppSource = void 0;
 exports.diagnosticsFor = diagnosticsFor;
 exports.syncEditorSupport = syncEditorSupport;
 exports.installEditorExtension = installEditorExtension;
@@ -13,57 +11,11 @@ exports.installEditorSupport = installEditorSupport;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
-const parse_js_1 = require("./parse.js");
-const preprocess_js_1 = require("./preprocess.js");
-const editor_install_js_1 = require("./editor-install.js");
+const node_child_process_1 = require("node:child_process");
 const package_info_js_1 = require("./package-info.js");
-function posix(file) {
-    return String(file).replace(/\\/g, "/");
-}
-function collectFiles(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()) {
-            collectFiles(full, files);
-        }
-        else {
-            files.push(full);
-        }
-    }
-    return files;
-}
-function isCppFile(file) {
-    return /\.(cpp|cc|cxx|c|h|hpp|hh)$/i.test(file);
-}
-function clangCompileArgs(root) {
-    const absRoot = posix(node_path_1.default.resolve(root));
-    const absInclude = posix(node_path_1.default.join(absRoot, "include"));
-    const absSrc = posix(node_path_1.default.join(absRoot, "src"));
-    const roblox = posix(node_path_1.default.join(absInclude, "cluaupp", "roblox.hpp"));
-    return [
-        "-xc++",
-        "-std=c++20",
-        "-ferror-limit=0",
-        "-I" + absInclude,
-        "-I" + absSrc,
-        "-Iinclude",
-        "-Isrc",
-        "-include",
-        roblox,
-    ];
-}
-function compileCommandEntry(root, file) {
-    const absRoot = posix(node_path_1.default.resolve(root));
-    const absFile = posix(node_path_1.default.resolve(file));
-    return {
-        directory: absRoot,
-        file: absFile,
-        arguments: [clangPath(), ...clangCompileArgs(root), "-c", absFile],
-    };
-}
+const contract_js_1 = require("./clpp/contract.js");
+const runner_js_1 = require("./clpp/runner.js");
+const paths_js_1 = require("./clpp/paths.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 })) {
@@ -93,16 +45,6 @@ function uniqueStrings(...lists) {
     }
     return out;
 }
-function stripCppToolsSettings(current) {
-    const next = {};
-    for (const [key, value] of Object.entries(current)) {
-        if (key === "C_Cpp" || key.startsWith("C_Cpp.")) {
-            continue;
-        }
-        next[key] = value;
-    }
-    return next;
-}
 function readJsonObject(file) {
     if (!node_fs_1.default.existsSync(file)) {
         return {};
@@ -114,7 +56,7 @@ function readJsonObject(file) {
         }
     }
     catch {
-        // ignore corrupt editor json
+        // ignore
     }
     return {};
 }
@@ -126,58 +68,6 @@ function writeJson(file, value) {
     }
     node_fs_1.default.writeFileSync(file, json, "utf8");
 }
-function clangdEditorArgs() {
-    return [
-        "--compile-commands-dir=${workspaceFolder}",
-        "--header-insertion=never",
-        "--query-driver=**/clang++*,**/clang++.exe,**/g++*,**/g++.exe",
-    ];
-}
-function clangPath() {
-    return (0, editor_install_js_1.findClangPlusPlus)() || "clang++";
-}
-function writeCompileCommands(root, srcDir) {
-    const files = collectFiles(srcDir).filter((file) => isCppFile(file)).sort();
-    const json = `${JSON.stringify(files.map((file) => compileCommandEntry(root, file)), null, "\t")}\n`;
-    const dest = node_path_1.default.join(root, "compile_commands.json");
-    if (node_fs_1.default.existsSync(dest) && node_fs_1.default.readFileSync(dest, "utf8") === json) {
-        return false;
-    }
-    node_fs_1.default.writeFileSync(dest, json, "utf8");
-    return true;
-}
-function writeClangd(root) {
-    const flags = clangCompileArgs(root)
-        .map((flag) => `    - ${flag}`)
-        .join("\n");
-    const contents = `CompileFlags:
-  CompilationDatabase: .
-  Add:
-${flags}
-
-Diagnostics:
-  Suppress: '*'
-
----
-If:
-  PathMatch: .*\\.(cpp|cc|cxx|c|h|hpp|hh)$
-CompileFlags:
-  Add:
-    - -xc++
-
----
-If:
-  PathMatch: (out|libs)/.*
-Index:
-  Background: Skip
-`;
-    const dest = node_path_1.default.join(root, ".clangd");
-    if (node_fs_1.default.existsSync(dest) && node_fs_1.default.readFileSync(dest, "utf8") === contents) {
-        return false;
-    }
-    node_fs_1.default.writeFileSync(dest, contents, "utf8");
-    return true;
-}
 function writeVscode(root) {
     const settingsPath = node_path_1.default.join(root, ".vscode", "settings.json");
     const current = readJsonObject(settingsPath);
@@ -185,61 +75,32 @@ function writeVscode(root) {
         ...((current["files.associations"] && typeof current["files.associations"] === "object" && !Array.isArray(current["files.associations"]))
             ? current["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",
     };
     writeJson(settingsPath, {
-        ...stripCppToolsSettings(current),
-        "clangd.enable": true,
-        "clangd.arguments": clangdEditorArgs(),
+        ...current,
         "files.associations": associations,
     });
     const extensionsPath = node_path_1.default.join(root, ".vscode", "extensions.json");
     const extensions = readJsonObject(extensionsPath);
     writeJson(extensionsPath, {
         ...extensions,
-        recommendations: uniqueStrings(extensions.recommendations, ["llvm-vs-code-extensions.vscode-clangd"]),
+        recommendations: uniqueStrings(extensions.recommendations),
         unwantedRecommendations: uniqueStrings(extensions.unwantedRecommendations, ["ms-vscode.cpptools"]),
     });
-    const props = node_path_1.default.join(root, ".vscode", "c_cpp_properties.json");
-    if (node_fs_1.default.existsSync(props)) {
-        node_fs_1.default.unlinkSync(props);
-    }
 }
-function diagnosticsFor(source, fileName, options = {}) {
-    try {
-        const prepared = options.filePath ? (0, preprocess_js_1.preprocess)(source, options.filePath, options) : source;
-        (0, parse_js_1.parse)(prepared, fileName || "input.cpp");
-        return [];
-    }
-    catch (err) {
-        const error = err;
-        const message = error.message ? String(error.message) : "parse error";
-        const match = message.match(/:(\d+):(\d+):\s*(.*)$/);
-        if (match) {
-            return [{ line: Number(match[1]), col: Number(match[2]), message: match[3], severity: "error" }];
-        }
-        return [{ line: error.line || 1, col: error.col || 1, message, severity: "error" }];
-    }
+function diagnosticsFor(_source, _fileName) {
+    // Language diagnostics belong to `clpp install`. Do not spawn `clpp api compile`
+    // from the editor — that duplicates source=clpp and freezes on every keystroke.
+    return [];
 }
-function syncEditorSupport(root, config = {}) {
-    const srcDir = node_path_1.default.join(root, config.rootDir || "src");
-    if (node_fs_1.default.existsSync(srcDir)) {
-        writeCompileCommands(root, srcDir);
-    }
-    writeClangd(root);
+function syncEditorSupport(root, _config = {}) {
     writeVscode(root);
-    const flags = ["-xc++", "-std=c++20", "-ferror-limit=0", "-Iinclude", "-Isrc", "-include", "include/cluaupp/roblox.hpp"].join("\n") + "\n";
-    const flagsFile = node_path_1.default.join(root, "compile_flags.txt");
-    if (!node_fs_1.default.existsSync(flagsFile) || node_fs_1.default.readFileSync(flagsFile, "utf8") !== flags) {
-        node_fs_1.default.writeFileSync(flagsFile, flags, "utf8");
-    }
 }
 function installEditorExtension(cluauppRoot = package_info_js_1.projectRoot) {
     const from = node_path_1.default.join(cluauppRoot, "editors", "vscode");
@@ -261,12 +122,20 @@ function installEditorExtension(cluauppRoot = package_info_js_1.projectRoot) {
     }
     return installed;
 }
-async function installEditorSupport(cluauppRoot = package_info_js_1.projectRoot) {
-    const local = installEditorExtension(cluauppRoot);
-    const llvm = (0, editor_install_js_1.ensureLlvm)();
-    (0, editor_install_js_1.reportInstall)(llvm, "LLVM clang++");
-    const clangd = await (0, editor_install_js_1.installMarketplaceExtension)(editor_install_js_1.CLANGD_ID, "clangd (LLVM)");
-    (0, editor_install_js_1.reportInstall)(clangd, "clangd");
-    console.log("cluaupp: C++ completion is clangd — reload the editor (Ctrl+Shift+P → Developer: Reload Window)");
-    return { local, llvm, clangd };
+async function installEditorSupport() {
+    const local = installEditorExtension();
+    if ((0, runner_js_1.hasClpp)()) {
+        const result = (0, node_child_process_1.spawnSync)("clpp", ["install"], { encoding: "utf8", windowsHide: true });
+        if (result.status === 0) {
+            console.log(String(result.stderr || result.stdout || "clpp install ok").trim());
+        }
+        else {
+            console.log("cluaupp:", contract_js_1.CLPP_INSTALL_HINT);
+        }
+    }
+    else {
+        console.log("cluaupp:", contract_js_1.CLPP_INSTALL_HINT);
+    }
+    return { local };
 }
+exports.isClppSource = paths_js_1.isSourceFile;

package/generated/libs.js

@@ -259,7 +259,7 @@ function walk(node, visit) {
 function modulesFromIncludes(source) {
     const found = new Set();
     for (const line of String(source).split(/\r?\n/)) {
-        const match = line.match(/^\s*#\s*include\s+<cluaupp\/(?:libs\/)?([A-Za-z0-9]+)\.hpp>/);
+        const match = line.match(/^\s*#\s*include\s+<(?:clpp|cluaupp)\/(?:libs\/)?([A-Za-z0-9]+)\.(?:clh|hpp)>/);
         if (!match) {
             continue;
         }

package/generated/lsp.js

@@ -1,23 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
-const node_path_1 = __importDefault(require("node:path"));
 const node_1 = require("vscode-languageserver/node");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-const intellisense_js_1 = require("./intellisense.js");
 const package_info_js_1 = require("./package-info.js");
-function uriPath(uri) {
-    let file = String(uri || "").replace(/^file:\/\//, "");
-    if (/^\/[A-Za-z]:/.test(file)) {
-        file = file.slice(1);
-    }
-    return decodeURIComponent(file);
-}
-function start(options = {}) {
-    const projectRoot = options.projectRoot || process.cwd();
+function start(_options = {}) {
     const connection = (0, node_1.createConnection)(node_1.ProposedFeatures.all);
     const documents = new node_1.TextDocuments(vscode_languageserver_textdocument_1.TextDocument);
     connection.onInitialize(() => ({
@@ -26,30 +13,12 @@ function start(options = {}) {
         },
         serverInfo: { name: "cluaupp", version: package_info_js_1.pkg.version },
     }));
-    const publish = (document) => {
-        const file = uriPath(document.uri);
-        const items = (0, intellisense_js_1.diagnosticsFor)(document.getText(), file, {
-            filePath: file,
-            includeDirs: [node_path_1.default.dirname(file), node_path_1.default.join(projectRoot, "src"), node_path_1.default.join(projectRoot, "include")],
-        });
-        connection.sendDiagnostics({
-            uri: document.uri,
-            diagnostics: items.map((item) => ({
-                range: {
-                    start: { line: Math.max(0, (item.line || 1) - 1), character: Math.max(0, (item.col || 1) - 1) },
-                    end: { line: Math.max(0, (item.line || 1) - 1), character: Math.max(1, item.col || 1) },
-                },
-                severity: 1,
-                source: "cluaupp",
-                message: item.message,
-            })),
-        });
+    const clear = (uri) => {
+        connection.sendDiagnostics({ uri, diagnostics: [] });
     };
-    documents.onDidOpen((event) => publish(event.document));
-    documents.onDidChangeContent((event) => publish(event.document));
-    documents.onDidClose((event) => {
-        connection.sendDiagnostics({ uri: event.document.uri, diagnostics: [] });
-    });
+    documents.onDidOpen((event) => clear(event.document.uri));
+    documents.onDidChangeContent((event) => clear(event.document.uri));
+    documents.onDidClose((event) => clear(event.document.uri));
     documents.listen(connection);
     connection.listen();
 }