@gct-paas/core 0.1.5-dev.3 → 0.1.5-dev.5

package/es/utils/kit-pkg-util/kit-pkg-util.mjs

@@ -1,3 +1,5 @@
+import { PluginModeEnum } from "../../enums/plugin-enum.mjs";
+import "../../enums/index.mjs";
 //#region src/utils/kit-pkg-util/kit-pkg-util.ts
 /**
 * 用于加载套件包的工具类
@@ -6,8 +8,7 @@
 * @class KitPkgUtil
 */
 var KitPkgUtil = class {
-	static KIT_PKG_BASE_PATH = "/kits";
-	static cache = /* @__PURE__ */ new Map();
+	static KIT_PKG_BASE_PATH = "/plugin-kit";
 	static joinPaths(...paths) {
 		return paths.filter((p) => p && p.length > 0).map((p, index) => {
 			let normalized = p;
@@ -17,56 +18,66 @@ var KitPkgUtil = class {
 		}).join("/");
 	}
 	/**
-	* 加载套件包配置
+	* 加载套件包，返回套件包入口实例
 	*
 	* @static
 	* @param {string} kit
-	* @return {*}  {(Promise<IKitInfo | undefined>)}
+	* @param {PluginModeEnum} mode
+	* @return {*}  {(Promise<IPluginKitModule | null>)}
 	*/
-	static async loadKitPkgInfo(kit) {
-		if (this.cache.has(kit)) return this.cache.get(kit);
+	static async loadKit(kit, mode) {
+		const loaderUrl = this.joinPaths(this.KIT_PKG_BASE_PATH, kit, mode, "loader.esm.min.js");
 		try {
-			const url = this.joinPaths(this.KIT_PKG_BASE_PATH, kit.toUpperCase(), "kit-info.json");
-			const response = await fetch(url);
-			if (!response.ok) throw new Error(`Failed to load kit package from ${url}`);
-			const config = await response.json();
-			this.cache.set(kit, config);
-			return config;
+			const module = await import(
+				/* @vite-ignore */
+				loaderUrl
+);
+			if (module) return module;
+			else console.warn(`Kit ${kit} does not export a default function`);
 		} catch (error) {
-			console.error(`Error loading kit package ${kit}:`, error);
+			console.error(`Error loading kit ${kit} from ${loaderUrl}:`, error);
 		}
+		return null;
 	}
 	/**
-	* 加载套件包内的插件
+	* 加载设计模式套件包
 	*
 	* @static
-	* @param {App} app
-	* @param {(string | string[])} kit
-	* @param {PluginModeEnum} mode
-	* @return {*}  {Promise<void>}
+	* @param {string} kit
+	* @return {*}  {(Promise<IPluginKitModule | null>)}
 	*/
-	static async loadKits(app, kit, mode) {
-		const kits = Array.isArray(kit) ? kit : [kit];
-		for (const k of kits) {
-			if (this.cache.has(k)) {
-				console.warn(`Kit package ${k} is already loaded, skipping.`);
-				return;
-			}
-			const config = await this.loadKitPkgInfo(k);
-			if (config) {
-				const loaderUrl = this.joinPaths(this.KIT_PKG_BASE_PATH, config.kit.toUpperCase(), mode, `loader.esm.min.js?version=${config.version || "0.0.0"}`);
-				try {
-					const module = await import(
-						/* @vite-ignore */
-						loaderUrl
-);
-					if (module && module.default) app.use(module.default);
-					else console.warn(`Kit ${config.kit} does not export a default function`);
-				} catch (error) {
-					console.error(`Error loading kit ${config.kit} from ${loaderUrl}:`, error);
-				}
-			}
-		}
+	static loadDesign(kit) {
+		return this.loadKit(kit, PluginModeEnum.DESIGN);
+	}
+	/**
+	* 加载移动端绘制模式套件包
+	*
+	* @static
+	* @param {string} kit
+	* @return {*}  {(Promise<IPluginKitModule | null>)}
+	*/
+	static loadMobile(kit) {
+		return this.loadKit(kit, PluginModeEnum.MOBILE);
+	}
+	/**
+	* 加载平板端绘制模式套件包
+	*
+	* @static
+	* @param {string} kit
+	* @return {*}  {(Promise<IPluginKitModule | null>)}
+	*/
+	static loadPad(kit) {
+		return this.loadKit(kit, PluginModeEnum.PAD);
+	}
+	/**
+	* 加载网页端绘制模式套件包
+	*
+	* @static
+	* @param {string} kit
+	* @return {*}  {(Promise<IPluginKitModule | null>)}
+	*/
+	static loadWeb(kit) {
+		return this.loadKit(kit, PluginModeEnum.WEB);
 	}
 };
 //#endregion

package/es/utils/plugin-pkg-util/plugin-pkg-util.d.ts

@@ -1,6 +1,6 @@
 import { PluginModeEnum, Platform } from '../../enums';
 import { PluginTenant } from '@gct-paas/api/platform';
-export type IModuleMap = Record<string, System.Module>;
+export type IModuleMap = Record<string, IObject>;
 export type LoadPluginResult = [PluginTenant[], IModuleMap];
 /**
  * 插件包处理工具类
@@ -28,7 +28,7 @@ export declare class PluginPgkUtil {
      *
      * @static
      */
-    static readonly module: Map<string, System.Module>;
+    static readonly module: Map<string, IObject>;
     protected static joinPaths(...paths: string[]): string;
     /**
      * 加载插件包配置

package/es/utils/tools/tools.d.ts

@@ -11,7 +11,7 @@ export declare function getToken(): string | null;
  * @export
  * @param {string} token
  */
-export declare function setToken(token: string): void;
+export declare function setToken(token?: string): void;
 /**
  * 从 cookie 获取租户标识
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.1.5-dev.3",
+  "version": "0.1.5-dev.5",
   "type": "module",
   "description": "paas 平台核心包",
   "loader": "dist/index.esm.min.js",
@@ -32,7 +32,7 @@
   "author": "gct",
   "dependencies": {
     "@fingerprintjs/fingerprintjs": "^5.1.0",
-    "@gct-paas/api": "^0.1.3",
+    "@gct-paas/api": "0.1.4-dev.0",
     "@module-federation/runtime": "^2.2.3",
     "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
@@ -57,7 +57,7 @@
     "playwright": "^1.58.0"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^0.1.3",
+    "@gct-paas/api": "0.1.4-dev.0",
     "vue": ">=3",
     "vue-i18n": ">=11",
     "vue-router": ">=4"
@@ -65,7 +65,7 @@
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",
     "es:build": "vite build --config vite.dev.config.ts",
-    "build": "npm run lint && vite build --config vite.dev.config.ts && vite build --config vite.config.ts",
+    "build": "npm run lint && vue-tsc --noEmit && vite build --config vite.dev.config.ts && vite build --config vite.config.ts",
     "lint": "eslint src/",
     "test": "vitest",
     "test:run": "vitest run",

package/es/interface/i-kit-info/i-kit-info.d.ts

@@ -1,20 +0,0 @@
-/**
- * 套件配置信息
- *
- * @export
- * @interface IKitInfo
- */
-export interface IKitInfo {
-    /**
-     * 套件名称
-     *
-     * @type {string}
-     */
-    kit: string;
-    /**
-     * 套件版本
-     *
-     * @type {string}
-     */
-    version: string;
-}