@openapi-qraft/cli 2.14.0 → 2.15.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @openapi-qraft/cli
 
+## 2.15.0-beta.1
+
+### Minor Changes
+
+- a282960: Introduce unified CLI tool `@qraft/cli` that extends code generation capabilities beyond OpenAPI to support AsyncAPI
+  specifications. The new CLI provides three main commands:
+  - `qraft openapi` - Generate type-safe code from OpenAPI documents (React Query hooks and TypeScript types)
+  - `qraft asyncapi` - Generate TypeScript types from AsyncAPI documents
+  - `qraft redocly` - Generate code from Redocly configuration files supporting both OpenAPI and AsyncAPI APIs
+
+  The CLI uses a plugin-based architecture where plugins are installed as peer dependencies, allowing users to install
+  only the plugins they need. It maintains full backward compatibility with existing OpenAPI workflows while adding
+  seamless support for event-driven API specifications.
+
+### Patch Changes
+
+- Updated dependencies [7074f50]
+- Updated dependencies [a282960]
+  - @openapi-qraft/tanstack-query-react-plugin@2.15.0-beta.1
+  - @openapi-qraft/openapi-typescript-plugin@2.15.0-beta.1
+  - @openapi-qraft/plugin@2.15.0-beta.1
+  - @qraft/cli-utils@1.0.0-beta.0
+  - @qraft/plugin@1.0.0-beta.0
+
+## 2.15.0-beta.0
+
+### Patch Changes
+
+- Updated dependencies [87730d2]
+  - @openapi-qraft/tanstack-query-react-plugin@2.15.0-beta.0
+  - @openapi-qraft/plugin@2.15.0-beta.0
+  - @openapi-qraft/openapi-typescript-plugin@2.15.0-beta.0
+
 ## 2.14.0
 
 ### Patch Changes

package/README.md

@@ -209,8 +209,6 @@ The following plugins are currently supported:
       - `--openapi-types-import-path ../openapi.d.ts`
       - `--openapi-types-import-path '@/api/openapi.d.ts'`
       - `--openapi-types-import-path '@external-package-types'`
-- **`--operation-generics-import-path <path>`:** Define the path to the operation generics file, allowing for custom
-  operation handling _(optional, default: `@openapi-qraft/react`)_.
 - **`--export-openapi-types [bool]`:** Add an export statement of the generated OpenAPI document types from the `./index.ts` file. Useful for sharing types within your project. _(optional, default: `true`, if `--plugin openapi-typescript` is used)_
 
 ### `--plugin openapi-typescript` options

package/dist/bin.d.ts

@@ -1,15 +1,4 @@
 #!/usr/bin/env node
-import { ParseOptions } from 'commander';
+import type { ParseOptions } from 'commander';
 export declare function main(processArgv: string[], processArgvParseOptions?: ParseOptions): Promise<void>;
-/**
- * Extracts multiple `--plugin <name>` options from `argv`
- * and returns both the filtered `argv` and the extracted plugins list.
- */
-export declare function extractArgvPluginOptions(argv: string[]): {
-    argv: string[];
-    plugins?: undefined;
-} | {
-    argv: string[];
-    plugins: string[];
-};
 //# sourceMappingURL=bin.d.ts.map

package/dist/bin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AAIA,OAAO,EAAU,YAAY,EAAE,MAAM,WAAW,CAAC;AAIjD,wBAAsB,IAAI,CACxB,WAAW,EAAE,MAAM,EAAE,EACrB,uBAAuB,CAAC,EAAE,YAAY,iBAavC;AAkED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE;;;;;;EA6BtD"}
+{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAgB9C,wBAAsB,IAAI,CACxB,WAAW,EAAE,MAAM,EAAE,EACrB,uBAAuB,CAAC,EAAE,YAAY,iBAavC"}

package/dist/bin.js

@@ -1,83 +1,45 @@
 #!/usr/bin/env node
 import { QraftCommand } from '@openapi-qraft/plugin';
-import { RedoclyConfigCommand } from '@openapi-qraft/plugin/lib/RedoclyConfigCommand';
+import { addCommandUsageWithPlugins, createFileHeader, extractArgvPluginOptions, setupPlugins, } from '@qraft/cli-utils';
+import { OPENAPI_QRAFT_REDOC_CONFIG_KEY, RedoclyConfigCommand, } from '@qraft/plugin/lib/RedoclyConfigCommand';
 import { Option } from 'commander';
 import { builtInPlugins } from './builtInPlugins.js';
 import { handleDeprecatedOptions } from './handleDeprecatedOptions.js';
 export async function main(processArgv, processArgvParseOptions) {
     const argv = handleDeprecatedOptions(processArgv);
-    const redoclyConfigParseResult = await new RedoclyConfigCommand().parseConfig(qraft, argv, processArgvParseOptions);
+    const redoclyConfigParseResult = await new RedoclyConfigCommand().parseConfig({ [OPENAPI_QRAFT_REDOC_CONFIG_KEY]: qraft }, argv, processArgvParseOptions);
     if (redoclyConfigParseResult?.length)
         return;
     await qraft(argv, processArgvParseOptions);
 }
 async function qraft(processArgv, processArgvParseOptions) {
-    const command = new QraftCommand();
+    const command = new QraftCommand(undefined, {
+        defaultFileHeader: createFileHeader('@openapi-qraft/cli'),
+    });
     const { argv, plugins } = extractArgvPluginOptions(processArgv);
     if (plugins) {
-        await setupPlugins(command, plugins);
+        await setupPlugins({
+            command,
+            plugins,
+            builtInPlugins,
+            addUsage: addCommandUsageWithPlugins,
+        });
     }
     else {
-        // Default - set up the tanstack-query-react plugin
-        await setupPlugins(command, [
-            'tanstack-query-react',
-        ]);
-        // Option to display help with all available plugins
+        await setupPlugins({
+            command,
+            plugins: [
+                'tanstack-query-react',
+            ],
+            builtInPlugins,
+            addUsage: addCommandUsageWithPlugins,
+        });
         command.addOption(new Option('--plugin <name_1> --plugin <name_2>', `Specifies which generator plugins should be used for code generation`)
             .choices(Object.keys(builtInPlugins))
             .argParser(() => {
-            // Fallback handler for when plugin parsing fails
             throw new Error('The plugin option must be processed before command parsing and should not be directly passed to the commander');
         }));
     }
     await command.parseAsync(argv, processArgvParseOptions);
 }
-async function setupPlugins(command, plugins) {
-    const pluginList = [];
-    for (const pluginName of plugins) {
-        if (!(pluginName in builtInPlugins))
-            throw new Error(`Unknown plugin: '${pluginName}'`);
-        pluginList.push((await builtInPlugins[pluginName]())
-            .default);
-        addCommandUsageWithPlugins(command, plugins);
-    }
-    await Promise.all(pluginList.map((plugin) => plugin.setupCommand(command)));
-    await Promise.all(pluginList.map((plugin) => plugin.postSetupCommand?.(command, plugins)));
-}
-/**
- * Adds plugin usage instructions by calling `command.usage(...)`
- */
-function addCommandUsageWithPlugins(command, plugins) {
-    const pluginUsage = plugins.map((plugin) => `--plugin ${plugin}`).join(' ');
-    command.usage(`${pluginUsage} [input] [options]`);
-}
-/**
- * Extracts multiple `--plugin <name>` options from `argv`
- * and returns both the filtered `argv` and the extracted plugins list.
- */
-export function extractArgvPluginOptions(argv) {
-    const pluginIndex = argv.indexOf('--plugin');
-    if (pluginIndex === -1)
-        return { argv };
-    const filteredArgv = argv.slice(0, pluginIndex);
-    const plugins = [];
-    for (let i = pluginIndex; i < argv.length; i++) {
-        if (argv[i] === '--plugin') {
-            const pluginName = argv.at(i + 1);
-            if (!pluginName)
-                throw new Error(`A plugin name must be specified after the '--plugin' option`);
-            if (pluginName?.startsWith('--'))
-                throw new Error(`Invalid plugin name: '${pluginName}'. Plugin names cannot start with '--'`);
-            plugins.push(pluginName);
-            i++; // Skip next item
-        }
-        else {
-            filteredArgv.push(argv[i]);
-        }
-    }
-    return {
-        argv: filteredArgv,
-        plugins,
-    };
-}
 //# sourceMappingURL=bin.js.map

package/dist/bin.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACL,0BAA0B,EAC1B,gBAAgB,EAChB,wBAAwB,EACxB,YAAY,GACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,8BAA8B,EAC9B,oBAAoB,GACrB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,WAAqB,EACrB,uBAAsC;IAEtC,MAAM,IAAI,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAElD,MAAM,wBAAwB,GAAG,MAAM,IAAI,oBAAoB,EAAE,CAAC,WAAW,CAC3E,EAAE,CAAC,8BAA8B,CAAC,EAAE,KAAK,EAAE,EAC3C,IAAI,EACJ,uBAAuB,CACxB,CAAC;IAEF,IAAI,wBAAwB,EAAE,MAAM;QAAE,OAAO;IAE7C,MAAM,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;AAC7C,CAAC;AAED,KAAK,UAAU,KAAK,CAClB,WAAqB,EACrB,uBAAsC;IAEtC,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,SAAS,EAAE;QAC1C,iBAAiB,EAAE,gBAAgB,CAAC,oBAAoB,CAAC;KAC1D,CAAC,CAAC;IAEH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;IAEhE,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,YAAY,CAAC;YACjB,OAAO;YACP,OAAO;YACP,cAAc;YACd,QAAQ,EAAE,0BAA0B;SACrC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,CAAC;YACjB,OAAO;YACP,OAAO,EAAE;gBACP,sBAAsB;aACmB;YAC3C,cAAc;YACd,QAAQ,EAAE,0BAA0B;SACrC,CAAC,CAAC;QAEH,OAAO,CAAC,SAAS,CACf,IAAI,MAAM,CACR,qCAAqC,EACrC,sEAAsE,CACvE;aACE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACpC,SAAS,CAAC,GAAG,EAAE;YACd,MAAM,IAAI,KAAK,CACb,+GAA+G,CAChH,CAAC;QACJ,CAAC,CAAC,CACL,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;AAC1D,CAAC"}

package/dist/builtInPlugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtInPlugins.d.ts","sourceRoot":"","sources":["../src/builtInPlugins.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc;;;CAKjB,CAAC"}
+{"version":3,"file":"builtInPlugins.d.ts","sourceRoot":"","sources":["../src/builtInPlugins.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc;;;CAKQ,CAAC"}

package/dist/builtInPlugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"builtInPlugins.js","sourceRoot":"","sources":["../src/builtInPlugins.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,sBAAsB,EAAE,GAAG,EAAE,CAC3B,MAAM,CAAC,4CAA4C,CAAC;IACtD,oBAAoB,EAAE,GAAG,EAAE,CACzB,MAAM,CAAC,0CAA0C,CAAC;CAC5C,CAAC"}
+{"version":3,"file":"builtInPlugins.js","sourceRoot":"","sources":["../src/builtInPlugins.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,sBAAsB,EAAE,GAAG,EAAE,CAC3B,MAAM,CAAC,4CAA4C,CAAC;IACtD,oBAAoB,EAAE,GAAG,EAAE,CACzB,MAAM,CAAC,0CAA0C,CAAC;CACnB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/cli",
-  "version": "2.14.0",
+  "version": "2.15.0-beta.1",
   "description": "CLI for generating typed TanStack Query React Hooks and services from OpenAPI Document, improving type safety in React apps",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -15,9 +15,11 @@
     "openapi-qraft": "./bin.mjs"
   },
   "dependencies": {
-    "@openapi-qraft/openapi-typescript-plugin": "2.14.0",
-    "@openapi-qraft/plugin": "2.14.0",
-    "@openapi-qraft/tanstack-query-react-plugin": "2.14.0",
+    "@openapi-qraft/openapi-typescript-plugin": "2.15.0-beta.1",
+    "@openapi-qraft/plugin": "2.15.0-beta.1",
+    "@openapi-qraft/tanstack-query-react-plugin": "2.15.0-beta.1",
+    "@qraft/cli-utils": "1.0.0-beta.0",
+    "@qraft/plugin": "1.0.0-beta.0",
     "ansi-colors": "^4.1.3",
     "commander": "^14.0.2"
   },
@@ -56,7 +58,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/OpenAPI-Qraft/openapi-qraft.git",
-    "directory": "packages/cli"
+    "directory": "packages/openapi-cli"
   },
   "bugs": {
     "url": "https://github.com/OpenAPI-Qraft/openapi-qraft/issues"

package/src/bin.ts

@@ -1,8 +1,17 @@
 #!/usr/bin/env node
-import type { QraftCommandPlugin } from '@openapi-qraft/plugin/lib/QraftCommandPlugin';
+import type { ParseOptions } from 'commander';
 import { QraftCommand } from '@openapi-qraft/plugin';
-import { RedoclyConfigCommand } from '@openapi-qraft/plugin/lib/RedoclyConfigCommand';
-import { Option, ParseOptions } from 'commander';
+import {
+  addCommandUsageWithPlugins,
+  createFileHeader,
+  extractArgvPluginOptions,
+  setupPlugins,
+} from '@qraft/cli-utils';
+import {
+  OPENAPI_QRAFT_REDOC_CONFIG_KEY,
+  RedoclyConfigCommand,
+} from '@qraft/plugin/lib/RedoclyConfigCommand';
+import { Option } from 'commander';
 import { builtInPlugins } from './builtInPlugins.js';
 import { handleDeprecatedOptions } from './handleDeprecatedOptions.js';
 
@@ -13,7 +22,7 @@ export async function main(
   const argv = handleDeprecatedOptions(processArgv);
 
   const redoclyConfigParseResult = await new RedoclyConfigCommand().parseConfig(
-    qraft,
+    { [OPENAPI_QRAFT_REDOC_CONFIG_KEY]: qraft },
     argv,
     processArgvParseOptions
   );
@@ -27,19 +36,29 @@ async function qraft(
   processArgv: string[],
   processArgvParseOptions?: ParseOptions
 ) {
-  const command = new QraftCommand();
+  const command = new QraftCommand(undefined, {
+    defaultFileHeader: createFileHeader('@openapi-qraft/cli'),
+  });
 
   const { argv, plugins } = extractArgvPluginOptions(processArgv);
 
   if (plugins) {
-    await setupPlugins(command, plugins);
+    await setupPlugins({
+      command,
+      plugins,
+      builtInPlugins,
+      addUsage: addCommandUsageWithPlugins,
+    });
   } else {
-    // Default - set up the tanstack-query-react plugin
-    await setupPlugins(command, [
-      'tanstack-query-react',
-    ] satisfies (keyof typeof builtInPlugins)[]);
+    await setupPlugins({
+      command,
+      plugins: [
+        'tanstack-query-react',
+      ] satisfies (keyof typeof builtInPlugins)[],
+      builtInPlugins,
+      addUsage: addCommandUsageWithPlugins,
+    });
 
-    // Option to display help with all available plugins
     command.addOption(
       new Option(
         '--plugin <name_1> --plugin <name_2>',
@@ -47,7 +66,6 @@ async function qraft(
       )
         .choices(Object.keys(builtInPlugins))
         .argParser(() => {
-          // Fallback handler for when plugin parsing fails
           throw new Error(
             'The plugin option must be processed before command parsing and should not be directly passed to the commander'
           );
@@ -57,67 +75,3 @@ async function qraft(
 
   await command.parseAsync(argv, processArgvParseOptions);
 }
-
-async function setupPlugins(command: QraftCommand, plugins: string[]) {
-  const pluginList: QraftCommandPlugin[] = [];
-
-  for (const pluginName of plugins) {
-    if (!(pluginName in builtInPlugins))
-      throw new Error(`Unknown plugin: '${pluginName}'`);
-
-    pluginList.push(
-      (await builtInPlugins[pluginName as keyof typeof builtInPlugins]())
-        .default
-    );
-
-    addCommandUsageWithPlugins(command, plugins);
-  }
-
-  await Promise.all(pluginList.map((plugin) => plugin.setupCommand(command)));
-  await Promise.all(
-    pluginList.map((plugin) => plugin.postSetupCommand?.(command, plugins))
-  );
-}
-
-/**
- * Adds plugin usage instructions by calling `command.usage(...)`
- */
-function addCommandUsageWithPlugins(command: QraftCommand, plugins: string[]) {
-  const pluginUsage = plugins.map((plugin) => `--plugin ${plugin}`).join(' ');
-  command.usage(`${pluginUsage} [input] [options]`);
-}
-
-/**
- * Extracts multiple `--plugin <name>` options from `argv`
- * and returns both the filtered `argv` and the extracted plugins list.
- */
-export function extractArgvPluginOptions(argv: string[]) {
-  const pluginIndex = argv.indexOf('--plugin');
-  if (pluginIndex === -1) return { argv };
-
-  const filteredArgv: string[] = argv.slice(0, pluginIndex);
-  const plugins: string[] = [];
-
-  for (let i = pluginIndex; i < argv.length; i++) {
-    if (argv[i] === '--plugin') {
-      const pluginName = argv.at(i + 1);
-      if (!pluginName)
-        throw new Error(
-          `A plugin name must be specified after the '--plugin' option`
-        );
-      if (pluginName?.startsWith('--'))
-        throw new Error(
-          `Invalid plugin name: '${pluginName}'. Plugin names cannot start with '--'`
-        );
-      plugins.push(pluginName);
-      i++; // Skip next item
-    } else {
-      filteredArgv.push(argv[i]);
-    }
-  }
-
-  return {
-    argv: filteredArgv,
-    plugins,
-  };
-}

package/src/builtInPlugins.ts

@@ -1,6 +1,8 @@
+import type { BuiltInPlugins } from '@qraft/cli-utils';
+
 export const builtInPlugins = {
   'tanstack-query-react': () =>
     import('@openapi-qraft/tanstack-query-react-plugin'),
   'openapi-typescript': () =>
     import('@openapi-qraft/openapi-typescript-plugin'),
-} as const;
+} as const satisfies BuiltInPlugins;