@thigasdevelopment/luam 0.19.10 → 0.19.12

package/luam.mjs

@@ -4427,13 +4427,16 @@ function isCallStart(stream) {
   return stream.check("punctuation", "(") || stream.check("punctuation", "{") || stream.check("string") || stream.check("template");
 }
 function parseSuffixed(stream) {
+  const checkpoint = stream.checkpoint();
   let expression = parsePrimary(stream);
+  stream.recordSpan(expression, checkpoint);
   for (; ; ) {
     const token = stream.current();
     if (token.kind === "punctuation" && token.value === ".") {
       stream.next();
       const property = stream.expectName().value;
       expression = { kind: "member-expression", object: expression, property, position: token.position };
+      stream.recordSpan(expression, checkpoint);
       continue;
     }
     if (token.kind === "punctuation" && token.value === "[") {
@@ -4441,6 +4444,7 @@ function parseSuffixed(stream) {
       const index = parseExpression(stream);
       stream.expect("punctuation", "]");
       expression = { kind: "index-expression", object: expression, index, position: token.position };
+      stream.recordSpan(expression, checkpoint);
       continue;
     }
     if (token.kind === "punctuation" && token.value === ":" && stream.checkName(1)) {
@@ -4448,11 +4452,13 @@ function parseSuffixed(stream) {
       const method = stream.next().value;
       const typeArguments2 = parseCallTypeArguments(stream);
       expression = { kind: "call-expression", callee: expression, method, typeArguments: typeArguments2, args: parseArguments(stream), position: token.position };
+      stream.recordSpan(expression, checkpoint);
       continue;
     }
     const typeArguments = parseCallTypeArguments(stream);
     if (typeArguments.length > 0 || isCallStart(stream)) {
       expression = { kind: "call-expression", callee: expression, method: null, typeArguments, args: parseArguments(stream), position: token.position };
+      stream.recordSpan(expression, checkpoint);
       continue;
     }
     return expression;
@@ -6972,7 +6978,7 @@ import { tmpdir } from "node:os";
 import { join as join2 } from "node:path";
 
 // src/cli/version.ts
-var VERSION = true ? "0.19.10" : "0.0.0-dev";
+var VERSION = true ? "0.19.12" : "0.0.0-dev";
 var PROGRAM_NAME = "luam";
 var PROGRAM_DESCRIPTION = "luam \u2014 the Luam compiler for Multi Theft Auto resources.";
 
@@ -15805,7 +15811,9 @@ function contextualFunction(type) {
 // ../mta-types/src/generated/mta-events.ts
 var SHARED_EVENTS = [];
 var SERVER_EVENTS = [
+  "onAccountCreate",
   "onAccountDataChange",
+  "onAccountRemove",
   "onBan",
   "onChatMessage",
   "onColShapeHit",
@@ -15822,12 +15830,14 @@ var SERVER_EVENTS = [
   "onElementModelChange",
   "onElementStartSync",
   "onElementStopSync",
+  "onExplosion",
   "onMarkerHit",
   "onMarkerLeave",
   "onPedDamage",
   "onPedVehicleEnter",
   "onPedVehicleExit",
   "onPedWasted",
+  "onPedWeaponReload",
   "onPedWeaponSwitch",
   "onPickupHit",
   "onPickupLeave",
@@ -15836,12 +15846,16 @@ var SERVER_EVENTS = [
   "onPlayerACInfo",
   "onPlayerBan",
   "onPlayerChangeNick",
+  "onPlayerChangesProtectedData",
+  "onPlayerChangesWorldSpecialProperty",
   "onPlayerChat",
   "onPlayerClick",
   "onPlayerCommand",
   "onPlayerConnect",
   "onPlayerContact",
   "onPlayerDamage",
+  "onPlayerDetonateSatchels",
+  "onPlayerDiscordJoin",
   "onPlayerJoin",
   "onPlayerLogin",
   "onPlayerLogout",
@@ -15854,12 +15868,17 @@ var SERVER_EVENTS = [
   "onPlayerPickupLeave",
   "onPlayerPickupUse",
   "onPlayerPrivateMessage",
+  "onPlayerProjectileCreation",
   "onPlayerQuit",
   "onPlayerResourceStart",
   "onPlayerScreenShot",
   "onPlayerSpawn",
   "onPlayerStealthKill",
   "onPlayerTarget",
+  "onPlayerTeamChange",
+  "onPlayerTeleport",
+  "onPlayerTriggerEventThreshold",
+  "onPlayerTriggerInvalidEvent",
   "onPlayerUnmute",
   "onPlayerVehicleEnter",
   "onPlayerVehicleExit",
@@ -15867,12 +15886,15 @@ var SERVER_EVENTS = [
   "onPlayerVoiceStop",
   "onPlayerWasted",
   "onPlayerWeaponFire",
+  "onPlayerWeaponReload",
   "onPlayerWeaponSwitch",
   "onResourceLoadStateChange",
   "onResourcePreStart",
   "onResourceStart",
+  "onResourceStateChange",
   "onResourceStop",
   "onSettingChange",
+  "onShutdown",
   "onTrailerAttach",
   "onTrailerDetach",
   "onUnban",
@@ -15903,6 +15925,7 @@ var CLIENT_EVENTS = [
   "onClientColShapeHit",
   "onClientColShapeLeave",
   "onClientConsole",
+  "onClientCoreCommand",
   "onClientCursorMove",
   "onClientDebugMessage",
   "onClientDoubleClick",
@@ -15945,6 +15968,7 @@ var CLIENT_EVENTS = [
   "onClientObjectMoveStart",
   "onClientObjectMoveStop",
   "onClientPaste",
+  "onClientPedChoke",
   "onClientPedDamage",
   "onClientPedHeliKilled",
   "onClientPedHitByWaterCannon",
@@ -16019,6 +16043,17 @@ var MTA_EVENTS = {
 
 // ../mta-types/src/generated/events/mta-event-signatures-server-1.ts
 var MTA_EVENT_SIGNATURES_SERVER_1 = {
+  onAccountCreate: fn(
+    [
+      named("Account")
+    ],
+    VOID,
+    1,
+    false,
+    [
+      "theAccount"
+    ]
+  ),
   onAccountDataChange: fn(
     [
       named("Account"),
@@ -16034,6 +16069,17 @@ var MTA_EVENT_SIGNATURES_SERVER_1 = {
       "theValue"
     ]
   ),
+  onAccountRemove: fn(
+    [
+      named("Account")
+    ],
+    VOID,
+    1,
+    false,
+    [
+      "theAccount"
+    ]
+  ),
   onBan: fn(
     [
       named("Ban")
@@ -16048,7 +16094,7 @@ var MTA_EVENT_SIGNATURES_SERVER_1 = {
   onChatMessage: fn(
     [
       STRING,
-      ANY
+      named("Element")
     ],
     VOID,
     2,
@@ -16100,16 +16146,22 @@ var MTA_EVENT_SIGNATURES_SERVER_1 = {
       STRING,
       NUMBER,
       STRING,
+      NUMBER,
+      NUMBER,
+      NUMBER,
       NUMBER
     ],
     VOID,
-    4,
+    7,
     false,
     [
       "message",
       "level",
       "file",
-      "line"
+      "line",
+      "r",
+      "g",
+      "b"
     ]
   ),
   onElementClicked: fn(
@@ -16206,7 +16258,11 @@ var MTA_EVENT_SIGNATURES_SERVER_1 = {
       "oldInterior",
       "newInterior"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-server-2.ts
+var MTA_EVENT_SIGNATURES_SERVER_2 = {
   onElementModelChange: fn(
     [
       NUMBER,
@@ -16241,11 +16297,24 @@ var MTA_EVENT_SIGNATURES_SERVER_1 = {
     [
       "oldSyncer"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-server-2.ts
-var MTA_EVENT_SIGNATURES_SERVER_2 = {
+  ),
+  onExplosion: fn(
+    [
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER
+    ],
+    VOID,
+    4,
+    false,
+    [
+      "x",
+      "y",
+      "z",
+      "theType"
+    ]
+  ),
   onMarkerHit: fn(
     [
       named("Element"),
@@ -16321,17 +16390,36 @@ var MTA_EVENT_SIGNATURES_SERVER_2 = {
       named("Element"),
       NUMBER,
       NUMBER,
-      BOOLEAN
+      BOOLEAN,
+      NUMBER,
+      NUMBER
     ],
     VOID,
-    5,
+    7,
     false,
     [
       "totalAmmo",
       "killer",
       "killerWeapon",
       "bodypart",
-      "stealth"
+      "stealth",
+      "animGroup",
+      "animID"
+    ]
+  ),
+  onPedWeaponReload: fn(
+    [
+      NUMBER,
+      NUMBER,
+      NUMBER
+    ],
+    VOID,
+    3,
+    false,
+    [
+      "weapon",
+      "clip",
+      "ammo"
     ]
   ),
   onPedWeaponSwitch: fn(
@@ -16386,7 +16474,11 @@ var MTA_EVENT_SIGNATURES_SERVER_2 = {
     [
       "playerWhoUsed"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-server-3.ts
+var MTA_EVENT_SIGNATURES_SERVER_3 = {
   onPlayerACInfo: fn(
     [
       TABLE,
@@ -16432,6 +16524,34 @@ var MTA_EVENT_SIGNATURES_SERVER_2 = {
       "changedByUser"
     ]
   ),
+  onPlayerChangesProtectedData: fn(
+    [
+      named("Element"),
+      STRING,
+      ANY
+    ],
+    VOID,
+    3,
+    false,
+    [
+      "element",
+      "key",
+      "value"
+    ]
+  ),
+  onPlayerChangesWorldSpecialProperty: fn(
+    [
+      STRING,
+      BOOLEAN
+    ],
+    VOID,
+    2,
+    false,
+    [
+      "property",
+      "enabled"
+    ]
+  ),
   onPlayerChat: fn(
     [
       STRING,
@@ -16469,11 +16589,7 @@ var MTA_EVENT_SIGNATURES_SERVER_2 = {
       "screenPosX",
       "screenPosY"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-server-3.ts
-var MTA_EVENT_SIGNATURES_SERVER_3 = {
+  ),
   onPlayerCommand: fn(
     [
       STRING
@@ -16536,6 +16652,26 @@ var MTA_EVENT_SIGNATURES_SERVER_3 = {
       "loss"
     ]
   ),
+  onPlayerDetonateSatchels: fn(
+    [],
+    VOID,
+    0,
+    false,
+    []
+  ),
+  onPlayerDiscordJoin: fn(
+    [
+      BOOLEAN,
+      STRING
+    ],
+    VOID,
+    2,
+    false,
+    [
+      "justConnected",
+      "key"
+    ]
+  ),
   onPlayerJoin: fn(
     [],
     VOID,
@@ -16568,7 +16704,11 @@ var MTA_EVENT_SIGNATURES_SERVER_3 = {
       "thePreviousAccount",
       "theCurrentAccount"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-server-4.ts
+var MTA_EVENT_SIGNATURES_SERVER_4 = {
   onPlayerMarkerHit: fn(
     [
       named("Marker"),
@@ -16630,7 +16770,7 @@ var MTA_EVENT_SIGNATURES_SERVER_3 = {
   ),
   onPlayerPickupHit: fn(
     [
-      ANY
+      named("Pickup")
     ],
     VOID,
     1,
@@ -16641,7 +16781,7 @@ var MTA_EVENT_SIGNATURES_SERVER_3 = {
   ),
   onPlayerPickupLeave: fn(
     [
-      ANY
+      named("Pickup")
     ],
     VOID,
     1,
@@ -16652,7 +16792,7 @@ var MTA_EVENT_SIGNATURES_SERVER_3 = {
   ),
   onPlayerPickupUse: fn(
     [
-      ANY
+      named("Pickup")
     ],
     VOID,
     1,
@@ -16664,14 +16804,49 @@ var MTA_EVENT_SIGNATURES_SERVER_3 = {
   onPlayerPrivateMessage: fn(
     [
       STRING,
-      named("Player")
+      named("Player"),
+      STRING
     ],
     VOID,
-    2,
+    3,
     false,
     [
-      "message",
-      "recipient"
+      "fullMessage",
+      "recipient",
+      "content"
+    ]
+  ),
+  onPlayerProjectileCreation: fn(
+    [
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      named("Element"),
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER
+    ],
+    VOID,
+    12,
+    false,
+    [
+      "weaponType",
+      "x",
+      "y",
+      "z",
+      "force",
+      "target",
+      "rotX",
+      "rotY",
+      "rotZ",
+      "velX",
+      "velY",
+      "velZ"
     ]
   ),
   onPlayerQuit: fn(
@@ -16699,11 +16874,7 @@ var MTA_EVENT_SIGNATURES_SERVER_3 = {
     [
       "loadedResource"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-server-4.ts
-var MTA_EVENT_SIGNATURES_SERVER_4 = {
+  ),
   onPlayerScreenShot: fn(
     [
       named("Resource"),
@@ -16758,7 +16929,11 @@ var MTA_EVENT_SIGNATURES_SERVER_4 = {
     [
       "targetPlayer"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-server-5.ts
+var MTA_EVENT_SIGNATURES_SERVER_5 = {
   onPlayerTarget: fn(
     [
       named("Element")
@@ -16770,6 +16945,66 @@ var MTA_EVENT_SIGNATURES_SERVER_4 = {
       "targettedElement"
     ]
   ),
+  onPlayerTeamChange: fn(
+    [
+      named("Team"),
+      named("Team")
+    ],
+    VOID,
+    2,
+    false,
+    [
+      "oldTeam",
+      "newTeam"
+    ]
+  ),
+  onPlayerTeleport: fn(
+    [
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER,
+      NUMBER
+    ],
+    VOID,
+    6,
+    false,
+    [
+      "previousX",
+      "previousY",
+      "previousZ",
+      "currentX",
+      "currentY",
+      "currentZ"
+    ]
+  ),
+  onPlayerTriggerEventThreshold: fn(
+    [
+      STRING
+    ],
+    VOID,
+    1,
+    false,
+    [
+      "eventName"
+    ]
+  ),
+  onPlayerTriggerInvalidEvent: fn(
+    [
+      STRING,
+      BOOLEAN,
+      BOOLEAN
+    ],
+    VOID,
+    3,
+    false,
+    [
+      "eventName",
+      "isAdded",
+      "isRemote"
+    ]
+  ),
   onPlayerUnmute: fn(
     [],
     VOID,
@@ -16829,17 +17064,21 @@ var MTA_EVENT_SIGNATURES_SERVER_4 = {
       named("Element"),
       NUMBER,
       NUMBER,
-      BOOLEAN
+      BOOLEAN,
+      NUMBER,
+      NUMBER
     ],
     VOID,
-    5,
+    7,
     false,
     [
       "totalAmmo",
       "killer",
       "killerWeapon",
       "bodypart",
-      "stealth"
+      "stealth",
+      "animGroup",
+      "animID"
     ]
   ),
   onPlayerWeaponFire: fn(
@@ -16857,7 +17096,7 @@ var MTA_EVENT_SIGNATURES_SERVER_4 = {
     8,
     false,
     [
-      "weapon",
+      "weaponID",
       "endX",
       "endY",
       "endZ",
@@ -16867,6 +17106,21 @@ var MTA_EVENT_SIGNATURES_SERVER_4 = {
       "startZ"
     ]
   ),
+  onPlayerWeaponReload: fn(
+    [
+      NUMBER,
+      NUMBER,
+      NUMBER
+    ],
+    VOID,
+    3,
+    false,
+    [
+      "weapon",
+      "ammoInClip",
+      "ammo"
+    ]
+  ),
   onPlayerWeaponSwitch: fn(
     [
       NUMBER,
@@ -16894,7 +17148,11 @@ var MTA_EVENT_SIGNATURES_SERVER_4 = {
       "oldState",
       "newState"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-server-6.ts
+var MTA_EVENT_SIGNATURES_SERVER_6 = {
   onResourcePreStart: fn(
     [
       named("Resource")
@@ -16916,11 +17174,22 @@ var MTA_EVENT_SIGNATURES_SERVER_4 = {
     [
       "startedResource"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-server-5.ts
-var MTA_EVENT_SIGNATURES_SERVER_5 = {
+  ),
+  onResourceStateChange: fn(
+    [
+      named("Resource"),
+      STRING,
+      STRING
+    ],
+    VOID,
+    3,
+    false,
+    [
+      "changedResource",
+      "oldState",
+      "newState"
+    ]
+  ),
   onResourceStop: fn(
     [
       named("Resource"),
@@ -16949,6 +17218,19 @@ var MTA_EVENT_SIGNATURES_SERVER_5 = {
       "newValue"
     ]
   ),
+  onShutdown: fn(
+    [
+      named("Resource"),
+      STRING
+    ],
+    VOID,
+    2,
+    false,
+    [
+      "theResource",
+      "reason"
+    ]
+  ),
   onTrailerAttach: fn(
     [
       named("Vehicle")
@@ -17028,11 +17310,17 @@ var MTA_EVENT_SIGNATURES_SERVER_5 = {
     ]
   ),
   onVehicleExplode: fn(
-    [],
+    [
+      BOOLEAN,
+      named("Player")
+    ],
     VOID,
-    0,
+    2,
     false,
-    []
+    [
+      "withExplosion",
+      "player"
+    ]
   ),
   onVehicleRespawn: fn(
     [
@@ -17153,7 +17441,7 @@ var MTA_EVENT_SIGNATURES_CLIENT_1 = {
     false,
     [
       "URL",
-      "isMain"
+      "isMainFrame"
     ]
   ),
   onClientBrowserNavigate: fn(
@@ -17319,6 +17607,17 @@ var MTA_EVENT_SIGNATURES_CLIENT_1 = {
 
 // ../mta-types/src/generated/events/mta-event-signatures-client-2.ts
 var MTA_EVENT_SIGNATURES_CLIENT_2 = {
+  onClientCoreCommand: fn(
+    [
+      STRING
+    ],
+    VOID,
+    1,
+    false,
+    [
+      "command"
+    ]
+  ),
   onClientCursorMove: fn(
     [
       NUMBER,
@@ -17531,18 +17830,18 @@ var MTA_EVENT_SIGNATURES_CLIENT_2 = {
     [
       "editBox"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-client-3.ts
+var MTA_EVENT_SIGNATURES_CLIENT_3 = {
   onClientGUIBlur: fn(
     [],
     VOID,
     0,
     false,
     []
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-client-3.ts
-var MTA_EVENT_SIGNATURES_CLIENT_3 = {
+  ),
   onClientGUIChanged: fn(
     [
       named("Element")
@@ -17739,7 +18038,11 @@ var MTA_EVENT_SIGNATURES_CLIENT_3 = {
       "absoluteY",
       "leftGUI"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-client-4.ts
+var MTA_EVENT_SIGNATURES_CLIENT_4 = {
   onClientMouseLeave: fn(
     [
       NUMBER,
@@ -17754,11 +18057,7 @@ var MTA_EVENT_SIGNATURES_CLIENT_3 = {
       "absoluteY",
       "enteredGUI"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-client-4.ts
-var MTA_EVENT_SIGNATURES_CLIENT_4 = {
+  ),
   onClientMouseMove: fn(
     [
       NUMBER,
@@ -17843,6 +18142,19 @@ var MTA_EVENT_SIGNATURES_CLIENT_4 = {
       "clipboardText"
     ]
   ),
+  onClientPedChoke: fn(
+    [
+      NUMBER,
+      named("Ped")
+    ],
+    VOID,
+    2,
+    false,
+    [
+      "weaponID",
+      "responsiblePed"
+    ]
+  ),
   onClientPedDamage: fn(
     [
       named("Element"),
@@ -17940,9 +18252,13 @@ var MTA_EVENT_SIGNATURES_CLIENT_4 = {
       "killer",
       "weapon",
       "bodypart",
-      "loss"
+      "lossOrStealth"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-client-5.ts
+var MTA_EVENT_SIGNATURES_CLIENT_5 = {
   onClientPedWeaponFire: fn(
     [
       NUMBER,
@@ -17978,11 +18294,7 @@ var MTA_EVENT_SIGNATURES_CLIENT_4 = {
       "thePlayer",
       "matchingDimension"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-client-5.ts
-var MTA_EVENT_SIGNATURES_CLIENT_5 = {
+  ),
   onClientPickupLeave: fn(
     [
       named("Player"),
@@ -18174,7 +18486,11 @@ var MTA_EVENT_SIGNATURES_CLIENT_5 = {
     [
       "stuntType"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-client-6.ts
+var MTA_EVENT_SIGNATURES_CLIENT_6 = {
   onClientPlayerTarget: fn(
     [
       named("Element")
@@ -18198,11 +18514,7 @@ var MTA_EVENT_SIGNATURES_CLIENT_5 = {
       "theVehicle",
       "seat"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-client-6.ts
-var MTA_EVENT_SIGNATURES_CLIENT_6 = {
+  ),
   onClientPlayerVehicleExit: fn(
     [
       named("Vehicle"),
@@ -18257,16 +18569,20 @@ var MTA_EVENT_SIGNATURES_CLIENT_6 = {
       named("Element"),
       NUMBER,
       NUMBER,
-      BOOLEAN
+      BOOLEAN,
+      NUMBER,
+      NUMBER
     ],
     VOID,
-    4,
+    6,
     false,
     [
       "killer",
       "weapon",
       "bodypart",
-      "stealth"
+      "stealth",
+      "animGroup",
+      "animID"
     ]
   ),
   onClientPlayerWeaponFire: fn(
@@ -18389,7 +18705,11 @@ var MTA_EVENT_SIGNATURES_CLIENT_6 = {
     [
       "didClearRenderTargets"
     ]
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-client-7.ts
+var MTA_EVENT_SIGNATURES_CLIENT_7 = {
   onClientSoundBeat: fn(
     [
       NUMBER
@@ -18422,11 +18742,7 @@ var MTA_EVENT_SIGNATURES_CLIENT_6 = {
     [
       "length"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-client-7.ts
-var MTA_EVENT_SIGNATURES_CLIENT_7 = {
+  ),
   onClientSoundStarted: fn(
     [
       STRING
@@ -18532,7 +18848,7 @@ var MTA_EVENT_SIGNATURES_CLIENT_7 = {
     [
       "theHitElement",
       "damageImpulseMag",
-      "bodypart",
+      "bodyPart",
       "collisionX",
       "collisionY",
       "collisionZ",
@@ -18616,7 +18932,11 @@ var MTA_EVENT_SIGNATURES_CLIENT_7 = {
     0,
     false,
     []
-  ),
+  )
+};
+
+// ../mta-types/src/generated/events/mta-event-signatures-client-8.ts
+var MTA_EVENT_SIGNATURES_CLIENT_8 = {
   onClientVehicleStartEnter: fn(
     [
       named("Ped"),
@@ -18646,11 +18966,7 @@ var MTA_EVENT_SIGNATURES_CLIENT_7 = {
       "seat",
       "door"
     ]
-  )
-};
-
-// ../mta-types/src/generated/events/mta-event-signatures-client-8.ts
-var MTA_EVENT_SIGNATURES_CLIENT_8 = {
+  ),
   onClientVehicleWeaponHit: fn(
     [
       NUMBER,
@@ -18731,7 +19047,8 @@ var MTA_EVENT_SIGNATURES = {
     ...MTA_EVENT_SIGNATURES_SERVER_2,
     ...MTA_EVENT_SIGNATURES_SERVER_3,
     ...MTA_EVENT_SIGNATURES_SERVER_4,
-    ...MTA_EVENT_SIGNATURES_SERVER_5
+    ...MTA_EVENT_SIGNATURES_SERVER_5,
+    ...MTA_EVENT_SIGNATURES_SERVER_6
   },
   client: {
     ...MTA_EVENT_SIGNATURES_CLIENT_1,
@@ -21909,14 +22226,15 @@ function canonicalEdit(input, statement, span) {
   if (trimmed.length === 0) {
     return erasedEdit(source, span);
   }
-  const authored = source.slice(span.start, span.end);
-  const replacement = reindent(trimmed, indentOf(source, span.start));
+  const end = erasedEnd(source, span);
+  const authored = source.slice(span.start, end);
+  const replacement = `${reindent(trimmed, indentOf(source, span.start))}${source.slice(span.end, end).trim()}`;
   const missing2 = lineCount2(authored) - lineCount2(replacement);
   if (missing2 < 0 && input.development) {
     return null;
   }
-  const padded = missing2 > 0 && source.slice(span.end).trim().length > 0 ? `${replacement}${"\n".repeat(missing2)}` : replacement;
-  return { start: span.start, end: span.end, replacement: padded, lines: emitted2.lines };
+  const padded = missing2 > 0 && source.slice(end).trim().length > 0 ? `${replacement}${"\n".repeat(missing2)}` : replacement;
+  return { start: span.start, end, replacement: padded, lines: emitted2.lines };
 }
 
 // ../compiler/src/emitter/preserve-decorators.ts
@@ -22059,7 +22377,11 @@ function selfEdit(source, member, span) {
   return { start: parenthesis + 1, end: parenthesis + 1, replacement: "self" };
 }
 function isKept(member) {
-  return !isLazyField(member) && (member.kind === "class-method" || member.value !== null);
+  return !isLazyField(member);
+}
+function declaredFieldEdit(source, member, end, separator) {
+  const start = member.position.offset;
+  return { start, end, replacement: `${member.name} = nil${separator}${blankSpan(source.slice(start, end))}` };
 }
 function isLazyField(member) {
   return member.kind === "class-field" && member.decorators.some((decorator) => decorator.name === "Lazy");
@@ -22120,6 +22442,13 @@ function classEdits(input, statement, spans) {
       edits.push({ start: span.start, end, replacement: isLazyField(member) ? longComment(text) : blankSpan(text) });
       continue;
     }
+    const needsSeparator2 = separator === null && (member !== kept[kept.length - 1] || injected !== null);
+    if (member.kind === "class-field" && member.value === null) {
+      const end = separator === null ? span.end : separator + 1;
+      const written = separator === null ? needsSeparator2 ? "," : "" : source.slice(separator, separator + 1);
+      edits.push(declaredFieldEdit(source, member, end, written));
+      continue;
+    }
     if (member.kind === "class-method" && !member.isStatic) {
       const self = selfEdit(source, member, span);
       if (self === null) {
@@ -22127,7 +22456,7 @@ function classEdits(input, statement, spans) {
       }
       edits.push(self);
     }
-    if (separator === null && (member !== kept[kept.length - 1] || injected !== null)) {
+    if (needsSeparator2) {
       edits.push({ start: span.end, end: span.end, replacement: "," });
     }
   }
@@ -22146,6 +22475,99 @@ function classEdits(input, statement, spans) {
   return edits;
 }
 
+// ../compiler/src/emitter/preserve-expressions.ts
+function children(expression) {
+  switch (expression.kind) {
+    case "member-expression":
+      return [expression.object];
+    case "index-expression":
+      return [expression.object, expression.index];
+    case "call-expression":
+      return [expression.callee, ...expression.args];
+    case "new-expression":
+      return [...expression.args];
+    case "table-expression":
+      return expression.fields.flatMap((field2) => field2.key === null ? [field2.value] : [field2.key, field2.value]);
+    case "binary-expression":
+      return [expression.left, expression.right];
+    case "unary-expression":
+      return [expression.operand];
+    case "group-expression":
+      return [expression.expression];
+    default:
+      return [];
+  }
+}
+function isOwnFailure(expression, types, statics) {
+  switch (expression.kind) {
+    case "template-literal":
+    case "new-expression":
+      return true;
+    case "member-expression":
+      return statics.has(expression) || resolvePropertyExtension(types.get(expression.object) ?? null, expression.property) !== null;
+    case "call-expression":
+      if (expression.method === null && expression.callee.kind === "identifier" && expression.callee.name === "super") {
+        return true;
+      }
+      return expression.callee.kind === "member-expression" && resolveCallExtension(types.get(expression.callee.object) ?? null, expression.callee.property) !== null;
+    default:
+      return false;
+  }
+}
+function holdsFunction(expression) {
+  return expression.kind === "function-expression" || children(expression).some(holdsFunction);
+}
+function collect2(input, expression, found) {
+  if (isPreservableExpression(expression, input.types, input.staticAccess)) {
+    return true;
+  }
+  if (isOwnFailure(expression, input.types, input.staticAccess)) {
+    found.push(expression);
+    return true;
+  }
+  return children(expression).every((child) => collect2(input, child, found));
+}
+function statementExpressions3(statement) {
+  switch (statement.kind) {
+    case "local-statement":
+      return [...statement.values];
+    case "assignment-statement":
+      return statement.operator === "=" ? [...statement.targets, ...statement.values] : null;
+    case "call-statement":
+      return [statement.expression];
+    case "return-statement":
+      return [...statement.values];
+    case "if-statement":
+      return statement.clauses.map((clause) => clause.condition);
+    default:
+      return null;
+  }
+}
+function expressionEdits(input, statement) {
+  const slots = input.development ? statementExpressions3(statement) : null;
+  if (slots === null) {
+    return null;
+  }
+  const found = [];
+  if (!slots.every((slot) => collect2(input, slot, found)) || found.length === 0) {
+    return null;
+  }
+  const edits = [];
+  for (const expression of found) {
+    const span = input.spans.get(expression);
+    if (span === void 0 || holdsFunction(expression)) {
+      return null;
+    }
+    const state = createEmitState(input.types, input.references, input.generatedMembers, input.staticAccess);
+    const replacement = emitExpression(state, expression);
+    if (replacement.includes("\n") || input.source.slice(span.start, span.end).includes("\n")) {
+      return null;
+    }
+    edits.push({ start: span.start, end: span.end, replacement });
+  }
+  return edits;
+}
+
 // ../compiler/src/emitter/preserve-loops.ts
 var BREAK_KEYWORD = "break";
 var CONTINUE_KEYWORD = "continue";
@@ -22263,8 +22685,11 @@ function visit(collector, statement, wrapped) {
     descend(collector, statement, false, surgical.wrapsBody);
     return;
   }
-  if (isPreservableStatement(statement, collector.input.types, collector.input.staticAccess) && keepsScaffolding(statement)) {
+  const preservable = isPreservableStatement(statement, collector.input.types, collector.input.staticAccess);
+  const narrowed = preservable ? null : expressionEdits(collector.input, statement);
+  if ((preservable || narrowed !== null) && keepsScaffolding(statement)) {
     const inherited = statement.kind === "do-statement" || statement.kind === "if-statement" ? wrapped : false;
+    collector.edits.push(...narrowed ?? []);
     descend(collector, statement, inherited, false);
     return;
   }

package/package.json

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