mobx-tanstack-query-api 0.38.1 → 0.39.0

package/cli.cjs

@@ -429,11 +429,12 @@ function generateAuxiliarySchemas(schemaKeys, schemas, schemaKeyToVarNameFn, vis
     const schema = schemas[key];
     if (!schema) continue;
     const varName = schemaKeyToVarNameFn(key);
+    const cyclePath = /* @__PURE__ */ new Set([key]);
     const expr = schemaToZodExpr(
       schema,
       schemas,
       schemaKeyToVarNameFn,
-      visited
+      cyclePath
     );
     lines.push(`export const ${varName} = ${expr};`);
   }
@@ -912,7 +913,26 @@ const newEndpointTmpl = ({
     openApiComponentsParameters: swaggerSchema?.components?.parameters ?? void 0,
     queryParamName: queryName
   }) : null;
-  const contractsLine = contractsVarName != null ? `contracts: ${contractsVarName},` : "";
+  const appendRuleOpt = zodContractsIsObject && zodContracts.appendRule != null ? zodContracts.appendRule : null;
+  const routeInfoForAppend = contractsVarName != null ? {
+    operationId: raw.operationId ?? "",
+    path: path2,
+    method,
+    contractName: contractsVarName
+  } : null;
+  const contractsLine = (() => {
+    if (contractsVarName == null) return "";
+    if (typeof appendRuleOpt === "string")
+      return `contracts: ${appendRuleOpt} ? ${contractsVarName} : undefined,`;
+    if (typeof appendRuleOpt === "function" && routeInfoForAppend) {
+      const include = appendRuleOpt(
+        routeInfoForAppend.contractName,
+        routeInfoForAppend
+      );
+      return include ? `contracts: ${contractsVarName},` : "contracts: undefined,";
+    }
+    return `contracts: ${contractsVarName},`;
+  })();
   const validateContractsLine = (() => {
     if (validateOpt === void 0) return "";
     if (typeof validateOpt === "string")
@@ -1490,12 +1510,25 @@ const generateApi = async (params) => {
     sortTypes: true,
     templates: paths.templates.toString(),
     primitiveTypeConstructs: (constructs) => {
-      return {
+      const result = {
         ...constructs,
         object: () => `Record<string, any>`,
-        float: () => `number`,
-        ...params.otherCodegenParams?.primitiveTypeConstructs?.(constructs)
+        float: () => `number`
       };
+      if (params.otherCodegenParams?.primitiveTypeConstructs) {
+        if (typeof params.otherCodegenParams?.primitiveTypeConstructs === "function") {
+          Object.assign(
+            result,
+            params.otherCodegenParams.primitiveTypeConstructs(result)
+          );
+        } else {
+          Object.assign(
+            result,
+            params.otherCodegenParams.primitiveTypeConstructs
+          );
+        }
+      }
+      return result;
     },
     requestOptions: params.fetchSchemaRequestOptions,
     ...params.otherCodegenParams
@@ -1509,6 +1542,34 @@ const generateApi = async (params) => {
     );
     return;
   }
+  const prepareConfig = (config) => {
+    config.routes.combined?.forEach((routeInfo) => {
+      routeInfo.routes.sort(
+        (routeA, routeB) => routeA.routeName.usage.localeCompare(routeB.routeName.usage)
+      );
+    });
+    return params.otherCodegenParams?.hooks?.onPrepareConfig?.(config);
+  };
+  const formatRouteName = (routeInfo, usageRouteName) => {
+    let formattedRouteName = usageRouteName;
+    if (params.addPathSegmentToRouteName === true || typeof params.addPathSegmentToRouteName === "number") {
+      const pathSegmentForSuffix = typeof params.addPathSegmentToRouteName === "number" ? params.addPathSegmentToRouteName : 0;
+      const pathSegments = routeInfo.route.split("/").filter(Boolean);
+      const { _: _2 } = codegenProcess.getRenderTemplateData().utils;
+      formattedRouteName = _2.camelCase(
+        `${pathSegments[pathSegmentForSuffix] || ""}_${formattedRouteName}`
+      );
+    }
+    const endpointName = formattedRouteName;
+    const resultRouteName = params?.formatEndpointName?.(endpointName, routeInfo) ?? swaggerTypescriptApiCodegenBaseParams?.hooks?.onFormatRouteName?.(
+      routeInfo,
+      endpointName
+    ) ?? endpointName;
+    return params.otherCodegenParams?.hooks?.onFormatRouteName?.(
+      routeInfo,
+      resultRouteName
+    ) ?? resultRouteName;
+  };
   const inputToCodegenInput = (input) => {
     const inputData = {};
     if (typeof input === "string") {
@@ -1525,32 +1586,11 @@ const generateApi = async (params) => {
       ...swaggerTypescriptApiCodegenBaseParams,
       ...inputToCodegenInput(params.mixinInput),
       hooks: {
-        onInit: (configuration) => {
+        onInit: (configuration, codegenProcess2) => {
           mixinSwaggerSchema = lodashEs.cloneDeep(configuration.swaggerSchema);
         },
-        onPrepareConfig: (config) => {
-          config.routes.combined?.forEach((routeInfo) => {
-            routeInfo.routes.sort(
-              (routeA, routeB) => routeA.routeName.usage.localeCompare(routeB.routeName.usage)
-            );
-          });
-        },
-        onFormatRouteName: (routeInfo, usageRouteName) => {
-          let formattedRouteName = usageRouteName;
-          if (params.addPathSegmentToRouteName === true || typeof params.addPathSegmentToRouteName === "number") {
-            const pathSegmentForSuffix = typeof params.addPathSegmentToRouteName === "number" ? params.addPathSegmentToRouteName : 0;
-            const pathSegments = routeInfo.route.split("/").filter(Boolean);
-            const { _: _2 } = codegenProcess.getRenderTemplateData().utils;
-            formattedRouteName = _2.camelCase(
-              `${pathSegments[pathSegmentForSuffix] || ""}_${formattedRouteName}`
-            );
-          }
-          const endpointName = formattedRouteName;
-          return params?.formatEndpointName?.(endpointName, routeInfo) ?? swaggerTypescriptApiCodegenBaseParams?.hooks?.onFormatRouteName?.(
-            routeInfo,
-            endpointName
-          ) ?? endpointName;
-        }
+        onPrepareConfig: prepareConfig,
+        onFormatRouteName: formatRouteName
       }
     });
   }
@@ -1576,32 +1616,8 @@ const generateApi = async (params) => {
           codeGenProcessFromInit
         );
       },
-      onPrepareConfig: (config) => {
-        config.routes.combined?.forEach((routeInfo) => {
-          routeInfo.routes.sort(
-            (routeA, routeB) => routeA.routeName.usage.localeCompare(routeB.routeName.usage)
-          );
-        });
-        return swaggerTypescriptApiCodegenBaseParams?.hooks?.onPrepareConfig?.(
-          config
-        );
-      },
-      onFormatRouteName: (routeInfo, usageRouteName) => {
-        let formattedRouteName = usageRouteName;
-        if (params.addPathSegmentToRouteName === true || typeof params.addPathSegmentToRouteName === "number") {
-          const pathSegmentForSuffix = typeof params.addPathSegmentToRouteName === "number" ? params.addPathSegmentToRouteName : 0;
-          const pathSegments = routeInfo.route.split("/").filter(Boolean);
-          const { _: _2 } = codegenProcess.getRenderTemplateData().utils;
-          formattedRouteName = _2.camelCase(
-            `${pathSegments[pathSegmentForSuffix] || ""}_${formattedRouteName}`
-          );
-        }
-        const endpointName = formattedRouteName;
-        return params?.formatEndpointName?.(endpointName, routeInfo) ?? swaggerTypescriptApiCodegenBaseParams?.hooks?.onFormatRouteName?.(
-          routeInfo,
-          endpointName
-        ) ?? endpointName;
-      }
+      onPrepareConfig: prepareConfig,
+      onFormatRouteName: formatRouteName
     }
   });
   const utils = codegenProcess.getRenderTemplateData().utils;