@nativewrappers/redm 0.0.161 → 0.0.163

package/common/Command.d.ts

@@ -1,7 +1,11 @@
 type Restricted = boolean | string | string[];
-export interface ParameterTypes {
+export interface ParameterTypeOverrides {
+}
+export interface ParameterTypes extends ParameterTypeOverrides {
     number: number;
-    playerId: number;
+    playerId: ParameterTypeOverrides extends {
+        playerId: infer T;
+    } ? T : number;
     string: string;
     longString: string;
 }
@@ -15,7 +19,7 @@ interface Parameter {
 type MappedParameters<T extends Parameter[]> = {
     [K in T[number] as K["name"]]: ParameterTypes[K["type"]];
 } & {
-    source: number;
+    source: ParameterTypes["playerId"];
     raw: string;
 };
 type CommandHandler<T extends Parameter[]> = (args: MappedParameters<T>) => void | Promise<void>;

package/common/Command.js

@@ -27,7 +27,7 @@ function registerCommand(name, commandHandler, restricted = true) {
     }
     if (Array.isArray(restricted)) {
       for (const principal of restricted) {
-        if (!IsPrincipalAceAllowed(principal, ace)) ExecuteCommand(`add_ace ${restricted} ${ace} allow`);
+        if (!IsPrincipalAceAllowed(principal, ace)) ExecuteCommand(`add_ace ${principal} ${ace} allow`);
       }
     }
   }
@@ -52,15 +52,15 @@ registerParameterType("string", (arg) => {
   $CLIENT: if (GlobalData.IS_CLIENT) {
     registerParameterType("playerId", (arg) => {
       const isMe = arg === "me";
-      const target = isMe ? GetPlayerServerId(PlayerId()) : parseInt(arg, 10);
+      if (isMe) {
+        return GetPlayerServerId(PlayerId());
+      }
+      const target = parseInt(arg, 10);
       if (Number.isNaN(target)) {
         throw new TypeError(`could not parse argument into a valid playerId`);
       }
-      if (isMe) {
-        return target;
-      }
       if (GetPlayerFromServerId(target) === -1) {
-        throw new Error(`player with server id $${target} didn't exist`);
+        throw new Error(`player with server id ${target} didn't exist`);
       }
       return target;
     });
@@ -68,12 +68,15 @@ registerParameterType("string", (arg) => {
   }
   $SERVER: {
     registerParameterType("playerId", (arg, { source: source2 }) => {
-      const target = arg === "me" ? source2 : parseInt(arg, 10);
+      if (arg === "me") {
+        return source2;
+      }
+      const target = parseInt(arg, 10);
       if (Number.isNaN(target)) {
         throw new TypeError(`could not parse argument into a valid playerId`);
       }
       if (!DoesPlayerExist(target)) {
-        throw new Error(`player at ${source2} didn't exist`);
+        throw new Error(`player at ${target} didn't exist`);
       }
       return target;
     });
@@ -135,15 +138,17 @@ class Command {
    * @returns A mapped object containing parsed parameters.
    */
   mapArguments(source2, args, raw) {
-    const mapped = {
+    const defaultContextObject = {
       source: source2,
       raw
     };
-    if (!this.params) return mapped;
-    const defaultContextObject = {
-      source: source2,
+    const parser = commandTypeParserRegistry.get("playerId");
+    const parsedSource = parser ? parser("me", defaultContextObject) : source2;
+    const mapped = {
+      source: parsedSource,
       raw
     };
+    if (!this.params) return mapped;
     const result = this.params.every((param, index) => {
       const arg = args[index];
       let value = arg;
@@ -151,15 +156,15 @@ class Command {
       if (!hasArg) {
         value = param.defaultValue;
       } else {
-        const parser = commandTypeParserRegistry.get(param.type);
-        if (!parser) {
+        const parser2 = commandTypeParserRegistry.get(param.type);
+        if (!parser2) {
           console.error(
             `${param.type} didn't have a valid parser, did you forget to register it with 'registerParameterType'?`
           );
           return false;
         }
         try {
-          value = parser(arg, defaultContextObject);
+          value = parser2(arg, defaultContextObject);
         } catch (e) {
           globalThis.printError("command parsing", e);
           return false;

package/package.json

@@ -8,7 +8,7 @@
   ],
   "license": "MIT",
   "type": "module",
-  "version": "0.0.161",
+  "version": "0.0.163",
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/nativewrappers.git"