nuxt-openapi-hyperfetch 0.3.8-beta → 1.0.0

package/src/generators/use-async-data/templates.ts

@@ -15,7 +15,6 @@ function generateFileHeader(): string {
  */
 
 /* eslint-disable */
-// @ts-nocheck
 `;
 }
 
@@ -123,6 +122,18 @@ function generateImports(method: MethodInfo, apiImportPath: string, isRaw: boole
     imports += `import { useApiAsyncData, type ApiAsyncDataOptions } from '../runtime/useApiAsyncData';`;
   }
 
+  // Vue imports needed by the generated function body
+  const vueImports: string[] = ['shallowRef'];
+  if (method.requestType) {
+    vueImports.push('isRef');
+  }
+  if (method.hasBody || method.hasQueryParams || method.pathParams.length > 0) {
+    vueImports.push('computed');
+  }
+  const vueTypeImports = method.requestType ? ['Ref', 'ComputedRef'] : [];
+  const allVueImports = [...vueImports, ...vueTypeImports.map((t) => `type ${t}`)].join(', ');
+  imports += `\nimport { ${allVueImports} } from 'vue';`;
+
   return imports;
 }
 
@@ -170,26 +181,23 @@ function generateFunctionBody(
     ? `ReturnType<typeof ${wrapperFunction}<${responseType}, DataT, PickT, Options>>`
     : `ReturnType<typeof ${wrapperFunction}<${responseType}, Options>>`;
 
-  const pInit = hasParams ? `\n  const p = shallowRef(params)` : '';
+  const pInit = hasParams ? `\n  const p = isRef(params) ? params : shallowRef(params)` : '';
 
   const argsExtraction = hasParams
     ? `  const _hasKey = typeof args[0] === 'string'\n  const params = _hasKey ? args[1] : args[0]\n  const options = _hasKey ? { cacheKey: args[0], ...args[2] } : args[1]`
     : `  const _hasKey = typeof args[0] === 'string'\n  const options = _hasKey ? { cacheKey: args[0], ...args[1] } : args[0]`;
 
-  return `${description}export function ${composableName}<
-  DataT = ${responseType},
-  PickT extends ReadonlyArray<string> | undefined = undefined,
-  Options extends ${optionsType} = ${optionsDefaultType}
->(key: string, ${args}): ${returnType}
-export function ${composableName}<
-  DataT = ${responseType},
-  PickT extends ReadonlyArray<string> | undefined = undefined,
-  Options extends ${optionsType} = ${optionsDefaultType}
->(${args}): ${returnType}
-export function ${composableName}(...args: any[]) {
-${argsExtraction}${pInit}
-  return ${wrapperCall}(${key}, ${url}, ${fetchOptions})
-}`;
+  const genericTypeParams = `<\n  DataT = ${responseType},\n  PickT extends ReadonlyArray<string> | undefined = undefined,\n  Options extends ${optionsType} = ${optionsDefaultType}\n>`;
+
+  const refParamsStr = hasParams
+    ? `params: Ref<${method.requestType}> | ComputedRef<${method.requestType}>, ${optionsArg}`
+    : '';
+
+  const refOverloads = hasParams
+    ? `\nexport function ${composableName}${genericTypeParams}(${refParamsStr}): ${returnType}\nexport function ${composableName}${genericTypeParams}(key: string, ${refParamsStr}): ${returnType}`
+    : '';
+
+  return `${description}export function ${composableName}${genericTypeParams}(${args}): ${returnType}\nexport function ${composableName}${genericTypeParams}(key: string, ${args}): ${returnType}${refOverloads}\nexport function ${composableName}(...args: any[]) {\n${argsExtraction}${pInit}\n  return ${wrapperCall}(${key}, ${url}, ${fetchOptions})\n}`;
 }
 
 /**

package/src/generators/use-fetch/templates.ts

@@ -126,7 +126,7 @@ function generateFunctionBody(method: MethodInfo, options?: GenerateOptions): st
 
   const description = method.description ? `/**\n * ${method.description}\n */\n` : '';
 
-  const pInit = hasParams ? `\n  const p = shallowRef(params)` : '';
+  const pInit = hasParams ? `\n  const p = isRef(params) ? params : shallowRef(params)` : '';
 
   return `${description}export const ${method.composableName} = <
   DataT = ${responseType},

package/src/index.ts

@@ -1,13 +1,11 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import * as p from '@clack/prompts';
-import { existsSync } from 'fs';
-import * as path from 'path';
 import { generateOpenApiFiles, generateHeyApiFiles, checkJavaInstalled } from './generate.js';
 import { generateUseFetchComposables } from './generators/use-fetch/generator.js';
 import { generateUseAsyncDataComposables } from './generators/use-async-data/generator.js';
 import { generateNuxtServerRoutes } from './generators/nuxt-server/generator.js';
-import { generateConnectors } from './generators/components/connector-generator/generator.js';
+import { generateConnectors } from './generators/connectors/generator.js';
 import {
   promptInitialInputs,
   promptInputPath,
@@ -114,7 +112,7 @@ program
           : config.generator === 'heyapi'
             ? 'heyapi'
             : config.backend;
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+
       const backend = await promptGeneratorBackend(resolvedBackend);
 
       // Check Java availability when official backend is selected
@@ -209,7 +207,6 @@ program
         const spinner = p.spinner();
         spinner.start(`Generating ${composable}...`);
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const generateOptions = { baseUrl: config.baseUrl, backend };
 
         try {
@@ -240,7 +237,6 @@ program
               break;
             case 'nuxtServer':
               if (!config.dryRun) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 await generateNuxtServerRoutes(outputPath, serverRoutePath, { enableBff, backend });
                 spinner.stop(`✓ Generated Nuxt server routes`);
               } else {
@@ -255,19 +251,6 @@ program
       }
 
       // Generate headless connectors if requested (requires useAsyncData)
-      if (generateConnectorsFlag) {
-        // Check zod is available in the user's project by probing their node_modules,
-        // not via import() which resolves from the CLI's own context (npx sandbox).
-        const zodPath = path.resolve(process.cwd(), 'node_modules', 'zod');
-        if (!existsSync(zodPath)) {
-          p.log.warn(
-            'Skipping connectors: "zod" is not installed in this project.\n' +
-            '  Run: npm install zod'
-          );
-          generateConnectorsFlag = false;
-        }
-      }
-
       if (generateConnectorsFlag) {
         const spinner = p.spinner();
         spinner.start('Generating headless UI connectors...');

package/src/module/index.ts

@@ -5,7 +5,7 @@ import { checkJavaInstalled } from '../generate.js';
 import { generateUseFetchComposables } from '../generators/use-fetch/generator.js';
 import { generateUseAsyncDataComposables } from '../generators/use-async-data/generator.js';
 import { generateNuxtServerRoutes } from '../generators/nuxt-server/generator.js';
-import { generateConnectors } from '../generators/components/connector-generator/generator.js';
+import { generateConnectors } from '../generators/connectors/generator.js';
 import { createConsoleLogger } from '../cli/logger.js';
 import type { ModuleOptions } from './types.js';
 
@@ -103,10 +103,7 @@ export default defineNuxtModule<ModuleOptions>({
       }
 
       // 3. Generate headless connectors if requested (requires useAsyncData)
-      if (
-        options.createUseAsyncDataConnectors &&
-        selectedGenerators.includes('useAsyncData')
-      ) {
+      if (options.createUseAsyncDataConnectors && selectedGenerators.includes('useAsyncData')) {
         const connectorsOutputDir = path.join(composablesOutputDir, 'connectors');
         await generateConnectors(
           {