mobx-tanstack-query-api 0.38.0 → 0.38.1

package/cli.cjs

@@ -220,10 +220,16 @@ const createShortModelType = (shortModelType) => {
   };
 };
 const REF_PREFIX = "#/components/schemas/";
+const REF_PREFIX_PARAMS = "#/components/parameters/";
 function parseRef(ref) {
   if (typeof ref !== "string" || !ref.startsWith(REF_PREFIX)) return null;
   return ref.slice(REF_PREFIX.length);
 }
+function parseParamRef(ref) {
+  if (typeof ref !== "string" || !ref.startsWith(REF_PREFIX_PARAMS))
+    return null;
+  return ref.slice(REF_PREFIX_PARAMS.length);
+}
 function getResponseSchemaKeyFromOperation(rawOperation) {
   const op = rawOperation;
   const responses = op?.responses;
@@ -265,7 +271,7 @@ function schemaToNumber(schema) {
   return n;
 }
 function schemaToArray(schema, schemas, schemaKeyToVarName2, visited) {
-  const items = schema.items ? schemaToZodExpr(schema.items, schemas, schemaKeyToVarName2) : "z.any()";
+  const items = schema.items ? schemaToZodExpr(schema.items, schemas, schemaKeyToVarName2, visited) : "z.any()";
   let a = `z.array(${items})`;
   if (schema.minItems != null) a += `.min(${schema.minItems})`;
   if (schema.maxItems != null) a += `.max(${schema.maxItems})`;
@@ -279,7 +285,8 @@ function schemaToObject(schema, schemas, schemaKeyToVarName2, visited) {
         const expr = schemaToZodExpr(
           propSchema,
           schemas,
-          schemaKeyToVarName2
+          schemaKeyToVarName2,
+          visited
         );
         const optional = !required.has(propName);
         const field = optional ? `${expr}.optional()` : expr;
@@ -296,7 +303,8 @@ ${entries.join(",\n")}
     const value = schemaToZodExpr(
       schema.additionalProperties,
       schemas,
-      schemaKeyToVarName2
+      schemaKeyToVarName2,
+      visited
     );
     return `z.record(z.string(), ${value})`;
   }
@@ -306,13 +314,15 @@ function schemaToZodExpr(schema, schemas, schemaKeyToVarName2, visited) {
   if (!schema) return "z.any()";
   if (schema.$ref) {
     const key = parseRef(schema.$ref);
-    if (key && key in schemas)
-      return `z.lazy(() => ${schemaKeyToVarName2(key)})`;
+    if (key && key in schemas) {
+      const isCycle = visited.has(key);
+      return isCycle ? `z.lazy((): z.ZodTypeAny => ${schemaKeyToVarName2(key)})` : `z.lazy(() => ${schemaKeyToVarName2(key)})`;
+    }
     return "z.any()";
   }
   if (schema.allOf && schema.allOf.length > 0) {
     const parts = schema.allOf.map(
-      (part) => schemaToZodExpr(part, schemas, schemaKeyToVarName2)
+      (part) => schemaToZodExpr(part, schemas, schemaKeyToVarName2, visited)
     );
     const base2 = parts.length === 1 ? parts[0] : parts.reduce((acc, p) => `z.intersection(${acc}, ${p})`);
     return schema.nullable === true ? `${base2}.nullable()` : base2;
@@ -331,10 +341,10 @@ function schemaToZodExpr(schema, schemas, schemaKeyToVarName2, visited) {
       base = "z.boolean()";
       break;
     case "array":
-      base = schemaToArray(schema, schemas, schemaKeyToVarName2);
+      base = schemaToArray(schema, schemas, schemaKeyToVarName2, visited);
       break;
     case "object":
-      base = schemaToObject(schema, schemas, schemaKeyToVarName2);
+      base = schemaToObject(schema, schemas, schemaKeyToVarName2, visited);
       break;
     default:
       base = "z.any()";
@@ -368,6 +378,49 @@ function schemaKeyToVarName(key, utils) {
   const _ = utils._;
   return `${_.camelCase(key)}Schema`;
 }
+function resolveQueryParameters(operation, componentsParameters) {
+  const list = [];
+  const params = operation?.parameters;
+  if (!Array.isArray(params) || !params.length) return list;
+  for (const p of params) {
+    let param = p;
+    if (p.$ref && componentsParameters) {
+      const key = parseParamRef(p.$ref);
+      if (key && key in componentsParameters)
+        param = componentsParameters[key];
+    }
+    if (param.in !== "query") continue;
+    const name = param.name;
+    if (!name) continue;
+    const schema = param.schema ?? {
+      type: param.type ?? "string",
+      format: param.format,
+      items: param.items
+    };
+    list.push({
+      name,
+      required: param.required === true,
+      schema
+    });
+  }
+  return list;
+}
+function queryParamsToZodObject(queryParams, schemas, schemaKeyToVarName2) {
+  if (queryParams.length === 0) return "z.object({})";
+  const entries = queryParams.map(({ name, required, schema }) => {
+    const expr = schemaToZodExpr(
+      schema,
+      schemas,
+      schemaKeyToVarName2,
+      /* @__PURE__ */ new Set()
+    );
+    const field = required ? expr : `${expr}.optional()`;
+    return `  ${JSON.stringify(name)}: ${field}`;
+  });
+  return `z.object({
+${entries.join(",\n")}
+})`;
+}
 function generateAuxiliarySchemas(schemaKeys, schemas, schemaKeyToVarNameFn, visited) {
   const lines = [];
   for (const key of schemaKeys) {
@@ -379,7 +432,8 @@ function generateAuxiliarySchemas(schemaKeys, schemas, schemaKeyToVarNameFn, vis
     const expr = schemaToZodExpr(
       schema,
       schemas,
-      schemaKeyToVarNameFn
+      schemaKeyToVarNameFn,
+      visited
     );
     lines.push(`export const ${varName} = ${expr};`);
   }
@@ -430,7 +484,8 @@ function typeToZodSchemaWithSchema(typeStr, schemas, utils, typeSuffix) {
   const expr = schemaToZodExpr(
     schema,
     schemas,
-    schemaKeyToVarNameFn
+    schemaKeyToVarNameFn,
+    /* @__PURE__ */ new Set()
   );
   return { expr, refs: [...refs] };
 }
@@ -443,7 +498,8 @@ function schemaKeyToZod(schemaKey, schemas, utils) {
   const expr = schemaToZodExpr(
     schema,
     schemas,
-    schemaKeyToVarNameFn
+    schemaKeyToVarNameFn,
+    /* @__PURE__ */ new Set()
   );
   return { expr, refs: [...refs] };
 }
@@ -457,20 +513,37 @@ function buildEndpointZodContractsCode(params) {
     componentsSchemas = null,
     typeSuffix = "DC",
     responseSchemaKey,
-    useExternalZodSchemas = false
+    useExternalZodSchemas = false,
+    openApiOperation = null,
+    openApiComponentsParameters = null,
+    queryParamName = "query"
   } = params;
   const _ = utils._;
   const paramsSchemaName = `${_.camelCase(routeNameUsage)}ParamsSchema`;
   const dataSchemaName = `${_.camelCase(routeNameUsage)}DataSchema`;
   const allAuxiliaryKeys = /* @__PURE__ */ new Set();
   const paramParts = [];
+  const resolvedQueryParams = openApiOperation && (openApiComponentsParameters || openApiOperation.parameters?.length) ? resolveQueryParameters(openApiOperation, openApiComponentsParameters) : [];
+  const schemaKeyToVarNameFn = (key) => schemaKeyToVarName(key, utils);
   for (const p of inputParams) {
-    const { expr, refs: refKeys } = typeToZodSchemaWithSchema(
-      p.type,
-      componentsSchemas,
-      utils,
-      typeSuffix
-    );
+    let expr;
+    let refKeys = [];
+    if (p.name === queryParamName && resolvedQueryParams.length > 0 && componentsSchemas) {
+      expr = queryParamsToZodObject(
+        resolvedQueryParams,
+        componentsSchemas,
+        schemaKeyToVarNameFn
+      );
+    } else {
+      const result = typeToZodSchemaWithSchema(
+        p.type,
+        componentsSchemas,
+        utils,
+        typeSuffix
+      );
+      expr = result.expr;
+      refKeys = result.refs;
+    }
     for (const k of refKeys) allAuxiliaryKeys.add(k);
     const schemaWithOptional = p.optional ? `${expr}.optional()` : expr;
     paramParts.push(`${p.name}: ${schemaWithOptional}`);
@@ -481,7 +554,6 @@ function buildEndpointZodContractsCode(params) {
     utils,
     typeSuffix
   );
-  const schemaKeyToVarNameFn = (key) => schemaKeyToVarName(key, utils);
   const useDataSchemaFromCentral = useExternalZodSchemas && responseSchemaKey && componentsSchemas && responseSchemaKey in componentsSchemas;
   if (useDataSchemaFromCentral) {
     allAuxiliaryKeys.add(responseSchemaKey);
@@ -835,7 +907,10 @@ const newEndpointTmpl = ({
     componentsSchemas: componentsSchemas ?? void 0,
     typeSuffix: "DC",
     responseSchemaKey: responseSchemaKey ?? void 0,
-    useExternalZodSchemas: Boolean(relativePathZodSchemas)
+    useExternalZodSchemas: Boolean(relativePathZodSchemas),
+    openApiOperation: operationFromSpec ?? void 0,
+    openApiComponentsParameters: swaggerSchema?.components?.parameters ?? void 0,
+    queryParamName: queryName
   }) : null;
   const contractsLine = contractsVarName != null ? `contracts: ${contractsVarName},` : "";
   const validateContractsLine = (() => {