imean-service-engine 1.8.2 → 1.9.0

package/dist/mod.cjs

@@ -72,11 +72,18 @@ function Action(options) {
     context.addInitializer(function() {
       const prototype = this.constructor.prototype;
       const func = target.toString().split("\n")[0];
-      const params = func.slice(func.indexOf("(") + 1, func.indexOf(")")).split(",").map((p) => p.split("=").shift()).filter((param) => !!param?.trim());
-      params.forEach((param, index) => {
-        options.params[index] = options.params[index]?.describe(
-          param.trim()
-        );
+      const paramString = func.slice(func.indexOf("(") + 1, func.indexOf(")"));
+      const parsedParams = paramString.split(",").map((p) => {
+        const paramWithoutDefault = p.split("=")[0]?.trim();
+        return paramWithoutDefault;
+      }).filter((param) => !!param);
+      options.params.forEach((param, index) => {
+        if (index < parsedParams.length) {
+          const paramName = parsedParams[index].split(":")[0]?.trim();
+          if (paramName) {
+            options.params[index] = param.describe(paramName);
+          }
+        }
       });
       const existingMetadata = prototype[ACTION_METADATA] || {};
       existingMetadata[methodName] = {
@@ -397,7 +404,10 @@ async function generateClientCode(modules) {
       }
       const params = action.params.map((param, index) => {
         const name2 = param.description || `arg${index}`;
-        return `${name2}${param.isOptional() ? "?" : ""}: ${getZodTypeString(
+        const paramDef = param._def;
+        const isOptional = param.isOptional();
+        const hasDefault = paramDef?.typeName === "ZodDefault";
+        return `${name2}${isOptional || hasDefault ? "?" : ""}: ${getZodTypeString(
           param,
           true
         )}`;
@@ -488,27 +498,25 @@ var ActionHandler = class {
   async _validate(req) {
     const span = tracer2.startSpan("validate");
     try {
-      let args;
+      let paramsMap = [];
       if (typeof req === "string") {
         try {
-          args = Object.values(ejson4__default.default.parse(req));
+          paramsMap = ejson4__default.default.parse(req);
         } catch (error) {
           throw new Error(`Invalid request body: ${error.message}`);
         }
       } else {
-        args = req;
-      }
-      if (this.metadata.params) {
-        args = args.map((arg, index) => {
-          try {
-            return this.metadata.params[index].parse(arg);
-          } catch (error) {
-            throw new Error(
-              `Invalid argument ${index}: ${error.message}`
-            );
-          }
-        });
+        paramsMap = req;
       }
+      const args = this.metadata.params ? this.metadata.params.map((param, index) => {
+        try {
+          return param.parse(paramsMap[index]);
+        } catch (error) {
+          throw new Error(
+            `Invalid argument ${index}: ${error.message}`
+          );
+        }
+      }) : [];
       const requestHash = hashText(ejson4__default.default.stringify(args));
       span.setAttribute("requestHash", requestHash);
       return { args, requestHash };
@@ -532,9 +540,10 @@ var ActionHandler = class {
       }
     }
     try {
+      const argsWithContext = [...args, ctx];
       const result = await this.moduleInstance[this.actionName].apply(
         this.moduleInstance,
-        args.concat(ctx)
+        argsWithContext
       );
       if (this.metadata.stream) {
         span?.setAttribute("stream", true);

package/dist/mod.js

@@ -63,11 +63,18 @@ function Action(options) {
     context.addInitializer(function() {
       const prototype = this.constructor.prototype;
       const func = target.toString().split("\n")[0];
-      const params = func.slice(func.indexOf("(") + 1, func.indexOf(")")).split(",").map((p) => p.split("=").shift()).filter((param) => !!param?.trim());
-      params.forEach((param, index) => {
-        options.params[index] = options.params[index]?.describe(
-          param.trim()
-        );
+      const paramString = func.slice(func.indexOf("(") + 1, func.indexOf(")"));
+      const parsedParams = paramString.split(",").map((p) => {
+        const paramWithoutDefault = p.split("=")[0]?.trim();
+        return paramWithoutDefault;
+      }).filter((param) => !!param);
+      options.params.forEach((param, index) => {
+        if (index < parsedParams.length) {
+          const paramName = parsedParams[index].split(":")[0]?.trim();
+          if (paramName) {
+            options.params[index] = param.describe(paramName);
+          }
+        }
       });
       const existingMetadata = prototype[ACTION_METADATA] || {};
       existingMetadata[methodName] = {
@@ -388,7 +395,10 @@ async function generateClientCode(modules) {
       }
       const params = action.params.map((param, index) => {
         const name2 = param.description || `arg${index}`;
-        return `${name2}${param.isOptional() ? "?" : ""}: ${getZodTypeString(
+        const paramDef = param._def;
+        const isOptional = param.isOptional();
+        const hasDefault = paramDef?.typeName === "ZodDefault";
+        return `${name2}${isOptional || hasDefault ? "?" : ""}: ${getZodTypeString(
           param,
           true
         )}`;
@@ -479,27 +489,25 @@ var ActionHandler = class {
   async _validate(req) {
     const span = tracer2.startSpan("validate");
     try {
-      let args;
+      let paramsMap = [];
       if (typeof req === "string") {
         try {
-          args = Object.values(ejson4.parse(req));
+          paramsMap = ejson4.parse(req);
         } catch (error) {
           throw new Error(`Invalid request body: ${error.message}`);
         }
       } else {
-        args = req;
-      }
-      if (this.metadata.params) {
-        args = args.map((arg, index) => {
-          try {
-            return this.metadata.params[index].parse(arg);
-          } catch (error) {
-            throw new Error(
-              `Invalid argument ${index}: ${error.message}`
-            );
-          }
-        });
+        paramsMap = req;
       }
+      const args = this.metadata.params ? this.metadata.params.map((param, index) => {
+        try {
+          return param.parse(paramsMap[index]);
+        } catch (error) {
+          throw new Error(
+            `Invalid argument ${index}: ${error.message}`
+          );
+        }
+      }) : [];
       const requestHash = hashText(ejson4.stringify(args));
       span.setAttribute("requestHash", requestHash);
       return { args, requestHash };
@@ -523,9 +531,10 @@ var ActionHandler = class {
       }
     }
     try {
+      const argsWithContext = [...args, ctx];
       const result = await this.moduleInstance[this.actionName].apply(
         this.moduleInstance,
-        args.concat(ctx)
+        argsWithContext
       );
       if (this.metadata.stream) {
         span?.setAttribute("stream", true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imean-service-engine",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "microservice engine",
   "keywords": [
     "microservice",