@tilua/compiler 5.0.0 → 5.0.1

package/README.md

@@ -180,7 +180,9 @@ another, and one the class writes itself replaces the copy.
 Two links come with every class, and they cost an instance nothing because
 they live on the class table: `ClassObject`, which an instance reads through
 its metatable to reach its own class, and `ParentClass`, which a class reads
-to reach the one it extends.
+to reach the one it extends. The class table holds its `name` too
+(`tilua_class(base, "Dog")`), so `rex.ClassObject.name` says what built an
+instance.
 
 A class written as a value (`const Counter = class { … }`) is the same code,
 inside a function that runs where the class is written and hands the table

package/dist/{chunk-3J2QMA4W.js → chunk-Y7QGXLCV.js}

@@ -258,6 +258,18 @@ var Lowerer = class {
     for (const binding of scopes.bindings.values()) {
       if (binding.declarationNode) this.bindingByDeclaration.set(binding.declarationNode, binding);
     }
+    const visit = (value) => {
+      if (!value || typeof value !== "object") return;
+      if (Array.isArray(value)) return void value.forEach(visit);
+      const node = value;
+      if (node.type === "VariableDeclaration" && node.name?.type === "IdentifierPattern" && node.name.name) {
+        let init = node.init;
+        while (init?.type === "ParenthesizedExpression") init = init.expression;
+        if (init?.type === "ClassExpression") this.classExpressionNames.set(init, node.name.name);
+      }
+      for (const [key, child] of Object.entries(value)) if (key !== "line" && key !== "column") visit(child);
+    };
+    visit(source.body);
   }
   source;
   scopes;
@@ -279,6 +291,8 @@ var Lowerer = class {
   lua51;
   /** The source line each emitted statement came from. */
   origins = /* @__PURE__ */ new WeakMap();
+  /** The name each class written as a value is known by. */
+  classExpressionNames = /* @__PURE__ */ new WeakMap();
   run() {
     const body = this.options.module ? this.module(this.options.module) : this.topLevel(this.source.body.statements);
     const scriptArgs = this.usesScriptArgs && !this.options.module ? [local(["scriptArgs"], [this.array(table([{ type: "TableFieldPositional", value: vararg() }]))])] : [];
@@ -660,6 +674,8 @@ end`).body.statements);
       out.push(...parseLuau(`
 local function ${accessors}(target, getters, setters)
 	return ${this.builtin("setmetatable").name}(target, {
+		-- Read by a spread, which copies what the getters give.
+		__tiluaGetters = getters,
 		__index = function(self, key)
 			local get = getters[key]
 			if get ~= nil then
@@ -683,17 +699,25 @@ end`).body.statements);
     }
     const assign2 = this.helpers.get("assign");
     if (assign2) {
-      out.push(localFunction(assign2, functionBody(["target"], [
-        numericFor("i", number(1), selectCount(this.builtin("select")), [
-          local(["source"], [call(this.builtin("select"), [identifier("i"), vararg()])]),
-          ifThen(binary("~=", identifier("source"), nil()), [
-            genericFor(["key", "value"], [call(this.builtin("pairs"), [identifier("source")])], [
-              assign([index(identifier("target"), identifier("key"))], [identifier("value")])
-            ])
-          ])
-        ]),
-        returns([identifier("target")])
-      ], true)));
+      out.push(...parseLuau(`
+local function ${assign2}(target, ...)
+	for i = 1, ${this.builtin("select").name}("#", ...) do
+		local source = (${this.builtin("select").name}(i, ...))
+		if source ~= nil then
+			for key, value in ${this.builtin("pairs").name}(source) do
+				target[key] = value
+			end
+			local meta = ${this.builtin("type").name}(source) == "table" and ${this.builtin("getmetatable").name}(source) or nil
+			local getters = ${this.builtin("type").name}(meta) == "table" and ${this.builtin("rawget").name}(meta, "__tiluaGetters") or nil
+			if getters ~= nil then
+				for key, get in ${this.builtin("pairs").name}(getters) do
+					target[key] = get(source)
+				end
+			end
+		end
+	end
+	return target
+end`).body.statements);
     }
     out.push(...runtimes);
     const concat = this.helpers.get("concat");
@@ -1238,11 +1262,12 @@ end`).body.statements);
     const { build, accessors } = this.classHelpers;
     const metamethods = `{ ${CLASS_METAMETHODS.map((name) => `"${name}"`).join(", ")} }`;
     return parseLuau(`
-local function ${build}(base)
+local function ${build}(base, name)
     local class = { __getters = {}, __setters = {} }
     class.__index = class
     class.ClassObject = class
     class.ParentClass = base
+    class.name = name
     if base ~= nil then
         setmetatable(class, { __index = base })
         setmetatable(class.__getters, { __index = base.__getters })
@@ -1296,7 +1321,11 @@ end
    *  table is assigned to `self`, which a module has already declared. */
   classStatements(node, self, declare) {
     const { build, accessors } = this.classRuntime();
-    const create = call(identifier(build), [node.superclass ? this.reference(node.superclass) : nil()]);
+    const called = node.name?.name ?? (node.type === "ClassExpression" ? this.classExpressionNames.get(node) : void 0) ?? "";
+    const create = call(identifier(build), [
+      node.superclass ? this.reference(node.superclass) : nil(),
+      string(called)
+    ]);
     const out = [declare !== void 0 ? local([declare], [create]) : assign([self], [create])];
     const previous = this.classContext;
     this.classContext = node;

package/dist/cli.cjs

@@ -275,6 +275,18 @@ var Lowerer = class {
     for (const binding of scopes.bindings.values()) {
       if (binding.declarationNode) this.bindingByDeclaration.set(binding.declarationNode, binding);
     }
+    const visit = (value) => {
+      if (!value || typeof value !== "object") return;
+      if (Array.isArray(value)) return void value.forEach(visit);
+      const node = value;
+      if (node.type === "VariableDeclaration" && node.name?.type === "IdentifierPattern" && node.name.name) {
+        let init = node.init;
+        while (init?.type === "ParenthesizedExpression") init = init.expression;
+        if (init?.type === "ClassExpression") this.classExpressionNames.set(init, node.name.name);
+      }
+      for (const [key, child] of Object.entries(value)) if (key !== "line" && key !== "column") visit(child);
+    };
+    visit(source.body);
   }
   source;
   scopes;
@@ -296,6 +308,8 @@ var Lowerer = class {
   lua51;
   /** The source line each emitted statement came from. */
   origins = /* @__PURE__ */ new WeakMap();
+  /** The name each class written as a value is known by. */
+  classExpressionNames = /* @__PURE__ */ new WeakMap();
   run() {
     const body = this.options.module ? this.module(this.options.module) : this.topLevel(this.source.body.statements);
     const scriptArgs = this.usesScriptArgs && !this.options.module ? [local(["scriptArgs"], [this.array(table([{ type: "TableFieldPositional", value: vararg() }]))])] : [];
@@ -677,6 +691,8 @@ end`).body.statements);
       out2.push(...(0, import_luau_parser.parse)(`
 local function ${accessors}(target, getters, setters)
 	return ${this.builtin("setmetatable").name}(target, {
+		-- Read by a spread, which copies what the getters give.
+		__tiluaGetters = getters,
 		__index = function(self, key)
 			local get = getters[key]
 			if get ~= nil then
@@ -700,17 +716,25 @@ end`).body.statements);
     }
     const assign2 = this.helpers.get("assign");
     if (assign2) {
-      out2.push(localFunction(assign2, functionBody(["target"], [
-        numericFor("i", number(1), selectCount(this.builtin("select")), [
-          local(["source"], [call(this.builtin("select"), [identifier("i"), vararg()])]),
-          ifThen(binary("~=", identifier("source"), nil()), [
-            genericFor(["key", "value"], [call(this.builtin("pairs"), [identifier("source")])], [
-              assign([index(identifier("target"), identifier("key"))], [identifier("value")])
-            ])
-          ])
-        ]),
-        returns([identifier("target")])
-      ], true)));
+      out2.push(...(0, import_luau_parser.parse)(`
+local function ${assign2}(target, ...)
+	for i = 1, ${this.builtin("select").name}("#", ...) do
+		local source = (${this.builtin("select").name}(i, ...))
+		if source ~= nil then
+			for key, value in ${this.builtin("pairs").name}(source) do
+				target[key] = value
+			end
+			local meta = ${this.builtin("type").name}(source) == "table" and ${this.builtin("getmetatable").name}(source) or nil
+			local getters = ${this.builtin("type").name}(meta) == "table" and ${this.builtin("rawget").name}(meta, "__tiluaGetters") or nil
+			if getters ~= nil then
+				for key, get in ${this.builtin("pairs").name}(getters) do
+					target[key] = get(source)
+				end
+			end
+		end
+	end
+	return target
+end`).body.statements);
     }
     out2.push(...runtimes);
     const concat = this.helpers.get("concat");
@@ -1255,11 +1279,12 @@ end`).body.statements);
     const { build, accessors } = this.classHelpers;
     const metamethods = `{ ${CLASS_METAMETHODS.map((name) => `"${name}"`).join(", ")} }`;
     return (0, import_luau_parser.parse)(`
-local function ${build}(base)
+local function ${build}(base, name)
     local class = { __getters = {}, __setters = {} }
     class.__index = class
     class.ClassObject = class
     class.ParentClass = base
+    class.name = name
     if base ~= nil then
         setmetatable(class, { __index = base })
         setmetatable(class.__getters, { __index = base.__getters })
@@ -1313,7 +1338,11 @@ end
    *  table is assigned to `self`, which a module has already declared. */
   classStatements(node, self, declare) {
     const { build, accessors } = this.classRuntime();
-    const create = call(identifier(build), [node.superclass ? this.reference(node.superclass) : nil()]);
+    const called = node.name?.name ?? (node.type === "ClassExpression" ? this.classExpressionNames.get(node) : void 0) ?? "";
+    const create = call(identifier(build), [
+      node.superclass ? this.reference(node.superclass) : nil(),
+      string(called)
+    ]);
     const out2 = [declare !== void 0 ? local([declare], [create]) : assign([self], [create])];
     const previous = this.classContext;
     this.classContext = node;

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   bundle,
   resolveConfig
-} from "./chunk-3J2QMA4W.js";
+} from "./chunk-Y7QGXLCV.js";
 
 // src/cli.ts
 import { mkdirSync, writeFileSync } from "fs";

package/dist/index.cjs

@@ -298,6 +298,18 @@ var Lowerer = class {
     for (const binding of scopes.bindings.values()) {
       if (binding.declarationNode) this.bindingByDeclaration.set(binding.declarationNode, binding);
     }
+    const visit = (value) => {
+      if (!value || typeof value !== "object") return;
+      if (Array.isArray(value)) return void value.forEach(visit);
+      const node = value;
+      if (node.type === "VariableDeclaration" && node.name?.type === "IdentifierPattern" && node.name.name) {
+        let init = node.init;
+        while (init?.type === "ParenthesizedExpression") init = init.expression;
+        if (init?.type === "ClassExpression") this.classExpressionNames.set(init, node.name.name);
+      }
+      for (const [key, child] of Object.entries(value)) if (key !== "line" && key !== "column") visit(child);
+    };
+    visit(source.body);
   }
   source;
   scopes;
@@ -319,6 +331,8 @@ var Lowerer = class {
   lua51;
   /** The source line each emitted statement came from. */
   origins = /* @__PURE__ */ new WeakMap();
+  /** The name each class written as a value is known by. */
+  classExpressionNames = /* @__PURE__ */ new WeakMap();
   run() {
     const body = this.options.module ? this.module(this.options.module) : this.topLevel(this.source.body.statements);
     const scriptArgs = this.usesScriptArgs && !this.options.module ? [local(["scriptArgs"], [this.array(table([{ type: "TableFieldPositional", value: vararg() }]))])] : [];
@@ -700,6 +714,8 @@ end`).body.statements);
       out.push(...(0, import_luau_parser.parse)(`
 local function ${accessors}(target, getters, setters)
 	return ${this.builtin("setmetatable").name}(target, {
+		-- Read by a spread, which copies what the getters give.
+		__tiluaGetters = getters,
 		__index = function(self, key)
 			local get = getters[key]
 			if get ~= nil then
@@ -723,17 +739,25 @@ end`).body.statements);
     }
     const assign2 = this.helpers.get("assign");
     if (assign2) {
-      out.push(localFunction(assign2, functionBody(["target"], [
-        numericFor("i", number(1), selectCount(this.builtin("select")), [
-          local(["source"], [call(this.builtin("select"), [identifier("i"), vararg()])]),
-          ifThen(binary("~=", identifier("source"), nil()), [
-            genericFor(["key", "value"], [call(this.builtin("pairs"), [identifier("source")])], [
-              assign([index(identifier("target"), identifier("key"))], [identifier("value")])
-            ])
-          ])
-        ]),
-        returns([identifier("target")])
-      ], true)));
+      out.push(...(0, import_luau_parser.parse)(`
+local function ${assign2}(target, ...)
+	for i = 1, ${this.builtin("select").name}("#", ...) do
+		local source = (${this.builtin("select").name}(i, ...))
+		if source ~= nil then
+			for key, value in ${this.builtin("pairs").name}(source) do
+				target[key] = value
+			end
+			local meta = ${this.builtin("type").name}(source) == "table" and ${this.builtin("getmetatable").name}(source) or nil
+			local getters = ${this.builtin("type").name}(meta) == "table" and ${this.builtin("rawget").name}(meta, "__tiluaGetters") or nil
+			if getters ~= nil then
+				for key, get in ${this.builtin("pairs").name}(getters) do
+					target[key] = get(source)
+				end
+			end
+		end
+	end
+	return target
+end`).body.statements);
     }
     out.push(...runtimes);
     const concat = this.helpers.get("concat");
@@ -1278,11 +1302,12 @@ end`).body.statements);
     const { build, accessors } = this.classHelpers;
     const metamethods = `{ ${CLASS_METAMETHODS.map((name) => `"${name}"`).join(", ")} }`;
     return (0, import_luau_parser.parse)(`
-local function ${build}(base)
+local function ${build}(base, name)
     local class = { __getters = {}, __setters = {} }
     class.__index = class
     class.ClassObject = class
     class.ParentClass = base
+    class.name = name
     if base ~= nil then
         setmetatable(class, { __index = base })
         setmetatable(class.__getters, { __index = base.__getters })
@@ -1336,7 +1361,11 @@ end
    *  table is assigned to `self`, which a module has already declared. */
   classStatements(node, self, declare) {
     const { build, accessors } = this.classRuntime();
-    const create = call(identifier(build), [node.superclass ? this.reference(node.superclass) : nil()]);
+    const called = node.name?.name ?? (node.type === "ClassExpression" ? this.classExpressionNames.get(node) : void 0) ?? "";
+    const create = call(identifier(build), [
+      node.superclass ? this.reference(node.superclass) : nil(),
+      string(called)
+    ]);
     const out = [declare !== void 0 ? local([declare], [create]) : assign([self], [create])];
     const previous = this.classContext;
     this.classContext = node;

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tilua/compiler",
-  "version": "5.0.0",
+  "version": "5.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",
@@ -38,7 +38,7 @@
   "type": "module",
   "dependencies": {
     "luau-parser": "^1.0.3",
-    "@tilua/parser": "^5.0.0"
+    "@tilua/parser": "^5.0.1"
   },
   "devDependencies": {
     "@types/node": "^22.20.2",

package/runtime/array.luau

@@ -130,6 +130,30 @@ function __NAME__.slice(t, start, stop)
 end
 
 -- One level, as JavaScript's `flat()` does by default.
+function __NAME__.keys(t)
+	local out = __ARRAY__({})
+	for i = 1, #t do
+		out[i] = i
+	end
+	return out
+end
+
+function __NAME__.values(t)
+	local out = __ARRAY__({})
+	for i = 1, #t do
+		out[i] = t[i]
+	end
+	return out
+end
+
+function __NAME__.entries(t)
+	local out = __ARRAY__({})
+	for i = 1, #t do
+		out[i] = __ARRAY__({ i, t[i] })
+	end
+	return out
+end
+
 function __NAME__.flat(t)
 	local out = __ARRAY__({})
 	for i = 1, #t do