@gopowerteam/request-generate 0.2.2 → 0.3.0

package/dist/templates/{partials → templates/partials}/export-service-namespace.hbs

@@ -1,5 +1,5 @@
 {{#include-query-params operations}}
-namespace RequestQueryParams {
+export namespace RequestQueryParams {
 {{#each operations}}
   {{#if parametersQuery}}
   export type {{to-upper name true}} = {

package/dist/vite-plugin/index.cjs

@@ -0,0 +1,238 @@
+const require_chunk = require('../chunk-C0xms8kb.cjs');
+let node_fs = require("node:fs");
+node_fs = require_chunk.__toESM(node_fs);
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
+let node_process = require("node:process");
+node_process = require_chunk.__toESM(node_process);
+let handlebars = require("handlebars");
+handlebars = require_chunk.__toESM(handlebars);
+let node_child_process = require("node:child_process");
+
+//#region src/vite-plugin/templates.ts
+const useRequestFunctionCodeTemplate = `
+export function useRequest(
+  ...selects
+) {
+  const services = selects.map((select)=>{
+    const service = select(serviceMap)
+    return new service()
+  })
+
+  if(services.length === 1){
+    return services[0]
+  }else{
+    return services
+  }
+}
+`;
+const useRequestFunctionTypeTemplate = `
+export function useRequest<T1,T2,T3,T4,T5,T6>(
+  select1: ((services: typeof serviceMap) => { new (): T1 }),
+  select2: ((services: typeof serviceMap) => { new (): T2 }),
+  select3: ((services: typeof serviceMap) => { new (): T3 }),
+  select4: ((services: typeof serviceMap) => { new (): T4 }),
+  select5: ((services: typeof serviceMap) => { new (): T5 }),
+  select6: ((services: typeof serviceMap) => { new (): T6 }),
+): [T1,T2,T3,T4,T5,T6]
+export function useRequest<T1,T2,T3,T4,T5>(
+  select1: ((services: typeof serviceMap) => { new (): T1 }),
+  select2: ((services: typeof serviceMap) => { new (): T2 }),
+  select3: ((services: typeof serviceMap) => { new (): T3 }),
+  select4: ((services: typeof serviceMap) => { new (): T4 }),
+  select5: ((services: typeof serviceMap) => { new (): T5 }),
+): [T1,T2,T3,T4,T5]
+export function useRequest<T1,T2,T3,T4>(
+  select1: ((services: typeof serviceMap) => { new (): T1 }),
+  select2: ((services: typeof serviceMap) => { new (): T2 }),
+  select3: ((services: typeof serviceMap) => { new (): T3 }),
+  select4: ((services: typeof serviceMap) => { new (): T4 }),
+): [T1,T2,T3,T4]
+export function useRequest<T1,T2,T3>(
+  select1: ((services: typeof serviceMap) => { new (): T1 }),
+  select2: ((services: typeof serviceMap) => { new (): T2 }),
+  select3: ((services: typeof serviceMap) => { new (): T3 }),
+): [T1,T2,T3]
+export function useRequest<T1,T2>(
+  select1: ((services: typeof serviceMap) => { new (): T1 }),
+  select2: ((services: typeof serviceMap) => { new (): T2 }),
+): [T1,T2]
+export function useRequest<T>(
+  select: ((services: typeof serviceMap) => { new (): T })
+): T
+export function useRequest<T>(
+  ...selects: ((services: typeof serviceMap) => { new (): T })[]
+): T | T[]
+`;
+const importServiceTemplate = `
+{{#if groups}}
+{{#each groups}}
+{{#each services}}
+import { {{{name}}} as {{group}}_{{name}} } from '{{path}}'
+{{/each}}
+{{/each}}
+{{else}}
+{{#each services}}
+import { {{{name}}} } from '{{path}}'
+{{/each}}
+{{/if}}
+`;
+const defineServiceMapTemplate = `
+{{#if groups}}
+const serviceMap = {
+  {{#each groups}}
+  {{{name}}}: {
+    {{#each services}}
+    {{{name}}}: {{group}}_{{name}},
+    {{/each}}
+  },
+  {{/each}}
+}
+{{else}}
+const serviceMap = {
+{{#each services}}
+  {{{name}}},
+{{/each}}
+}
+{{/if}}
+`;
+const generateCodeTemplate = `
+${importServiceTemplate.trim()}
+
+${defineServiceMapTemplate.trim()}
+
+${useRequestFunctionCodeTemplate.trim()}
+`;
+const generateDeclareTemplate = `declare module '{{{MODULE_ID}}}' {
+  ${importServiceTemplate.trim()}
+
+  ${defineServiceMapTemplate.trim()}
+
+  ${useRequestFunctionTypeTemplate.trim()}
+}
+`;
+
+//#endregion
+//#region src/vite-plugin/index.ts
+const MODULE_ID = "virtual:request";
+const DECLARATION_FILE = "request.d.ts";
+let viteConfig;
+let GerneratedCodeStr = "";
+function genretateDeclareAndCode(options) {
+	const services = getServiceItems(getServicePaths(options));
+	const groups = getServiceGroups(services);
+	if (services && services.length) {
+		generateCode(services, groups);
+		if (options.dts !== false) generateDeclare(services, groups, options);
+	}
+}
+function generateRequestCode() {
+	(0, node_child_process.execSync)(`${node_path.resolve(viteConfig.root, "node_modules", ".bin", "request-generate")}`, { env: {
+		...node_process.default.env,
+		FORCE_COLOR: "1"
+	} });
+}
+/**
+* Request插件
+*/
+var vite_plugin_default = (options) => {
+	return {
+		name: "vite-plugin-vue-request",
+		enforce: "pre",
+		configResolved(config) {
+			viteConfig = config;
+		},
+		resolveId(id) {
+			return id === MODULE_ID ? MODULE_ID : void 0;
+		},
+		async buildStart() {
+			await generateRequestCode();
+			await genretateDeclareAndCode(options);
+		},
+		load(id) {
+			if (id !== MODULE_ID) return;
+			return GerneratedCodeStr;
+		}
+	};
+};
+/**
+* 生成服务路径
+* @param options PluginOptions
+* @returns string[]
+*/
+function getServicePaths(options) {
+	const paths = [];
+	const walk = (dir) => {
+		node_fs.readdirSync(dir).forEach((file) => {
+			const fullpath = node_path.join(dir, file).replace(/\\/g, "/");
+			const stat = node_fs.statSync(fullpath);
+			if (stat.isFile() && fullpath.endsWith("Service.ts")) paths.push(fullpath);
+			else if (stat.isDirectory()) walk(node_path.join(dir, file));
+		});
+	};
+	const { replacement } = viteConfig.resolve.alias.find((alias) => alias.find === options.alias);
+	if (node_fs.existsSync(node_path.resolve(options.dir))) walk(node_path.resolve(options.dir));
+	return paths.map((filepath) => filepath.replace(replacement.replace(/\\/g, "/"), options.alias));
+}
+/**
+* 生成服务项
+* @param paths
+* @returns ServiceItem[]
+*/
+function getServiceItems(paths) {
+	const toCaseString = (str = "") => str.replace(/-(\w)/g, (_, $1) => $1.toUpperCase()).replace(/^\S/, (s) => s.toUpperCase());
+	return paths.map((filePath) => {
+		const [name] = /[^\\]+(?=\.ts$)/.exec(toCaseString(node_path.basename(filePath))) || [];
+		const [group] = /(?<=^.\/http\/)(.*?)(?=\/.*?Service\.ts$)/.exec(filePath) || [];
+		return {
+			name: toCaseString(name),
+			group: group !== "services" ? toCaseString(group) : void 0,
+			path: filePath.replace(/\.ts$/g, "")
+		};
+	});
+}
+/**
+* 获取分组列表
+* @param services
+* @returns GroupItem[]
+*/
+function getServiceGroups(services) {
+	return services.reduce((r, s) => {
+		if (!s.group) return r;
+		const group = r.find((x) => x.name === s.group) || {
+			name: s.group,
+			services: []
+		};
+		group.services.push(s);
+		if (!r.find((g) => g === group)) r.push(group);
+		return r;
+	}, []);
+}
+/**
+* 生成代码
+* @param services
+* @param groups
+*/
+function generateCode(services, groups) {
+	GerneratedCodeStr = handlebars.default.compile(generateCodeTemplate)({
+		groups: groups.length ? groups : void 0,
+		services
+	});
+}
+/**
+* 生成代码
+* @param services
+* @param groups
+* @param options
+*/
+function generateDeclare(services, groups, options) {
+	const content = handlebars.default.compile(generateDeclareTemplate)({
+		groups: groups.length ? groups : void 0,
+		services,
+		MODULE_ID
+	});
+	node_fs.writeFileSync(node_path.resolve(viteConfig.root, typeof options.dts === "string" ? options.dts : DECLARATION_FILE), content.replace(/\r\n/g, "\n"), "utf-8");
+}
+
+//#endregion
+module.exports = vite_plugin_default;

package/dist/vite-plugin/index.d.cts

@@ -0,0 +1,13 @@
+import { PluginOption } from "vite";
+
+//#region src/vite-plugin/index.d.ts
+interface PluginOptions {
+  alias: string;
+  dir: string;
+  dts: string | boolean;
+}
+/**
+ * Request插件
+ */
+declare const _default: (options: PluginOptions) => PluginOption;
+export = _default;

package/dist/vite-plugin/index.d.mts

@@ -0,0 +1,14 @@
+import { PluginOption } from "vite";
+
+//#region src/vite-plugin/index.d.ts
+interface PluginOptions {
+  alias: string;
+  dir: string;
+  dts: string | boolean;
+}
+/**
+ * Request插件
+ */
+declare const _default: (options: PluginOptions) => PluginOption;
+//#endregion
+export { _default as default };

package/dist/vite-plugin/index.mjs

@@ -1,14 +1,11 @@
-import "../chunk-WF3XBEPN.mjs";
-
-// src/vite-plugin/index.ts
-import { execSync } from "node:child_process";
-import * as fs from "node:fs";
-import * as path from "node:path";
+import * as fs$1 from "node:fs";
+import * as path$1 from "node:path";
 import process from "node:process";
 import Handlebars from "handlebars";
+import { execSync } from "node:child_process";
 
-// src/vite-plugin/templates.ts
-var useRequestFunctionCodeTemplate = `
+//#region src/vite-plugin/templates.ts
+const useRequestFunctionCodeTemplate = `
 export function useRequest(
   ...selects
 ) {
@@ -24,7 +21,7 @@ export function useRequest(
   }
 }
 `;
-var useRequestFunctionTypeTemplate = `
+const useRequestFunctionTypeTemplate = `
 export function useRequest<T1,T2,T3,T4,T5,T6>(
   select1: ((services: typeof serviceMap) => { new (): T1 }),
   select2: ((services: typeof serviceMap) => { new (): T2 }),
@@ -62,7 +59,7 @@ export function useRequest<T>(
   ...selects: ((services: typeof serviceMap) => { new (): T })[]
 ): T | T[]
 `;
-var importServiceTemplate = `
+const importServiceTemplate = `
 {{#if groups}}
 {{#each groups}}
 {{#each services}}
@@ -75,7 +72,7 @@ import { {{{name}}} } from '{{path}}'
 {{/each}}
 {{/if}}
 `;
-var defineServiceMapTemplate = `
+const defineServiceMapTemplate = `
 {{#if groups}}
 const serviceMap = {
   {{#each groups}}
@@ -94,14 +91,14 @@ const serviceMap = {
 }
 {{/if}}
 `;
-var generateCodeTemplate = `
+const generateCodeTemplate = `
 ${importServiceTemplate.trim()}
 
 ${defineServiceMapTemplate.trim()}
 
 ${useRequestFunctionCodeTemplate.trim()}
 `;
-var generateDeclareTemplate = `declare module '{{{MODULE_ID}}}' {
+const generateDeclareTemplate = `declare module '{{{MODULE_ID}}}' {
   ${importServiceTemplate.trim()}
 
   ${defineServiceMapTemplate.trim()}
@@ -110,122 +107,127 @@ var generateDeclareTemplate = `declare module '{{{MODULE_ID}}}' {
 }
 `;
 
-// src/vite-plugin/index.ts
-var MODULE_ID = "virtual:request";
-var DECLARATION_FILE = "request.d.ts";
-var viteConfig;
-var GerneratedCodeStr = "";
+//#endregion
+//#region src/vite-plugin/index.ts
+const MODULE_ID = "virtual:request";
+const DECLARATION_FILE = "request.d.ts";
+let viteConfig;
+let GerneratedCodeStr = "";
 function genretateDeclareAndCode(options) {
-  const paths = getServicePaths(options);
-  const services = getServiceItems(paths);
-  const groups = getServiceGroups(services);
-  if (services && services.length) {
-    generateDeclare(services, groups, options);
-    generateCode(services, groups);
-  }
+	const services = getServiceItems(getServicePaths(options));
+	const groups = getServiceGroups(services);
+	if (services && services.length) {
+		generateCode(services, groups);
+		if (options.dts !== false) generateDeclare(services, groups, options);
+	}
 }
 function generateRequestCode() {
-  const generateScript = path.resolve(viteConfig.root, "node_modules", ".bin", "request-generate");
-  execSync(`${generateScript}`, {
-    env: {
-      ...process.env,
-      FORCE_COLOR: "1"
-    }
-  });
+	execSync(`${path$1.resolve(viteConfig.root, "node_modules", ".bin", "request-generate")}`, { env: {
+		...process.env,
+		FORCE_COLOR: "1"
+	} });
 }
+/**
+* Request插件
+*/
 var vite_plugin_default = (options) => {
-  return {
-    name: "vite-plugin-vue-request",
-    enforce: "pre",
-    configResolved(config) {
-      viteConfig = config;
-    },
-    resolveId(id) {
-      return id === MODULE_ID ? MODULE_ID : void 0;
-    },
-    async buildStart() {
-      await generateRequestCode();
-      await genretateDeclareAndCode(options);
-    },
-    load(id) {
-      if (id !== MODULE_ID)
-        return;
-      return GerneratedCodeStr;
-    }
-  };
+	return {
+		name: "vite-plugin-vue-request",
+		enforce: "pre",
+		configResolved(config) {
+			viteConfig = config;
+		},
+		resolveId(id) {
+			return id === MODULE_ID ? MODULE_ID : void 0;
+		},
+		async buildStart() {
+			await generateRequestCode();
+			await genretateDeclareAndCode(options);
+		},
+		load(id) {
+			if (id !== MODULE_ID) return;
+			return GerneratedCodeStr;
+		}
+	};
 };
+/**
+* 生成服务路径
+* @param options PluginOptions
+* @returns string[]
+*/
 function getServicePaths(options) {
-  const paths = [];
-  const walk = (dir) => {
-    fs.readdirSync(dir).forEach((file) => {
-      const fullpath = path.join(dir, file).replace(/\\/g, "/");
-      const stat = fs.statSync(fullpath);
-      if (stat.isFile() && fullpath.endsWith("Service.ts")) {
-        paths.push(fullpath);
-      } else if (stat.isDirectory()) {
-        const subdir = path.join(dir, file);
-        walk(subdir);
-      }
-    });
-  };
-  const { replacement } = viteConfig.resolve.alias.find(
-    (alias) => alias.find === options.alias
-  );
-  if (fs.existsSync(path.resolve(options.dir))) {
-    walk(path.resolve(options.dir));
-  }
-  return paths.map(
-    (filepath) => filepath.replace(replacement.replace(/\\/g, "/"), options.alias)
-  );
+	const paths = [];
+	const walk = (dir) => {
+		fs$1.readdirSync(dir).forEach((file) => {
+			const fullpath = path$1.join(dir, file).replace(/\\/g, "/");
+			const stat = fs$1.statSync(fullpath);
+			if (stat.isFile() && fullpath.endsWith("Service.ts")) paths.push(fullpath);
+			else if (stat.isDirectory()) walk(path$1.join(dir, file));
+		});
+	};
+	const { replacement } = viteConfig.resolve.alias.find((alias) => alias.find === options.alias);
+	if (fs$1.existsSync(path$1.resolve(options.dir))) walk(path$1.resolve(options.dir));
+	return paths.map((filepath) => filepath.replace(replacement.replace(/\\/g, "/"), options.alias));
 }
+/**
+* 生成服务项
+* @param paths
+* @returns ServiceItem[]
+*/
 function getServiceItems(paths) {
-  const toCaseString = (str = "") => str.replace(/-(\w)/g, (_, $1) => $1.toUpperCase()).replace(/^\S/, (s) => s.toUpperCase());
-  return paths.map((filePath) => {
-    const [name] = /[^\\]+(?=\.ts$)/.exec(toCaseString(path.basename(filePath))) || [];
-    const [group] = /(?<=^.\/http\/)(.*?)(?=\/.*?Service\.ts$)/.exec(filePath) || [];
-    return {
-      name: toCaseString(name),
-      group: group !== "services" ? toCaseString(group) : void 0,
-      path: filePath.replace(/\.ts$/g, "")
-    };
-  });
+	const toCaseString = (str = "") => str.replace(/-(\w)/g, (_, $1) => $1.toUpperCase()).replace(/^\S/, (s) => s.toUpperCase());
+	return paths.map((filePath) => {
+		const [name] = /[^\\]+(?=\.ts$)/.exec(toCaseString(path$1.basename(filePath))) || [];
+		const [group] = /(?<=^.\/http\/)(.*?)(?=\/.*?Service\.ts$)/.exec(filePath) || [];
+		return {
+			name: toCaseString(name),
+			group: group !== "services" ? toCaseString(group) : void 0,
+			path: filePath.replace(/\.ts$/g, "")
+		};
+	});
 }
+/**
+* 获取分组列表
+* @param services
+* @returns GroupItem[]
+*/
 function getServiceGroups(services) {
-  return services.reduce((r, s) => {
-    if (!s.group) {
-      return r;
-    }
-    const group = r.find((x) => x.name === s.group) || {
-      name: s.group,
-      services: []
-    };
-    group.services.push(s);
-    if (!r.find((g) => g === group)) {
-      r.push(group);
-    }
-    return r;
-  }, []);
+	return services.reduce((r, s) => {
+		if (!s.group) return r;
+		const group = r.find((x) => x.name === s.group) || {
+			name: s.group,
+			services: []
+		};
+		group.services.push(s);
+		if (!r.find((g) => g === group)) r.push(group);
+		return r;
+	}, []);
 }
+/**
+* 生成代码
+* @param services
+* @param groups
+*/
 function generateCode(services, groups) {
-  const template = Handlebars.compile(generateCodeTemplate);
-  GerneratedCodeStr = template({
-    groups: groups.length ? groups : void 0,
-    services
-  });
+	GerneratedCodeStr = Handlebars.compile(generateCodeTemplate)({
+		groups: groups.length ? groups : void 0,
+		services
+	});
 }
+/**
+* 生成代码
+* @param services
+* @param groups
+* @param options
+*/
 function generateDeclare(services, groups, options) {
-  const template = Handlebars.compile(generateDeclareTemplate);
-  const content = template({
-    groups: groups.length ? groups : void 0,
-    services,
-    MODULE_ID
-  });
-  fs.writeFileSync(
-    path.resolve(viteConfig.root, options.dts ?? DECLARATION_FILE),
-    content.replace(/\r\n/g, "\n"),
-    "utf-8"
-  );
+	const content = Handlebars.compile(generateDeclareTemplate)({
+		groups: groups.length ? groups : void 0,
+		services,
+		MODULE_ID
+	});
+	fs$1.writeFileSync(path$1.resolve(viteConfig.root, typeof options.dts === "string" ? options.dts : DECLARATION_FILE), content.replace(/\r\n/g, "\n"), "utf-8");
 }
-export {
-  vite_plugin_default as default
-};
+
+//#endregion
+export { vite_plugin_default as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request-generate",
   "type": "commonjs",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "private": false,
   "keywords": [
     "gopowerteam",
@@ -9,19 +9,19 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
+      "types": "./dist/index.d.mts",
       "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "require": "./dist/index.cjs"
     },
     "./vite-plugin": {
-      "types": "./dist/vite-plugin/index.d.ts",
+      "types": "./dist/vite-plugin/index.d.mts",
       "import": "./dist/vite-plugin/index.mjs",
-      "require": "./dist/vite-plugin/index.js"
+      "require": "./dist/vite-plugin/index.cjs"
     }
   },
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "types": "./dist/index.d.mts",
   "bin": {
     "request-download": "bin/download.mts",
     "request-generate": "bin/generate.mts"
@@ -37,33 +37,33 @@
     "access": "public"
   },
   "dependencies": {
-    "@apidevtools/swagger-parser": "^10.1.0",
-    "chalk": "^5.3.0",
-    "commander": "^10.0.0",
+    "@apidevtools/swagger-parser": "^12.1.0",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.3",
     "handlebars": "^4.7.8",
-    "ora": "^8.1.0",
-    "qs": "^6.11.0",
-    "rimraf": "^4.1.2",
-    "rxjs": "^7.8.0",
-    "tsx": "^4.7.0"
+    "ora": "^9.3.0",
+    "qs": "^6.15.0",
+    "rimraf": "^6.1.3",
+    "rxjs": "^7.8.2",
+    "tsx": "^4.21.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.4.0",
-    "@types/node": "20",
-    "@types/qs": "^6.9.7",
+    "@types/node": "24",
+    "@types/qs": "^6.14.0",
     "@types/rimraf": "^3.0.2",
-    "fs-extra": "^11.1.0",
-    "jest": "^29.4.3",
-    "openapi-types": "^12.1.0",
-    "ts-jest": "^29.0.5",
-    "tsup": "^6.6.3",
-    "typescript": "^4.9.5",
-    "vite": "^4.1.4",
-    "@gopowerteam/request": "0.1.20"
+    "openapi-types": "^12.1.3",
+    "tsdown": "0.21.0-beta.2",
+    "typescript": "^5.9.3",
+    "vite": "^7.3.1",
+    "vitest": "^3.0.0",
+    "@gopowerteam/request": "0.2.0"
   },
   "scripts": {
-    "dev": "tsup --watch",
-    "build": "tsup",
-    "lint": "eslint . --fix"
+    "dev": "tsdown --watch",
+    "build": "tsdown",
+    "lint": "eslint . --fix",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage"
   }
 }

package/dist/chunk-WF3XBEPN.mjs

@@ -1,18 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-
-// ../../node_modules/.pnpm/tsup@6.6.3_postcss@8.5.3_ts-node@10.9.1_@types+node@20.16.5_typescript@4.9.5__typescript@4.9.5/node_modules/tsup/assets/esm_shims.js
-import { fileURLToPath } from "url";
-import path from "path";
-var getFilename = () => fileURLToPath(import.meta.url);
-var getDirname = () => path.dirname(getFilename());
-var __dirname = /* @__PURE__ */ getDirname();
-
-export {
-  __publicField,
-  __dirname
-};