@travetto/openapi 7.0.0-rc.3 → 7.0.0-rc.4

package/README.md

@@ -99,7 +99,7 @@ export class ApiSpecConfig {
       this.persist = false;
     } else {
       this.output = path.resolve(Runtime.mainSourcePath, this.output);
-      this.persist ??= Runtime.dynamic;
+      this.persist ??= !Runtime.production;
     }
     if (this.persist) {
       if (!/[.](json|ya?ml) $/.test(this.output)) { // Assume a folder

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/openapi",
-  "version": "7.0.0-rc.3",
+  "version": "7.0.0-rc.4",
   "description": "OpenAPI integration support for the Travetto framework",
   "keywords": [
     "web",
@@ -26,14 +26,14 @@
     "directory": "module/openapi"
   },
   "dependencies": {
-    "@travetto/config": "^7.0.0-rc.2",
-    "@travetto/schema": "^7.0.0-rc.2",
-    "@travetto/web": "^7.0.0-rc.3",
+    "@travetto/config": "^7.0.0-rc.3",
+    "@travetto/schema": "^7.0.0-rc.3",
+    "@travetto/web": "^7.0.0-rc.4",
     "openapi3-ts": "^4.5.0",
     "yaml": "^2.8.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.2"
+    "@travetto/cli": "^7.0.0-rc.3"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config.ts

@@ -73,7 +73,7 @@ export class ApiSpecConfig {
       this.persist = false;
     } else {
       this.output = path.resolve(Runtime.mainSourcePath, this.output);
-      this.persist ??= Runtime.dynamic;
+      this.persist ??= !Runtime.production;
     }
     if (this.persist) {
       if (!/[.](json|ya?ml)$/.test(this.output)) { // Assume a folder

package/src/generate.ts

@@ -12,7 +12,7 @@ import { ApiSpecConfig } from './config.ts';
 
 const DEFINITION = '#/components/schemas';
 
-const isInputConfig = (value: object): value is SchemaInputConfig => !!value && 'owner' in value && 'type' in value;
+const isInputConfig = (value: object): value is SchemaInputConfig => !!value && 'class' in value && 'type' in value;
 const isFieldConfig = (value: object): value is SchemaFieldConfig => isInputConfig(value) && 'name' in value;
 
 type GeneratedSpec = {
@@ -138,19 +138,19 @@ export class OpenapiVisitor implements ControllerVisitor<GeneratedSpec> {
     }
     config.description = input.description;
     if (input.match) {
-      config.pattern = input.match.re!.source;
+      config.pattern = input.match.regex!.source;
     }
     if (input.maxlength) {
-      config.maxLength = input.maxlength.n;
+      config.maxLength = input.maxlength.limit;
     }
     if (input.minlength) {
-      config.minLength = input.minlength.n;
+      config.minLength = input.minlength.limit;
     }
     if (input.min) {
-      config.minimum = typeof input.min.n === 'number' ? input.min.n : input.min.n.getTime();
+      config.minimum = typeof input.min.limit === 'number' ? input.min.limit : input.min.limit.getTime();
     }
     if (input.max) {
-      config.maximum = typeof input.max.n === 'number' ? input.max.n : input.max.n.getTime();
+      config.maximum = typeof input.max.limit === 'number' ? input.max.limit : input.max.limit.getTime();
     }
     if (input.enum) {
       config.enum = input.enum.values;
@@ -314,9 +314,7 @@ export class OpenapiVisitor implements ControllerVisitor<GeneratedSpec> {
     const code = Object.keys(bodyConfig.content).length ? 200 : 201;
     apiConfig.responses![code] = bodyConfig;
 
-    const methodSchema = SchemaRegistryIndex.get(endpoint.class).getMethod(endpoint.methodName);
-
-    for (const param of methodSchema.parameters) {
+    for (const param of schema.parameters) {
       const result = this.#processEndpointParam(endpoint, endpoint.parameters[param.index] ?? {}, param);
       if (result) {
         if ('parameters' in result) {

package/src/service.ts

@@ -3,9 +3,7 @@ import { stringify } from 'yaml';
 
 import { BinaryUtil } from '@travetto/runtime';
 import { Injectable, Inject } from '@travetto/di';
-import { ControllerRegistryIndex, ControllerVisitUtil, WebConfig } from '@travetto/web';
-import { SchemaRegistryIndex } from '@travetto/schema';
-import { Registry } from '@travetto/registry';
+import { ControllerVisitUtil, WebConfig } from '@travetto/web';
 
 import { ApiHostConfig, ApiInfoConfig, ApiSpecConfig } from './config.ts';
 import { OpenapiVisitor } from './generate.ts';
@@ -44,9 +42,6 @@ export class OpenApiService {
    * Initialize after schemas are readied
    */
   async postConstruct(): Promise<void> {
-    Registry.onClassChange(() => this.resetSpec(), ControllerRegistryIndex);
-    Registry.onClassChange(() => this.resetSpec(), SchemaRegistryIndex);
-
     if (!this.apiHostConfig.servers && this.webConfig.baseUrl) {
       this.apiHostConfig.servers = [{ url: this.webConfig.baseUrl }];
     }

package/support/bin/help.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
 import path from 'node:path';
 
-import { ExecUtil, Runtime } from '@travetto/runtime';
+import { ExecUtil, JSONUtil, Runtime } from '@travetto/runtime';
 import { cliTpl } from '@travetto/cli';
 
 /**
@@ -24,7 +24,7 @@ export class OpenApiClientHelp {
       await fs.mkdir(path.dirname(formatCache), { recursive: true });
       await fs.writeFile(formatCache, JSON.stringify([...lines.toSorted(),]));
     }
-    const list: string[] = JSON.parse(await fs.readFile(formatCache, 'utf8'));
+    const list: string[] = await JSONUtil.readFile(formatCache);
     return list;
   }