@hyper-fetch/cli 7.2.4 → 7.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyper-fetch/cli",
-  "version": "7.2.4",
+  "version": "7.2.6",
   "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/",
@@ -10,8 +10,8 @@
   "types": "dist/index.d.ts",
   "source": "src/index.ts",
   "cli": "src/cli/index.ts",
-  "climain": "dist/cli.cjs.js",
-  "bin": "dist/cli.cjs.js",
+  "climain": "dist/index.js",
+  "bin": "dist/index.js",
   "scripts": {
     "clean": "npx rimraf dist",
     "test": "node --experimental-vm-modules ../../node_modules/jest/bin/jest --watchAll --maxWorkers=3 --forceExit",
@@ -40,7 +40,7 @@
     "url": "https://github.com/BetterTyped/hyper-fetch/issues"
   },
   "dependencies": {
-    "@anttiviljami/dtsgenerator": "^3.12.2",
+    "@anttiviljami/dtsgenerator": "^3.20.0",
     "@apidevtools/json-schema-ref-parser": "^11.9.3",
     "@hyper-fetch/core": "*",
     "@inquirer/prompts": "^7.6.0",

package/src/codegen/openapi/generator.ts

@@ -1,10 +1,10 @@
 import DtsGenerator, { ExportedType } from "@anttiviljami/dtsgenerator/dist/core/dtsGenerator";
 import RefParser from "@apidevtools/json-schema-ref-parser";
 import { parseSchema } from "@anttiviljami/dtsgenerator/dist/core/type";
-import { find, chain, isEmpty } from "lodash";
+import * as lodash from "lodash";
 import * as prettier from "prettier";
 import * as fs from "fs-extra";
-import * as path from "path";
+import * as path from "node:path";
 import { createClient } from "@hyper-fetch/core";
 
 import { Document, Operation, GeneratedTypes } from "./openapi.types";
@@ -46,7 +46,7 @@ export class OpenapiRequestGenerator {
     const defaultFileName = "openapi.client";
     const { schemaTypes, generatedTypes, sdkSchema, createSdkFn } = await this.generateRequestsFromSchema();
     const contents = [
-      `import { createSdk as coreCreateSdk, ClientInstance, RequestInstance } from "@hyper-fetch/core";`,
+      `import { createSdk as coreCreateSdk, ClientInstance, Request } from "@hyper-fetch/core";`,
       "\n\n",
       schemaTypes,
       "\n\n",
@@ -138,7 +138,7 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
   };
 
   static generateRequestInstanceType(
-    { id, path: relPath }: { id: string; path: string },
+    { id, path: endpoint }: { id: string; path: string },
     types: Record<string, string>,
   ) {
     const Response = types[`${createTypeBaseName(id)}ResponseType`]
@@ -150,25 +150,7 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
       ? `${createTypeBaseName(id)}QueryParams`
       : undefined;
 
-    const genericTypes: string[] = [];
-
-    genericTypes.push(`client: Client`);
-    genericTypes.push(`endpoint: "${relPath}"`);
-
-    if (Response) {
-      genericTypes.push(`response: ${Response}`);
-    }
-    if (Payload) {
-      genericTypes.push(`payload: ${Payload}`);
-    }
-    if (LocalError) {
-      genericTypes.push(`error: ${LocalError}`);
-    }
-    if (QueryParams) {
-      genericTypes.push(`queryParams: ${QueryParams}`);
-    }
-
-    return `RequestInstance<{ ${genericTypes.join(", ")} }>`;
+    return `Request<${Response}, ${Payload}, ${QueryParams}, ${LocalError}, "${endpoint}", Client>`;
   }
 
   static generateHyperFetchRequest(
@@ -257,18 +239,22 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
   ) {
     const { operationId, method, path: relPath } = operation;
     const normalizedOperationId = normalizeOperationId(operationId);
-    const pathParametersType = find(exportTypes, {
+    const pathParametersType = lodash.find(exportTypes, {
       schemaRef: `#/paths/${normalizedOperationId}/pathParameters`,
     })?.path;
-    const queryParametersType = find(exportTypes, {
+    const queryParametersType = lodash.find(exportTypes, {
       schemaRef: `#/paths/${normalizedOperationId}/queryParameters`,
     })?.path;
-    const requestBodyType = find(exportTypes, { schemaRef: `#/paths/${normalizedOperationId}/requestBody` })?.path;
-    const responseTypePaths = chain(exportTypes)
+    const requestBodyType = lodash.find(exportTypes, {
+      schemaRef: `#/paths/${normalizedOperationId}/requestBody`,
+    })?.path;
+    const responseTypePaths = lodash
+      .chain(exportTypes)
       .filter(({ schemaRef }) => schemaRef.startsWith(`#/paths/${normalizedOperationId}/responses/2`))
       .map(({ path: responsePath }) => responsePath)
       .value();
-    const errorTypePaths = chain(exportTypes)
+    const errorTypePaths = lodash
+      .chain(exportTypes)
       .filter(
         ({ schemaRef }) =>
           schemaRef.startsWith(`#/paths/${normalizedOperationId}/responses/4`) ||
@@ -277,8 +263,8 @@ export const createSdk = <Client extends ClientInstance>(client: Client) => {
       .map(({ path: errorPath }) => errorPath)
       .value();
 
-    const responseType = !isEmpty(responseTypePaths) ? responseTypePaths.join(" | ") : "any";
-    const errorType = !isEmpty(errorTypePaths) ? errorTypePaths.join(" | ") : "undefined";
+    const responseType = !lodash.isEmpty(responseTypePaths) ? responseTypePaths.join(" | ") : "any";
+    const errorType = !lodash.isEmpty(errorTypePaths) ? errorTypePaths.join(" | ") : "undefined";
 
     return {
       id: normalizedOperationId,

package/src/commands/generate.ts

@@ -1,8 +1,8 @@
 /* eslint-disable no-param-reassign */
 import { Command } from "commander";
 import { z } from "zod";
-import path from "path";
-import fs from "fs-extra";
+import * as path from "node:path";
+import * as fs from "fs-extra";
 import { input, select, confirm } from "@inquirer/prompts";
 
 import { handleError } from "utils/handle-error";

package/src/commands/init.ts

@@ -1,8 +1,8 @@
 import { Command } from "commander";
 import { input, select } from "@inquirer/prompts";
 import { z } from "zod";
-import path from "path";
-import { existsSync, mkdir, readFileSync, writeFile } from "fs-extra";
+import * as path from "node:path";
+import * as fs from "fs-extra";
 
 import { handleError } from "../utils/handle-error";
 import { spinner } from "../utils/spinner";
@@ -103,16 +103,16 @@ export const init = new Command()
         {
           name: `Initialize API directory at ${relativePath}`,
           action: async () => {
-            if (!existsSync(fullPath)) {
-              await mkdir(fullPath, { recursive: true });
+            if (!fs.existsSync(fullPath)) {
+              await fs.mkdir(fullPath, { recursive: true });
             }
           },
         },
         {
           name: "Setup configuration",
           action: async (currentConfig) => {
-            if (existsSync(configPath)) {
-              const existingConfig = JSON.parse(readFileSync(configPath, "utf8"));
+            if (fs.existsSync(configPath)) {
+              const existingConfig = JSON.parse(fs.readFileSync(configPath, "utf8"));
               const { success, error, data } = configSchema.omit({ resolvedPaths: true }).safeParse({
                 ...defaultConfig,
                 ...existingConfig,
@@ -163,7 +163,7 @@ export const init = new Command()
 
             configSchema.omit({ resolvedPaths: true }).parse(finalConfig);
 
-            await writeFile(configPath, JSON.stringify(finalConfig, null, 2));
+            await fs.writeFile(configPath, JSON.stringify(finalConfig, null, 2));
           },
         },
       ];

package/src/config/get-config.ts

@@ -1,5 +1,5 @@
-import path from "path";
-import fs from "fs-extra";
+import * as path from "node:path";
+import * as fs from "fs-extra";
 import { loadConfig } from "tsconfig-paths";
 
 import { highlighter } from "utils/highlighter";

package/src/preflights/preflight-add.ts

@@ -1,5 +1,5 @@
-import path from "path";
-import fs from "fs-extra";
+import * as path from "node:path";
+import * as fs from "fs-extra";
 import { z } from "zod";
 
 import { addOptionsSchema } from "commands/add";

package/src/preflights/preflight-generate.ts

@@ -1,5 +1,5 @@
-import path from "path";
-import fs from "fs-extra";
+import * as path from "node:path";
+import * as fs from "fs-extra";
 import { z } from "zod";
 
 import { generateOptionsSchema } from "commands/generate";