@hyper-fetch/cli 7.2.6 → 7.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyper-fetch/cli",
-  "version": "7.2.6",
+  "version": "7.4.0",
   "description": "Hyper Fetch cli for code generation and utilities",
   "author": "Maciej Pyrc <maciekpyrc@gmail.com>, Kacper Skawina <kacper.skawina@gmail.com>",
   "homepage": "https://hyperfetch.bettertyped.com/",

package/src/cli/index.ts

@@ -5,6 +5,7 @@ import { select } from "@inquirer/prompts";
 import pkg from "../../package.json";
 import { generate } from "commands/generate";
 import { init } from "commands/init";
+import { handleError } from "utils/handle-error";
 
 const program = new Command();
 
@@ -38,10 +39,12 @@ const main = async () => {
           description: cmd.description(),
         })),
       });
+      await program.parseAsync([process.argv[0], process.argv[1], chosenCommand]);
+    } else {
+      await program.parseAsync(process.argv);
     }
-
-    await program.parseAsync([process.argv[0], process.argv[1], chosenCommand]);
   } catch (e) {
+    handleError(e);
     if (e instanceof Error) {
       if (e.message.includes("User force closed the prompt")) {
         process.exit(0);

package/src/codegen/openapi/generator.ts

@@ -117,20 +117,34 @@ export class OpenapiRequestGenerator {
       let currentLevel = schemaTree;
       // eslint-disable-next-line no-restricted-syntax
       for (const segment of segments) {
-        const key = segment.startsWith(":") ? `$${segment.slice(1)}` : segment;
+        let key: string;
+        if (segment.startsWith(":")) {
+          // Parameter segment - keep the $ prefix
+          key = `$${segment.slice(1)}`;
+        } else if (segment.includes("-")) {
+          // Convert kebab-case to camelCase for path segments
+          key = segment.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
+        } else {
+          key = segment;
+        }
+
         if (!currentLevel[key]) {
           currentLevel[key] = {};
         }
         currentLevel = currentLevel[key];
       }
-      currentLevel[method.toLowerCase()] = requestInstanceType;
+      // Prefix method names with $
+      currentLevel[`$${method.toLowerCase()}`] = requestInstanceType;
     });
 
     const sdkSchema = `export type SdkSchema<Client extends ClientInstance> = {\n${formatSchema(schemaTree)}\n}`;
 
     const createSdkFn = `
-export const createSdk = <Client extends ClientInstance>(client: Client) => {
-  return coreCreateSdk<Client, SdkSchema<Client>>(client);
+
+export type { Components };
+
+export const createSdk = <Client extends ClientInstance>(client: Client, options?: Parameters<typeof coreCreateSdk>[1] | undefined) => {
+  return coreCreateSdk<Client, SdkSchema<Client>>(client, options);
 };
 `;
 
@@ -138,7 +152,7 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
   };
 
   static generateRequestInstanceType(
-    { id, path: endpoint }: { id: string; path: string },
+    { id, path: endpoint, queryParamsRequired }: { id: string; path: string; queryParamsRequired?: boolean },
     types: Record<string, string>,
   ) {
     const Response = types[`${createTypeBaseName(id)}ResponseType`]
@@ -150,11 +164,18 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
       ? `${createTypeBaseName(id)}QueryParams`
       : undefined;
 
-    return `Request<${Response}, ${Payload}, ${QueryParams}, ${LocalError}, "${endpoint}", Client>`;
+    const QueryParamsGeneric = QueryParams && !queryParamsRequired ? `${QueryParams} | undefined` : QueryParams;
+
+    return `Request<${Response}, ${Payload}, ${QueryParamsGeneric}, ${LocalError}, "${endpoint}", Client>`;
   }
 
   static generateHyperFetchRequest(
-    { id, path: relPath, method }: { id: string; path: string; method: string },
+    {
+      id,
+      path: relPath,
+      method,
+      queryParamsRequired,
+    }: { id: string; path: string; method: string; queryParamsRequired?: boolean },
     types: Record<string, string>,
   ) {
     const Response = types[`${createTypeBaseName(id)}ResponseType`]
@@ -186,7 +207,8 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
       addToGenericType("error", LocalError);
     }
     if (QueryParams) {
-      addToGenericType("query", QueryParams);
+      const key = !queryParamsRequired ? "queryParams?" : "queryParams";
+      addToGenericType(key, QueryParams);
     }
 
     if (genericType) {
@@ -265,6 +287,11 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
 
     const responseType = !lodash.isEmpty(responseTypePaths) ? responseTypePaths.join(" | ") : "any";
     const errorType = !lodash.isEmpty(errorTypePaths) ? errorTypePaths.join(" | ") : "undefined";
+    const queryParamsRequired = Array.isArray(operation.parameters)
+      ? operation.parameters.some((p) => {
+          return "in" in p && p.in === "query" && p.required === true;
+        })
+      : false;
 
     return {
       id: normalizedOperationId,
@@ -275,6 +302,7 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
       responseType,
       path: adjustPathParamsFormat(relPath),
       method: method ? method.toUpperCase() : HttpMethod.GET,
+      queryParamsRequired,
     };
   }
 

package/src/utils/handle-error.ts

@@ -7,7 +7,7 @@ export function handleError(error: unknown) {
   logger.break();
   logger.error(`Something went wrong. Please check the error below for more details.`);
   logger.error(`If the problem persists, please open an issue on GitHub.`);
-  logger.error("");
+  logger.break();
   if (typeof error === "string") {
     logger.error(error);
     logger.break();
@@ -30,6 +30,8 @@ export function handleError(error: unknown) {
     process.exit(1);
   }
 
+  logger.error(JSON.stringify({ error }));
+
   logger.break();
   process.exit(1);
 }