Merge pull request #22 from karlvr/refactor-naming

Refactor naming
karlvr · Jul 2, 2024 · c546e05 · c546e05
2 parents 08f1c4f + 128cc20
commit c546e05
Show file tree

Hide file tree

Showing 10 changed files with 163 additions and 163 deletions.
diff --git a/templates/api.hbs b/templates/api.hbs
@@ -68,9 +68,9 @@ export default function(app: Express, impl: t.{{className name}}Api) {
 							req.body[{{{stringLiteral name}}}] = req.files[{{{stringLiteral name}}}]{{#unless isArray}}[0]{{/unless}}
 							{{/each}}
 						}
-						return {{>frag/fromJson schema prefix='v.'}}('body', req.body)
+						return {{>frag/fromRequest schema prefix='v.'}}('body', req.body)
 						{{else if (isContentJson .)}}
-						return {{>frag/fromJson schema prefix='v.'}}('body', req.body)
+						return {{>frag/fromRequest schema prefix='v.'}}('body', req.body)
 						{{else if (isBinary schema)}}
 						return req.body as Buffer
 						{{else if (isString schema)}}
@@ -99,7 +99,7 @@ export default function(app: Express, impl: t.{{className name}}Api) {
 						let body: any
 						try {
 							{{#if (isJson defaultContent)}}
-							body = {{>frag/toJson defaultContent.schema prefix='v.'}}('response', response.body)
+							body = {{>frag/toResponse defaultContent.schema prefix='v.'}}('response', response.body)
 							{{else}}
 							body = response.body
 							{{/if}}
@@ -140,7 +140,7 @@ export default function(app: Express, impl: t.{{className name}}Api) {
 					{{#if defaultContent.schema}}
 					let body: any
 					try {
-						body = {{>frag/toJson defaultContent.schema prefix='v.'}}('response', response.body)
+						body = {{>frag/toResponse defaultContent.schema prefix='v.'}}('response', response.body)
 					} catch (error) {
 						console.error('Invalid response body in {{identifier ../../name}}.{{identifier ../name}}', error)
 						res.status(500)

diff --git a/templates/frag/fromJson.hbs b/templates/frag/fromJson.hbs
diff --git a/templates/frag/fromRequest.hbs b/templates/frag/fromRequest.hbs
@@ -0,0 +1,38 @@
+{{!--
+Output a reference to a function to transform the serialized request value to a JavaScript value.
+@param <this> CodegenSchema
+@param prefix the import prefix for the functions
+--}}
+{{#if (isBoolean)}}
+{{prefix}}booleanFromRequest
+{{~else if (isInteger)~}}
+{{prefix}}integerFromRequest
+{{~else if (isNumber)~}}
+{{prefix}}numberFromRequest
+{{~else if (isString)~}}
+{{prefix}}stringFromRequest
+{{~else if (isBinary)~}}
+{{prefix}}binaryFromRequest
+{{~else if (isFile)~}}
+{{prefix}}fileFromRequest
+{{~else if (isObject)~}}
+{{prefix}}model{{className nativeType.parentType}}FromRequest
+{{~else if (isArray)~}}
+{{prefix}}arrayFromRequest{{#if component.nullable}}WithNullable{{/if}}({{>frag/fromRequest component.schema prefix=prefix}})
+{{~else if (isEnum)~}}
+{{prefix}}enum{{className nativeType.parentType}}FromRequest
+{{~else if (isDate)~}}
+{{prefix}}dateFromRequest
+{{~else if (isDateTime)~}}
+{{prefix}}dateTimeFromRequest
+{{~else if (isTime)~}}
+{{prefix}}timeFromRequest
+{{~else if (isMap)~}}
+{{prefix}}mapFromRequest({{>frag/fromRequest component.schema prefix=prefix}})
+{{~else if (isInterface)~}}
+{{prefix}}model{{className nativeType.parentType}}FromRequest
+{{~else if (isOneOf)~}}
+{{prefix}}oneOf{{className nativeType.parentType}}FromRequest
+{{~else~}}
+{{prefix}}unsupportedFromRequest
+{{~/if}}
diff --git a/templates/frag/parseType.hbs b/templates/frag/parseType.hbs
@@ -20,11 +20,11 @@ Parse input
 {{~else if (isDateTime)~}}
 {{prefix}}parseDateTime
 {{~else if (isObject)~}}
-{{prefix}}{{!--TODO--}}model{{className nativeType}}FromJson
+{{prefix}}{{!--TODO--}}model{{className nativeType}}FromRequest
 {{~else if (isArray)~}}
-{{prefix}}{{!--TODO--}}arrayFromJson{{#if schema.component.nullable}}WithNullable{{/if}}({{>frag/fromJson schema.component.schema prefix=prefix}})
+{{prefix}}{{!--TODO--}}arrayFromRequest{{#if schema.component.nullable}}WithNullable{{/if}}({{>frag/fromRequest schema.component.schema prefix=prefix}})
 {{~else if (isEnum)~}}
-{{prefix}}enum{{className nativeType}}FromJson
+{{prefix}}enum{{className nativeType}}FromRequest
 {{~else~}}
 {{prefix}}parseUnsupported{{/if~}}
 {{#unless required}}

diff --git a/templates/frag/toJson.hbs b/templates/frag/toJson.hbs
diff --git a/templates/frag/toResponse.hbs b/templates/frag/toResponse.hbs
@@ -0,0 +1,36 @@
+{{!--
+Output a reference to a function to serialize the value to the form suitable for a response.
+@param <this> CodegenSchema
+@param prefix the import prefix for the functions
+--}}
+{{#if (isBoolean)}}
+{{prefix}}booleanToResponse
+{{~else if (isInteger)~}}
+{{prefix}}integerToResponse
+{{~else if (isNumber)~}}
+{{prefix}}numberToResponse
+{{~else if (isString)~}}
+{{prefix}}stringToResponse
+{{~else if (isBinary)~}}
+{{prefix}}binaryToResponse
+{{~else if (isObject)~}}
+{{prefix}}model{{className nativeType.parentType}}ToResponse
+{{~else if (isArray)~}}
+{{prefix}}arrayToResponse({{>frag/toResponse component.schema prefix=prefix}})
+{{~else if (isEnum)~}}
+{{prefix}}enum{{className nativeType.parentType}}ToResponse
+{{~else if (isDate)~}}
+{{prefix}}dateToResponse
+{{~else if (isDateTime)~}}
+{{prefix}}dateTimeToResponse
+{{~else if (isTime)~}}
+{{prefix}}timeToResponse
+{{~else if (isMap)~}}
+{{prefix}}mapToResponse({{>frag/toResponse component.schema prefix=prefix}})
+{{~else if (isInterface)~}}
+{{prefix}}model{{className nativeType.parentType}}ToResponse
+{{~else if (isOneOf)~}}
+{{prefix}}oneOf{{className nativeType.parentType}}ToResponse
+{{~else~}}
+{{prefix}}unsupportedToResponse
+{{~/if}}