@thigasdevelopment/luam 0.6.0 → 0.8.0

package/luam.mjs

@@ -4328,7 +4328,7 @@ function parseClassMethod(stream, token, decorators) {
     position: token.position
   };
 }
-function parseLegacyClassMethod(stream, token, decorators) {
+function parseBraceClassMethod(stream, token, decorators) {
   const parameters = parseParameters(stream);
   const returnAnnotation = parseOptionalAnnotation(stream);
   const body = parseBraceBlock(stream);
@@ -4359,7 +4359,8 @@ function parseClassMember(stream) {
   const decorators = parseDecorators(stream);
   const token = stream.expectName();
   if (stream.check("punctuation", "(")) {
-    return parseLegacyClassMethod(stream, token, decorators);
+    stream.report("parse-class-method-form", `Write class member "${token.value}" as "${token.value} = function (...) ... end".`, token.position);
+    return parseBraceClassMethod(stream, token, decorators);
   }
   if (stream.check("operator", "=") && stream.checkAhead(1, "keyword", "function")) {
     return parseClassMethod(stream, token, decorators);
@@ -5943,7 +5944,7 @@ import { tmpdir } from "node:os";
 import { join as join2 } from "node:path";
 
 // src/cli/version.ts
-var VERSION = true ? "0.6.0" : "0.0.0-dev";
+var VERSION = true ? "0.8.0" : "0.0.0-dev";
 var PROGRAM_NAME = "luam";
 var PROGRAM_DESCRIPTION = "luam \u2014 the Luam compiler for Multi Theft Auto resources.";
 
@@ -11781,6 +11782,11 @@ function scopeLabel(environment) {
   return environment === "shared" ? "shared" : `${environment}-only`;
 }
 function checkGlobalReference(context, name, position2) {
+  if (name === "self") {
+    const message2 = 'A "self" is only bound inside a class method or a "function Name:method()"; here it reads a global that is "nil".';
+    context.report("check-invalid-self", message2, position2);
+    return;
+  }
   const project = context.projectEnvironmentOf(name);
   if (project !== null) {
     const message2 = `"${name}" is declared by the project, is ${scopeLabel(project)}, and is not available in a "${context.environment}" file.`;
@@ -12426,6 +12432,13 @@ function fieldType(context, member) {
   }
   return declared;
 }
+function checkFieldName(context, member) {
+  if (member.name !== "constructor") {
+    return;
+  }
+  const message = 'A "constructor" is the class constructor, not a field. Write it as "constructor = function (...) ... end" or rename the field.';
+  context.report("check-invalid-constructor", message, member.position);
+}
 function generatedMethodType(member, fieldTypes) {
   const fieldType2 = [...fieldTypes].find(([field2]) => field2.position.offset === member.position.offset)?.[1] ?? ANY_TYPE;
   return member.parameters.length === 0 ? createFunction([], fieldType2) : createFunction([fieldType2], VOID_TYPE);
@@ -12434,6 +12447,7 @@ function registerMembers(context, info, statement) {
   const fieldTypes = /* @__PURE__ */ new Map();
   for (const member of statement.members) {
     if (member.kind === "class-field") {
+      checkFieldName(context, member);
       fieldTypes.set(member, fieldType(context, member));
     }
   }
@@ -13187,9 +13201,9 @@ function containsJump(body, kind) {
     return inClause || statement.alternate !== null && containsJump(statement.alternate, kind);
   });
 }
-function emitNested(state, body, wrapped2) {
+function emitNested(state, body, wrapped) {
   const previous = state.loopWrap;
-  state.loopWrap = wrapped2;
+  state.loopWrap = wrapped;
   try {
     return emitBlock(state, body);
   } finally {
@@ -13858,10 +13872,9 @@ function collectBundles(helpers, scripts, pinned) {
     return members.length === 0 ? [] : [{ path: bundlePath(environment), environment, members }];
   });
 }
-function wrapped(content) {
-  return `do
-${content}${content.length > 0 && !content.endsWith("\n") ? "\n" : ""}end
-`;
+function terminated(content) {
+  return content.length > 0 && !content.endsWith("\n") ? `${content}
+` : content;
 }
 function newlineCount(value) {
   return value.match(/\n/g)?.length ?? 0;
@@ -13875,9 +13888,9 @@ function materializeBundle(bundle, resolveHelper) {
   let generatedStartLine = 1;
   for (const member of bundle.members) {
     const content = member.kind === "helper" ? resolveHelper(member.helper) : member.module.content;
-    const block = wrapped(content);
+    const block = terminated(content);
     const generatedEndLine = generatedStartLine + newlineCount(block) - 1;
-    const contentStartLine = generatedStartLine + 1;
+    const contentStartLine = generatedStartLine;
     const contentEndLine = contentStartLine + contentLineCount(content) - 1;
     const source = member.kind === "helper" ? member.helper.file : member.module.source;
     const lines = member.kind === "helper" ? [] : member.module.lines ?? [];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@thigasdevelopment/luam",
-    "version": "0.6.0",
+    "version": "0.8.0",
     "description": "The Luam compiler for Multi Theft Auto resources.",
     "keywords": [
         "mta",