cluaupp 1.5.2 → 2.0.0-beta.2

package/generated/target/source-map.js

@@ -3,23 +3,76 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.remapSourceLines = remapSourceLines;
+exports.embedSourceMap = embedSourceMap;
 exports.writeSourceMap = writeSourceMap;
-/** Minimal source map: CL++ path ↔ emitted Luau (1:1 file mapping for v1). */
+/** Compiler coordinates are retained only for lines that survive host transformations. */
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+/** LCS alignment: inserted headers and removed lines never become fake source locations. */
+function remapSourceLines(original, generated, mappings = []) {
+    const a = original.split(/\r?\n/);
+    const b = generated.split(/\r?\n/);
+    if (original === generated)
+        return mappings.map(m => ({ ...m }));
+    // Avoid unbounded memory for generated bundles. An absent map is safer than a wrong one.
+    if (a.length * b.length > 4_000_000)
+        return [];
+    const widths = b.length + 1;
+    const dp = new Uint32Array((a.length + 1) * widths);
+    for (let i = a.length - 1; i >= 0; i--)
+        for (let j = b.length - 1; j >= 0; j--) {
+            dp[i * widths + j] = a[i].trim() === b[j].trim() ? 1 + dp[(i + 1) * widths + j + 1] : Math.max(dp[(i + 1) * widths + j], dp[i * widths + j + 1]);
+        }
+    const translated = new Map();
+    let i = 0, j = 0;
+    while (i < a.length && j < b.length) {
+        if (a[i].trim() === b[j].trim()) {
+            translated.set(i + 1, j + 1);
+            i++;
+            j++;
+        }
+        else if (dp[(i + 1) * widths + j] >= dp[i * widths + j + 1])
+            i++;
+        else
+            j++;
+    }
+    return mappings.flatMap(m => {
+        const line = translated.get(m.luauLine);
+        if (!line || !Number.isInteger(m.clppLine) || m.clppLine < 1)
+            return [];
+        // Formatting can move columns; do not invent a column in that case.
+        const exact = a[m.luauLine - 1] === b[line - 1];
+        const { luauColumn, ...rest } = m;
+        return [{ ...rest, luauLine: line, ...(exact && luauColumn ? { luauColumn } : {}) }];
+    });
+}
+function embedSourceMap(luau, lines) {
+    if (!lines.length)
+        return { contents: luau, lines: [] };
+    const shifted = lines.map(m => ({ ...m, luauLine: m.luauLine + 1 }));
+    // Preserve Luau directives at the start of the file.
+    const parts = luau.split(/\r?\n/);
+    let index = 0;
+    while (index < parts.length && parts[index].startsWith("--!"))
+        index++;
+    const adjusted = shifted.map((m, i) => ({ ...m, luauLine: lines[i].luauLine > index ? m.luauLine : lines[i].luauLine }));
+    parts.splice(index, 0, "-- cluaupp-map: " + JSON.stringify(adjusted));
+    return { contents: parts.join("\n"), lines: adjusted };
+}
 function writeSourceMap(opts) {
+    const lines = opts.lines || [];
+    const source = opts.sourceClppRel.replace(/\\/g, "/");
     const map = {
         version: 1,
         file: node_path_1.default.basename(opts.outLuauPath),
         sourceRoot: opts.projectRoot.replace(/\\/g, "/"),
-        sources: [opts.sourceClppRel.replace(/\\/g, "/")],
-        mappings: "AAAA", // identity stub — refine when clpp emits VLQ maps
-        cluaupp: {
-            source: opts.sourceClppRel.replace(/\\/g, "/"),
-            generated: node_path_1.default.relative(opts.projectRoot, opts.outLuauPath).replace(/\\/g, "/"),
-        },
+        sources: [...new Set([source, ...lines.map(m => m.file)])],
+        cluaupp: { source, generated: node_path_1.default.relative(opts.projectRoot, opts.outLuauPath).replace(/\\/g, "/"), lines },
     };
     const mapPath = opts.outLuauPath + ".map.json";
-    node_fs_1.default.writeFileSync(mapPath, JSON.stringify(map, null, "\t") + "\n", "utf8");
+    const contents = JSON.stringify(map, null, "\t") + "\n";
+    if (!node_fs_1.default.existsSync(mapPath) || node_fs_1.default.readFileSync(mapPath, "utf8") !== contents)
+        node_fs_1.default.writeFileSync(mapPath, contents, "utf8");
     return mapPath;
 }

package/generated/target/studio-bridge.js

@@ -80,6 +80,7 @@ function startStudioBridge(opts = {}) {
                         type: data.type || "open",
                         path: rel || undefined,
                         line: data.line,
+                        column: data.column,
                         instancePath: data.instancePath,
                         message: data.message,
                     });

package/generated/utils/project.js

@@ -13,6 +13,7 @@ exports.watch = watch;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const package_info_js_1 = require("../package-info.js");
+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 index_js_1 = require("../flare/index.js");
@@ -33,6 +34,8 @@ 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");
+const project_js_1 = require("../compiler/project.js");
+const diagnostics_js_1 = require("../compiler/diagnostics.js");
 function readProjectConfig(file) {
     const raw = JSON.parse(node_fs_1.default.readFileSync(file, "utf8"));
     if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
@@ -322,6 +325,10 @@ function compileOptions(root, config, file, rel) {
         outDir: config.outDir,
     };
 }
+function needsLegacyHeaders(srcDir) {
+    const sources = (0, paths_js_1.collectSources)(srcDir);
+    return sources.some(file => /\.clpp$/i.test(file)) || !sources.some(file => /\.clp$/i.test(file));
+}
 function compileSchemaJobs(root, config, srcDir) {
     const jobs = [];
     const errors = [];
@@ -336,7 +343,8 @@ function compileSchemaJobs(root, config, srcDir) {
             if (!(0, safe_paths_js_1.isInside)(node_path_1.default.resolve(root, config.rootDir), headerDest) && !(0, safe_paths_js_1.isInside)(srcDir, headerDest)) {
                 throw new Error(`cluaupp schema: skip unsafe header ${emit.headerRel}`);
             }
-            writeTextIfChanged(headerDest, emit.header);
+            if (needsLegacyHeaders(srcDir))
+                writeTextIfChanged(headerDest, emit.header);
             jobs.push({
                 rel,
                 files: [{ name: emit.luauRel, contents: emit.luau }],
@@ -364,7 +372,8 @@ function compileFlareJobs(root, config, srcDir) {
             if (!(0, safe_paths_js_1.isInside)(node_path_1.default.resolve(root, config.rootDir), headerDest) && !(0, safe_paths_js_1.isInside)(srcDir, headerDest)) {
                 throw new Error(`cluaupp flare: skip unsafe header ${emit.headerRel}`);
             }
-            writeTextIfChanged(headerDest, emit.header);
+            if (needsLegacyHeaders(srcDir))
+                writeTextIfChanged(headerDest, emit.header);
             jobs.push({
                 rel,
                 files: [{ name: emit.luauRel, contents: emit.luau }],
@@ -377,25 +386,61 @@ function compileFlareJobs(root, config, srcDir) {
     }
     return { jobs, errors };
 }
-function configFingerprint(config) {
+function configFingerprint(root, config, rojoPath) {
+    const inputs = [node_path_1.default.resolve(root, rojoPath || "default.project.json"), node_path_1.default.join(root, "cluaupp.platform.json"), node_path_1.default.join(root, "cluaupp.profile.json"), node_path_1.default.join(package_info_js_1.projectRoot, "api", "normalized", "roblox-target.profile.json"), node_path_1.default.join(package_info_js_1.projectRoot, "api", "generated", "capability-profile.json"), node_path_1.default.join(package_info_js_1.projectRoot, "api", "roblox-api.lock.json")];
     return JSON.stringify({
         strict: config.strict === true,
         architecture: config.architecture === true,
         rootDir: config.rootDir,
         outDir: config.outDir,
         v: package_info_js_1.pkg.version,
+        rules: config.rules,
+        components: config.components,
+        inputs: inputs.map(file => [file, node_fs_1.default.existsSync(file) ? (0, build_cache_js_1.hashText)(node_fs_1.default.readFileSync(file, "utf8")) : null]),
     });
 }
+function compileClpJobs(root, config, srcDir) {
+    const compiler = new project_js_1.ProjectCompiler({ root, srcDir, strict: config.strict === true, version: package_info_js_1.pkg.version });
+    const jobs = [];
+    const errors = [];
+    for (const result of compiler.compileAll()) {
+        if (result.luau === null) {
+            const diagnostics = result.diagnostics.filter((d) => d.severity === "error");
+            errors.push({
+                rel: result.rel,
+                prefixes: sourcePrefixes(result.rel),
+                message: diagnostics.map((d) => (0, diagnostics_js_1.formatDiagnostic)(d, result.source)).join("\n") || `${result.rel}: Luau emission failed`,
+            });
+            continue;
+        }
+        jobs.push({ rel: result.rel, files: [{ name: result.outRel, contents: result.luau, sourceMap: result.sourceMap, generatedSource: result.luau }], stale: [] });
+    }
+    return { jobs, errors };
+}
 function compileProject(root, config, mapper, options = {}) {
     const srcDir = node_path_1.default.join(root, config.rootDir);
     const schema = compileSchemaJobs(root, config, srcDir);
     const files = (0, paths_js_1.collectSources)(srcDir);
-    const jobs = [...schema.jobs];
-    const errors = [...schema.errors];
+    const legacyFiles = files.filter((file) => !file.toLowerCase().endsWith(".clp"));
+    const clp = compileClpJobs(root, config, srcDir);
+    const jobs = [...schema.jobs, ...clp.jobs];
+    const errors = [...schema.errors, ...clp.errors];
     const incremental = options.incremental !== false;
-    const cfgKey = configFingerprint(config);
+    let cfgKey = configFingerprint(root, config, options.rojo);
+    if (legacyFiles.length) {
+        try {
+            cfgKey += (0, runner_js_1.clppCacheIdentity)();
+        }
+        catch (err) {
+            for (const file of legacyFiles) {
+                const rel = posixRel(srcDir, file);
+                errors.push({ rel, prefixes: sourcePrefixes(rel), message: err.message });
+            }
+            return { files, jobs, errors };
+        }
+    }
     let cacheHits = 0;
-    for (const file of files) {
+    for (const file of legacyFiles) {
         const source = node_fs_1.default.readFileSync(file, "utf8");
         const rel = posixRel(srcDir, file);
         const sourceHash = (0, modules_js_1.fingerprintSourceWithDeps)(source, file, cfgKey, srcDir, build_cache_js_1.hashText);
@@ -424,7 +469,7 @@ function compileProject(root, config, mapper, options = {}) {
         }
     }
     if (cacheHits > 0) {
-        console.log(`cluaupp: incremental cache hit ${cacheHits}/${files.length}`);
+        console.log(`cluaupp: incremental cache hit ${cacheHits}/${legacyFiles.length}`);
     }
     return { files, jobs, errors };
 }
@@ -432,13 +477,27 @@ async function compileProjectAsync(root, config, mapper, options = {}) {
     const srcDir = node_path_1.default.join(root, config.rootDir);
     const schema = compileSchemaJobs(root, config, srcDir);
     const files = (0, paths_js_1.collectSources)(srcDir);
-    const jobs = [...schema.jobs];
-    const errors = [...schema.errors];
+    const legacyFiles = files.filter((file) => !file.toLowerCase().endsWith(".clp"));
+    const clp = compileClpJobs(root, config, srcDir);
+    const jobs = [...schema.jobs, ...clp.jobs];
+    const errors = [...schema.errors, ...clp.errors];
     const incremental = options.incremental !== false;
-    const cfgKey = configFingerprint(config);
+    let cfgKey = configFingerprint(root, config, options.rojo);
+    if (legacyFiles.length) {
+        try {
+            cfgKey += (0, runner_js_1.clppCacheIdentity)();
+        }
+        catch (err) {
+            for (const file of legacyFiles) {
+                const rel = posixRel(srcDir, file);
+                errors.push({ rel, prefixes: sourcePrefixes(rel), message: err.message });
+            }
+            return { files, jobs, errors };
+        }
+    }
     const concurrency = options.jobs ?? (0, build_cache_js_1.defaultJobCount)();
     let cacheHits = 0;
-    const compiled = await (0, build_cache_js_1.mapPool)(files, concurrency, async (file) => {
+    const compiled = await (0, build_cache_js_1.mapPool)(legacyFiles, concurrency, async (file) => {
         const source = node_fs_1.default.readFileSync(file, "utf8");
         const rel = posixRel(srcDir, file);
         const sourceHash = (0, modules_js_1.fingerprintSourceWithDeps)(source, file, cfgKey, srcDir, build_cache_js_1.hashText);
@@ -495,9 +554,9 @@ async function compileProjectAsync(root, config, mapper, options = {}) {
         }
     }
     if (cacheHits > 0) {
-        console.log(`cluaupp: incremental cache hit ${cacheHits}/${files.length} (jobs=${concurrency})`);
+        console.log(`cluaupp: incremental cache hit ${cacheHits}/${legacyFiles.length} (jobs=${concurrency})`);
     }
-    else if (files.length > 1 && concurrency > 1) {
+    else if (legacyFiles.length > 1 && concurrency > 1) {
         console.log(`cluaupp: parallel compile jobs=${concurrency}`);
     }
     return { files, jobs, errors };
@@ -536,7 +595,19 @@ function writeJobs(root, config, jobs, format) {
             if (/\.luau$/i.test(dest)) {
                 const srcFile = node_path_1.default.join(root, config.rootDir, job.rel);
                 const clppSource = node_fs_1.default.existsSync(srcFile) ? node_fs_1.default.readFileSync(srcFile, "utf8") : undefined;
-                contents = (0, luau_stamp_js_1.stampLuauFromClpp)((0, postprocess_js_1.rewriteClppEmit)(contents), job.rel, clppSource);
+                contents = (0, luau_stamp_js_1.stampLuauFromClpp)(/\.clp$/i.test(job.rel) ? contents : (0, postprocess_js_1.rewriteClppEmit)(contents), posixRel(root, srcFile), clppSource);
+            }
+            let lines = (artifact.sourceMap || []).map(m => ({ ...m, file: node_path_1.default.isAbsolute(m.file) ? posixRel(root, m.file) : node_path_1.default.posix.join(config.rootDir.replace(/\\/g, "/"), m.file) }));
+            if (format && /\.luau$/i.test(dest)) {
+                writeTextIfChanged(dest, contents);
+                process_orchestrator_js_1.ProcessOrchestrator.formatWithStyLuaSync(dest);
+                contents = node_fs_1.default.readFileSync(dest, "utf8");
+            }
+            if (/\.luau$/i.test(dest)) {
+                lines = (0, source_map_js_1.remapSourceLines)(artifact.generatedSource || artifact.contents, contents, lines);
+                const embedded = (0, source_map_js_1.embedSourceMap)(contents, lines);
+                contents = embedded.contents;
+                lines = embedded.lines;
             }
             const changed = writeTextIfChanged(dest, contents);
             written.add(resolveKey(dest));
@@ -546,14 +617,12 @@ function writeJobs(root, config, jobs, format) {
             if (/\.luau$/i.test(dest)) {
                 const mapPath = (0, source_map_js_1.writeSourceMap)({
                     outLuauPath: dest,
-                    sourceClppRel: job.rel,
+                    sourceClppRel: node_path_1.default.posix.join(config.rootDir.replace(/\\/g, "/"), job.rel),
                     projectRoot: root,
+                    lines,
                 });
                 written.add(resolveKey(mapPath));
             }
-            if (format && /\.luau$/i.test(dest)) {
-                process_orchestrator_js_1.ProcessOrchestrator.formatWithStyLuaSync(dest);
-            }
         }
         for (const stale of job.stale || []) {
             const dest = outDest(root, config, stale);
@@ -568,7 +637,10 @@ function writeJobs(root, config, jobs, format) {
 }
 function ensureVendor(root) {
     copyRuntime(root);
-    copyHeaders(root);
+    const config = loadConfig(root);
+    if ((0, paths_js_1.collectSources)(node_path_1.default.join(root, config.rootDir)).some(file => /\.clpp$/i.test(file))) {
+        copyHeaders(root);
+    }
 }
 function finishBuild(root, config, compiled, options) {
     const exitOnError = options.exitOnError !== false;
@@ -697,10 +769,15 @@ async function buildAsync(root, options = {}) {
 }
 async function init(dest) {
     const target = (0, safe_paths_js_1.assertInitDest)(dest);
-    const template = node_path_1.default.join(__dirname, "..", "..", "templates", "game");
-    const include = node_path_1.default.join(__dirname, "..", "..", "include");
+    if (node_fs_1.default.existsSync(node_path_1.default.join(target, "cluaupp.config.json")) || node_fs_1.default.existsSync(node_path_1.default.join(target, "src"))) {
+        throw new Error("cluaupp init: project already exists; choose a new folder. Existing .clpp/.clh sources require migration, not another init.");
+    }
+    const template = node_path_1.default.join(__dirname, "..", "..", "templates", "game-modern");
     copyDir(template, target);
-    copyDir(include, node_path_1.default.join(target, "include"));
+    const packageFile = node_path_1.default.join(target, "package.json");
+    const projectPackage = JSON.parse(node_fs_1.default.readFileSync(packageFile, "utf8"));
+    projectPackage.devDependencies = { ...projectPackage.devDependencies, cluaupp: package_info_js_1.pkg.version };
+    node_fs_1.default.writeFileSync(packageFile, JSON.stringify(projectPackage, null, "\t") + "\n");
     const skills = node_path_1.default.join(__dirname, "..", "..", "skills");
     if (node_fs_1.default.existsSync(skills)) {
         copyDir(skills, node_path_1.default.join(target, ".cursor", "skills"));
@@ -709,17 +786,13 @@ async function init(dest) {
     const initConfig = loadConfig(target);
     syncRojoTree(target, initConfig);
     (0, intellisense_js_1.syncEditorSupport)(target);
-    try {
-        (0, intellisense_js_1.installEditorExtension)();
-    }
-    catch {
-        // editor homes may be missing in CI
-    }
+    // CL++ 0.10 owns its editor extension; project init only writes associations.
     console.log("Cluaupp ready in", target);
-    console.log("  clpp install          (CL++ highlighting + IntelliSense)");
+    console.log("  CL++ 0.10 editor extension provides syntax highlighting; Cluaupp compiles Roblox .clp files");
     console.log("  cluaupp intellisense  (schema .flare .hive .mint .bloom .helm .shift .axiom)");
     console.log("  rokit install");
-    console.log("  cluaupp build");
+    console.log("  npm install");
+    console.log("  npm run build");
     console.log("  rojo serve");
 }
 function pidAlive(pid) {

package/include/README.md

@@ -0,0 +1,5 @@
+# Legacy CL++ headers
+
+The .clh files in this directory use the legacy .clpp compiler syntax. They are preserved for the explicit legacy adapter and API projection tests. They are not modules for modern .clp programs, and modern cluaupp init and build do not copy them into a project.
+
+Modern Roblox code uses link @clpp.roblox; and libraries use link @clpp.libs.Ward as Ward; (replace Ward with the runtime library). The API types come from the registry. Changing .clh to .clp does not migrate the syntax. Generated schema bindings still need modern type projections; legacy headers are not advertised as modern bindings.

package/native/bin/.gitkeep

@@ -0,0 +1 @@
+

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cluaupp",
-	"version": "1.5.2",
-	"description": "Cluaupp toolchain — compile CL++ to Luau with Rojo and CluauppLibs.",
+	"version": "2.0.0-beta.2",
+	"description": "Roblox target for CL++: compile .clp to Luau with Rojo and CluauppLibs.",
 	"author": "KartzDev",
 	"license": "MIT",
 	"bin": {
@@ -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,11 +43,14 @@
 		"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/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",
+		"postinstall": "node scripts/postinstall-native.js && node scripts/postinstall-editor.js",
+		"test": "node test/cli-modern.test.js && node test/handshake.test.js && node test/source-map.test.js && node test/cache-invalidation.test.js && node test/package.test.js && node test/security.test.js && node test/understander.test.js && node test/modern-clp.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",
+		"test:modern": "node test/modern-clp.test.js",
+		"bench": "node scripts/bench-site.cjs",
 		"generate-api": "node scripts/generate-api.js",
 		"vendor-libs": "node scripts/vendor-libs.js",
 		"build:libs": "node scripts/sync-packages.js",
@@ -52,10 +58,15 @@
 		"site:dev": "npm run dev -w @cluaupp/docs",
 		"dev": "node scripts/dev.js",
 		"stop": "node scripts/stop.js",
-		"prepublishOnly": "tsc && npm test"
+		"prepublishOnly": "npm run setup:runtime && tsc && node generated/cli.js api generate && node generated/cli.js api verify && npm test && npm run test:runtime && npm run test:release",
+		"api:surface": "tsx scripts/build-surface.ts",
+		"test:handshake": "node test/handshake.test.js",
+		"test:runtime": "node scripts/test-runtime.cjs",
+		"test:release": "node scripts/test-release.cjs",
+		"setup:runtime": "node scripts/setup-runtime.cjs"
 	},
 	"engines": {
-		"node": ">=18"
+		"node": ">=22.12.0"
 	},
 	"keywords": [
 		"luau",

package/plugins/CluauppNav/Plugin.luau

@@ -91,6 +91,26 @@ local function findSourceComment(source: string): string?
 	return nil
 end
 
+-- Only exact compiler locations are used. Headers/helpers stay unmapped.
+local function mappedLocation(source: string, generatedLine: number): (string?, number?, number?)
+ for line in string.gmatch(source, "[^\r\n]+") do
+  local raw = string.match(line, "^%-%-%s*cluaupp%-map:%s*(.+)$")
+  if raw then
+   local ok, entries = pcall(function() return HttpService:JSONDecode(raw) end)
+   if ok and type(entries) == "table" then
+    for _, entry in entries do
+     if entry.luauLine == generatedLine and type(entry.file) == "string" and type(entry.clppLine) == "number" then
+      return entry.file, entry.clppLine, entry.clppColumn
+     end
+    end
+   end
+   return nil, nil, nil
+  end
+  if not string.match(line, "^%-%-") then break end
+ end
+ return nil, nil, nil
+end
+
 local function currentClppPath(): (string?, LuaSourceContainer?)
 	local sel = Selection:Get()
 	local scriptInst = sel[1]
@@ -186,15 +206,19 @@ ScriptContext.Error:Connect(function(message, stack, scriptInst)
 	local ok, source = pcall(function()
 		return (scriptInst :: LuaSourceContainer).Source
 	end)
-	local clpp = ok and typeof(source) == "string" and findSourceComment(source) or nil
-	local line = tonumber(string.match(stack or "", ":(%d+)")) or 1
-	local text = string.format("[error] %s\n  luau: %s\n  clpp: %s:%d", tostring(message), scriptInst:GetFullName(), tostring(clpp or "?"), line)
+	local line = tonumber(string.match(tostring(message), ":(%d+):")) or tonumber(string.match(stack or "", ":(%d+)"))
+	local clpp, sourceLine, sourceColumn
+	if ok and typeof(source) == "string" and line then
+		clpp, sourceLine, sourceColumn = mappedLocation(source, line)
+	end
+	local text = string.format("[error] %s\n  luau: %s\n  clpp: %s:%d", tostring(message), scriptInst:GetFullName(), tostring(clpp or "(unmapped)"), sourceLine or 0)
 	appendLog(text, Color3.fromRGB(255, 120, 120))
 	if clpp then
 		postBridge({
 			type = "error",
 			path = clpp,
-			line = line,
+			line = sourceLine,
+			column = sourceColumn,
 			message = tostring(message),
 			instancePath = scriptInst:GetFullName(),
 		})