@travetto/openapi 4.0.0-rc.0 → 4.0.0-rc.10

package/package.json

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

package/src/service.ts

@@ -1,6 +1,6 @@
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
 
-import { ManifestFileUtil } from '@travetto/manifest';
+import { Util } from '@travetto/base';
 import { Injectable, Inject } from '@travetto/di';
 import { ControllerRegistry, ControllerVisitUtil, RestConfig } from '@travetto/rest';
 import { SchemaRegistry } from '@travetto/schema';
@@ -80,7 +80,7 @@ export class OpenApiService {
         JSON.stringify(spec, undefined, 2) :
         YamlUtil.serialize(spec);
 
-      await ManifestFileUtil.bufferedFileWrite(this.apiSpecConfig.output, output);
+      await Util.bufferedFileWrite(this.apiSpecConfig.output, output);
     } catch (err) {
       console.error('Unable to persist openapi spec', err);
     }

package/support/bin/help.ts

@@ -1,9 +1,11 @@
 import fs from 'node:fs/promises';
+import { spawn } from 'node:child_process';
 
-import { ManifestFileUtil, path, RuntimeIndex } from '@travetto/manifest';
+import { ExecUtil } from '@travetto/base';
+import { path, RuntimeContext } from '@travetto/manifest';
 import { cliTpl } from '@travetto/cli';
+
 import { OpenApiClientPresets } from './presets';
-import { ExecUtil } from '@travetto/base';
 
 /**
  * Help utility for openapi client command
@@ -11,11 +13,10 @@ import { ExecUtil } from '@travetto/base';
 export class OpenApiClientHelp {
 
   static async getListOfFormats(dockerImage: string): Promise<string[]> {
-    const formatCache = ManifestFileUtil.toolPath(RuntimeIndex, 'openapi-formats.json');
+    const formatCache = RuntimeContext.toolPath('openapi-formats.json');
     if (!await fs.stat(formatCache).catch(() => false)) {
-      const stdout = ExecUtil.spawn('docker', ['run', '--rm', dockerImage, 'list']);
-      const res = await stdout.result;
-      const lines = res.stdout
+      const { stdout } = await ExecUtil.getResult(spawn('docker', ['run', '--rm', dockerImage, 'list'], { shell: false }));
+      const lines = stdout
         .split('DOCUMENTATION')[0]
         .trim()
         .split(/\n/g)

package/support/cli.openapi_client.ts

@@ -1,6 +1,7 @@
 import { path } from '@travetto/manifest';
 import { CliCommandShape, CliCommand, CliFlag } from '@travetto/cli';
 import { DockerContainer } from '@travetto/command';
+import { ExecUtil } from '@travetto/base';
 
 import { OpenApiClientHelp } from './bin/help';
 import { OpenApiClientPresets } from './bin/presets';
@@ -62,7 +63,7 @@ export class OpenApiClientCommand implements CliCommandShape {
 
     const propList = await this.getPropList(format);
 
-    const res = cmd.run([
+    const proc = await cmd.run([
       'generate',
       '--skip-validate-spec',
       '--remove-operation-id-prefix',
@@ -73,7 +74,7 @@ export class OpenApiClientCommand implements CliCommandShape {
       ...(propList ? ['--additional-properties', propList] : [])
     ]);
 
-    const result = await res;
+    const result = await ExecUtil.getResult(proc);
     if (!result.valid) {
       process.exitCode = 1;
     }