@technicity/openapi-sdk-generator 5.5.2 → 5.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/openapi-sdk-generator",
-  "version": "5.5.2",
+  "version": "5.6.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "bin": {

package/src/generate-remix.ts

@@ -12,15 +12,24 @@ import * as prettier from "prettier";
 import del from "del";
 
 type TEnv = "browser" | "node";
+type TResult = {
+  operationId: string;
+  methodCode: string;
+  restCode: string;
+  reqBody: any;
+  reqBodySchemaName: string;
+  reqBodySchemas: string;
+  resBodyTypes: { name: string; status: string; type: string }[];
+};
 
 export async function generate(input: {
   api: OpenAPI.Document;
   doc: OpenAPI.Document;
   outdir: string;
-  env: TEnv;
+  generateBrowser: boolean;
   generateOrThrow: boolean;
 }) {
-  const { api, outdir, env, generateOrThrow } = input;
+  const { api, outdir, generateOrThrow } = input;
 
   if (api.paths == null || Object.keys(api.paths).length === 0) {
     throw new Error("No paths found.");
@@ -29,15 +38,7 @@ export async function generate(input: {
   const produces = (api as OpenAPIV2.Document).produces;
   const baseUrl = getBaseUrl(api);
 
-  let results: {
-    operationId: string;
-    methodCode: string;
-    restCode: string;
-    reqBody: any;
-    reqBodySchemaName: string;
-    reqBodySchemas: string;
-    resBodyTypes: { name: string; status: string; type: string }[];
-  }[] = [];
+  let results: TResult[] = [];
 
   // Sort
   api.paths = Object.fromEntries(
@@ -57,7 +58,7 @@ export async function generate(input: {
 
       results.push({
         operationId,
-        ...(await getCode({
+        ...(await getMethodCode({
           operationId,
           path: p,
           method,
@@ -76,19 +77,61 @@ export async function generate(input: {
 
   await fs.writeFile(
     path.join(outdir, `Sdk.ts`),
-    prettier.format(
-      `${
-        env === "browser"
-          ? ""
-          : `// TODO: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/60924
-      import { 
-        fetch,
-        Response,
-        Request,
-        HeadersInit,
-        BodyInit,
-        Headers, } from "undici";`
-      }
+    getCode({ results, baseUrl, generateOrThrow, env: "node" })
+  );
+
+  if (input.generateBrowser) {
+    await fs.writeFile(
+      path.join(outdir, `Sdk.browser.ts`),
+      getCode({ results, baseUrl, generateOrThrow, env: "browser" })
+    );
+  }
+
+  const reqBodySchemas = results.map((x) => x.reqBodySchemas);
+
+  if (reqBodySchemas.length > 0) {
+    await fs.writeFile(
+      path.join(outdir, `schemas.ts`),
+      prettier.format(reqBodySchemas.join("\n\n"), {
+        parser: "typescript",
+      })
+    );
+  }
+
+  await fs.writeFile(
+    path.join(outdir, "api.json"),
+    JSON.stringify(input.doc, null, 2)
+  );
+}
+
+function getCode({
+  results,
+  baseUrl,
+  generateOrThrow,
+  env,
+}: {
+  results: TResult[];
+  baseUrl: string | undefined;
+  generateOrThrow: boolean;
+  env: TEnv;
+}) {
+  return prettier.format(
+    `${
+      env === "browser"
+        ? ""
+        : `// TODO: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/60924
+        import {
+          fetch,
+          type RequestInit,
+          type HeadersInit,
+          type BodyInit,
+          Response,
+          Request,
+          Headers,
+          RetryAgent,
+          Agent,
+        } from "undici";`
+    }
 
       export type Interceptors = { req?: (req: Request) => Promise<Request>, res?: (req: Request, res: Response) => Promise<Response> };
       
@@ -127,10 +170,8 @@ export async function generate(input: {
                     );
                   }${
                     env === "node"
-                      ? `const ReadableStream =
-                  (global as any).ReadableStream ??
-                  require("node:stream/web").ReadableStream`
-                      : `const ReadableStream = globalThis.ReadableStream;`
+                      ? `const ReadableStream = await import("node:stream/web").then(({ReadableStream}) => ReadableStream)`
+                      : ""
                   }
                   const _reqBody =
                     req.reqBody instanceof ReadableStream
@@ -243,12 +284,17 @@ export async function generate(input: {
           req = await interceptors.req(req);
         }
 
-        let fetchOpts: Parameters<HttpClient["fetch"]>[1] | undefined;
+        let reqOpts: RequestInit = {};
+
+        (reqOpts as any).dispatcher = new RetryAgent(new Agent(), {
+          methods: ["GET", "HEAD", "OPTIONS"],
+        });
+
         if (typeof opts?.timeout === "number") {
-          fetchOpts = { signal: AbortSignal.timeout(opts.timeout) };
+          reqOpts.signal = AbortSignal.timeout(opts.timeout);
         }
     
-        let res = await this.#httpClient.fetch(req, fetchOpts);
+        let res = await this.#httpClient.fetch(req, reqOpts);
     
         if (interceptors?.res) {
           res = await interceptors.res(req, res);
@@ -345,12 +391,17 @@ export async function generate(input: {
           req = await interceptors.req(req);
         }
 
-        let fetchOpts: Parameters<HttpClient["fetch"]>[1] | undefined;
+        let reqOpts: RequestInit = {};
+
+        (reqOpts as any).dispatcher = new RetryAgent(new Agent(), {
+          methods: ["GET", "HEAD", "OPTIONS"],
+        });
+
         if (typeof opts?.timeout === "number") {
-          fetchOpts = { signal: AbortSignal.timeout(opts.timeout) };
+          reqOpts.signal = AbortSignal.timeout(opts.timeout);
         }
     
-        let res = await this.#httpClient.fetch(req, fetchOpts);
+        let res = await this.#httpClient.fetch(req, reqOpts);
     
         if (interceptors?.res) {
           res = await interceptors.res(req, res);
@@ -413,34 +464,17 @@ export async function generate(input: {
       return readable.text();
     }
     // Node
-    const consumers = require("stream/consumers");
+    const consumers = await import("node:stream/consumers");
     return consumers.text(readable);
   }
 
       ${getHttpClientCode(env)}
       `,
-      { parser: "typescript" }
-    )
-  );
-
-  const reqBodySchemas = results.map((x) => x.reqBodySchemas);
-
-  if (reqBodySchemas.length > 0) {
-    await fs.writeFile(
-      path.join(outdir, `schemas.ts`),
-      prettier.format(reqBodySchemas.join("\n\n"), {
-        parser: "typescript",
-      })
-    );
-  }
-
-  await fs.writeFile(
-    path.join(outdir, "api.json"),
-    JSON.stringify(input.doc, null, 2)
+    { parser: "typescript" }
   );
 }
 
-async function getCode(input: {
+async function getMethodCode(input: {
   operationId: string;
   path: string;
   method: string;
@@ -804,7 +838,7 @@ function getHttpClientCode(env: TEnv) {
           ? requestInfo
           : requestInfo instanceof Request
           ? getURL(requestInfo.url)
-          : getURL(requestInfo);
+          : getURL(requestInfo as string);
       const method =
         init?.method?.toUpperCase() ??
         (requestInfo instanceof Request ? requestInfo.method : "GET");

package/src/generate.ts

@@ -60,8 +60,7 @@ export const schema = {
       description: "module type for generated SDK",
     },
     variant: { enum: ["default", "remix"], default: "default" },
-    // TODO: remove this option after https://github.com/DefinitelyTyped/DefinitelyTyped/issues/60924 is resolved.
-    env: { enum: ["browser", "node"], default: "browser" },
+    generateBrowser: { type: "boolean", default: false },
     generateOrThrow: { type: "boolean", default: true },
   },
   additionalProperties: false,
@@ -115,7 +114,7 @@ export async function generate(opts) {
       api,
       outdir: path.resolve(opts.outdir),
       doc: _doc,
-      env: opts.env,
+      generateBrowser: opts.generateBrowser,
       generateOrThrow: opts.generateOrThrow,
     });
   }