@travetto/openapi 4.0.2 → 4.0.4

package/README.md

@@ -145,15 +145,8 @@ Options:
   -a, --additional-properties <string>  Additional Properties (default: [])
   -i, --input <string>                  Input file (default: "./openapi.yml")
   -o, --output <string>                 Output folder (default: "./api-client")
-  -d, --docker-image <string>           Docker Image to user (default: "arcsine/openapi-generator:latest")
-  -w, --watch                           Watch for file changes
+  -d, --docker-image <string>           Docker Image to user (default: "openapitools/openapi-generator-cli:latest")
   -h, --help                            display help for command
-
-Available Presets
-----------------------------------
-* @travetto/angular14 -- typescript-angular supportsES6=true,stringEnums=true,ngVersion=14.0,fileNaming=kebab-case
-* @travetto/angular15 -- typescript-angular supportsES6=true,stringEnums=true,ngVersion=15.0,fileNaming=kebab-case
-* @travetto/fetch -- typescript-fetch stringEnums=true
 ```
 
 This tool relies upon a custom build of [OpenAPI client generation tools](https://github.com/OpenAPITools/openapi-generator), which supports watching.  This allows for fast responsive client generation as the shape of the API changes.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/openapi",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "OpenAPI integration support for the Travetto framework",
   "keywords": [
     "rest",
@@ -26,15 +26,15 @@
     "directory": "module/openapi"
   },
   "dependencies": {
-    "@travetto/config": "^4.0.2",
-    "@travetto/rest": "^4.0.2",
-    "@travetto/schema": "^4.0.2",
-    "@travetto/yaml": "^4.0.1",
+    "@travetto/config": "^4.0.3",
+    "@travetto/rest": "^4.0.3",
+    "@travetto/schema": "^4.0.3",
+    "@travetto/yaml": "^4.0.2",
     "openapi3-ts": "^4.2.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.2",
-    "@travetto/command": "^4.0.1"
+    "@travetto/cli": "^4.0.4",
+    "@travetto/command": "^4.0.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/help.ts

@@ -5,8 +5,6 @@ import { ExecUtil } from '@travetto/base';
 import { path, RuntimeContext } from '@travetto/manifest';
 import { cliTpl } from '@travetto/cli';
 
-import { OpenApiClientPresets } from './presets';
-
 /**
  * Help utility for openapi client command
  */
@@ -31,28 +29,16 @@ export class OpenApiClientHelp {
   }
 
   static async help(dockerImage: string, extendedHelp: boolean): Promise<string[]> {
-    const presets = await OpenApiClientPresets.getPresets();
-    const presetLen = Math.max(...Object.keys(presets).map(x => x.length));
-    const presetEntries = Object
-      .entries(presets)
-      .sort(([a], [b]) => a.localeCompare(b))
-      .map(([k, [cmd, v]]) => [`@travetto/${k}`.padEnd(presetLen + 5), [cmd, OpenApiClientPresets.presetMap(v)]] as const);
-
-    const presetText = [
-      cliTpl`${{ subtitle: 'Available Presets' }}`,
-      '----------------------------------',
-      ...presetEntries.map(([k, [cmd, param]]) => cliTpl`* ${{ input: k }} -- ${{ identifier: cmd }} ${{ param }}`),
-    ];
-
+    const help: string[] = [];
     if (extendedHelp) {
       const formats = await this.getListOfFormats(dockerImage);
-      presetText.push(
+      help.push(
         '',
         cliTpl`${{ subtitle: 'Available Formats' }}`,
         '----------------------------------',
         ...formats.map(x => cliTpl`* ${{ input: x }}`)
       );
     }
-    return presetText;
+    return help;
   }
 }

package/support/cli.openapi_client.ts

@@ -4,7 +4,6 @@ import { DockerContainer } from '@travetto/command';
 import { ExecUtil } from '@travetto/base';
 
 import { OpenApiClientHelp } from './bin/help';
-import { OpenApiClientPresets } from './bin/presets';
 
 /**
  * CLI for generating the cli client
@@ -20,30 +19,7 @@ export class OpenApiClientCommand implements CliCommandShape {
   @CliFlag({ desc: 'Output folder' })
   output = './api-client';
   @CliFlag({ desc: 'Docker Image to user' })
-  dockerImage = 'arcsine/openapi-generator:latest';
-  @CliFlag({ desc: 'Watch for file changes' })
-  watch?: boolean;
-
-  async getPropList(format: string): Promise<string> {
-    let propMap = Object.fromEntries(this.props?.map(p => p.split('=')) ?? []);
-
-    if (format.startsWith('@travetto/')) {
-      const key = format.split('@travetto/')[1];
-      const [, props] = (await OpenApiClientPresets.getPresets())[key];
-      propMap = { ...props, ...propMap };
-    }
-
-    return OpenApiClientPresets.presetMap(propMap);
-  }
-
-  async getResolvedFormat(format: string): Promise<string> {
-    if (format.startsWith('@travetto/')) {
-      const key = format.split('@travetto/')[1];
-      const [fmt] = (await OpenApiClientPresets.getPresets())[key];
-      return fmt;
-    }
-    return format;
-  }
+  dockerImage = 'openapitools/openapi-generator-cli:latest';
 
   async help(): Promise<string[]> {
     return OpenApiClientHelp.help(this.dockerImage, this.extendedHelp ?? false);
@@ -61,17 +37,14 @@ export class OpenApiClientCommand implements CliCommandShape {
       .setTTY(false)
       .setDeleteOnFinish(true);
 
-    const propList = await this.getPropList(format);
-
     const proc = await cmd.run([
       'generate',
       '--skip-validate-spec',
       '--remove-operation-id-prefix',
-      '-g', await this.getResolvedFormat(format),
+      '-g', format,
       '-o', '/workspace',
       '-i', `/input/${path.basename(this.input)}`,
-      ...(this.watch ? ['-w'] : []),
-      ...(propList ? ['--additional-properties', propList] : [])
+      ...(this.props.length ? ['--additional-properties', this.props.join(',')] : [])
     ]);
 
     const result = await ExecUtil.getResult(proc);

package/support/bin/presets.ts

@@ -1,22 +0,0 @@
-import { FileLoader } from '@travetto/base';
-
-/**
- * Presets utility for openapi client command
- */
-export class OpenApiClientPresets {
-
-  static #presets: Record<string, [string, object] | [string]>;
-  static #resources = new FileLoader(['@travetto/openapi#support/resources']);
-
-  static async getPresets(): Promise<Record<string, [string, object] | [string]>> {
-    if (!this.#presets) {
-      const text = await this.#resources.read('presets.json');
-      this.#presets = JSON.parse(text);
-    }
-    return this.#presets;
-  }
-
-  static presetMap(prop?: object): string {
-    return !prop || Object.keys(prop).length === 0 ? '' : Object.entries(prop).map(([k, v]) => `${k}=${v}`).join(',');
-  }
-}

package/support/resources/presets.json

@@ -1,26 +0,0 @@
-{
-  "angular15": [
-    "typescript-angular",
-    {
-      "supportsES6": true,
-      "stringEnums": true,
-      "ngVersion": "15.0",
-      "fileNaming": "kebab-case"
-    }
-  ],
-  "angular14": [
-    "typescript-angular",
-    {
-      "supportsES6": true,
-      "stringEnums": true,
-      "ngVersion": "14.0",
-      "fileNaming": "kebab-case"
-    }
-  ],
-  "fetch": [
-    "typescript-fetch",
-    {
-      "stringEnums": true
-    }
-  ]
-}