From 16e761b5c2bbd18eff874f93f5be777a05694417 Mon Sep 17 00:00:00 2001 From: long-woo Date: Thu, 16 Jul 2026 22:52:21 +0800 Subject: [PATCH] fix: hyphenated parameters in headers/queries and spaces in tag names --- src/core.ts | 3 ++- src/plugins/action.ts | 3 ++- src/plugins/dart/template/actionMethod.eta | 2 +- src/plugins/dart/template/definitionFooter.eta | 4 ++-- src/plugins/swift/template/actionMethod.eta | 2 +- src/plugins/swift/template/definitionFooter.eta | 9 ++++++++- src/plugins/typescript/template/actionMethod.eta | 2 +- src/plugins/typescript/template/definitionBody.eta | 2 +- src/swagger.ts | 1 + 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/core.ts b/src/core.ts index 563f18c..847bf76 100644 --- a/src/core.ts +++ b/src/core.ts @@ -377,7 +377,8 @@ const getPathVirtualProperty = ( ) { const _schema = current.schema; const item: IDefinitionVirtualProperty = { - name: current.name, + name: camelCase(current.name), + originalName: current.name, type: current.type ?? _schema?.type ?? "", required: current.required, description: current.description, diff --git a/src/plugins/action.ts b/src/plugins/action.ts index b6d6d40..a97de88 100644 --- a/src/plugins/action.ts +++ b/src/plugins/action.ts @@ -216,6 +216,7 @@ const parseParams = (parameters: IPathVirtualParameter, action: string) => if (!_multiParam) { _formalParam = { name: item.name, + originalName: item.originalName, category: current, type: _type, description: (item.title || item.description) ?? "", @@ -366,7 +367,7 @@ const getActionFiles = (data: Map) => { Logs.info(`${getT("$t(plugin.parserAction)")}...`); data.forEach((item, key) => { - const _tag = item.tag; + const _tag = item.tag?.replace(/\s+/g, ""); if (!_tag) { Logs.error(getT("$t(plugin.no_tag)", { url: item.url })); diff --git a/src/plugins/dart/template/actionMethod.eta b/src/plugins/dart/template/actionMethod.eta index 30ee7d7..c653dbe 100644 --- a/src/plugins/dart/template/actionMethod.eta +++ b/src/plugins/dart/template/actionMethod.eta @@ -26,7 +26,7 @@ Future<<%~ it.responseType %>> <%= it.methodName %>(<% it.params.forEach((param, method: '<%= it.method %>'<% if (it.params.length) { %>, params: { <% it.params.forEach((param, index) => { %> - '<%= param.category %>': <% if (param.category === param.name) { %><%= param.name %><% } else { %>{'<%= param.name %>' : <%= param.name %>}<% } %><% if (index < it.params.length - 1) { %>, <% } %> + '<%= param.category %>': <% if (param.category === param.name) { %><%= param.name %><% } else { %>{'<%= param.originalName || param.name %>' : <%= param.name %>}<% } %><% if (index < it.params.length - 1) { %>, <% } %> <% }) %> } diff --git a/src/plugins/dart/template/definitionFooter.eta b/src/plugins/dart/template/definitionFooter.eta index 830fdb7..f5f55f4 100644 --- a/src/plugins/dart/template/definitionFooter.eta +++ b/src/plugins/dart/template/definitionFooter.eta @@ -8,7 +8,7 @@ factory <%= it.defName %>.fromJson(Map json) { return <%= it.defName %>( <% it.props.forEach((prop, index) => { %> - <%= prop.name %>: json['<%= prop.name %>']<% if (index < it.props.length - 1) { %>,<% } %> + <%= prop.name %>: json['<%= prop.originalName || prop.name %>']<% if (index < it.props.length - 1) { %>,<% } %> <% }) %> ); @@ -18,7 +18,7 @@ final Map data = {}; <% it.props.forEach((prop) => { %> - data['<%= prop.name %>'] = <%= prop.name %>; + data['<%= prop.originalName || prop.name %>'] = <%= prop.name %>; <% }) %> return data; diff --git a/src/plugins/swift/template/actionMethod.eta b/src/plugins/swift/template/actionMethod.eta index 8d81f93..a1af25d 100644 --- a/src/plugins/swift/template/actionMethod.eta +++ b/src/plugins/swift/template/actionMethod.eta @@ -24,7 +24,7 @@ public func <%= it.methodName %>(<% it.params.forEach((param, index) => { %> <% if (pathParams.length > 0) { %> let pathParams: [String: String] = [ <% pathParams.forEach((param, index) => { %> - "<%= param.name %>": String(<%= param.name %>)<% if (index < pathParams.length - 1) { %>,<% } %> + "<%= param.originalName || param.name %>": String(<%= param.name %>)<% if (index < pathParams.length - 1) { %>,<% } %> <% }) %> ] let parsedUrl = "<%= it.url %>".parsePathParams(pathParams) diff --git a/src/plugins/swift/template/definitionFooter.eta b/src/plugins/swift/template/definitionFooter.eta index 5c34318..d260446 100644 --- a/src/plugins/swift/template/definitionFooter.eta +++ b/src/plugins/swift/template/definitionFooter.eta @@ -1 +1,8 @@ -} +<% if (it.props && it.props.some(prop => prop.originalName && prop.originalName !== prop.name)) { %> + private enum CodingKeys: String, CodingKey { +<% it.props.forEach(prop => { %> + case <%= prop.name %> = "<%= prop.originalName || prop.name %>" +<% }) %> + } +<% } %> +} \ No newline at end of file diff --git a/src/plugins/typescript/template/actionMethod.eta b/src/plugins/typescript/template/actionMethod.eta index 03364fe..f7a7220 100644 --- a/src/plugins/typescript/template/actionMethod.eta +++ b/src/plugins/typescript/template/actionMethod.eta @@ -35,7 +35,7 @@ export const <%= it.methodName %> = (<% it.params.forEach((param, index) => { %> <% it.params.forEach((param, index) => { %> <%= param.category %><% if (param.category === param.name) { %> <% } else { %>: <% if (param.category === 'body') { %><%= param.name %><% } else { %>{ - <%= param.name %> + <%= param.originalName ? "'" + param.originalName + "': " + param.name : param.name %> }<% } %> <% } %><% if (index < it.params.length - 1) { %>, <% } %> diff --git a/src/plugins/typescript/template/definitionBody.eta b/src/plugins/typescript/template/definitionBody.eta index 4e90a83..8ea64eb 100644 --- a/src/plugins/typescript/template/definitionBody.eta +++ b/src/plugins/typescript/template/definitionBody.eta @@ -4,4 +4,4 @@ */ <% } %> - <%= it.prop.name %><% if (!it.prop.required) { %>?<% } %>: <%~ it.propType %><% if (it.nullable) { %> | <%~ it.nullable %><% } %>; \ No newline at end of file + "<%= it.prop.originalName || it.prop.name %>"<% if (!it.prop.required) { %>?<% } %>: <%~ it.propType %><% if (it.nullable) { %> | <%~ it.nullable %><% } %>; \ No newline at end of file diff --git a/src/swagger.ts b/src/swagger.ts index 244938d..5ebaa0f 100644 --- a/src/swagger.ts +++ b/src/swagger.ts @@ -172,6 +172,7 @@ export interface IDefinitionVirtualProperty { * 属性名 */ name: string; + originalName?: string; /** * 属性类型。数组的情况，通常是 action 的返回值会多个 */