@_tc/template-core 0.0.1-bate.36 → 0.0.1-bate.38

package/esm/packages/core/index.js

@@ -1,4 +1,3 @@
-import { __require } from "../../_virtual/_rolldown/runtime.js";
 import env_default from "./env.js";
 import { resolve } from "../utils/path.js";
 import { runFileFn } from "../utils/runFileFn.js";
@@ -16,9 +15,12 @@ import Koa from "koa";
 var loaderModel = modelLoader;
 var start = (options = {}) => {
 	const app = new Koa();
-	const { frameBaseDir: _frameBaseDir, ..._options } = options;
+	app.hooks = {};
+	app.hooks.initing?.();
+	const { frameBaseDir: _frameBaseDir, baseDir: businessPath, ..._options } = options;
 	app.options = _options;
-	const baseDir = app.baseDir = process.cwd();
+	app.options.pageBasePage = app.options.pageBasePage ?? "/";
+	const baseDir = app.baseDir = businessPath ?? process.cwd();
 	const frameBaseDir = app.frameBaseDir = _frameBaseDir ?? resolve(__dirname, "..");
 	app.businessPath = resolve(baseDir, "app");
 	app.framePath = resolve(frameBaseDir, "app");
@@ -30,50 +32,52 @@ var start = (options = {}) => {
 		path: app.businessPath
 	}];
 	app.envs = env_default();
-	console.log(`-- [start] env: ${app.envs.get()} --`);
+	console.log(`-- [init] env: ${app.envs.get()} --`);
 	/**
 	* 第一个挂载
 	* 方便后续 所有带有app的方法中可以通过 app.config 获取配置
 	*/
 	config_default(app);
-	console.log(`-- [start] loader config done --`);
+	console.log(`-- [init] loader config done --`);
 	/**
 	* 	第二个挂载 扩展的方法
 	* 	因不确定会在何处调用 app.[extendFN]
 	*  所以需要调高挂载顺序
 	*/
 	extend_default(app);
-	console.log(`-- [start] loader extend done --`);
+	console.log(`-- [init] loader extend done --`);
 	/**
 	*	参数校验规则，在中间件之前即可
 	*/
 	router_schema_default(app);
-	console.log(`-- [start] loader routerSchema done --`);
+	console.log(`-- [init] loader routerSchema done --`);
 	/**
 	*   service 在 controller 之前即可
 	*  以下俩loader在router前即可
 	*/
 	service_default(app);
-	console.log(`-- [start] loader service done --`);
+	console.log(`-- [init] loader service done --`);
 	controller_default(app);
-	console.log(`-- [start] loader controller done --`);
+	console.log(`-- [init] loader controller done --`);
 	/**
 	* 挂载中间件文件
 	*/
 	middleware_default(app);
-	console.log(`-- [start] loader middleware done --`);
+	console.log(`-- [init] loader middleware done --`);
 	mountMiddleware(app);
 	router_default(app);
-	console.log(`-- [start] loader router done --`);
+	console.log(`-- [init] loader router done --`);
 	try {
 		const _p = app.config.port || process.env.PORT || "8080";
 		const port = parseInt(_p + "", 10);
 		const host = process.env.IP || "0.0.0.0";
 		app.listen(port, host);
-		console.log(`Server port:${port}`);
+		console.log(`Server port: http://localhost:${port}`);
+		console.log(`run env is ${env_default().get()}`);
 	} catch (error) {
 		console.error(error);
 	}
+	app.hooks.inited?.();
 	return app;
 };
 var mountMiddleware = (app) => {
@@ -83,8 +87,8 @@ var mountMiddleware = (app) => {
 		for (const fileSymbol of ["ts", "js"]) {
 			const fileName = `middleware.${fileSymbol}`;
 			try {
-				runFileFn(__require(resolve(pathInfo.path, fileName)))?.(app);
-				console.log(`-- [start] loader ${pathInfo.type} appMiddlerare ${fileName} done -- (${pathInfo.path})`);
+				runFileFn(resolve(pathInfo.path, fileName))?.(app);
+				console.log(`-- [init] loader ${pathInfo.type} appMiddlerare ${fileName} done -- (${pathInfo.path})`);
 				loaded = true;
 				break;
 			} catch (error) {

package/esm/packages/core/loader/config.js

@@ -1,12 +1,13 @@
-import { __require } from "../../../_virtual/_rolldown/runtime.js";
 import { resolve } from "../../utils/path.js";
 import { getAllFilesInFolder } from "../../utils/getAllFilesInFolder.js";
+import { runFileFn } from "../../utils/runFileFn.js";
+import "../../utils/index.js";
 //#region packages/core/loader/config.ts
 /**
 * config loader 只处理一级
 *
 * @param app 加载 xx/config/ 下的文件
-*  config/config.default.js
+*  config/config.default.(js|ts)
 */
 var config_default = (app) => {
 	const files = getAllFilesInFolder(app.baseDir, "config");
@@ -26,7 +27,7 @@ var config_default = (app) => {
 			configMap[k] = true;
 			const configFile = configPath.reduce((preData, currentPath) => ({
 				...preData,
-				...__require(resolve(currentPath))
+				...runFileFn(resolve(currentPath))
 			}), {});
 			envConfig = [envConfig, configFile][k === "default" ? "reduceRight" : "reduce"]((o, c) => ({
 				...o,

package/esm/packages/core/loader/controller.js

@@ -1,6 +1,4 @@
-import { __require } from "../../../_virtual/_rolldown/runtime.js";
 import { getAppPaths } from "../paths.js";
-import { resolve } from "../../utils/path.js";
 import { loadFileFn } from "../../utils/loadFile.js";
 import { runFileFn } from "../../utils/runFileFn.js";
 import "../../utils/index.js";
@@ -13,7 +11,7 @@ app/controller
 
 |-- cuStom-moduLe
 
-|-- custom-midd Leware.js
+|-- custom-midd Leware.(js|ts)
 
 => app.controller.customModule. customMiddleware
 *
@@ -26,7 +24,7 @@ var controller_default = (app) => {
 	app.controller = getAppPaths(app).reduce((preData, currentPath) => ({
 		...preData,
 		...loadFileFn(currentPath, "controller", { loadFileCallback: (file) => {
-			return new (runFileFn(__require(resolve(file)))(app))();
+			return new (runFileFn(file)(app))();
 		} })
 	}), {});
 };

package/esm/packages/core/loader/extend.js

@@ -1,6 +1,4 @@
-import { __require } from "../../../_virtual/_rolldown/runtime.js";
 import { getAppPaths } from "../paths.js";
-import { resolve } from "../../utils/path.js";
 import { loadFileFn } from "../../utils/loadFile.js";
 import { runFileFn } from "../../utils/runFileFn.js";
 import "../../utils/index.js";
@@ -19,7 +17,7 @@ var extend_default = (app) => {
 					console.log("\x1B[31m%s\x1B[0m", `[extend loader error] name:${fileName} is already in app`);
 					return;
 				}
-				const exs = runFileFn(__require(resolve(filePath)))(app);
+				const exs = runFileFn(filePath)(app);
 				if (exs instanceof Promise) (async () => {
 					app.extends[fileName] = await exs;
 				})();

package/esm/packages/core/loader/middleware.js

@@ -1,4 +1,3 @@
-import { __require } from "../../../_virtual/_rolldown/runtime.js";
 import { getAppPaths } from "../paths.js";
 import { loadFileFn } from "../../utils/loadFile.js";
 import { runFileFn } from "../../utils/runFileFn.js";
@@ -14,12 +13,11 @@ import "../../utils/index.js";
 */
 var middleware_default = (app) => {
 	/**
-	* xx/app/middleware/a/a.js -> app.middleware.a.a =
-	*  require('app/middleware/a/a.js')(app)
+	* xx/app/middleware/a/a.(js|ts) -> app.middleware.a.a
 	*/
 	app.middlewares = getAppPaths(app).reduce((preData, currentPath) => {
 		const middlewares = loadFileFn(currentPath, "middleware", { loadFileCallback: (path) => {
-			return runFileFn(__require(path))(app);
+			return runFileFn(path)(app);
 		} });
 		return {
 			...preData,

package/esm/packages/core/loader/model.js

@@ -1,10 +1,10 @@
-import { __require } from "../../../_virtual/_rolldown/runtime.js";
 import { loadFileFn } from "../../utils/loadFile.js";
+import { runFileFn } from "../../utils/runFileFn.js";
 import { sep } from "path";
 import _ from "lodash";
 //#region packages/core/loader/model.ts
 /**
-*
+* 获取使用方的 跟路径下的 model文件夹
 * @param app
 */
 var modelLoader = (app) => {
@@ -16,10 +16,10 @@ var modelLoader = (app) => {
 	/**
 	*  1.遍历当前文件夹
 	*  2.根据路径区分 model ｜ project
-	*  3.根据不同的 类型后去key
+	*  3.根据不同的 类型 获取key
 	*/
 loadFileCallback: (file) => {
-		if (file.indexOf(`model${sep}index.js`) === -1) {
+		if (!isModelIndexFile(file)) {
 			const filePathChunk = file.split(sep);
 			if (filePathChunk[filePathChunk.length - 2] === "project") {
 				const modelKey = filePathChunk[filePathChunk.length - 3];
@@ -75,7 +75,7 @@ var setProject = (config, modelKey, key, file) => {
 	const projectItem = {
 		key,
 		modelKey,
-		...__require(file)
+		...runFileFn(file)
 	};
 	currentModel.project[key] = projectItem;
 };
@@ -91,16 +91,19 @@ var setModel = (config, key, filePath) => {
 	if (!modelItem) {
 		const newModel = {
 			model: { key },
-			project: { key }
+			project: {}
 		};
 		config.push(newModel);
 		modelItem = newModel;
 	}
 	if (filePath) modelItem.model = {
-		...__require(filePath),
+		...runFileFn(filePath),
 		key
 	};
 	return modelItem;
 };
+function isModelIndexFile(file) {
+	return file.indexOf(`model${sep}index.js`) !== -1 || file.indexOf(`model${sep}index.ts`) !== -1;
+}
 //#endregion
 export { modelLoader as default };

package/esm/packages/core/loader/router-schema.js

@@ -1,7 +1,8 @@
-import { __require } from "../../../_virtual/_rolldown/runtime.js";
 import { getAppPaths } from "../paths.js";
 import { resolve } from "../../utils/path.js";
 import { loadFileFn } from "../../utils/loadFile.js";
+import { runFileFn } from "../../utils/runFileFn.js";
+import "../../utils/index.js";
 //#region packages/core/loader/router-schema.ts
 /**
 *
@@ -9,7 +10,7 @@ import { loadFileFn } from "../../utils/loadFile.js";
 *
 * @param app
 *
-* xx/app/router-schema/**.js
+* xx/app/router-schema/**.(js|ts)
 *
 * 输出：
 *  app.routerSchema = {
@@ -24,7 +25,7 @@ var router_schema_default = (app) => {
 		loadFileFn(currentPath, "router-schema", { preProcessingFileCallback(file) {
 			routerSchema = {
 				...routerSchema,
-				...__require(resolve(file))
+				...runFileFn(resolve(file))
 			};
 		} });
 	});

package/esm/packages/core/loader/router.js

@@ -1,9 +1,9 @@
-import { __require } from "../../../_virtual/_rolldown/runtime.js";
 import { getAppPath, getAppPaths } from "../paths.js";
 import { resolve } from "../../utils/path.js";
 import { loadFileFn } from "../../utils/loadFile.js";
 import { runFileFn } from "../../utils/runFileFn.js";
 import "../../utils/index.js";
+import { existsSync } from "fs";
 import KoaRouter from "koa-router";
 //#region packages/core/loader/router.ts
 /**
@@ -12,25 +12,33 @@ import KoaRouter from "koa-router";
 * 解析 xx/app/router/下的所有文件 加载到 koa-router上
 */
 var router_default = (app) => {
-	const router = new KoaRouter();
 	let routerGuard;
-	try {
-		const businessPath = getAppPath(app, "business");
-		if (businessPath) routerGuard = runFileFn(__require(resolve(businessPath, "router-guard.js")))(app);
-	} catch (error) {
-		console.info("-- [router-guard] -- not router-guard.js file");
+	const businessPath = getAppPath(app, "business");
+	if (businessPath) for (const fileName of ["router-guard.ts", "router-guard.js"]) {
+		const filePath = resolve(businessPath, fileName);
+		if (existsSync(filePath)) {
+			routerGuard = runFileFn(filePath)(app);
+			break;
+		}
 	}
+	if (!routerGuard) console.info("-- [router-guard] -- not router-guard.(ts|js) file");
+	const routers = [];
 	getAppPaths(app).forEach((currentPath) => {
 		loadFileFn(currentPath, "router", { preProcessingFileCallback: (filePath) => {
+			const router = new KoaRouter();
+			router.level = 0;
+			routers.push(router);
 			/**
 			*  module.export = (app,router) => {
 			*      router.get('/xxx/xxxx', app.controller)
 			*  }
 			*/
-			runFileFn(__require(resolve(filePath)))(app, router);
+			runFileFn(resolve(filePath))(app, router);
 		} });
 	});
-	router.get("(.*)", async (ctx, _next) => {
+	const BaseRouters = new KoaRouter();
+	BaseRouters.level = 99;
+	BaseRouters.get("(.*)", async (ctx, _next) => {
 		console.info("\x1B[31m%s\x1B[0m", `-- notFound path: ${ctx.path} --`);
 		ctx.status = 302;
 		const executionResults = routerGuard?.(ctx);
@@ -40,9 +48,13 @@ var router_default = (app) => {
 			ctx.body = "notFound";
 		}
 	});
-	app.use(router.routes());
-	app.use(router.allowedMethods());
-	app.currentUseRouter = router;
+	routers.push(BaseRouters);
+	routers.sort((r, nr) => (r.level ?? 0) < (nr.level ?? 0) ? -1 : 1);
+	routers.forEach((r) => {
+		app.use(r.routes());
+		app.use(r.allowedMethods());
+	});
+	app.currentUseRouter = routers;
 };
 //#endregion
 export { router_default as default };

package/esm/packages/core/loader/service.js

@@ -1,4 +1,3 @@
-import { __require } from "../../../_virtual/_rolldown/runtime.js";
 import { getAppPaths } from "../paths.js";
 import { loadFileFn } from "../../utils/loadFile.js";
 import { runFileFn } from "../../utils/runFileFn.js";
@@ -12,7 +11,7 @@ app/service
 
 |-- cuStom-moduLe
 
-|-- custom-midd Leware.js
+|-- custom-midd Leware.(js|ts)
 
 => app.service.customModule. customMiddleware
 *
@@ -22,7 +21,7 @@ var service_default = (app) => {
 	app.service = getAppPaths(app).reduce((preData, currentPath) => ({
 		...preData,
 		...loadFileFn(currentPath, "service", { loadFileCallback: (file) => {
-			return new (runFileFn(__require(file))(app))();
+			return new (runFileFn(file)(app))();
 		} })
 	}), {});
 };

package/esm/packages/utils/runFileFn.js

@@ -1,4 +1,50 @@
+import { __require } from "../../_virtual/_rolldown/runtime.js";
+import { extname } from "path";
+import { readFileSync } from "fs";
 //#region packages/utils/runFileFn.ts
-var runFileFn = (fn) => typeof fn === "function" ? fn : fn.default;
+var registeredTypeScriptLoader = false;
+function runFileFn(fileOrModule) {
+	return getDefaultExport(typeof fileOrModule === "string" ? requireFile(fileOrModule) : fileOrModule);
+}
+function getDefaultExport(fileModule) {
+	if (fileModule && typeof fileModule === "object" && "default" in fileModule && fileModule.default !== void 0) return fileModule.default;
+	return fileModule;
+}
+function requireFile(file) {
+	try {
+		return __require(file);
+	} catch (error) {
+		if (extname(file) !== ".ts" || !shouldRetryWithTypeScript(error)) throw error;
+		registerTypeScriptLoader();
+		delete __require.cache[__require.resolve(file)];
+		return __require(file);
+	}
+}
+function shouldRetryWithTypeScript(error) {
+	const err = error;
+	const message = err?.message ?? "";
+	return err?.code === "ERR_UNKNOWN_FILE_EXTENSION" || err?.code === "ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX" || err?.name === "SyntaxError" || message.indexOf("Cannot use import statement outside a module") !== -1 || message.indexOf("Unexpected token 'export'") !== -1;
+}
+function registerTypeScriptLoader() {
+	if (registeredTypeScriptLoader) return;
+	const typescript = loadTypeScriptCompiler();
+	__require.extensions[".ts"] = (module, filename) => {
+		const { outputText } = typescript.transpileModule(readFileSync(filename, "utf8"), { compilerOptions: {
+			module: typescript.ModuleKind.CommonJS,
+			target: typescript.ScriptTarget.ES2020,
+			esModuleInterop: true,
+			allowSyntheticDefaultImports: true
+		} });
+		module._compile(outputText, filename);
+	};
+	registeredTypeScriptLoader = true;
+}
+function loadTypeScriptCompiler() {
+	try {
+		return __require("typescript");
+	} catch (error) {
+		throw new Error(`Unable to load TypeScript file. Please install "typescript" or run with a TypeScript runtime. ${String(error)}`);
+	}
+}
 //#endregion
 export { runFileFn };

package/fe/frontend/dash/Dashboard.d.ts

@@ -0,0 +1,7 @@
+import { PropsWithChildren } from 'react';
+declare const Dashboard: {
+    (props: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+    displayName: string;
+};
+export default Dashboard;
+//# sourceMappingURL=Dashboard.d.ts.map

package/fe/frontend/dash/Dashboard.js

@@ -0,0 +1,73 @@
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useMemo, useRef, useState } from 'react';
+import { Outlet, useNavigate } from 'react-router-dom';
+import { generateMenuItemData } from '../widgets/common/generateMenuData';
+import { findMenuItem, leftSidebarBasePath } from '../widgets/common/menu';
+import HeaderView from '../widgets/components/BasePage/HeaderView';
+import useRouterParams from '../widgets/hooks/useRouterParams';
+import { useModeStore } from '../widgets/store/mode';
+import { Menu } from '../../packages/ui/react/components';
+import useInit from '../../packages/ui/react/hooks/useInit';
+const Dashboard = (props) => {
+    const { initModeData, initData, projestInfo } = useModeStore();
+    useInit(initModeData);
+    const isInit = useRef(false);
+    const params = useRouterParams();
+    const [SK, uSK] = useState(params.key ?? params.custk);
+    const nav = useNavigate();
+    const menu = useMemo(() => {
+        if (initData && projestInfo?.menuLayout === 'top') {
+            const menuData = generateMenuItemData(projestInfo.menu);
+            return (_jsx(Menu, { className: " w-full", mode: "top", items: menuData, selectedKey: SK, onSelect: (e) => {
+                    uSK(e);
+                    const m = findMenuItem(projestInfo.menu, e);
+                    m && nav(m?.path);
+                } }));
+        }
+        return _jsx(_Fragment, {});
+    }, [initData, projestInfo, SK, nav]);
+    // 重定向 处理
+    useEffect(() => {
+        if (initData && projestInfo) {
+            if (isInit.current)
+                return;
+            if (projestInfo.menuLayout !== 'top') {
+                console.log('left sidebar');
+                // 如果有参数 说明跳转的不是 根路径 并且路径带有专属前缀
+                if (Object.keys(params).length && location.pathname.includes(`/${leftSidebarBasePath}`)) {
+                    return;
+                }
+                const m = findMenuItem(projestInfo.menu);
+                // projestInfo?.menu
+                nav({
+                    pathname: `/${leftSidebarBasePath}${m.path.pathname}`,
+                    search: m.path.search,
+                }, {
+                    replace: true,
+                });
+            }
+            else {
+                // top
+                console.log('top sidebar');
+                if (
+                // 根路径
+                !Object.keys(params).length ||
+                    // 残留路径
+                    location.pathname.includes(`/${leftSidebarBasePath}`)) {
+                    // 重定向
+                    const m = findMenuItem(projestInfo.menu);
+                    // 因为这是父容器 所以只会初始化一次
+                    // 重定向后不会走初始化流程 重新获取key
+                    uSK(m.key);
+                    nav(m.path, {
+                        replace: true,
+                    });
+                }
+            }
+            isInit.current = true;
+        }
+    }, [initData, projestInfo, params, nav]);
+    return (_jsxs("div", { className: "dash-main h-screen flex flex-col", children: [_jsx(HeaderView, { title: projestInfo?.desc, menu: menu }), _jsx("div", { className: "dash-container p-1.5 flex-1", children: _jsx(Outlet, {}) })] }));
+};
+Dashboard.displayName = 'Dashboard';
+export default Dashboard;

package/fe/frontend/dash/dash.entry.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=dash.entry.d.ts.map

package/fe/frontend/dash/dash.entry.js

@@ -0,0 +1,80 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { renderImportComponent } from '../widgets/common/importComponent';
+import { leftSidebarBasePath, QK } from '../widgets/common/menu';
+import { initApp } from '../main';
+import Dashboard from './Dashboard';
+const baseRoutes = [
+    {
+        path: '/',
+        component: _jsx(Dashboard, {}),
+        children: [
+            {
+                path: `/:${QK.k}`,
+                component: renderImportComponent(import('../widgets/defaultPages/SlotPage')),
+            },
+            {
+                path: `/testPage`,
+                component: renderImportComponent(import('../testPage')),
+            },
+            //
+            {
+                path: `todo`,
+                component: renderImportComponent(import('../widgets/defaultPages/Todo')),
+            },
+            // sidebarRoutes 追加在这
+            // {
+            //   path: "/iframe",
+            //   component: renderImportComponent(import("../defaultPages/Iframe")),
+            // },
+            // {
+            //   path: "/schema",
+            //   component: renderImportComponent(import("../defaultPages/Schema")),
+            // },
+            // 插入自定义路由
+        ],
+    },
+];
+const sidebarRoutes = [
+    {
+        // path: `/:${QK.k}/:${QK.sk}`,
+        path: `/:${QK.k}/*`,
+        component: renderImportComponent(import('../widgets/defaultPages/SidebarSlotPage')),
+        children: [
+            {
+                path: `todo`,
+                component: renderImportComponent(import('../widgets/defaultPages/Todo')),
+            },
+            {
+                path: `:${QK.sk}`,
+                component: renderImportComponent(import('../widgets/defaultPages/SlotPage')),
+            },
+            // {
+            //   path: "schema",
+            //   component: renderImportComponent(import("../defaultPages/Schema")),
+            // },
+            // 插入自定义路由
+        ],
+    },
+    {
+        path: `/${leftSidebarBasePath}/*`,
+        component: renderImportComponent(import('../widgets/defaultPages/SidebarSlotPageTmp')),
+        children: [
+            {
+                path: `todo`,
+                component: renderImportComponent(import('../widgets/defaultPages/Todo')),
+            },
+            {
+                path: `:${QK.sk}`,
+                component: renderImportComponent(import('../widgets/defaultPages/SlotPage')),
+            },
+        ],
+    },
+];
+const getDefaultPageRoutes = () => {
+    //   getBusinessRoutes(baseRoutes, sidebarRoutes[0]?.childrens ?? []);
+    baseRoutes[0]?.children?.push(...sidebarRoutes);
+    return [...baseRoutes];
+};
+initApp(({ children }) => _jsx("div", { className: "dash", children: children }), {
+    routes: getDefaultPageRoutes(),
+});

package/fe/frontend/index.d.ts

@@ -0,0 +1,3 @@
+export * from './main';
+export type { FormFieldSchema, SchemaFormBusinessComponentsMap, SchemaFormNamespace, SelectProps, } from '../packages/ui/react';
+//# sourceMappingURL=index.d.ts.map

package/fe/frontend/index.js

@@ -0,0 +1 @@
+export * from './main';