@1szx1/vite-plugin-swagger2ts 1.2.3 → 1.3.1

package/dist/bin.cjs

@@ -6,5 +6,6 @@ require('path');
 require('swagger2openapi');
 require('cross-fetch');
 require('unconfig');
+require('chalk');
 
 index.default();

package/dist/bin.mjs

@@ -4,5 +4,6 @@ import 'path';
 import 'swagger2openapi';
 import 'cross-fetch';
 import 'unconfig';
+import 'chalk';
 
 swagger2TsPlugin();

package/dist/index.cjs

@@ -7,10 +7,12 @@ const path = require('path');
 const swagger2openapi = require('swagger2openapi');
 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);
 
 function loadConfig() {
   return unconfig.loadConfig({
@@ -97,7 +99,7 @@ function generateDocs(input, { docsName, baseUrl, formatSchema }) {
       const pathParameters = allParameters.filter((item) => item.in === "path");
       const bodyParameters = allParameters.filter((item) => !item.in);
       const requestBody = options.requestBody ? "$ref" in options.requestBody ? getRefObject(options.requestBody.$ref) : options.requestBody : void 0;
-      let responses = Object.entries(options.responses).filter((items) => items[0] == "200" || items[0] == "default").sort()?.[0]?.[1];
+      let responses = Object.entries(options.responses).filter((items) => items[0].startsWith("20") || items[0] == "default").sort()?.[0]?.[1];
       if ("$ref" in responses) {
         responses = getRefObject(responses.$ref);
       }
@@ -215,6 +217,9 @@ ${title ? ` * @title ${title}
 function getPathsName(docsName) {
   return `Paths${getRefName(docsName)}`;
 }
+function getApiName(json) {
+  return json.info.title.replace(" ", "_");
+}
 
 function convertObjPromise(docs) {
   return new Promise((resolve2, reject) => {
@@ -226,7 +231,7 @@ function convertObjPromise(docs) {
   });
 }
 async function loadSwaggerSource(options) {
-  const { swaggerUrl, jsonUrl, output, formatDocs, formatSchema } = options;
+  const { swaggerUrl, jsonUrl, jsonPath, output, formatDocs, formatSchema } = options;
   async function genInterface(docs, docsName) {
     let openapiDocs = formatDocs ? formatDocs(docs) : docs;
     if (!("openapi" in openapiDocs)) {
@@ -237,14 +242,14 @@ async function loadSwaggerSource(options) {
     }
     return generateDocs(openapiDocs, { docsName, baseUrl: docs.basePath ?? "", formatSchema });
   }
-  async function genCode(source) {
+  async function genResourcesCode(source) {
     const { url, name } = source;
     try {
       const docs = await fetchUrl(`${swaggerUrl}${url}`);
       const code2 = await genInterface(docs, name);
       return code2;
     } catch (error) {
-      console.log(`%c[vite-plugin-swagger2ts]: ${name} error`, "color: #ff0000;", error.message);
+      console.log(chalk__default.yellow(`[vite-plugin-swagger2ts]: ${name} error;`) + error.message);
       return "";
     }
   }
@@ -252,19 +257,24 @@ async function loadSwaggerSource(options) {
     let sources2 = void 0;
     let interfaces2 = [];
     if (typeof swaggerUrl === "string") {
-      const resources = await fetchUrl(`${swaggerUrl}/swagger-resources`).catch((error) => error);
+      const resources = await fetchUrl(`${swaggerUrl}/swagger-resources;`).catch((error) => error);
       if (Array.isArray(resources)) {
         sources2 = resources;
-        interfaces2.push(...await Promise.all(sources2.map(genCode)));
+        interfaces2.push(...await Promise.all(sources2.map(genResourcesCode)));
       } else {
-        console.log(`%c[vite-plugin-swagger2ts]: resources error`, "color: #ff0000;", JSON.stringify(resources));
+        console.log(chalk__default.yellow(`[vite-plugin-swagger2ts]: resources error`) + JSON.stringify(resources));
       }
     }
     if (typeof jsonUrl === "string") {
       const swaggerJson = await fetchUrl(jsonUrl);
       if (!swaggerJson.info)
-        return console.log(`%c[vite-plugin-swagger2ts]: jsonUrl error`, "color: #ff0000;", JSON.stringify(swaggerJson));
-      interfaces2.push(await genInterface(swaggerJson, swaggerJson.info.title.replace(" ", "_")));
+        return console.log(chalk__default.yellow(`[vite-plugin-swagger2ts]: jsonUrl error;`) + JSON.stringify(swaggerJson));
+      interfaces2.push(await genInterface(swaggerJson, getApiName(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)));
     }
     return { sources: sources2, interfaces: interfaces2 };
   }

package/dist/index.d.cts

@@ -11,6 +11,10 @@ interface Options {
      * 文档json地址
      */
     jsonUrl?: string;
+    /**
+     * openApi 本地json
+     */
+    jsonPath?: string;
     output?: string;
     formatDocs?: (docs: SwaggerDoc | OpenAPIObject) => typeof docs;
     formatSchema?: FormatSchema;

package/dist/index.d.mts

@@ -11,6 +11,10 @@ interface Options {
      * 文档json地址
      */
     jsonUrl?: string;
+    /**
+     * openApi 本地json
+     */
+    jsonPath?: string;
     output?: string;
     formatDocs?: (docs: SwaggerDoc | OpenAPIObject) => typeof docs;
     formatSchema?: FormatSchema;

package/dist/index.d.ts

@@ -11,6 +11,10 @@ interface Options {
      * 文档json地址
      */
     jsonUrl?: string;
+    /**
+     * openApi 本地json
+     */
+    jsonPath?: string;
     output?: string;
     formatDocs?: (docs: SwaggerDoc | OpenAPIObject) => typeof docs;
     formatSchema?: FormatSchema;

package/dist/index.mjs

@@ -1,8 +1,9 @@
-import { writeFileSync } from 'fs';
+import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
 import { convertObj } from 'swagger2openapi';
 import fetch from 'cross-fetch';
 import { loadConfig as loadConfig$1 } from 'unconfig';
+import chalk from 'chalk';
 
 function loadConfig() {
   return loadConfig$1({
@@ -89,7 +90,7 @@ function generateDocs(input, { docsName, baseUrl, formatSchema }) {
       const pathParameters = allParameters.filter((item) => item.in === "path");
       const bodyParameters = allParameters.filter((item) => !item.in);
       const requestBody = options.requestBody ? "$ref" in options.requestBody ? getRefObject(options.requestBody.$ref) : options.requestBody : void 0;
-      let responses = Object.entries(options.responses).filter((items) => items[0] == "200" || items[0] == "default").sort()?.[0]?.[1];
+      let responses = Object.entries(options.responses).filter((items) => items[0].startsWith("20") || items[0] == "default").sort()?.[0]?.[1];
       if ("$ref" in responses) {
         responses = getRefObject(responses.$ref);
       }
@@ -207,6 +208,9 @@ ${title ? ` * @title ${title}
 function getPathsName(docsName) {
   return `Paths${getRefName(docsName)}`;
 }
+function getApiName(json) {
+  return json.info.title.replace(" ", "_");
+}
 
 function convertObjPromise(docs) {
   return new Promise((resolve2, reject) => {
@@ -218,7 +222,7 @@ function convertObjPromise(docs) {
   });
 }
 async function loadSwaggerSource(options) {
-  const { swaggerUrl, jsonUrl, output, formatDocs, formatSchema } = options;
+  const { swaggerUrl, jsonUrl, jsonPath, output, formatDocs, formatSchema } = options;
   async function genInterface(docs, docsName) {
     let openapiDocs = formatDocs ? formatDocs(docs) : docs;
     if (!("openapi" in openapiDocs)) {
@@ -229,14 +233,14 @@ async function loadSwaggerSource(options) {
     }
     return generateDocs(openapiDocs, { docsName, baseUrl: docs.basePath ?? "", formatSchema });
   }
-  async function genCode(source) {
+  async function genResourcesCode(source) {
     const { url, name } = source;
     try {
       const docs = await fetchUrl(`${swaggerUrl}${url}`);
       const code2 = await genInterface(docs, name);
       return code2;
     } catch (error) {
-      console.log(`%c[vite-plugin-swagger2ts]: ${name} error`, "color: #ff0000;", error.message);
+      console.log(chalk.yellow(`[vite-plugin-swagger2ts]: ${name} error;`) + error.message);
       return "";
     }
   }
@@ -244,19 +248,24 @@ async function loadSwaggerSource(options) {
     let sources2 = void 0;
     let interfaces2 = [];
     if (typeof swaggerUrl === "string") {
-      const resources = await fetchUrl(`${swaggerUrl}/swagger-resources`).catch((error) => error);
+      const resources = await fetchUrl(`${swaggerUrl}/swagger-resources;`).catch((error) => error);
       if (Array.isArray(resources)) {
         sources2 = resources;
-        interfaces2.push(...await Promise.all(sources2.map(genCode)));
+        interfaces2.push(...await Promise.all(sources2.map(genResourcesCode)));
       } else {
-        console.log(`%c[vite-plugin-swagger2ts]: resources error`, "color: #ff0000;", JSON.stringify(resources));
+        console.log(chalk.yellow(`[vite-plugin-swagger2ts]: resources error`) + JSON.stringify(resources));
       }
     }
     if (typeof jsonUrl === "string") {
       const swaggerJson = await fetchUrl(jsonUrl);
       if (!swaggerJson.info)
-        return console.log(`%c[vite-plugin-swagger2ts]: jsonUrl error`, "color: #ff0000;", JSON.stringify(swaggerJson));
-      interfaces2.push(await genInterface(swaggerJson, swaggerJson.info.title.replace(" ", "_")));
+        return console.log(chalk.yellow(`[vite-plugin-swagger2ts]: jsonUrl error;`) + JSON.stringify(swaggerJson));
+      interfaces2.push(await genInterface(swaggerJson, getApiName(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)));
     }
     return { sources: sources2, interfaces: interfaces2 };
   }

package/package.json

@@ -1,108 +1,109 @@
-{
-    "name": "@1szx1/vite-plugin-swagger2ts",
-    "description": "forked from https://github.com/morelearn1990/vite-plugin-swagger2ts",
-    "version": "1.2.3",
-    "license": "MIT",
-    "author": "1SZX1 <2414126198@qq.com>",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/1SZX1/vite-plugin-swagger2ts"
-    },
-    "homepage": "https://github.com/1SZX1/vite-plugin-swagger2ts",
-    "bugs": "https://github.com/1SZX1/vite-plugin-swagger2ts/issues",
-    "files": [
-        "dist"
-    ],
-    "exports": {
-        ".": {
-            "require": "./dist/index.cjs",
-            "import": "./dist/index.mjs",
-            "types": "./dist/index.d.ts"
-        },
-        "./adapters": {
-            "require": "./dist/adapters.cjs",
-            "import": "./dist/adapters.mjs",
-            "types": "./dist/adapters.d.ts"
-        }
-    },
-    "main": "dist/index.cjs",
-    "module": "dist/index.mjs",
-    "types": "dist/index.d.ts",
-    "typesVersions": {
-        "*": {
-            "adapters": [
-                "./dist/adapters"
-            ]
-        }
-    },
-    "bin": {
-        "swagger2ts": "./dist/bin.mjs"
-    },
-    "scripts": {
-        "build": "unbuild",
-        "stub": "unbuild --stub",
-        "prepublishOnly": "pnpm run build",
-        "release": "pnpx git-ensure -a && pnpx bumpp --commit --tag --push",
-        "demo:dev": "pnpm -C examples/demo run dev",
-        "demo:build": "pnpm -C examples/demo run build",
-        "demo:preview": "pnpm -C examples/demo run preview",
-        "test": "jest",
-        "lint": "eslint --fix --ext .ts ./",
-        "version": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
-        "preinstall": "npx only-allow pnpm"
-    },
-    "dependencies": {
-        "axios": "^1.4.0",
-        "cross-fetch": "^3.1.5",
-        "luch-request": "^3.1.0",
-        "openapi3-ts": "^2.0.2",
-        "swagger2openapi": "^7.0.8",
-        "unconfig": "^0.3.9"
-    },
-    "peerDependencies": {
-        "axios": "^1.4.0",
-        "luch-request": "^3.1.0",
-        "vite": "^2.0.0"
-    },
-    "devDependencies": {
-        "@antfu/eslint-config": "^0.6.6",
-        "@commitlint/cli": "^12.1.4",
-        "@commitlint/config-conventional": "^12.1.4",
-        "@dcloudio/types": "^3.3.3",
-        "@types/eslint": "^8.44.0",
-        "@types/jest": "^26.0.24",
-        "@types/node": "^14.18.12",
-        "@typescript-eslint/eslint-plugin": "^4.33.0",
-        "@typescript-eslint/parser": "^5.14.0",
-        "conventional-changelog": "^3.1.25",
-        "cz-conventional-changelog": "^3.3.0",
-        "eslint": "^8.44.0",
-        "husky": "^8.0.3",
-        "jest": "^26.6.3",
-        "jest-esbuild": "^0.1.6",
-        "lint-staged": "^10.5.4",
-        "typescript": "^4.7.0",
-        "unbuild": "^2.0.0",
-        "vite": "^2.8.6"
-    },
-    "lint-staged": {
-        "*.{ts}": "eslint --fix --ext",
-        "*.{ts,md}": "prettier --write"
-    },
-    "husky": {
-        "hooks": {
-            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-            "pre-commit": "lint-staged"
-        }
-    },
-    "commitlint": {
-        "extends": [
-            "@commitlint/config-conventional"
-        ]
-    },
-    "config": {
-        "commitizen": {
-            "path": "./node_modules/cz-conventional-changelog"
-        }
-    }
+{
+    "name": "@1szx1/vite-plugin-swagger2ts",
+    "description": "forked from https://github.com/morelearn1990/vite-plugin-swagger2ts",
+    "version": "1.3.1",
+    "license": "MIT",
+    "author": "1SZX1 <2414126198@qq.com>",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/1SZX1/vite-plugin-swagger2ts"
+    },
+    "homepage": "https://github.com/1SZX1/vite-plugin-swagger2ts",
+    "bugs": "https://github.com/1SZX1/vite-plugin-swagger2ts/issues",
+    "files": [
+        "dist"
+    ],
+    "exports": {
+        ".": {
+            "require": "./dist/index.cjs",
+            "import": "./dist/index.mjs",
+            "types": "./dist/index.d.ts"
+        },
+        "./adapters": {
+            "require": "./dist/adapters.cjs",
+            "import": "./dist/adapters.mjs",
+            "types": "./dist/adapters.d.ts"
+        }
+    },
+    "main": "dist/index.cjs",
+    "module": "dist/index.mjs",
+    "types": "dist/index.d.ts",
+    "typesVersions": {
+        "*": {
+            "adapters": [
+                "./dist/adapters"
+            ]
+        }
+    },
+    "bin": {
+        "swagger2ts": "./dist/bin.mjs"
+    },
+    "scripts": {
+        "build": "unbuild",
+        "stub": "unbuild --stub",
+        "prepublishOnly": "pnpm run build",
+        "release": "pnpx git-ensure -a && pnpx bumpp --commit --tag --push",
+        "demo:dev": "pnpm -C examples/demo run dev",
+        "demo:build": "pnpm -C examples/demo run build",
+        "demo:preview": "pnpm -C examples/demo run preview",
+        "test": "jest",
+        "lint": "eslint --fix --ext .ts ./",
+        "version": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
+        "preinstall": "npx only-allow pnpm"
+    },
+    "dependencies": {
+        "axios": "^1.4.0",
+        "cross-fetch": "^3.1.5",
+        "luch-request": "^3.1.0",
+        "openapi3-ts": "^2.0.2",
+        "swagger2openapi": "^7.0.8",
+        "unconfig": "^0.3.9"
+    },
+    "peerDependencies": {
+        "axios": "^1.4.0",
+        "luch-request": "^3.1.0",
+        "chalk": "^5.3.0",
+        "vite": "^2.0.0"
+    },
+    "devDependencies": {
+        "@antfu/eslint-config": "^0.6.6",
+        "@commitlint/cli": "^12.1.4",
+        "@commitlint/config-conventional": "^12.1.4",
+        "@dcloudio/types": "^3.3.3",
+        "@types/eslint": "^8.44.0",
+        "@types/jest": "^26.0.24",
+        "@types/node": "^14.18.12",
+        "@typescript-eslint/eslint-plugin": "^4.33.0",
+        "@typescript-eslint/parser": "^5.14.0",
+        "conventional-changelog": "^3.1.25",
+        "cz-conventional-changelog": "^3.3.0",
+        "eslint": "^8.44.0",
+        "husky": "^8.0.3",
+        "jest": "^26.6.3",
+        "jest-esbuild": "^0.1.6",
+        "lint-staged": "^10.5.4",
+        "typescript": "^4.7.0",
+        "unbuild": "^2.0.0",
+        "vite": "^2.8.6"
+    },
+    "lint-staged": {
+        "*.{ts}": "eslint --fix --ext",
+        "*.{ts,md}": "prettier --write"
+    },
+    "husky": {
+        "hooks": {
+            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
+            "pre-commit": "lint-staged"
+        }
+    },
+    "commitlint": {
+        "extends": [
+            "@commitlint/config-conventional"
+        ]
+    },
+    "config": {
+        "commitizen": {
+            "path": "./node_modules/cz-conventional-changelog"
+        }
+    }
 }