swgto-ts 3.0.0 → 3.0.2

package/dist/{chunk-OU5BJNJI.js → chunk-GTJIYNPK.js}

@@ -338,6 +338,16 @@ ${[...exportSet].join("\n")}
 }
 
 // src/generators/genRequestJs.ts
+function isSimpleTypeRef(name) {
+  return /^[\w.]+$/.test(name);
+}
+function buildParamTag(requestParamType, typeImportPath) {
+  if (requestParamType === "void") return "[params]";
+  if (isSimpleTypeRef(requestParamType)) {
+    return `{import(${JSON.stringify(typeImportPath)}).${requestParamType}} params`;
+  }
+  return `{${requestParamType}} params`;
+}
 function buildFunctionDoc(operation, typeImportPath, requestParamType) {
   const lines = [];
   if (operation.summary) {
@@ -349,7 +359,7 @@ function buildFunctionDoc(operation, typeImportPath, requestParamType) {
   lines.push(`@path ${operation.path}`);
   lines.push(`@requestPath ${operation.requestPath}`);
   lines.push(`@method ${operation.method.toUpperCase()}`);
-  lines.push(`@param ${requestParamType === "void" ? "[params]" : `{import(${JSON.stringify(typeImportPath)}).${requestParamType}} params`}`);
+  lines.push(`@param ${buildParamTag(requestParamType, typeImportPath)}`);
   lines.push("@param [config]");
   if (operation.responseTypeName) {
     lines.push(`@returns {Promise<import(${JSON.stringify(typeImportPath)}).${operation.responseTypeName}>}`);
@@ -363,14 +373,19 @@ function renderFunction(operation, useGenericUrl, mergeParams) {
   const queryLine = operation.queryParams.length ? `    params: ${mergeParams ? "params" : "params?.query"},
 ` : "";
   const bodyOnly = Boolean(operation.requestBodySchema) && !operation.queryParams.length && !operation.pathParams.length;
-  const bodyLine = operation.requestBodySchema ? `    data: ${mergeParams ? "params" : bodyOnly ? "params" : "params?.body"},
+  const hasBodySchema = Boolean(operation.requestBodySchema);
+  const needsCleanData = mergeParams && hasBodySchema && operation.pathParams.length > 0;
+  const destructureLine = needsCleanData ? `  const { ${operation.pathParams.map((p) => p.name).join(", ")}, ...requestData } = params;
+` : "";
+  const dataValue = needsCleanData ? "requestData" : mergeParams ? "params" : bodyOnly ? "params" : "params?.body";
+  const bodyLine = hasBodySchema ? `    data: ${dataValue},
 ` : "";
   const pathArg = mergeParams ? "params" : "params?.path";
   const urlValue = useGenericUrl && operation.pathParams.length ? `buildUrl(${JSON.stringify(operation.requestPath)}, ${pathArg})` : operation.pathParams.length ? `buildUrl(${pathArg})` : JSON.stringify(operation.requestPath);
   const pathLine = `    url: ${urlValue},
 `;
   return `export async function ${operation.functionName}(params, config) {
-  return request({
+${destructureLine}  return request({
 ${pathLine}    method: ${JSON.stringify(operation.method)},
 ${queryLine}${bodyLine}    ...config,
   });
@@ -381,7 +396,12 @@ function generateJsRequestFile(operation, httpClientPath, typeImportPath, mergeP
   const queryLine = operation.queryParams.length ? `    params: ${mergeParams ? "params" : "params?.query"},
 ` : "";
   const bodyOnly = Boolean(operation.requestBodySchema) && !operation.queryParams.length && !operation.pathParams.length;
-  const bodyLine = operation.requestBodySchema ? `    data: ${mergeParams ? "params" : bodyOnly ? "params" : "params?.body"},
+  const hasBodySchema = Boolean(operation.requestBodySchema);
+  const needsCleanData = mergeParams && hasBodySchema && operation.pathParams.length > 0;
+  const destructureLine = needsCleanData ? `  const { ${operation.pathParams.map((p) => p.name).join(", ")}, ...requestData } = params;
+` : "";
+  const dataValue = needsCleanData ? "requestData" : mergeParams ? "params" : bodyOnly ? "params" : "params?.body";
+  const bodyLine = hasBodySchema ? `    data: ${dataValue},
 ` : "";
   const pathArg = mergeParams ? "params" : "params?.path";
   const pathLine = operation.pathParams.length ? `    url: buildUrl(${pathArg}),
@@ -399,7 +419,7 @@ ${buildUrlHelper}
 
 ${buildFunctionDoc(operation, typeImportPath, requestParamType)}
 export async function ${operation.functionName}(params, config) {
-  return request({
+${destructureLine}  return request({
 ${pathLine}    method: ${JSON.stringify(operation.method)},
 ${queryLine}${bodyLine}    ...config,
   });
@@ -445,7 +465,12 @@ function renderFunction2(operation, useGenericUrl, mergeParams) {
   const requestArg = operation.requestTypeExpression ? `params: ${operation.requestTypeExpression}, config?: RequestConfig` : "params?: void, config?: RequestConfig";
   const defaultResponseType = operation.responseTypeName ?? "unknown";
   const bodyOnly = Boolean(operation.requestBodySchema) && !operation.queryParams.length && !operation.pathParams.length;
-  const bodyLine = operation.requestBodySchema ? `    data: ${mergeParams ? "params" : bodyOnly ? "params" : "params?.body"},
+  const hasBodySchema = Boolean(operation.requestBodySchema);
+  const needsCleanData = mergeParams && hasBodySchema && operation.pathParams.length > 0;
+  const destructureLine = needsCleanData ? `  const { ${operation.pathParams.map((p) => p.name).join(", ")}, ...requestData } = params;
+` : "";
+  const dataValue = needsCleanData ? "requestData" : mergeParams ? "params" : bodyOnly ? "params" : "params?.body";
+  const bodyLine = hasBodySchema ? `    data: ${dataValue},
 ` : "";
   const queryLine = operation.queryParams.length ? `    params: ${mergeParams ? "params" : "params?.query"},
 ` : "";
@@ -454,22 +479,20 @@ function renderFunction2(operation, useGenericUrl, mergeParams) {
   const pathLine = `    url: ${urlValue},
 `;
   return `${buildFunctionDoc2(operation)}export async function ${operation.functionName}<T = ${defaultResponseType}>(${requestArg}): Promise<T> {
-  return request<T>({
+${destructureLine}  return request<T>({
 ${pathLine}    method: ${JSON.stringify(operation.method)},
 ${queryLine}${bodyLine}    ...config,
   });
 }`;
 }
 function generateTsRequestFile(operation, httpClientPath, typeImportPath, mergeParams = false) {
-  const importTypes = [
-    ...operation.requestImportTypes,
-    operation.responseTypeName,
-    "RequestConfig"
-  ].filter((value, index, array) => Boolean(value) && array.indexOf(value) === index);
+  const importTypes = [...operation.requestImportTypes, operation.responseTypeName, "RequestConfig"].filter(
+    (value, index, array) => Boolean(value) && array.indexOf(value) === index
+  );
   const importLine = importTypes.length ? `import type { ${importTypes.join(", ")} } from ${JSON.stringify(typeImportPath)};
 ` : "";
   const buildUrlHelper = operation.pathParams.length ? `
-function buildUrl(path?: Record<string, unknown>): string {
+function buildUrl(path?: Record<string, any>): string {
   return ${JSON.stringify(operation.requestPath)}.replace(/\\{([^}]+)\\}/g, (_, key) => String(path?.[key] ?? ''));
 }
 ` : "";

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   generateFromConfig
-} from "./chunk-OU5BJNJI.js";
+} from "./chunk-GTJIYNPK.js";
 import "./chunk-HBBM5HFP.js";
 
 // src/cli.ts

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   generateFromConfig
-} from "./chunk-OU5BJNJI.js";
+} from "./chunk-GTJIYNPK.js";
 import "./chunk-HBBM5HFP.js";
 export {
   generateFromConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swgto-ts",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Generate API request files from OpenAPI 3.x documents.",
   "license": "MIT",
   "type": "module",
@@ -25,9 +25,6 @@
     "generator",
     "cli"
   ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
   "engines": {
     "node": ">=18"
   },