mobx-tanstack-query-api 0.41.0 → 0.41.1

package/cli.cjs

@@ -219,10 +219,15 @@ const createShortModelType = (shortModelType) => {
     description: shortModelType.description || ""
   };
 };
-const DEFAULT_ZOD_CONTRACT_SUFFIX = "Contract";
+const DEFAULT_DATA_CONTRACT_TYPE_SUFFIX = "DC";
+const DEFAULT_ZOD_CONTRACT_SUFFIX = "";
+const DEFAULT_ENDPOINT_ZOD_CONTRACT_SUFFIX = "Contract";
 function getZodContractSuffix(zodContracts) {
   return (typeof zodContracts === "object" && zodContracts !== null && typeof zodContracts.suffix === "string" ? zodContracts.suffix : void 0) ?? DEFAULT_ZOD_CONTRACT_SUFFIX;
 }
+function getEndpointZodContractSuffix(zodContracts) {
+  return (typeof zodContracts === "object" && zodContracts !== null && typeof zodContracts.suffix === "string" ? zodContracts.suffix : void 0) ?? DEFAULT_ENDPOINT_ZOD_CONTRACT_SUFFIX;
+}
 const REF_PREFIX = "#/components/schemas/";
 const REF_PREFIX_PARAMS = "#/components/parameters/";
 function parseRef(ref) {
@@ -251,7 +256,7 @@ function getResponseSchemaKeyFromOperation(rawOperation) {
   if (typeof ref !== "string") return null;
   return parseRef(ref);
 }
-function typeNameToSchemaKey(typeName, typeSuffix = "DC") {
+function typeNameToSchemaKey(typeName, typeSuffix = DEFAULT_DATA_CONTRACT_TYPE_SUFFIX) {
   const t = typeName.trim();
   if (typeSuffix && t.endsWith(typeSuffix))
     return t.slice(0, -typeSuffix.length);
@@ -378,9 +383,16 @@ function collectRefs(schema, schemas, out) {
     collectRefs(schema.additionalProperties, schemas, out);
   }
 }
-function schemaKeyToContractVarName(key, utils, contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX) {
+function dataContractTypeNameToZodVarName(typeName, utils, contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX) {
   const _ = utils._;
-  return `${_.camelCase(key)}${contractSuffix}`;
+  return `${_.camelCase(typeName)}${contractSuffix}`;
+}
+function schemaKeyToContractVarName(key, utils, contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX, typeSuffix = DEFAULT_DATA_CONTRACT_TYPE_SUFFIX) {
+  return dataContractTypeNameToZodVarName(
+    `${key}${typeSuffix}`,
+    utils,
+    contractSuffix
+  );
 }
 function resolveQueryParameters(operation, componentsParameters) {
   const list = [];
@@ -448,9 +460,10 @@ function buildCentralZodContractsFile(params) {
   const {
     componentsSchemas,
     utils,
-    contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX
+    contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX,
+    typeSuffix = DEFAULT_DATA_CONTRACT_TYPE_SUFFIX
   } = params;
-  const schemaKeyToContractVarNameFn = (key) => schemaKeyToContractVarName(key, utils, contractSuffix);
+  const schemaKeyToContractVarNameFn = (key) => schemaKeyToContractVarName(key, utils, contractSuffix, typeSuffix);
   const lines = generateAuxiliarySchemas(
     Object.keys(componentsSchemas),
     componentsSchemas,
@@ -476,7 +489,7 @@ function typeToZodSchemaFallback(typeStr) {
   if (t === "unknown") return "z.unknown()";
   return "z.any()";
 }
-function typeToZodSchemaWithSchema(typeStr, schemas, utils, typeSuffix, contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX) {
+function typeToZodSchemaWithSchema(typeStr, schemas, utils, typeSuffix = DEFAULT_DATA_CONTRACT_TYPE_SUFFIX, contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX) {
   const t = typeStr.trim();
   if (!schemas || Object.keys(schemas).length === 0) {
     return { expr: typeToZodSchemaFallback(t), refs: [] };
@@ -489,7 +502,7 @@ function typeToZodSchemaWithSchema(typeStr, schemas, utils, typeSuffix, contract
   }
   const refs = /* @__PURE__ */ new Set();
   collectRefs(schema, schemas, refs);
-  const schemaKeyToContractVarNameFn = (key) => schemaKeyToContractVarName(key, utils, contractSuffix);
+  const schemaKeyToContractVarNameFn = (key) => schemaKeyToContractVarName(key, utils, contractSuffix, typeSuffix);
   const expr = schemaToZodExpr(
     schema,
     schemas,
@@ -498,12 +511,12 @@ function typeToZodSchemaWithSchema(typeStr, schemas, utils, typeSuffix, contract
   );
   return { expr, refs: [...refs] };
 }
-function schemaKeyToZod(schemaKey, schemas, utils, contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX) {
+function schemaKeyToZod(schemaKey, schemas, utils, typeSuffix = DEFAULT_DATA_CONTRACT_TYPE_SUFFIX, contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX) {
   const schema = schemas[schemaKey];
   if (!schema) return { expr: "z.any()", refs: [] };
   const refs = /* @__PURE__ */ new Set();
   collectRefs(schema, schemas, refs);
-  const schemaKeyToContractVarNameFn = (key) => schemaKeyToContractVarName(key, utils, contractSuffix);
+  const schemaKeyToContractVarNameFn = (key) => schemaKeyToContractVarName(key, utils, contractSuffix, typeSuffix);
   const expr = schemaToZodExpr(
     schema,
     schemas,
@@ -520,7 +533,7 @@ function buildEndpointZodContractsCode(params) {
     utils,
     contractSuffix = DEFAULT_ZOD_CONTRACT_SUFFIX,
     componentsSchemas = null,
-    typeSuffix = "DC",
+    typeSuffix = DEFAULT_DATA_CONTRACT_TYPE_SUFFIX,
     responseSchemaKey,
     useExternalZodSchemas = false,
     openApiOperation = null,
@@ -531,7 +544,7 @@ function buildEndpointZodContractsCode(params) {
   const allAuxiliaryKeys = /* @__PURE__ */ new Set();
   const paramParts = [];
   const resolvedQueryParams = openApiOperation && (openApiComponentsParameters || openApiOperation.parameters?.length) ? resolveQueryParameters(openApiOperation, openApiComponentsParameters) : [];
-  const schemaKeyToContractVarNameFn = (key) => schemaKeyToContractVarName(key, utils, contractSuffix);
+  const schemaKeyToContractVarNameFn = (key) => schemaKeyToContractVarName(key, utils, contractSuffix, typeSuffix);
   for (const p of inputParams) {
     let expr;
     let refKeys = [];
@@ -560,6 +573,7 @@ function buildEndpointZodContractsCode(params) {
     responseSchemaKey,
     componentsSchemas,
     utils,
+    typeSuffix,
     contractSuffix
   ) : typeToZodSchemaWithSchema(
     responseDataTypeName,
@@ -754,7 +768,8 @@ const newEndpointTmpl = ({
 }) => {
   const zodContractsIsObject = typeof zodContracts === "object" && zodContracts !== null;
   const hasZodContracts = zodContracts === true || zodContractsIsObject;
-  const contractSuffix = getZodContractSuffix(zodContracts);
+  const sharedContractSuffix = getZodContractSuffix(zodContracts);
+  const endpointContractSuffix = getEndpointZodContractSuffix(zodContracts);
   const { _ } = utils;
   const positiveResponseTypes = route.raw.responsesTypes?.filter(
     (it) => +it.status >= 200 && +it.status < 300 && (!it.typeData || filterTypes(it.typeData))
@@ -868,7 +883,7 @@ const newEndpointTmpl = ({
   });
   const isAllowedInputType = filterTypes(requestInputTypeDc);
   const defaultOkResponseType = positiveResponseTypes?.[0]?.type ?? "unknown";
-  const contractVarName = hasZodContracts ? `${_.camelCase(route.routeName.usage)}${contractSuffix}` : null;
+  const contractVarName = hasZodContracts ? `${_.camelCase(route.routeName.usage)}${endpointContractSuffix}` : null;
   const routeInfoForContracts = contractVarName != null ? {
     operationId: raw.operationId ?? "",
     path: path2,
@@ -911,7 +926,10 @@ const newEndpointTmpl = ({
       (m) => m.name === defaultOkResponseType
     );
     if (aliasType?.typeIdentifier === "type" && typeof aliasType.content === "string" && /^[A-Za-z0-9_]+$/.test(aliasType.content.trim())) {
-      const resolved = typeNameToSchemaKey(aliasType.content.trim(), "DC");
+      const resolved = typeNameToSchemaKey(
+        aliasType.content.trim(),
+        DEFAULT_DATA_CONTRACT_TYPE_SUFFIX
+      );
       if (resolved in componentsSchemas) responseSchemaKey = resolved;
     }
   }
@@ -929,10 +947,10 @@ const newEndpointTmpl = ({
     contractVarName,
     utils,
     componentsSchemas: componentsSchemas ?? void 0,
-    typeSuffix: "DC",
+    typeSuffix: DEFAULT_DATA_CONTRACT_TYPE_SUFFIX,
     responseSchemaKey: responseSchemaKey ?? void 0,
     useExternalZodSchemas: Boolean(relativePathZodSchemas),
-    contractSuffix,
+    contractSuffix: sharedContractSuffix,
     openApiOperation: operationFromSpec ?? void 0,
     openApiComponentsParameters: swaggerSchema?.components?.parameters ?? void 0,
     queryParamName: queryName
@@ -1509,7 +1527,7 @@ const generateApi = async (params) => {
     cleanOutput: params.cleanOutput ?? true,
     modular: true,
     patch: true,
-    typeSuffix: "DC",
+    typeSuffix: DEFAULT_DATA_CONTRACT_TYPE_SUFFIX,
     disableStrictSSL: false,
     singleHttpClient: true,
     extractRequestBody: true,