@travetto/openapi 3.1.18 → 3.2.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/openapi",
-  "version": "3.1.18",
+  "version": "3.2.0-rc.0",
   "description": "OpenAPI integration support for the Travetto framework",
   "keywords": [
     "rest",
@@ -26,15 +26,15 @@
     "directory": "module/openapi"
   },
   "dependencies": {
-    "@travetto/config": "^3.1.8",
-    "@travetto/rest": "^3.1.11",
-    "@travetto/schema": "^3.1.8",
-    "@travetto/yaml": "^3.1.3",
+    "@travetto/config": "^3.2.0-rc.0",
+    "@travetto/rest": "^3.2.0-rc.0",
+    "@travetto/schema": "^3.2.0-rc.0",
+    "@travetto/yaml": "^3.2.0-rc.0",
     "openapi3-ts": "^3.2.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.1.9",
-    "@travetto/command": "^3.1.4"
+    "@travetto/cli": "^3.2.0-rc.0",
+    "@travetto/command": "^3.2.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/controller.ts

@@ -1,34 +1,27 @@
-import { Controller, Get, SetHeaders, Undocumented } from '@travetto/rest';
+import { ConfigureInterceptor, Controller, CorsInterceptor, Get, SetHeaders, Undocumented } from '@travetto/rest';
 import { Inject } from '@travetto/di';
 import { YamlUtil } from '@travetto/yaml';
 
 import { OpenApiService } from './service';
 
-const CORS_HEADERS = {
-  'Access-Control-Allow-Origin': '*',
-  'Access-Control-Allow-Method': 'GET',
-  'Access-Control-Allow-Headers': '*',
-  'Access-Control-Allow-Credentials': 'true'
-};
-
 /**
  * Basic controller for surfacing the api spec
  */
 @Undocumented()
 @Controller('/')
+@ConfigureInterceptor(CorsInterceptor, { origins: ['*'] })
 export class OpenApiController {
 
   @Inject()
   service: OpenApiService;
 
   @Get('openapi.json')
-  @SetHeaders(CORS_HEADERS)
   async getSpec(): Promise<object> {
     return this.service.getSpec(); // Force output to be simple
   }
 
   @Get('openapi.yaml')
-  @SetHeaders({ 'Content-Type': 'text/vnd.yaml', ...CORS_HEADERS })
+  @SetHeaders({ 'Content-Type': 'text/vnd.yaml' })
   async getYmlSpec(): Promise<string> {
     return YamlUtil.serialize(await this.service.getSpec()); // Force output to be simple
   }

package/src/spec-generate.ts

@@ -291,12 +291,13 @@ export class OpenapiVisitor implements ControllerVisitor<GeneratedSpec> {
     { parameters: ParameterObject[] } |
     undefined
   ) {
+    const complex = field.type && SchemaRegistry.has(field.type);
     if (param.location) {
       if (param.location === 'body') {
         return {
           requestBody: field.specifiers?.includes('file') ? this.#buildUploadBody() : this.#getEndpointBody(field, this.#getHeaderValue(ep, 'accepts'))
         };
-      } else if (field.type && SchemaRegistry.has(field.type) && (param.location === 'query' || param.location === 'header')) {
+      } else if (complex && (param.location === 'query' || param.location === 'header')) {
         return { parameters: this.#schemaToDotParams(param.location, field, param.prefix ? `${param.prefix}.` : '') };
       } else if (param.location !== 'context') {
         const epParam: ParameterObject = {