@nativewrappers/common 0.0.98 → 0.0.100

package/Command.d.ts

@@ -8,6 +8,7 @@ interface ParameterTypes {
 interface Parameter {
     name: string;
     type: keyof ParameterTypes;
+    defaultValue?: any;
     help?: string;
     optional?: boolean;
 }
@@ -18,6 +19,27 @@ type MappedParameters<T extends Parameter[]> = {
     raw: string;
 };
 type CommandHandler<T extends Parameter[]> = (args: MappedParameters<T>) => void | Promise<void>;
+/**
+ * ```typescript
+ * new Command(["do", "deleteobjects"], async ({source, radius}) => {
+ *   const entities = Prop.AllProps();
+ *   const ply = new Player(source);
+ *   const pos = ply.Ped.Position
+ *   for (const ent of entities) {
+ *     // if they're outside of the range of our specified radius just continue to next
+ *     if (ent.Position.distance(pos) > radius) continue;
+ *     ent.delete();
+ *   }
+ * }, "Deletes all objects in the specified range", [
+ *   {
+ *      name: "radius",
+ *      type: "number",
+ *      help: "The radius to delete the entities in",
+ *      defaultValue: 5.0
+ *   }
+ * ] as const, "group.moderator")
+ *  ```
+ */
 export declare class Command<T extends Parameter[] = Parameter[]> {
     #private;
     readonly name: string | string[];

package/Command.js

@@ -49,7 +49,9 @@ class Command {
     if (params) {
       for (const parameter of params) {
         if (parameter.type) {
-          parameter.help = parameter.help ? `${parameter.help} (type: ${parameter.type})` : `(type: ${parameter.type})`;
+          const defaultString = parameter.defaultValue !== void 0 ? `[default: ${parameter.defaultValue}]` : "";
+          const typeString = `[type: ${parameter.type}] ${defaultString}`;
+          parameter.help = parameter.help ? `${parameter.help} ${typeString}` : `${typeString}`;
         }
       }
     }
@@ -87,26 +89,36 @@ class Command {
     const result = this.params.every((param, index) => {
       const arg = args[index];
       let value = arg;
-      switch (param.type) {
-        case "number":
-          value = +arg;
-          break;
-        case "string":
-          value = !Number(arg) ? arg : false;
-          break;
-        case "playerId":
-          $SERVER: {
-            value = arg === "me" ? source2 : +arg;
-            if (!value || !DoesPlayerExist(value.toString())) value = void 0;
-          }
-          $CLIENT: {
-            value = arg === "me" ? GetPlayerServerId(PlayerId()) : +arg;
-            if (!value || GetPlayerFromServerId(value) === -1) value = void 0;
-          }
-          break;
-        case "longString":
-          value = raw.substring(raw.indexOf(arg));
-          break;
+      const hasDefaultValue = param.defaultValue !== void 0;
+      const hasArg = typeof arg === "string";
+      if (!hasArg && hasDefaultValue) {
+        value = param.defaultValue;
+      } else {
+        switch (param.type) {
+          case "number":
+            if (hasDefaultValue && !hasArg) {
+              value = param.defaultValue;
+            } else {
+              value = +arg;
+            }
+            break;
+          case "string":
+            value = !Number(arg) ? arg : false;
+            break;
+          case "playerId":
+            $SERVER: {
+              value = arg === "me" ? source2 : +arg;
+              if (!value || !DoesPlayerExist(value.toString())) value = void 0;
+            }
+            $CLIENT: {
+              value = arg === "me" ? GetPlayerServerId(PlayerId()) : +arg;
+              if (!value || GetPlayerFromServerId(value) === -1) value = void 0;
+            }
+            break;
+          case "longString":
+            value = raw.substring(raw.indexOf(arg));
+            break;
+        }
       }
       if (value === void 0 && (!param.optional || param.optional && arg)) {
         return Citizen.trace(

package/decors/Events.js

@@ -15,8 +15,20 @@ function Exports(exportName) {
       throw new Error("Exports does not work on private methods, please mark the method as public");
     }
     context.addInitializer(function() {
-      exports(exportName, (...args) => {
-        return originalMethod.call(this, ...args);
+      exports(exportName, async (...args) => {
+        try {
+          return await originalMethod.call(this, ...args);
+        } catch (err) {
+          REMOVE_EVENT_LOG: {
+            if (!GlobalData.EnablePrettyPrint) return;
+            console.error("------- EXPORT ERROR --------");
+            console.error(`Call to ${exportName} errored`);
+            console.error(`Data: ${JSON.stringify(args)}`);
+            console.error(`Error: ${err}`);
+            console.error("------- END EXPORT ERROR --------");
+          }
+          throw err;
+        }
       });
     });
   }, "actualDecorator");
@@ -28,9 +40,9 @@ function Event(eventName) {
       throw new Error("Event does not work on private methods, please mark the method as public");
     }
     context.addInitializer(function() {
-      on(eventName, (...args) => {
+      on(eventName, async (...args) => {
         try {
-          return originalMethod.call(this, ...args);
+          return await originalMethod.call(this, ...args);
         } catch (e) {
           REMOVE_EVENT_LOG: {
             if (!GlobalData.EnablePrettyPrint) return;
@@ -52,7 +64,7 @@ function NetEvent(eventName, remoteOnly = true) {
       throw new Error("NetEvent does not work on private methods, please mark the method as public");
     }
     context.addInitializer(function() {
-      onNet(eventName, (...args) => {
+      onNet(eventName, async (...args) => {
         const src = source;
         try {
           $CLIENT: {
@@ -60,7 +72,7 @@ function NetEvent(eventName, remoteOnly = true) {
               return;
             }
           }
-          return originalMethod.call(this, ...args);
+          return await originalMethod.call(this, ...args);
         } catch (e) {
           REMOVE_NET_EVENT_LOG: {
             if (!GlobalData.EnablePrettyPrint) return;

package/package.json

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