nuxt-openapi-hyperfetch 1.0.3 → 1.0.4

package/src/index.ts

@@ -17,7 +17,15 @@ import {
 } from './cli/prompts.js';
 import { MESSAGES } from './cli/messages.js';
 import { displayLogo } from './cli/logo.js';
-import { loadConfig, mergeConfig, parseTags, parseGenerators } from './cli/config.js';
+import {
+  loadConfig,
+  mergeConfig,
+  parseTags,
+  parseGenerators,
+  normalizeGenerators,
+  type ComposableGeneratorType,
+} from './cli/config.js';
+import { hasConnectorsConfig } from './config/connectors.js';
 
 const program = new Command();
 
@@ -54,7 +62,7 @@ program
   .option('--dry-run', 'Preview changes without writing files', false)
   .option('-v, --verbose', 'Enable verbose logging', false)
   .option('--watch', 'Watch mode - regenerate on file changes', false)
-  .option('--generators <types>', 'Generators to use: useFetch,useAsyncData,nuxtServer')
+  .option('--generators <types>', 'Generators to use: useFetch,useAsyncData,nuxtServer,connectors')
   .option('--connectors', 'Generate headless UI connectors on top of useAsyncData', false)
   .option('--server-route-path <path>', 'Server route path (for nuxtServer mode)')
   .option('--enable-bff', 'Enable BFF pattern (for nuxtServer mode)', false)
@@ -127,19 +135,28 @@ program
       }
 
       // 1. Determine composables to generate FIRST
-      let composables: ('useFetch' | 'useAsyncData' | 'nuxtServer')[];
+      let composables: ComposableGeneratorType[];
+      let generateConnectorsFlag = false;
+      const connectorsConfigured = hasConnectorsConfig(config.connectors);
 
       if (config.generators) {
-        // filter out 'connectors' — handled separately below
-        composables = config.generators.filter(
-          (g): g is 'useFetch' | 'useAsyncData' | 'nuxtServer' => g !== 'connectors'
+        const normalized = normalizeGenerators(
+          config.generators,
+          config.createUseAsyncDataConnectors
         );
+        composables = normalized.composables;
+        generateConnectorsFlag = normalized.generateConnectors;
         if (config.verbose) {
           console.log(`Using generators from config: ${composables.join(', ')}`);
         }
       } else {
         const result = await promptComposablesSelection();
-        composables = result.composables;
+        const normalized = normalizeGenerators(
+          result.composables,
+          config.createUseAsyncDataConnectors
+        );
+        composables = normalized.composables;
+        generateConnectorsFlag = normalized.generateConnectors;
       }
 
       if (composables.length === 0) {
@@ -165,13 +182,24 @@ program
         outputPath = config.output ?? './swagger';
       }
 
-      // 3. Ask whether to generate headless connectors (only if useAsyncData selected)
-      let generateConnectorsFlag = false;
+      // 3. Ask whether to generate headless connectors (only if still unresolved)
       if (composables.includes('useAsyncData')) {
-        if (config.createUseAsyncDataConnectors !== undefined) {
-          generateConnectorsFlag = config.createUseAsyncDataConnectors;
-        } else {
+        const hasExplicitConnectorsInGenerators =
+          config.generators?.includes('connectors') ?? false;
+        const shouldPromptConnectors =
+          !generateConnectorsFlag &&
+          config.createUseAsyncDataConnectors === undefined &&
+          !hasExplicitConnectorsInGenerators &&
+          !connectorsConfigured;
+
+        if (shouldPromptConnectors) {
           generateConnectorsFlag = await promptConnectors();
+        } else if (connectorsConfigured) {
+          generateConnectorsFlag = true;
+        } else if (config.createUseAsyncDataConnectors !== undefined) {
+          generateConnectorsFlag = config.createUseAsyncDataConnectors;
+        } else if (hasExplicitConnectorsInGenerators) {
+          generateConnectorsFlag = true;
         }
       }
 
@@ -261,6 +289,7 @@ program
               outputDir: `${composablesOutputDir}/connectors`,
               composablesRelDir: '../use-async-data/composables',
               runtimeRelDir: '../../runtime',
+              connectorsConfig: config.connectors,
             });
             spinner.stop('✓ Generated headless UI connectors');
           } else {

package/src/module/index.ts

@@ -7,6 +7,8 @@ import { generateUseAsyncDataComposables } from '../generators/use-async-data/ge
 import { generateNuxtServerRoutes } from '../generators/nuxt-server/generator.js';
 import { generateConnectors } from '../generators/connectors/generator.js';
 import { createConsoleLogger } from '../cli/logger.js';
+import { normalizeGenerators } from '../cli/config.js';
+import { isConnectorsRequested } from '../config/connectors.js';
 import type { ModuleOptions } from './types.js';
 
 export default defineNuxtModule<ModuleOptions>({
@@ -39,7 +41,13 @@ export default defineNuxtModule<ModuleOptions>({
     const resolvedInput = path.resolve(nuxt.options.rootDir, options.input);
     const resolvedOutput = path.resolve(nuxt.options.rootDir, options.output!);
     const composablesOutputDir = path.join(resolvedOutput, 'composables');
-    const selectedGenerators = options.generators ?? ['useFetch', 'useAsyncData'];
+    const normalized = normalizeGenerators(
+      options.generators ?? ['useFetch', 'useAsyncData'],
+      options.createUseAsyncDataConnectors
+    );
+    const selectedGenerators = normalized.composables;
+    const generateConnectorsFlag = normalized.generateConnectors;
+    const connectorsRequested = isConnectorsRequested(options);
     const backend = options.backend ?? 'heyapi';
     const logger = createConsoleLogger();
 
@@ -103,7 +111,10 @@ export default defineNuxtModule<ModuleOptions>({
       }
 
       // 3. Generate headless connectors if requested (requires useAsyncData)
-      if (options.createUseAsyncDataConnectors && selectedGenerators.includes('useAsyncData')) {
+      if (
+        (generateConnectorsFlag || connectorsRequested) &&
+        selectedGenerators.includes('useAsyncData')
+      ) {
         const connectorsOutputDir = path.join(composablesOutputDir, 'connectors');
         await generateConnectors(
           {
@@ -111,6 +122,7 @@ export default defineNuxtModule<ModuleOptions>({
             outputDir: connectorsOutputDir,
             composablesRelDir: '../use-async-data/composables',
             runtimeRelDir: '../../runtime',
+            connectorsConfig: options.connectors,
           },
           logger
         );
@@ -142,7 +154,10 @@ export default defineNuxtModule<ModuleOptions>({
       if (selectedGenerators.includes('useAsyncData')) {
         addImportsDir(path.join(composablesOutputDir, 'use-async-data', 'composables'));
       }
-      if (options.createUseAsyncDataConnectors && selectedGenerators.includes('useAsyncData')) {
+      if (
+        (generateConnectorsFlag || connectorsRequested) &&
+        selectedGenerators.includes('useAsyncData')
+      ) {
         addImportsDir(path.join(composablesOutputDir, 'connectors'));
       }
     }

package/src/module/types.ts

@@ -1,4 +1,4 @@
-import type { GeneratorConfig } from '../cli/config.js';
+import type { GeneratorConfig } from '../config/types.js';
 
 /**
  * Configuration options for the nuxt-openapi-hyperfetch Nuxt module.
@@ -30,9 +30,9 @@ export interface ModuleOptions extends GeneratorConfig {
   enableAutoImport?: boolean;
 
   /**
-   * Generate headless UI connector composables on top of useAsyncData.
-   * Connectors provide ready-made logic for tables, pagination, forms and delete actions.
-   * Requires useAsyncData to also be in generators.
+   * Backward-compatible connectors flag.
+   * Prefer `generators: ['connectors']` so module and CLI behave the same.
+   * When true, connectors are generated and useAsyncData is added automatically.
    * @default false
    */
   createUseAsyncDataConnectors?: boolean;