@travetto/openapi 3.4.1 → 3.4.2

package/README.md

@@ -24,7 +24,7 @@ All of the high level configurations can be found in the following structure:
 
 **Code: Config: OpenAPI Configuration**
 ```typescript
-import type { ServerObject, ContactObject, LicenseObject } from 'openapi3-ts/oas30';
+import type { ServerObject, ContactObject, LicenseObject } from 'openapi3-ts/oas31';
 
 import { Config } from '@travetto/config';
 import { path, RootIndex } from '@travetto/manifest';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/openapi",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "OpenAPI integration support for the Travetto framework",
   "keywords": [
     "rest",
@@ -26,14 +26,14 @@
     "directory": "module/openapi"
   },
   "dependencies": {
-    "@travetto/config": "^3.4.1",
-    "@travetto/rest": "^3.4.1",
-    "@travetto/schema": "^3.4.1",
+    "@travetto/config": "^3.4.2",
+    "@travetto/rest": "^3.4.2",
+    "@travetto/schema": "^3.4.2",
     "@travetto/yaml": "^3.4.1",
     "openapi3-ts": "^4.1.2"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.3",
+    "@travetto/cli": "^3.4.4",
     "@travetto/command": "^3.4.1"
   },
   "peerDependenciesMeta": {

package/src/config.ts

@@ -1,4 +1,4 @@
-import type { ServerObject, ContactObject, LicenseObject } from 'openapi3-ts/oas30';
+import type { ServerObject, ContactObject, LicenseObject } from 'openapi3-ts/oas31';
 
 import { Config } from '@travetto/config';
 import { path, RootIndex } from '@travetto/manifest';

package/src/spec-generate.ts

@@ -7,7 +7,7 @@ import type {
 import { EndpointConfig, ControllerConfig, ParamConfig, EndpointIOType, ControllerVisitor } from '@travetto/rest';
 import { RootIndex } from '@travetto/manifest';
 import { Class } from '@travetto/base';
-import { SchemaRegistry, FieldConfig, ClassConfig } from '@travetto/schema';
+import { SchemaRegistry, FieldConfig, ClassConfig, SchemaNameResolver } from '@travetto/schema';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 
 import { ApiSpecConfig } from './config';
@@ -37,6 +37,8 @@ export class OpenapiVisitor implements ControllerVisitor<GeneratedSpec> {
 
   #config: Partial<ApiSpecConfig> = {};
 
+  #nameResolver = new SchemaNameResolver();
+
   constructor(config: Partial<ApiSpecConfig> = {}) {
     this.#config = config;
   }
@@ -95,7 +97,7 @@ export class OpenapiVisitor implements ControllerVisitor<GeneratedSpec> {
     const out: Record<string, unknown> = {};
     // Handle nested types
     if (SchemaRegistry.has(field.type)) {
-      const id = SchemaRegistry.get(field.type).externalName;
+      const id = this.#nameResolver.getName(SchemaRegistry.get(field.type));
       // Exposing
       this.#schemas[id] = this.#allSchemas[id];
       out.$ref = `${DEFINITION}/${id}`;
@@ -193,7 +195,7 @@ export class OpenapiVisitor implements ControllerVisitor<GeneratedSpec> {
     }
 
     const cls = type.class;
-    const typeId = type.externalName;
+    const typeId = this.#nameResolver.getName(type);
 
     if (!this.#allSchemas[typeId]) {
       const config = SchemaRegistry.get(cls);
@@ -253,8 +255,9 @@ export class OpenapiVisitor implements ControllerVisitor<GeneratedSpec> {
         description: ''
       };
     } else {
-      const typeId = SchemaRegistry.get(body.type)?.externalName ?? body.type.name;
-      const typeRef = SchemaRegistry.has(body.type) ? this.#getType(body.type) : { type: body.type.name.toLowerCase() };
+      const cls = SchemaRegistry.get(body.type);
+      const typeId = cls ? this.#nameResolver.getName(cls) : body.type.name;
+      const typeRef = cls ? this.#getType(body.type) : { type: body.type.name.toLowerCase() };
       return {
         content: {
           [mime ?? 'application/json']: {