From 84248c08592682d268f091db4b88c53caa184562 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 28 Sep 2021 09:29:14 +0200
Subject: [PATCH 01/27] Add yargs options

---
 .../openapi-generator/src/options/flags.ts    | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/flags.ts
index 5f1f7e657d..d7349f9261 100644
--- a/packages/openapi-generator/src/options/flags.ts
+++ b/packages/openapi-generator/src/options/flags.ts
@@ -2,6 +2,111 @@ import { resolve, extname } from 'path';
 import { existsSync, lstatSync } from 'fs';
 import { flags } from '@oclif/command';
 
+export const generatorOptions = {
+  input: {
+    string: true,
+    alias: 'i',
+    description:
+      'Specify the path to the directory or file containing the OpenAPI service definition(s) to generate clients for. Accepts Swagger and OpenAPI definitions as YAML and JSON files. Throws an error if the path does not exist.',
+    coerce: (input: string): string => resolve(input),
+    default: ''
+  },
+  outputDir: {
+    string: true,
+    alias: 'o',
+    description:
+      'Specify the path to the directory to generate the client(s) in. Each client is generated into a subdirectory within the given output directory. Creates the directory if it does not exist. Customize subdirectory naming through `--optionsPerService`.',
+    coerce: (input: string): string => resolve(input),
+    default: ''
+  },
+  transpile: {
+    boolean: true,
+    alias: 't',
+    description:
+      'Transpile the generated TypeScript code. When enabled a default `tsconfig.json` will be generated and used. It emits `.js`, `.js.map`, `.d.ts` and `.d.ts.map` files. To configure transpilation set `--tsconfig`.',
+    default: false
+  },
+  include: {
+    string: true,
+    description:
+      'Include files matching the given glob into the root of each generated client directory.'
+  },
+  overwrite: {
+    boolean: true,
+    description:
+      'Allow to overwrite files, that already exist. This is useful, when running the generation regularly.',
+    default: false
+  },
+  clearOutputDir: {
+    boolean: true,
+    description:
+      'Remove all files in the output directory before generation. Be cautious when using this option, as it really removes EVERYTHING in the output directory.',
+    default: false
+  },
+  skipValidation: {
+    boolean: true,
+    description:
+      'By default, the generation fails, when there are duplicate or invalid names for operations and/or path parameters after transforming them to camel case. Set this to true to enable unique and valid name generation. The names will then be generated by appending numbers and prepending prefixes.',
+    default: false
+  },
+  tsConfig: {
+    string: true,
+    description:
+      'Replace the default `tsconfig.json` by passing a path to a custom config. By default, a `tsconfig.json` is only generated, when transpilation is enabled (`--transpile`). If a directory is passed, a `tsconfig.json` file is read from this directory.',
+    coerce: (input: string): string => resolve(input)
+  },
+  packageJson: {
+    boolean: true,
+    description:
+      'When enabled, a `package.json`, that specifies dependencies and scripts for transpilation and documentation generation is generated.',
+    default: false
+  },
+  verbose: {
+    boolean: true,
+    alias: 'v',
+    description: 'Turn on verbose logging.',
+    default: false
+  },
+  optionsPerService: {
+    string: true,
+    description:
+      'Set the path to a file containing the options per service. The configuration allows to set a `directoryName` and `packageName` for every service, identified by the path to the original file. It also makes sure that names do not change between generator runs. If a directory is passed, a `options-per-service.json` file is read/created in this directory.',
+    coerce: (input: string): string => {
+      const isFilePath =
+        (existsSync(input) && lstatSync(input).isFile()) || !!extname(input);
+      return isFilePath
+        ? resolve(input)
+        : resolve(input, 'options-per-service.json');
+    }
+  },
+  packageVersion: {
+    string: true,
+    description: 'Set the version in the generated package.json.',
+    default: '1.0.0',
+    hidden: true
+  },
+  readme: {
+    boolean: true,
+    description:
+      'Generate default `README.md` files in the client directories.',
+    default: false,
+    hidden: true
+  },
+  metadata: {
+    boolean: true,
+    description: 'When enabled, metadata for the API hub is generated.',
+    default: false,
+    hidden: true
+  },
+  config: {
+    string: true,
+    alias: 'c',
+    parse: (input: string): string => resolve(input),
+    description:
+      'Set the path to a file containing the options for generation instead of setting the options on the command line. When combining the `config` option with other options on the command line, the command line options take precedence. If a directory is passed, a `config.json` file is read from this directory.'
+  }
+};
+
 export const generatorFlags = {
   input: flags.string({
     char: 'i',

From 6827a6dbccb73a052b9aeb329e5738bc7d03b2da Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 28 Sep 2021 11:32:25 +0200
Subject: [PATCH 02/27] Fix types

---
 packages/openapi-generator/package.json       |   4 +-
 packages/openapi-generator/src/cli/index.ts   |  31 +-
 packages/openapi-generator/src/generator.ts   |  40 +-
 .../openapi-generator/src/options/flags.ts    |   5 +-
 .../src/options/generator-options.ts          |  20 +-
 .../src/options/options-per-service.ts        |  14 +-
 .../src/options/tsconfig-json.ts              |  15 +-
 yarn.lock                                     | 346 +++++++++---------
 8 files changed, 252 insertions(+), 223 deletions(-)

diff --git a/packages/openapi-generator/package.json b/packages/openapi-generator/package.json
index 663787d398..c19e7e0d44 100644
--- a/packages/openapi-generator/package.json
+++ b/packages/openapi-generator/package.json
@@ -49,10 +49,12 @@
     "glob": "^7.1.6",
     "js-yaml": "^4.0.0",
     "openapi-types": "^9.3.0",
-    "swagger2openapi": "^7.0.4"
+    "swagger2openapi": "^7.0.4",
+    "yargs": "^17.1.1"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.2",
+    "@types/yargs": "^17.0.2",
     "mock-fs": "^5.0.0",
     "nock": "^13.0.11",
     "typescript": "~4.3.4"
diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index d6263358cf..a80d8e210a 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -3,15 +3,40 @@ import { cli } from 'cli-ux';
 import { createLogger } from '@sap-cloud-sdk/util';
 // eslint-disable-next-line import/no-internal-modules
 import { FlagToken } from '@oclif/parser/lib/parse';
+import yargs from 'yargs';
+// eslint-disable-next-line import/no-internal-modules
+import { hideBin } from 'yargs/helpers';
 import {
   parseOptionsFromConfig,
   getSpecifiedFlags,
-  generatorFlags
+  generatorFlags,
+  generatorOptions
 } from '../options';
 import { generate, generateWithParsedOptions } from '../generator';
 
 const logger = createLogger('openapi-generator');
-class OpenApiGenerator extends Command {
+
+export async function parseCmdArgs(): Promise<void> {
+  const argv = await yargs(hideBin(process.argv))
+    .usage('--input <input> --outputDir <outputDirectory>')
+    .options(generatorOptions)
+    .strict().argv;
+
+  if (argv.config) {
+    await generate({
+      ...(await parseOptionsFromConfig(argv.config)),
+      ...getSpecifiedFlags(
+        argv,
+        (parsed.raw as FlagToken[]).map(({ flag }) => flag)
+      )
+    });
+  } else {
+    await generateWithParsedOptions(argv);
+  }
+  return;
+}
+
+export class OpenApiGenerator extends Command {
   static description =
     'Generate OpenAPI client(s), that use the connectivity features of the SAP Cloud SDK for JavaScript/TypeScript.';
 
@@ -50,5 +75,3 @@ $ openapi-generator --input ./my-spec.yaml --outputDir ./client --transpile`
     }
   }
 }
-
-export = OpenApiGenerator;
diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts
index b1b752f0df..13e13798dc 100644
--- a/packages/openapi-generator/src/generator.ts
+++ b/packages/openapi-generator/src/generator.ts
@@ -43,7 +43,8 @@ import {
   tsconfigJson,
   ServiceOptions,
   OptionsPerService,
-  getOptionsPerService
+  getOptionsPerService,
+  GeneratorOptions2
 } from './options';
 import { sdkMetadata } from './sdk-metadata';
 import { GeneratorOptions } from '.';
@@ -66,7 +67,7 @@ export async function generate(options: GeneratorOptions): Promise<void> {
  * @param options - Options to configure generation.
  */
 export async function generateWithParsedOptions(
-  options: ParsedGeneratorOptions
+  options: ParsedGeneratorOptions | GeneratorOptions2
 ): Promise<void> {
   if (options.input === '' || options.outputDir === '') {
     throw new Error('Either input or outputDir were not set.');
@@ -127,7 +128,7 @@ async function generateSources(
   openApiDocument: OpenApiDocument,
   inputFilePath: string,
   tsConfig: string | undefined,
-  options: ParsedGeneratorOptions
+  options: ParsedGeneratorOptions | GeneratorOptions2
 ): Promise<void> {
   await mkdir(serviceDir, { recursive: true });
 
@@ -168,32 +169,32 @@ async function generateSources(
 async function generateMandatorySources(
   serviceDir: string,
   openApiDocument: OpenApiDocument,
-  options: ParsedGeneratorOptions
+  { overwrite }: ParsedGeneratorOptions | GeneratorOptions2
 ) {
   if (openApiDocument.schemas.length) {
     const schemaDir = resolve(serviceDir, 'schema');
-    await createSchemaFiles(schemaDir, openApiDocument, options);
+    await createSchemaFiles(schemaDir, openApiDocument, !!overwrite);
     await createFile(
       schemaDir,
       'index.ts',
       schemaIndexFile(openApiDocument),
-      options.overwrite
+      !!overwrite
     );
   }
 
-  await createApis(serviceDir, openApiDocument, options);
+  await createApis(serviceDir, openApiDocument, !!overwrite);
   await createFile(
     serviceDir,
     'index.ts',
     apiIndexFile(openApiDocument),
-    options.overwrite
+    !!overwrite
   );
 }
 
 async function createApis(
   serviceDir: string,
   openApiDocument: OpenApiDocument,
-  options: ParsedGeneratorOptions
+  overwrite: boolean
 ): Promise<void> {
   await Promise.all(
     openApiDocument.apis.map(api =>
@@ -201,7 +202,7 @@ async function createApis(
         serviceDir,
         `${kebabCase(api.name)}.ts`,
         apiFile(api, openApiDocument.serviceName),
-        options.overwrite
+        overwrite
       )
     )
   );
@@ -210,17 +211,12 @@ async function createApis(
 async function createSchemaFiles(
   dir: string,
   openApiDocument: OpenApiDocument,
-  options: ParsedGeneratorOptions
+  overwrite: boolean
 ): Promise<void> {
   await mkdir(dir, { recursive: true });
   await Promise.all(
     openApiDocument.schemas.map(schema =>
-      createFile(
-        dir,
-        `${schema.fileName}.ts`,
-        schemaFile(schema),
-        options.overwrite
-      )
+      createFile(dir, `${schema.fileName}.ts`, schemaFile(schema), overwrite)
     )
   );
 }
@@ -235,7 +231,7 @@ async function createSchemaFiles(
  */
 async function generateService(
   inputFilePath: string,
-  options: ParsedGeneratorOptions,
+  options: ParsedGeneratorOptions | GeneratorOptions2,
   serviceOptions: ServiceOptions,
   tsConfig: string | undefined
 ): Promise<void> {
@@ -328,7 +324,7 @@ function generateReadme(
 async function generateMetadata(
   openApiDocument: OpenApiDocument,
   inputFilePath: string,
-  options: ParsedGeneratorOptions
+  { packageVersion, overwrite }: ParsedGeneratorOptions
 ) {
   const { name: inputFileName, dir: inputDirPath } = parse(inputFilePath);
   const { clientFileName, headerFileName } =
@@ -341,11 +337,11 @@ async function generateMetadata(
     metadataDir,
     headerFileName,
     JSON.stringify(
-      await sdkMetadataHeader('rest', inputFileName, options.packageVersion),
+      await sdkMetadataHeader('rest', inputFileName, packageVersion),
       null,
       2
     ),
-    options.overwrite,
+    overwrite,
     false
   );
 
@@ -354,7 +350,7 @@ async function generateMetadata(
     metadataDir,
     clientFileName,
     JSON.stringify(await sdkMetadata(openApiDocument), null, 2),
-    options.overwrite,
+    overwrite,
     false
   );
   return Promise.all([headerFile, clientFile]);
diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/flags.ts
index d7349f9261..d423eee4df 100644
--- a/packages/openapi-generator/src/options/flags.ts
+++ b/packages/openapi-generator/src/options/flags.ts
@@ -1,5 +1,6 @@
 import { resolve, extname } from 'path';
 import { existsSync, lstatSync } from 'fs';
+import { GlobSync } from 'glob';
 import { flags } from '@oclif/command';
 
 export const generatorOptions = {
@@ -28,6 +29,7 @@ export const generatorOptions = {
   },
   include: {
     string: true,
+    coerce: (input: string): string[] => new GlobSync(input).found,
     description:
       'Include files matching the given glob into the root of each generated client directory.'
   },
@@ -101,7 +103,8 @@ export const generatorOptions = {
   config: {
     string: true,
     alias: 'c',
-    parse: (input: string): string => resolve(input),
+    // config: true,
+    coerce: (input: string): string => resolve(input),
     description:
       'Set the path to a file containing the options for generation instead of setting the options on the command line. When combining the `config` option with other options on the command line, the command line options take precedence. If a directory is passed, a `config.json` file is read from this directory.'
   }
diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index 7db1c0e96d..5efb3e3e86 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -2,7 +2,7 @@ import { promises } from 'fs';
 import { resolve } from 'path';
 import Parser from '@oclif/parser';
 import { ErrorWithCause, createLogger } from '@sap-cloud-sdk/util';
-import OpenApiGenerator from '../cli';
+import { OpenApiGenerator } from '../cli';
 import { generatorFlags } from './flags';
 const { readFile, lstat } = promises;
 
@@ -30,6 +30,24 @@ export interface GeneratorOptions {
   config?: string;
 }
 
+export interface GeneratorOptions2 {
+  input: string;
+  outputDir: string;
+  transpile: boolean;
+  include?: string[];
+  overwrite: boolean;
+  clearOutputDir: boolean;
+  skipValidation: boolean;
+  tsConfig?: string;
+  packageJson: boolean;
+  verbose: boolean;
+  optionsPerService?: string;
+  packageVersion?: string;
+  readme: boolean;
+  metadata: boolean;
+  config?: string;
+}
+
 /**
  * Parsed options with default values.
  */
diff --git a/packages/openapi-generator/src/options/options-per-service.ts b/packages/openapi-generator/src/options/options-per-service.ts
index ec629bd482..0d611c700b 100644
--- a/packages/openapi-generator/src/options/options-per-service.ts
+++ b/packages/openapi-generator/src/options/options-per-service.ts
@@ -3,6 +3,7 @@ import { parse } from 'path';
 import { unique, UniqueNameGenerator } from '@sap-cloud-sdk/util';
 import { getRelPathWithPosixSeparator } from '../generator';
 import { ParsedGeneratorOptions } from './generator-options';
+import { GeneratorOptions2 } from '.';
 
 const { readFile } = promises;
 
@@ -58,10 +59,13 @@ export async function getOriginalOptionsPerService(
  */
 export async function getOptionsPerService(
   inputPaths: string[],
-  options: ParsedGeneratorOptions
+  {
+    optionsPerService,
+    skipValidation
+  }: ParsedGeneratorOptions | GeneratorOptions2
 ): Promise<OptionsPerService> {
   const originalOptionsPerService = await getOriginalOptionsPerService(
-    options.optionsPerService
+    optionsPerService
   );
 
   const uniqueNameGenerator = new UniqueNameGenerator('-');
@@ -70,11 +74,11 @@ export async function getOptionsPerService(
     inputPaths,
     originalOptionsPerService
   );
-  if (!options.skipValidation) {
+  if (!skipValidation) {
     validateDirectoryNames(directoryNamesByPaths);
   }
 
-  const optionsPerService: OptionsPerService = inputPaths.reduce(
+  const optsPerService: OptionsPerService = inputPaths.reduce(
     (previousOptions, inputPath) => {
       const relativePath = getRelPathWithPosixSeparator(inputPath);
 
@@ -91,7 +95,7 @@ export async function getOptionsPerService(
     {}
   );
 
-  return optionsPerService;
+  return optsPerService;
 }
 
 function getDirectoryNamesByPaths(
diff --git a/packages/openapi-generator/src/options/tsconfig-json.ts b/packages/openapi-generator/src/options/tsconfig-json.ts
index d337bb7792..f52191ab89 100644
--- a/packages/openapi-generator/src/options/tsconfig-json.ts
+++ b/packages/openapi-generator/src/options/tsconfig-json.ts
@@ -1,7 +1,7 @@
 import { promises } from 'fs';
 import { resolve } from 'path';
 import { ErrorWithCause, formatJson } from '@sap-cloud-sdk/util';
-import { ParsedGeneratorOptions } from './generator-options';
+import { ParsedGeneratorOptions, GeneratorOptions2 } from './generator-options';
 const { readFile, lstat } = promises;
 
 export const defaultTsConfig = {
@@ -28,12 +28,13 @@ export const defaultTsConfig = {
  * @param options - Options passed to the generator.
  * @returns The serialized tsconfig.json contents.
  */
-export async function tsconfigJson(
-  options: ParsedGeneratorOptions
-): Promise<string | undefined> {
-  if (options.transpile || options.tsConfig) {
-    return options.tsConfig
-      ? readCustomTsConfig(options.tsConfig)
+export async function tsconfigJson({
+  transpile,
+  tsConfig
+}: ParsedGeneratorOptions | GeneratorOptions2): Promise<string | undefined> {
+  if (transpile || tsConfig) {
+    return tsConfig
+      ? readCustomTsConfig(tsConfig)
       : formatJson(defaultTsConfig);
   }
 }
diff --git a/yarn.lock b/yarn.lock
index bc7dbe53a8..131a5dcd67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -658,10 +658,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@jest/types@^27.1.1":
-  version "27.1.1"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz#77a3fc014f906c65752d12123a0134359707c0ad"
-  integrity sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==
+"@jest/types@^27.2.3":
+  version "27.2.3"
+  resolved "https://registry.npmjs.org/@jest/types/-/types-27.2.3.tgz#e0242545f442242c2538656d947a147443eee8f2"
+  integrity sha512-UJMDg90+W2i/QsS1NIN6Go8O/rSHLFWUkofGqKsUQs54mhmCVyLTiDy1cwKhoNO5fpmr9fctm9L/bRp/YzA1uQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
@@ -1574,10 +1574,10 @@
     "@octokit/types" "^6.0.3"
     universal-user-agent "^6.0.0"
 
-"@octokit/openapi-types@^10.3.0":
-  version "10.3.0"
-  resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.3.0.tgz#c168e6904055bf637a43c79331ad280b142c7762"
-  integrity sha512-mThN3aLK9BXPKdVUNxmQLv6nCJMmp7mrfTNvw9NevzvXhM3ObGg6NWsAfCtP6t3fCcpNhkL1fwbbm4pF55DmXg==
+"@octokit/openapi-types@^10.6.1":
+  version "10.6.1"
+  resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.6.1.tgz#4eb303e7da4de3d17216db80e3be6309f03b9fcc"
+  integrity sha512-53YKy8w8+sHQhUONhTiYt6MqNqPolejYr6rK/3VOevpORAIYGQEX2pmXnnhgdSsjHy176e5ZBgVt0ppOGziS7g==
 
 "@octokit/plugin-enterprise-rest@^6.0.1":
   version "6.0.1"
@@ -1585,23 +1585,23 @@
   integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==
 
 "@octokit/plugin-paginate-rest@^2.16.0":
-  version "2.16.3"
-  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.3.tgz#6dbf74a12a53e04da6ca731d4c93f20c0b5c6fe9"
-  integrity sha512-kdc65UEsqze/9fCISq6BxLzeB9qf0vKvKojIfzgwf4tEF+Wy6c9dXnPFE6vgpoDFB1Z5Jek5WFVU6vL1w22+Iw==
+  version "2.16.5"
+  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.5.tgz#4d8098410f4c4697d33979f06f38d2ed2574adf1"
+  integrity sha512-2PfRGymdBypqRes4Xelu0BAZZRCV/Qg0xgo8UB10UKoghCM+zg640+T5WkRsRD0edwfLBPP3VsJgDyDTG4EIYg==
   dependencies:
-    "@octokit/types" "^6.28.1"
+    "@octokit/types" "^6.31.0"
 
 "@octokit/plugin-request-log@^1.0.4":
   version "1.0.4"
   resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
   integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
 
-"@octokit/plugin-rest-endpoint-methods@^5.9.0":
-  version "5.11.0"
-  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.11.0.tgz#9751741932110ead98c631be9e530a35c175e5fe"
-  integrity sha512-K7kbhfv7ZBMQK7j/3wEA0Sr/aic2OZr6XB2qQvmJzgP0eSPsAHUxEtiYFzHuCBgtQKoygylofhv/6Q+Hw5colw==
+"@octokit/plugin-rest-endpoint-methods@5.11.3":
+  version "5.11.3"
+  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.11.3.tgz#d3b01fafb4a64bf7da4e3852f969cb65293e78ae"
+  integrity sha512-E19gqHqfP3uJa2/hx6Abhx2NrVP5tsNbst2/AeqGxlGM+eL4N8fRbzhd+NEIsGAB4y3R7e9kVE0y8OOghlXUXw==
   dependencies:
-    "@octokit/types" "^6.29.0"
+    "@octokit/types" "^6.31.1"
     deprecation "^2.3.1"
 
 "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
@@ -1626,21 +1626,21 @@
     universal-user-agent "^6.0.0"
 
 "@octokit/rest@^18.1.0":
-  version "18.10.0"
-  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.10.0.tgz#8a0add9611253e0e31d3ed5b4bc941a3795a7648"
-  integrity sha512-esHR5OKy38bccL/sajHqZudZCvmv4yjovMJzyXlphaUo7xykmtOdILGJ3aAm0mFHmMLmPFmDMJXf39cAjNJsrw==
+  version "18.11.2"
+  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-18.11.2.tgz#0a38cd42f5e41128276099fa0513f456044a4a52"
+  integrity sha512-XZPD5HN0B8AfvXhdztFqoZxNVC6hRgQSZTWS1Eh0xHAoJvduVBwniWJ0t4DsdO9in+odZZ9EYAOFtQuaLVZ44Q==
   dependencies:
     "@octokit/core" "^3.5.1"
     "@octokit/plugin-paginate-rest" "^2.16.0"
     "@octokit/plugin-request-log" "^1.0.4"
-    "@octokit/plugin-rest-endpoint-methods" "^5.9.0"
+    "@octokit/plugin-rest-endpoint-methods" "5.11.3"
 
-"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.28.1", "@octokit/types@^6.29.0":
-  version "6.29.0"
-  resolved "https://registry.npmjs.org/@octokit/types/-/types-6.29.0.tgz#0261a7f0aea05d4b348845f8d763821e5c661072"
-  integrity sha512-+6DczLm2ryGbMmJspCA26gt0OGonhCwVrp9wqku486SCo6/SjbI2ipbJm8TSKWuQ6LJgftRC+Q236v6tVgaa1w==
+"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.31.0", "@octokit/types@^6.31.1":
+  version "6.31.1"
+  resolved "https://registry.npmjs.org/@octokit/types/-/types-6.31.1.tgz#223d062778bb6121635a022d3bf545d506fcc880"
+  integrity sha512-xkF46eaYcpT8ieO78mZWhMq3bt37zIsP5BUkN+zWgX+mTYDB7jOtUP1MOxcSF8hhJhsjjlB1YDgQAhX0z0oqPw==
   dependencies:
-    "@octokit/openapi-types" "^10.3.0"
+    "@octokit/openapi-types" "^10.6.1"
 
 "@opencensus/core@0.0.9":
   version "0.0.9"
@@ -1673,9 +1673,9 @@
     uuid "^3.2.1"
 
 "@pm2/agent@~2.0.0":
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.0.tgz#b3ab77cd12d85187dd155c59a9771b04e7e345a3"
-  integrity sha512-W1LvdyF1tGaVU5f/hV8DjpI5joI7MEgXiQMLZnTwZlFwDVP00O9s86571Q8xSiweTcFZFyye0F4wORN/PjSgGA==
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.1.tgz#0edffc54cd8ee2b12f90136264e7880f3f78c79d"
+  integrity sha512-QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw==
   dependencies:
     async "~3.2.0"
     chalk "~3.0.0"
@@ -1687,7 +1687,7 @@
     nssocket "0.6.0"
     pm2-axon "~4.0.1"
     pm2-axon-rpc "~0.7.0"
-    proxy-agent "~4.0.1"
+    proxy-agent "~5.0.0"
     semver "~7.2.0"
     ws "~7.4.0"
 
@@ -1745,22 +1745,21 @@
     npmlog "2 || ^3.1.0 || ^4.0.0"
 
 "@sap/cds-compiler@^2.4.4":
-  version "2.5.2"
-  resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-2.5.2.tgz#6a6273a36123109f110e1d09829bbb40e14ec772"
-  integrity sha512-C8I9YbZ7LkS7OkjKWMmsIYGXGYYwxW9TgveMxFkDjefv6bljEGD0HkVo3UoEdtbXWAyPxFJ8kBBjKDPHXXFDjQ==
+  version "2.7.0"
+  resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-2.7.0.tgz#f7d06c16746a21be37c9d0feab63d233b9d8c68e"
+  integrity sha512-GfifUHd+FePYH2y+BKksUrnHT5VWzVQWublZrxCbB+HpSbb1HSADOd0SlK0+aUObmSxPlPMAOwpmS19dXB1l7A==
   dependencies:
     antlr4 "4.8.0"
 
 "@sap/cds-dk@^4.0.7":
-  version "4.4.2"
-  resolved "https://registry.npmjs.org/@sap/cds-dk/-/cds-dk-4.4.2.tgz#0838440e470aa55722e02a4f4b145a77de7158f0"
-  integrity sha512-ckfyHfCWE17PO5q/WkxhOLo/M/IDjrIRWbknLnSs44WNmbwmraQO/lJ96soNGY/RgZ30JFHQMdxrKZV8co7/pw==
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/@sap/cds-dk/-/cds-dk-4.5.0.tgz#03dba5de09a8fdc10a0b28edbb3f4dc30ade9708"
+  integrity sha512-wwxrB3yu+ZYuTfbZzHR5+Ls76YikaQuHaOC9FamoCY9pCEbkYEhQh6oLoHR9cuc+yKXPB/puldWgSfm/mgCoew==
   dependencies:
-    "@sap/cds" "^5.4.0"
+    "@sap/cds" "^5.5.0"
     "@sap/cds-foss" "^3"
-    "@sap/cds-sidecar-client" "^1.1.23"
-    "@sap/eslint-plugin-cds" "2.0.4"
-    axios "^0.21.0"
+    "@sap/eslint-plugin-cds" "^2.1.0"
+    axios "^0.21.4"
     connect-livereload "^0.6.1"
     eslint "^7.0.0"
     express "^4.17.1"
@@ -1787,15 +1786,7 @@
     xmlbuilder "15.1.1"
     yaml "1.10.2"
 
-"@sap/cds-sidecar-client@^1.1.23":
-  version "1.1.23"
-  resolved "https://registry.npmjs.org/@sap/cds-sidecar-client/-/cds-sidecar-client-1.1.23.tgz#d928ce33809587724dc30da4b83ce99131eeda66"
-  integrity sha512-4IQStF2NJnqECLU0e7EohhkmCeSc2QjGJ/bcewegoJl+x4IBOu8LzkgJaSGirzT7INuy/Z4BOJVkVh1Ek+P5Qw==
-  dependencies:
-    axios "^0.21.1"
-    fs-extra "9.0.1"
-
-"@sap/cds@^5.0.0", "@sap/cds@^5.0.6", "@sap/cds@^5.4.0":
+"@sap/cds@^5.0.0", "@sap/cds@^5.0.6", "@sap/cds@^5.5.0":
   version "5.5.1"
   resolved "https://registry.npmjs.org/@sap/cds/-/cds-5.5.1.tgz#befab3636dc25a5f5e92a1504a9042fca1e596cf"
   integrity sha512-8XkYO17kYTyuxn4A5LQtH01tO+y3GgiSpD7vUiB+M9Velo4jIcBwy4KcaJxPy/GUuX/8pBU9MVUGxZaQ5v0ebw==
@@ -1822,10 +1813,10 @@
     request "=2.88.0"
     xml-js "=1.6.8"
 
-"@sap/eslint-plugin-cds@2.0.4":
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/@sap/eslint-plugin-cds/-/eslint-plugin-cds-2.0.4.tgz#f7adfad2e290e655a122b48d244d8d55cf3663d3"
-  integrity sha512-lKH5rXCogV4DDf9N+J5a6FUqB/YQRIzpRQcQCg7BvA+nTHXiOt2aBf4SYVunkic6d88j5uapHqIl0D6x0rHFsA==
+"@sap/eslint-plugin-cds@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/@sap/eslint-plugin-cds/-/eslint-plugin-cds-2.1.0.tgz#dd1e88d1c653ba1fc6de54d6675f2cea4584aa85"
+  integrity sha512-RbFoLx/RQjfxPCS+g7HD9jvnhzhxjOe54C27l8bEttf+5/uYHJWQeqD7yz6TC6qtEqHhGBmdm/zerLqXkddIyA==
   dependencies:
     "@sap/cds" "^5.0.0"
     semver "^7.3.4"
@@ -2066,9 +2057,9 @@
   integrity sha512-FwAQwMRbkhx0J6YELkwIpciVzCcgEqXEbIrIn3a2P5d3kGEHQ3wVhlN3YdVepYP+bZzCYO6OjmD4o9TGOZ40rA==
 
 "@types/prettier@^2.0.0":
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3"
-  integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==
+  version "2.4.1"
+  resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb"
+  integrity sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==
 
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
@@ -2116,7 +2107,7 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yargs@^17.0.0":
+"@types/yargs@^17.0.0", "@types/yargs@^17.0.2":
   version "17.0.3"
   resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.3.tgz#e6c552aa3277b21a8e802019d03ee5e77894cf27"
   integrity sha512-K7rm3Ke3ag/pAniBe80A6J6fjoqRibvCrl3dRmtXV9eCEt9h/pZwmHX9MzjQVUc/elneQTL4Ky7XKorC71Lmxw==
@@ -2193,63 +2184,63 @@
     "@typescript-eslint/types" "4.32.0"
     eslint-visitor-keys "^2.0.0"
 
-"@vue/compiler-core@3.2.13":
-  version "3.2.13"
-  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.13.tgz#901268088b98a53c43be0f02bfa0e3a389ad6bf4"
-  integrity sha512-H8MUuKVCfAT6C0vth/+1LAriKnM+RTFo/5MoFycwRPwworTvkpWq/EuGoIXdLBblo8Y2/bNsOmIBEEoOtrb/bQ==
+"@vue/compiler-core@3.2.19":
+  version "3.2.19"
+  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.19.tgz#b537dd377ce51fdb64e9b30ebfbff7cd70a64cb9"
+  integrity sha512-8dOPX0YOtaXol0Zf2cfLQ4NU/yHYl2H7DCKsLEZ7gdvPK6ZSEwGLJ7IdghhY2YEshEpC5RB9QKdC5I07z8Dtjg==
   dependencies:
     "@babel/parser" "^7.15.0"
-    "@vue/shared" "3.2.13"
+    "@vue/shared" "3.2.19"
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.2.13":
-  version "3.2.13"
-  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.13.tgz#028982494fb9d97807d5275b42355732686f8ed7"
-  integrity sha512-5+2dYgQyNzM97EEgbdAusUpLjulcKkvLM26jOGpd14+qwEcW/KCnns5DGjlZD/tsdEwToOoTDCm+mjx7cO/G1Q==
+"@vue/compiler-dom@3.2.19":
+  version "3.2.19"
+  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.19.tgz#0607bc90de6af55fde73b09b3c4d0bf8cb597ed8"
+  integrity sha512-WzQoE8rfkFjPtIioc7SSgTsnz9g2oG61DU8KHnzPrRS7fW/lji6H2uCYJfp4Z6kZE8GjnHc1Ljwl3/gxDes0cw==
   dependencies:
-    "@vue/compiler-core" "3.2.13"
-    "@vue/shared" "3.2.13"
+    "@vue/compiler-core" "3.2.19"
+    "@vue/shared" "3.2.19"
 
 "@vue/compiler-sfc@^3.0.5":
-  version "3.2.13"
-  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.13.tgz#a38475048aad9c96cf04dfe635129b417e0f9295"
-  integrity sha512-3j970d969aOILykcTstdihP33xH1Onm0wsvcl+rGv9AGxivB9xicRxBw93HCIA4dAPivr42WjHEoci9q2/85uw==
+  version "3.2.19"
+  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.19.tgz#d412195a98ebd49b84602f171719294a1d9549be"
+  integrity sha512-pLlbgkO1UHTO02MSpa/sFOXUwIDxSMiKZ1ozE5n71CY4DM+YmI+G3gT/ZHZ46WBId7f3VTF/D8pGwMygcQbrQA==
   dependencies:
     "@babel/parser" "^7.15.0"
-    "@vue/compiler-core" "3.2.13"
-    "@vue/compiler-dom" "3.2.13"
-    "@vue/compiler-ssr" "3.2.13"
-    "@vue/ref-transform" "3.2.13"
-    "@vue/shared" "3.2.13"
+    "@vue/compiler-core" "3.2.19"
+    "@vue/compiler-dom" "3.2.19"
+    "@vue/compiler-ssr" "3.2.19"
+    "@vue/ref-transform" "3.2.19"
+    "@vue/shared" "3.2.19"
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
     postcss "^8.1.10"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.2.13":
-  version "3.2.13"
-  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.13.tgz#98434672e0b488c2affa4b0570731d6be5cda187"
-  integrity sha512-ZbO6uDhUWTdKBRguYNEZXj2FU3nh1cudoHBiidbxj9q5J0tVT+j1PSVFAXPq6SquUBdJpa4HvGkQ5kQzv6upXg==
+"@vue/compiler-ssr@3.2.19":
+  version "3.2.19"
+  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz#3e91ecf70f8f961c5f63eacd2139bcdab9a7a07c"
+  integrity sha512-oLon0Cn3O7WEYzzmzZavGoqXH+199LT+smdjBT3Uf3UX4HwDNuBFCmvL0TsqV9SQnIgKvBRbQ7lhbpnd4lqM3w==
   dependencies:
-    "@vue/compiler-dom" "3.2.13"
-    "@vue/shared" "3.2.13"
+    "@vue/compiler-dom" "3.2.19"
+    "@vue/shared" "3.2.19"
 
-"@vue/ref-transform@3.2.13":
-  version "3.2.13"
-  resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.13.tgz#6adfce50d388cc03683d9d2ba58f3a3bde5166f4"
-  integrity sha512-q6GXHZFzXjpx1K3UFRF8fa+xSmD9xV/FjhGzTNnfrryBr8tBUNYgP2f0s5K5N+21Ay7+MlQ1XXMUp8McGvsryQ==
+"@vue/ref-transform@3.2.19":
+  version "3.2.19"
+  resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz#cf0f986486bb26838fbd09749e927bab19745600"
+  integrity sha512-03wwUnoIAeKti5IGGx6Vk/HEBJ+zUcm5wrUM3+PQsGf7IYnXTbeIfHHpx4HeSeWhnLAjqZjADQwW8uA4rBmVbg==
   dependencies:
     "@babel/parser" "^7.15.0"
-    "@vue/compiler-core" "3.2.13"
-    "@vue/shared" "3.2.13"
+    "@vue/compiler-core" "3.2.19"
+    "@vue/shared" "3.2.19"
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
 
-"@vue/shared@3.2.13":
-  version "3.2.13"
-  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz#c830ef966d7af12598e0ea862a55695ea589cd47"
-  integrity sha512-F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w==
+"@vue/shared@3.2.19":
+  version "3.2.19"
+  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.19.tgz#111ec3da18337d86274446984c49925b1b2b2dd7"
+  integrity sha512-Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew==
 
 JSONStream@^1.0.4:
   version "1.3.5"
@@ -2410,7 +2401,7 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-regex@^5.0.0:
+ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -3023,9 +3014,9 @@ camelcase@^6.0.0, camelcase@^6.2.0:
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
 caniuse-lite@^1.0.30001259:
-  version "1.0.30001259"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001259.tgz#ae21691d3da9c4be6144403ac40f71d9f6efd790"
-  integrity sha512-V7mQTFhjITxuk9zBpI6nYsiTXhcPe05l+364nZjK7MFK/E7ibvYBSAXr4YcA6oPR8j3ZLM/LN+lUqUVAQEUZFg==
+  version "1.0.30001261"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001261.tgz#96d89813c076ea061209a4e040d8dcf0c66a1d01"
+  integrity sha512-vM8D9Uvp7bHIN0fZ2KQ4wnmYFpJo/Etb4Vwsuc+ka0tfGDHvOPrFm6S/7CCNLSOkAUjenT2HnUPESdOIL91FaA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3801,14 +3792,15 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-degenerator@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz#49e98c11fa0293c5b26edfbb52f15729afcdb254"
-  integrity sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==
+degenerator@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz#7ef78ec0c8577a544477308ddf1d2d6e88d51f5b"
+  integrity sha512-LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ==
   dependencies:
     ast-types "^0.13.2"
     escodegen "^1.8.1"
     esprima "^4.0.0"
+    vm2 "^3.9.3"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -4146,9 +4138,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.846:
-  version "1.3.846"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.846.tgz#a55fd59613dbcaed609e965e3e88f42b08c401d3"
-  integrity sha512-2jtSwgyiRzybHRxrc2nKI+39wH3AwQgn+sogQ+q814gv8hIFwrcZbV07Ea9f8AmK0ufPVZUvvAG1uZJ+obV4Jw==
+  version "1.3.851"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.851.tgz#457846fce94d5de25511570435a94f1a622203ac"
+  integrity sha512-Ak970eGtRSoHTaJkoDjdkeXYetbwm5Bl9pN/nPOQ3QzLfw1EWRjReOlWUra6o58SVgxfpwOT9U2P1BUXoJ57dw==
 
 emitter-listener@^1.1.1:
   version "1.1.2"
@@ -4817,11 +4809,11 @@ fast-safe-stringify@^2.0.7:
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
 
 fast-xml-parser@^3.16.0:
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.20.0.tgz#b9ce9ddbc44d2cb7e38f846c5929c667bbf0936d"
-  integrity sha512-cMQwDJYVDjMPU56DviszewgMKuNzuf4NQSBuDf9RgZ6FKm5QEMxW05Za8lvnuL6moxoeZVUWBlL733WmovvV6g==
+  version "3.20.3"
+  resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.20.3.tgz#c171425356d4d929efeca4e4f67f24231a31c786"
+  integrity sha512-FfHJ/QCpo4K2gquBX7dIAcmShSBG4dMtYJ3ghSiR4w7YqlUujuamrM57C+mKLNWS3mvZzmm2B2Qx8Q6Gfw+lDQ==
   dependencies:
-    strnum "^1.0.3"
+    strnum "^1.0.4"
 
 fastest-levenshtein@^1.0.7:
   version "1.0.12"
@@ -5039,16 +5031,6 @@ fs-extra@10.0.0, fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
-  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^1.0.0"
-
 fs-extra@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
@@ -5861,9 +5843,9 @@ is-ci@^2.0.0:
     ci-info "^2.0.0"
 
 is-core-module@^2.1.0, is-core-module@^2.2.0, is-core-module@^2.4.0, is-core-module@^2.5.0, is-core-module@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
-  integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
+  version "2.7.0"
+  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
+  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
   dependencies:
     has "^1.0.3"
 
@@ -5951,9 +5933,9 @@ is-generator-fn@^2.0.0:
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.2.tgz#859fc2e731e58c902f99fcabccb75a7dd07d29d8"
+  integrity sha512-ZZTOjRcDjuAAAv2cTBQP/lL59ZTArx77+7UzHdWW/XB1mrfp7DEaVpKmZ0XIzx+M7AxfhKcqV+nMetUQmFifwg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -6169,9 +6151,9 @@ isstream@~0.1.2:
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.1.tgz#e8900b3ed6069759229cf30f7067388d148aeb5e"
+  integrity sha512-GvCYYTxaCPqwMjobtVcVKvSHtAGe48MNhGjpK8LtVF8K0ISX7hCKl85LgtuaSneWVyQmaGcW3iXVV3GaZSLpmQ==
 
 istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
@@ -6295,14 +6277,14 @@ jest-diff@^26.6.2:
     pretty-format "^26.6.2"
 
 jest-diff@^27.0.0:
-  version "27.2.0"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.0.tgz#bda761c360f751bab1e7a2fe2fc2b0a35ce8518c"
-  integrity sha512-QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw==
+  version "27.2.3"
+  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.3.tgz#4298ecc53f7476571d0625e8fda3ade13607a864"
+  integrity sha512-ihRKT1mbm/Lw+vaB1un4BEof3WdfYIXT0VLvEyLUTU3XbIUgyiljis3YzFf2RFn+ECFAeyilqJa35DeeRV2NeQ==
   dependencies:
     chalk "^4.0.0"
     diff-sequences "^27.0.6"
     jest-get-type "^27.0.6"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.3"
 
 jest-docblock@^26.0.0:
   version "26.0.0"
@@ -7678,9 +7660,9 @@ mute-stream@0.0.8, mute-stream@~0.0.4:
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 nanocolors@^0.1.5:
-  version "0.1.6"
-  resolved "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.6.tgz#bc2350d3edfdbfadd7ac018c855ae7c13905a6ad"
-  integrity sha512-2pvTw6vYRaBLGir2xR7MxaJtyWkrn+C53EpW8yPotG+pdAwBvt0Xwk4VJ6VHLY0aLthVZPvDfm9TdZvrvAm5UQ==
+  version "0.1.12"
+  resolved "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
+  integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
 
 nanocolors@^0.2.2:
   version "0.2.11"
@@ -7688,9 +7670,9 @@ nanocolors@^0.2.2:
   integrity sha512-83ttyvfJj66dKMadWfBkEUOEDFfRc8FpzTJvh1MySR/pzWFmFikTQZGOV6kHZRz7yR/heiQ1y/MHBBN5P/e7WQ==
 
 nanoid@^3.1.25:
-  version "3.1.25"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
-  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
+  version "3.1.28"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.28.tgz#3c01bac14cb6c5680569014cc65a2f26424c6bd4"
+  integrity sha512-gSu9VZ2HtmoKYe/lmyPFES5nknFrHa+/DT9muUFWFMi6Jh9E1I7bkvlQ8xxf1Kos9pi9o8lBnIOkatMhKX/YUw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -7780,9 +7762,9 @@ node-fetch-h2@^2.3.0:
     http2-client "^1.2.5"
 
 node-fetch@^2.6.1:
-  version "2.6.4"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.4.tgz#7f1d13b8f9ff0c1a994dc6f73c69f7d652c7ace2"
-  integrity sha512-aD1fO+xtLiSCc9vuD+sYMxpIuQyhHscGSkBEo2o5LTV/3bTEAYvdUii29n8LlO5uLCmWdGP7uVUVXFo5SRdkLA==
+  version "2.6.5"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd"
+  integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -8452,10 +8434,10 @@ p-waterfall@^2.1.1:
   dependencies:
     p-reduce "^2.0.0"
 
-pac-proxy-agent@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz#66883eeabadc915fc5e95457324cb0f0ac78defb"
-  integrity sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==
+pac-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz#b718f76475a6a5415c2efbe256c1c971c84f635e"
+  integrity sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==
   dependencies:
     "@tootallnate/once" "1"
     agent-base "6"
@@ -8463,16 +8445,16 @@ pac-proxy-agent@^4.1.0:
     get-uri "3"
     http-proxy-agent "^4.0.1"
     https-proxy-agent "5"
-    pac-resolver "^4.1.0"
+    pac-resolver "^5.0.0"
     raw-body "^2.2.0"
     socks-proxy-agent "5"
 
-pac-resolver@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz#b82bcb9992d48166920bc83c7542abb454bd9bdd"
-  integrity sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==
+pac-resolver@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.0.tgz#1d717a127b3d7a9407a16d6e1b012b13b9ba8dc0"
+  integrity sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==
   dependencies:
-    degenerator "^2.2.0"
+    degenerator "^3.0.1"
     ip "^1.1.5"
     netmask "^2.0.1"
 
@@ -8912,13 +8894,13 @@ pretty-format@^26.6.2:
     ansi-styles "^4.0.0"
     react-is "^17.0.1"
 
-pretty-format@^27.0.0, pretty-format@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.0.tgz#ee37a94ce2a79765791a8649ae374d468c18ef19"
-  integrity sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==
+pretty-format@^27.0.0, pretty-format@^27.2.3:
+  version "27.2.3"
+  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.3.tgz#c76710de6ebd8b1b412a5668bacf4a6c2f21a029"
+  integrity sha512-wvg2HzuGKKEE/nKY4VdQ/LM8w8pRZvp0XpqhwgaZBbjTwd5UdF2I4wvwZjyUwu8G+HI6g4t6u9b2FZlKhlzxcQ==
   dependencies:
-    "@jest/types" "^27.1.1"
-    ansi-regex "^5.0.0"
+    "@jest/types" "^27.2.3"
+    ansi-regex "^5.0.1"
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
@@ -9009,17 +8991,17 @@ proxy-addr@~2.0.5:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-proxy-agent@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz#326c3250776c7044cd19655ccbfadf2e065a045c"
-  integrity sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==
+proxy-agent@~5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz#d31405c10d6e8431fde96cba7a0c027ce01d633b"
+  integrity sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==
   dependencies:
     agent-base "^6.0.0"
     debug "4"
     http-proxy-agent "^4.0.0"
     https-proxy-agent "^5.0.0"
     lru-cache "^5.1.1"
-    pac-proxy-agent "^4.1.0"
+    pac-proxy-agent "^5.0.0"
     proxy-from-env "^1.0.0"
     socks-proxy-agent "^5.0.0"
 
@@ -10190,13 +10172,13 @@ string-width@^1.0.1:
     strip-ansi "^4.0.0"
 
 string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
-  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
 
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
@@ -10263,12 +10245,12 @@ strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
 
 strip-bom@^3.0.0:
   version "3.0.0"
@@ -10307,10 +10289,10 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strnum@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/strnum/-/strnum-1.0.3.tgz#bbc438bcb35fbbfc9c1e82f73097665b6ec6959e"
-  integrity sha512-GVoRjsqAYZkAH16GDzfTuafuwKxzKdaaCQyLaWf37gOP1e2PPbAKWoME1OmO+c4RCKMfNrrPRDLFCNBFU45N/A==
+strnum@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/strnum/-/strnum-1.0.4.tgz#e97e36a7d6ba9f93d0d6b496b2ed0678d422832b"
+  integrity sha512-lMzNMfDpaQOLt4B2mEbfzYS0+T7dvCXeojnlGf6f1AygvWDMcWyXYaLbyICfjVu29sErR8fnRagQfBW/N/hGgw==
 
 strong-log-transformer@^2.1.0:
   version "2.1.0"
@@ -10386,9 +10368,9 @@ symbol-tree@^3.2.4:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 systeminformation@^5.7:
-  version "5.9.3"
-  resolved "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.3.tgz#d247c3fc27dc51787af28f0b4a0d82f9bce7f88b"
-  integrity sha512-FmifqCPDU5uJZeORt1jCiATBTHwpX7luDzeFo8lojYbEiJk6oR3mtAZBOayCo3iEmgSILzmbcO855OXPHCeU+g==
+  version "5.9.4"
+  resolved "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.4.tgz#1f0e29e0aa376dec8f69cc517eeefc5cdcda411a"
+  integrity sha512-FOsiTn0CyJZoj9kIhla11ndsMzbbwwuriul81wpqIBt9IpbxHZ6P/oZCphIFgJrwqjTnme0Qp1HDzIkUD9Xr/g==
 
 table@^6.0.9:
   version "6.7.1"
@@ -10916,11 +10898,6 @@ universalify@^0.1.0, universalify@^0.1.2:
   resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-universalify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
-  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
-
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -11056,6 +11033,11 @@ vizion@~2.2.1:
     ini "^1.3.5"
     js-git "^0.7.8"
 
+vm2@^3.9.3:
+  version "3.9.3"
+  resolved "https://registry.npmjs.org/vm2/-/vm2-3.9.3.tgz#29917f6cc081cc43a3f580c26c5b553fd3c91f40"
+  integrity sha512-smLS+18RjXYMl9joyJxMNI9l4w7biW8ilSDaVRvFBDwOH8P0BK1ognFQTpg0wyQ6wIKLTblHJvROW692L/E53Q==
+
 voca@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/voca/-/voca-1.4.0.tgz#e15ac58b38290b72acc0c330366b6cc7984924d7"
@@ -11439,7 +11421,7 @@ yargs@^16.1.0, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.0.1:
+yargs@^17.0.1, yargs@^17.1.1:
   version "17.2.1"
   resolved "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea"
   integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==

From d25a1c16761c4580e9323f44714e0fd7e35f03ba Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 28 Sep 2021 13:51:19 +0200
Subject: [PATCH 03/27] Fix typo bug in parseGeneratorOptions

---
 packages/openapi-generator/src/options/generator-options.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index 5efb3e3e86..62ebbc6327 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -70,7 +70,7 @@ export function parseGeneratorOptions(
       const value = options[name];
       if (typeof value !== 'undefined') {
         parsedOptions[name] = flag.parse(value as never, undefined);
-      } else if (typeof flag.default !== undefined) {
+      } else if (typeof flag.default !== 'undefined') {
         parsedOptions[name] = flag.default;
       }
       return parsedOptions;

From 306dd85f9fc3c8244b7612447e2130e7c9fdb7e6 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Fri, 8 Oct 2021 11:05:41 +0200
Subject: [PATCH 04/27] Fix config handling

---
 packages/openapi-generator/src/cli/index.ts   |  2 +-
 packages/openapi-generator/src/generator.ts   | 27 +++++++++++++------
 .../src/options/generator-options.ts          |  4 +--
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index a80d8e210a..5e384de890 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -27,7 +27,7 @@ export async function parseCmdArgs(): Promise<void> {
       ...(await parseOptionsFromConfig(argv.config)),
       ...getSpecifiedFlags(
         argv,
-        (parsed.raw as FlagToken[]).map(({ flag }) => flag)
+        Object.keys(await yargs(hideBin(process.argv)).argv)
       )
     });
   } else {
diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts
index 13e13798dc..cbe7261e0a 100644
--- a/packages/openapi-generator/src/generator.ts
+++ b/packages/openapi-generator/src/generator.ts
@@ -287,15 +287,26 @@ export async function getInputFilePaths(input: string): Promise<string[]> {
 // TODO 1728 move to a new package to reduce code duplication.
 async function copyAdditionalFiles(
   serviceDir: string,
-  additionalFiles: string,
+  additionalFiles: string | string[],
   overwrite: boolean
 ): Promise<void[]> {
   logger.verbose(
     `Copying additional files matching ${additionalFiles} into ${serviceDir}.`
   );
 
+  if (typeof additionalFiles === 'string') {
+    return Promise.all(
+      new GlobSync(additionalFiles!).found.map(filePath =>
+        copyFile(
+          resolve(filePath),
+          join(serviceDir, basename(filePath)),
+          overwrite
+        )
+      )
+    );
+  }
   return Promise.all(
-    new GlobSync(additionalFiles!).found.map(filePath =>
+    additionalFiles.map(filePath =>
       copyFile(
         resolve(filePath),
         join(serviceDir, basename(filePath)),
@@ -308,7 +319,7 @@ async function copyAdditionalFiles(
 function generateReadme(
   serviceDir: string,
   openApiDocument: OpenApiDocument,
-  options: ParsedGeneratorOptions
+  { overwrite }: ParsedGeneratorOptions | GeneratorOptions2
 ): Promise<void> {
   logger.verbose(`Generating readme in ${serviceDir}.`);
 
@@ -316,7 +327,7 @@ function generateReadme(
     serviceDir,
     'README.md',
     readme(openApiDocument),
-    options.overwrite,
+    overwrite,
     false
   );
 }
@@ -324,7 +335,7 @@ function generateReadme(
 async function generateMetadata(
   openApiDocument: OpenApiDocument,
   inputFilePath: string,
-  { packageVersion, overwrite }: ParsedGeneratorOptions
+  { packageVersion, overwrite }: ParsedGeneratorOptions | GeneratorOptions2
 ) {
   const { name: inputFileName, dir: inputDirPath } = parse(inputFilePath);
   const { clientFileName, headerFileName } =
@@ -359,7 +370,7 @@ async function generateMetadata(
 async function generatePackageJson(
   serviceDir: string,
   { packageName, directoryName }: ServiceOptions,
-  options: ParsedGeneratorOptions
+  { packageVersion, overwrite }: ParsedGeneratorOptions | GeneratorOptions2
 ) {
   logger.verbose(`Generating package.json in ${serviceDir}.`);
 
@@ -370,9 +381,9 @@ async function generatePackageJson(
       packageName,
       genericDescription(directoryName),
       await getSdkVersion(),
-      options.packageVersion
+      packageVersion || '1.0.0'
     ),
-    options.overwrite,
+    overwrite,
     false
   );
 }
diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index 62ebbc6327..8c7de7a9d4 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -115,10 +115,10 @@ export async function parseOptionsFromConfig(
  * @returns generator options that were used in the raw input
  */
 export function getSpecifiedFlags(
-  options: ParsedGeneratorOptions,
+  options: ParsedGeneratorOptions | GeneratorOptions2,
   rawInputFlags: string[]
 ): GeneratorOptions {
-  return Object.entries(rawInputFlags).reduce((reducedOptions, [name]) => {
+  return rawInputFlags.reduce((reducedOptions, name) => {
     const value = options[name];
     if (value !== undefined) {
       reducedOptions[name] = value;

From 8422d4e3f64b8e5f956683e01757ff99b1ae9a3a Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Fri, 8 Oct 2021 15:59:02 +0200
Subject: [PATCH 05/27] Remove oclif and cli-ux

---
 packages/openapi-generator/bin/run            |  16 -
 packages/openapi-generator/bin/run.cmd        |   3 -
 packages/openapi-generator/package.json       |  19 +-
 packages/openapi-generator/src/cli/index.ts   |  78 +--
 packages/openapi-generator/src/generator.ts   |  18 +-
 .../openapi-generator/src/options/flags.ts    | 101 +---
 .../src/options/generator-options.ts          |  51 +-
 .../src/options/options-per-service.ts        |   8 +-
 .../src/options/tsconfig-json.ts              |   4 +-
 scripts/generate-test-services.ts             |  14 +-
 yarn.lock                                     | 450 ++----------------
 11 files changed, 89 insertions(+), 673 deletions(-)
 delete mode 100755 packages/openapi-generator/bin/run
 delete mode 100644 packages/openapi-generator/bin/run.cmd

diff --git a/packages/openapi-generator/bin/run b/packages/openapi-generator/bin/run
deleted file mode 100755
index 3e035104f8..0000000000
--- a/packages/openapi-generator/bin/run
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable */
-
-const fs = require('fs');
-const path = require('path');
-const project = path.join(__dirname, '../tsconfig.json');
-const dev = fs.existsSync(project);
-
-if (dev) {
-  require('ts-node').register({ project });
-}
-
-const command = require(`../${dev ? 'src/cli' : 'dist/cli'}`);
-  command.run()
-  .catch(require('@oclif/errors/handle'));
-
diff --git a/packages/openapi-generator/bin/run.cmd b/packages/openapi-generator/bin/run.cmd
deleted file mode 100644
index 968fc30758..0000000000
--- a/packages/openapi-generator/bin/run.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\run" %*
diff --git a/packages/openapi-generator/package.json b/packages/openapi-generator/package.json
index 52fc067b51..95ea19a1d5 100644
--- a/packages/openapi-generator/package.json
+++ b/packages/openapi-generator/package.json
@@ -10,11 +10,10 @@
     "sap-cloud-platform",
     "generator"
   ],
-  "repository": "github:SAP/cloud-sdk-js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
-    "openapi-generator": "./bin/run"
+    "openapi-generator": "./dist/cli/index.js"
   },
   "publishConfig": {
     "access": "public"
@@ -25,27 +24,19 @@
     "internal.d.ts",
     "internal.js"
   ],
-  "oclif": {
-    "bin": "generate-openapi-client",
-    "commands": "./dist/cli"
-  },
+  "repository": "github:SAP/cloud-sdk-js",
   "scripts": {
     "compile": "yarn tsc -b",
     "prepare": "yarn compile",
-    "readme": "oclif-dev readme",
+    "readme": "echo 'TODO'",
     "test": "yarn jest",
     "coverage": "yarn jest --coverage",
-    "check:dependencies": "depcheck . --ignore-bin-package=true --ignores=@oclif/plugin-*"
+    "check:dependencies": "depcheck ."
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.2",
-    "@oclif/command": "^1.5.19",
-    "@oclif/config": "^1.14.0",
-    "@oclif/parser": "^3.8.5",
     "@sap-cloud-sdk/generator-common": "^1.50.0",
     "@sap-cloud-sdk/util": "^1.50.0",
-    "@types/js-yaml": "^4.0.0",
-    "cli-ux": "^5.4.5",
     "glob": "^7.1.6",
     "js-yaml": "^4.0.0",
     "openapi-types": "^9.3.0",
@@ -53,7 +44,7 @@
     "yargs": "^17.1.1"
   },
   "devDependencies": {
-    "@oclif/dev-cli": "^1.22.2",
+    "@types/js-yaml": "^4.0.0",
     "@types/yargs": "^17.0.2",
     "mock-fs": "^5.0.0",
     "nock": "^13.0.11",
diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index 5e384de890..7753129415 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -1,15 +1,10 @@
-import { Command } from '@oclif/command';
-import { cli } from 'cli-ux';
 import { createLogger } from '@sap-cloud-sdk/util';
-// eslint-disable-next-line import/no-internal-modules
-import { FlagToken } from '@oclif/parser/lib/parse';
 import yargs from 'yargs';
 // eslint-disable-next-line import/no-internal-modules
 import { hideBin } from 'yargs/helpers';
 import {
   parseOptionsFromConfig,
   getSpecifiedFlags,
-  generatorFlags,
   generatorOptions
 } from '../options';
 import { generate, generateWithParsedOptions } from '../generator';
@@ -17,61 +12,24 @@ import { generate, generateWithParsedOptions } from '../generator';
 const logger = createLogger('openapi-generator');
 
 export async function parseCmdArgs(): Promise<void> {
-  const argv = await yargs(hideBin(process.argv))
-    .usage('--input <input> --outputDir <outputDirectory>')
-    .options(generatorOptions)
-    .strict().argv;
-
-  if (argv.config) {
-    await generate({
-      ...(await parseOptionsFromConfig(argv.config)),
-      ...getSpecifiedFlags(
-        argv,
-        Object.keys(await yargs(hideBin(process.argv)).argv)
-      )
-    });
-  } else {
-    await generateWithParsedOptions(argv);
-  }
-  return;
-}
-
-export class OpenApiGenerator extends Command {
-  static description =
-    'Generate OpenAPI client(s), that use the connectivity features of the SAP Cloud SDK for JavaScript/TypeScript.';
-
-  static usage = '--input <input> --outputDir <outputDirectory>';
-  static examples = [
-    `
-// generate TypeScript clients from OpenAPI definitions in a directory
-$ openapi-generator --input ./my-specs --outputDir ./clients`,
-    `
-// generate a JavaScript client from a OpenAPI definition file
-$ openapi-generator --input ./my-spec.yaml --outputDir ./client --transpile`
-  ];
-
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  static version = require('../../package.json').version;
-
-  static flags = generatorFlags;
-
-  async run(): Promise<void> {
-    try {
-      const parsed = this.parse(OpenApiGenerator);
-      if (parsed.flags.config) {
-        await generate({
-          ...(await parseOptionsFromConfig(parsed.flags.config)),
-          ...getSpecifiedFlags(
-            parsed.flags,
-            (parsed.raw as FlagToken[]).map(({ flag }) => flag)
-          )
-        });
-      } else {
-        await generateWithParsedOptions(parsed.flags);
-      }
-    } catch (err) {
-      logger.error(err);
-      cli.exit(1);
+  try {
+    const argv = await yargs(hideBin(process.argv))
+      .usage('--input <input> --outputDir <outputDirectory>')
+      .options(generatorOptions)
+      .strict().argv;
+
+    if (argv.config) {
+      await generate({
+        ...(await parseOptionsFromConfig(argv.config)),
+        ...getSpecifiedFlags(
+          argv,
+          Object.keys(await yargs(hideBin(process.argv)).argv)
+        )
+      });
+    } else {
+      await generateWithParsedOptions(argv);
     }
+  } catch (err) {
+    logger.error(err);
   }
 }
diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts
index cbe7261e0a..6c72390ec7 100644
--- a/packages/openapi-generator/src/generator.ts
+++ b/packages/openapi-generator/src/generator.ts
@@ -39,15 +39,13 @@ import { convertOpenApiSpec } from './document-converter';
 import { createFile, copyFile } from './file-writer';
 import {
   parseGeneratorOptions,
-  ParsedGeneratorOptions,
   tsconfigJson,
   ServiceOptions,
   OptionsPerService,
   getOptionsPerService,
-  GeneratorOptions2
+  GeneratorOptions
 } from './options';
 import { sdkMetadata } from './sdk-metadata';
-import { GeneratorOptions } from '.';
 
 const { readdir, rmdir, mkdir, lstat } = promisesFs;
 const logger = createLogger('openapi-generator');
@@ -67,7 +65,7 @@ export async function generate(options: GeneratorOptions): Promise<void> {
  * @param options - Options to configure generation.
  */
 export async function generateWithParsedOptions(
-  options: ParsedGeneratorOptions | GeneratorOptions2
+  options: GeneratorOptions
 ): Promise<void> {
   if (options.input === '' || options.outputDir === '') {
     throw new Error('Either input or outputDir were not set.');
@@ -128,7 +126,7 @@ async function generateSources(
   openApiDocument: OpenApiDocument,
   inputFilePath: string,
   tsConfig: string | undefined,
-  options: ParsedGeneratorOptions | GeneratorOptions2
+  options: GeneratorOptions
 ): Promise<void> {
   await mkdir(serviceDir, { recursive: true });
 
@@ -169,7 +167,7 @@ async function generateSources(
 async function generateMandatorySources(
   serviceDir: string,
   openApiDocument: OpenApiDocument,
-  { overwrite }: ParsedGeneratorOptions | GeneratorOptions2
+  { overwrite }: GeneratorOptions
 ) {
   if (openApiDocument.schemas.length) {
     const schemaDir = resolve(serviceDir, 'schema');
@@ -231,7 +229,7 @@ async function createSchemaFiles(
  */
 async function generateService(
   inputFilePath: string,
-  options: ParsedGeneratorOptions | GeneratorOptions2,
+  options: GeneratorOptions,
   serviceOptions: ServiceOptions,
   tsConfig: string | undefined
 ): Promise<void> {
@@ -319,7 +317,7 @@ async function copyAdditionalFiles(
 function generateReadme(
   serviceDir: string,
   openApiDocument: OpenApiDocument,
-  { overwrite }: ParsedGeneratorOptions | GeneratorOptions2
+  { overwrite }: GeneratorOptions
 ): Promise<void> {
   logger.verbose(`Generating readme in ${serviceDir}.`);
 
@@ -335,7 +333,7 @@ function generateReadme(
 async function generateMetadata(
   openApiDocument: OpenApiDocument,
   inputFilePath: string,
-  { packageVersion, overwrite }: ParsedGeneratorOptions | GeneratorOptions2
+  { packageVersion, overwrite }: GeneratorOptions
 ) {
   const { name: inputFileName, dir: inputDirPath } = parse(inputFilePath);
   const { clientFileName, headerFileName } =
@@ -370,7 +368,7 @@ async function generateMetadata(
 async function generatePackageJson(
   serviceDir: string,
   { packageName, directoryName }: ServiceOptions,
-  { packageVersion, overwrite }: ParsedGeneratorOptions | GeneratorOptions2
+  { packageVersion, overwrite }: GeneratorOptions
 ) {
   logger.verbose(`Generating package.json in ${serviceDir}.`);
 
diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/flags.ts
index d423eee4df..1acf3d5bfb 100644
--- a/packages/openapi-generator/src/options/flags.ts
+++ b/packages/openapi-generator/src/options/flags.ts
@@ -1,7 +1,6 @@
 import { resolve, extname } from 'path';
 import { existsSync, lstatSync } from 'fs';
 import { GlobSync } from 'glob';
-import { flags } from '@oclif/command';
 
 export const generatorOptions = {
   input: {
@@ -103,107 +102,9 @@ export const generatorOptions = {
   config: {
     string: true,
     alias: 'c',
-    // config: true,
+    // config: true, // Disabled to maintain backwards compatibility with the oclif behavior
     coerce: (input: string): string => resolve(input),
     description:
       'Set the path to a file containing the options for generation instead of setting the options on the command line. When combining the `config` option with other options on the command line, the command line options take precedence. If a directory is passed, a `config.json` file is read from this directory.'
   }
 };
-
-export const generatorFlags = {
-  input: flags.string({
-    char: 'i',
-    description:
-      '(required) Specify the path to the directory or file containing the OpenAPI service definition(s) to generate clients for. Accepts Swagger and OpenAPI definitions as YAML and JSON files. Throws an error if the path does not exist.',
-    parse: input => resolve(input),
-    required: false,
-    default: '',
-    helpValue: '<path/to/input>'
-  }),
-  outputDir: flags.string({
-    char: 'o',
-    description:
-      '(required) Specify the path to the directory to generate the client(s) in. Each client is generated into a subdirectory within the given output directory. Creates the directory if it does not exist. Customize subdirectory naming through `--optionsPerService`.',
-    parse: input => resolve(input),
-    required: false,
-    default: '',
-    helpValue: '<path/to/output>'
-  }),
-  transpile: flags.boolean({
-    char: 't',
-    description:
-      'Transpile the generated TypeScript code. When enabled a default `tsconfig.json` will be generated and used. It emits `.js`, `.js.map`, `.d.ts` and `.d.ts.map` files. To configure transpilation set `--tsconfig`.',
-    default: false
-  }),
-  include: flags.string({
-    description:
-      'Include files matching the given glob into the root of each generated client directory.',
-    helpValue: '<glob/to/include>'
-  }),
-  overwrite: flags.boolean({
-    description:
-      'Allow to overwrite files, that already exist. This is useful, when running the generation regularly.',
-    default: false
-  }),
-  clearOutputDir: flags.boolean({
-    description:
-      'Remove all files in the output directory before generation. Be cautious when using this option, as it really removes EVERYTHING in the output directory.',
-    default: false
-  }),
-  skipValidation: flags.boolean({
-    description:
-      'By default, the generation fails, when there are duplicate or invalid names for operations and/or path parameters after transforming them to camel case. Set this to true to enable unique and valid name generation. The names will then be generated by appending numbers and prepending prefixes.',
-    default: false
-  }),
-  tsConfig: flags.string({
-    description:
-      'Replace the default `tsconfig.json` by passing a path to a custom config. By default, a `tsconfig.json` is only generated, when transpilation is enabled (`--transpile`). If a directory is passed, a `tsconfig.json` file is read from this directory.',
-    parse: input => resolve(input),
-    helpValue: '<path/to/tsconfig.json>'
-  }),
-  packageJson: flags.boolean({
-    description:
-      'When enabled, a `package.json`, that specifies dependencies and scripts for transpilation and documentation generation is generated.',
-    default: false
-  }),
-  verbose: flags.boolean({
-    description: 'Turn on verbose logging.',
-    default: false
-  }),
-  optionsPerService: flags.string({
-    description:
-      'Set the path to a file containing the options per service. The configuration allows to set a `directoryName` and `packageName` for every service, identified by the path to the original file. It also makes sure that names do not change between generator runs. If a directory is passed, a `options-per-service.json` file is read/created in this directory.',
-    helpValue: '<path/to/options-per-service.json>',
-    parse: input => {
-      const isFilePath =
-        (existsSync(input) && lstatSync(input).isFile()) || !!extname(input);
-      return isFilePath
-        ? resolve(input)
-        : resolve(input, 'options-per-service.json');
-    }
-  }),
-  packageVersion: flags.string({
-    description: 'Set the version in the generated package.json.',
-    default: '1.0.0',
-    hidden: true
-  }),
-  readme: flags.boolean({
-    description:
-      'Generate default `README.md` files in the client directories.',
-    default: false,
-    hidden: true
-  }),
-  metadata: flags.boolean({
-    description: 'When enabled, metadata for the API hub is generated.',
-    default: false,
-    hidden: true
-  }),
-  config: flags.string({
-    char: 'c',
-    parse: input => resolve(input),
-    description:
-      'Set the path to a file containing the options for generation instead of setting the options on the command line. When combining the `config` option with other options on the command line, the command line options take precedence. If a directory is passed, a `config.json` file is read from this directory.',
-    helpValue: '<path/to/config.json>',
-    required: false
-  })
-};
diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index 8c7de7a9d4..7733351cdd 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -1,11 +1,10 @@
 import { promises } from 'fs';
 import { resolve } from 'path';
-import Parser from '@oclif/parser';
+import yargs from 'yargs';
 import { ErrorWithCause, createLogger } from '@sap-cloud-sdk/util';
-import { OpenApiGenerator } from '../cli';
-import { generatorFlags } from './flags';
-const { readFile, lstat } = promises;
+import { generatorOptions } from './flags';
 
+const { readFile, lstat } = promises;
 const logger = createLogger('openapi-generator');
 
 /**
@@ -13,24 +12,6 @@ const logger = createLogger('openapi-generator');
  * The options match the CLI options.
  */
 export interface GeneratorOptions {
-  input: string;
-  outputDir: string;
-  transpile?: boolean;
-  include?: string;
-  clearOutputDir?: boolean;
-  skipValidation?: boolean;
-  tsConfig?: string;
-  packageJson?: boolean;
-  optionsPerService?: string;
-  packageVersion?: string;
-  readme?: boolean;
-  metadata?: boolean;
-  verbose?: boolean;
-  overwrite?: boolean;
-  config?: string;
-}
-
-export interface GeneratorOptions2 {
   input: string;
   outputDir: string;
   transpile: boolean;
@@ -48,12 +29,6 @@ export interface GeneratorOptions2 {
   config?: string;
 }
 
-/**
- * Parsed options with default values.
- */
-export type ParsedGeneratorOptions =
-  typeof OpenApiGenerator extends Parser.Input<infer F> ? F : never;
-
 /**
  * Parse the given generator options for programmatic use.
  * This function is only used when invoking the generator programmatically.
@@ -64,18 +39,18 @@ export type ParsedGeneratorOptions =
  */
 export function parseGeneratorOptions(
   options: GeneratorOptions
-): ParsedGeneratorOptions {
-  return Object.entries(generatorFlags).reduce(
-    (parsedOptions, [name, flag]) => {
+): GeneratorOptions {
+  return Object.entries(generatorOptions).reduce(
+    (parsedOptions, [name, flag]: [string, yargs.Options]) => {
       const value = options[name];
       if (typeof value !== 'undefined') {
-        parsedOptions[name] = flag.parse(value as never, undefined);
+        parsedOptions[name] = value;
       } else if (typeof flag.default !== 'undefined') {
         parsedOptions[name] = flag.default;
       }
       return parsedOptions;
     },
-    {} as ParsedGeneratorOptions
+    {} as GeneratorOptions
   );
 }
 
@@ -91,15 +66,15 @@ export async function parseOptionsFromConfig(
     if ((await lstat(configPath)).isDirectory()) {
       configPath = resolve(configPath, 'config.json');
     }
-    const generatorOptions = JSON.parse(await readFile(configPath, 'utf8'));
-    Object.keys(generatorOptions).forEach(key => {
-      if (!Object.keys(generatorFlags).includes(key)) {
+    const generatorOpts = JSON.parse(await readFile(configPath, 'utf8'));
+    Object.keys(generatorOpts).forEach(key => {
+      if (!Object.keys(generatorOptions).includes(key)) {
         logger.warn(
           `"${key}" is not part of the configuration and will be ignored.`
         );
       }
     });
-    return generatorOptions;
+    return generatorOpts;
   } catch (err) {
     throw new ErrorWithCause(
       `Could not read configuration file at ${configPath}.`,
@@ -115,7 +90,7 @@ export async function parseOptionsFromConfig(
  * @returns generator options that were used in the raw input
  */
 export function getSpecifiedFlags(
-  options: ParsedGeneratorOptions | GeneratorOptions2,
+  options: GeneratorOptions,
   rawInputFlags: string[]
 ): GeneratorOptions {
   return rawInputFlags.reduce((reducedOptions, name) => {
diff --git a/packages/openapi-generator/src/options/options-per-service.ts b/packages/openapi-generator/src/options/options-per-service.ts
index 0d611c700b..dcbc697bf2 100644
--- a/packages/openapi-generator/src/options/options-per-service.ts
+++ b/packages/openapi-generator/src/options/options-per-service.ts
@@ -2,8 +2,7 @@ import { existsSync, promises } from 'fs';
 import { parse } from 'path';
 import { unique, UniqueNameGenerator } from '@sap-cloud-sdk/util';
 import { getRelPathWithPosixSeparator } from '../generator';
-import { ParsedGeneratorOptions } from './generator-options';
-import { GeneratorOptions2 } from '.';
+import { GeneratorOptions } from './generator-options';
 
 const { readFile } = promises;
 
@@ -59,10 +58,7 @@ export async function getOriginalOptionsPerService(
  */
 export async function getOptionsPerService(
   inputPaths: string[],
-  {
-    optionsPerService,
-    skipValidation
-  }: ParsedGeneratorOptions | GeneratorOptions2
+  { optionsPerService, skipValidation }: GeneratorOptions
 ): Promise<OptionsPerService> {
   const originalOptionsPerService = await getOriginalOptionsPerService(
     optionsPerService
diff --git a/packages/openapi-generator/src/options/tsconfig-json.ts b/packages/openapi-generator/src/options/tsconfig-json.ts
index f52191ab89..f4a7a75c7d 100644
--- a/packages/openapi-generator/src/options/tsconfig-json.ts
+++ b/packages/openapi-generator/src/options/tsconfig-json.ts
@@ -1,7 +1,7 @@
 import { promises } from 'fs';
 import { resolve } from 'path';
 import { ErrorWithCause, formatJson } from '@sap-cloud-sdk/util';
-import { ParsedGeneratorOptions, GeneratorOptions2 } from './generator-options';
+import { GeneratorOptions } from './generator-options';
 const { readFile, lstat } = promises;
 
 export const defaultTsConfig = {
@@ -31,7 +31,7 @@ export const defaultTsConfig = {
 export async function tsconfigJson({
   transpile,
   tsConfig
-}: ParsedGeneratorOptions | GeneratorOptions2): Promise<string | undefined> {
+}: GeneratorOptions): Promise<string | undefined> {
   if (transpile || tsConfig) {
     return tsConfig
       ? readCustomTsConfig(tsConfig)
diff --git a/scripts/generate-test-services.ts b/scripts/generate-test-services.ts
index fa139ad5a3..991b04318b 100644
--- a/scripts/generate-test-services.ts
+++ b/scripts/generate-test-services.ts
@@ -4,7 +4,7 @@ import { createLogger } from '@sap-cloud-sdk/util';
 import { generate as generateOdata } from '../packages/generator/src';
 import {
   generate as generateOpenApi,
-  GeneratorOptions
+  GeneratorOptions2
 } from '../packages/openapi-generator/src';
 import { ODataVersion } from '../packages/util/src';
 
@@ -39,16 +39,22 @@ const generatorConfigOData = {
   s4hanaCloud: false
 };
 
-const generatorConfigOpenApi: GeneratorOptions = {
+const generatorConfigOpenApi: GeneratorOptions2 = {
   input: path.resolve('test-resources', 'openapi-service-specs'),
   outputDir: path.resolve('test-packages', 'test-services', 'openapi'),
   clearOutputDir: true,
   transpile: true,
   packageJson: true,
   packageVersion: '1.2.3',
-  include: 'test-resources/{CHANGELOG.md,some-test-markdown.md}',
+  include: [
+    'test-resources/CHANGELOG.md',
+    'test-resources/some-test-markdown.md'
+  ],
   readme: true,
-  skipValidation: true
+  skipValidation: true,
+  overwrite: false,
+  verbose: false,
+  metadata: false
 };
 
 const logger = createLogger('generate-test-service');
diff --git a/yarn.lock b/yarn.lock
index 40b1f6f793..c1fa06e9df 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1395,96 +1395,6 @@
     node-gyp "^7.1.0"
     read-package-json-fast "^2.0.1"
 
-"@oclif/command@^1.5.19", "@oclif/command@^1.5.20", "@oclif/command@^1.6.0", "@oclif/command@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz#c1a499b10d26e9d1a611190a81005589accbb339"
-  integrity sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==
-  dependencies:
-    "@oclif/config" "^1.15.1"
-    "@oclif/errors" "^1.3.3"
-    "@oclif/parser" "^3.8.3"
-    "@oclif/plugin-help" "^3"
-    debug "^4.1.1"
-    semver "^7.3.2"
-
-"@oclif/config@^1.14.0", "@oclif/config@^1.15.1", "@oclif/config@^1.17.0":
-  version "1.17.0"
-  resolved "https://registry.npmjs.org/@oclif/config/-/config-1.17.0.tgz#ba8639118633102a7e481760c50054623d09fcab"
-  integrity sha512-Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA==
-  dependencies:
-    "@oclif/errors" "^1.3.3"
-    "@oclif/parser" "^3.8.0"
-    debug "^4.1.1"
-    globby "^11.0.1"
-    is-wsl "^2.1.1"
-    tslib "^2.0.0"
-
-"@oclif/dev-cli@^1.22.2":
-  version "1.26.0"
-  resolved "https://registry.npmjs.org/@oclif/dev-cli/-/dev-cli-1.26.0.tgz#e3ec294b362c010ffc8948003d3770955c7951fd"
-  integrity sha512-272udZP+bG4qahoAcpWcMTJKiA+V42kRMqQM7n4tgW35brYb2UP5kK+p08PpF8sgSfRTV8MoJVJG9ax5kY82PA==
-  dependencies:
-    "@oclif/command" "^1.8.0"
-    "@oclif/config" "^1.17.0"
-    "@oclif/errors" "^1.3.3"
-    "@oclif/plugin-help" "^3.2.0"
-    cli-ux "^5.2.1"
-    debug "^4.1.1"
-    find-yarn-workspace-root "^2.0.0"
-    fs-extra "^8.1"
-    github-slugger "^1.2.1"
-    lodash "^4.17.11"
-    normalize-package-data "^3.0.0"
-    qqjs "^0.3.10"
-    tslib "^2.0.3"
-
-"@oclif/errors@^1.2.1", "@oclif/errors@^1.2.2", "@oclif/errors@^1.3.3":
-  version "1.3.5"
-  resolved "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.5.tgz#a1e9694dbeccab10fe2fe15acb7113991bed636c"
-  integrity sha512-OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ==
-  dependencies:
-    clean-stack "^3.0.0"
-    fs-extra "^8.1"
-    indent-string "^4.0.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
-
-"@oclif/linewrap@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz#aedcb64b479d4db7be24196384897b5000901d91"
-  integrity sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==
-
-"@oclif/parser@^3.8.0", "@oclif/parser@^3.8.3", "@oclif/parser@^3.8.5":
-  version "3.8.5"
-  resolved "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.5.tgz#c5161766a1efca7343e1f25d769efbefe09f639b"
-  integrity sha512-yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg==
-  dependencies:
-    "@oclif/errors" "^1.2.2"
-    "@oclif/linewrap" "^1.0.0"
-    chalk "^2.4.2"
-    tslib "^1.9.3"
-
-"@oclif/plugin-help@^3", "@oclif/plugin-help@^3.2.0":
-  version "3.2.3"
-  resolved "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.3.tgz#cd24010e7eb326782843d3aa6d6b5a4affebb2c3"
-  integrity sha512-l2Pd0lbOMq4u/7xsl9hqISFqyR9gWEz/8+05xmrXFr67jXyS6EUCQB+mFBa0wepltrmJu0sAFg9AvA2mLaMMqQ==
-  dependencies:
-    "@oclif/command" "^1.5.20"
-    "@oclif/config" "^1.15.1"
-    "@oclif/errors" "^1.2.2"
-    chalk "^4.1.0"
-    indent-string "^4.0.0"
-    lodash.template "^4.4.0"
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    widest-line "^3.1.0"
-    wrap-ansi "^4.0.0"
-
-"@oclif/screen@^1.0.3":
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/@oclif/screen/-/screen-1.0.4.tgz#b740f68609dfae8aa71c3a6cab15d816407ba493"
-  integrity sha512-60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==
-
 "@octokit/auth-token@^2.4.4":
   version "2.5.0"
   resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36"
@@ -1885,7 +1795,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@^7.1.1", "@types/glob@^7.1.2":
+"@types/glob@^7.1.2":
   version "7.1.4"
   resolved "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
   integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
@@ -2302,12 +2212,7 @@ ansi-colors@^4.1.1:
   resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
-ansi-escapes@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
+ansi-escapes@^4.2.1:
   version "4.3.2"
   resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -2341,7 +2246,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0, ansi-styles@^4.2.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -2353,11 +2258,6 @@ ansi-styles@^5.0.0:
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansicolors@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
-  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
-
 antlr4@4.8.0:
   version "4.8.0"
   resolved "https://registry.npmjs.org/antlr4/-/antlr4-4.8.0.tgz#f938ec171be7fc2855cd3a533e87647185b32b6a"
@@ -2859,14 +2759,6 @@ caniuse-lite@^1.0.30001264:
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz#0613c9e6c922e422792e6fcefdf9a3afeee4f8c3"
   integrity sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==
 
-cardinal@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505"
-  integrity sha1-fMEFXYItISlU0HsIXeolHMe8VQU=
-  dependencies:
-    ansicolors "~0.3.2"
-    redeyed "~2.1.0"
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -2891,7 +2783,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2950,11 +2842,6 @@ charm@~0.1.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -2980,13 +2867,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-clean-stack@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz#155bf0b2221bf5f4fba89528d24c5953f17fe3a8"
-  integrity sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==
-  dependencies:
-    escape-string-regexp "4.0.0"
-
 cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -2994,14 +2874,6 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-progress@^3.4.0:
-  version "3.9.1"
-  resolved "https://registry.npmjs.org/cli-progress/-/cli-progress-3.9.1.tgz#a22eba6a20f53289fdd05d5ee8cb2cc8c28f866e"
-  integrity sha512-AXxiCe2a0Lm0VN+9L0jzmfQSkcZm5EYspfqXKaSIQKqIk+0hnkZ3/v1E9B39mkD6vYhKih3c/RPsJBSwq9O99Q==
-  dependencies:
-    colors "^1.1.2"
-    string-width "^4.2.0"
-
 cli-spinners@^2.5.0:
   version "2.6.1"
   resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
@@ -3014,38 +2886,6 @@ cli-tableau@^2.0.0:
   dependencies:
     chalk "3.0.0"
 
-cli-ux@^5.2.1, cli-ux@^5.4.5:
-  version "5.6.3"
-  resolved "https://registry.npmjs.org/cli-ux/-/cli-ux-5.6.3.tgz#eecdb2e0261171f2b28f2be6b18c490291c3a287"
-  integrity sha512-/oDU4v8BiDjX2OKcSunGH0iGDiEtj2rZaGyqNuv9IT4CgcSMyVWAMfn0+rEHaOc4n9ka78B0wo1+N1QX89f7mw==
-  dependencies:
-    "@oclif/command" "^1.6.0"
-    "@oclif/errors" "^1.2.1"
-    "@oclif/linewrap" "^1.0.0"
-    "@oclif/screen" "^1.0.3"
-    ansi-escapes "^4.3.0"
-    ansi-styles "^4.2.0"
-    cardinal "^2.1.1"
-    chalk "^4.1.0"
-    clean-stack "^3.0.0"
-    cli-progress "^3.4.0"
-    extract-stack "^2.0.0"
-    fs-extra "^8.1"
-    hyperlinker "^1.0.0"
-    indent-string "^4.0.0"
-    is-wsl "^2.2.0"
-    js-yaml "^3.13.1"
-    lodash "^4.17.11"
-    natural-orderby "^2.0.1"
-    object-treeify "^1.1.4"
-    password-prompt "^1.1.2"
-    semver "^7.3.2"
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    supports-color "^8.1.0"
-    supports-hyperlinks "^2.1.0"
-    tslib "^2.0.0"
-
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
@@ -3150,7 +2990,7 @@ color@3.0.x:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colors@^1.1.2, colors@^1.2.1:
+colors@^1.2.1:
   version "1.4.0"
   resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -3261,7 +3101,7 @@ content-disposition@0.5.3:
   dependencies:
     safe-buffer "5.1.2"
 
-content-type@^1.0.4, content-type@~1.0.4:
+content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
@@ -3411,17 +3251,6 @@ cron@1.8.2:
   dependencies:
     moment-timezone "^0.5.x"
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -3965,7 +3794,7 @@ encoding@^0.1.12:
   dependencies:
     iconv-lite "^0.6.2"
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -4083,11 +3912,6 @@ escape-html@~1.0.3:
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -4098,6 +3922,11 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^1.8.1:
   version "1.14.3"
   resolved "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
@@ -4290,7 +4119,7 @@ espree@^7.3.0, espree@^7.3.1:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
-esprima@4.0.1, esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+esprima@4.0.1, esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4354,19 +4183,6 @@ eventemitter3@^4.0.4:
   resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -4449,11 +4265,6 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extract-stack@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/extract-stack/-/extract-stack-2.0.0.tgz#11367bc865bfcd9bc0db3123e5edb57786f11f9b"
-  integrity sha512-AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==
-
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -4474,7 +4285,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.7:
+fast-glob@^3.1.1, fast-glob@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
   integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
@@ -4626,13 +4437,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-yarn-workspace-root@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
-  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
-  dependencies:
-    micromatch "^4.0.2"
-
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -4722,7 +4526,7 @@ fs-extra@^6.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^8.1, fs-extra@^8.1.0:
+fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
   integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
@@ -4857,18 +4661,6 @@ get-port@^5.1.1:
   resolved "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
   integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
-get-stream@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
 get-stream@^6.0.0:
   version "6.0.1"
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -4960,11 +4752,6 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
-github-slugger@^1.2.1:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e"
-  integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==
-
 glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -4996,21 +4783,7 @@ globals@^13.6.0, globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^10.0.1:
-  version "10.0.2"
-  resolved "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
-  integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.0.3"
-    glob "^7.1.3"
-    ignore "^5.1.1"
-    merge2 "^1.2.3"
-    slash "^3.0.0"
-
-globby@^11.0.1, globby@^11.0.2, globby@^11.0.3:
+globby@^11.0.2, globby@^11.0.3:
   version "11.0.4"
   resolved "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
   integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -5156,18 +4929,6 @@ http-cache-semantics@^4.1.0:
   resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
-http-call@^5.1.2:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz#4ded815b13f423de176eb0942d69c43b25b148db"
-  integrity sha512-ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w==
-  dependencies:
-    content-type "^1.0.4"
-    debug "^4.1.1"
-    is-retry-allowed "^1.1.0"
-    is-stream "^2.0.0"
-    parse-json "^4.0.0"
-    tunnel-agent "^0.6.0"
-
 http-errors@1.7.2:
   version "1.7.2"
   resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
@@ -5242,11 +5003,6 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-hyperlinker@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e"
-  integrity sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==
-
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -5278,7 +5034,7 @@ ignore@^4.0.6:
   resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
+ignore@^5.1.4, ignore@^5.1.8:
   version "5.1.8"
   resolved "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -5478,11 +5234,6 @@ is-date-object@^1.0.1:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-docker@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -5604,11 +5355,6 @@ is-relative-path@^1.0.2:
   resolved "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.2.tgz#091b46a0d67c1ed0fe85f1f8cfdde006bb251d46"
   integrity sha1-CRtGoNZ8HtD+hfH4z93gBrslHUY=
 
-is-retry-allowed@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
-  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
-
 is-set@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
@@ -5626,11 +5372,6 @@ is-ssh@^1.3.0:
   dependencies:
     protocols "^1.1.0"
 
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -5684,13 +5425,6 @@ is-weakref@^1.0.1:
   dependencies:
     call-bind "^1.0.0"
 
-is-wsl@^2.1.1, is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -6671,7 +6405,7 @@ lodash.set@^4.3.2:
   resolved "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
   integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
 
-lodash.template@^4.4.0, lodash.template@^4.5.0:
+lodash.template@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
   integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
@@ -6691,7 +6425,7 @@ lodash.truncate@^4.4.2:
   resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
   integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
 
-lodash@4.x, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@4.x, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6907,7 +6641,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3, merge2@^1.3.0:
+merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -6917,7 +6651,7 @@ methods@~1.1.2:
   resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.4:
   version "4.0.4"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
   integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
@@ -7035,11 +6769,6 @@ minizlib@^2.0.0, minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp-classic@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
 mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
@@ -7170,11 +6899,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-natural-orderby@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz#8623bc518ba162f8ff1cdb8941d74deb0fdcc016"
-  integrity sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==
-
 needle@2.4.0:
   version "2.4.0"
   resolved "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
@@ -7208,11 +6932,6 @@ neo-async@^2.6.0:
   resolved "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
   integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
 nock@^13.0.11:
   version "13.1.3"
   resolved "https://registry.npmjs.org/nock/-/nock-13.1.3.tgz#110b005965654a8ffb798e87bad18b467bff15f9"
@@ -7499,13 +7218,6 @@ npm-registry-fetch@^9.0.0:
     minizlib "^2.0.0"
     npm-package-arg "^8.0.0"
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -7607,11 +7319,6 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-treeify@^1.1.4:
-  version "1.1.33"
-  resolved "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.33.tgz#f06fece986830a3cba78ddd32d4c11d1f76cdf40"
-  integrity sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==
-
 object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
@@ -7647,7 +7354,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -7993,14 +7700,6 @@ passport@^0.4.1:
     passport-strategy "1.x.x"
     pause "0.0.1"
 
-password-prompt@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz#85b2f93896c5bd9e9f2d6ff0627fa5af3dc00923"
-  integrity sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA==
-  dependencies:
-    ansi-escapes "^3.1.0"
-    cross-spawn "^6.0.5"
-
 path-browserify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
@@ -8021,11 +7720,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -8417,14 +8111,6 @@ psl@^1.1.24, psl@^1.1.28, psl@^1.1.33:
   resolved "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -8440,25 +8126,6 @@ q@^1.5.1:
   resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qqjs@^0.3.10:
-  version "0.3.11"
-  resolved "https://registry.npmjs.org/qqjs/-/qqjs-0.3.11.tgz#795b9f7d00807d75c391b1241b5be3077143d9ea"
-  integrity sha512-pB2X5AduTl78J+xRSxQiEmga1jQV0j43jOPs/MTgTLApGFEOn6NgdE2dEjp7nvDtjkIOZbvFIojAiYUx6ep3zg==
-  dependencies:
-    chalk "^2.4.1"
-    debug "^4.1.1"
-    execa "^0.10.0"
-    fs-extra "^6.0.1"
-    get-stream "^5.1.0"
-    glob "^7.1.2"
-    globby "^10.0.1"
-    http-call "^5.1.2"
-    load-json-file "^6.2.0"
-    pkg-dir "^4.2.0"
-    tar-fs "^2.0.0"
-    tmp "^0.1.0"
-    write-json-file "^4.1.1"
-
 qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
@@ -8714,13 +8381,6 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-redeyed@~2.1.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b"
-  integrity sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=
-  dependencies:
-    esprima "~4.0.0"
-
 reftools@^1.1.9:
   version "1.1.9"
   resolved "https://registry.npmjs.org/reftools/-/reftools-1.1.9.tgz#e16e19f662ccd4648605312c06d34e5da3a2b77e"
@@ -9050,13 +8710,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -9064,11 +8717,6 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -9412,7 +9060,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.1:
+"string-width@^1.0.2 || 2":
   version "2.1.1"
   resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -9420,7 +9068,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9504,11 +9152,6 @@ strip-bom@^4.0.0:
   resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -9572,14 +9215,14 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0, supports-color@^8.1.0:
+supports-color@^8.0.0:
   version "8.1.1"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.1.0:
+supports-hyperlinks@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
   integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
@@ -9631,16 +9274,6 @@ tapable@^2.2.0:
   resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar-fs@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
 tar-stream@^2.1.4:
   version "2.2.0"
   resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
@@ -9749,13 +9382,6 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
-  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
-  dependencies:
-    rimraf "^2.6.3"
-
 tmp@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
@@ -9892,12 +9518,12 @@ tslib@1.9.3:
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3:
+tslib@^2.0.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -10328,7 +9954,7 @@ which-module@^2.0.0:
   resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.9, which@^1.3.1:
+which@1, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -10349,13 +9975,6 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
-  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
-  dependencies:
-    string-width "^4.0.0"
-
 winston-transport@^4.4.0:
   version "4.4.0"
   resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59"
@@ -10389,15 +10008,6 @@ wordwrap@^1.0.0:
   resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-wrap-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz#b3570d7c70156159a2d42be5cc942e957f7b1131"
-  integrity sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -10452,7 +10062,7 @@ write-json-file@^3.2.0:
     sort-keys "^2.0.0"
     write-file-atomic "^2.4.2"
 
-write-json-file@^4.1.1, write-json-file@^4.3.0:
+write-json-file@^4.3.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz#908493d6fd23225344af324016e4ca8f702dd12d"
   integrity sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==

From 0e9e85e95e52534a79a6e8bfcd9363b0c193ab0c Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Fri, 8 Oct 2021 16:19:36 +0200
Subject: [PATCH 06/27] Improve types

---
 packages/openapi-generator/src/cli/index.ts   |  2 ++
 packages/openapi-generator/src/generator.ts   | 26 +++++------------
 .../src/options/generator-options.ts          |  8 ++---
 scripts/generate-test-services.ts             | 29 ++++++++-----------
 4 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index 7753129415..fc293b482a 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -11,6 +11,8 @@ import { generate, generateWithParsedOptions } from '../generator';
 
 const logger = createLogger('openapi-generator');
 
+parseCmdArgs();
+
 export async function parseCmdArgs(): Promise<void> {
   try {
     const argv = await yargs(hideBin(process.argv))
diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts
index 6c72390ec7..909f30cf4f 100644
--- a/packages/openapi-generator/src/generator.ts
+++ b/packages/openapi-generator/src/generator.ts
@@ -16,7 +16,6 @@ import {
   setLogLevel,
   formatJson
 } from '@sap-cloud-sdk/util';
-import { GlobSync } from 'glob';
 import {
   getSdkMetadataFileNames,
   getSdkVersion,
@@ -168,24 +167,24 @@ async function generateMandatorySources(
   serviceDir: string,
   openApiDocument: OpenApiDocument,
   { overwrite }: GeneratorOptions
-) {
+): Promise<void> {
   if (openApiDocument.schemas.length) {
     const schemaDir = resolve(serviceDir, 'schema');
-    await createSchemaFiles(schemaDir, openApiDocument, !!overwrite);
+    await createSchemaFiles(schemaDir, openApiDocument, overwrite);
     await createFile(
       schemaDir,
       'index.ts',
       schemaIndexFile(openApiDocument),
-      !!overwrite
+      overwrite
     );
   }
 
-  await createApis(serviceDir, openApiDocument, !!overwrite);
+  await createApis(serviceDir, openApiDocument, overwrite);
   await createFile(
     serviceDir,
     'index.ts',
     apiIndexFile(openApiDocument),
-    !!overwrite
+    overwrite
   );
 }
 
@@ -285,24 +284,13 @@ export async function getInputFilePaths(input: string): Promise<string[]> {
 // TODO 1728 move to a new package to reduce code duplication.
 async function copyAdditionalFiles(
   serviceDir: string,
-  additionalFiles: string | string[],
+  additionalFiles: string[],
   overwrite: boolean
 ): Promise<void[]> {
   logger.verbose(
     `Copying additional files matching ${additionalFiles} into ${serviceDir}.`
   );
 
-  if (typeof additionalFiles === 'string') {
-    return Promise.all(
-      new GlobSync(additionalFiles!).found.map(filePath =>
-        copyFile(
-          resolve(filePath),
-          join(serviceDir, basename(filePath)),
-          overwrite
-        )
-      )
-    );
-  }
   return Promise.all(
     additionalFiles.map(filePath =>
       copyFile(
@@ -379,7 +367,7 @@ async function generatePackageJson(
       packageName,
       genericDescription(directoryName),
       await getSdkVersion(),
-      packageVersion || '1.0.0'
+      packageVersion
     ),
     overwrite,
     false
diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index 7733351cdd..c8156eb416 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -23,7 +23,7 @@ export interface GeneratorOptions {
   packageJson: boolean;
   verbose: boolean;
   optionsPerService?: string;
-  packageVersion?: string;
+  packageVersion: string;
   readme: boolean;
   metadata: boolean;
   config?: string;
@@ -38,7 +38,7 @@ export interface GeneratorOptions {
  * @returns Parsed options with default values.
  */
 export function parseGeneratorOptions(
-  options: GeneratorOptions
+  options: Partial<GeneratorOptions>
 ): GeneratorOptions {
   return Object.entries(generatorOptions).reduce(
     (parsedOptions, [name, flag]: [string, yargs.Options]) => {
@@ -92,12 +92,12 @@ export async function parseOptionsFromConfig(
 export function getSpecifiedFlags(
   options: GeneratorOptions,
   rawInputFlags: string[]
-): GeneratorOptions {
+): Partial<GeneratorOptions> {
   return rawInputFlags.reduce((reducedOptions, name) => {
     const value = options[name];
     if (value !== undefined) {
       reducedOptions[name] = value;
     }
     return reducedOptions;
-  }, {} as GeneratorOptions);
+  }, {} as Partial<GeneratorOptions>);
 }
diff --git a/scripts/generate-test-services.ts b/scripts/generate-test-services.ts
index 991b04318b..570cefaf60 100644
--- a/scripts/generate-test-services.ts
+++ b/scripts/generate-test-services.ts
@@ -2,10 +2,7 @@ import { promises, Dirent } from 'fs';
 import path from 'path';
 import { createLogger } from '@sap-cloud-sdk/util';
 import { generate as generateOdata } from '../packages/generator/src';
-import {
-  generate as generateOpenApi,
-  GeneratorOptions2
-} from '../packages/openapi-generator/src';
+import { generate as generateOpenApi } from '../packages/openapi-generator/src';
 import { ODataVersion } from '../packages/util/src';
 
 const { readFile, readdir, writeFile } = promises;
@@ -39,7 +36,7 @@ const generatorConfigOData = {
   s4hanaCloud: false
 };
 
-const generatorConfigOpenApi: GeneratorOptions2 = {
+const generatorConfigOpenApi: Partial<GeneratorOptions> = {
   input: path.resolve('test-resources', 'openapi-service-specs'),
   outputDir: path.resolve('test-packages', 'test-services', 'openapi'),
   clearOutputDir: true,
@@ -50,11 +47,7 @@ const generatorConfigOpenApi: GeneratorOptions2 = {
     'test-resources/CHANGELOG.md',
     'test-resources/some-test-markdown.md'
   ],
-  readme: true,
-  skipValidation: true,
-  overwrite: false,
-  verbose: false,
-  metadata: false
+  readme: true
 };
 
 const logger = createLogger('generate-test-service');
@@ -72,7 +65,7 @@ function generateTestServicesPackage(
 }
 
 async function generateTestServicesWithLocalCoreModules(
-  outputDirBase,
+  outputDirBase: string,
   version: ODataVersion | 'openapi'
 ): Promise<void> {
   const outputDir = path.resolve(outputDirBase, version);
@@ -106,13 +99,15 @@ async function generateTestServicesWithLocalCoreModules(
     )
   );
 
-  function readServiceDirectories() {
-    return readdir(outputDir).catch(dirErr => {
+  async function readServiceDirectories() {
+    try {
+      return readdir(outputDir);
+    } catch (dirErr) {
       throw Error(`Reading output directory failed: ${dirErr}`);
-    });
+    }
   }
 
-  function readServiceDirectory(serviceDirectory): Promise<Dirent[]> {
+  async function readServiceDirectory(serviceDirectory): Promise<Dirent[]> {
     return readdir(path.resolve(outputDir, serviceDirectory), {
       withFileTypes: true
     }).catch(serviceDirErr => {
@@ -120,7 +115,7 @@ async function generateTestServicesWithLocalCoreModules(
     });
   }
 
-  function readServiceFile(serviceDirectory, file) {
+  async function readServiceFile(serviceDirectory, file) {
     return readFile(path.resolve(outputDir, serviceDirectory, file), {
       encoding: 'utf8'
     }).catch(fileReadErr => {
@@ -128,7 +123,7 @@ async function generateTestServicesWithLocalCoreModules(
     });
   }
 
-  function replaceWithLocalModules(serviceDirectory, file, data) {
+  async function replaceWithLocalModules(serviceDirectory, file, data) {
     return writeFile(
       path.resolve(outputDir, serviceDirectory, file),
       data.replace('@sap-cloud-sdk/core', '../../../../../src'),

From d3079dc643b807555e12f6bc55fd415c643ce6ac Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Mon, 11 Oct 2021 09:33:39 +0200
Subject: [PATCH 07/27] Replace parsedGeneratorOptions

---
 STYLEGUIDE.md                                 | 46 +++++++++----------
 .../src/options/options-per-service.spec.ts   | 12 ++---
 .../src/options/tsconfig-json.spec.ts         | 12 ++---
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index 30cc4f58e1..f202a6af6c 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -7,7 +7,7 @@ Those that are checked by lint are marked by the following symbol: ✓.
 #### Table of Contents
 
 - [Naming](#naming)
-  - [Use kebap case for file names](#use-kebap-case-for-file-names)
+  - [Use kebab case for file names](#use-kebab-case-for-file-names)
   - [Use camel case for variable names ✓](#use-camel-case-for-variable-names-)
   - [Use pascal case for classes ✓](#use-pascal-case-for-classes-)
   - [Use pascal case for interface names and don't prefix them](#use-pascal-case-for-interface-names-and-dont-prefix-them)
@@ -45,9 +45,9 @@ Those that are checked by lint are marked by the following symbol: ✓.
 
 ## Naming
 
-### Use kebap case for file names
+### Use kebab case for file names
 
-Use kebap case for all file names and directories, except for generated files and markdown files, that are not in the knowledge base.
+Use kebab case for all file names and directories, except for generated files and markdown files, that are not in the knowledge base.
 
 ❌ Examples of **incorrect** code:
 
@@ -65,7 +65,7 @@ some_dir / some_class.ts;
 ✅ Examples of **correct** code:
 
 ```ts
-/* Use kebap case */
+/* Use kebab case */
 some-dir/some-class.ts
 
 /* Exceptions apply for generated files and some markdown files */
@@ -122,7 +122,7 @@ class FooBar {
 ### Use pascal case for interface names and don't prefix them
 
 Pascal case is common in most JavaScript/TypeScript projects for interfaces.
-Don't prefix interfaces with the hungarian notation 'I' (or other prefixes).
+Don't prefix interfaces with the Hungarian notation 'I' (or other prefixes).
 If you have a class with the same name as an interface, consider a more general name for the interface or a more specific name for the class - if they are different things it should be possible to name them differently.
 
 ❌ Examples of **incorrect** code:
@@ -200,7 +200,7 @@ function parseJson() { ... }
 
 Every function should do something and that action should be described with a verb.
 The verb should fit the return type and value.
-An exception to this can be methods, that operate on an instance directly, e. g. `instance.toString()`, `instance.asObject()`.
+An exception to this can be methods, that operate on an instance directly, e.g. `instance.toString()`, `instance.asObject()`.
 
 ❌ Examples of **incorrect** code:
 
@@ -253,7 +253,7 @@ class FooBar {
 
 ### Use single quotes ✓
 
-Use single quotes, unless not possible otherwise, e. g. when your string contains single quotes.
+Use single quotes, unless not possible otherwise, e.g. when your string contains single quotes.
 
 ❌ Examples of **incorrect** code:
 
@@ -301,7 +301,7 @@ const foo = `foo ${fn(bar + 'bar')}`;
 ### Use `.forEach` and other array functions rather than `for`
 
 Use the functional language concepts of JavaScript in favor of the imperative ones, when possible.
-Use the correct function for your use case (e. g. `.map`, `.reduce`, `.filter`, `.find`, `.some`, `.every`).
+Use the correct function for your use case (e.g. `.map`, `.reduce`, `.filter`, `.find`, `.some`, `.every`).
 In some cases it makes sense to resort to the imperative `for`, for example, when performance is of the essence, if you have to iterate over every n-th element or if you want to execute asynchronous actions sequentially.
 Be aware of the effects of asynchronicity.
 The callback passed to `.forEach` is invoked for every item of a list sequentially.
@@ -395,7 +395,7 @@ function foo(obj: SomeType | undefined) {
 ### Use `null` for intentional explicit absence of values or if it is part of an external API
 
 If a value can both be non-existent and intentionally absent and those states are semantically different it may make sense to allow the usage of `null`.
-Those cases should however be rather rare and are more common when calling external APIs, e. g. through HTTP requests.
+Those cases should however be rather rare and are more common when calling external APIs, e.g. through HTTP requests.
 Consider whether there is a better API design that might avoid this.
 
 ❌ Examples of **incorrect** code:
@@ -425,7 +425,7 @@ function foo(obj: SomeType | null | undefined) {
 ### Use truthy/falsy checks where possible
 
 In most cases it is possible to check for truthiness/falsiness instead of explicitly comparing values.
-This should be used when possible, but carefully considered in cases where falsy values are valid and therefore semantically truthy values, e. g. 0, ''.
+This should be used when possible, but carefully considered in cases where falsy values are valid and therefore semantically truthy values, e.g. 0, ''.
 Therefore, when checking for existence of primitives, don't use truthy/falsy checks.
 Of course, more fine granular checks should be applied if semantically needed.
 
@@ -433,37 +433,37 @@ Of course, more fine granular checks should be applied if semantically needed.
 
 ```ts
 /* Don't use explicit comparison with `undefined` for objects */
-if(obj !== undefined) { ... }
+if (obj !== undefined) { ... }
 
 /* Don't use truthy/falsy checks for existence of primitives */
 function checkIfExist(obj: string | number) {
-  if(obj) { ... }
+  if (obj) { ... }
 }
 
 /* Don't use explicit comparison for array length (or other numbers)*/
-if(arr.length !== 0) { ... }
+if (arr.length !== 0) { ... }
 
 /* Don't use explicit comparison for booleans */
-if(isFoo !== false) { ... }
+if (isFoo !== false) { ... }
 
 /* Don't use explicit comparison when checking for empty string */
-if(someString !== '') { ... }
+if (someString !== '') { ... }
 ```
 
 ✅ Examples of **correct** code:
 
 ```ts
 /* Use truthy/falsy check for objects */
-if(obj) { ... }
+if (obj) { ... }
 
 /* Use truthy/falsy check for array length (or other numbers)*/
-if(arr.length) { ... }
+if (arr.length) { ... }
 
 /* Use truthy/falsy for booleans */
-if(!isFoo) { ... }
+if (!isFoo) { ... }
 
 /* Use truthy/falsy check when checking for empty string */
-if(someString) { ... }
+if (someString) { ... }
 ```
 
 ## White space
@@ -483,7 +483,7 @@ arr.forEach(item => {
 
 /* Don't use tabs */
 arr.forEach(item => {
-⇥const property = item.property;
+  const property = item.property;
 });
 ```
 
@@ -556,7 +556,7 @@ There should be no empty lines in between, except if it is part of the descripti
 ### Use `@deprecated` tag for deprecation
 
 When deprecating public API, this is done through the TypeDoc comments.
-The first line of the comment should start with `@deprecated` followed by a note mentioning since which version this is deprecated (e. g. `Since v1.0.0.`) and a note of what to use instead (or alternatively that it won't be replaced).
+The first line of the comment should start with `@deprecated` followed by a note mentioning since which version this is deprecated (e.g. `Since v1.0.0.`) and a note of what to use instead (or alternatively that it won't be replaced).
 
 ❌ Examples of **incorrect** code:
 
@@ -616,7 +616,7 @@ The description should end with a full stop.
  */
 ```
 
-### Use @returns if a function has a return value ✓
+### Use `@returns` if a function has a return value ✓
 
 Functions that return something should have an `@returns` statement in the documentation, followed by a description of the return value.
 The description should end with a full stop.
@@ -827,7 +827,7 @@ arr.forEach(item => {
 
 ### Use function declarations to reference functions by name
 
-Arrow functions require less boilerplate code than function declarations, especially if the function returns something directly, e. g. in one-liners.
+Arrow functions require less boilerplate code than function declarations, especially if the function returns something directly, e.g. in one-liners.
 For more complex functions, there is no significant difference.
 Arrow functions cannot be named and therefore have to be assigned to variables - much like function expressions.
 Function declarations are visually easier to differentiate from other variables than functions assigned to variables.
diff --git a/packages/openapi-generator/src/options/options-per-service.spec.ts b/packages/openapi-generator/src/options/options-per-service.spec.ts
index 1b55c49686..ada7d6ca99 100644
--- a/packages/openapi-generator/src/options/options-per-service.spec.ts
+++ b/packages/openapi-generator/src/options/options-per-service.spec.ts
@@ -10,13 +10,13 @@ jest.mock('path', () => {
 });
 
 import mock from 'mock-fs';
+import { GeneratorOptions } from './generator-options';
 import {
   getOptionsPerService,
   getOriginalOptionsPerService,
   getServiceOptions,
   OptionsPerService
 } from './options-per-service';
-import { ParsedGeneratorOptions } from './generator-options';
 
 describe('getOriginalOptionsPerService', () => {
   const config: OptionsPerService = {
@@ -97,7 +97,7 @@ describe('getOptionsPerService', () => {
 
   it('builds PerService config without options per service.', async () => {
     await expect(
-      getOptionsPerService(['/user/path/service'], {} as ParsedGeneratorOptions)
+      getOptionsPerService(['/user/path/service'], {} as GeneratorOptions)
     ).resolves.toEqual({
       'path/service': {
         directoryName: 'service',
@@ -125,7 +125,7 @@ describe('getOptionsPerService', () => {
     await expect(
       getOptionsPerService(['/user/path/service'], {
         optionsPerService: 'path/myConfig.json'
-      } as ParsedGeneratorOptions)
+      } as GeneratorOptions)
     ).resolves.toEqual({
       'path/service': {
         directoryName: 'dirName',
@@ -152,7 +152,7 @@ describe('getOptionsPerService', () => {
     await expect(
       getOptionsPerService(['/user/path/service'], {
         optionsPerService: 'path/myPartialConfig.json'
-      } as ParsedGeneratorOptions)
+      } as GeneratorOptions)
     ).resolves.toEqual({
       'path/service': {
         directoryName: 'service',
@@ -166,7 +166,7 @@ describe('getOptionsPerService', () => {
     await expect(
       getOptionsPerService(['/user/path1/service', '/user/path2/service'], {
         skipValidation: false
-      } as ParsedGeneratorOptions)
+      } as GeneratorOptions)
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
             "Duplicate service directory names found. Customize directory names with \`optionsPerService\` or enable automatic name adjustment with \`skipValidation\`.
             	Duplicates:
@@ -181,7 +181,7 @@ describe('getOptionsPerService', () => {
     await expect(
       getOptionsPerService(['/user/path1/service', '/user/path2/service'], {
         skipValidation: true
-      } as ParsedGeneratorOptions)
+      } as GeneratorOptions)
     ).resolves.toEqual({
       'path1/service': {
         directoryName: 'service',
diff --git a/packages/openapi-generator/src/options/tsconfig-json.spec.ts b/packages/openapi-generator/src/options/tsconfig-json.spec.ts
index 08598de87f..64a3bd5f66 100644
--- a/packages/openapi-generator/src/options/tsconfig-json.spec.ts
+++ b/packages/openapi-generator/src/options/tsconfig-json.spec.ts
@@ -1,19 +1,19 @@
 import mock from 'mock-fs';
-import { ParsedGeneratorOptions } from './generator-options';
+import { GeneratorOptions } from './generator-options';
 import { defaultTsConfig, tsconfigJson } from './tsconfig-json';
 
 describe('tsconfigJson', () => {
   it('returns the default tsconfig if transpilation is enabled', async () => {
     const tsConfig = await tsconfigJson({
       transpile: true
-    } as ParsedGeneratorOptions);
+    } as GeneratorOptions);
     expect(JSON.parse(tsConfig!)).toEqual(defaultTsConfig);
   });
 
   it('returns undefined if transpilation is disabled', async () => {
     const tsConfig = await tsconfigJson({
       transpile: false
-    } as ParsedGeneratorOptions);
+    } as GeneratorOptions);
     expect(tsConfig).toBeUndefined();
   });
 
@@ -26,7 +26,7 @@ describe('tsconfigJson', () => {
     });
     const tsConfig = await tsconfigJson({
       tsConfig: './path/customConfig.json'
-    } as ParsedGeneratorOptions);
+    } as GeneratorOptions);
     expect(JSON.parse(tsConfig!)).toEqual(customConfig);
     mock.restore();
   });
@@ -40,7 +40,7 @@ describe('tsconfigJson', () => {
     });
     const tsConfig = await tsconfigJson({
       tsConfig: './path'
-    } as ParsedGeneratorOptions);
+    } as GeneratorOptions);
     expect(JSON.parse(tsConfig!)).toEqual(customConfig);
     mock.restore();
   });
@@ -50,7 +50,7 @@ describe('tsconfigJson', () => {
     await expect(() =>
       tsconfigJson({
         tsConfig: './path'
-      } as ParsedGeneratorOptions)
+      } as GeneratorOptions)
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       '"Could not read tsconfig.json at ./path."'
     );

From da3e32804105caee791a7c9bd85e4163e133c601 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Mon, 11 Oct 2021 09:52:12 +0200
Subject: [PATCH 08/27] Fix tests

---
 .../openapi-generator/src/generator.spec.ts   | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/packages/openapi-generator/src/generator.spec.ts b/packages/openapi-generator/src/generator.spec.ts
index 910c724817..5da80e86a5 100644
--- a/packages/openapi-generator/src/generator.spec.ts
+++ b/packages/openapi-generator/src/generator.spec.ts
@@ -12,6 +12,21 @@ jest.mock('../../generator-common', () => {
 
 const { readFile } = promises;
 
+const defaultOptions = {
+  input: '',
+  outputDir: '',
+  transpile: false,
+  include: [],
+  overwrite: false,
+  clearOutputDir: false,
+  skipValidation: true,
+  packageJson: true,
+  verbose: false,
+  packageVersion: '1.0.0',
+  readme: false,
+  metadata: false
+};
+
 describe('generator', () => {
   afterAll(() => {
     mock.restore();
@@ -62,12 +77,16 @@ describe('generator', () => {
       });
 
       await generate({
+        ...defaultOptions,
         input: 'root/inputDir/mySpec.json',
         outputDir: 'root/outputDir',
         skipValidation: true,
         transpile: true,
         metadata: true,
-        include: 'root/additionalFiles/*',
+        include: [
+          'root/additionalFiles/CHANGELOG.md',
+          'root/additionalFiles/OtherFile.txt'
+        ],
         readme: true,
         packageJson: true,
         packageVersion: '1.2.3'
@@ -82,18 +101,18 @@ describe('generator', () => {
       mock.restore();
     });
 
-    it('should transpile the generated sources', async () => {
-      const files = await promises.readdir(outputPath);
+    // it('should transpile the generated sources', async () => {
+    //   const files = await promises.readdir(outputPath);
 
-      const expectedFiles: string[] = [];
-      ['default-api', 'entity-api', 'test-case-api'].forEach(file =>
-        ['js', 'd.ts.map', 'd.ts'].forEach(postfix =>
-          expectedFiles.push(`${file}.${postfix}`)
-        )
-      );
+    //   const expectedFiles: string[] = [];
+    //   ['default-api', 'entity-api', 'test-case-api'].forEach(file =>
+    //     ['js', 'd.ts.map', 'd.ts'].forEach(postfix =>
+    //       expectedFiles.push(`${file}.${postfix}`)
+    //     )
+    //   );
 
-      expect(files).toIncludeAllMembers(expectedFiles);
-    });
+    //   expect(files).toIncludeAllMembers(expectedFiles);
+    // });
 
     it('should create a package.json', () => {
       const packageJson = resolve(outputPath, 'package.json');
@@ -164,6 +183,7 @@ describe('generator', () => {
 
     it('writes options per service', async () => {
       await generate({
+        ...defaultOptions,
         input: 'inputDir',
         outputDir: 'out',
         optionsPerService: 'options.json'
@@ -185,6 +205,7 @@ describe('generator', () => {
 
     it('overwrites writes options per service', async () => {
       await generate({
+        ...defaultOptions,
         input: 'inputDir',
         outputDir: 'out',
         optionsPerService: 'existingConfig'
@@ -232,6 +253,7 @@ describe('generator', () => {
     it('fails to overwrite by default', async () => {
       await expect(() =>
         generate({
+          ...defaultOptions,
           input: 'specs',
           outputDir: 'out'
         })
@@ -245,6 +267,7 @@ describe('generator', () => {
     it('does not fail when overwrite is enabled', async () => {
       await expect(
         generate({
+          ...defaultOptions,
           input: 'specs',
           outputDir: 'out',
           overwrite: true

From e071b0653cea1c12f885de453ff4ff9b6405387f Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Mon, 11 Oct 2021 09:57:40 +0200
Subject: [PATCH 09/27] Fix tests

---
 .../openapi-generator/src/generator.spec.ts   | 20 -------------------
 packages/openapi-generator/src/generator.ts   |  4 +++-
 scripts/generate-test-services.ts             |  5 ++++-
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/packages/openapi-generator/src/generator.spec.ts b/packages/openapi-generator/src/generator.spec.ts
index 5da80e86a5..52db727635 100644
--- a/packages/openapi-generator/src/generator.spec.ts
+++ b/packages/openapi-generator/src/generator.spec.ts
@@ -12,21 +12,6 @@ jest.mock('../../generator-common', () => {
 
 const { readFile } = promises;
 
-const defaultOptions = {
-  input: '',
-  outputDir: '',
-  transpile: false,
-  include: [],
-  overwrite: false,
-  clearOutputDir: false,
-  skipValidation: true,
-  packageJson: true,
-  verbose: false,
-  packageVersion: '1.0.0',
-  readme: false,
-  metadata: false
-};
-
 describe('generator', () => {
   afterAll(() => {
     mock.restore();
@@ -77,7 +62,6 @@ describe('generator', () => {
       });
 
       await generate({
-        ...defaultOptions,
         input: 'root/inputDir/mySpec.json',
         outputDir: 'root/outputDir',
         skipValidation: true,
@@ -183,7 +167,6 @@ describe('generator', () => {
 
     it('writes options per service', async () => {
       await generate({
-        ...defaultOptions,
         input: 'inputDir',
         outputDir: 'out',
         optionsPerService: 'options.json'
@@ -205,7 +188,6 @@ describe('generator', () => {
 
     it('overwrites writes options per service', async () => {
       await generate({
-        ...defaultOptions,
         input: 'inputDir',
         outputDir: 'out',
         optionsPerService: 'existingConfig'
@@ -253,7 +235,6 @@ describe('generator', () => {
     it('fails to overwrite by default', async () => {
       await expect(() =>
         generate({
-          ...defaultOptions,
           input: 'specs',
           outputDir: 'out'
         })
@@ -267,7 +248,6 @@ describe('generator', () => {
     it('does not fail when overwrite is enabled', async () => {
       await expect(
         generate({
-          ...defaultOptions,
           input: 'specs',
           outputDir: 'out',
           overwrite: true
diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts
index 909f30cf4f..93f7215a92 100644
--- a/packages/openapi-generator/src/generator.ts
+++ b/packages/openapi-generator/src/generator.ts
@@ -54,7 +54,9 @@ const logger = createLogger('openapi-generator');
  * Generates models and API files.
  * @param options - Options to configure generation.
  */
-export async function generate(options: GeneratorOptions): Promise<void> {
+export async function generate(
+  options: Partial<GeneratorOptions>
+): Promise<void> {
   return generateWithParsedOptions(parseGeneratorOptions(options));
 }
 
diff --git a/scripts/generate-test-services.ts b/scripts/generate-test-services.ts
index 570cefaf60..96252c8078 100644
--- a/scripts/generate-test-services.ts
+++ b/scripts/generate-test-services.ts
@@ -2,7 +2,10 @@ import { promises, Dirent } from 'fs';
 import path from 'path';
 import { createLogger } from '@sap-cloud-sdk/util';
 import { generate as generateOdata } from '../packages/generator/src';
-import { generate as generateOpenApi } from '../packages/openapi-generator/src';
+import {
+  generate as generateOpenApi,
+  GeneratorOptions
+} from '../packages/openapi-generator/src';
 import { ODataVersion } from '../packages/util/src';
 
 const { readFile, readdir, writeFile } = promises;

From 63be9dd63f8dceb3303ce4063529e5089d54590c Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 12 Oct 2021 11:21:51 +0200
Subject: [PATCH 10/27] Revert change to cli option 'include'

---
 packages/openapi-generator/src/generator.spec.ts         | 7 ++-----
 packages/openapi-generator/src/generator.ts              | 9 +++++----
 packages/openapi-generator/src/options/flags.ts          | 3 +--
 .../openapi-generator/src/options/generator-options.ts   | 2 +-
 scripts/generate-test-services.ts                        | 5 +----
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/openapi-generator/src/generator.spec.ts b/packages/openapi-generator/src/generator.spec.ts
index 52db727635..f7e4554601 100644
--- a/packages/openapi-generator/src/generator.spec.ts
+++ b/packages/openapi-generator/src/generator.spec.ts
@@ -67,10 +67,7 @@ describe('generator', () => {
         skipValidation: true,
         transpile: true,
         metadata: true,
-        include: [
-          'root/additionalFiles/CHANGELOG.md',
-          'root/additionalFiles/OtherFile.txt'
-        ],
+        include: 'root/additionalFiles/*',
         readme: true,
         packageJson: true,
         packageVersion: '1.2.3'
@@ -104,7 +101,7 @@ describe('generator', () => {
     });
 
     it('should create a package.json with the provided version', async () => {
-      const packageJson = await readJSON(resolve(outputPath, 'package.json'));
+      const packageJson = readJSON(resolve(outputPath, 'package.json'));
       expect(packageJson.version).toBe('1.2.3');
     });
 
diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts
index 93f7215a92..fd002e9646 100644
--- a/packages/openapi-generator/src/generator.ts
+++ b/packages/openapi-generator/src/generator.ts
@@ -9,6 +9,7 @@ import {
   posix,
   sep
 } from 'path';
+import { GlobSync } from 'glob';
 import {
   createLogger,
   kebabCase,
@@ -145,7 +146,7 @@ async function generateSources(
     );
   }
 
-  if (options.include) {
+  if (typeof options.include === 'string') {
     await copyAdditionalFiles(serviceDir, options.include, options.overwrite);
   }
 
@@ -286,15 +287,15 @@ export async function getInputFilePaths(input: string): Promise<string[]> {
 // TODO 1728 move to a new package to reduce code duplication.
 async function copyAdditionalFiles(
   serviceDir: string,
-  additionalFiles: string[],
+  additionalFilesGlob: string,
   overwrite: boolean
 ): Promise<void[]> {
   logger.verbose(
-    `Copying additional files matching ${additionalFiles} into ${serviceDir}.`
+    `Copying additional files matching ${additionalFilesGlob} into ${serviceDir}.`
   );
 
   return Promise.all(
-    additionalFiles.map(filePath =>
+    new GlobSync(additionalFilesGlob).found.map(filePath =>
       copyFile(
         resolve(filePath),
         join(serviceDir, basename(filePath)),
diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/flags.ts
index 1acf3d5bfb..82829823ef 100644
--- a/packages/openapi-generator/src/options/flags.ts
+++ b/packages/openapi-generator/src/options/flags.ts
@@ -1,6 +1,5 @@
 import { resolve, extname } from 'path';
 import { existsSync, lstatSync } from 'fs';
-import { GlobSync } from 'glob';
 
 export const generatorOptions = {
   input: {
@@ -28,7 +27,7 @@ export const generatorOptions = {
   },
   include: {
     string: true,
-    coerce: (input: string): string[] => new GlobSync(input).found,
+    // coerce: (input: string): string[] => new GlobSync(input).found,
     description:
       'Include files matching the given glob into the root of each generated client directory.'
   },
diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index c8156eb416..3f41687ddf 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -15,7 +15,7 @@ export interface GeneratorOptions {
   input: string;
   outputDir: string;
   transpile: boolean;
-  include?: string[];
+  include?: string | unknown;
   overwrite: boolean;
   clearOutputDir: boolean;
   skipValidation: boolean;
diff --git a/scripts/generate-test-services.ts b/scripts/generate-test-services.ts
index 96252c8078..4120f0a138 100644
--- a/scripts/generate-test-services.ts
+++ b/scripts/generate-test-services.ts
@@ -46,10 +46,7 @@ const generatorConfigOpenApi: Partial<GeneratorOptions> = {
   transpile: true,
   packageJson: true,
   packageVersion: '1.2.3',
-  include: [
-    'test-resources/CHANGELOG.md',
-    'test-resources/some-test-markdown.md'
-  ],
+  include: 'test-resources/*',
   readme: true
 };
 

From 9189da7cefc1bf8510bb787c49ac44181d5ee3ec Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 12 Oct 2021 14:08:45 +0200
Subject: [PATCH 11/27] Apply coerce if not using argv

---
 packages/openapi-generator/src/cli/index.ts              | 4 ++--
 packages/openapi-generator/src/generator.ts              | 9 ++++-----
 packages/openapi-generator/src/options/flags.ts          | 3 ++-
 .../openapi-generator/src/options/generator-options.ts   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index fc293b482a..0b58d62593 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -7,7 +7,7 @@ import {
   getSpecifiedFlags,
   generatorOptions
 } from '../options';
-import { generate, generateWithParsedOptions } from '../generator';
+import { generateWithParsedOptions } from '../generator';
 
 const logger = createLogger('openapi-generator');
 
@@ -21,7 +21,7 @@ export async function parseCmdArgs(): Promise<void> {
       .strict().argv;
 
     if (argv.config) {
-      await generate({
+      await generateWithParsedOptions({
         ...(await parseOptionsFromConfig(argv.config)),
         ...getSpecifiedFlags(
           argv,
diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts
index fd002e9646..93f7215a92 100644
--- a/packages/openapi-generator/src/generator.ts
+++ b/packages/openapi-generator/src/generator.ts
@@ -9,7 +9,6 @@ import {
   posix,
   sep
 } from 'path';
-import { GlobSync } from 'glob';
 import {
   createLogger,
   kebabCase,
@@ -146,7 +145,7 @@ async function generateSources(
     );
   }
 
-  if (typeof options.include === 'string') {
+  if (options.include) {
     await copyAdditionalFiles(serviceDir, options.include, options.overwrite);
   }
 
@@ -287,15 +286,15 @@ export async function getInputFilePaths(input: string): Promise<string[]> {
 // TODO 1728 move to a new package to reduce code duplication.
 async function copyAdditionalFiles(
   serviceDir: string,
-  additionalFilesGlob: string,
+  additionalFiles: string[],
   overwrite: boolean
 ): Promise<void[]> {
   logger.verbose(
-    `Copying additional files matching ${additionalFilesGlob} into ${serviceDir}.`
+    `Copying additional files matching ${additionalFiles} into ${serviceDir}.`
   );
 
   return Promise.all(
-    new GlobSync(additionalFilesGlob).found.map(filePath =>
+    additionalFiles.map(filePath =>
       copyFile(
         resolve(filePath),
         join(serviceDir, basename(filePath)),
diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/flags.ts
index 82829823ef..1acf3d5bfb 100644
--- a/packages/openapi-generator/src/options/flags.ts
+++ b/packages/openapi-generator/src/options/flags.ts
@@ -1,5 +1,6 @@
 import { resolve, extname } from 'path';
 import { existsSync, lstatSync } from 'fs';
+import { GlobSync } from 'glob';
 
 export const generatorOptions = {
   input: {
@@ -27,7 +28,7 @@ export const generatorOptions = {
   },
   include: {
     string: true,
-    // coerce: (input: string): string[] => new GlobSync(input).found,
+    coerce: (input: string): string[] => new GlobSync(input).found,
     description:
       'Include files matching the given glob into the root of each generated client directory.'
   },
diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index 3f41687ddf..107eb848af 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -15,7 +15,7 @@ export interface GeneratorOptions {
   input: string;
   outputDir: string;
   transpile: boolean;
-  include?: string | unknown;
+  include?: string[];
   overwrite: boolean;
   clearOutputDir: boolean;
   skipValidation: boolean;
@@ -44,7 +44,7 @@ export function parseGeneratorOptions(
     (parsedOptions, [name, flag]: [string, yargs.Options]) => {
       const value = options[name];
       if (typeof value !== 'undefined') {
-        parsedOptions[name] = value;
+        parsedOptions[name] = flag.coerce ? flag.coerce(value) : value;
       } else if (typeof flag.default !== 'undefined') {
         parsedOptions[name] = flag.default;
       }

From 36f8b3d586dfbe74107a5035a7b5a1b57976be3a Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 12 Oct 2021 14:27:14 +0200
Subject: [PATCH 12/27] Differentiate between GeneratorOpts and ParsedOpts

---
 packages/openapi-generator/src/generator.ts   | 19 ++++++------
 .../src/options/generator-options.ts          | 31 ++++++++++++++++---
 .../src/options/options-per-service.spec.ts   | 12 +++----
 .../src/options/options-per-service.ts        |  4 +--
 .../src/options/tsconfig-json.spec.ts         | 12 +++----
 .../src/options/tsconfig-json.ts              |  4 +--
 scripts/generate-test-services.ts             |  2 +-
 7 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts
index 93f7215a92..e299a1dca2 100644
--- a/packages/openapi-generator/src/generator.ts
+++ b/packages/openapi-generator/src/generator.ts
@@ -42,6 +42,7 @@ import {
   ServiceOptions,
   OptionsPerService,
   getOptionsPerService,
+  ParsedGeneratorOptions,
   GeneratorOptions
 } from './options';
 import { sdkMetadata } from './sdk-metadata';
@@ -54,9 +55,7 @@ const logger = createLogger('openapi-generator');
  * Generates models and API files.
  * @param options - Options to configure generation.
  */
-export async function generate(
-  options: Partial<GeneratorOptions>
-): Promise<void> {
+export async function generate(options: GeneratorOptions): Promise<void> {
   return generateWithParsedOptions(parseGeneratorOptions(options));
 }
 
@@ -66,7 +65,7 @@ export async function generate(
  * @param options - Options to configure generation.
  */
 export async function generateWithParsedOptions(
-  options: GeneratorOptions
+  options: ParsedGeneratorOptions
 ): Promise<void> {
   if (options.input === '' || options.outputDir === '') {
     throw new Error('Either input or outputDir were not set.');
@@ -127,7 +126,7 @@ async function generateSources(
   openApiDocument: OpenApiDocument,
   inputFilePath: string,
   tsConfig: string | undefined,
-  options: GeneratorOptions
+  options: ParsedGeneratorOptions
 ): Promise<void> {
   await mkdir(serviceDir, { recursive: true });
 
@@ -168,7 +167,7 @@ async function generateSources(
 async function generateMandatorySources(
   serviceDir: string,
   openApiDocument: OpenApiDocument,
-  { overwrite }: GeneratorOptions
+  { overwrite }: ParsedGeneratorOptions
 ): Promise<void> {
   if (openApiDocument.schemas.length) {
     const schemaDir = resolve(serviceDir, 'schema');
@@ -230,7 +229,7 @@ async function createSchemaFiles(
  */
 async function generateService(
   inputFilePath: string,
-  options: GeneratorOptions,
+  options: ParsedGeneratorOptions,
   serviceOptions: ServiceOptions,
   tsConfig: string | undefined
 ): Promise<void> {
@@ -307,7 +306,7 @@ async function copyAdditionalFiles(
 function generateReadme(
   serviceDir: string,
   openApiDocument: OpenApiDocument,
-  { overwrite }: GeneratorOptions
+  { overwrite }: ParsedGeneratorOptions
 ): Promise<void> {
   logger.verbose(`Generating readme in ${serviceDir}.`);
 
@@ -323,7 +322,7 @@ function generateReadme(
 async function generateMetadata(
   openApiDocument: OpenApiDocument,
   inputFilePath: string,
-  { packageVersion, overwrite }: GeneratorOptions
+  { packageVersion, overwrite }: ParsedGeneratorOptions
 ) {
   const { name: inputFileName, dir: inputDirPath } = parse(inputFilePath);
   const { clientFileName, headerFileName } =
@@ -358,7 +357,7 @@ async function generateMetadata(
 async function generatePackageJson(
   serviceDir: string,
   { packageName, directoryName }: ServiceOptions,
-  { packageVersion, overwrite }: GeneratorOptions
+  { packageVersion, overwrite }: ParsedGeneratorOptions
 ) {
   logger.verbose(`Generating package.json in ${serviceDir}.`);
 
diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index 107eb848af..2671648d27 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -12,6 +12,27 @@ const logger = createLogger('openapi-generator');
  * The options match the CLI options.
  */
 export interface GeneratorOptions {
+  input: string;
+  outputDir: string;
+  transpile?: boolean;
+  include?: string;
+  overwrite?: boolean;
+  clearOutputDir?: boolean;
+  skipValidation?: boolean;
+  tsConfig?: string;
+  packageJson?: boolean;
+  verbose?: boolean;
+  optionsPerService?: string;
+  packageVersion?: string;
+  readme?: boolean;
+  metadata?: boolean;
+  config?: string;
+}
+
+/**
+ * Parsed options with default values.
+ */
+export interface ParsedGeneratorOptions {
   input: string;
   outputDir: string;
   transpile: boolean;
@@ -38,8 +59,8 @@ export interface GeneratorOptions {
  * @returns Parsed options with default values.
  */
 export function parseGeneratorOptions(
-  options: Partial<GeneratorOptions>
-): GeneratorOptions {
+  options: GeneratorOptions
+): ParsedGeneratorOptions {
   return Object.entries(generatorOptions).reduce(
     (parsedOptions, [name, flag]: [string, yargs.Options]) => {
       const value = options[name];
@@ -50,7 +71,7 @@ export function parseGeneratorOptions(
       }
       return parsedOptions;
     },
-    {} as GeneratorOptions
+    {} as ParsedGeneratorOptions
   );
 }
 
@@ -92,12 +113,12 @@ export async function parseOptionsFromConfig(
 export function getSpecifiedFlags(
   options: GeneratorOptions,
   rawInputFlags: string[]
-): Partial<GeneratorOptions> {
+): GeneratorOptions {
   return rawInputFlags.reduce((reducedOptions, name) => {
     const value = options[name];
     if (value !== undefined) {
       reducedOptions[name] = value;
     }
     return reducedOptions;
-  }, {} as Partial<GeneratorOptions>);
+  }, {} as GeneratorOptions);
 }
diff --git a/packages/openapi-generator/src/options/options-per-service.spec.ts b/packages/openapi-generator/src/options/options-per-service.spec.ts
index ada7d6ca99..b0ccb3d888 100644
--- a/packages/openapi-generator/src/options/options-per-service.spec.ts
+++ b/packages/openapi-generator/src/options/options-per-service.spec.ts
@@ -10,7 +10,7 @@ jest.mock('path', () => {
 });
 
 import mock from 'mock-fs';
-import { GeneratorOptions } from './generator-options';
+import { ParsedGeneratorOptions } from './generator-options';
 import {
   getOptionsPerService,
   getOriginalOptionsPerService,
@@ -97,7 +97,7 @@ describe('getOptionsPerService', () => {
 
   it('builds PerService config without options per service.', async () => {
     await expect(
-      getOptionsPerService(['/user/path/service'], {} as GeneratorOptions)
+      getOptionsPerService(['/user/path/service'], {} as ParsedGeneratorOptions)
     ).resolves.toEqual({
       'path/service': {
         directoryName: 'service',
@@ -125,7 +125,7 @@ describe('getOptionsPerService', () => {
     await expect(
       getOptionsPerService(['/user/path/service'], {
         optionsPerService: 'path/myConfig.json'
-      } as GeneratorOptions)
+      } as ParsedGeneratorOptions)
     ).resolves.toEqual({
       'path/service': {
         directoryName: 'dirName',
@@ -152,7 +152,7 @@ describe('getOptionsPerService', () => {
     await expect(
       getOptionsPerService(['/user/path/service'], {
         optionsPerService: 'path/myPartialConfig.json'
-      } as GeneratorOptions)
+      } as ParsedGeneratorOptions)
     ).resolves.toEqual({
       'path/service': {
         directoryName: 'service',
@@ -166,7 +166,7 @@ describe('getOptionsPerService', () => {
     await expect(
       getOptionsPerService(['/user/path1/service', '/user/path2/service'], {
         skipValidation: false
-      } as GeneratorOptions)
+      } as ParsedGeneratorOptions)
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
             "Duplicate service directory names found. Customize directory names with \`optionsPerService\` or enable automatic name adjustment with \`skipValidation\`.
             	Duplicates:
@@ -181,7 +181,7 @@ describe('getOptionsPerService', () => {
     await expect(
       getOptionsPerService(['/user/path1/service', '/user/path2/service'], {
         skipValidation: true
-      } as GeneratorOptions)
+      } as ParsedGeneratorOptions)
     ).resolves.toEqual({
       'path1/service': {
         directoryName: 'service',
diff --git a/packages/openapi-generator/src/options/options-per-service.ts b/packages/openapi-generator/src/options/options-per-service.ts
index dcbc697bf2..4d6b87d801 100644
--- a/packages/openapi-generator/src/options/options-per-service.ts
+++ b/packages/openapi-generator/src/options/options-per-service.ts
@@ -2,7 +2,7 @@ import { existsSync, promises } from 'fs';
 import { parse } from 'path';
 import { unique, UniqueNameGenerator } from '@sap-cloud-sdk/util';
 import { getRelPathWithPosixSeparator } from '../generator';
-import { GeneratorOptions } from './generator-options';
+import { ParsedGeneratorOptions } from './generator-options';
 
 const { readFile } = promises;
 
@@ -58,7 +58,7 @@ export async function getOriginalOptionsPerService(
  */
 export async function getOptionsPerService(
   inputPaths: string[],
-  { optionsPerService, skipValidation }: GeneratorOptions
+  { optionsPerService, skipValidation }: ParsedGeneratorOptions
 ): Promise<OptionsPerService> {
   const originalOptionsPerService = await getOriginalOptionsPerService(
     optionsPerService
diff --git a/packages/openapi-generator/src/options/tsconfig-json.spec.ts b/packages/openapi-generator/src/options/tsconfig-json.spec.ts
index 64a3bd5f66..08598de87f 100644
--- a/packages/openapi-generator/src/options/tsconfig-json.spec.ts
+++ b/packages/openapi-generator/src/options/tsconfig-json.spec.ts
@@ -1,19 +1,19 @@
 import mock from 'mock-fs';
-import { GeneratorOptions } from './generator-options';
+import { ParsedGeneratorOptions } from './generator-options';
 import { defaultTsConfig, tsconfigJson } from './tsconfig-json';
 
 describe('tsconfigJson', () => {
   it('returns the default tsconfig if transpilation is enabled', async () => {
     const tsConfig = await tsconfigJson({
       transpile: true
-    } as GeneratorOptions);
+    } as ParsedGeneratorOptions);
     expect(JSON.parse(tsConfig!)).toEqual(defaultTsConfig);
   });
 
   it('returns undefined if transpilation is disabled', async () => {
     const tsConfig = await tsconfigJson({
       transpile: false
-    } as GeneratorOptions);
+    } as ParsedGeneratorOptions);
     expect(tsConfig).toBeUndefined();
   });
 
@@ -26,7 +26,7 @@ describe('tsconfigJson', () => {
     });
     const tsConfig = await tsconfigJson({
       tsConfig: './path/customConfig.json'
-    } as GeneratorOptions);
+    } as ParsedGeneratorOptions);
     expect(JSON.parse(tsConfig!)).toEqual(customConfig);
     mock.restore();
   });
@@ -40,7 +40,7 @@ describe('tsconfigJson', () => {
     });
     const tsConfig = await tsconfigJson({
       tsConfig: './path'
-    } as GeneratorOptions);
+    } as ParsedGeneratorOptions);
     expect(JSON.parse(tsConfig!)).toEqual(customConfig);
     mock.restore();
   });
@@ -50,7 +50,7 @@ describe('tsconfigJson', () => {
     await expect(() =>
       tsconfigJson({
         tsConfig: './path'
-      } as GeneratorOptions)
+      } as ParsedGeneratorOptions)
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       '"Could not read tsconfig.json at ./path."'
     );
diff --git a/packages/openapi-generator/src/options/tsconfig-json.ts b/packages/openapi-generator/src/options/tsconfig-json.ts
index f4a7a75c7d..20f152c07d 100644
--- a/packages/openapi-generator/src/options/tsconfig-json.ts
+++ b/packages/openapi-generator/src/options/tsconfig-json.ts
@@ -1,7 +1,7 @@
 import { promises } from 'fs';
 import { resolve } from 'path';
 import { ErrorWithCause, formatJson } from '@sap-cloud-sdk/util';
-import { GeneratorOptions } from './generator-options';
+import { ParsedGeneratorOptions } from './generator-options';
 const { readFile, lstat } = promises;
 
 export const defaultTsConfig = {
@@ -31,7 +31,7 @@ export const defaultTsConfig = {
 export async function tsconfigJson({
   transpile,
   tsConfig
-}: GeneratorOptions): Promise<string | undefined> {
+}: ParsedGeneratorOptions): Promise<string | undefined> {
   if (transpile || tsConfig) {
     return tsConfig
       ? readCustomTsConfig(tsConfig)
diff --git a/scripts/generate-test-services.ts b/scripts/generate-test-services.ts
index 4120f0a138..b188fabaea 100644
--- a/scripts/generate-test-services.ts
+++ b/scripts/generate-test-services.ts
@@ -39,7 +39,7 @@ const generatorConfigOData = {
   s4hanaCloud: false
 };
 
-const generatorConfigOpenApi: Partial<GeneratorOptions> = {
+const generatorConfigOpenApi: GeneratorOptions = {
   input: path.resolve('test-resources', 'openapi-service-specs'),
   outputDir: path.resolve('test-packages', 'test-services', 'openapi'),
   clearOutputDir: true,

From be5c793297de8a5a6392955b982299464e888326 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 12 Oct 2021 14:51:03 +0200
Subject: [PATCH 13/27] Fix tests (hopefully)

---
 .../src/options/generator-options.spec.ts          | 14 ++++++++------
 .../src/options/generator-options.ts               | 10 +++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/openapi-generator/src/options/generator-options.spec.ts b/packages/openapi-generator/src/options/generator-options.spec.ts
index e972791ce6..ab4a897fdc 100644
--- a/packages/openapi-generator/src/options/generator-options.spec.ts
+++ b/packages/openapi-generator/src/options/generator-options.spec.ts
@@ -157,21 +157,23 @@ describe('parseGeneratorOptions', () => {
     );
   });
 
-  it('parses a given path to a config file and returns its content as generator options', async () => {
+  it('parses a given path to a config file and returns its content as parsed generator options', async () => {
     const config = {
-      input: 'some-repository'
+      input: 'some-repository',
+      include: '/path/*'
     };
     const parameters = {
       config: '/path/config.json'
     };
     mock({
       '/path/': {
-        'config.json': JSON.stringify(config)
+        'config.json': JSON.stringify(config),
+        'README.md': 'Test File'
       }
     });
-    await expect(parseOptionsFromConfig(parameters.config)).resolves.toEqual(
-      config
-    );
+    const parsed = await parseOptionsFromConfig(parameters.config);
+    expect(parsed.input).toContain(config.input);
+    expect(parsed.include).toEqual(['/path/config.json', '/path/README.md']);
   });
 
   it('logs a warning if wrong configuration keys were used', async () => {
diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index 2671648d27..dc49222f67 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -82,7 +82,7 @@ export function parseGeneratorOptions(
  */
 export async function parseOptionsFromConfig(
   configPath: string
-): Promise<GeneratorOptions> {
+): Promise<ParsedGeneratorOptions> {
   try {
     if ((await lstat(configPath)).isDirectory()) {
       configPath = resolve(configPath, 'config.json');
@@ -95,7 +95,7 @@ export async function parseOptionsFromConfig(
         );
       }
     });
-    return generatorOpts;
+    return parseGeneratorOptions(generatorOpts);
   } catch (err) {
     throw new ErrorWithCause(
       `Could not read configuration file at ${configPath}.`,
@@ -111,14 +111,14 @@ export async function parseOptionsFromConfig(
  * @returns generator options that were used in the raw input
  */
 export function getSpecifiedFlags(
-  options: GeneratorOptions,
+  options: ParsedGeneratorOptions,
   rawInputFlags: string[]
-): GeneratorOptions {
+): ParsedGeneratorOptions {
   return rawInputFlags.reduce((reducedOptions, name) => {
     const value = options[name];
     if (value !== undefined) {
       reducedOptions[name] = value;
     }
     return reducedOptions;
-  }, {} as GeneratorOptions);
+  }, {} as ParsedGeneratorOptions);
 }

From 84e05a5e5618b38f2b4d4b2ffec0e18505065c0b Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 12 Oct 2021 16:26:42 +0200
Subject: [PATCH 14/27] Revert change to options in generate-test-services

---
 scripts/generate-test-services.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-test-services.ts b/scripts/generate-test-services.ts
index b188fabaea..e29f8fc234 100644
--- a/scripts/generate-test-services.ts
+++ b/scripts/generate-test-services.ts
@@ -46,8 +46,9 @@ const generatorConfigOpenApi: GeneratorOptions = {
   transpile: true,
   packageJson: true,
   packageVersion: '1.2.3',
-  include: 'test-resources/*',
-  readme: true
+  include: 'test-resources/{CHANGELOG.md,some-test-markdown.md}',
+  readme: true,
+  skipValidation: true
 };
 
 const logger = createLogger('generate-test-service');

From 0bc286dfd9d7ba9d5fabf389d623887918ac27ad Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 12 Oct 2021 17:09:30 +0200
Subject: [PATCH 15/27] Debug integration tests

---
 .../integration-tests/test/openapi-negative-case.spec.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test-packages/integration-tests/test/openapi-negative-case.spec.ts b/test-packages/integration-tests/test/openapi-negative-case.spec.ts
index ad2abc7fa6..72489dc7a2 100644
--- a/test-packages/integration-tests/test/openapi-negative-case.spec.ts
+++ b/test-packages/integration-tests/test/openapi-negative-case.spec.ts
@@ -18,9 +18,9 @@ describe('openapi negative tests', () => {
         'npx',
         [
           'openapi-generator',
-          '-i',
+          '--input',
           resolve(testResourcesDir, 'faulty-openapi'),
-          '-o',
+          '--outputDir',
           output,
           '--clearOutputDir'
         ],
@@ -43,7 +43,7 @@ describe('openapi negative tests', () => {
         'npx',
         [
           'openapi-generator',
-          '-i',
+          '--input',
           resolve(testDir, '../openapi-service-specs/test-service.json'),
           '-o',
           output,

From c32dc8526e2e249404de2a91d954f1b90d056b59 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Tue, 12 Oct 2021 18:36:44 +0200
Subject: [PATCH 16/27] Add shebang

---
 packages/openapi-generator/src/cli/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index 0b58d62593..4473dcfd5b 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 import { createLogger } from '@sap-cloud-sdk/util';
 import yargs from 'yargs';
 // eslint-disable-next-line import/no-internal-modules

From 7aba91ec0d6d86f6b27ce12a6471b598e0c902f3 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Wed, 13 Oct 2021 10:37:32 +0200
Subject: [PATCH 17/27] Fix tests

---
 packages/openapi-generator/src/options/flags.ts   | 15 ++++++++++-----
 .../test/openapi-negative-case.spec.ts            |  9 +++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/flags.ts
index 1acf3d5bfb..c47959647d 100644
--- a/packages/openapi-generator/src/options/flags.ts
+++ b/packages/openapi-generator/src/options/flags.ts
@@ -8,7 +8,8 @@ export const generatorOptions = {
     alias: 'i',
     description:
       'Specify the path to the directory or file containing the OpenAPI service definition(s) to generate clients for. Accepts Swagger and OpenAPI definitions as YAML and JSON files. Throws an error if the path does not exist.',
-    coerce: (input: string): string => resolve(input),
+    coerce: (input: string): string =>
+      typeof input !== 'undefined' ? resolve(input) : '',
     default: ''
   },
   outputDir: {
@@ -16,7 +17,8 @@ export const generatorOptions = {
     alias: 'o',
     description:
       'Specify the path to the directory to generate the client(s) in. Each client is generated into a subdirectory within the given output directory. Creates the directory if it does not exist. Customize subdirectory naming through `--optionsPerService`.',
-    coerce: (input: string): string => resolve(input),
+    coerce: (input: string): string =>
+      typeof input !== 'undefined' ? resolve(input) : '',
     default: ''
   },
   transpile: {
@@ -28,7 +30,8 @@ export const generatorOptions = {
   },
   include: {
     string: true,
-    coerce: (input: string): string[] => new GlobSync(input).found,
+    coerce: (input: string): string[] | undefined =>
+      typeof input !== 'undefined' ? new GlobSync(input).found : undefined,
     description:
       'Include files matching the given glob into the root of each generated client directory.'
   },
@@ -54,7 +57,8 @@ export const generatorOptions = {
     string: true,
     description:
       'Replace the default `tsconfig.json` by passing a path to a custom config. By default, a `tsconfig.json` is only generated, when transpilation is enabled (`--transpile`). If a directory is passed, a `tsconfig.json` file is read from this directory.',
-    coerce: (input: string): string => resolve(input)
+    coerce: (input: string): string | undefined =>
+      typeof input !== 'undefined' ? resolve(input) : undefined
   },
   packageJson: {
     boolean: true,
@@ -103,7 +107,8 @@ export const generatorOptions = {
     string: true,
     alias: 'c',
     // config: true, // Disabled to maintain backwards compatibility with the oclif behavior
-    coerce: (input: string): string => resolve(input),
+    coerce: (input: string): string | undefined =>
+      typeof input !== 'undefined' ? resolve(input) : undefined,
     description:
       'Set the path to a file containing the options for generation instead of setting the options on the command line. When combining the `config` option with other options on the command line, the command line options take precedence. If a directory is passed, a `config.json` file is read from this directory.'
   }
diff --git a/test-packages/integration-tests/test/openapi-negative-case.spec.ts b/test-packages/integration-tests/test/openapi-negative-case.spec.ts
index 72489dc7a2..72b5aa95c8 100644
--- a/test-packages/integration-tests/test/openapi-negative-case.spec.ts
+++ b/test-packages/integration-tests/test/openapi-negative-case.spec.ts
@@ -17,6 +17,9 @@ describe('openapi negative tests', () => {
       execa(
         'npx',
         [
+          '--no-save',
+          '-p',
+          '@sap-cloud-sdk/openapi-generator',
           'openapi-generator',
           '--input',
           resolve(testResourcesDir, 'faulty-openapi'),
@@ -42,6 +45,9 @@ describe('openapi negative tests', () => {
       execa(
         'npx',
         [
+          '--no-save',
+          '-p',
+          '@sap-cloud-sdk/openapi-generator',
           'openapi-generator',
           '--input',
           resolve(testDir, '../openapi-service-specs/test-service.json'),
@@ -70,6 +76,9 @@ describe('openapi negative tests', () => {
       execa(
         'npx',
         [
+          '--no-save',
+          '-p',
+          '@sap-cloud-sdk/openapi-generator',
           'openapi-generator',
           '-i',
           resolve(testDir, '../openapi-service-specs/test-service.json'),

From 5b0053890ada5bc9ce0af08d89d959da40c002f4 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Wed, 13 Oct 2021 10:39:58 +0200
Subject: [PATCH 18/27] Fix typos

---
 knowledge-base/adr/0027-versioning-strategy.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/knowledge-base/adr/0027-versioning-strategy.md b/knowledge-base/adr/0027-versioning-strategy.md
index 4c62f08de2..0d1b3987c5 100644
--- a/knowledge-base/adr/0027-versioning-strategy.md
+++ b/knowledge-base/adr/0027-versioning-strategy.md
@@ -23,14 +23,14 @@ We will keep this approach because:
 - It is very simple to have a fixed version for all packages.
   No need to monitor which packages have been changes to which extent.
 - It is easy to use/install the SDK, because all SDK parts have the same version.
-- It is done the same way by other monorepos like [nest](https://github.com/nestjs/nest) or [anguar](https://github.com/angular/angular).
+- It is done the same way by other monorepos like [nest](https://github.com/nestjs/nest) or [angular](https://github.com/angular/angular).
 
 The drawback of having new version without changes is taken into account for the simplicity.
 
 ## Decision Clients
 
 For the clients the situation is much less coupled than for core.
-Some services will update every two weeks (workflow) other every year (S/4 OnPremise).
+Some services will update every two weeks (workflow) other every year (SAP S/4HANA OnPremise).
 We will do versioning in the following way:
 
 - Major versions of clients aligns with major version of core.
@@ -40,7 +40,7 @@ We will do versioning in the following way:
 - Pipeline runs every two weeks and publishes only the changed clients with increased minor version.
 - Errors on the client layer are rare and in such a case we trigger a bump of all affected clients.
 
-This approach challenges the current release practice to a higer degree of automation.
+This approach challenges the current release practice to a higher degree of automation.
 
 ## Consequences
 

From eda744d1f801870a5b672eb42a3a1c5ad9ebae24 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Wed, 13 Oct 2021 11:45:02 +0200
Subject: [PATCH 19/27] Fix integration tests

---
 packages/openapi-generator/src/cli/index.ts   |  2 +-
 .../openapi-generator/src/options/flags.ts    | 20 ++++++++-------
 .../test/openapi-negative-case.spec.ts        | 25 ++++++++-----------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index 4473dcfd5b..02b603e042 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -15,7 +15,7 @@ const logger = createLogger('openapi-generator');
 
 parseCmdArgs();
 
-export async function parseCmdArgs(): Promise<void> {
+export default async function parseCmdArgs(): Promise<void> {
   try {
     const argv = await yargs(hideBin(process.argv))
       .usage('--input <input> --outputDir <outputDirectory>')
diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/flags.ts
index c47959647d..c191ea2afa 100644
--- a/packages/openapi-generator/src/options/flags.ts
+++ b/packages/openapi-generator/src/options/flags.ts
@@ -30,7 +30,7 @@ export const generatorOptions = {
   },
   include: {
     string: true,
-    coerce: (input: string): string[] | undefined =>
+    coerce: (input?: string): string[] | undefined =>
       typeof input !== 'undefined' ? new GlobSync(input).found : undefined,
     description:
       'Include files matching the given glob into the root of each generated client directory.'
@@ -57,7 +57,7 @@ export const generatorOptions = {
     string: true,
     description:
       'Replace the default `tsconfig.json` by passing a path to a custom config. By default, a `tsconfig.json` is only generated, when transpilation is enabled (`--transpile`). If a directory is passed, a `tsconfig.json` file is read from this directory.',
-    coerce: (input: string): string | undefined =>
+    coerce: (input?: string): string | undefined =>
       typeof input !== 'undefined' ? resolve(input) : undefined
   },
   packageJson: {
@@ -76,12 +76,14 @@ export const generatorOptions = {
     string: true,
     description:
       'Set the path to a file containing the options per service. The configuration allows to set a `directoryName` and `packageName` for every service, identified by the path to the original file. It also makes sure that names do not change between generator runs. If a directory is passed, a `options-per-service.json` file is read/created in this directory.',
-    coerce: (input: string): string => {
-      const isFilePath =
-        (existsSync(input) && lstatSync(input).isFile()) || !!extname(input);
-      return isFilePath
-        ? resolve(input)
-        : resolve(input, 'options-per-service.json');
+    coerce: (input?: string): string | undefined => {
+      if (typeof input !== 'undefined') {
+        const isFilePath =
+          (existsSync(input) && lstatSync(input).isFile()) || !!extname(input);
+        return isFilePath
+          ? resolve(input)
+          : resolve(input, 'options-per-service.json');
+      }
     }
   },
   packageVersion: {
@@ -107,7 +109,7 @@ export const generatorOptions = {
     string: true,
     alias: 'c',
     // config: true, // Disabled to maintain backwards compatibility with the oclif behavior
-    coerce: (input: string): string | undefined =>
+    coerce: (input?: string): string | undefined =>
       typeof input !== 'undefined' ? resolve(input) : undefined,
     description:
       'Set the path to a file containing the options for generation instead of setting the options on the command line. When combining the `config` option with other options on the command line, the command line options take precedence. If a directory is passed, a `config.json` file is read from this directory.'
diff --git a/test-packages/integration-tests/test/openapi-negative-case.spec.ts b/test-packages/integration-tests/test/openapi-negative-case.spec.ts
index 72b5aa95c8..2b52e82b73 100644
--- a/test-packages/integration-tests/test/openapi-negative-case.spec.ts
+++ b/test-packages/integration-tests/test/openapi-negative-case.spec.ts
@@ -7,6 +7,10 @@ import {
 } from '../../../test-resources/generator';
 
 describe('openapi negative tests', () => {
+  const pathToGenerator = resolve(
+    '../../node_modules/@sap-cloud-sdk/openapi-generator/dist/cli/index.js'
+  );
+
   it('should fail on generation for faulty spec file', async () => {
     const output = resolve(
       testOutputRootDir,
@@ -15,12 +19,9 @@ describe('openapi negative tests', () => {
     );
     await expect(
       execa(
-        'npx',
+        'node',
         [
-          '--no-save',
-          '-p',
-          '@sap-cloud-sdk/openapi-generator',
-          'openapi-generator',
+          pathToGenerator,
           '--input',
           resolve(testResourcesDir, 'faulty-openapi'),
           '--outputDir',
@@ -43,12 +44,9 @@ describe('openapi negative tests', () => {
     );
     await expect(
       execa(
-        'npx',
+        'node',
         [
-          '--no-save',
-          '-p',
-          '@sap-cloud-sdk/openapi-generator',
-          'openapi-generator',
+          pathToGenerator,
           '--input',
           resolve(testDir, '../openapi-service-specs/test-service.json'),
           '-o',
@@ -74,12 +72,9 @@ describe('openapi negative tests', () => {
     );
     await expect(
       execa(
-        'npx',
+        'node',
         [
-          '--no-save',
-          '-p',
-          '@sap-cloud-sdk/openapi-generator',
-          'openapi-generator',
+          pathToGenerator,
           '-i',
           resolve(testDir, '../openapi-service-specs/test-service.json'),
           '-o',

From 23457790cbe815e7d8e724beae6c6c7f04668fa0 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Wed, 13 Oct 2021 13:11:51 +0200
Subject: [PATCH 20/27] Fix tests

---
 packages/openapi-generator/src/cli/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index 02b603e042..c51109dbdd 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -35,5 +35,6 @@ export default async function parseCmdArgs(): Promise<void> {
     }
   } catch (err) {
     logger.error(err);
+    yargs.exit(1, new Error());
   }
 }

From 36f87c5a42ebcd09a1014a2171ee238a26ece7f4 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Wed, 13 Oct 2021 13:51:08 +0200
Subject: [PATCH 21/27] Use stricter version for @sap packages

---
 packages/generator/package.json      |   2 +-
 test-packages/e2e-tests/package.json |   4 +-
 yarn.lock                            | 176 +++++++++++++++++----------
 3 files changed, 114 insertions(+), 68 deletions(-)

diff --git a/packages/generator/package.json b/packages/generator/package.json
index f58a403b90..8ef0adb0e7 100644
--- a/packages/generator/package.json
+++ b/packages/generator/package.json
@@ -38,7 +38,7 @@
     "@sap-cloud-sdk/core": "^1.50.0",
     "@sap-cloud-sdk/generator-common": "^1.50.0",
     "@sap-cloud-sdk/util": "^1.50.0",
-    "@sap/edm-converters": "^1.0.21",
+    "@sap/edm-converters": "~1.0.21",
     "@types/fs-extra": "^9.0.1",
     "@types/glob": "^7.1.2",
     "execa": "^5.0.0",
diff --git a/test-packages/e2e-tests/package.json b/test-packages/e2e-tests/package.json
index 783faa8347..bc9a34b788 100644
--- a/test-packages/e2e-tests/package.json
+++ b/test-packages/e2e-tests/package.json
@@ -24,8 +24,8 @@
     "@sap-cloud-sdk/test-services": "^1.50.0",
     "@sap-cloud-sdk/test-services-e2e": "^1.50.0",
     "@sap-cloud-sdk/util": "^1.50.0",
-    "@sap/cds": "^5.0.6",
-    "@sap/cds-dk": "^4.0.7",
+    "@sap/cds": "~5.0.6",
+    "@sap/cds-dk": "~4.0.7",
     "express": "^4.17.1",
     "json-schema-faker": "^0.5.0-rcv.30",
     "moment": "^2.29.0",
diff --git a/yarn.lock b/yarn.lock
index 6b08b12c6e..afca0ac5f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1604,37 +1604,50 @@
   optionalDependencies:
     npmlog "2 || ^3.1.0 || ^4.0.0"
 
-"@sap/cds-compiler@^2.4.4":
+"@sap/cds-compiler@^2.1.6", "@sap/cds-compiler@^2.4.4":
   version "2.7.0"
   resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-2.7.0.tgz#f7d06c16746a21be37c9d0feab63d233b9d8c68e"
   integrity sha512-GfifUHd+FePYH2y+BKksUrnHT5VWzVQWublZrxCbB+HpSbb1HSADOd0SlK0+aUObmSxPlPMAOwpmS19dXB1l7A==
   dependencies:
     antlr4 "4.8.0"
 
-"@sap/cds-dk@^4.0.7":
-  version "4.5.3"
-  resolved "https://registry.npmjs.org/@sap/cds-dk/-/cds-dk-4.5.3.tgz#36fab8c87081d43d91e7319285ff37c04b470e54"
-  integrity sha512-cUKlxwDPPfYvkOSK6QyJ+UsVYSh5j38TSoVVdr1GIFWAHR7PO94MGYBrIwDrxs8c7KeGnd6OVcMwFJ34XxOh1A==
-  dependencies:
-    "@sap/cds" "^5.5.0"
-    "@sap/cds-foss" "^3"
-    "@sap/eslint-plugin-cds" "^2.1.0"
-    axios "^0.21.4"
+"@sap/cds-dk@~4.0.7":
+  version "4.0.7"
+  resolved "https://registry.npmjs.org/@sap/cds-dk/-/cds-dk-4.0.7.tgz#3c0ceb0aaccfd306ee57f41cc9611ca1030af6a9"
+  integrity sha512-oacrX8B89/0ZJ2XJ/fRe/S6ufhAy3g1Rjfy1VEY99eSN9FrasUgnw+RCq/KHsfVWhwep348GXmapEDfg1AZ+hg==
+  dependencies:
+    "@sap/cds" "^5.0.6"
+    "@sap/cds-foss" "^2"
+    "@sap/cds-sidecar-client" "^1.1.14"
+    "@sap/edm-converters" "^1.0.41"
+    "@sap/eslint-plugin-cds" "^1.0.8"
+    axios "^0.21.0"
     connect-livereload "^0.6.1"
     eslint "^7.0.0"
     express "^4.17.1"
     htmlparser2 "5.0.1"
     livereload-js "^3.3.1"
-    md5 "^2.3.0"
-    mustache "^4.0.1"
+    mustache "4.0.1"
     node-watch "0.6.4"
     passport "^0.4.1"
     pluralize "^8.0.0"
     ws "^7"
-    xml-js "^1.6.11"
+    xml2js "^0.4.3"
   optionalDependencies:
     sqlite3 "^5.0.2"
 
+"@sap/cds-foss@^2", "@sap/cds-foss@^2.2.0":
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-2.3.1.tgz#f73846c0fb2ac6e13872017f4c2788b35e2f305b"
+  integrity sha512-Scfvem8T7YFBJE2Ruphrl/YVBUah8kYtaSyhiCh7N3+Vop4vx09WWysa1geOT1hholbZL3UCZ87w5R+0wKMEoA==
+  dependencies:
+    big.js "6.0.3"
+    fs-extra "9.1.0"
+    generic-pool "3.7.2"
+    uuid "8.3.2"
+    xmlbuilder "15.1.1"
+    yaml "1.10.2"
+
 "@sap/cds-foss@^3":
   version "3.0.0"
   resolved "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-3.0.0.tgz#e7e7e8c7032acecc8055361eab796c3e0241f208"
@@ -1647,7 +1660,24 @@
     xmlbuilder "15.1.1"
     yaml "1.10.2"
 
-"@sap/cds@^5.0.0", "@sap/cds@^5.0.6", "@sap/cds@^5.5.0":
+"@sap/cds-runtime@~3.0.6":
+  version "3.0.9"
+  resolved "https://registry.npmjs.org/@sap/cds-runtime/-/cds-runtime-3.0.9.tgz#81aab8a05cf8cb91a01495c3246f6ba1d6516447"
+  integrity sha512-cESV5LSmfHmaUUlX2viXkgulX7QDuftTJShUz3JbVvE2RXIDkWFL0a4JGHRIQqV2WMTueglykEacebzy9ELQlQ==
+  dependencies:
+    "@sap-cloud-sdk/core" "^1.41"
+    "@sap-cloud-sdk/util" "^1.41"
+    "@sap/cds-foss" "^2.2.0"
+
+"@sap/cds-sidecar-client@^1.1.14":
+  version "1.1.23"
+  resolved "https://registry.npmjs.org/@sap/cds-sidecar-client/-/cds-sidecar-client-1.1.23.tgz#d928ce33809587724dc30da4b83ce99131eeda66"
+  integrity sha512-4IQStF2NJnqECLU0e7EohhkmCeSc2QjGJ/bcewegoJl+x4IBOu8LzkgJaSGirzT7INuy/Z4BOJVkVh1Ek+P5Qw==
+  dependencies:
+    axios "^0.21.1"
+    fs-extra "9.0.1"
+
+"@sap/cds@^5.0.0", "@sap/cds@^5.0.6":
   version "5.5.3"
   resolved "https://registry.npmjs.org/@sap/cds/-/cds-5.5.3.tgz#77d6967397f371b00e5b8dc70d70815b3e707afa"
   integrity sha512-kFIdD7FGb3+RempaEvzWMnHnm3TrCZ4B+WQZ/+JimgsWS0NumJ17+ZiTRdLEu9Iw/nxP8L7ilhJV/LMktVu2ng==
@@ -1657,6 +1687,15 @@
     "@sap/cds-compiler" "^2.4.4"
     "@sap/cds-foss" "^3"
 
+"@sap/cds@~5.0.6":
+  version "5.0.6"
+  resolved "https://registry.npmjs.org/@sap/cds/-/cds-5.0.6.tgz#0d15e7b6814d8a25fad883e1945e5f6f965978fd"
+  integrity sha512-Zht1jOPq0sJmL4J1X07Ym/jtMnB7ohZaf6W/yFkjNhewg08iMPRn5MO3cudWyC9dd+PkXKKu0VPoIB5kBURW0g==
+  dependencies:
+    "@sap/cds-compiler" "^2.1.6"
+    "@sap/cds-foss" "^2"
+    "@sap/cds-runtime" "~3.0.6"
+
 "@sap/cloud-sdk-vdm-business-partner-service@^1.23.0", "@sap/cloud-sdk-vdm-business-partner-service@^1.24.0":
   version "1.27.0"
   resolved "https://registry.npmjs.org/@sap/cloud-sdk-vdm-business-partner-service/-/cloud-sdk-vdm-business-partner-service-1.27.0.tgz#e25ca729c97c538598553a9d50ea46be98c96a41"
@@ -1664,7 +1703,7 @@
   dependencies:
     "@sap-cloud-sdk/core" "^1.47.1"
 
-"@sap/edm-converters@^1.0.21":
+"@sap/edm-converters@^1.0.41", "@sap/edm-converters@~1.0.21":
   version "1.0.41"
   resolved "https://registry.npmjs.org/@sap/edm-converters/-/edm-converters-1.0.41.tgz#e38cdd69b49ac407ef3c6637f78f1c6ea26ada4d"
   integrity sha512-Af7L7amlh06YXfOK2ufjKUZXhcuwXSt0uzPDrHbVBvN1lQS8Gj4BxzXTbnskiFweTR2CFuhoqsSaV2r/7l9mYw==
@@ -1674,10 +1713,10 @@
     request "=2.88.0"
     xml-js "=1.6.8"
 
-"@sap/eslint-plugin-cds@^2.1.0":
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/@sap/eslint-plugin-cds/-/eslint-plugin-cds-2.1.1.tgz#1e5aee2e5cd0e61c6740c96e5bbf1cdd9e88a12d"
-  integrity sha512-7VVJ1r2aexoU5aTzYFwfvP9GwPfdJpbO0tGcLVI19CmoAjbW8K12/4linev5enusPLM7yOLi8c2JjFWwGim/Dg==
+"@sap/eslint-plugin-cds@^1.0.8":
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/@sap/eslint-plugin-cds/-/eslint-plugin-cds-1.1.4.tgz#ab0d8767f1e484ba8a4e143dd8b9e9d41bbb174f"
+  integrity sha512-08wRYADUmFHDbYetr4nkkUP5FEHsCmMK8pWJOe0JljUxmDfMT4yBFKq/VnhPA3BBh0UZAvZFLGUC0qAx5RWlcg==
   dependencies:
     "@sap/cds" "^5.0.0"
     semver "^7.3.4"
@@ -2602,6 +2641,11 @@ before-after-hook@^2.2.0:
   resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
   integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
 
+big.js@6.0.3:
+  version "6.0.3"
+  resolved "https://registry.npmjs.org/big.js/-/big.js-6.0.3.tgz#8b4d99ac7023668e0e465d3f78c23b8ac29ad381"
+  integrity sha512-n6yn1FyVL1EW2DBAr4jlU/kObhRzmr+NNRESl65VIOT8WBJj/Kezpx2zFdhJUqYI6qrtTW7moCStYL5VxeVdPA==
+
 big.js@6.1.1:
   version "6.1.1"
   resolved "https://registry.npmjs.org/big.js/-/big.js-6.1.1.tgz#63b35b19dc9775c94991ee5db7694880655d5537"
@@ -2857,11 +2901,6 @@ chardet@^0.7.0:
   resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-charenc@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
 charm@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
@@ -3307,11 +3346,6 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypt@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
 cssom@^0.4.4:
   version "0.4.4"
   resolved "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
@@ -4568,6 +4602,26 @@ fs-extra@10.0.0, fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
+  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^1.0.0"
+
+fs-extra@9.1.0, fs-extra@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
@@ -4586,16 +4640,6 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -4655,6 +4699,11 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+generic-pool@3.7.2:
+  version "3.7.2"
+  resolved "https://registry.npmjs.org/generic-pool/-/generic-pool-3.7.2.tgz#78c2e5f054fc8bb611568c435051ecea2418e965"
+  integrity sha512-Ec7D4KySmEtIdJBNRVS8jus84ejNAvYG7KaLsXMhIs4AVQ2RuXSjMtmpskTKDT0y6TFSPjo4H+cCmLKUb+vDzg==
+
 generic-pool@3.7.8:
   version "3.7.8"
   resolved "https://registry.npmjs.org/generic-pool/-/generic-pool-3.7.8.tgz#202087bf5ec5e0b3bae39842a0ef98bcd4c1e450"
@@ -5247,11 +5296,6 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@~1.1.6:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
 is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
@@ -6651,15 +6695,6 @@ marked@^3.0.4:
   resolved "https://registry.npmjs.org/marked/-/marked-3.0.7.tgz#343aad9e91b96249b495c99c512ea09cfe06de1e"
   integrity sha512-ctKqbnLuNbsHbI26cfMyOlKgXGfl1orOv1AvWWDX7AkgfMOwCWvmuYc+mVLeWhQ9W6hdWVBynOs96VkcscKo0Q==
 
-md5@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
-  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
-  dependencies:
-    charenc "0.0.2"
-    crypt "0.0.2"
-    is-buffer "~1.1.6"
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -6930,10 +6965,10 @@ multimatch@^5.0.0:
     arrify "^2.0.1"
     minimatch "^3.0.4"
 
-mustache@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64"
-  integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==
+mustache@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz#d99beb031701ad433338e7ea65e0489416c854a2"
+  integrity sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==
 
 mute-stream@0.0.8, mute-stream@~0.0.4:
   version "0.0.8"
@@ -8657,7 +8692,7 @@ sass@^1.29.0:
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
 
-sax@^1.2.4:
+sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -9773,6 +9808,11 @@ universalify@^0.1.0, universalify@^0.1.2:
   resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
+  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
+
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -10144,18 +10184,19 @@ xml-js@=1.6.8:
   dependencies:
     sax "^1.2.4"
 
-xml-js@^1.6.11:
-  version "1.6.11"
-  resolved "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9"
-  integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==
-  dependencies:
-    sax "^1.2.4"
-
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xml2js@^0.4.3:
+  version "0.4.23"
+  resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
 xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
@@ -10166,6 +10207,11 @@ xmlbuilder@15.1.1:
   resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
   integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
 
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"

From 5f2f2385e7db7992ac409b6730a02cec743478b0 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Thu, 14 Oct 2021 11:02:55 +0200
Subject: [PATCH 22/27] Generate readme

---
 packages/openapi-generator/README.md          | 145 +++++++++---------
 packages/openapi-generator/generate-readme.ts |  38 +++++
 packages/openapi-generator/package.json       |   2 +-
 packages/openapi-generator/src/cli/index.ts   |  11 +-
 .../openapi-generator/src/options/flags.ts    |  24 ++-
 5 files changed, 136 insertions(+), 84 deletions(-)
 create mode 100644 packages/openapi-generator/generate-readme.ts

diff --git a/packages/openapi-generator/README.md b/packages/openapi-generator/README.md
index 8206ecc12e..22334a7fba 100644
--- a/packages/openapi-generator/README.md
+++ b/packages/openapi-generator/README.md
@@ -14,87 +14,92 @@ This generator is based on the [OpenAPI Tools generator](https://openapi-generat
 $ npm install @sap-cloud-sdk/openapi-generator
 ```
 
-## Usage (CLI)
+To run the CLI locally, compile and link the package.
 
-<!-- prettier-ignore-start -->
-<!-- commands -->
-* [`generate-openapi-client --input <input> --outputDir <outputDirectory>`](#generate-openapi-client---input-input---outputdir-outputdirectory)
+```bash
+$ yarn install
 
-## `generate-openapi-client --input <input> --outputDir <outputDirectory>`
+$ yarn compile
 
-Generate OpenAPI client(s), that use the connectivity features of the SAP Cloud SDK for JavaScript/TypeScript.
+$ npm link
 
+$ openapi-generator help
 ```
-USAGE
-  $ generate-openapi-client --input <input> --outputDir <outputDirectory>
-
-OPTIONS
-  -c, --config=<path/to/config.json>
-      Set the path to a file containing the options for generation instead of setting the options on the command line. 
-      When combining the `config` option with other options on the command line, the command line options take precedence. 
-      If a directory is passed, a `config.json` file is read from this directory.
-
-  -i, --input=<path/to/input>
-      (required) Specify the path to the directory or file containing the OpenAPI service definition(s) to generate 
-      clients for. Accepts Swagger and OpenAPI definitions as YAML and JSON files. Throws an error if the path does not 
-      exist.
-
-  -o, --outputDir=<path/to/output>
-      (required) Specify the path to the directory to generate the client(s) in. Each client is generated into a 
-      subdirectory within the given output directory. Creates the directory if it does not exist. Customize subdirectory 
-      naming through `--optionsPerService`.
-
-  -t, --transpile
-      Transpile the generated TypeScript code. When enabled a default `tsconfig.json` will be generated and used. It emits 
-      `.js`, `.js.map`, `.d.ts` and `.d.ts.map` files. To configure transpilation set `--tsconfig`.
-
-  --clearOutputDir
-      Remove all files in the output directory before generation. Be cautious when using this option, as it really removes 
-      EVERYTHING in the output directory.
-
-  --include=<glob/to/include>
-      Include files matching the given glob into the root of each generated client directory.
-
-  --optionsPerService=<path/to/options-per-service.json>
-      Set the path to a file containing the options per service. The configuration allows to set a `directoryName` and 
-      `packageName` for every service, identified by the path to the original file. It also makes sure that names do not 
-      change between generator runs. If a directory is passed, a `options-per-service.json` file is read/created in this 
-      directory.
 
-  --overwrite
-      Allow to overwrite files, that already exist. This is useful, when running the generation regularly.
-
-  --packageJson
-      When enabled, a `package.json`, that specifies dependencies and scripts for transpilation and documentation 
-      generation is generated.
-
-  --skipValidation
-      By default, the generation fails, when there are duplicate or invalid names for operations and/or path parameters 
-      after transforming them to camel case. Set this to true to enable unique and valid name generation. The names will 
-      then be generated by appending numbers and prepending prefixes.
-
-  --tsConfig=<path/to/tsconfig.json>
-      Replace the default `tsconfig.json` by passing a path to a custom config. By default, a `tsconfig.json` is only 
-      generated, when transpilation is enabled (`--transpile`). If a directory is passed, a `tsconfig.json` file is read 
-      from this directory.
-
-  --verbose
-      Turn on verbose logging.
-
-EXAMPLES
+## Usage (CLI)
 
-  // generate TypeScript clients from OpenAPI definitions in a directory
-  $ openapi-generator --input ./my-specs --outputDir ./clients
+Generate OpenAPI client(s), that use the connectivity features of the SAP Cloud SDK for JavaScript/TypeScript.
 
-  // generate a JavaScript client from a OpenAPI definition file
-  $ openapi-generator --input ./my-spec.yaml --outputDir ./client --transpile
+<!-- commands -->
+<!-- This block is inserted by generate-readme.ts. Do not adjust it manually. -->
+```
+Usage: openapi-generator --input <input> --outputDir <outputDirectory>
+
+Options:
+      --help               Show help                                   [boolean]
+      --version            Show version number                         [boolean]
+  -i, --input              Specify the path to the directory or file containing
+                           the OpenAPI service definition(s) to generate clients
+                           for. Accepts Swagger and OpenAPI definitions as YAML
+                           and JSON files. Throws an error if the path does not
+                           exist.                            [string] [required]
+  -o, --outputDir          Specify the path to the directory to generate the
+                           client(s) in. Each client is generated into a
+                           subdirectory within the given output directory.
+                           Creates the directory if it does not exist. Customize
+                           subdirectory naming through `--optionsPerService`.
+                                                             [string] [required]
+  -t, --transpile          Transpile the generated TypeScript code. When enabled
+                           a default `tsconfig.json` will be generated and used.
+                           It emits `.js`, `.js.map`, `.d.ts` and `.d.ts.map`
+                           files. To configure transpilation set `--tsconfig`.
+                                                      [boolean] [default: false]
+      --include            Include files matching the given glob into the root
+                           of each generated client directory.          [string]
+      --overwrite          Allow to overwrite files, that already exist. This is
+                           useful, when running the generation regularly.
+                                                      [boolean] [default: false]
+      --clearOutputDir     Remove all files in the output directory before
+                           generation. Be cautious when using this option, as it
+                           really removes EVERYTHING in the output directory.
+                                                      [boolean] [default: false]
+      --skipValidation     By default, the generation fails, when there are
+                           duplicate or invalid names for operations and/or path
+                           parameters after transforming them to camel case. Set
+                           this to true to enable unique and valid name
+                           generation. The names will then be generated by
+                           appending numbers and prepending prefixes.
+                                                      [boolean] [default: false]
+      --tsConfig           Replace the default `tsconfig.json` by passing a path
+                           to a custom config. By default, a `tsconfig.json` is
+                           only generated, when transpilation is enabled
+                           (`--transpile`). If a directory is passed, a
+                           `tsconfig.json` file is read from this directory.
+                                                                        [string]
+      --packageJson        When enabled, a `package.json`, that specifies
+                           dependencies and scripts for transpilation and
+                           documentation generation is generated.
+                                                      [boolean] [default: false]
+  -v, --verbose            Turn on verbose logging.   [boolean] [default: false]
+      --optionsPerService  Set the path to a file containing the options per
+                           service. The configuration allows to set a
+                           `directoryName` and `packageName` for every service,
+                           identified by the path to the original file. It also
+                           makes sure that names do not change between generator
+                           runs. If a directory is passed, a
+                           `options-per-service.json` file is read/created in
+                           this directory.                              [string]
+  -c, --config             Set the path to a file containing the options for
+                           generation instead of setting the options on the
+                           command line. When combining the `config` option with
+                           other options on the command line, the command line
+                           options take precedence. If a directory is passed, a
+                           `config.json` file is read from this directory.
+                                                                        [string]
 ```
-
-_See code: [dist/cli/index.ts](https://github.com/SAP/cloud-sdk-js/blob/v1.50.0/dist/cli/index.ts)_
 <!-- commandsstop -->
-<!-- prettier-ignore-end -->
 
-## Usage (programatically)
+## Usage (programmatically)
 
 ```ts
 import { generate } from '@sap-cloud-sdk/openapi-generator';
diff --git a/packages/openapi-generator/generate-readme.ts b/packages/openapi-generator/generate-readme.ts
new file mode 100644
index 0000000000..dbfa3724af
--- /dev/null
+++ b/packages/openapi-generator/generate-readme.ts
@@ -0,0 +1,38 @@
+import { readFile, writeFile } from 'fs/promises';
+import { resolve } from 'path';
+import { cli } from './src/options';
+
+writeReadMe();
+
+const infoNoManualEdit =
+  '<!-- This block is inserted by generate-readme.ts. Do not adjust it manually. -->';
+
+async function writeReadMe() {
+  const file = await readFile(resolve(__dirname, 'README.md'), {
+    encoding: 'utf-8'
+  });
+
+  await writeFile(
+    resolve(__dirname, 'README.md'),
+    replaceContentUsingTags(
+      '<!-- commands -->',
+      '<!-- commandsstop -->',
+      '```\n' +
+        (await cli(['--input', 'test', '--outputDir', 'test']).getHelp()) +
+        '\n```',
+      file
+    )
+  );
+}
+
+function replaceContentUsingTags(
+  startTag: string,
+  endTag: string,
+  replacement: string,
+  fileContent: string
+) {
+  return fileContent.replace(
+    new RegExp(`${startTag}(?:.|\n)*${endTag}`),
+    `${startTag}\n${infoNoManualEdit}\n${replacement}\n${endTag}`
+  );
+}
diff --git a/packages/openapi-generator/package.json b/packages/openapi-generator/package.json
index 95ea19a1d5..2db87fcaa3 100644
--- a/packages/openapi-generator/package.json
+++ b/packages/openapi-generator/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "compile": "yarn tsc -b",
     "prepare": "yarn compile",
-    "readme": "echo 'TODO'",
+    "readme": "npx ts-node generate-readme.ts",
     "test": "yarn jest",
     "coverage": "yarn jest --coverage",
     "check:dependencies": "depcheck ."
diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli/index.ts
index c51109dbdd..08efcdcb7b 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli/index.ts
@@ -4,11 +4,7 @@ import { createLogger } from '@sap-cloud-sdk/util';
 import yargs from 'yargs';
 // eslint-disable-next-line import/no-internal-modules
 import { hideBin } from 'yargs/helpers';
-import {
-  parseOptionsFromConfig,
-  getSpecifiedFlags,
-  generatorOptions
-} from '../options';
+import { parseOptionsFromConfig, getSpecifiedFlags, cli } from '../options';
 import { generateWithParsedOptions } from '../generator';
 
 const logger = createLogger('openapi-generator');
@@ -17,10 +13,7 @@ parseCmdArgs();
 
 export default async function parseCmdArgs(): Promise<void> {
   try {
-    const argv = await yargs(hideBin(process.argv))
-      .usage('--input <input> --outputDir <outputDirectory>')
-      .options(generatorOptions)
-      .strict().argv;
+    const argv = await cli(process.argv).argv;
 
     if (argv.config) {
       await generateWithParsedOptions({
diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/flags.ts
index c191ea2afa..f511186903 100644
--- a/packages/openapi-generator/src/options/flags.ts
+++ b/packages/openapi-generator/src/options/flags.ts
@@ -1,6 +1,24 @@
 import { resolve, extname } from 'path';
 import { existsSync, lstatSync } from 'fs';
 import { GlobSync } from 'glob';
+import yargs from 'yargs';
+// eslint-disable-next-line import/no-internal-modules
+import { hideBin } from 'yargs/helpers';
+
+// eslint-disable-next-line
+export function cli(argv: string[]) {
+  return (
+    yargs(hideBin(argv))
+      .usage(
+        'Usage: openapi-generator --input <input> --outputDir <outputDirectory>'
+      )
+      .options(generatorOptions)
+      // This needs to be specified separately due to following bug: https://github.com/yargs/yargs/issues/1928
+      .demandOption('input')
+      .demandOption('outputDir')
+      .strict()
+  );
+}
 
 export const generatorOptions = {
   input: {
@@ -9,8 +27,7 @@ export const generatorOptions = {
     description:
       'Specify the path to the directory or file containing the OpenAPI service definition(s) to generate clients for. Accepts Swagger and OpenAPI definitions as YAML and JSON files. Throws an error if the path does not exist.',
     coerce: (input: string): string =>
-      typeof input !== 'undefined' ? resolve(input) : '',
-    default: ''
+      typeof input !== 'undefined' ? resolve(input) : ''
   },
   outputDir: {
     string: true,
@@ -18,8 +35,7 @@ export const generatorOptions = {
     description:
       'Specify the path to the directory to generate the client(s) in. Each client is generated into a subdirectory within the given output directory. Creates the directory if it does not exist. Customize subdirectory naming through `--optionsPerService`.',
     coerce: (input: string): string =>
-      typeof input !== 'undefined' ? resolve(input) : '',
-    default: ''
+      typeof input !== 'undefined' ? resolve(input) : ''
   },
   transpile: {
     boolean: true,

From 400cb64a4c188e8fbdfe1969d55f0a7bd2d66542 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Thu, 14 Oct 2021 11:32:32 +0200
Subject: [PATCH 23/27] Add note to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0beb748e83..95059f499e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ Blog: TBD<br>
 ## Improvements
 
 - [generator] Include and exclude options added to the `transpileDirectory()` method
+- [openapi-generator] Replace `oclif` library with `yargs`. This is a refactoring without functional changes.
 
 ## Fixed Issues
 

From 7b806382e74d6fad8cb5a4c90079a37a98ebb236 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Thu, 14 Oct 2021 11:37:07 +0200
Subject: [PATCH 24/27] Use node 14 instead of 12 in GHActions

---
 .github/actions/get-changelog/action.yml |  2 +-
 .github/workflows/build.yml              | 10 +++++-----
 .github/workflows/bump.yml               |  2 +-
 .github/workflows/release.yml            |  2 +-
 .github/workflows/tests-windows.yml      |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/actions/get-changelog/action.yml b/.github/actions/get-changelog/action.yml
index ad0c45144b..6730fe2daf 100644
--- a/.github/actions/get-changelog/action.yml
+++ b/.github/actions/get-changelog/action.yml
@@ -4,5 +4,5 @@ outputs:
   changelog:
     description: 'The current changelog'
 runs:
-  using: 'node12'
+  using: 'node14'
   main: 'dist/.github/actions/get-changelog/index.js'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc688d78f8..5dde41b7e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [12.x]
+        node-version: [14.x]
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1
@@ -42,7 +42,7 @@ jobs:
       - run: git fetch --depth=1
       - uses: actions/setup-node@v2
         with:
-          node-version: '12.x'
+          node-version: '14.x'
       - uses: actions/cache@v2
         id: cache
         with:
@@ -72,7 +72,7 @@ jobs:
       - run: git fetch --depth=1
       - uses: actions/setup-node@v2
         with:
-          node-version: '12.x'
+          node-version: '14.x'
       - uses: actions/cache@v2
         id: cache
         with:
@@ -91,7 +91,7 @@ jobs:
       - run: git fetch --depth=1
       - uses: actions/setup-node@v2
         with:
-          node-version: '12.x'
+          node-version: '14.x'
       - uses: actions/cache@v2
         id: cache
         with:
@@ -116,7 +116,7 @@ jobs:
       - run: git fetch --depth=1
       - uses: actions/setup-node@v2
         with:
-          node-version: '12.x'
+          node-version: '14.x'
       - uses: actions/cache@v2
         id: cache
         with:
diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml
index ceea01e8e9..4cddd1efc8 100644
--- a/.github/workflows/bump.yml
+++ b/.github/workflows/bump.yml
@@ -17,7 +17,7 @@ jobs:
           token: ${{ secrets.GH_CLOUD_SDK_JS_ADMIN_WRITE_TOKEN }}
       - uses: actions/setup-node@v2
         with:
-          node-version: '12.x'
+          node-version: '14.x'
       - run: yarn install --frozen-lockfile
       - name: Setup git
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e35ae3acd0..bef9bdca44 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '12.x'
+          node-version: '14.x'
       - run: yarn install --frozen-lockfile
       - name: Stable Release
         run: |
diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml
index 89ee4bab31..9689d2d2c0 100644
--- a/.github/workflows/tests-windows.yml
+++ b/.github/workflows/tests-windows.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        node-version: [12.x]
+        node-version: [14.x]
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1

From b9c9568bebcce4f5ccebb52e1a7f04ee7e536c2c Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Fri, 15 Oct 2021 11:25:49 +0200
Subject: [PATCH 25/27] Revert node14 to node12

---
 .github/actions/get-changelog/action.yml      |  2 +-
 .github/workflows/build.yml                   | 10 +++++-----
 .github/workflows/bump.yml                    |  2 +-
 .github/workflows/release.yml                 |  2 +-
 .github/workflows/tests-windows.yml           |  2 +-
 packages/openapi-generator/generate-readme.ts |  6 +++++-
 .../openapi-generator/src/generator.spec.ts   | 20 +++++++++----------
 7 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.github/actions/get-changelog/action.yml b/.github/actions/get-changelog/action.yml
index 6730fe2daf..ad0c45144b 100644
--- a/.github/actions/get-changelog/action.yml
+++ b/.github/actions/get-changelog/action.yml
@@ -4,5 +4,5 @@ outputs:
   changelog:
     description: 'The current changelog'
 runs:
-  using: 'node14'
+  using: 'node12'
   main: 'dist/.github/actions/get-changelog/index.js'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5dde41b7e9..cc688d78f8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [14.x]
+        node-version: [12.x]
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1
@@ -42,7 +42,7 @@ jobs:
       - run: git fetch --depth=1
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '12.x'
       - uses: actions/cache@v2
         id: cache
         with:
@@ -72,7 +72,7 @@ jobs:
       - run: git fetch --depth=1
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '12.x'
       - uses: actions/cache@v2
         id: cache
         with:
@@ -91,7 +91,7 @@ jobs:
       - run: git fetch --depth=1
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '12.x'
       - uses: actions/cache@v2
         id: cache
         with:
@@ -116,7 +116,7 @@ jobs:
       - run: git fetch --depth=1
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '12.x'
       - uses: actions/cache@v2
         id: cache
         with:
diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml
index 4cddd1efc8..ceea01e8e9 100644
--- a/.github/workflows/bump.yml
+++ b/.github/workflows/bump.yml
@@ -17,7 +17,7 @@ jobs:
           token: ${{ secrets.GH_CLOUD_SDK_JS_ADMIN_WRITE_TOKEN }}
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '12.x'
       - run: yarn install --frozen-lockfile
       - name: Setup git
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bef9bdca44..e35ae3acd0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '12.x'
       - run: yarn install --frozen-lockfile
       - name: Stable Release
         run: |
diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml
index 9689d2d2c0..89ee4bab31 100644
--- a/.github/workflows/tests-windows.yml
+++ b/.github/workflows/tests-windows.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        node-version: [14.x]
+        node-version: [12.x]
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1
diff --git a/packages/openapi-generator/generate-readme.ts b/packages/openapi-generator/generate-readme.ts
index dbfa3724af..ab0af9d6c6 100644
--- a/packages/openapi-generator/generate-readme.ts
+++ b/packages/openapi-generator/generate-readme.ts
@@ -1,7 +1,11 @@
-import { readFile, writeFile } from 'fs/promises';
+import { readFile as rf, writeFile as wf } from 'fs';
+import { promisify } from 'util';
 import { resolve } from 'path';
 import { cli } from './src/options';
 
+const readFile = promisify(rf);
+const writeFile = promisify(wf);
+
 writeReadMe();
 
 const infoNoManualEdit =
diff --git a/packages/openapi-generator/src/generator.spec.ts b/packages/openapi-generator/src/generator.spec.ts
index f7e4554601..afe76d334d 100644
--- a/packages/openapi-generator/src/generator.spec.ts
+++ b/packages/openapi-generator/src/generator.spec.ts
@@ -82,18 +82,18 @@ describe('generator', () => {
       mock.restore();
     });
 
-    // it('should transpile the generated sources', async () => {
-    //   const files = await promises.readdir(outputPath);
+    it('should transpile the generated sources', async () => {
+      const files = await promises.readdir(outputPath);
 
-    //   const expectedFiles: string[] = [];
-    //   ['default-api', 'entity-api', 'test-case-api'].forEach(file =>
-    //     ['js', 'd.ts.map', 'd.ts'].forEach(postfix =>
-    //       expectedFiles.push(`${file}.${postfix}`)
-    //     )
-    //   );
+      const expectedFiles: string[] = [];
+      ['default-api', 'entity-api', 'test-case-api'].forEach(file =>
+        ['js', 'd.ts.map', 'd.ts'].forEach(postfix =>
+          expectedFiles.push(`${file}.${postfix}`)
+        )
+      );
 
-    //   expect(files).toIncludeAllMembers(expectedFiles);
-    // });
+      expect(files).toIncludeAllMembers(expectedFiles);
+    });
 
     it('should create a package.json', () => {
       const packageJson = resolve(outputPath, 'package.json');

From 5461604c00b095ed53a2bf8e70157fccb0f6dc41 Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Fri, 15 Oct 2021 15:59:34 +0200
Subject: [PATCH 26/27] Move index.ts to cli.ts

---
 packages/openapi-generator/package.json                 | 2 +-
 packages/openapi-generator/src/{cli/index.ts => cli.ts} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/openapi-generator/src/{cli/index.ts => cli.ts} (92%)

diff --git a/packages/openapi-generator/package.json b/packages/openapi-generator/package.json
index 2db87fcaa3..60afe002e5 100644
--- a/packages/openapi-generator/package.json
+++ b/packages/openapi-generator/package.json
@@ -13,7 +13,7 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
-    "openapi-generator": "./dist/cli/index.js"
+    "openapi-generator": "./dist/cli.js"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/openapi-generator/src/cli/index.ts b/packages/openapi-generator/src/cli.ts
similarity index 92%
rename from packages/openapi-generator/src/cli/index.ts
rename to packages/openapi-generator/src/cli.ts
index 08efcdcb7b..aa8d66495f 100644
--- a/packages/openapi-generator/src/cli/index.ts
+++ b/packages/openapi-generator/src/cli.ts
@@ -4,8 +4,8 @@ import { createLogger } from '@sap-cloud-sdk/util';
 import yargs from 'yargs';
 // eslint-disable-next-line import/no-internal-modules
 import { hideBin } from 'yargs/helpers';
-import { parseOptionsFromConfig, getSpecifiedFlags, cli } from '../options';
-import { generateWithParsedOptions } from '../generator';
+import { parseOptionsFromConfig, getSpecifiedFlags, cli } from './options';
+import { generateWithParsedOptions } from './generator';
 
 const logger = createLogger('openapi-generator');
 

From b8df407aebdae898c17aca7b26b670d3ec48916f Mon Sep 17 00:00:00 2001
From: Florian Richter <florian.richter@sap.com>
Date: Fri, 15 Oct 2021 16:19:08 +0200
Subject: [PATCH 27/27] Rename flags.ts to options.ts

---
 packages/openapi-generator/src/options/generator-options.ts     | 2 +-
 packages/openapi-generator/src/options/index.ts                 | 2 +-
 packages/openapi-generator/src/options/{flags.ts => options.ts} | 0
 .../integration-tests/test/openapi-negative-case.spec.ts        | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/openapi-generator/src/options/{flags.ts => options.ts} (100%)

diff --git a/packages/openapi-generator/src/options/generator-options.ts b/packages/openapi-generator/src/options/generator-options.ts
index dc49222f67..cdb4729ddc 100644
--- a/packages/openapi-generator/src/options/generator-options.ts
+++ b/packages/openapi-generator/src/options/generator-options.ts
@@ -2,7 +2,7 @@ import { promises } from 'fs';
 import { resolve } from 'path';
 import yargs from 'yargs';
 import { ErrorWithCause, createLogger } from '@sap-cloud-sdk/util';
-import { generatorOptions } from './flags';
+import { generatorOptions } from './options';
 
 const { readFile, lstat } = promises;
 const logger = createLogger('openapi-generator');
diff --git a/packages/openapi-generator/src/options/index.ts b/packages/openapi-generator/src/options/index.ts
index b0b30ce7c9..7b9017c8e0 100644
--- a/packages/openapi-generator/src/options/index.ts
+++ b/packages/openapi-generator/src/options/index.ts
@@ -1,4 +1,4 @@
 export * from './generator-options';
 export * from './options-per-service';
 export * from './tsconfig-json';
-export * from './flags';
+export * from './options';
diff --git a/packages/openapi-generator/src/options/flags.ts b/packages/openapi-generator/src/options/options.ts
similarity index 100%
rename from packages/openapi-generator/src/options/flags.ts
rename to packages/openapi-generator/src/options/options.ts
diff --git a/test-packages/integration-tests/test/openapi-negative-case.spec.ts b/test-packages/integration-tests/test/openapi-negative-case.spec.ts
index 2b52e82b73..016b5c7682 100644
--- a/test-packages/integration-tests/test/openapi-negative-case.spec.ts
+++ b/test-packages/integration-tests/test/openapi-negative-case.spec.ts
@@ -8,7 +8,7 @@ import {
 
 describe('openapi negative tests', () => {
   const pathToGenerator = resolve(
-    '../../node_modules/@sap-cloud-sdk/openapi-generator/dist/cli/index.js'
+    '../../node_modules/@sap-cloud-sdk/openapi-generator/dist/cli.js'
   );
 
   it('should fail on generation for faulty spec file', async () => {