@travetto/openapi 5.0.0-rc.0 → 5.0.0-rc.2

package/README.md

@@ -29,8 +29,7 @@ import path from 'node:path';
 import type { ServerObject, ContactObject, LicenseObject } from 'openapi3-ts/oas31';
 
 import { Config } from '@travetto/config';
-import { RuntimeIndex, RuntimeContext } from '@travetto/manifest';
-import { Env } from '@travetto/base';
+import { Runtime } from '@travetto/runtime';
 import { Required } from '@travetto/schema';
 
 /**
@@ -52,9 +51,9 @@ export class ApiInfoConfig {
   version: string;
 
   postConstruct(): void {
-    this.title ??= RuntimeContext.main.name;
-    this.version ??= RuntimeContext.main.version;
-    this.description ??= RuntimeContext.main.description;
+    this.title ??= Runtime.main.name;
+    this.version ??= Runtime.main.version;
+    this.description ??= Runtime.main.description;
   }
 }
 
@@ -99,8 +98,8 @@ export class ApiSpecConfig {
     if (!this.output || this.output === '-') {
       this.persist = false;
     } else {
-      this.output = path.resolve(RuntimeIndex.mainModule.sourcePath, this.output);
-      this.persist ??= Env.dynamic;
+      this.output = path.resolve(Runtime.mainSourcePath, this.output);
+      this.persist ??= Runtime.dynamic;
     }
     if (this.persist) {
       if (!/[.](json|ya?ml) $/.test(this.output)) { // Assume a folder

package/package.json

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

package/src/config.ts

@@ -3,8 +3,7 @@ import path from 'node:path';
 import type { ServerObject, ContactObject, LicenseObject } from 'openapi3-ts/oas31';
 
 import { Config } from '@travetto/config';
-import { RuntimeIndex, RuntimeContext } from '@travetto/manifest';
-import { Env } from '@travetto/base';
+import { Runtime } from '@travetto/runtime';
 import { Required } from '@travetto/schema';
 
 /**
@@ -26,9 +25,9 @@ export class ApiInfoConfig {
   version: string;
 
   postConstruct(): void {
-    this.title ??= RuntimeContext.main.name;
-    this.version ??= RuntimeContext.main.version;
-    this.description ??= RuntimeContext.main.description;
+    this.title ??= Runtime.main.name;
+    this.version ??= Runtime.main.version;
+    this.description ??= Runtime.main.description;
   }
 }
 
@@ -73,8 +72,8 @@ export class ApiSpecConfig {
     if (!this.output || this.output === '-') {
       this.persist = false;
     } else {
-      this.output = path.resolve(RuntimeIndex.mainModule.sourcePath, this.output);
-      this.persist ??= Env.dynamic;
+      this.output = path.resolve(Runtime.mainSourcePath, this.output);
+      this.persist ??= Runtime.dynamic;
     }
     if (this.persist) {
       if (!/[.](json|ya?ml)$/.test(this.output)) { // Assume a folder

package/src/service.ts

@@ -1,6 +1,6 @@
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
 
-import { Util } from '@travetto/base';
+import { Util } from '@travetto/runtime';
 import { Injectable, Inject } from '@travetto/di';
 import { ControllerRegistry, ControllerVisitUtil, RestConfig } from '@travetto/rest';
 import { SchemaRegistry } from '@travetto/schema';

package/src/spec-generate.ts

@@ -5,8 +5,7 @@ import type {
 } from 'openapi3-ts/oas31';
 
 import { EndpointConfig, ControllerConfig, ParamConfig, EndpointIOType, ControllerVisitor } from '@travetto/rest';
-import { RuntimeIndex } from '@travetto/manifest';
-import { Class } from '@travetto/base';
+import { Class, describeFunction } from '@travetto/runtime';
 import { SchemaRegistry, FieldConfig, ClassConfig, SchemaNameResolver } from '@travetto/schema';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 
@@ -218,11 +217,11 @@ export class OpenapiVisitor implements ControllerVisitor<GeneratedSpec> {
         }
 
         const extra: Record<string, unknown> = {};
-        if (RuntimeIndex.getFunctionMetadata(cls)?.abstract) {
+        if (describeFunction(cls)?.abstract) {
           const map = SchemaRegistry.getSubTypesForClass(cls);
           if (map) {
             extra.oneOf = map
-              .filter(x => !RuntimeIndex.getFunctionMetadata(x)?.abstract)
+              .filter(x => !describeFunction(x)?.abstract)
               .map(c => {
                 this.onSchema(SchemaRegistry.get(c));
                 return this.#getType(c);

package/support/bin/help.ts

@@ -2,8 +2,7 @@ import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
 import path from 'node:path';
 
-import { ExecUtil } from '@travetto/base';
-import { RuntimeContext } from '@travetto/manifest';
+import { ExecUtil, Runtime } from '@travetto/runtime';
 import { cliTpl } from '@travetto/cli';
 
 /**
@@ -12,7 +11,7 @@ import { cliTpl } from '@travetto/cli';
 export class OpenApiClientHelp {
 
   static async getListOfFormats(dockerImage: string): Promise<string[]> {
-    const formatCache = RuntimeContext.toolPath('openapi-formats.json');
+    const formatCache = Runtime.toolPath('openapi-formats.json');
     if (!await fs.stat(formatCache).catch(() => false)) {
       const { stdout } = await ExecUtil.getResult(spawn('docker', ['run', '--rm', dockerImage, 'list'], { shell: false }));
       const lines = stdout

package/support/cli.openapi_client.ts

@@ -2,7 +2,7 @@ import path from 'node:path';
 
 import { CliCommandShape, CliCommand, CliFlag } from '@travetto/cli';
 import { DockerContainer } from '@travetto/command';
-import { ExecUtil } from '@travetto/base';
+import { ExecUtil } from '@travetto/runtime';
 
 import { OpenApiClientHelp } from './bin/help';
 

package/support/cli.openapi_spec.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import { CliCommandShape, CliCommand } from '@travetto/cli';
-import { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 import { RootRegistry } from '@travetto/registry';
 import { DependencyRegistry } from '@travetto/di';