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

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,16 +5,23 @@ 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 */
+/* prettier-ignore */
+// @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
+// Generated by ${pluginName}
+`;
 function loadConfig() {
   return unconfig.loadConfig({
     sources: [
@@ -36,7 +43,7 @@ async function resolveOptions(userOptions) {
     const { output } = item;
     const root = process.cwd();
     const outputFile = output ? output?.endsWith(".ts") ? output : output + ".ts" : "./src/swagger.ts";
-    return Object.assign({ output: path.resolve(root, outputFile) }, item);
+    return { ...item, output: path.resolve(root, outputFile) };
   });
 }
 async function fetchUrl(url) {
@@ -76,6 +83,7 @@ function getRefName($ref, prefix = "") {
   return getSchemaName(prefix) + getSchemaName($ref || "");
 }
 
+const METHODS = ["get", "put", "post", "delete", "options", "head", "patch", "trace"];
 function generateDocs(input, { docsName, baseUrl, formatSchema }) {
   function getRefObject(ref) {
     return ref.split("/").slice(1).reduce((obj, item) => {
@@ -86,7 +94,7 @@ function generateDocs(input, { docsName, baseUrl, formatSchema }) {
     const pathValue = value;
     const parametersExtended = pathValue.parameters;
     const result = Object.entries(pathValue).map(([method, options]) => {
-      if (!["get", "put", "post", "delete", "options", "head", "patch", "trace"].includes(method)) {
+      if (!METHODS.includes(method)) {
         return;
       }
       let allParameters = [...parametersExtended || [], ...options.parameters || []].map((item) => {
@@ -215,6 +223,22 @@ ${title ? ` * @title ${title}
 ` : `${key}${isRequired === false ? "?" : ""}: ${result};
 `}`;
 }
+function generatorMethodType(intersection) {
+  const paramKeys = ["body", "query", "path"];
+  const genTypeCode = (method, key) => {
+    const paths = `keyof FilterOptional<${intersection}, { ${method}: { param: { ${key}: any } } }`;
+    return `export type ${toPascalCase(method)}${toPascalCase(key)}<T extends ${paths}>> = ${intersection}[T]['${method}']['param']['${key}'];`;
+  };
+  return METHODS.reduce((total, method) => {
+    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 && `
+
+`}${code}`;
+  }, "");
+}
 function getPathsName(docsName) {
   return `Paths${getRefName(docsName)}`;
 }
@@ -281,27 +305,46 @@ async function loadSwaggerSource(options) {
   const { sources, interfaces } = await getSources();
   if (!interfaces.length)
     return;
-  const prefix = `/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// noinspection JSUnusedGlobalSymbols
-// Generated by ${pluginName}
-`;
   const code = interfaces.reduce((a, b) => a + b, "");
-  const suffix = sources.length ? interfaces.reduce((a, b, index) => {
+  const suffix = interfaces.reduce((a, b, index) => {
     if (b) {
       a += !a ? `export type ${getPathsName("_Intersection")} = ` : `&`;
-      a += `${getPathsName(sources[index].name)}`;
+      const { name } = sources[index];
+      a += name ? getPathsName(name) : "any";
     }
     return a;
-  }, "") : "";
+  }, "");
   const outputFile = path.resolve(process.cwd(), output);
-  fs.writeFileSync(outputFile, prefix + code + suffix);
+  fs.writeFileSync(outputFile, await prettier.format(CODE_PREFIX + code + suffix, { parser: "typescript" }));
+  return { sources, interfaces };
+}
+async function loadGlobTypes({ glob, output }) {
+  if (!glob)
+    return;
+  const outputFile = path.resolve(process.cwd(), glob.output || "auto-types.d.ts");
+  const importPath = path.relative(outputFile, output).replaceAll("\\", "/").replace(/^\.\.\//, "./");
+  const intersection = getPathsName("_Intersection");
+  const code = `${CODE_PREFIX}import { ${intersection} } from '${importPath}'
+
+type FilterOptional<Source, Condition> = Pick<
+  Source,
+  {
+    [K in keyof Source]: Source[K] extends Condition ? K : never;
+  }[keyof Source]
+>
+
+declare global {
+  export namespace ${glob.namespace} {
+    ${generatorMethodType(intersection)}
+  }
+}`;
+  fs.writeFileSync(outputFile, await prettier.format(code, { parser: "typescript" }));
 }
 function swagger2TsPlugin(userOptions) {
   (async () => {
     const options = await resolveOptions(userOptions);
     await Promise.all(options.map(loadSwaggerSource));
+    await Promise.all(options.map(loadGlobTypes));
   })();
   return {
     name: `${pluginName}`,

package/dist/index.d.cts

@@ -18,6 +18,10 @@ interface Options {
     output?: string;
     formatDocs?: (docs: SwaggerDoc | OpenAPIObject) => typeof docs;
     formatSchema?: FormatSchema;
+    glob?: {
+        namespace: string;
+        output?: string;
+    };
 }
 type UserOptions = Options | {
     sources: Options[];

package/dist/index.d.mts

@@ -18,6 +18,10 @@ interface Options {
     output?: string;
     formatDocs?: (docs: SwaggerDoc | OpenAPIObject) => typeof docs;
     formatSchema?: FormatSchema;
+    glob?: {
+        namespace: string;
+        output?: string;
+    };
 }
 type UserOptions = Options | {
     sources: Options[];

package/dist/index.d.ts

@@ -18,6 +18,10 @@ interface Options {
     output?: string;
     formatDocs?: (docs: SwaggerDoc | OpenAPIObject) => typeof docs;
     formatSchema?: FormatSchema;
+    glob?: {
+        namespace: string;
+        output?: string;
+    };
 }
 type UserOptions = Options | {
     sources: Options[];

package/dist/index.mjs

@@ -1,11 +1,18 @@
 import { writeFileSync, readFileSync } from 'fs';
-import { resolve } from 'path';
+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 */
+/* prettier-ignore */
+// @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
+// Generated by ${pluginName}
+`;
 function loadConfig() {
   return loadConfig$1({
     sources: [
@@ -27,7 +34,7 @@ async function resolveOptions(userOptions) {
     const { output } = item;
     const root = process.cwd();
     const outputFile = output ? output?.endsWith(".ts") ? output : output + ".ts" : "./src/swagger.ts";
-    return Object.assign({ output: resolve(root, outputFile) }, item);
+    return { ...item, output: resolve(root, outputFile) };
   });
 }
 async function fetchUrl(url) {
@@ -67,6 +74,7 @@ function getRefName($ref, prefix = "") {
   return getSchemaName(prefix) + getSchemaName($ref || "");
 }
 
+const METHODS = ["get", "put", "post", "delete", "options", "head", "patch", "trace"];
 function generateDocs(input, { docsName, baseUrl, formatSchema }) {
   function getRefObject(ref) {
     return ref.split("/").slice(1).reduce((obj, item) => {
@@ -77,7 +85,7 @@ function generateDocs(input, { docsName, baseUrl, formatSchema }) {
     const pathValue = value;
     const parametersExtended = pathValue.parameters;
     const result = Object.entries(pathValue).map(([method, options]) => {
-      if (!["get", "put", "post", "delete", "options", "head", "patch", "trace"].includes(method)) {
+      if (!METHODS.includes(method)) {
         return;
       }
       let allParameters = [...parametersExtended || [], ...options.parameters || []].map((item) => {
@@ -206,6 +214,22 @@ ${title ? ` * @title ${title}
 ` : `${key}${isRequired === false ? "?" : ""}: ${result};
 `}`;
 }
+function generatorMethodType(intersection) {
+  const paramKeys = ["body", "query", "path"];
+  const genTypeCode = (method, key) => {
+    const paths = `keyof FilterOptional<${intersection}, { ${method}: { param: { ${key}: any } } }`;
+    return `export type ${toPascalCase(method)}${toPascalCase(key)}<T extends ${paths}>> = ${intersection}[T]['${method}']['param']['${key}'];`;
+  };
+  return METHODS.reduce((total, method) => {
+    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 && `
+
+`}${code}`;
+  }, "");
+}
 function getPathsName(docsName) {
   return `Paths${getRefName(docsName)}`;
 }
@@ -272,27 +296,46 @@ async function loadSwaggerSource(options) {
   const { sources, interfaces } = await getSources();
   if (!interfaces.length)
     return;
-  const prefix = `/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// noinspection JSUnusedGlobalSymbols
-// Generated by ${pluginName}
-`;
   const code = interfaces.reduce((a, b) => a + b, "");
-  const suffix = sources.length ? interfaces.reduce((a, b, index) => {
+  const suffix = interfaces.reduce((a, b, index) => {
     if (b) {
       a += !a ? `export type ${getPathsName("_Intersection")} = ` : `&`;
-      a += `${getPathsName(sources[index].name)}`;
+      const { name } = sources[index];
+      a += name ? getPathsName(name) : "any";
     }
     return a;
-  }, "") : "";
+  }, "");
   const outputFile = resolve(process.cwd(), output);
-  writeFileSync(outputFile, prefix + code + suffix);
+  writeFileSync(outputFile, await format(CODE_PREFIX + code + suffix, { parser: "typescript" }));
+  return { sources, interfaces };
+}
+async function loadGlobTypes({ glob, output }) {
+  if (!glob)
+    return;
+  const outputFile = resolve(process.cwd(), glob.output || "auto-types.d.ts");
+  const importPath = relative(outputFile, output).replaceAll("\\", "/").replace(/^\.\.\//, "./");
+  const intersection = getPathsName("_Intersection");
+  const code = `${CODE_PREFIX}import { ${intersection} } from '${importPath}'
+
+type FilterOptional<Source, Condition> = Pick<
+  Source,
+  {
+    [K in keyof Source]: Source[K] extends Condition ? K : never;
+  }[keyof Source]
+>
+
+declare global {
+  export namespace ${glob.namespace} {
+    ${generatorMethodType(intersection)}
+  }
+}`;
+  writeFileSync(outputFile, await format(code, { parser: "typescript" }));
 }
 function swagger2TsPlugin(userOptions) {
   (async () => {
     const options = await resolveOptions(userOptions);
     await Promise.all(options.map(loadSwaggerSource));
+    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.11",
+    "version": "1.3.13",
     "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"
     },