@tilua/compiler 9.1.0 → 9.1.2

package/README.md

@@ -546,12 +546,12 @@ a script that requires any of them knows what it got.
 <!-- compatibility:start -->
 ## Compatibility
 
-`@tilua/compiler@9.1.0` works with these tilua packages. *Released with* is the
+`@tilua/compiler@9.1.2` works with these tilua packages. *Released with* is the
 version it was built and tested against.
 
 | Package | Range | Released with | |
 | --- | --- | --- | --- |
-| `@tilua/parser` | `^9.1.0` | 9.1.0 | dependency |
+| `@tilua/parser` | `^9.1.2` | 9.1.2 | dependency |
 <!-- compatibility:end -->
 
 ## Development

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

@@ -710,6 +710,8 @@ var Lowerer = class {
         receiverGlobal,
         argumentCount: args.length,
         at: this.callSite(name),
+        perFile: this.options.perFile ?? false,
+        report: (message) => this.diagnostics.push({ message, line: node.line.start, column: node.column.start }),
         get arguments() {
           return info();
         },
@@ -739,6 +741,8 @@ var Lowerer = class {
         options: lowerings[i].options ?? {},
         name,
         at: this.callSite(node.callee),
+        perFile: this.options.perFile ?? false,
+        report: (message) => this.diagnostics.push({ message, line: node.line.start, column: node.column.start }),
         get arguments() {
           return info();
         },
@@ -754,11 +758,16 @@ var Lowerer = class {
     if (!lowerings?.some((l) => l.plugin.globalValue)) return void 0;
     const name = this.globalName(node);
     if (name === void 0) return void 0;
+    const called = this.readingCallee;
     for (let i = lowerings.length - 1; i >= 0; i--) {
       const answer = lowerings[i].plugin.globalValue?.({
         options: lowerings[i].options ?? {},
         name,
         at: this.callSite(node),
+        perFile: this.options.perFile ?? false,
+        report: (message) => {
+          if (!called) this.diagnostics.push({ message, line: node.line.start, column: node.column.start });
+        },
         use: (runtime2) => this.loweringRuntime(i, runtime2)
       });
       if (answer !== void 0) return this.libraryExpression(answer, i, node);
@@ -2122,8 +2131,14 @@ end
     if (node.type === "CallExpression" && object2.type === "Identifier") {
       return this.link(node, this.reference(object2));
     }
-    return this.link(node, this.expression(object2));
+    const callee = node.type === "CallExpression" && node.callee === object2;
+    const reading = this.readingCallee;
+    this.readingCallee = callee;
+    const lowered = this.expression(object2);
+    this.readingCallee = reading;
+    return this.link(node, lowered);
   }
+  readingCallee = false;
   /** A call is one value in tilua, and Luau would hand on every value one
    *  returns in the last place of an argument list or a `return`: it is
    *  kept to one there, `f((g()))`. Every value is taken only where the
@@ -3272,7 +3287,7 @@ async function bundle(options) {
     for (let n = 2; taken.has(pathKey(runtimeFile)); n++) runtimeFile = join(outDir, `_tilua${n}.luau`);
     for (let i = lowerings.length - 1; i >= 0 && !host; i--) {
       const { plugin: plugin3, options: own } = lowerings[i];
-      host = plugin3.files?.({ options: own ?? {}, directory: config?.directory ?? root, outDir, files: outputs, runtime: runtimeFile });
+      host = plugin3.files?.({ options: own ?? {}, directory: config?.directory ?? root, rootDir, outDir, files: outputs, runtime: runtimeFile });
     }
     for (const problem of host?.problems ?? []) {
       diagnostics.push({
@@ -3315,6 +3330,7 @@ async function bundle(options) {
     const dynamicImports = /* @__PURE__ */ new Set();
     const lowered2 = lower(source.program, source.scopes, {
       names,
+      perFile,
       types: analysis.types.get(file),
       lowerings,
       noLib: config?.noLib,
@@ -3493,6 +3509,27 @@ ${G}.arrays[${G}.scriptArgs] = true`).body.statements);
     files2.push({ path: runtimePath, code: `${runtimeCode}
 ${WRITTEN_BY_TILUA}: the runtime every file of the project requires.
 `, modules: [] });
+    try {
+      const more = await host?.output?.();
+      for (const { file, code } of more?.files ?? []) {
+        if (isOutside(outDir, resolve2(file))) return stop(`A library's file has to go inside outDir, not at ${file}`);
+        files2.push({ path: relative(outDir, file).replace(/\\/g, "/"), code: `${code}
+${WRITTEN_BY_TILUA}: a library's own file.
+`, modules: [] });
+      }
+      for (const problem of more?.problems ?? []) {
+        diagnostics.push({
+          file: problem.file ?? config?.path ?? anchor,
+          message: problem.message,
+          line: 1,
+          column: 1,
+          category: "config",
+          ...problem.severity === "warning" && { severity: "warning" }
+        });
+      }
+    } catch (error) {
+      return stop(`A library could not write its files: ${error.message}`);
+    }
     return { code: files2[0].code, files: files2, modules: moduleNames, diagnostics };
   }
   const several = mode !== "single";
@@ -4049,7 +4086,11 @@ ${several ? `
         })
         record = { loading = true, exports = exports }
         ${G}.records[name] = record
-        module.load(exports)
+        -- A module runs once, so nothing keeps its body: anything can reach
+        -- this table, and the body holds what the file kept to itself.
+        local run = module.load
+        module.load = nil
+        run(exports)
         record.loading = false
         return exports
     end,

package/dist/cli.cjs

@@ -727,6 +727,8 @@ var Lowerer = class {
         receiverGlobal,
         argumentCount: args2.length,
         at: this.callSite(name),
+        perFile: this.options.perFile ?? false,
+        report: (message) => this.diagnostics.push({ message, line: node.line.start, column: node.column.start }),
         get arguments() {
           return info();
         },
@@ -756,6 +758,8 @@ var Lowerer = class {
         options: lowerings[i].options ?? {},
         name,
         at: this.callSite(node.callee),
+        perFile: this.options.perFile ?? false,
+        report: (message) => this.diagnostics.push({ message, line: node.line.start, column: node.column.start }),
         get arguments() {
           return info();
         },
@@ -771,11 +775,16 @@ var Lowerer = class {
     if (!lowerings?.some((l) => l.plugin.globalValue)) return void 0;
     const name = this.globalName(node);
     if (name === void 0) return void 0;
+    const called = this.readingCallee;
     for (let i = lowerings.length - 1; i >= 0; i--) {
       const answer = lowerings[i].plugin.globalValue?.({
         options: lowerings[i].options ?? {},
         name,
         at: this.callSite(node),
+        perFile: this.options.perFile ?? false,
+        report: (message) => {
+          if (!called) this.diagnostics.push({ message, line: node.line.start, column: node.column.start });
+        },
         use: (runtime2) => this.loweringRuntime(i, runtime2)
       });
       if (answer !== void 0) return this.libraryExpression(answer, i, node);
@@ -2139,8 +2148,14 @@ end
     if (node.type === "CallExpression" && object2.type === "Identifier") {
       return this.link(node, this.reference(object2));
     }
-    return this.link(node, this.expression(object2));
+    const callee = node.type === "CallExpression" && node.callee === object2;
+    const reading = this.readingCallee;
+    this.readingCallee = callee;
+    const lowered = this.expression(object2);
+    this.readingCallee = reading;
+    return this.link(node, lowered);
   }
+  readingCallee = false;
   /** A call is one value in tilua, and Luau would hand on every value one
    *  returns in the last place of an argument list or a `return`: it is
    *  kept to one there, `f((g()))`. Every value is taken only where the
@@ -3265,7 +3280,7 @@ async function bundle(options) {
     for (let n = 2; taken.has(pathKey(runtimeFile)); n++) runtimeFile = (0, import_node_path2.join)(outDir, `_tilua${n}.luau`);
     for (let i = lowerings.length - 1; i >= 0 && !host; i--) {
       const { plugin: plugin3, options: own } = lowerings[i];
-      host = plugin3.files?.({ options: own ?? {}, directory: config2?.directory ?? root, outDir, files: outputs, runtime: runtimeFile });
+      host = plugin3.files?.({ options: own ?? {}, directory: config2?.directory ?? root, rootDir, outDir, files: outputs, runtime: runtimeFile });
     }
     for (const problem of host?.problems ?? []) {
       diagnostics.push({
@@ -3308,6 +3323,7 @@ async function bundle(options) {
     const dynamicImports = /* @__PURE__ */ new Set();
     const lowered2 = lower(source.program, source.scopes, {
       names,
+      perFile,
       types: analysis.types.get(file),
       lowerings,
       noLib: config2?.noLib,
@@ -3486,6 +3502,27 @@ ${G}.arrays[${G}.scriptArgs] = true`).body.statements);
     files2.push({ path: runtimePath, code: `${runtimeCode}
 ${WRITTEN_BY_TILUA}: the runtime every file of the project requires.
 `, modules: [] });
+    try {
+      const more = await host?.output?.();
+      for (const { file, code } of more?.files ?? []) {
+        if (isOutside(outDir, (0, import_node_path2.resolve)(file))) return stop(`A library's file has to go inside outDir, not at ${file}`);
+        files2.push({ path: (0, import_node_path2.relative)(outDir, file).replace(/\\/g, "/"), code: `${code}
+${WRITTEN_BY_TILUA}: a library's own file.
+`, modules: [] });
+      }
+      for (const problem of more?.problems ?? []) {
+        diagnostics.push({
+          file: problem.file ?? config2?.path ?? anchor,
+          message: problem.message,
+          line: 1,
+          column: 1,
+          category: "config",
+          ...problem.severity === "warning" && { severity: "warning" }
+        });
+      }
+    } catch (error) {
+      return stop(`A library could not write its files: ${error.message}`);
+    }
     return { code: files2[0].code, files: files2, modules: moduleNames, diagnostics };
   }
   const several = mode !== "single";
@@ -4042,7 +4079,11 @@ ${several ? `
         })
         record = { loading = true, exports = exports }
         ${G}.records[name] = record
-        module.load(exports)
+        -- A module runs once, so nothing keeps its body: anything can reach
+        -- this table, and the body holds what the file kept to itself.
+        local run = module.load
+        module.load = nil
+        run(exports)
         record.loading = false
         return exports
     end,

package/dist/cli.js

@@ -3,7 +3,7 @@ import {
   WRITTEN_BY_TILUA,
   bundle,
   resolveConfig
-} from "./chunk-3RJVN4KC.js";
+} from "./chunk-NS6CK5FX.js";
 
 // src/cli.ts
 import { copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync, rmdirSync, rmSync, watch, writeFileSync } from "fs";

package/dist/index.cjs

@@ -751,6 +751,8 @@ var Lowerer = class {
         receiverGlobal,
         argumentCount: args.length,
         at: this.callSite(name),
+        perFile: this.options.perFile ?? false,
+        report: (message) => this.diagnostics.push({ message, line: node.line.start, column: node.column.start }),
         get arguments() {
           return info();
         },
@@ -780,6 +782,8 @@ var Lowerer = class {
         options: lowerings[i].options ?? {},
         name,
         at: this.callSite(node.callee),
+        perFile: this.options.perFile ?? false,
+        report: (message) => this.diagnostics.push({ message, line: node.line.start, column: node.column.start }),
         get arguments() {
           return info();
         },
@@ -795,11 +799,16 @@ var Lowerer = class {
     if (!lowerings?.some((l) => l.plugin.globalValue)) return void 0;
     const name = this.globalName(node);
     if (name === void 0) return void 0;
+    const called = this.readingCallee;
     for (let i = lowerings.length - 1; i >= 0; i--) {
       const answer = lowerings[i].plugin.globalValue?.({
         options: lowerings[i].options ?? {},
         name,
         at: this.callSite(node),
+        perFile: this.options.perFile ?? false,
+        report: (message) => {
+          if (!called) this.diagnostics.push({ message, line: node.line.start, column: node.column.start });
+        },
         use: (runtime2) => this.loweringRuntime(i, runtime2)
       });
       if (answer !== void 0) return this.libraryExpression(answer, i, node);
@@ -2163,8 +2172,14 @@ end
     if (node.type === "CallExpression" && object2.type === "Identifier") {
       return this.link(node, this.reference(object2));
     }
-    return this.link(node, this.expression(object2));
+    const callee = node.type === "CallExpression" && node.callee === object2;
+    const reading = this.readingCallee;
+    this.readingCallee = callee;
+    const lowered = this.expression(object2);
+    this.readingCallee = reading;
+    return this.link(node, lowered);
   }
+  readingCallee = false;
   /** A call is one value in tilua, and Luau would hand on every value one
    *  returns in the last place of an argument list or a `return`: it is
    *  kept to one there, `f((g()))`. Every value is taken only where the
@@ -3289,7 +3304,7 @@ async function bundle(options) {
     for (let n = 2; taken.has(pathKey(runtimeFile)); n++) runtimeFile = (0, import_node_path2.join)(outDir, `_tilua${n}.luau`);
     for (let i = lowerings.length - 1; i >= 0 && !host; i--) {
       const { plugin: plugin3, options: own } = lowerings[i];
-      host = plugin3.files?.({ options: own ?? {}, directory: config?.directory ?? root, outDir, files: outputs, runtime: runtimeFile });
+      host = plugin3.files?.({ options: own ?? {}, directory: config?.directory ?? root, rootDir, outDir, files: outputs, runtime: runtimeFile });
     }
     for (const problem of host?.problems ?? []) {
       diagnostics.push({
@@ -3332,6 +3347,7 @@ async function bundle(options) {
     const dynamicImports = /* @__PURE__ */ new Set();
     const lowered2 = lower(source.program, source.scopes, {
       names,
+      perFile,
       types: analysis.types.get(file),
       lowerings,
       noLib: config?.noLib,
@@ -3510,6 +3526,27 @@ ${G}.arrays[${G}.scriptArgs] = true`).body.statements);
     files2.push({ path: runtimePath, code: `${runtimeCode}
 ${WRITTEN_BY_TILUA}: the runtime every file of the project requires.
 `, modules: [] });
+    try {
+      const more = await host?.output?.();
+      for (const { file, code } of more?.files ?? []) {
+        if (isOutside(outDir, (0, import_node_path2.resolve)(file))) return stop(`A library's file has to go inside outDir, not at ${file}`);
+        files2.push({ path: (0, import_node_path2.relative)(outDir, file).replace(/\\/g, "/"), code: `${code}
+${WRITTEN_BY_TILUA}: a library's own file.
+`, modules: [] });
+      }
+      for (const problem of more?.problems ?? []) {
+        diagnostics.push({
+          file: problem.file ?? config?.path ?? anchor,
+          message: problem.message,
+          line: 1,
+          column: 1,
+          category: "config",
+          ...problem.severity === "warning" && { severity: "warning" }
+        });
+      }
+    } catch (error) {
+      return stop(`A library could not write its files: ${error.message}`);
+    }
     return { code: files2[0].code, files: files2, modules: moduleNames, diagnostics };
   }
   const several = mode !== "single";
@@ -4066,7 +4103,11 @@ ${several ? `
         })
         record = { loading = true, exports = exports }
         ${G}.records[name] = record
-        module.load(exports)
+        -- A module runs once, so nothing keeps its body: anything can reach
+        -- this table, and the body holds what the file kept to itself.
+        local run = module.load
+        module.load = nil
+        run(exports)
         record.loading = false
         return exports
     end,

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import * as T from '@tilua/parser';
 import { OutputMode, TiluaConfig, ConfigProblem, LoweringPlugin, TypeAnalysis, ScopeAnalysis } from '@tilua/parser';
-export { EntryExports, EntryExportsLowering, FilesAnswer, FilesLayout, LoweringPlugin, LuaSyntax, MethodCall, MethodLowering, PluginContext } from '@tilua/parser';
+export { EntryExports, EntryExportsLowering, FilesAnswer, FilesLayout, FilesOutput, FilesProblem, LoweringPlugin, LuaSyntax, MethodCall, MethodLowering, PluginContext } from '@tilua/parser';
 import * as L from 'luau-parser';
 
 /** What `tilua.config.json` holds. */
@@ -264,6 +264,8 @@ interface ModuleContext {
     readonly arrays?: string;
 }
 interface LowerOptions {
+    /** The build is `"output": "files"`, as a library is told. */
+    readonly perFile?: boolean;
     /** Lower the file as a module of a bundle. Without it, `import` and
      *  `export` are errors. */
     readonly module?: ModuleContext;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as T from '@tilua/parser';
 import { OutputMode, TiluaConfig, ConfigProblem, LoweringPlugin, TypeAnalysis, ScopeAnalysis } from '@tilua/parser';
-export { EntryExports, EntryExportsLowering, FilesAnswer, FilesLayout, LoweringPlugin, LuaSyntax, MethodCall, MethodLowering, PluginContext } from '@tilua/parser';
+export { EntryExports, EntryExportsLowering, FilesAnswer, FilesLayout, FilesOutput, FilesProblem, LoweringPlugin, LuaSyntax, MethodCall, MethodLowering, PluginContext } from '@tilua/parser';
 import * as L from 'luau-parser';
 
 /** What `tilua.config.json` holds. */
@@ -264,6 +264,8 @@ interface ModuleContext {
     readonly arrays?: string;
 }
 interface LowerOptions {
+    /** The build is `"output": "files"`, as a library is told. */
+    readonly perFile?: boolean;
     /** Lower the file as a module of a bundle. Without it, `import` and
      *  `export` are errors. */
     readonly module?: ModuleContext;

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tilua/compiler",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "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.1.0",
+    "@tilua/parser": "^9.1.2",
     "luau-parser": "^1.1.0"
   },
   "devDependencies": {