@tilua/compiler 7.0.1 → 8.1.0

package/README.md

@@ -14,7 +14,7 @@ npx tilua src/main.tilua --out build/main.luau
 
 ```
 tilua <entry> [--out <file>] [--output single|chunks|modules] [--config <tilua.config.json>]
-              [--noCheck]
+              [--noCheck] [--noLineMap]
 ```
 
 Every module the entry imports is bundled in. Problems are reported as
@@ -74,9 +74,10 @@ JavaScript module the build loads.
 | `const` / `let` | `local` |
 | `class C { … }` | one table for the class, one per instance — see below |
 | `return [a, b]` | `return { a, b }` — several results are an array |
-| `for (const item in xs)` | `for _, item in xs do … end` — an array or a table walked for its values |
-| `for (const item in step)` | `for item in step do … end` — an iterator function |
-| `for (const [k, v] in pairs(t))` | `for item in unpack(pairs(t), 1, 3) do local k, v = item[1], item[2] … end` — an iteration is `[step, state, first]` |
+| `for (const item of xs)` | `for _, item in xs do … end` — an array or a table walked for its values |
+| `for (const item of step)` | `for item in step do … end` — an iterator function |
+| `for (const [k, v] of pairs(t))` | `for item in unpack(pairs(t), 1, 3) do local k, v = item[1], item[2] … end` — an iteration is `[step, state, first]` |
+| `for (const key in t)` | `for key in pairs(t) do … end` — a table's keys, as in TypeScript |
 | `t ??= v` | `if t == nil then t = v end` — what addresses `t` read once, into locals |
 | `{ m() { … } }` | `{ m = function(this) … end }` — called with `:` |
 | `break outer` from a loop inside `outer` | a flag `outer` declares, raised, and a `break`; after each loop on the way out, a check that breaks again — or, at `outer`, does the `break` or `continue` |
@@ -117,7 +118,7 @@ Luau without asking:
 | `a += b`, `a // b` | `a = a + (b)`, `math.floor(a / (b))` | as written |
 | `continue` | a `break` out of a one-pass `repeat` | as written |
 | `c ? a : b`, `a?.b`, `a ?? b` | `and`/`or` where neither arm can be `false`, else a function called on the spot | `if c then a else b` |
-| `for (const x in xs)` | `ipairs(xs)` where `xs` is an array by its type; otherwise `tilua_each(xs)`, which walks a table as Luau would — its `__iter` if it has one, `next` if not | `for _, x in xs do` |
+| `for (const x of xs)` | `ipairs(xs)` where `xs` is an array by its type; otherwise `tilua_each(xs)`, which walks a table as Luau would — its `__iter` if it has one, `next` if not | `for _, x in xs do` |
 | `1_000`, `0b101` | plain numbers | as written |
 | `@native` and other attributes | dropped | kept |
 | another file of the bundle | `loadfile` | `require` by path |
@@ -295,6 +296,16 @@ With several files each has its own line map, and a position is read by the
 map of the file it names — matched by the end of that file's path, since the
 Lua running it may call it by a full path, a relative one, or an Instance's.
 
+The map is packed — the files it names once, then three base-64 VLQ numbers a
+line, each counted from the line before — and read out the first time a line
+is looked up, so a program that never fails never unpacks it.
+
+For a release nobody will debug, `"lineMap": false` in `tilua.config.json`
+(or `--noLineMap`, or `bundle({ lineMap: false })`) leaves out the map and
+everything that reads it: the entry runs without `xpcall`, a callback handed
+to Roblox is passed through unwrapped, and an error names the bundle's own
+lines, as plain Luau would.
+
 ## Modules
 
 Roblox's `require` takes an Instance, so the bundle has its own. Each module
@@ -433,12 +444,12 @@ entry's.
 <!-- compatibility:start -->
 ## Compatibility
 
-`@tilua/compiler@7.0.1` works with these tilua packages. *Released with* is the
+`@tilua/compiler@8.1.0` works with these tilua packages. *Released with* is the
 version it was built and tested against.
 
 | Package | Range | Released with | |
 | --- | --- | --- | --- |
-| `@tilua/parser` | `^7.0.0` | 7.0.0 | dependency |
+| `@tilua/parser` | `^8.1.0` | 8.1.0 | dependency |
 <!-- compatibility:end -->
 
 ## Development

package/dist/{chunk-WGXXYKEU.js → chunk-WOBHMGGC.js}

@@ -1448,8 +1448,15 @@ end`).body.statements, out);
           item = this.names.fresh("item");
           prelude.push(...this.destructure(variable, identifier(item), "declare"));
         }
-        const form = this.options.types?.loops.get(node) ?? { walks: "values", viaIter: false };
+        const form = this.options.types?.loops.get(node) ?? { walks: node.over === "keys" ? "keys" : "values", viaIter: false };
         let source = this.expression(node.iterator);
+        if (form.walks === "keys") {
+          return [genericFor(
+            [item],
+            [call(this.builtin("pairs"), [source])],
+            this.loopBody51(this.block(node.body, prelude)).statements
+          )];
+        }
         if (form.viaIter) source = methodCall(source, "__iter", []);
         const variables = form.walks === "values" ? [this.names.fresh("_"), item] : [item];
         let iterators = form.walks === "iteration" ? [call(this.helper("unpack"), [source, number(1), number(3)])] : [source];
@@ -2792,6 +2799,7 @@ import {
   directivesOf,
   applyDirectives,
   UNUSED_EXPECT_ERROR,
+  UNUSED_EXPECT_WARNING,
   ParseError,
   LexError,
   luauString as luauString4
@@ -3093,10 +3101,33 @@ function buildLineMap(emitted, printed, origins) {
   }
   return map;
 }
-function lineMapSource(map) {
+var VLQ_DIGITS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+function vlq(n) {
+  let value = n < 0 ? -n * 2 + 1 : n * 2;
+  let out = "";
+  do {
+    const digit = value % 32;
+    value = Math.floor(value / 32);
+    out += VLQ_DIGITS[value > 0 ? digit + 32 : digit];
+  } while (value > 0);
+  return out;
+}
+function lineMapSource(map, unpack) {
   const entries = [...map.entries()].sort((a, b) => a[0] - b[0]);
-  const quoted = (s) => luauString3(s.replace(/\\/g, "/"));
-  return `{${entries.map(([line, o]) => `[${line}]={${quoted(o.file)},${o.line}}`).join(",")}}`;
+  const files = [];
+  const indexes = /* @__PURE__ */ new Map();
+  let data = "";
+  let line = 0, file = 0, source = 0;
+  for (const [at, origin] of entries) {
+    const name = origin.file.replace(/\\/g, "/");
+    if (!indexes.has(name)) indexes.set(name, files.push(name));
+    const index2 = indexes.get(name);
+    data += vlq(at - line) + vlq(index2 - file) + vlq(origin.line - source);
+    line = at;
+    file = index2;
+    source = origin.line;
+  }
+  return `${unpack}({${files.map(luauString3).join(",")}},${luauString3(data)})`;
 }
 
 // src/bundle.ts
@@ -3144,6 +3175,7 @@ async function bundle(options) {
   const origins = /* @__PURE__ */ new WeakMap();
   const shared = new SharedRuntime(names);
   const shaking = options.treeShaking ?? config?.treeShaking ?? false;
+  const mapping = options.lineMap ?? config?.lineMap ?? true;
   const resolveIn = (file) => (specifier) => {
     const found = resolveModulePath(file, specifier, config);
     return found !== void 0 && sources.has(found) ? found : void 0;
@@ -3182,8 +3214,8 @@ async function bundle(options) {
         import: importExpression,
         // One file has one line map. Several have one each, and a
         // module reads the one of the file it is in.
-        lines: mode === "single" ? `${G}.lines` : `${G}.maps[${luauString4(source.name)}]`,
-        fail: `${G}.fail`,
+        lines: !mapping ? void 0 : mode === "single" ? `${G}.lines` : `${G}.maps[${luauString4(source.name)}]`,
+        fail: mapping ? `${G}.fail` : void 0,
         arrays: `${G}.arrays`,
         resolve: (specifier, dynamic) => {
           const found = resolveModulePath(file, specifier, config);
@@ -3213,7 +3245,7 @@ async function bundle(options) {
   }
   for (const [file, fileDirectives] of directives) {
     const semantic = diagnostics.filter((d) => d.file === file && (d.category === "scope" || d.category === "type"));
-    const { kept, unusedExpectErrors } = applyDirectives(fileDirectives, semantic, (d) => d.line);
+    const { kept, unusedExpectErrors, unusedExpectWarnings } = applyDirectives(fileDirectives, semantic, (d) => d.line, (d) => d.severity === "warning");
     const suppressed = new Set(semantic.filter((d) => !kept.includes(d)));
     const remaining = diagnostics.filter((d) => !suppressed.has(d));
     diagnostics.length = 0;
@@ -3222,6 +3254,9 @@ async function bundle(options) {
     for (const d of unusedExpectErrors) {
       diagnostics.push({ file, message: UNUSED_EXPECT_ERROR, line: d.line, column: d.column, category: "type" });
     }
+    for (const d of unusedExpectWarnings) {
+      diagnostics.push({ file, message: UNUSED_EXPECT_WARNING, line: d.line, column: d.column, category: "type", severity: "warning" });
+    }
   }
   const moduleProblems = new Set(diagnostics.filter((d) => d.category === "module").map((d) => `${d.file}:${d.line}:${d.column}:${d.message}`));
   const reported = diagnostics.filter((d) => d.category !== "type" || !moduleProblems.has(`${d.file}:${d.line}:${d.column}:${d.message}`));
@@ -3244,7 +3279,8 @@ async function bundle(options) {
     several,
     byPath,
     files: elsewhere,
-    imports: lowered.some((m) => m.dynamicImports.size > 0)
+    imports: lowered.some((m) => m.dynamicImports.size > 0),
+    mapping
   }));
   const assignment = program2.body.statements[1];
   if (usesScriptArgs) {
@@ -3261,21 +3297,23 @@ async function bundle(options) {
   program2.body.statements.unshift(...helpers.declare);
   const ok = names.fresh("ok");
   const result2 = names.fresh("result");
-  const entryStatements = parseLuau2(`
+  const entryName = luauString4(sources.get(entry).name);
+  const returnsExports = modules.get(entry).info.exports;
+  const entryStatements = parseLuau2(!mapping ? `${returnsExports ? "return " : ""}${G}.require(${entryName})` : `
 local ${ok}, ${result2} = xpcall(function()
-    return ${G}.require(${luauString4(sources.get(entry).name)})
+    return ${G}.require(${entryName})
 end, ${G}.fail)
 if not ${ok} then
     error(${result2}, 0)
 end
-${modules.get(entry).info.exports ? `return ${result2}` : ""}
+${returnsExports ? `return ${result2}` : ""}
 `).body.statements;
   program2.body.statements.push(...entryStatements);
-  const map = buildLineMap(program2, parseLuau2(print(program2)), origins);
-  if (map.size || several) {
+  const map = mapping ? buildLineMap(program2, parseLuau2(print(program2)), origins) : /* @__PURE__ */ new Map();
+  if (mapping && (map.size || several)) {
     const mapStatements = [assign(
       [member(identifier(G), "lines")],
-      [parseExpressionFromSource2(lineMapSource(map))]
+      [parseExpressionFromSource2(lineMapSource(map, `${G}.lineMap`))]
     )];
     if (several) mapStatements.push(...mapRegistration(G, layout[0], `${G}.lines`));
     program2.body.statements.splice(program2.body.statements.length - entryStatements.length, 0, ...mapStatements);
@@ -3293,8 +3331,11 @@ ${modules.get(entry).info.exports ? `return ${result2}` : ""}
       ));
     }
     const chunk = program([returns([functionExpression(functionBody([G], body))])]);
-    const lines = buildLineMap(chunk, parseLuau2(print(chunk)), origins);
-    body.push(...mapRegistration(G, file, lineMapSource(lines)), ...fileHelpers.define);
+    if (mapping) {
+      const lines = buildLineMap(chunk, parseLuau2(print(chunk)), origins);
+      body.push(...mapRegistration(G, file, lineMapSource(lines, `${G}.lineMap`)));
+    }
+    body.push(...fileHelpers.define);
     files.push({ path: file.path, code: print(chunk) + "\n", modules: file.modules.map((m) => m.name) });
   }
   return { code: files[0].code, files, modules: moduleNames, diagnostics };
@@ -3392,7 +3433,7 @@ function loader(G, byPath) {
         require(file)(${G})`;
 }
 function runtime(G, options) {
-  const { several } = options;
+  const { several, mapping } = options;
   const files = [...options.files].map(([name, file]) => `[${luauString4(name)}] = ${luauString4(file)}`).join(", ");
   return `
 local ${G}
@@ -3400,7 +3441,7 @@ ${G} = {
     modules = {},
     -- Every array the program made, so \`typeof\` can tell one from an object.
     -- The keys are held weakly: being written down keeps no array alive.
-    arrays = setmetatable({}, { __mode = "k" }),
+    arrays = setmetatable({}, { __mode = "k" }),${mapping ? `
     -- Filled in just before the entry runs: bundle line -> { file, line }.
     lines = nil,
     -- What an error nothing caught says, in the project's files: the bundle's
@@ -3568,13 +3609,49 @@ ${several ? `
         end
         return mapped .. "\\n" .. table.concat(frames, "\\n")
     end,
+    -- A line map as it is written: the files it names, and base-64 VLQ
+    -- numbers, three to a line \u2014 how far down the bundle, which file, how far
+    -- down that file, each counted from the line before. It is read out the
+    -- first time a line is looked up, which is when something went wrong.
+    lineMap = function(files, data)
+        local map = {}
+        return setmetatable(map, { __index = function(_, key)
+            setmetatable(map, nil)
+            local digits = {}
+            for i = 1, 64 do
+                digits[("${VLQ_DIGITS}"):byte(i)] = i - 1
+            end
+            local at = 1
+            local function read()
+                local value, scale = 0, 1
+                repeat
+                    local digit = digits[data:byte(at)]
+                    at = at + 1
+                    value = value + digit % 32 * scale
+                    scale = scale * 32
+                until digit < 32
+                if value % 2 == 1 then
+                    return -math.floor(value / 2)
+                end
+                return math.floor(value / 2)
+            end
+            local line, file, source = 0, 0, 0
+            while at <= #data do
+                line = line + read()
+                file = file + read()
+                source = source + read()
+                map[line] = { files[file], source }
+            end
+            return map[key]
+        end })
+    end,` : ""}
     records = {},${several ? `
     -- The file each module outside this one is in, as \`load\` is handed it.
     files = { ${files} },
-    loaded = {},
+    loaded = {},${mapping ? `
     -- Every file's line map: by the module, and by the file's name.
     maps = {},
-    sources = {},
+    sources = {},` : ""}
     -- Another of the bundle's files: a function that adds its modules here.
     load = function(file)
         if ${G}.loaded[file] then

package/dist/cli.cjs

@@ -1465,8 +1465,15 @@ end`).body.statements, out2);
           item = this.names.fresh("item");
           prelude.push(...this.destructure(variable, identifier(item), "declare"));
         }
-        const form = this.options.types?.loops.get(node) ?? { walks: "values", viaIter: false };
+        const form = this.options.types?.loops.get(node) ?? { walks: node.over === "keys" ? "keys" : "values", viaIter: false };
         let source = this.expression(node.iterator);
+        if (form.walks === "keys") {
+          return [genericFor(
+            [item],
+            [call(this.builtin("pairs"), [source])],
+            this.loopBody51(this.block(node.body, prelude)).statements
+          )];
+        }
         if (form.viaIter) source = methodCall(source, "__iter", []);
         const variables = form.walks === "values" ? [this.names.fresh("_"), item] : [item];
         let iterators = form.walks === "iteration" ? [call(this.helper("unpack"), [source, number(1), number(3)])] : [source];
@@ -3063,10 +3070,33 @@ function buildLineMap(emitted, printed, origins) {
   }
   return map;
 }
-function lineMapSource(map) {
+var VLQ_DIGITS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+function vlq(n) {
+  let value = n < 0 ? -n * 2 + 1 : n * 2;
+  let out2 = "";
+  do {
+    const digit = value % 32;
+    value = Math.floor(value / 32);
+    out2 += VLQ_DIGITS[value > 0 ? digit + 32 : digit];
+  } while (value > 0);
+  return out2;
+}
+function lineMapSource(map, unpack) {
   const entries = [...map.entries()].sort((a, b) => a[0] - b[0]);
-  const quoted = (s) => (0, import_parser6.luauString)(s.replace(/\\/g, "/"));
-  return `{${entries.map(([line, o]) => `[${line}]={${quoted(o.file)},${o.line}}`).join(",")}}`;
+  const files = [];
+  const indexes = /* @__PURE__ */ new Map();
+  let data = "";
+  let line = 0, file = 0, source = 0;
+  for (const [at, origin] of entries) {
+    const name = origin.file.replace(/\\/g, "/");
+    if (!indexes.has(name)) indexes.set(name, files.push(name));
+    const index2 = indexes.get(name);
+    data += vlq(at - line) + vlq(index2 - file) + vlq(origin.line - source);
+    line = at;
+    file = index2;
+    source = origin.line;
+  }
+  return `${unpack}({${files.map(import_parser6.luauString).join(",")}},${(0, import_parser6.luauString)(data)})`;
 }
 
 // src/lowering.ts
@@ -3141,6 +3171,7 @@ async function bundle(options) {
   const origins = /* @__PURE__ */ new WeakMap();
   const shared = new SharedRuntime(names);
   const shaking = options.treeShaking ?? config2?.treeShaking ?? false;
+  const mapping = options.lineMap ?? config2?.lineMap ?? true;
   const resolveIn = (file) => (specifier) => {
     const found = (0, import_parser7.resolveModulePath)(file, specifier, config2);
     return found !== void 0 && sources.has(found) ? found : void 0;
@@ -3179,8 +3210,8 @@ async function bundle(options) {
         import: importExpression,
         // One file has one line map. Several have one each, and a
         // module reads the one of the file it is in.
-        lines: mode === "single" ? `${G}.lines` : `${G}.maps[${(0, import_parser7.luauString)(source.name)}]`,
-        fail: `${G}.fail`,
+        lines: !mapping ? void 0 : mode === "single" ? `${G}.lines` : `${G}.maps[${(0, import_parser7.luauString)(source.name)}]`,
+        fail: mapping ? `${G}.fail` : void 0,
         arrays: `${G}.arrays`,
         resolve: (specifier, dynamic) => {
           const found = (0, import_parser7.resolveModulePath)(file, specifier, config2);
@@ -3210,7 +3241,7 @@ async function bundle(options) {
   }
   for (const [file, fileDirectives] of directives) {
     const semantic = diagnostics.filter((d) => d.file === file && (d.category === "scope" || d.category === "type"));
-    const { kept, unusedExpectErrors } = (0, import_parser7.applyDirectives)(fileDirectives, semantic, (d) => d.line);
+    const { kept, unusedExpectErrors, unusedExpectWarnings } = (0, import_parser7.applyDirectives)(fileDirectives, semantic, (d) => d.line, (d) => d.severity === "warning");
     const suppressed = new Set(semantic.filter((d) => !kept.includes(d)));
     const remaining = diagnostics.filter((d) => !suppressed.has(d));
     diagnostics.length = 0;
@@ -3219,6 +3250,9 @@ async function bundle(options) {
     for (const d of unusedExpectErrors) {
       diagnostics.push({ file, message: import_parser7.UNUSED_EXPECT_ERROR, line: d.line, column: d.column, category: "type" });
     }
+    for (const d of unusedExpectWarnings) {
+      diagnostics.push({ file, message: import_parser7.UNUSED_EXPECT_WARNING, line: d.line, column: d.column, category: "type", severity: "warning" });
+    }
   }
   const moduleProblems = new Set(diagnostics.filter((d) => d.category === "module").map((d) => `${d.file}:${d.line}:${d.column}:${d.message}`));
   const reported = diagnostics.filter((d) => d.category !== "type" || !moduleProblems.has(`${d.file}:${d.line}:${d.column}:${d.message}`));
@@ -3241,7 +3275,8 @@ async function bundle(options) {
     several,
     byPath,
     files: elsewhere,
-    imports: lowered.some((m) => m.dynamicImports.size > 0)
+    imports: lowered.some((m) => m.dynamicImports.size > 0),
+    mapping
   }));
   const assignment = program2.body.statements[1];
   if (usesScriptArgs) {
@@ -3258,21 +3293,23 @@ async function bundle(options) {
   program2.body.statements.unshift(...helpers.declare);
   const ok = names.fresh("ok");
   const result2 = names.fresh("result");
-  const entryStatements = (0, import_luau_parser2.parse)(`
+  const entryName = (0, import_parser7.luauString)(sources.get(entry2).name);
+  const returnsExports = modules.get(entry2).info.exports;
+  const entryStatements = (0, import_luau_parser2.parse)(!mapping ? `${returnsExports ? "return " : ""}${G}.require(${entryName})` : `
 local ${ok}, ${result2} = xpcall(function()
-    return ${G}.require(${(0, import_parser7.luauString)(sources.get(entry2).name)})
+    return ${G}.require(${entryName})
 end, ${G}.fail)
 if not ${ok} then
     error(${result2}, 0)
 end
-${modules.get(entry2).info.exports ? `return ${result2}` : ""}
+${returnsExports ? `return ${result2}` : ""}
 `).body.statements;
   program2.body.statements.push(...entryStatements);
-  const map = buildLineMap(program2, (0, import_luau_parser2.parse)((0, import_luau_parser2.print)(program2)), origins);
-  if (map.size || several) {
+  const map = mapping ? buildLineMap(program2, (0, import_luau_parser2.parse)((0, import_luau_parser2.print)(program2)), origins) : /* @__PURE__ */ new Map();
+  if (mapping && (map.size || several)) {
     const mapStatements = [assign(
       [member(identifier(G), "lines")],
-      [(0, import_luau_parser2.parseExpressionFromSource)(lineMapSource(map))]
+      [(0, import_luau_parser2.parseExpressionFromSource)(lineMapSource(map, `${G}.lineMap`))]
     )];
     if (several) mapStatements.push(...mapRegistration(G, layout[0], `${G}.lines`));
     program2.body.statements.splice(program2.body.statements.length - entryStatements.length, 0, ...mapStatements);
@@ -3290,8 +3327,11 @@ ${modules.get(entry2).info.exports ? `return ${result2}` : ""}
       ));
     }
     const chunk = program([returns([functionExpression(functionBody([G], body))])]);
-    const lines = buildLineMap(chunk, (0, import_luau_parser2.parse)((0, import_luau_parser2.print)(chunk)), origins);
-    body.push(...mapRegistration(G, file, lineMapSource(lines)), ...fileHelpers.define);
+    if (mapping) {
+      const lines = buildLineMap(chunk, (0, import_luau_parser2.parse)((0, import_luau_parser2.print)(chunk)), origins);
+      body.push(...mapRegistration(G, file, lineMapSource(lines, `${G}.lineMap`)));
+    }
+    body.push(...fileHelpers.define);
     files.push({ path: file.path, code: (0, import_luau_parser2.print)(chunk) + "\n", modules: file.modules.map((m) => m.name) });
   }
   return { code: files[0].code, files, modules: moduleNames, diagnostics };
@@ -3389,7 +3429,7 @@ function loader(G, byPath) {
         require(file)(${G})`;
 }
 function runtime(G, options) {
-  const { several } = options;
+  const { several, mapping } = options;
   const files = [...options.files].map(([name, file]) => `[${(0, import_parser7.luauString)(name)}] = ${(0, import_parser7.luauString)(file)}`).join(", ");
   return `
 local ${G}
@@ -3397,7 +3437,7 @@ ${G} = {
     modules = {},
     -- Every array the program made, so \`typeof\` can tell one from an object.
     -- The keys are held weakly: being written down keeps no array alive.
-    arrays = setmetatable({}, { __mode = "k" }),
+    arrays = setmetatable({}, { __mode = "k" }),${mapping ? `
     -- Filled in just before the entry runs: bundle line -> { file, line }.
     lines = nil,
     -- What an error nothing caught says, in the project's files: the bundle's
@@ -3565,13 +3605,49 @@ ${several ? `
         end
         return mapped .. "\\n" .. table.concat(frames, "\\n")
     end,
+    -- A line map as it is written: the files it names, and base-64 VLQ
+    -- numbers, three to a line \u2014 how far down the bundle, which file, how far
+    -- down that file, each counted from the line before. It is read out the
+    -- first time a line is looked up, which is when something went wrong.
+    lineMap = function(files, data)
+        local map = {}
+        return setmetatable(map, { __index = function(_, key)
+            setmetatable(map, nil)
+            local digits = {}
+            for i = 1, 64 do
+                digits[("${VLQ_DIGITS}"):byte(i)] = i - 1
+            end
+            local at = 1
+            local function read()
+                local value, scale = 0, 1
+                repeat
+                    local digit = digits[data:byte(at)]
+                    at = at + 1
+                    value = value + digit % 32 * scale
+                    scale = scale * 32
+                until digit < 32
+                if value % 2 == 1 then
+                    return -math.floor(value / 2)
+                end
+                return math.floor(value / 2)
+            end
+            local line, file, source = 0, 0, 0
+            while at <= #data do
+                line = line + read()
+                file = file + read()
+                source = source + read()
+                map[line] = { files[file], source }
+            end
+            return map[key]
+        end })
+    end,` : ""}
     records = {},${several ? `
     -- The file each module outside this one is in, as \`load\` is handed it.
     files = { ${files} },
-    loaded = {},
+    loaded = {},${mapping ? `
     -- Every file's line map: by the module, and by the file's name.
     maps = {},
-    sources = {},
+    sources = {},` : ""}
     -- Another of the bundle's files: a function that adds its modules here.
     load = function(file)
         if ${G}.loaded[file] then
@@ -3812,18 +3888,20 @@ function allStatements(statements) {
 }
 
 // src/cli.ts
-var usage = "usage: tilua <entry> [--out <file>] [--output single|chunks|modules] [--config <tilua.config.json>] [--noCheck]";
+var usage = "usage: tilua <entry> [--out <file>] [--output single|chunks|modules] [--config <tilua.config.json>] [--noCheck] [--noLineMap]";
 var args = process.argv.slice(2);
 var entry;
 var out;
 var config;
 var typeCheck = true;
+var lineMap;
 var output;
 for (let i = 0; i < args.length; i++) {
   const arg = args[i];
   if (arg === "--out") out = args[++i];
   else if (arg === "--config") config = args[++i];
   else if (arg === "--noCheck") typeCheck = false;
+  else if (arg === "--noLineMap") lineMap = false;
   else if (arg === "--target") {
     console.error(`--target is gone: the output runs on Lua 5.1 to 5.4, LuaJIT and Luau, and a library says what more its Lua has \u2014 add "luau" to the config's 'types'`);
     process.exit(2);
@@ -3853,6 +3931,7 @@ async function main(from) {
     config,
     typeCheck,
     output: mode,
+    lineMap,
     outFile: entryFile !== void 0 ? (0, import_node_path3.basename)(entryFile) : void 0
   });
   for (const d of result2.diagnostics) {

package/dist/cli.js

@@ -2,23 +2,25 @@
 import {
   bundle,
   resolveConfig
-} from "./chunk-WGXXYKEU.js";
+} from "./chunk-WOBHMGGC.js";
 
 // src/cli.ts
 import { mkdirSync, writeFileSync } from "fs";
 import { basename, dirname, join, relative, resolve } from "path";
-var usage = "usage: tilua <entry> [--out <file>] [--output single|chunks|modules] [--config <tilua.config.json>] [--noCheck]";
+var usage = "usage: tilua <entry> [--out <file>] [--output single|chunks|modules] [--config <tilua.config.json>] [--noCheck] [--noLineMap]";
 var args = process.argv.slice(2);
 var entry;
 var out;
 var config;
 var typeCheck = true;
+var lineMap;
 var output;
 for (let i = 0; i < args.length; i++) {
   const arg = args[i];
   if (arg === "--out") out = args[++i];
   else if (arg === "--config") config = args[++i];
   else if (arg === "--noCheck") typeCheck = false;
+  else if (arg === "--noLineMap") lineMap = false;
   else if (arg === "--target") {
     console.error(`--target is gone: the output runs on Lua 5.1 to 5.4, LuaJIT and Luau, and a library says what more its Lua has \u2014 add "luau" to the config's 'types'`);
     process.exit(2);
@@ -48,6 +50,7 @@ async function main(from) {
     config,
     typeCheck,
     output: mode,
+    lineMap,
     outFile: entryFile !== void 0 ? basename(entryFile) : void 0
   });
   for (const d of result.diagnostics) {

package/dist/index.cjs

@@ -1488,8 +1488,15 @@ end`).body.statements, out);
           item = this.names.fresh("item");
           prelude.push(...this.destructure(variable, identifier(item), "declare"));
         }
-        const form = this.options.types?.loops.get(node) ?? { walks: "values", viaIter: false };
+        const form = this.options.types?.loops.get(node) ?? { walks: node.over === "keys" ? "keys" : "values", viaIter: false };
         let source = this.expression(node.iterator);
+        if (form.walks === "keys") {
+          return [genericFor(
+            [item],
+            [call(this.builtin("pairs"), [source])],
+            this.loopBody51(this.block(node.body, prelude)).statements
+          )];
+        }
         if (form.viaIter) source = methodCall(source, "__iter", []);
         const variables = form.walks === "values" ? [this.names.fresh("_"), item] : [item];
         let iterators = form.walks === "iteration" ? [call(this.helper("unpack"), [source, number(1), number(3)])] : [source];
@@ -3086,10 +3093,33 @@ function buildLineMap(emitted, printed, origins) {
   }
   return map;
 }
-function lineMapSource(map) {
+var VLQ_DIGITS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+function vlq(n) {
+  let value = n < 0 ? -n * 2 + 1 : n * 2;
+  let out = "";
+  do {
+    const digit = value % 32;
+    value = Math.floor(value / 32);
+    out += VLQ_DIGITS[value > 0 ? digit + 32 : digit];
+  } while (value > 0);
+  return out;
+}
+function lineMapSource(map, unpack) {
   const entries = [...map.entries()].sort((a, b) => a[0] - b[0]);
-  const quoted = (s) => (0, import_parser6.luauString)(s.replace(/\\/g, "/"));
-  return `{${entries.map(([line, o]) => `[${line}]={${quoted(o.file)},${o.line}}`).join(",")}}`;
+  const files = [];
+  const indexes = /* @__PURE__ */ new Map();
+  let data = "";
+  let line = 0, file = 0, source = 0;
+  for (const [at, origin] of entries) {
+    const name = origin.file.replace(/\\/g, "/");
+    if (!indexes.has(name)) indexes.set(name, files.push(name));
+    const index2 = indexes.get(name);
+    data += vlq(at - line) + vlq(index2 - file) + vlq(origin.line - source);
+    line = at;
+    file = index2;
+    source = origin.line;
+  }
+  return `${unpack}({${files.map(import_parser6.luauString).join(",")}},${(0, import_parser6.luauString)(data)})`;
 }
 
 // src/lowering.ts
@@ -3164,6 +3194,7 @@ async function bundle(options) {
   const origins = /* @__PURE__ */ new WeakMap();
   const shared = new SharedRuntime(names);
   const shaking = options.treeShaking ?? config?.treeShaking ?? false;
+  const mapping = options.lineMap ?? config?.lineMap ?? true;
   const resolveIn = (file) => (specifier) => {
     const found = (0, import_parser7.resolveModulePath)(file, specifier, config);
     return found !== void 0 && sources.has(found) ? found : void 0;
@@ -3202,8 +3233,8 @@ async function bundle(options) {
         import: importExpression,
         // One file has one line map. Several have one each, and a
         // module reads the one of the file it is in.
-        lines: mode === "single" ? `${G}.lines` : `${G}.maps[${(0, import_parser7.luauString)(source.name)}]`,
-        fail: `${G}.fail`,
+        lines: !mapping ? void 0 : mode === "single" ? `${G}.lines` : `${G}.maps[${(0, import_parser7.luauString)(source.name)}]`,
+        fail: mapping ? `${G}.fail` : void 0,
         arrays: `${G}.arrays`,
         resolve: (specifier, dynamic) => {
           const found = (0, import_parser7.resolveModulePath)(file, specifier, config);
@@ -3233,7 +3264,7 @@ async function bundle(options) {
   }
   for (const [file, fileDirectives] of directives) {
     const semantic = diagnostics.filter((d) => d.file === file && (d.category === "scope" || d.category === "type"));
-    const { kept, unusedExpectErrors } = (0, import_parser7.applyDirectives)(fileDirectives, semantic, (d) => d.line);
+    const { kept, unusedExpectErrors, unusedExpectWarnings } = (0, import_parser7.applyDirectives)(fileDirectives, semantic, (d) => d.line, (d) => d.severity === "warning");
     const suppressed = new Set(semantic.filter((d) => !kept.includes(d)));
     const remaining = diagnostics.filter((d) => !suppressed.has(d));
     diagnostics.length = 0;
@@ -3242,6 +3273,9 @@ async function bundle(options) {
     for (const d of unusedExpectErrors) {
       diagnostics.push({ file, message: import_parser7.UNUSED_EXPECT_ERROR, line: d.line, column: d.column, category: "type" });
     }
+    for (const d of unusedExpectWarnings) {
+      diagnostics.push({ file, message: import_parser7.UNUSED_EXPECT_WARNING, line: d.line, column: d.column, category: "type", severity: "warning" });
+    }
   }
   const moduleProblems = new Set(diagnostics.filter((d) => d.category === "module").map((d) => `${d.file}:${d.line}:${d.column}:${d.message}`));
   const reported = diagnostics.filter((d) => d.category !== "type" || !moduleProblems.has(`${d.file}:${d.line}:${d.column}:${d.message}`));
@@ -3264,7 +3298,8 @@ async function bundle(options) {
     several,
     byPath,
     files: elsewhere,
-    imports: lowered.some((m) => m.dynamicImports.size > 0)
+    imports: lowered.some((m) => m.dynamicImports.size > 0),
+    mapping
   }));
   const assignment = program2.body.statements[1];
   if (usesScriptArgs) {
@@ -3281,21 +3316,23 @@ async function bundle(options) {
   program2.body.statements.unshift(...helpers.declare);
   const ok = names.fresh("ok");
   const result2 = names.fresh("result");
-  const entryStatements = (0, import_luau_parser2.parse)(`
+  const entryName = (0, import_parser7.luauString)(sources.get(entry).name);
+  const returnsExports = modules.get(entry).info.exports;
+  const entryStatements = (0, import_luau_parser2.parse)(!mapping ? `${returnsExports ? "return " : ""}${G}.require(${entryName})` : `
 local ${ok}, ${result2} = xpcall(function()
-    return ${G}.require(${(0, import_parser7.luauString)(sources.get(entry).name)})
+    return ${G}.require(${entryName})
 end, ${G}.fail)
 if not ${ok} then
     error(${result2}, 0)
 end
-${modules.get(entry).info.exports ? `return ${result2}` : ""}
+${returnsExports ? `return ${result2}` : ""}
 `).body.statements;
   program2.body.statements.push(...entryStatements);
-  const map = buildLineMap(program2, (0, import_luau_parser2.parse)((0, import_luau_parser2.print)(program2)), origins);
-  if (map.size || several) {
+  const map = mapping ? buildLineMap(program2, (0, import_luau_parser2.parse)((0, import_luau_parser2.print)(program2)), origins) : /* @__PURE__ */ new Map();
+  if (mapping && (map.size || several)) {
     const mapStatements = [assign(
       [member(identifier(G), "lines")],
-      [(0, import_luau_parser2.parseExpressionFromSource)(lineMapSource(map))]
+      [(0, import_luau_parser2.parseExpressionFromSource)(lineMapSource(map, `${G}.lineMap`))]
     )];
     if (several) mapStatements.push(...mapRegistration(G, layout[0], `${G}.lines`));
     program2.body.statements.splice(program2.body.statements.length - entryStatements.length, 0, ...mapStatements);
@@ -3313,8 +3350,11 @@ ${modules.get(entry).info.exports ? `return ${result2}` : ""}
       ));
     }
     const chunk = program([returns([functionExpression(functionBody([G], body))])]);
-    const lines = buildLineMap(chunk, (0, import_luau_parser2.parse)((0, import_luau_parser2.print)(chunk)), origins);
-    body.push(...mapRegistration(G, file, lineMapSource(lines)), ...fileHelpers.define);
+    if (mapping) {
+      const lines = buildLineMap(chunk, (0, import_luau_parser2.parse)((0, import_luau_parser2.print)(chunk)), origins);
+      body.push(...mapRegistration(G, file, lineMapSource(lines, `${G}.lineMap`)));
+    }
+    body.push(...fileHelpers.define);
     files.push({ path: file.path, code: (0, import_luau_parser2.print)(chunk) + "\n", modules: file.modules.map((m) => m.name) });
   }
   return { code: files[0].code, files, modules: moduleNames, diagnostics };
@@ -3412,7 +3452,7 @@ function loader(G, byPath) {
         require(file)(${G})`;
 }
 function runtime(G, options) {
-  const { several } = options;
+  const { several, mapping } = options;
   const files = [...options.files].map(([name, file]) => `[${(0, import_parser7.luauString)(name)}] = ${(0, import_parser7.luauString)(file)}`).join(", ");
   return `
 local ${G}
@@ -3420,7 +3460,7 @@ ${G} = {
     modules = {},
     -- Every array the program made, so \`typeof\` can tell one from an object.
     -- The keys are held weakly: being written down keeps no array alive.
-    arrays = setmetatable({}, { __mode = "k" }),
+    arrays = setmetatable({}, { __mode = "k" }),${mapping ? `
     -- Filled in just before the entry runs: bundle line -> { file, line }.
     lines = nil,
     -- What an error nothing caught says, in the project's files: the bundle's
@@ -3588,13 +3628,49 @@ ${several ? `
         end
         return mapped .. "\\n" .. table.concat(frames, "\\n")
     end,
+    -- A line map as it is written: the files it names, and base-64 VLQ
+    -- numbers, three to a line \u2014 how far down the bundle, which file, how far
+    -- down that file, each counted from the line before. It is read out the
+    -- first time a line is looked up, which is when something went wrong.
+    lineMap = function(files, data)
+        local map = {}
+        return setmetatable(map, { __index = function(_, key)
+            setmetatable(map, nil)
+            local digits = {}
+            for i = 1, 64 do
+                digits[("${VLQ_DIGITS}"):byte(i)] = i - 1
+            end
+            local at = 1
+            local function read()
+                local value, scale = 0, 1
+                repeat
+                    local digit = digits[data:byte(at)]
+                    at = at + 1
+                    value = value + digit % 32 * scale
+                    scale = scale * 32
+                until digit < 32
+                if value % 2 == 1 then
+                    return -math.floor(value / 2)
+                end
+                return math.floor(value / 2)
+            end
+            local line, file, source = 0, 0, 0
+            while at <= #data do
+                line = line + read()
+                file = file + read()
+                source = source + read()
+                map[line] = { files[file], source }
+            end
+            return map[key]
+        end })
+    end,` : ""}
     records = {},${several ? `
     -- The file each module outside this one is in, as \`load\` is handed it.
     files = { ${files} },
-    loaded = {},
+    loaded = {},${mapping ? `
     -- Every file's line map: by the module, and by the file's name.
     maps = {},
-    sources = {},
+    sources = {},` : ""}
     -- Another of the bundle's files: a function that adds its modules here.
     load = function(file)
         if ${G}.loaded[file] then

package/dist/index.d.cts

@@ -22,6 +22,9 @@ interface TiluaConfigJson {
     noLib?: boolean;
     /** Leave out of the bundle what the entry never reaches (`treeShake`). */
     treeShaking?: boolean;
+    /** Write the map from the bundle's lines back to the project's, which
+     *  error reports and `console` read. Default: true. */
+    lineMap?: boolean;
 }
 /** A config file's path, or the config itself. Relative paths — to a config
  *  file, and inside an inline config — resolve from `cwd`. */
@@ -51,6 +54,10 @@ interface BundleOptions {
     /** Leave out what the entry never reaches. Overrides the config's
      *  `treeShaking`; off without either. */
     readonly treeShaking?: boolean;
+    /** Write the map from the bundle's lines back to the project's. Overrides
+     *  the config's `lineMap`; on without either. Without it an error names
+     *  the bundle's lines, and the entry does not run under `xpcall`. */
+    readonly lineMap?: boolean;
     /** What the entry's file is called: `main.luau`. The other files of
      *  `"chunks"` are named after it (`main_shop.luau`), and every file takes
      *  its extension. Default: the entry's own name, with `.luau`. */

package/dist/index.d.ts

@@ -22,6 +22,9 @@ interface TiluaConfigJson {
     noLib?: boolean;
     /** Leave out of the bundle what the entry never reaches (`treeShake`). */
     treeShaking?: boolean;
+    /** Write the map from the bundle's lines back to the project's, which
+     *  error reports and `console` read. Default: true. */
+    lineMap?: boolean;
 }
 /** A config file's path, or the config itself. Relative paths — to a config
  *  file, and inside an inline config — resolve from `cwd`. */
@@ -51,6 +54,10 @@ interface BundleOptions {
     /** Leave out what the entry never reaches. Overrides the config's
      *  `treeShaking`; off without either. */
     readonly treeShaking?: boolean;
+    /** Write the map from the bundle's lines back to the project's. Overrides
+     *  the config's `lineMap`; on without either. Without it an error names
+     *  the bundle's lines, and the entry does not run under `xpcall`. */
+    readonly lineMap?: boolean;
     /** What the entry's file is called: `main.luau`. The other files of
      *  `"chunks"` are named after it (`main_shop.luau`), and every file takes
      *  its extension. Default: the entry's own name, with `.luau`. */

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   lower,
   program,
   resolveConfig
-} from "./chunk-WGXXYKEU.js";
+} from "./chunk-WOBHMGGC.js";
 
 // src/compile.ts
 import { readFileSync } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tilua/compiler",
-  "version": "7.0.1",
+  "version": "8.1.0",
   "description": "Compiles tilua to Luau: lowers the @tilua/parser AST to a luau-parser AST and prints it",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -38,7 +38,7 @@
   "type": "module",
   "dependencies": {
     "luau-parser": "^1.0.3",
-    "@tilua/parser": "^7.0.0"
+    "@tilua/parser": "^8.1.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.2",