1

packages/vite-plugin/dist/config.d.ts

@@ -1,5 +1,6 @@
+import type { Type } from "../types";
 export declare const config: {
-    type: string;
+    type: Type;
     reqUrl: string;
     demo: boolean;
     nameTag: boolean;

packages/vite-plugin/dist/eps/flatten.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 将模板字符串扁平化处理，转换为 Service 类型定义
+ * @param template - 包含 Service 类型定义的模板字符串
+ * @returns 处理后的 Service 类型定义字符串
+ * @throws {Error} 当模板中找不到 Service 类型定义时抛出错误
+ */
+export declare function flatten(template: string): string;

packages/vite-plugin/dist/eps/index.d.ts

@@ -1,10 +1,18 @@
 import type { Eps } from "../../types";
+/**
+ * 主入口：创建 eps 相关文件和 service
+ */
 export declare function createEps(): Promise<{
     service: {};
+    serviceCode: {
+        content: string;
+        types: string[];
+    };
     list: Eps.Entity[];
     isUpdate: boolean;
 } | {
     service: {};
     list: never[];
+    serviceCode?: undefined;
     isUpdate?: undefined;
 }>;

packages/vite-plugin/dist/index.d.ts

@@ -1,2 +1,2 @@
 import type { Config } from "../types";
-export declare function cool(options: Config.Options): (import("vite").Plugin<any> | Promise<import("vite").Plugin<any>> | import("vite").Plugin<any>[])[];
+export declare function cool(options: Config.Options): (import("vite").Plugin<any> | Promise<import("vite").Plugin<any>> | Promise<import("vite").Plugin<any>[]>)[];

packages/vite-plugin/dist/uniapp-x/flatten.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 将模板字符串扁平化处理，转换为 Service 类型定义
+ * @param template - 包含 Service 类型定义的模板字符串
+ * @returns 处理后的 Service 类型定义字符串
+ * @throws {Error} 当模板中找不到 Service 类型定义时抛出错误
+ */
+export declare function flatten(template: string): string;

packages/vite-plugin/dist/uniapp-x/index.d.ts

@@ -4,4 +4,4 @@ import type { Plugin } from "vite";
  * @param options 配置项
  * @returns Vite 插件数组
  */
-export declare function uniappX(): Plugin<any>[];
+export declare function uniappX(): Promise<Plugin<any>[]>;

packages/vite-plugin/dist/uniapp-x/utils.d.ts

@@ -22,3 +22,7 @@ export declare function addScriptContent(code: string, content: string): string;
  * 判断是否为 Tailwind 类名
  */
 export declare function isTailwindClass(className: string): boolean;
+/**
+ * 将 interface 转换为 type
+ */
+export declare function interfaceToType(code: string): string;

packages/vite-plugin/src/config.ts

@@ -1,5 +1,7 @@
+import type { Type } from "../types";
+
 export const config = {
-	type: "admin",
+	type: "admin" as Type,
 	reqUrl: "",
 	demo: false,
 	nameTag: true,
@@ -35,6 +37,10 @@ export const config = {
 				type: "BigInt",
 				test: ["bigint"],
 			},
+			{
+				type: "any",
+				test: ["json"],
+			},
 		],
 	},
 	svg: {

packages/vite-plugin/src/eps/index.ts

@@ -1,12 +1,13 @@
 import { createDir, error, firstUpperCase, readFile, rootDir, toCamel } from "../utils";
 import { join } from "path";
 import axios from "axios";
-import { isEmpty, last, values } from "lodash";
+import { compact, isEmpty, last, uniqBy, values } from "lodash";
 import { createWriteStream } from "fs";
 import prettier from "prettier";
 import { config } from "../config";
 import type { Eps } from "../../types";
-import { flatten } from "./flatten";
+import { flatten } from "../uniapp-x/flatten";
+import { interfaceToType } from "../uniapp-x/utils";
 
 // 全局 service 对象，用于存储服务结构
 const service = {};
@@ -58,6 +59,47 @@ function getNames(v: any): string[] {
 	return Object.keys(v).filter((e) => !["namespace", "permission"].includes(e));
 }
 
+/**
+ * 获取字段类型
+ */
+function getType({ propertyName, type }: any) {
+	for (const map of config.eps.mapping) {
+		if (map.custom) {
+			const resType = map.custom({ propertyName, type });
+			if (resType) return resType;
+		}
+		if (map.test) {
+			if (map.test.includes(type)) return map.type;
+		}
+	}
+	return type;
+}
+
+/**
+ * 格式化方法名，去除特殊字符
+ */
+function formatName(name: string) {
+	return (name || "").replace(/[:,\s,\/,-]/g, "");
+}
+
+/**
+ * 检查方法名是否合法（不包含特殊字符）
+ */
+function checkName(name: string) {
+	return name && !["{", "}", ":"].some((e) => name.includes(e));
+}
+
+/**
+ * 不支持 uniapp-x 平台显示
+ */
+function noUniappX(text: string) {
+	if (config.type == "uniapp-x") {
+		return "";
+	} else {
+		return text;
+	}
+}
+
 /**
  * 查找字段
  * @param sources 字段 source 数组
@@ -88,8 +130,7 @@ async function formatCode(text: string): Promise<string | null> {
 			printWidth: 100,
 			trailingComma: "none",
 		})
-		.catch((err) => {
+		.catch(() => {
-			console.log(err);
 			error(
 				`[cool-eps] Failed to format /build/cool/eps.d.ts. Please delete the file and try again`,
 			);
@@ -139,6 +180,8 @@ async function getData() {
 			};
 		}
 	});
+
+	list = list.filter((e) => e.prefix.startsWith("/app"));
 }
 
 /**
@@ -179,36 +222,6 @@ function createJson(): boolean {
  * @param param0 list: eps实体列表, service: service对象
  */
 async function createDescribe({ list, service }: { list: Eps.Entity[]; service: any }) {
-	/**
-	 * 获取字段类型
-	 */
-	function getType({ propertyName, type }: any) {
-		for (const map of config.eps.mapping) {
-			if (map.custom) {
-				const resType = map.custom({ propertyName, type });
-				if (resType) return resType;
-			}
-			if (map.test) {
-				if (map.test.includes(type)) return map.type;
-			}
-		}
-		return type;
-	}
-
-	/**
-	 * 格式化方法名，去除特殊字符
-	 */
-	function formatName(name: string) {
-		return (name || "").replace(/[:,\s,\/,-]/g, "");
-	}
-
-	/**
-	 * 检查方法名是否合法（不包含特殊字符）
-	 */
-	function checkName(name: string) {
-		return name && !["{", "}", ":"].some((e) => name.includes(e));
-	}
-
 	/**
 	 * 创建 Entity 接口定义
 	 */
@@ -222,14 +235,10 @@ async function createDescribe({ list, service }: { list: Eps.Entity[]; service:
 			let t = `interface ${formatName(item.name)} {`;
 
 			// 合并 columns 和 pageColumns，去重
-			const columns: Eps.Column[] = [];
+			const columns: Eps.Column[] = uniqBy(
-			[item.columns, item.pageColumns]
+				compact([...(item.columns || []), ...(item.pageColumns || [])]),
-				.flat()
+				"source",
-				.filter(Boolean)
+			);
-				.forEach((e) => {
-					const d = columns.find((c) => c.source == e.source);
-					if (!d) columns.push(e);
-				});
 
 			for (const col of columns || []) {
 				t += `
@@ -337,29 +346,23 @@ async function createDescribe({ list, service }: { list: Eps.Entity[]; service:
 									// 实体名
 									const en = item.name || "any";
 
-									switch (a.path) {
+									if (config.type == "uniapp-x") {
-										case "/page":
+										res = "any";
-											if (config.type == "uniapp-x") {
+									} else {
+										switch (a.path) {
+											case "/page":
 												res = `PageResponse<${en}>`;
-											} else {
+												break;
-												res = `
+											case "/list":
-												{
+												res = `${en} []`;
-													pagination: PaginationData;
+												break;
-													list: ${en} [];
+											case "/info":
-													[key: string]: any;
+												res = en;
-												}
+												break;
-												`;
+											default:
-											}
+												res = "any";
-											break;
+												break;
-										case "/list":
+										}
-											res = `${en} []`;
-											break;
-										case "/info":
-											res = en;
-											break;
-										default:
-											res = "any";
-											break;
 									}
 
 									// 方法描述
@@ -376,27 +379,26 @@ async function createDescribe({ list, service }: { list: Eps.Entity[]; service:
 								}
 							});
 
-							if (config.type != "uniapp-x") {
+							// 权限标识
-								// 权限标识
+							t += noUniappX(`
-								t += `
+								/**
-									/**
+								 * 权限标识
-									 * 权限标识
+								 */
-									 */
+								permission: { ${permission.map((e) => `${e}: string;`).join("\n")} };
-									permission: { ${permission.map((e) => `${e}: string;`).join("\n")} };
+							`);
-								`;
 
-								// 权限状态
+							// 权限状态
-								t += `
+							t += noUniappX(`
-									/**
+								/**
-									 * 权限状态
+								 * 权限状态
-									 */
+								 */
-									_permission: { ${permission.map((e) => `${e}: boolean;`).join("\n")} };
+								_permission: { ${permission.map((e) => `${e}: boolean;`).join("\n")} };
-								`;
+							`);
-							}
 
-							t += `
+							// 请求
-								request: Request
+							t += noUniappX(`
-							`;
+								request: Request;
+							`);
 						}
 
 						t += "}\n\n";
@@ -418,40 +420,37 @@ async function createDescribe({ list, service }: { list: Eps.Entity[]; service:
 		return `
 			type json = any;
 
-			type PaginationData = {
+			interface PagePagination {
 				size: number;
 				page: number;
 				total: number;
+				[key: string]: any;
 			};
 
-			type PageResponse<T> = {
+			interface PageResponse<T> {
-				pagination: PaginationData;
+				pagination: PagePagination;
 				list: T[];
+				[key: string]: any;
 			};
 
 			${controller}
 
-			interface RequestOptions {
+			${noUniappX(`interface RequestOptions {
 				url: string;
 				method?: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
 				data?: any;
 				params?: any;
-				header?: any;
+				headers?: any;
 				timeout?: number;
-				withCredentials?: boolean;
+				[key: string]: any;
-				firstIpv4?: boolean;
+			}`)}
-				enableChunked?: boolean;
-			}
 
-			type Request = (options: RequestOptions) => Promise<any>;
+			${noUniappX("type Request = (options: RequestOptions) => Promise<any>;")}
 
 			${await createDict()}
 
 			type Service = {
-				/**
+				${noUniappX("request: Request;")}
-				 * 基础请求
-				 */
-				request: Request;
 
 				${chain}
 			}
@@ -475,6 +474,7 @@ async function createDescribe({ list, service }: { list: Eps.Entity[]; service:
 			.replaceAll("[key: string]: any;", "");
 
 		text = flatten(text);
+		text = interfaceToType(text);
 	} else {
 		text = `
 			declare namespace Eps {
@@ -565,6 +565,147 @@ function createService() {
 	});
 }
 
+/**
+ * 创建 service 代码
+ * @returns {string} service 代码
+ */
+function createServiceCode(): { content: string; types: string[] } {
+	const types: string[] = [];
+
+	let chain = "";
+
+	/**
+	 * 递归处理 service 树，生成接口代码
+	 * @param d 当前节点
+	 * @param k 前缀
+	 */
+	function deep(d: any, k?: string) {
+		if (!k) k = "";
+
+		for (const i in d) {
+			if (["swagger"].includes(i)) {
+				continue;
+			}
+
+			const name = k + toCamel(firstUpperCase(formatName(i)));
+
+			// 检查方法名
+			if (!checkName(name)) continue;
+
+			if (d[i].namespace) {
+				// 查找配置
+				const item = list.find((e) => (e.prefix || "") === `/${d[i].namespace}`);
+
+				if (item) {
+					//
+					let t = `{`;
+
+					// 插入方法
+					if (item.api) {
+						item.api.forEach((a) => {
+							// 方法名
+							const n = toCamel(formatName(a.name || last(a.path.split("/"))!));
+
+							// 检查方法名
+							if (!checkName(n)) return;
+
+							if (n) {
+								// 参数类型
+								let q: string[] = [];
+
+								// 参数列表
+								const { parameters = [] } = a.dts || {};
+
+								parameters.forEach((p) => {
+									if (p.description) {
+										q.push(`\n/** ${p.description}  */\n`);
+									}
+
+									// 检查参数名
+									if (!checkName(p.name)) {
+										return false;
+									}
+
+									const a = `${p.name}${p.required ? "" : "?"}`;
+									const b = `${p.schema.type || "string"}`;
+
+									q.push(`${a}: ${b}, `);
+								});
+
+								if (isEmpty(q)) {
+									q = ["any"];
+								} else {
+									q.unshift("{");
+									q.push("}");
+								}
+
+								if (item.name) {
+									types.push(item.name);
+								}
+
+								// 返回类型
+								let res = "";
+
+								// 实体名
+								const en = item.name || "any";
+
+								switch (a.path) {
+									case "/page":
+										res = `PageResponse<${en}>`;
+										break;
+									case "/list":
+										res = `${en} []`;
+										break;
+									case "/info":
+										res = en;
+										break;
+									default:
+										res = "any";
+										break;
+								}
+
+								// 方法描述
+								t += `
+									/**
+									 * ${a.summary || n}
+									 */
+									${n}(data${q.length == 1 ? "?" : ""}: ${q.join("")})${noUniappX(`: Promise<${res}>`)} {
+										return request({
+											url: "/${d[i].namespace}${a.path}",
+											method: "${(a.method || "get").toLocaleUpperCase()}",
+											data,
+										});
+									},
+								`;
+							}
+						});
+					}
+
+					t += `} as ${name}\n`;
+
+					types.push(name);
+
+					chain += `${formatName(i)}: ${t},\n`;
+				}
+			} else {
+				chain += `${formatName(i)}: {`;
+				deep(d[i], name);
+				chain += `} as ${firstUpperCase(i)}Interface,`;
+
+				types.push(`${firstUpperCase(i)}Interface`);
+			}
+		}
+	}
+
+	// 遍历 service 树
+	deep(service);
+
+	return {
+		content: `{ ${chain} }`,
+		types,
+	};
+}
+
 /**
  * 获取字典类型定义
  * @returns {Promise<string>} 字典类型 type 定义
@@ -606,7 +747,6 @@ async function createDict(): Promise<string> {
 
 /**
  * 主入口：创建 eps 相关文件和 service
- * @returns {Promise<{service: any, list: Eps.Entity[], isUpdate?: boolean}>}
  */
 export async function createEps() {
 	if (config.eps.enable) {
@@ -616,6 +756,8 @@ export async function createEps() {
 		// 构建 service 对象
 		createService();
 
+		const serviceCode = createServiceCode();
+
 		// 创建 eps 目录
 		createDir(getEpsPath(), true);
 
@@ -627,6 +769,7 @@ export async function createEps() {
 
 		return {
 			service,
+			serviceCode,
 			list,
 			isUpdate,
 		};

packages/vite-plugin/src/uniapp-x/code.ts

@@ -3,18 +3,18 @@ import { SAFE_CHAR_MAP } from "./config";
 import { createCtx } from "../ctx";
 import { readFile, rootDir } from "../utils";
 import { createEps } from "../eps";
+import { uniq } from "lodash";
 
-export async function codePlugin(): Promise<Plugin[]> {
+export function codePlugin(): Plugin[] {
-	const ctx = await createCtx();
-	const eps = await createEps();
-	const theme = await readFile(rootDir("theme.json"), true);
-
 	return [
 		{
 			name: "vite-cool-uniappx-code-pre",
 			enforce: "pre",
 			async transform(code, id) {
-				if (id.includes("/cool/virtual.ts")) {
+				if (id.includes("/cool/ctx/index.ts")) {
+					const ctx = await createCtx();
+					const theme = await readFile(rootDir("theme.json"), true);
+
 					ctx["SAFE_CHAR_MAP"] = [];
 					for (const i in SAFE_CHAR_MAP) {
 						ctx["SAFE_CHAR_MAP"].push([i, SAFE_CHAR_MAP[i]]);
@@ -27,10 +27,24 @@ export async function codePlugin(): Promise<Plugin[]> {
 						`const ctx = ${JSON.stringify(ctx, null, 4)}`,
 					);
 
-					code = code.replace(
+					return {
-						"const eps = {}",
+						code,
-						`const eps = ${JSON.stringify(eps, null, 4).replaceAll("[]", "[] as any[]")}`,
+						map: { mappings: "" },
-					);
+					};
+				}
+
+				if (id.includes("/cool/service/index.ts")) {
+					const eps = await createEps();
+
+					if (eps.serviceCode) {
+						const { content, types } = eps.serviceCode;
+						const typeCode = `import type { ${uniq(types).join(", ")} } from '../types';`;
+
+						code =
+							typeCode +
+							"\n\n" +
+							code.replace("const service = {}", `const service = ${content}`);
+					}
 
 					return {
 						code,

packages/vite-plugin/src/uniapp-x/flatten.ts

@@ -9,6 +9,8 @@ interface ParseResult {
 	key: string;
 	/** 解析出的内容 */
 	content: string;
+	/** 层级 */
+	level: number;
 }
 
 /**
@@ -31,7 +33,7 @@ export function flatten(template: string): string {
 	let serviceFields = "";
 
 	// 解析内容并生成接口定义
-	parse(serviceContent).forEach(({ key, content }) => {
+	parse(serviceContent).forEach(({ key, content, level }) => {
 		interfaces += `\nexport interface ${firstUpperCase(key)}Interface {${content}}\n`;
 		serviceFields += `${key}: ${firstUpperCase(key)}Interface;`;
 	});
@@ -68,7 +70,7 @@ function findClosingBrace(str: string, startIndex: number): number {
  * @param content - 要解析的内容字符串
  * @returns 解析结果数组，包含解析出的键值对
  */
-function parse(content: string): ParseResult[] {
+function parse(content: string, level: number = 0): ParseResult[] {
 	// 匹配形如 xxx: { ... } 的结构
 	const interfacePattern = /(\w+)\s*:\s*\{/g;
 	const result: ParseResult[] = [];
@@ -83,7 +85,7 @@ function parse(content: string): ParseResult[] {
 
 			// 处理嵌套结构
 			if (parsedContent.includes("{") && parsedContent.includes("}")) {
-				const nestedInterfaces = parse(parsedContent);
+				const nestedInterfaces = parse(parsedContent, level + 1);
 
 				// 替换嵌套的内容为接口引用
 				if (nestedInterfaces.length > 0) {
@@ -98,6 +100,7 @@ function parse(content: string): ParseResult[] {
 			// 将解析结果添加到数组开头
 			result.unshift({
 				key: match[1],
+				level,
 				content: parsedContent,
 			});
 		}

packages/vite-plugin/src/uniapp-x/index.ts

@@ -12,7 +12,7 @@ export async function uniappX() {
 	const plugins: Plugin[] = [];
 
 	if (config.type == "uniapp-x") {
-		plugins.push(...(await codePlugin()));
+		plugins.push(...codePlugin());
 
 		if (config.tailwind.enable) {
 			plugins.push(...tailwindPlugin());

packages/vite-plugin/src/uniapp-x/utils.ts

@@ -236,3 +236,20 @@ export function isTailwindClass(className: string): boolean {
 
 	return false;
 }
+
+/**
+ * 将 interface 转换为 type
+ */
+export function interfaceToType(code: string) {
+	// 匹配 interface 定义
+	const interfaceRegex = /interface\s+(\w+)(\s*extends\s+\w+)?\s*\{([^}]*)\}/g;
+
+	// 将 interface 转换为 type
+	return code.replace(interfaceRegex, (match, name, extends_, content) => {
+		// 处理可能存在的 extends
+		const extendsStr = extends_ ? extends_ : "";
+
+		// 返回转换后的 type 定义
+		return `type ${name}${extendsStr} = {${content}}`;
+	});
+}