@1szx1/vite-plugin-swagger2ts 1.3.12 → 1.3.14

package/dist/bin.cjs

@@ -4,8 +4,9 @@ const index = require('./index.cjs');
 require('fs');
 require('path');
 require('swagger2openapi');
+require('chalk');
+require('prettier');
 require('cross-fetch');
 require('unconfig');
-require('chalk');
 
 index.default();

package/dist/bin.mjs

@@ -2,8 +2,9 @@ import swagger2TsPlugin from './index.mjs';
 import 'fs';
 import 'path';
 import 'swagger2openapi';
+import 'chalk';
+import 'prettier';
 import 'cross-fetch';
 import 'unconfig';
-import 'chalk';
 
 swagger2TsPlugin();

package/dist/index.cjs

@@ -5,14 +5,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const fs = require('fs');
 const path = require('path');
 const swagger2openapi = require('swagger2openapi');
+const chalk = require('chalk');
+const prettier = require('prettier');
 const fetch = require('cross-fetch');
 const unconfig = require('unconfig');
-const chalk = require('chalk');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const fetch__default = /*#__PURE__*/_interopDefaultCompat(fetch);
 const chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
+const fetch__default = /*#__PURE__*/_interopDefaultCompat(fetch);
 
 const pluginName = "vite-plugin-swagger2ts";
 const CODE_PREFIX = `/* eslint-disable */
@@ -123,7 +124,7 @@ function generateDocs(input, { docsName, baseUrl, formatSchema }) {
       return jsDoc({}, { key: method, result: `{${paramString ? `
 param:{${paramString}}` : ""}${responseString}}` });
     }).join("");
-    return jsDoc({}, { key: `'${baseUrl}${endPoint}'`, result: `{${result}}` });
+    return jsDoc({}, { key: `${baseUrl}${endPoint}`, result: `{${result}}` });
   }).join("");
   const typeString = input.components?.schemas ? Object.entries(input.components.schemas).map(([name, schema]) => {
     if (typeof formatSchema == "function") {
@@ -207,7 +208,7 @@ function generatorResponseBodyType(schemas, docsName) {
   return jsDoc({ description }, { key: "response", result });
 }
 function jsDoc({ description, title, format, example, default: default1 }, { key, result, isRoot, isExport, isRequired }) {
-  if (!/(^\[.+\]$)|(^[^\[\]]*$)/.test(key))
+  if (!(isRoot || isExport) && !/^[^'"]*$/.test(key))
     key = `'${key}'`;
   const jsDoc2 = `
 /**
@@ -229,7 +230,8 @@ function generatorMethodType(intersection) {
     return `export type ${toPascalCase(method)}${toPascalCase(key)}<T extends ${paths}>> = ${intersection}[T]['${method}']['param']['${key}'];`;
   };
   return METHODS.reduce((total, method) => {
-    const responseCode = `export type ${toPascalCase(method)}${toPascalCase("response")}<T extends keyof ${intersection}> = ${intersection}[T]['${method}']['response'];`;
+    const responseCode = `// ${method}
+export type ${toPascalCase(method)}${toPascalCase("response")}<T extends keyof ${intersection}> = ${intersection}[T]['${method}']['response'];`;
     const code = paramKeys.reduce((total1, key) => `${total1}
 ${genTypeCode(method, key)}`, responseCode);
     return `${total}${total && `
@@ -313,10 +315,10 @@ async function loadSwaggerSource(options) {
     return a;
   }, "");
   const outputFile = path.resolve(process.cwd(), output);
-  fs.writeFileSync(outputFile, CODE_PREFIX + code + suffix);
+  fs.writeFileSync(outputFile, await prettier.format(CODE_PREFIX + code + suffix, { parser: "typescript" }));
   return { sources, interfaces };
 }
-function loadGlobTypes({ glob, output }) {
+async function loadGlobTypes({ glob, output }) {
   if (!glob)
     return;
   const outputFile = path.resolve(process.cwd(), glob.output || "auto-types.d.ts");
@@ -336,13 +338,13 @@ declare global {
     ${generatorMethodType(intersection)}
   }
 }`;
-  fs.writeFileSync(outputFile, code);
+  fs.writeFileSync(outputFile, await prettier.format(code, { parser: "typescript" }));
 }
 function swagger2TsPlugin(userOptions) {
   (async () => {
     const options = await resolveOptions(userOptions);
     await Promise.all(options.map(loadSwaggerSource));
-    options.forEach(loadGlobTypes);
+    await Promise.all(options.map(loadGlobTypes));
   })();
   return {
     name: `${pluginName}`,

package/dist/index.mjs

@@ -1,9 +1,10 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve, relative } from 'path';
 import { convertObj } from 'swagger2openapi';
+import chalk from 'chalk';
+import { format } from 'prettier';
 import fetch from 'cross-fetch';
 import { loadConfig as loadConfig$1 } from 'unconfig';
-import chalk from 'chalk';
 
 const pluginName = "vite-plugin-swagger2ts";
 const CODE_PREFIX = `/* eslint-disable */
@@ -114,7 +115,7 @@ function generateDocs(input, { docsName, baseUrl, formatSchema }) {
       return jsDoc({}, { key: method, result: `{${paramString ? `
 param:{${paramString}}` : ""}${responseString}}` });
     }).join("");
-    return jsDoc({}, { key: `'${baseUrl}${endPoint}'`, result: `{${result}}` });
+    return jsDoc({}, { key: `${baseUrl}${endPoint}`, result: `{${result}}` });
   }).join("");
   const typeString = input.components?.schemas ? Object.entries(input.components.schemas).map(([name, schema]) => {
     if (typeof formatSchema == "function") {
@@ -198,7 +199,7 @@ function generatorResponseBodyType(schemas, docsName) {
   return jsDoc({ description }, { key: "response", result });
 }
 function jsDoc({ description, title, format, example, default: default1 }, { key, result, isRoot, isExport, isRequired }) {
-  if (!/(^\[.+\]$)|(^[^\[\]]*$)/.test(key))
+  if (!(isRoot || isExport) && !/^[^'"]*$/.test(key))
     key = `'${key}'`;
   const jsDoc2 = `
 /**
@@ -220,7 +221,8 @@ function generatorMethodType(intersection) {
     return `export type ${toPascalCase(method)}${toPascalCase(key)}<T extends ${paths}>> = ${intersection}[T]['${method}']['param']['${key}'];`;
   };
   return METHODS.reduce((total, method) => {
-    const responseCode = `export type ${toPascalCase(method)}${toPascalCase("response")}<T extends keyof ${intersection}> = ${intersection}[T]['${method}']['response'];`;
+    const responseCode = `// ${method}
+export type ${toPascalCase(method)}${toPascalCase("response")}<T extends keyof ${intersection}> = ${intersection}[T]['${method}']['response'];`;
     const code = paramKeys.reduce((total1, key) => `${total1}
 ${genTypeCode(method, key)}`, responseCode);
     return `${total}${total && `
@@ -304,10 +306,10 @@ async function loadSwaggerSource(options) {
     return a;
   }, "");
   const outputFile = resolve(process.cwd(), output);
-  writeFileSync(outputFile, CODE_PREFIX + code + suffix);
+  writeFileSync(outputFile, await format(CODE_PREFIX + code + suffix, { parser: "typescript" }));
   return { sources, interfaces };
 }
-function loadGlobTypes({ glob, output }) {
+async function loadGlobTypes({ glob, output }) {
   if (!glob)
     return;
   const outputFile = resolve(process.cwd(), glob.output || "auto-types.d.ts");
@@ -327,13 +329,13 @@ declare global {
     ${generatorMethodType(intersection)}
   }
 }`;
-  writeFileSync(outputFile, code);
+  writeFileSync(outputFile, await format(code, { parser: "typescript" }));
 }
 function swagger2TsPlugin(userOptions) {
   (async () => {
     const options = await resolveOptions(userOptions);
     await Promise.all(options.map(loadSwaggerSource));
-    options.forEach(loadGlobTypes);
+    await Promise.all(options.map(loadGlobTypes));
   })();
   return {
     name: `${pluginName}`,

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.12",
+    "version": "1.3.14",
     "license": "MIT",
     "author": "1SZX1 <2414126198@qq.com>",
     "repository": {
@@ -60,6 +60,7 @@
         "cross-fetch": "^3.1.5",
         "luch-request": "^3.1.0",
         "openapi3-ts": "^2.0.2",
+        "prettier": "^3.2.5",
         "swagger2openapi": "^7.0.8",
         "unconfig": "^0.3.9"
     },