@tilua/compiler 9.0.0 → 9.0.1

package/README.md

@@ -18,9 +18,11 @@ tilua [<entry>] [--out <file>] [--output single|chunks|files] [--config <tilua.c
 tilua init
 ```
 
-`--watch` builds again whenever a `.tilua` file, the config or a Rojo project
-changes, and keeps going. `tilua init` writes a `tilua.config.json` for the
-Rojo project in the folder — see `@tilua-types/roblox`.
+`--watch` builds again whenever a file it reads changes — a `.tilua`, the
+config, a Rojo project, and with an `outDir` of its own anything under
+`rootDir` — and keeps going. `tilua init` sets up the Rojo project in the
+folder: `src` compiled to `out`, and the project pointed at `out` — see
+`@tilua-types/roblox`.
 
 Every module the entry imports is bundled in. Problems are reported as
 `file:line:column message`. Type errors are checked against the config's
@@ -486,7 +488,12 @@ tilua            # the config above this folder says the rest
 `rootDir` is the config's folder unless set, and `outDir` is `rootDir`, so
 each `.luau` lands beside its `.tilua`. Every file it writes ends with a line
 saying tilua wrote it: the CLI never replaces a `.luau` without that line —
-one written by hand — and removes one with it whose `.tilua` is gone. `--out` names the folder in place of
+one written by hand — and removes one with it whose `.tilua` is gone.
+
+With an `outDir` of its own, the CLI makes it a mirror of `rootDir`: every
+`.tilua` compiled, every other file copied as it is, every folder there, and
+nothing else. `outDir` is the build's alone, so it may not hold `rootDir` or
+the project, nor sit under `rootDir`. `--out` names the folder in place of
 `outDir`. From the API, `bundle({ output: "files", root })` without an
 `entry`; `result.files` holds every file, its path from `outDir`.
 
@@ -539,12 +546,12 @@ a script that requires any of them knows what it got.
 <!-- compatibility:start -->
 ## Compatibility
 
-`@tilua/compiler@9.0.0` works with these tilua packages. *Released with* is the
+`@tilua/compiler@9.0.1` works with these tilua packages. *Released with* is the
 version it was built and tested against.
 
 | Package | Range | Released with | |
 | --- | --- | --- | --- |
-| `@tilua/parser` | `^9.0.0` | 9.0.0 | dependency |
+| `@tilua/parser` | `^9.0.1` | 9.0.1 | dependency |
 <!-- compatibility:end -->
 
 ## Development

package/dist/{chunk-VUIF62OE.js → chunk-3RJVN4KC.js}

@@ -2805,6 +2805,9 @@ import {
   resolveModulePath,
   resolveTypeLibraries,
   importExpressions,
+  sourceMapOf,
+  sourceMapTypes,
+  outputPathOf,
   directivesOf,
   applyDirectives,
   UNUSED_EXPECT_ERROR,
@@ -4095,6 +4098,35 @@ function importedSpecifiers(program2) {
   return program2.body.statements.flatMap((s) => s.type === "ImportStatement" || s.type === "ExportAllStatement" || s.type === "ExportNamedStatement" && s.source ? [s.source.value] : []);
 }
 var libraryCache = /* @__PURE__ */ new Map();
+var treeCache;
+function instanceTree(config, libs, noLib) {
+  const tree = sourceMapOf(config);
+  if (!tree) return void 0;
+  if ("problem" in tree) return tree.named ? { problem: { file: config.path, message: tree.problem } } : void 0;
+  const declares = (name) => libs.some((lib) => lib.body.statements.some((s) => s.type === "DeclareStatement" && s.name === name));
+  if (!tree.named && !declares("game")) return void 0;
+  if (treeCache && treeCache.text === tree.text && treeCache.libs.length === libs.length && treeCache.libs.every((lib, i) => lib === libs[i])) {
+    return { types: treeCache.types };
+  }
+  const empty = parse("");
+  const aliases = analyzeTypes(empty, analyzeScopes(empty, { noLib }), { libs, noLib, diagnostics: false }).aliases;
+  const membersOf = (className) => {
+    const type = aliases.get(className);
+    return new Set(type?.kind === "object" ? type.properties.keys() : ["Name", "ClassName", "Parent", "Archivable"]);
+  };
+  const { types, problem } = sourceMapTypes(tree.text, tree.path, { classes: new Set(aliases.keys()), membersOf });
+  if (!types) return tree.named && problem ? { problem: { file: tree.path, message: problem } } : void 0;
+  const scripts = /* @__PURE__ */ new Map();
+  const cached = {
+    program: types.program,
+    scriptFor: (file) => {
+      if (!scripts.has(file)) scripts.set(file, types.scriptFor(file));
+      return scripts.get(file);
+    }
+  };
+  treeCache = { text: tree.text, libs: [...libs], types: cached, scripts };
+  return { types: cached };
+}
 function parsedLibrary(file) {
   let stamp;
   try {
@@ -4118,6 +4150,10 @@ function analyzeModules(modules, config) {
   const libs = libraries.files.map(parsedLibrary);
   const noLib = config?.noLib ?? false;
   const checked = libs.length > 0 || !noLib;
+  const tree = config ? instanceTree(config, libs, noLib) : void 0;
+  if (tree?.problem) out.push({ file: tree.problem.file, message: tree.problem.message, line: 1, column: 1, category: "config" });
+  if (tree?.types) libs.push(tree.types.program);
+  const scriptOf = (file) => tree?.types && config ? tree.types.scriptFor(outputPathOf(config, file)) : void 0;
   const globals = libs.flatMap((lib) => lib.body.statements.flatMap((s) => s.type === "DeclareStatement" ? [s.name] : []));
   const byFile = new Map(modules.map((m) => [m.file, m]));
   const exportsCache = /* @__PURE__ */ new Map();
@@ -4130,7 +4166,9 @@ function analyzeModules(modules, config) {
     const done = analyzed.get(file);
     if (done) return done;
     const remembered = moduleAnalyses.get(file);
-    if (remembered && remembered.setting === settingFor && libs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === libs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
+    const script = scriptOf(file);
+    const ownLibs = script ? [...libs, script] : libs;
+    if (remembered && remembered.setting === settingFor && ownLibs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === ownLibs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
       analyzed.set(file, remembered.result);
       readWhile.set(file, remembered.read);
       return remembered.result;
@@ -4143,7 +4181,7 @@ function analyzeModules(modules, config) {
     }
     const before = partials;
     const types = analyzeTypes(program2, scopes, {
-      libs,
+      libs: ownLibs,
       resolveModule: resolverFor(file),
       noLib,
       reportUnknownTypes: checked
@@ -4160,7 +4198,7 @@ function analyzeModules(modules, config) {
       if (own !== void 0) read3.set(file, own);
       readWhile.set(file, read3);
       if ([...read3.values()].every((stamp) => stamp !== void 0)) {
-        moduleAnalyses.set(file, { setting: settingFor, libs: [...libs], program: program2, read: read3, result: result2 });
+        moduleAnalyses.set(file, { setting: settingFor, libs: [...ownLibs], program: program2, read: read3, result: result2 });
       }
     }
     return result2;

package/dist/cli.cjs

@@ -4091,6 +4091,35 @@ function importedSpecifiers(program2) {
   return program2.body.statements.flatMap((s) => s.type === "ImportStatement" || s.type === "ExportAllStatement" || s.type === "ExportNamedStatement" && s.source ? [s.source.value] : []);
 }
 var libraryCache = /* @__PURE__ */ new Map();
+var treeCache;
+function instanceTree(config2, libs, noLib) {
+  const tree = (0, import_parser7.sourceMapOf)(config2);
+  if (!tree) return void 0;
+  if ("problem" in tree) return tree.named ? { problem: { file: config2.path, message: tree.problem } } : void 0;
+  const declares = (name) => libs.some((lib) => lib.body.statements.some((s) => s.type === "DeclareStatement" && s.name === name));
+  if (!tree.named && !declares("game")) return void 0;
+  if (treeCache && treeCache.text === tree.text && treeCache.libs.length === libs.length && treeCache.libs.every((lib, i) => lib === libs[i])) {
+    return { types: treeCache.types };
+  }
+  const empty = (0, import_parser7.parse)("");
+  const aliases = (0, import_parser7.analyzeTypes)(empty, (0, import_parser7.analyzeScopes)(empty, { noLib }), { libs, noLib, diagnostics: false }).aliases;
+  const membersOf = (className) => {
+    const type = aliases.get(className);
+    return new Set(type?.kind === "object" ? type.properties.keys() : ["Name", "ClassName", "Parent", "Archivable"]);
+  };
+  const { types, problem } = (0, import_parser7.sourceMapTypes)(tree.text, tree.path, { classes: new Set(aliases.keys()), membersOf });
+  if (!types) return tree.named && problem ? { problem: { file: tree.path, message: problem } } : void 0;
+  const scripts = /* @__PURE__ */ new Map();
+  const cached = {
+    program: types.program,
+    scriptFor: (file) => {
+      if (!scripts.has(file)) scripts.set(file, types.scriptFor(file));
+      return scripts.get(file);
+    }
+  };
+  treeCache = { text: tree.text, libs: [...libs], types: cached, scripts };
+  return { types: cached };
+}
 function parsedLibrary(file) {
   let stamp;
   try {
@@ -4114,6 +4143,10 @@ function analyzeModules(modules, config2) {
   const libs = libraries.files.map(parsedLibrary);
   const noLib = config2?.noLib ?? false;
   const checked = libs.length > 0 || !noLib;
+  const tree = config2 ? instanceTree(config2, libs, noLib) : void 0;
+  if (tree?.problem) out2.push({ file: tree.problem.file, message: tree.problem.message, line: 1, column: 1, category: "config" });
+  if (tree?.types) libs.push(tree.types.program);
+  const scriptOf = (file) => tree?.types && config2 ? tree.types.scriptFor((0, import_parser7.outputPathOf)(config2, file)) : void 0;
   const globals = libs.flatMap((lib) => lib.body.statements.flatMap((s) => s.type === "DeclareStatement" ? [s.name] : []));
   const byFile = new Map(modules.map((m) => [m.file, m]));
   const exportsCache = /* @__PURE__ */ new Map();
@@ -4126,7 +4159,9 @@ function analyzeModules(modules, config2) {
     const done = analyzed.get(file);
     if (done) return done;
     const remembered = moduleAnalyses.get(file);
-    if (remembered && remembered.setting === settingFor && libs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === libs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
+    const script = scriptOf(file);
+    const ownLibs = script ? [...libs, script] : libs;
+    if (remembered && remembered.setting === settingFor && ownLibs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === ownLibs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
       analyzed.set(file, remembered.result);
       readWhile.set(file, remembered.read);
       return remembered.result;
@@ -4139,7 +4174,7 @@ function analyzeModules(modules, config2) {
     }
     const before = partials;
     const types = (0, import_parser7.analyzeTypes)(program2, scopes, {
-      libs,
+      libs: ownLibs,
       resolveModule: resolverFor(file),
       noLib,
       reportUnknownTypes: checked
@@ -4156,7 +4191,7 @@ function analyzeModules(modules, config2) {
       if (own !== void 0) read3.set(file, own);
       readWhile.set(file, read3);
       if ([...read3.values()].every((stamp) => stamp !== void 0)) {
-        moduleAnalyses.set(file, { setting: settingFor, libs: [...libs], program: program2, read: read3, result: result2 });
+        moduleAnalyses.set(file, { setting: settingFor, libs: [...ownLibs], program: program2, read: read3, result: result2 });
       }
     }
     return result2;
@@ -4234,6 +4269,7 @@ function allStatements(statements) {
 }
 
 // src/cli.ts
+var import_parser8 = require("@tilua/parser");
 var usage = "usage: tilua [<entry>] [--out <file>] [--output single|chunks|files] [--config <tilua.config.json>] [--noCheck] [--noLineMap] [--minify] [--watch]\n       tilua init";
 var args = process.argv.slice(2);
 var entry;
@@ -4272,46 +4308,97 @@ for (let i = 0; i < args.length; i++) {
   } else entry = arg;
 }
 var shown = (path) => (0, import_node_path3.relative)(process.cwd(), path) || ".";
+var OUT = "out";
 function init() {
   const folder = process.cwd();
+  let existing;
   for (const name of ["tilua.config.json", "tilua.config.jsonc"]) {
-    if ((0, import_node_fs4.existsSync)((0, import_node_path3.join)(folder, name))) {
+    const path = (0, import_node_path3.join)(folder, name);
+    if (!(0, import_node_fs4.existsSync)(path)) continue;
+    let options2 = {};
+    try {
+      options2 = JSON.parse((0, import_parser8.stripJsonComments)((0, import_node_fs4.readFileSync)(path, "utf8")));
+    } catch (error) {
+      console.error(`${name}: ${error.message}`);
+      process.exit(1);
+    }
+    if (options2.output !== "files" || options2.outDir !== void 0 && options2.outDir !== options2.rootDir) {
       console.error(`${name} is already here`);
       process.exit(1);
     }
+    existing = { path, options: options2 };
   }
-  let rootDir = "src";
   const project = (0, import_node_path3.join)(folder, "default.project.json");
-  if ((0, import_node_fs4.existsSync)(project)) {
-    const paths = [];
-    const walk2 = (node) => {
-      if (!node || typeof node !== "object") return;
-      const path = node.$path;
-      const named = typeof path === "string" ? path : path?.optional;
-      if (typeof named === "string" && !/\.\w+$/.test(named)) paths.push(named);
-      for (const [key, child] of Object.entries(node)) if (!key.startsWith("$")) walk2(child);
-    };
-    try {
-      walk2(JSON.parse((0, import_node_fs4.readFileSync)(project, "utf8")).tree);
-    } catch (error) {
-      console.error(`default.project.json: ${error.message}`);
-      process.exit(1);
-    }
-    const split = paths.map((path) => path.replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/$/, "").split("/"));
-    const shared = [];
-    for (let i = 0; split.length && split.every((parts) => parts.length > i && parts[i] === split[0][i]); i++) shared.push(split[0][i]);
-    if (split.length) rootDir = shared.join("/") || ".";
-  } else {
-    console.error('No default.project.json here: rootDir is "src". Change it if the project reads its files from elsewhere.');
+  if (!(0, import_node_fs4.existsSync)(project)) {
+    console.error("No default.project.json here: run `tilua init` in the folder of a Rojo project (`rojo init` makes one)");
+    process.exit(1);
+  }
+  const text = (0, import_node_fs4.readFileSync)(project, "utf8");
+  const paths = [];
+  const walk2 = (node) => {
+    if (!node || typeof node !== "object") return;
+    const path = node.$path;
+    const named = typeof path === "string" ? path : path?.optional;
+    if (typeof named === "string") paths.push(named);
+    for (const [key, child] of Object.entries(node)) if (!key.startsWith("$")) walk2(child);
+  };
+  try {
+    walk2(JSON.parse(text).tree);
+  } catch (error) {
+    console.error(`default.project.json: ${error.message}`);
+    process.exit(1);
+  }
+  const split = paths.map((path) => path.replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/$/, "").split("/"));
+  const shared = [];
+  for (let i = 0; split.length && split.every((parts) => parts.length > i && parts[i] === split[0][i]); i++) shared.push(split[0][i]);
+  if (split.length === 1 && /\.\w+$/.test(shared.at(-1) ?? "")) shared.pop();
+  const rootDir = shared.join("/");
+  if (!rootDir) {
+    console.error("The project's $paths share no folder to compile from: put the code under one (src), as `rojo init` does");
+    process.exit(1);
+  }
+  if (rootDir === OUT || rootDir.startsWith(`${OUT}/`)) {
+    console.error(`The project already reads from ${OUT}: set tilua.config.json up by hand`);
+    process.exit(1);
+  }
+  const out2 = (0, import_node_path3.join)(folder, OUT);
+  if ((0, import_node_fs4.existsSync)(out2) && (0, import_node_fs4.readdirSync)(out2).length) {
+    console.error(`${OUT} is already here and not empty: the build would replace what is in it`);
+    process.exit(1);
+  }
+  const options = existing ? { ...existing.options, rootDir: existing.options.rootDir ?? rootDir, outDir: OUT } : { types: ["roblox"], output: "files", rootDir, outDir: OUT };
+  (0, import_node_fs4.writeFileSync)(existing?.path ?? (0, import_node_path3.join)(folder, "tilua.config.json"), JSON.stringify(options, null, 4) + "\n");
+  console.log(`${(0, import_node_path3.basename)(existing?.path ?? "tilua.config.json")}: ${String(options.rootDir)} compiled to ${OUT}`);
+  const escaped = rootDir.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  let changed = 0;
+  const pointed = text.replace(new RegExp(`("\\$path"\\s*:\\s*")(\\./)?${escaped}(?=/|")`, "g"), (_, head) => {
+    changed++;
+    return `${head}${OUT}`;
+  });
+  (0, import_node_fs4.writeFileSync)(project, pointed);
+  console.log(`default.project.json: ${changed} $path${changed === 1 ? "" : "s"} now read from ${OUT}`);
+  const ignore = (0, import_node_path3.join)(folder, ".gitignore");
+  const ignored = (0, import_node_fs4.existsSync)(ignore) ? (0, import_node_fs4.readFileSync)(ignore, "utf8") : "";
+  if (!ignored.split(/\r?\n/).some((line) => [OUT, `/${OUT}`, `${OUT}/`, `/${OUT}/`].includes(line.trim()))) {
+    (0, import_node_fs4.writeFileSync)(ignore, `${ignored}${ignored && !ignored.endsWith("\n") ? "\n" : ""}
+# What tilua builds from ${rootDir}
+/${OUT}
+`);
+    console.log(`.gitignore: /${OUT}`);
   }
-  const written = { types: ["roblox"], output: "files", rootDir };
-  (0, import_node_fs4.writeFileSync)((0, import_node_path3.join)(folder, "tilua.config.json"), JSON.stringify(written, null, 4) + "\n");
-  console.log("tilua.config.json: a .luau beside each .tilua under " + rootDir);
   console.log("Next: npm i -D @tilua/compiler @tilua-types/roblox, then run `npx tilua --watch` beside `rojo serve`.");
   process.exit(0);
 }
-function writtenByTilua(folder) {
-  const found = [];
+function isInside(folder, path) {
+  const below = (0, import_node_path3.relative)(folder, path);
+  return below === "" || !below.startsWith("..") && !(0, import_node_path3.isAbsolute)(below);
+}
+function filesUnder(folder) {
+  return under(folder).files;
+}
+function under(folder) {
+  const files = [];
+  const folders = [];
   const walk2 = (at) => {
     let items;
     try {
@@ -4320,14 +4407,27 @@ function writtenByTilua(folder) {
       return;
     }
     for (const item of items) {
-      if (item.name.startsWith(".") || item.name === "node_modules") continue;
+      if (item.name === "node_modules" || item.name === ".git") continue;
       const path = (0, import_node_path3.join)(at, item.name);
-      if (item.isDirectory()) walk2(path);
-      else if (/\.luau?$/.test(item.name) && isTilua(path)) found.push(path);
+      if (item.isDirectory()) {
+        folders.push(path);
+        walk2(path);
+      } else files.push(path);
     }
   };
   walk2(folder);
-  return found;
+  return { files, folders };
+}
+function removeEmpty(folder, keep) {
+  for (const item of (0, import_node_fs4.readdirSync)(folder, { withFileTypes: true })) {
+    if (!item.isDirectory()) continue;
+    const path = (0, import_node_path3.join)(folder, item.name);
+    removeEmpty(path, keep);
+    if (!(0, import_node_fs4.readdirSync)(path).length && !keep.has((0, import_node_path3.resolve)(path))) (0, import_node_fs4.rmdirSync)(path);
+  }
+}
+function writtenByTilua(folder) {
+  return filesUnder(folder).filter((path) => /\.luau?$/.test(path) && isTilua(path));
 }
 function isTilua(path) {
   try {
@@ -4347,6 +4447,12 @@ async function build(from) {
   const perFile = mode === "files";
   const entryFile = perFile || from === void 0 ? void 0 : out ?? from.replace(/\.tilua$/, "") + ".luau";
   const folder = (0, import_node_path3.resolve)(entryFile !== void 0 ? (0, import_node_path3.dirname)(entryFile) : out ?? found?.outDir ?? process.cwd());
+  const rootDir = (0, import_node_path3.resolve)(found?.rootDir ?? process.cwd());
+  const mirror = perFile && (0, import_node_path3.resolve)(folder) !== rootDir;
+  if (mirror && (isInside(folder, rootDir) || isInside(rootDir, folder) || isInside(folder, found?.directory ?? process.cwd()))) {
+    console.error(`outDir (${shown(folder)}) has to be a folder of its own: not ${isInside(rootDir, folder) ? "under" : "around"} rootDir (${shown(rootDir)}), and not around the project`);
+    return false;
+  }
   const result2 = await bundle({
     entry: perFile ? void 0 : from,
     config,
@@ -4365,6 +4471,54 @@ async function build(from) {
     return false;
   }
   const targets = result2.files.map((file) => ({ ...file, target: (0, import_node_path3.join)(folder, file.path) }));
+  if (mirror) {
+    const compiled = new Map(targets.map((file) => [(0, import_node_path3.resolve)(file.target), file]));
+    const copies = [];
+    let clash = false;
+    const leftovers = [];
+    for (const source of filesUnder(rootDir)) {
+      if (source.endsWith(".tilua")) continue;
+      if (/\.luau?$/.test(source) && isTilua(source)) {
+        leftovers.push(source);
+        continue;
+      }
+      const target = (0, import_node_path3.resolve)(folder, (0, import_node_path3.relative)(rootDir, source));
+      if (compiled.has(target)) {
+        console.error(`${shown(source)}: a .tilua compiles to the same file \u2014 rename or remove one of them`);
+        clash = true;
+        continue;
+      }
+      copies.push({ source, target });
+    }
+    if (clash) return false;
+    for (const leftover of leftovers) {
+      (0, import_node_fs4.rmSync)(leftover);
+      console.log(`${shown(leftover)}: removed \u2014 tilua compiled it beside its .tilua, and the output is in ${shown(folder)} now`);
+    }
+    for (const file of targets) {
+      if ((0, import_node_fs4.existsSync)(file.target) && (0, import_node_fs4.readFileSync)(file.target, "utf8") === file.code) continue;
+      (0, import_node_fs4.mkdirSync)((0, import_node_path3.dirname)(file.target), { recursive: true });
+      (0, import_node_fs4.writeFileSync)(file.target, file.code);
+      console.log(`${shown(file.target)}: ${file.modules.length} module${file.modules.length === 1 ? "" : "s"}`);
+    }
+    for (const { source, target } of copies) {
+      const bytes = (0, import_node_fs4.readFileSync)(source);
+      if ((0, import_node_fs4.existsSync)(target) && (0, import_node_fs4.readFileSync)(target).equals(bytes)) continue;
+      (0, import_node_fs4.mkdirSync)((0, import_node_path3.dirname)(target), { recursive: true });
+      (0, import_node_fs4.copyFileSync)(source, target);
+      console.log(`${shown(target)}: copied`);
+    }
+    const kept = /* @__PURE__ */ new Set([...compiled.keys(), ...copies.map((copy) => copy.target)]);
+    for (const stale of filesUnder(folder)) {
+      if (kept.has((0, import_node_path3.resolve)(stale))) continue;
+      (0, import_node_fs4.rmSync)(stale);
+      console.log(`${shown(stale)}: removed`);
+    }
+    const folders = /* @__PURE__ */ new Set([folder, ...under(rootDir).folders.map((path) => (0, import_node_path3.resolve)(folder, (0, import_node_path3.relative)(rootDir, path)))]);
+    for (const path of folders) (0, import_node_fs4.mkdirSync)(path, { recursive: true });
+    removeEmpty(folder, folders);
+    return !result2.diagnostics.some((d) => d.severity !== "warning");
+  }
   if (perFile) {
     const theirs = targets.filter((file) => (0, import_node_fs4.existsSync)(file.target) && !isTilua(file.target));
     for (const file of theirs) {
@@ -4391,6 +4545,9 @@ async function build(from) {
 async function watchAndBuild(from) {
   const found = resolveConfig(config, (0, import_node_path3.resolve)(from ?? "tilua.config.json")).config;
   const folder = found?.directory ?? (from !== void 0 ? (0, import_node_path3.dirname)((0, import_node_path3.resolve)(from)) : process.cwd());
+  const rootDir = found?.rootDir;
+  const outDir = (0, import_node_path3.resolve)(out ?? found?.outDir ?? folder);
+  const mirrored = (output ?? found?.output) === "files" && rootDir !== void 0 && outDir !== (0, import_node_path3.resolve)(rootDir);
   let running = false;
   let again = false;
   let timer;
@@ -4414,9 +4571,10 @@ async function watchAndBuild(from) {
   await run();
   (0, import_node_fs4.watch)(folder, { recursive: true }, (_event, name) => {
     if (!name) return;
-    const path = name.toString();
-    if (path.split(import_node_path3.sep).includes("node_modules")) return;
-    if (!/\.tilua$|tilua\.config\.jsonc?$|\.project\.json$/.test(path)) return;
+    const path = (0, import_node_path3.resolve)(folder, name.toString());
+    if ((0, import_node_path3.relative)(folder, path).split(/[\\/]/).includes("node_modules") || isInside(outDir, path) && mirrored) return;
+    const read3 = /\.tilua$|tilua\.config\.jsonc?$|\.project\.json$/.test(path) || mirrored && isInside(rootDir, path);
+    if (!read3) return;
     clearTimeout(timer);
     timer = setTimeout(() => void run(), 100);
   });

package/dist/cli.js

@@ -3,11 +3,12 @@ import {
   WRITTEN_BY_TILUA,
   bundle,
   resolveConfig
-} from "./chunk-VUIF62OE.js";
+} from "./chunk-3RJVN4KC.js";
 
 // src/cli.ts
-import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, watch, writeFileSync } from "fs";
-import { basename, dirname, join, relative, resolve, sep } from "path";
+import { copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync, rmdirSync, rmSync, watch, writeFileSync } from "fs";
+import { basename, dirname, isAbsolute, join, relative, resolve } from "path";
+import { stripJsonComments } from "@tilua/parser";
 var usage = "usage: tilua [<entry>] [--out <file>] [--output single|chunks|files] [--config <tilua.config.json>] [--noCheck] [--noLineMap] [--minify] [--watch]\n       tilua init";
 var args = process.argv.slice(2);
 var entry;
@@ -46,46 +47,97 @@ for (let i = 0; i < args.length; i++) {
   } else entry = arg;
 }
 var shown = (path) => relative(process.cwd(), path) || ".";
+var OUT = "out";
 function init() {
   const folder = process.cwd();
+  let existing;
   for (const name of ["tilua.config.json", "tilua.config.jsonc"]) {
-    if (existsSync(join(folder, name))) {
+    const path = join(folder, name);
+    if (!existsSync(path)) continue;
+    let options2 = {};
+    try {
+      options2 = JSON.parse(stripJsonComments(readFileSync(path, "utf8")));
+    } catch (error) {
+      console.error(`${name}: ${error.message}`);
+      process.exit(1);
+    }
+    if (options2.output !== "files" || options2.outDir !== void 0 && options2.outDir !== options2.rootDir) {
       console.error(`${name} is already here`);
       process.exit(1);
     }
+    existing = { path, options: options2 };
   }
-  let rootDir = "src";
   const project = join(folder, "default.project.json");
-  if (existsSync(project)) {
-    const paths = [];
-    const walk = (node) => {
-      if (!node || typeof node !== "object") return;
-      const path = node.$path;
-      const named = typeof path === "string" ? path : path?.optional;
-      if (typeof named === "string" && !/\.\w+$/.test(named)) paths.push(named);
-      for (const [key, child] of Object.entries(node)) if (!key.startsWith("$")) walk(child);
-    };
-    try {
-      walk(JSON.parse(readFileSync(project, "utf8")).tree);
-    } catch (error) {
-      console.error(`default.project.json: ${error.message}`);
-      process.exit(1);
-    }
-    const split = paths.map((path) => path.replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/$/, "").split("/"));
-    const shared = [];
-    for (let i = 0; split.length && split.every((parts) => parts.length > i && parts[i] === split[0][i]); i++) shared.push(split[0][i]);
-    if (split.length) rootDir = shared.join("/") || ".";
-  } else {
-    console.error('No default.project.json here: rootDir is "src". Change it if the project reads its files from elsewhere.');
-  }
-  const written = { types: ["roblox"], output: "files", rootDir };
-  writeFileSync(join(folder, "tilua.config.json"), JSON.stringify(written, null, 4) + "\n");
-  console.log("tilua.config.json: a .luau beside each .tilua under " + rootDir);
+  if (!existsSync(project)) {
+    console.error("No default.project.json here: run `tilua init` in the folder of a Rojo project (`rojo init` makes one)");
+    process.exit(1);
+  }
+  const text = readFileSync(project, "utf8");
+  const paths = [];
+  const walk = (node) => {
+    if (!node || typeof node !== "object") return;
+    const path = node.$path;
+    const named = typeof path === "string" ? path : path?.optional;
+    if (typeof named === "string") paths.push(named);
+    for (const [key, child] of Object.entries(node)) if (!key.startsWith("$")) walk(child);
+  };
+  try {
+    walk(JSON.parse(text).tree);
+  } catch (error) {
+    console.error(`default.project.json: ${error.message}`);
+    process.exit(1);
+  }
+  const split = paths.map((path) => path.replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/$/, "").split("/"));
+  const shared = [];
+  for (let i = 0; split.length && split.every((parts) => parts.length > i && parts[i] === split[0][i]); i++) shared.push(split[0][i]);
+  if (split.length === 1 && /\.\w+$/.test(shared.at(-1) ?? "")) shared.pop();
+  const rootDir = shared.join("/");
+  if (!rootDir) {
+    console.error("The project's $paths share no folder to compile from: put the code under one (src), as `rojo init` does");
+    process.exit(1);
+  }
+  if (rootDir === OUT || rootDir.startsWith(`${OUT}/`)) {
+    console.error(`The project already reads from ${OUT}: set tilua.config.json up by hand`);
+    process.exit(1);
+  }
+  const out2 = join(folder, OUT);
+  if (existsSync(out2) && readdirSync(out2).length) {
+    console.error(`${OUT} is already here and not empty: the build would replace what is in it`);
+    process.exit(1);
+  }
+  const options = existing ? { ...existing.options, rootDir: existing.options.rootDir ?? rootDir, outDir: OUT } : { types: ["roblox"], output: "files", rootDir, outDir: OUT };
+  writeFileSync(existing?.path ?? join(folder, "tilua.config.json"), JSON.stringify(options, null, 4) + "\n");
+  console.log(`${basename(existing?.path ?? "tilua.config.json")}: ${String(options.rootDir)} compiled to ${OUT}`);
+  const escaped = rootDir.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  let changed = 0;
+  const pointed = text.replace(new RegExp(`("\\$path"\\s*:\\s*")(\\./)?${escaped}(?=/|")`, "g"), (_, head) => {
+    changed++;
+    return `${head}${OUT}`;
+  });
+  writeFileSync(project, pointed);
+  console.log(`default.project.json: ${changed} $path${changed === 1 ? "" : "s"} now read from ${OUT}`);
+  const ignore = join(folder, ".gitignore");
+  const ignored = existsSync(ignore) ? readFileSync(ignore, "utf8") : "";
+  if (!ignored.split(/\r?\n/).some((line) => [OUT, `/${OUT}`, `${OUT}/`, `/${OUT}/`].includes(line.trim()))) {
+    writeFileSync(ignore, `${ignored}${ignored && !ignored.endsWith("\n") ? "\n" : ""}
+# What tilua builds from ${rootDir}
+/${OUT}
+`);
+    console.log(`.gitignore: /${OUT}`);
+  }
   console.log("Next: npm i -D @tilua/compiler @tilua-types/roblox, then run `npx tilua --watch` beside `rojo serve`.");
   process.exit(0);
 }
-function writtenByTilua(folder) {
-  const found = [];
+function isInside(folder, path) {
+  const below = relative(folder, path);
+  return below === "" || !below.startsWith("..") && !isAbsolute(below);
+}
+function filesUnder(folder) {
+  return under(folder).files;
+}
+function under(folder) {
+  const files = [];
+  const folders = [];
   const walk = (at) => {
     let items;
     try {
@@ -94,14 +146,27 @@ function writtenByTilua(folder) {
       return;
     }
     for (const item of items) {
-      if (item.name.startsWith(".") || item.name === "node_modules") continue;
+      if (item.name === "node_modules" || item.name === ".git") continue;
       const path = join(at, item.name);
-      if (item.isDirectory()) walk(path);
-      else if (/\.luau?$/.test(item.name) && isTilua(path)) found.push(path);
+      if (item.isDirectory()) {
+        folders.push(path);
+        walk(path);
+      } else files.push(path);
     }
   };
   walk(folder);
-  return found;
+  return { files, folders };
+}
+function removeEmpty(folder, keep) {
+  for (const item of readdirSync(folder, { withFileTypes: true })) {
+    if (!item.isDirectory()) continue;
+    const path = join(folder, item.name);
+    removeEmpty(path, keep);
+    if (!readdirSync(path).length && !keep.has(resolve(path))) rmdirSync(path);
+  }
+}
+function writtenByTilua(folder) {
+  return filesUnder(folder).filter((path) => /\.luau?$/.test(path) && isTilua(path));
 }
 function isTilua(path) {
   try {
@@ -121,6 +186,12 @@ async function build(from) {
   const perFile = mode === "files";
   const entryFile = perFile || from === void 0 ? void 0 : out ?? from.replace(/\.tilua$/, "") + ".luau";
   const folder = resolve(entryFile !== void 0 ? dirname(entryFile) : out ?? found?.outDir ?? process.cwd());
+  const rootDir = resolve(found?.rootDir ?? process.cwd());
+  const mirror = perFile && resolve(folder) !== rootDir;
+  if (mirror && (isInside(folder, rootDir) || isInside(rootDir, folder) || isInside(folder, found?.directory ?? process.cwd()))) {
+    console.error(`outDir (${shown(folder)}) has to be a folder of its own: not ${isInside(rootDir, folder) ? "under" : "around"} rootDir (${shown(rootDir)}), and not around the project`);
+    return false;
+  }
   const result = await bundle({
     entry: perFile ? void 0 : from,
     config,
@@ -139,6 +210,54 @@ async function build(from) {
     return false;
   }
   const targets = result.files.map((file) => ({ ...file, target: join(folder, file.path) }));
+  if (mirror) {
+    const compiled = new Map(targets.map((file) => [resolve(file.target), file]));
+    const copies = [];
+    let clash = false;
+    const leftovers = [];
+    for (const source of filesUnder(rootDir)) {
+      if (source.endsWith(".tilua")) continue;
+      if (/\.luau?$/.test(source) && isTilua(source)) {
+        leftovers.push(source);
+        continue;
+      }
+      const target = resolve(folder, relative(rootDir, source));
+      if (compiled.has(target)) {
+        console.error(`${shown(source)}: a .tilua compiles to the same file \u2014 rename or remove one of them`);
+        clash = true;
+        continue;
+      }
+      copies.push({ source, target });
+    }
+    if (clash) return false;
+    for (const leftover of leftovers) {
+      rmSync(leftover);
+      console.log(`${shown(leftover)}: removed \u2014 tilua compiled it beside its .tilua, and the output is in ${shown(folder)} now`);
+    }
+    for (const file of targets) {
+      if (existsSync(file.target) && readFileSync(file.target, "utf8") === file.code) continue;
+      mkdirSync(dirname(file.target), { recursive: true });
+      writeFileSync(file.target, file.code);
+      console.log(`${shown(file.target)}: ${file.modules.length} module${file.modules.length === 1 ? "" : "s"}`);
+    }
+    for (const { source, target } of copies) {
+      const bytes = readFileSync(source);
+      if (existsSync(target) && readFileSync(target).equals(bytes)) continue;
+      mkdirSync(dirname(target), { recursive: true });
+      copyFileSync(source, target);
+      console.log(`${shown(target)}: copied`);
+    }
+    const kept = /* @__PURE__ */ new Set([...compiled.keys(), ...copies.map((copy) => copy.target)]);
+    for (const stale of filesUnder(folder)) {
+      if (kept.has(resolve(stale))) continue;
+      rmSync(stale);
+      console.log(`${shown(stale)}: removed`);
+    }
+    const folders = /* @__PURE__ */ new Set([folder, ...under(rootDir).folders.map((path) => resolve(folder, relative(rootDir, path)))]);
+    for (const path of folders) mkdirSync(path, { recursive: true });
+    removeEmpty(folder, folders);
+    return !result.diagnostics.some((d) => d.severity !== "warning");
+  }
   if (perFile) {
     const theirs = targets.filter((file) => existsSync(file.target) && !isTilua(file.target));
     for (const file of theirs) {
@@ -165,6 +284,9 @@ async function build(from) {
 async function watchAndBuild(from) {
   const found = resolveConfig(config, resolve(from ?? "tilua.config.json")).config;
   const folder = found?.directory ?? (from !== void 0 ? dirname(resolve(from)) : process.cwd());
+  const rootDir = found?.rootDir;
+  const outDir = resolve(out ?? found?.outDir ?? folder);
+  const mirrored = (output ?? found?.output) === "files" && rootDir !== void 0 && outDir !== resolve(rootDir);
   let running = false;
   let again = false;
   let timer;
@@ -188,9 +310,10 @@ async function watchAndBuild(from) {
   await run();
   watch(folder, { recursive: true }, (_event, name) => {
     if (!name) return;
-    const path = name.toString();
-    if (path.split(sep).includes("node_modules")) return;
-    if (!/\.tilua$|tilua\.config\.jsonc?$|\.project\.json$/.test(path)) return;
+    const path = resolve(folder, name.toString());
+    if (relative(folder, path).split(/[\\/]/).includes("node_modules") || isInside(outDir, path) && mirrored) return;
+    const read = /\.tilua$|tilua\.config\.jsonc?$|\.project\.json$/.test(path) || mirrored && isInside(rootDir, path);
+    if (!read) return;
     clearTimeout(timer);
     timer = setTimeout(() => void run(), 100);
   });

package/dist/index.cjs

@@ -4115,6 +4115,35 @@ function importedSpecifiers(program2) {
   return program2.body.statements.flatMap((s) => s.type === "ImportStatement" || s.type === "ExportAllStatement" || s.type === "ExportNamedStatement" && s.source ? [s.source.value] : []);
 }
 var libraryCache = /* @__PURE__ */ new Map();
+var treeCache;
+function instanceTree(config, libs, noLib) {
+  const tree = (0, import_parser7.sourceMapOf)(config);
+  if (!tree) return void 0;
+  if ("problem" in tree) return tree.named ? { problem: { file: config.path, message: tree.problem } } : void 0;
+  const declares = (name) => libs.some((lib) => lib.body.statements.some((s) => s.type === "DeclareStatement" && s.name === name));
+  if (!tree.named && !declares("game")) return void 0;
+  if (treeCache && treeCache.text === tree.text && treeCache.libs.length === libs.length && treeCache.libs.every((lib, i) => lib === libs[i])) {
+    return { types: treeCache.types };
+  }
+  const empty = (0, import_parser7.parse)("");
+  const aliases = (0, import_parser7.analyzeTypes)(empty, (0, import_parser7.analyzeScopes)(empty, { noLib }), { libs, noLib, diagnostics: false }).aliases;
+  const membersOf = (className) => {
+    const type = aliases.get(className);
+    return new Set(type?.kind === "object" ? type.properties.keys() : ["Name", "ClassName", "Parent", "Archivable"]);
+  };
+  const { types, problem } = (0, import_parser7.sourceMapTypes)(tree.text, tree.path, { classes: new Set(aliases.keys()), membersOf });
+  if (!types) return tree.named && problem ? { problem: { file: tree.path, message: problem } } : void 0;
+  const scripts = /* @__PURE__ */ new Map();
+  const cached = {
+    program: types.program,
+    scriptFor: (file) => {
+      if (!scripts.has(file)) scripts.set(file, types.scriptFor(file));
+      return scripts.get(file);
+    }
+  };
+  treeCache = { text: tree.text, libs: [...libs], types: cached, scripts };
+  return { types: cached };
+}
 function parsedLibrary(file) {
   let stamp;
   try {
@@ -4138,6 +4167,10 @@ function analyzeModules(modules, config) {
   const libs = libraries.files.map(parsedLibrary);
   const noLib = config?.noLib ?? false;
   const checked = libs.length > 0 || !noLib;
+  const tree = config ? instanceTree(config, libs, noLib) : void 0;
+  if (tree?.problem) out.push({ file: tree.problem.file, message: tree.problem.message, line: 1, column: 1, category: "config" });
+  if (tree?.types) libs.push(tree.types.program);
+  const scriptOf = (file) => tree?.types && config ? tree.types.scriptFor((0, import_parser7.outputPathOf)(config, file)) : void 0;
   const globals = libs.flatMap((lib) => lib.body.statements.flatMap((s) => s.type === "DeclareStatement" ? [s.name] : []));
   const byFile = new Map(modules.map((m) => [m.file, m]));
   const exportsCache = /* @__PURE__ */ new Map();
@@ -4150,7 +4183,9 @@ function analyzeModules(modules, config) {
     const done = analyzed.get(file);
     if (done) return done;
     const remembered = moduleAnalyses.get(file);
-    if (remembered && remembered.setting === settingFor && libs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === libs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
+    const script = scriptOf(file);
+    const ownLibs = script ? [...libs, script] : libs;
+    if (remembered && remembered.setting === settingFor && ownLibs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === ownLibs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
       analyzed.set(file, remembered.result);
       readWhile.set(file, remembered.read);
       return remembered.result;
@@ -4163,7 +4198,7 @@ function analyzeModules(modules, config) {
     }
     const before = partials;
     const types = (0, import_parser7.analyzeTypes)(program2, scopes, {
-      libs,
+      libs: ownLibs,
       resolveModule: resolverFor(file),
       noLib,
       reportUnknownTypes: checked
@@ -4180,7 +4215,7 @@ function analyzeModules(modules, config) {
       if (own !== void 0) read3.set(file, own);
       readWhile.set(file, read3);
       if ([...read3.values()].every((stamp) => stamp !== void 0)) {
-        moduleAnalyses.set(file, { setting: settingFor, libs: [...libs], program: program2, read: read3, result: result2 });
+        moduleAnalyses.set(file, { setting: settingFor, libs: [...ownLibs], program: program2, read: read3, result: result2 });
       }
     }
     return result2;

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   program,
   resolveConfig,
   syntaxOf
-} from "./chunk-VUIF62OE.js";
+} from "./chunk-3RJVN4KC.js";
 
 // src/compile.ts
 import { readFileSync } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tilua/compiler",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "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",
@@ -37,7 +37,7 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
-    "@tilua/parser": "^9.0.0",
+    "@tilua/parser": "^9.0.1",
     "luau-parser": "^1.1.0"
   },
   "devDependencies": {