@thigasdevelopment/luam 0.10.1 → 0.10.3

package/luam.mjs

@@ -4836,6 +4836,19 @@ function createObjectType(members) {
   );
   return createRecord(keys.length === 0 ? "{}" : `{ ${keys.join(", ")} }`, members);
 }
+function createLiteralRecord(members) {
+  const literal = createObjectType(members);
+  return literal.kind === "record" ? { ...literal, isLiteral: true } : literal;
+}
+function isEmptyLiteral(type) {
+  return type.kind === "record" && type.isLiteral === true && type.members.size === 0;
+}
+function widenInferred(type) {
+  if (type.kind !== "record" || type.isLiteral !== true) {
+    return widenLiteral(type);
+  }
+  return type.members.size === 0 ? TABLE_TYPE : createRecord(type.name, type.members, type.origin);
+}
 function createFunction(parameters, returnType, minimumArguments2, isVariadic = false) {
   return { kind: "function", parameters, returnType, minimumArguments: minimumArguments2 ?? parameters.length, isVariadic };
 }
@@ -5034,7 +5047,7 @@ function isAssignable(source, target, options = { allowNil: false }) {
     return source.kind === "record" ? isRecordAssignable(source, target, options) : source.kind === "table";
   }
   if (target.kind === "array") {
-    return source.kind === "table" || source.kind === "array" && isAssignable(source.element, target.element, options);
+    return source.kind === "table" || isEmptyLiteral(source) || source.kind === "array" && isAssignable(source.element, target.element, options);
   }
   if (target.kind === "map") {
     return isMapAssignable(source, target, options);
@@ -6037,7 +6050,7 @@ import { tmpdir } from "node:os";
 import { join as join2 } from "node:path";
 
 // src/cli/version.ts
-var VERSION = true ? "0.10.1" : "0.0.0-dev";
+var VERSION = true ? "0.10.3" : "0.0.0-dev";
 var PROGRAM_NAME = "luam";
 var PROGRAM_DESCRIPTION = "luam \u2014 the Luam compiler for Multi Theft Auto resources.";
 
@@ -8338,11 +8351,11 @@ var MTA_SETTINGS_SERVER = {
 
 // ../mta-types/src/generated/api/mta-sql-server.ts
 var MTA_SQL_SERVER = {
-  dbConnect: fn([STRING, STRING, STRING, STRING, STRING], named("Element"), 2),
-  dbExec: fn([named("Element"), STRING, ANY], BOOLEAN, 2, true),
+  dbConnect: fn([STRING, STRING, STRING, STRING, STRING], named("Connection"), 2),
+  dbExec: fn([named("Connection"), STRING, ANY], BOOLEAN, 2, true),
   dbFree: fn([ANY], BOOLEAN, 1),
   dbPoll: fn([ANY, NUMBER, BOOLEAN], TABLE, 2),
-  dbPrepareString: fn([named("Element"), STRING, ANY], STRING, 2, true),
+  dbPrepareString: fn([named("Connection"), STRING, ANY], STRING, 2, true),
   dbQuery: fn([ANY, ANY, ANY, ANY, ANY], ANY, 2, true),
   executeSQLQuery: fn([STRING, ANY], TABLE, 1, true)
 };
@@ -9410,6 +9423,17 @@ var MTA_OOP_1 = [
     ],
     null
   ),
+  oopClass(
+    "Connection",
+    null,
+    [
+      oopMethod("exec", "server", "dbExec", fn([STRING, ANY], BOOLEAN, 1, true)),
+      oopMethod("prepareString", "server", "dbPrepareString", fn([STRING, ANY], STRING, 1, true)),
+      oopMethod("query", "server", "dbQuery", fn([ANY, ANY, ANY, ANY, ANY], ANY, 2, true))
+    ],
+    [],
+    oopConstructor("server", fn([STRING, STRING, STRING, STRING, STRING], named("Connection"), 2))
+  ),
   oopClass(
     "DxFont",
     null,
@@ -10090,7 +10114,7 @@ var MTA_OOP_4 = [
       oopMethod("toggleRespawn", "client", "toggleObjectRespawn", fn([BOOLEAN], BOOLEAN, 1))
     ],
     [],
-    oopConstructor("shared", fn([NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, BOOLEAN], named("MTASAObject"), 4))
+    oopConstructor("shared", fn([NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, BOOLEAN], named("Object"), 4))
   ),
   oopClass("Ped", "Element", [
     oopMethod("addClothes", "shared", "addPedClothes", fn([STRING, STRING, NUMBER], BOOLEAN, 3)),
@@ -11074,6 +11098,55 @@ function mtaMember(className, member) {
   return mtaClassRegistry().lookupMember(className, member);
 }
 
+// ../compiler/src/checker/shape-hint.ts
+function matchesDiscriminants(source, candidate) {
+  for (const [name, member] of candidate.members) {
+    const written = source.members.get(name);
+    if (!isLiteralType(member) || written === void 0) {
+      continue;
+    }
+    if (!isAssignable(written, member)) {
+      return false;
+    }
+  }
+  return true;
+}
+function chooseCandidate(source, candidates) {
+  const [only] = candidates;
+  if (candidates.length === 1 && only !== void 0) {
+    return only;
+  }
+  const matching = candidates.filter((candidate) => matchesDiscriminants(source, candidate));
+  const [best] = matching;
+  return matching.length === 1 && best !== void 0 ? best : null;
+}
+function missingKeys(source, target) {
+  const missing = [];
+  for (const [name, member] of target.members) {
+    if (member.kind !== "optional" && !source.members.has(name)) {
+      missing.push(`"${name}"`);
+    }
+  }
+  return missing;
+}
+function missingKeyHint(source, target) {
+  if (source.kind !== "record" || source.isLiteral !== true) {
+    return "";
+  }
+  const options = target.kind === "union" ? target.options : [target];
+  const candidates = options.filter((option) => option.kind === "record");
+  const candidate = chooseCandidate(source, candidates);
+  if (candidate === null) {
+    return "";
+  }
+  const missing = missingKeys(source, candidate);
+  if (missing.length === 0) {
+    return "";
+  }
+  const label2 = missing.length === 1 ? `Key ${missing[0]} is` : `Keys ${missing.join(", ")} are`;
+  return ` ${label2} missing from "${typeToString(candidate)}".`;
+}
+
 // ../compiler/src/checker/type-intersection.ts
 function namedMembers(context, name) {
   if (context.declarations.lookupInterface(name) === null && context.declarations.lookupClass(name) === null) {
@@ -11297,7 +11370,7 @@ var CheckContext = class {
     return this.returnStack[this.returnStack.length - 1]?.expected ?? null;
   }
   inferReturnType(type) {
-    this.returnStack[this.returnStack.length - 1]?.inferred.push(widenLiteral(type));
+    this.returnStack[this.returnStack.length - 1]?.inferred.push(widenInferred(type));
   }
   pushClassMethod(frame) {
     this.methodStack.push(frame);
@@ -11358,7 +11431,8 @@ var CheckContext = class {
     }
     const received = isLiteralType(target) || target.kind === "union" ? source : widenLiteral(source);
     const message = `${subject} expects "${typeToString(target)}" but received "${typeToString(received)}".`;
-    this.report("check-type-mismatch", `${message}${nilHint(source, target, this.mode)}`, position2);
+    const hint = `${nilHint(source, target, this.mode)}${missingKeyHint(source, target)}`;
+    this.report("check-type-mismatch", `${message}${hint}`, position2);
   }
   declareProject(project) {
     for (const declaration of project.globals) {
@@ -12096,6 +12170,7 @@ var ELEMENT_TYPES = [
   { name: "Browser", parent: "Element" },
   { name: "Camera", parent: "Element" },
   { name: "ColShape", parent: "Element" },
+  { name: "Connection", parent: null },
   { name: "DxFont", parent: null },
   { name: "DxRenderTarget", parent: null },
   { name: "DxScreenSource", parent: null },
@@ -12600,8 +12675,18 @@ function checkTable(context, expression) {
     }
     return checkExpression(context, field2.value);
   });
+  const isRecord = expression.fields.every((field2) => field2.name !== null);
+  if (isRecord) {
+    const members = /* @__PURE__ */ new Map();
+    expression.fields.forEach((field2, index) => {
+      if (field2.name !== null) {
+        members.set(field2.name, valueTypes[index] ?? ANY_TYPE);
+      }
+    });
+    return context.record(expression, createLiteralRecord(members));
+  }
   const isArray = expression.fields.every((field2) => field2.key === null && field2.name === null);
-  if (!isArray || valueTypes.length === 0) {
+  if (!isArray) {
     return context.record(expression, TABLE_TYPE);
   }
   return context.record(expression, createArray(createUnion(valueTypes)));
@@ -13173,7 +13258,7 @@ function checkLocal(context, statement) {
     const valueType = valueTypes[index] ?? NIL_TYPE;
     context.forgetNarrowing(declaration.name);
     if (declaration.annotation === null) {
-      const inferred = context.allowNil || value === void 0 ? ANY_TYPE : widenLiteral(valueType);
+      const inferred = context.allowNil || value === void 0 ? ANY_TYPE : widenInferred(valueType);
       context.binder.declare({ name: declaration.name, type: inferred, isLocal: true, position: declaration.position });
       return;
     }

package/package.json

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