feat: add sort-route-params flags

Author: remigermain

index.ts

@@ -258,6 +258,11 @@ const generateCommand = defineCommand({
       description: "sort routes in alphabetical order",
       default: codeGenBaseConfig.sortRoutes,
     },
+    "sort-route-params": {
+      type: "boolean",
+      description: "sort route params from path order",
+      default: codeGenBaseConfig.sortRouteParams,
+    },
     "sort-types": {
       type: "boolean",
       description: "sort fields and types",
@@ -324,6 +329,7 @@ const generateCommand = defineCommand({
       silent: args.silent,
       singleHttpClient: args["single-http-client"],
       sortRoutes: args["sort-routes"],
+      sortRouteParams: args["sort-route-params"],
       sortTypes: args["sort-types"],
       templates: args.templates,
       toJS: args.js,

src/configuration.ts

@@ -117,6 +117,7 @@ export class CodeGenConfig {
   disableThrowOnError = false;
   sortTypes = false;
   sortRoutes = false;
+  sortRouteParams = false;
   templatePaths = {
     /** `templates/base` */
     base: "",

templates/default/procedure-call.ejs

@@ -39,11 +39,27 @@ const rawWrapperArgs = config.extractRequestParams ?
         requestConfigParam,
     ])
 
-const wrapperArgs = _
-    // Sort by optionality
-    .sortBy(rawWrapperArgs, [o => o.optional])
-    .map(argToTmpl)
-    .join(', ')
+
+const requiredArgs = rawWrapperArgs.filter((o) => !o.optional)
+const optionalArgs = rawWrapperArgs.filter((o) => o.optional)
+
+// sort by params index of params in path
+if (config.sortRouteParams) {
+  requiredArgs.sort(({name}) => {
+    const idx = path.indexOf(`{${name}}`)
+    if (idx === -1) {
+      return Infinity
+    }
+    return idx
+  })
+}
+
+const sortedRawWrapperArgs = [
+  ...requiredArgs,
+  ...optionalArgs
+]
+
+const wrapperArgs = sortedRawWrapperArgs.map(argToTmpl).join(', ')
 
 // RequestParams["type"]
 const requestContentKind = {