@1szx1/vite-plugin-swagger2ts 1.3.10 → 1.3.11

package/dist/index.cjs

@@ -14,6 +14,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const fetch__default = /*#__PURE__*/_interopDefaultCompat(fetch);
 const chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 
+const pluginName = "vite-plugin-swagger2ts";
 function loadConfig() {
   return unconfig.loadConfig({
     sources: [
@@ -231,7 +232,9 @@ async function loadSwaggerSource(options) {
       else
         throw new Error(JSON.stringify(docs));
     }
-    return generateDocs(docs, { docsName, baseUrl: docs.basePath ?? "", formatSchema });
+    const res = generateDocs(docs, { docsName, baseUrl: docs.basePath ?? "", formatSchema });
+    console.log(chalk__default.green(`[${pluginName}]: ${docsName} success`));
+    return res;
   }
   async function genResourcesCode(source) {
     const { url, name } = source;
@@ -240,45 +243,52 @@ async function loadSwaggerSource(options) {
       const code2 = await genInterface(docs, name);
       return code2;
     } catch (error) {
-      console.log(chalk__default.yellow(`[vite-plugin-swagger2ts]: ${name} error;`) + error.message);
+      console.log(chalk__default.yellow(`[${pluginName}]: ${name} error;`) + error.message);
       return "";
     }
   }
   async function getSources() {
-    let sources2 = void 0;
-    let interfaces2 = [];
+    const sources2 = [];
+    const interfaces2 = [];
     if (typeof swaggerUrl === "string") {
       const resources = await fetchUrl(`${swaggerUrl}/swagger-resources;`).catch((error) => error);
       if (Array.isArray(resources)) {
-        sources2 = resources;
-        interfaces2.push(...await Promise.all(sources2.map(genResourcesCode)));
+        sources2.push(...resources);
+        interfaces2.push(...await Promise.all(resources.map(genResourcesCode)));
       } else {
-        console.log(chalk__default.yellow(`[vite-plugin-swagger2ts]: resources error`) + JSON.stringify(resources));
+        console.log(chalk__default.yellow(`[${pluginName}]: resources error`) + JSON.stringify(resources));
       }
     }
     if (typeof jsonUrl === "string") {
       const swaggerJson = await fetchUrl(jsonUrl);
-      if (!swaggerJson.info)
-        return console.log(chalk__default.yellow(`[vite-plugin-swagger2ts]: jsonUrl error;`) + JSON.stringify(swaggerJson));
-      interfaces2.push(await genInterface(swaggerJson, getApiName(swaggerJson)));
+      if (swaggerJson.info) {
+        const name = getApiName(swaggerJson);
+        interfaces2.push(await genInterface(swaggerJson, name));
+        sources2.push({ name });
+      } else {
+        console.log(chalk__default.yellow(`[${pluginName}]: jsonUrl error;`) + JSON.stringify(swaggerJson));
+      }
     }
     if (typeof jsonPath === "string") {
       const _jsonPath = path.resolve(process.cwd(), jsonPath);
       const swaggerJson = JSON.parse(fs.readFileSync(_jsonPath, { encoding: "utf-8" }));
-      interfaces2.push(await genInterface(swaggerJson, getApiName(swaggerJson)));
+      const name = getApiName(swaggerJson);
+      interfaces2.push(await genInterface(swaggerJson, name));
+      sources2.push({ name });
     }
     return { sources: sources2, interfaces: interfaces2 };
   }
-  const { sources, interfaces } = await getSources() || {};
-  if (!interfaces?.length)
+  const { sources, interfaces } = await getSources();
+  if (!interfaces.length)
     return;
   const prefix = `/* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
-// Generated by vite-plugin-swagger2ts`;
+// Generated by ${pluginName}
+`;
   const code = interfaces.reduce((a, b) => a + b, "");
-  const suffix = sources ? interfaces.reduce((a, b, index) => {
+  const suffix = sources.length ? interfaces.reduce((a, b, index) => {
     if (b) {
       a += !a ? `export type ${getPathsName("_Intersection")} = ` : `&`;
       a += `${getPathsName(sources[index].name)}`;
@@ -289,11 +299,12 @@ async function loadSwaggerSource(options) {
   fs.writeFileSync(outputFile, prefix + code + suffix);
 }
 function swagger2TsPlugin(userOptions) {
-  resolveOptions(userOptions).then((options) => {
-    Promise.all(options.map(loadSwaggerSource));
-  });
+  (async () => {
+    const options = await resolveOptions(userOptions);
+    await Promise.all(options.map(loadSwaggerSource));
+  })();
   return {
-    name: "vite-plugin-swagger2ts",
+    name: `${pluginName}`,
     enforce: "pre",
     apply: "serve"
   };

package/dist/index.mjs

@@ -5,6 +5,7 @@ import fetch from 'cross-fetch';
 import { loadConfig as loadConfig$1 } from 'unconfig';
 import chalk from 'chalk';
 
+const pluginName = "vite-plugin-swagger2ts";
 function loadConfig() {
   return loadConfig$1({
     sources: [
@@ -222,7 +223,9 @@ async function loadSwaggerSource(options) {
       else
         throw new Error(JSON.stringify(docs));
     }
-    return generateDocs(docs, { docsName, baseUrl: docs.basePath ?? "", formatSchema });
+    const res = generateDocs(docs, { docsName, baseUrl: docs.basePath ?? "", formatSchema });
+    console.log(chalk.green(`[${pluginName}]: ${docsName} success`));
+    return res;
   }
   async function genResourcesCode(source) {
     const { url, name } = source;
@@ -231,45 +234,52 @@ async function loadSwaggerSource(options) {
       const code2 = await genInterface(docs, name);
       return code2;
     } catch (error) {
-      console.log(chalk.yellow(`[vite-plugin-swagger2ts]: ${name} error;`) + error.message);
+      console.log(chalk.yellow(`[${pluginName}]: ${name} error;`) + error.message);
       return "";
     }
   }
   async function getSources() {
-    let sources2 = void 0;
-    let interfaces2 = [];
+    const sources2 = [];
+    const interfaces2 = [];
     if (typeof swaggerUrl === "string") {
       const resources = await fetchUrl(`${swaggerUrl}/swagger-resources;`).catch((error) => error);
       if (Array.isArray(resources)) {
-        sources2 = resources;
-        interfaces2.push(...await Promise.all(sources2.map(genResourcesCode)));
+        sources2.push(...resources);
+        interfaces2.push(...await Promise.all(resources.map(genResourcesCode)));
       } else {
-        console.log(chalk.yellow(`[vite-plugin-swagger2ts]: resources error`) + JSON.stringify(resources));
+        console.log(chalk.yellow(`[${pluginName}]: resources error`) + JSON.stringify(resources));
       }
     }
     if (typeof jsonUrl === "string") {
       const swaggerJson = await fetchUrl(jsonUrl);
-      if (!swaggerJson.info)
-        return console.log(chalk.yellow(`[vite-plugin-swagger2ts]: jsonUrl error;`) + JSON.stringify(swaggerJson));
-      interfaces2.push(await genInterface(swaggerJson, getApiName(swaggerJson)));
+      if (swaggerJson.info) {
+        const name = getApiName(swaggerJson);
+        interfaces2.push(await genInterface(swaggerJson, name));
+        sources2.push({ name });
+      } else {
+        console.log(chalk.yellow(`[${pluginName}]: jsonUrl error;`) + JSON.stringify(swaggerJson));
+      }
     }
     if (typeof jsonPath === "string") {
       const _jsonPath = resolve(process.cwd(), jsonPath);
       const swaggerJson = JSON.parse(readFileSync(_jsonPath, { encoding: "utf-8" }));
-      interfaces2.push(await genInterface(swaggerJson, getApiName(swaggerJson)));
+      const name = getApiName(swaggerJson);
+      interfaces2.push(await genInterface(swaggerJson, name));
+      sources2.push({ name });
     }
     return { sources: sources2, interfaces: interfaces2 };
   }
-  const { sources, interfaces } = await getSources() || {};
-  if (!interfaces?.length)
+  const { sources, interfaces } = await getSources();
+  if (!interfaces.length)
     return;
   const prefix = `/* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
-// Generated by vite-plugin-swagger2ts`;
+// Generated by ${pluginName}
+`;
   const code = interfaces.reduce((a, b) => a + b, "");
-  const suffix = sources ? interfaces.reduce((a, b, index) => {
+  const suffix = sources.length ? interfaces.reduce((a, b, index) => {
     if (b) {
       a += !a ? `export type ${getPathsName("_Intersection")} = ` : `&`;
       a += `${getPathsName(sources[index].name)}`;
@@ -280,11 +290,12 @@ async function loadSwaggerSource(options) {
   writeFileSync(outputFile, prefix + code + suffix);
 }
 function swagger2TsPlugin(userOptions) {
-  resolveOptions(userOptions).then((options) => {
-    Promise.all(options.map(loadSwaggerSource));
-  });
+  (async () => {
+    const options = await resolveOptions(userOptions);
+    await Promise.all(options.map(loadSwaggerSource));
+  })();
   return {
-    name: "vite-plugin-swagger2ts",
+    name: `${pluginName}`,
     enforce: "pre",
     apply: "serve"
   };

package/package.json

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