@1szx1/vite-plugin-swagger2ts 1.1.5 → 1.1.7

package/dist/adapters.d.ts

@@ -12,12 +12,11 @@ declare function axiosAdapter<T>(httpInstance: AxiosInstance): {
     }) | undefined) => Promise<T[U][M]["response" & keyof T[U][M]]>;
 };
 
-declare function LuchAdapter<T extends Record<string, any>, C extends HttpRequestConfig['custom'] = HttpRequestConfig['custom']>(httpInstance: Request__default): {
-    request: <U extends keyof T, M extends string & keyof T[U]>(url: U & string, method: M, param?: Get<T[U][M]["param" & keyof T[U][M]], M extends "get" ? "query" : "body"> | undefined, config?: (HttpRequestConfig<Request.HttpTask> & {
+declare function LuchAdapter<T extends Record<string, any>, C extends HttpRequestConfig = HttpRequestConfig>(httpInstance: Request__default): {
+    request: <U extends keyof T, M extends string & keyof T[U]>(url: U & string, method: M, param?: Get<T[U][M]["param" & keyof T[U][M]], M extends "get" ? "query" : "body"> | undefined, config?: (HttpRequestConfig<Request.HttpTask> & C & {
         data?: Get<T[U][M]["param" & keyof T[U][M]], "body"> | undefined;
         params?: Get<T[U][M]["param" & keyof T[U][M]], "query"> | undefined;
         path?: Get<T[U][M]["param" & keyof T[U][M]], "path"> | undefined;
-        custom?: C | undefined;
     }) | undefined) => Promise<T[U][M]["response" & keyof T[U][M]]>;
     upload: <U_1 extends { [K in keyof T]: T[K] extends {
         post: any;

package/dist/index.cjs

@@ -233,7 +233,7 @@ function swagger2TsPlugin(userOptions) {
           if (docs.swagger)
             openapiDocs = await convertObjPromise(openapiDocs);
           else
-            return "";
+            throw new Error(JSON.stringify(docs));
         }
         const apistrings = generateDocs(openapiDocs, { docsName, baseUrl: docs.basePath ?? "", formatSchema });
         return apistrings;
@@ -242,21 +242,21 @@ function swagger2TsPlugin(userOptions) {
         return "";
       }
     }
-    const sources = await fetchUrl(`${swaggerUrl}/swagger-resources`).catch((error) => {
-      console.log(`%c[vite-plugin-swagger2ts]: doc error`, "color: #ff0000;", error);
-      return [];
-    });
-    const code = (await Promise.all(sources.map(genCode))).reduce((a, b, index, list) => {
-      let res = a + b;
-      if (index === list.length - 1) {
-        const suffix = `export type ${getPathsName("_Intersection")} = ${sources.map(({ name }) => getPathsName(name)).join("&")}
+    const sources = await fetchUrl(`${swaggerUrl}/swagger-resources`).catch((error) => error);
+    if (!Array.isArray(sources))
+      return console.log(`%c[vite-plugin-swagger2ts]: doc error`, "color: #ff0000;", JSON.stringify(sources));
+    const interfaceList = await Promise.all(sources.map(genCode));
+    const code = interfaceList.reduce((a, b) => a + b, "");
+    const suffix = interfaceList.reduce((a, b, index) => {
+      if (b) {
+        a += !a ? `export type ${getPathsName("_Intersection")} = ` : `&
 `;
-        res += suffix;
+        a += `${getPathsName(sources[index].name)}`;
       }
-      return res;
+      return a;
     }, "");
     const outputFile = path.resolve(process.cwd(), output);
-    fs.writeFileSync(outputFile, code);
+    fs.writeFileSync(outputFile, code + suffix);
   }
   loadSwaggerSource();
   return {

package/dist/index.mjs

@@ -225,7 +225,7 @@ function swagger2TsPlugin(userOptions) {
           if (docs.swagger)
             openapiDocs = await convertObjPromise(openapiDocs);
           else
-            return "";
+            throw new Error(JSON.stringify(docs));
         }
         const apistrings = generateDocs(openapiDocs, { docsName, baseUrl: docs.basePath ?? "", formatSchema });
         return apistrings;
@@ -234,21 +234,21 @@ function swagger2TsPlugin(userOptions) {
         return "";
       }
     }
-    const sources = await fetchUrl(`${swaggerUrl}/swagger-resources`).catch((error) => {
-      console.log(`%c[vite-plugin-swagger2ts]: doc error`, "color: #ff0000;", error);
-      return [];
-    });
-    const code = (await Promise.all(sources.map(genCode))).reduce((a, b, index, list) => {
-      let res = a + b;
-      if (index === list.length - 1) {
-        const suffix = `export type ${getPathsName("_Intersection")} = ${sources.map(({ name }) => getPathsName(name)).join("&")}
+    const sources = await fetchUrl(`${swaggerUrl}/swagger-resources`).catch((error) => error);
+    if (!Array.isArray(sources))
+      return console.log(`%c[vite-plugin-swagger2ts]: doc error`, "color: #ff0000;", JSON.stringify(sources));
+    const interfaceList = await Promise.all(sources.map(genCode));
+    const code = interfaceList.reduce((a, b) => a + b, "");
+    const suffix = interfaceList.reduce((a, b, index) => {
+      if (b) {
+        a += !a ? `export type ${getPathsName("_Intersection")} = ` : `&
 `;
-        res += suffix;
+        a += `${getPathsName(sources[index].name)}`;
       }
-      return res;
+      return a;
     }, "");
     const outputFile = resolve(process.cwd(), output);
-    writeFileSync(outputFile, code);
+    writeFileSync(outputFile, code + suffix);
   }
   loadSwaggerSource();
   return {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@1szx1/vite-plugin-swagger2ts",
     "description": "forked from https://github.com/morelearn1990/vite-plugin-swagger2ts",
-    "version": "1.1.5",
+    "version": "1.1.7",
     "license": "MIT",
     "author": "1SZX1 <2414126198@qq.com>",
     "repository": {