api-typescript-generator
Advanced tools
Comparing version 2.4.9 to 2.4.10
@@ -1,2 +0,2 @@ | ||
import { ClassMethod, Statement } from '@babel/types'; | ||
import { ClassProperty, Statement } from '@babel/types'; | ||
import { GetModelData } from './models'; | ||
@@ -18,5 +18,5 @@ import { OpenApiPaths } from '../../schemas/openapi'; | ||
}): { | ||
methods: ClassMethod[]; | ||
methods: ClassProperty[]; | ||
dependencyImports: DependencyImports; | ||
validationStatements: Statement[]; | ||
}; |
@@ -97,3 +97,3 @@ "use strict"; | ||
const modelRegisterValidationSchemaImports = {}; | ||
const methods = []; | ||
const methodProperties = []; | ||
const validationStatements = []; | ||
@@ -434,3 +434,3 @@ if (validateResponse && !validationContext) { | ||
} | ||
const operationMethod = (0, types_1.classMethod)('method', (0, types_1.identifier)(operationName), argument.properties.length > 0 | ||
const operationMethod = (0, types_1.arrowFunctionExpression)(argument.properties.length > 0 | ||
? [ | ||
@@ -444,5 +444,6 @@ (0, type_utils_1.isAssignableToEmptyObject)(argument.typeAnnotation.typeAnnotation) | ||
])); | ||
const operationMethodProperty = (0, types_1.classProperty)((0, types_1.identifier)(operationName), operationMethod); | ||
operationMethod.returnType = (0, types_1.tsTypeAnnotation)((0, types_1.tsTypeReference)((0, types_1.identifier)('Promise'), (0, types_1.tsTypeParameterInstantiation)([operationReturn.type]))); | ||
(0, dependencies_1.extendDependencyImports)(dependencyImports, operationReturn.dependencyImports); | ||
methods.push((0, jsdoc_1.attachJsDocComment)(operationMethod, (0, jsdoc_1.renderJsDoc)(jsdoc, jsDocRenderConfig))); | ||
methodProperties.push((0, jsdoc_1.attachJsDocComment)(operationMethodProperty, (0, jsdoc_1.renderJsDoc)(jsdoc, jsDocRenderConfig))); | ||
} | ||
@@ -455,5 +456,5 @@ } | ||
} | ||
methods.sort((a, b) => a.key.name.localeCompare(b.key.name)); | ||
return { methods, dependencyImports, validationStatements }; | ||
methodProperties.sort((a, b) => a.key.name.localeCompare(b.key.name)); | ||
return { methods: methodProperties, dependencyImports, validationStatements }; | ||
} | ||
exports.generateOperationMethods = generateOperationMethods; |
{ | ||
"name": "api-typescript-generator", | ||
"version": "2.4.9", | ||
"version": "2.4.10", | ||
"description": "Generates OpenAPI TypeScript client. Extremely fast and flexible.", | ||
@@ -5,0 +5,0 @@ "license": "MIT", |
import { | ||
arrayExpression, | ||
arrowFunctionExpression, | ||
assignmentPattern, | ||
blockStatement, | ||
callExpression, | ||
classMethod, | ||
ClassMethod, | ||
ClassProperty, | ||
classProperty, | ||
Expression, | ||
@@ -169,3 +170,3 @@ expressionStatement, | ||
const modelRegisterValidationSchemaImports: Record<string, true> = {}; | ||
const methods: ClassMethod[] = []; | ||
const methodProperties: ClassProperty[] = []; | ||
const validationStatements: Statement[] = []; | ||
@@ -621,5 +622,3 @@ | ||
const operationMethod = classMethod( | ||
'method', | ||
identifier(operationName), | ||
const operationMethod = arrowFunctionExpression( | ||
argument.properties.length > 0 | ||
@@ -649,2 +648,3 @@ ? [ | ||
); | ||
const operationMethodProperty = classProperty(identifier(operationName), operationMethod); | ||
operationMethod.returnType = tsTypeAnnotation( | ||
@@ -654,3 +654,3 @@ tsTypeReference(identifier('Promise'), tsTypeParameterInstantiation([operationReturn.type])) | ||
extendDependencyImports(dependencyImports, operationReturn.dependencyImports); | ||
methods.push(attachJsDocComment(operationMethod, renderJsDoc(jsdoc, jsDocRenderConfig))); | ||
methodProperties.push(attachJsDocComment(operationMethodProperty, renderJsDoc(jsdoc, jsDocRenderConfig))); | ||
} | ||
@@ -678,5 +678,5 @@ } | ||
methods.sort((a, b) => (a.key as Identifier).name.localeCompare((b.key as Identifier).name)); | ||
methodProperties.sort((a, b) => (a.key as Identifier).name.localeCompare((b.key as Identifier).name)); | ||
return {methods, dependencyImports, validationStatements}; | ||
return {methods: methodProperties, dependencyImports, validationStatements}; | ||
} |
755976
14352