@_tc/template-core 0.0.1-bate.29 → 0.0.1-bate.30

package/esm/bundler/utils.js

@@ -1,180 +1,147 @@
+import { resolve as resolve$1 } from "../packages/utils/path.js";
+import "../packages/utils/index.js";
 import path from "path";
 import * as glob from "glob";
 import { build } from "vite";
-import { resolve } from "../packages/utils.js";
-import { copyFileSync, existsSync, readdirSync, readFileSync, rmdirSync, unlinkSync, writeFileSync, } from "fs";
-const base = process.cwd();
-// 瞄准输出后的产物路径
-const framePath = path.resolve(__dirname, "../../");
-const frameNodePath = path.resolve(__dirname, "../");
-const frameFEPath = path.resolve(framePath, "./fe/frontend");
-const runPath = path.resolve(base, ".");
-const runFEPath = path.resolve(runPath, "./frontend");
+import { copyFileSync, existsSync, readFileSync, readdirSync, rmdirSync, unlinkSync, writeFileSync } from "fs";
+import tailwindcss from "@tailwindcss/vite";
+//#region bundler/utils.ts
+var base = process.cwd();
+var framePath = path.resolve(__dirname, "../../");
+var frameNodePath = path.resolve(__dirname, "../");
+var frameFEPath = path.resolve(framePath, "./fe/frontend");
+var runPath = path.resolve(base, ".");
+var runFEPath = path.resolve(runPath, "./frontend");
 /**
- *
- * 寻找 frontend\/**\/*.entry.[j|t]s(x)?
- * 生成入口
- */
-export function entries() {
-    console.log("frameFEPath: ", frameFEPath);
-    console.log("runFEPath: ", runFEPath);
-    /**
-     * 所有包含 entry 的文件
-     */
-    const files = [frameFEPath, runFEPath].reduce((o, fileDir) => {
-        const fileType = ["js", "jsx", "ts", "tsx"].map((fileExtension) => resolve(fileDir, "/**", "/*." + fileExtension));
-        const files = glob
-            .sync(fileType)
-            .filter((fileName) => fileName.includes(".entry."))
-            .filter((fileName) => !fileName.includes(".d.ts"));
-        return [...o, ...files];
-    }, []);
-    const input = {};
-    if (!files.length)
-        return input;
-    /**
-     * 查找 file 同级是否存在 .html 文件
-     * 如果存在直接使用 如果不存在 生成一份
-     */
-    let templateHtml;
-    for (let index = 0; index < files.length; index++) {
-        const filePath = files[index];
-        const fileDIr = path.resolve(filePath, "../");
-        const fileHtml = glob.sync(resolve(fileDIr, "*.html"))[0];
-        if (!fileHtml) {
-            if (!templateHtml) {
-                templateHtml = readFileSync(path.resolve(frameNodePath, "./app/view/entry.tpl"), "utf-8");
-            }
-            //
-            const scriptStr = filePath.split(path.sep).at(-1);
-            const content = templateHtml.replace(`<!-- {{InsertScript}} -->`, `<script type="module" src="./${scriptStr}"></script>`);
-            const htmlName = fileDIr.split(path.sep).at(-1);
-            const htmlPath = path.join(fileDIr, htmlName + ".html");
-            writeFileSync(htmlPath, content);
-            input[htmlName] = htmlPath;
-        }
-        else {
-            fileHtml;
-            const key = path.basename(fileHtml, ".html");
-            input[key] = path.resolve(base, fileHtml);
-        }
-    }
-    // for (const file of readdirSync(base)) {
-    //   if (!file.endsWith(".html")) continue;
-    //   const key = path.basename(file, ".html");
-    //   input[key] = path.resolve(base, file);
-    // }
-    return input;
+*
+* 寻找 frontend\/**\/*.entry.[j|t]s(x)?
+* 生成入口
+*/
+function entries() {
+	console.log("frameFEPath: ", frameFEPath);
+	console.log("runFEPath: ", runFEPath);
+	/**
+	* 所有包含 entry 的文件
+	*/
+	const files = [frameFEPath, runFEPath].reduce((o, fileDir) => {
+		const fileType = [
+			"js",
+			"jsx",
+			"ts",
+			"tsx"
+		].map((fileExtension) => resolve$1(fileDir, "/**", "/*." + fileExtension));
+		const files = glob.sync(fileType).filter((fileName) => fileName.includes(".entry.")).filter((fileName) => !fileName.includes(".d.ts"));
+		return [...o, ...files];
+	}, []);
+	const input = {};
+	if (!files.length) return input;
+	/**
+	* 查找 file 同级是否存在 .html 文件
+	* 如果存在直接使用 如果不存在 生成一份
+	*/
+	let templateHtml;
+	for (let index = 0; index < files.length; index++) {
+		const filePath = files[index];
+		const fileDIr = path.resolve(filePath, "../");
+		const fileHtml = glob.sync(resolve$1(fileDIr, "*.html"))[0];
+		if (!fileHtml) {
+			if (!templateHtml) templateHtml = readFileSync(path.resolve(frameNodePath, "./app/view/entry.tpl"), "utf-8");
+			const scriptStr = filePath.split(path.sep).at(-1);
+			const content = templateHtml.replace(`<!-- {{InsertScript}} -->`, `<script type="module" src="./${scriptStr}"><\/script>`);
+			const htmlName = fileDIr.split(path.sep).at(-1);
+			const htmlPath = path.join(fileDIr, htmlName + ".html");
+			writeFileSync(htmlPath, content);
+			input[htmlName] = htmlPath;
+		} else {
+			const key = path.basename(fileHtml, ".html");
+			input[key] = path.resolve(base, fileHtml);
+		}
+	}
+	return input;
 }
-export function outDir() {
-    // // 为了保持代码 能见性 输出地址应该为 runPath/app/public/dist
-    // 放在框架路径比较保险
-    return path.join(frameNodePath, "./app/public/dist");
+function outDir() {
+	return path.join(frameNodePath, "./app/public/dist");
 }
-export const watchFiles = async (callback) => {
-    const chokidar = await import("chokidar");
-    // 在实际使用时  只有使用方的文件会变化
-    const watcher = chokidar.watch(runFEPath, {
-        ignored: /(^|[\/\\])\../,
-        persistent: true,
-        ignoreInitial: true,
-    });
-    let building = false;
-    watcher.on("change", async (filePath) => {
-        if (building)
-            return;
-        building = true;
-        console.log(`changed: ${filePath}`);
-        await callback?.();
-        console.log("rebuild done");
-        building = false;
-    });
-    console.log(`watching ${runFEPath}/...`);
+var watchFiles = async (callback) => {
+	const watcher = (await import("chokidar")).watch(runFEPath, {
+		ignored: /(^|[\/\\])\../,
+		persistent: true,
+		ignoreInitial: true
+	});
+	let building = false;
+	watcher.on("change", async (filePath) => {
+		if (building) return;
+		building = true;
+		console.log(`changed: ${filePath}`);
+		await callback?.();
+		console.log("rebuild done");
+		building = false;
+	});
+	console.log(`watching ${runFEPath}/...`);
 };
 /**
- *
- * 1. 在 build 结束后
- * 2. 获取输出目录下的html文件
- * 3. 移动内部的html 至 输出目录的根节点
- */
+*
+* 1. 在 build 结束后
+* 2. 获取输出目录下的html文件
+* 3. 移动内部的html 至 输出目录的根节点
+*/
 function flattenHtmlPlugin(suffix = ".html") {
-    return {
-        name: "flatten-html",
-        apply: "build",
-        closeBundle() {
-            const feDir = outDir();
-            if (!existsSync(feDir))
-                return;
-            // 移动文件
-            const htmlFiles = glob.sync("**/*.html", { cwd: feDir });
-            for (const file of htmlFiles) {
-                const src = path.join(feDir, file);
-                let fileOName = path.basename(file, ".html");
-                // 如果文件名没有 entry 补上后缀
-                const entrySuffix = ".entry";
-                if (fileOName.indexOf(entrySuffix) === -1) {
-                    fileOName = fileOName + entrySuffix;
-                }
-                const fileName = fileOName + suffix;
-                const dest = path.join(feDir, fileName);
-                if (src !== dest) {
-                    copyFileSync(src, dest);
-                    unlinkSync(src);
-                }
-            }
-            const parents = [...new Set(htmlFiles.map((f) => path.dirname(f)))]
-                .sort()
-                .reverse();
-            /**
-             *
-             * 删除空的目录
-             */
-            const delEmptyDir = (pathStr) => {
-                const currentDir = existsSync(pathStr) ? readdirSync(pathStr) : [1];
-                if (!currentDir.length) {
-                    rmdirSync(pathStr);
-                    const pa = pathStr.split(path.sep).slice(0, -1);
-                    pa.length && delEmptyDir(pa.join(path.sep));
-                }
-            };
-            for (const dir of parents) {
-                if (dir && dir !== ".") {
-                    const fullPath = path.join(feDir, dir);
-                    delEmptyDir(fullPath);
-                }
-            }
-            /**
-             * ------------------
-             */
-            // 输出最终的 文件路径
-            const endFiles = glob.sync("**/*" + suffix, { cwd: feDir });
-            for (const f of endFiles) {
-                console.log("final file path -----> ", f);
-            }
-        },
-    };
+	return {
+		name: "flatten-html",
+		apply: "build",
+		closeBundle() {
+			const feDir = outDir();
+			if (!existsSync(feDir)) return;
+			const htmlFiles = glob.sync("**/*.html", { cwd: feDir });
+			for (const file of htmlFiles) {
+				const src = path.join(feDir, file);
+				let fileOName = path.basename(file, ".html");
+				const entrySuffix = ".entry";
+				if (fileOName.indexOf(entrySuffix) === -1) fileOName = fileOName + entrySuffix;
+				const fileName = fileOName + suffix;
+				const dest = path.join(feDir, fileName);
+				if (src !== dest) {
+					copyFileSync(src, dest);
+					unlinkSync(src);
+				}
+			}
+			const parents = [...new Set(htmlFiles.map((f) => path.dirname(f)))].sort().reverse();
+			/**
+			*
+			* 删除空的目录
+			*/
+			const delEmptyDir = (pathStr) => {
+				if (!(existsSync(pathStr) ? readdirSync(pathStr) : [1]).length) {
+					rmdirSync(pathStr);
+					const pa = pathStr.split(path.sep).slice(0, -1);
+					pa.length && delEmptyDir(pa.join(path.sep));
+				}
+			};
+			for (const dir of parents) if (dir && dir !== ".") delEmptyDir(path.join(feDir, dir));
+			/**
+			* ------------------
+			*/
+			const endFiles = glob.sync("**/*" + suffix, { cwd: feDir });
+			for (const f of endFiles) console.log("final file path -----> ", f);
+		}
+	};
 }
-export const VBuildFE = async (input) => {
-    // 根据入口构建
-    await build({
-        configFile: false,
-        base: 'dist',
-        plugins: [
-            (await import("@vitejs/plugin-react")).default(),
-            flattenHtmlPlugin(".tpl"),
-        ],
-        build: {
-            outDir: outDir(),
-            emptyOutDir: true,
-            rollupOptions: {
-                input,
-            },
-        },
-        resolve: {
-            alias: {
-                // 需要配置打包后的文件地址
-                "@tc/ui-react": path.resolve(__dirname, "../../fe/packages/ui/react/"),
-            },
-        },
-    });
+var VBuildFE = async (input) => {
+	await build({
+		configFile: false,
+		base: "dist",
+		plugins: [
+			(await import("@vitejs/plugin-react")).default(),
+			flattenHtmlPlugin(".tpl"),
+			tailwindcss()
+		],
+		build: {
+			outDir: outDir(),
+			emptyOutDir: true,
+			rollupOptions: { input }
+		},
+		resolve: { alias: { "@tc/ui-react": path.resolve(__dirname, "../../fe/packages/ui/react/") } }
+	});
 };
+//#endregion
+export { VBuildFE, entries, outDir, watchFiles };

package/esm/index.js

@@ -1,13 +1,18 @@
-import { start } from "./packages/core/index.js";
-import "./app/typings.js";
-import { resolve } from "./packages/utils/index.js";
-import baseControllerFn from "./app/controller/base.js";
-import baseServiceFn from "./app/service/bese.js";
-export const serverStart = (options) => {
-    return start({ ...options, frameBaseDir: resolve(__dirname, ".") });
+import base_default from "./app/controller/base.js";
+import bese_default from "./app/service/bese.js";
+import { start } from "@tc/core";
+import { resolve } from "@tc/utils";
+import modelLoader from "@tc/core/loader/model";
+//#region index.ts
+var serverStart = (options) => {
+	return start({
+		...options,
+		frameBaseDir: resolve(__dirname, ".")
+	});
 };
-export const baseFn = {
-    baseControllerFn,
-    baseServiceFn,
+var baseFn = {
+	baseControllerFn: base_default,
+	baseServiceFn: bese_default
 };
-export { default as modelLoader } from "./packages/core/loader/model.js";
+//#endregion
+export { baseFn, modelLoader, serverStart };

package/esm/packages/core/env.js

@@ -1,23 +1,26 @@
-export default () => {
-    return {
-        isLocal() {
-            return process.env._ENV === 'local';
-        },
-        isBate() {
-            return process.env._ENV === 'bate';
-        },
-        isProd() {
-            return process.env._ENV === 'prod';
-        },
-        get() {
-            return (process.env._ENV ?? 'local');
-        },
-        getEnvKeys() {
-            return {
-                local: 'local',
-                bate: 'bate',
-                prod: 'prod',
-            };
-        },
-    };
+//#region packages/core/env.ts
+var env_default = () => {
+	return {
+		isLocal() {
+			return process.env._ENV === "local";
+		},
+		isBate() {
+			return process.env._ENV === "bate";
+		},
+		isProd() {
+			return process.env._ENV === "prod";
+		},
+		get() {
+			return process.env._ENV ?? "local";
+		},
+		getEnvKeys() {
+			return {
+				local: "local",
+				bate: "bate",
+				prod: "prod"
+			};
+		}
+	};
 };
+//#endregion
+export { env_default as default };

package/esm/packages/core/index.js

@@ -1,109 +1,101 @@
-import Koa from "koa";
-import "./types.js";
-import "../../app/typings.js";
-import env from "./env.js";
-import middlewareLoader from "./loader/middleware.js";
-import routerSchemaLoader from "./loader/router-schema.js";
-import routerLoader from "./loader/router.js";
-import controllerLoader from "./loader/controller.js";
-import serviceLoader from "./loader/service.js";
-import configLoader from "./loader/config.js";
-import extendLoader from "./loader/extend.js";
+import { __require } from "../../_virtual/_rolldown/runtime.js";
+import env_default from "./env.js";
+import middleware_default from "./loader/middleware.js";
+import router_schema_default from "./loader/router-schema.js";
+import router_default from "./loader/router.js";
+import controller_default from "./loader/controller.js";
+import service_default from "./loader/service.js";
+import config_default from "./loader/config.js";
+import extend_default from "./loader/extend.js";
 import modelLoader from "./loader/model.js";
-import { resolve } from "../utils/path.js";
-import { runFileFn } from "../utils/index.js";
-export const loaderModel = modelLoader;
-export const start = (options = {}) => {
-    const app = new Koa();
-    const { frameBaseDir: _frameBaseDir, ..._options } = options;
-    app.options = _options;
-    const baseDir = (app.baseDir = process.cwd());
-    const frameBaseDir = (app.frameBaseDir =
-        _frameBaseDir ?? resolve(__dirname, ".."));
-    app.businessPath = resolve(baseDir, "app");
-    app.framePath = resolve(frameBaseDir, "app");
-    app.paths = [
-        { type: "frame", path: app.framePath },
-        { type: "business", path: app.businessPath },
-    ];
-    app.envs = env();
-    console.log(`-- [start] env: ${app.envs.get()} --`);
-    /**
-     * 第一个挂载
-     * 方便后续 所有带有app的方法中可以通过 app.config 获取配置
-     */
-    configLoader(app);
-    console.log(`-- [start] loader config done --`);
-    /**
-     * 	第二个挂载 扩展的方法
-     * 	因不确定会在何处调用 app.[extendFN]
-     *  所以需要调高挂载顺序
-     */
-    extendLoader(app);
-    console.log(`-- [start] loader extend done --`);
-    /**
-     *	参数校验规则，在中间件之前即可
-     */
-    routerSchemaLoader(app);
-    console.log(`-- [start] loader routerSchema done --`);
-    /**
-     *   service 在 controller 之前即可
-     *  以下俩loader在router前即可
-     */
-    serviceLoader(app);
-    console.log(`-- [start] loader service done --`);
-    controllerLoader(app);
-    console.log(`-- [start] loader controller done --`);
-    /**
-     * 挂载中间件文件
-     */
-    middlewareLoader(app);
-    console.log(`-- [start] loader middleware done --`);
-    // 加载全局中间件
-    mountMiddleware(app);
-    // 最后加载路由
-    routerLoader(app);
-    console.log(`-- [start] loader router done --`);
-    // modelLoader(app);
-    // console.log(`-- [start] loader model 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}`);
-    }
-    catch (error) {
-        console.error(error);
-    }
-    return app;
+import { runFileFn } from "@tc/utils";
+import Koa from "koa";
+import { resolve as resolve$1 } from "@tc/utils/path";
+//#region packages/core/index.ts
+var loaderModel = modelLoader;
+var start = (options = {}) => {
+	const app = new Koa();
+	const { frameBaseDir: _frameBaseDir, ..._options } = options;
+	app.options = _options;
+	const baseDir = app.baseDir = process.cwd();
+	const frameBaseDir = app.frameBaseDir = _frameBaseDir ?? resolve$1(__dirname, "..");
+	app.businessPath = resolve$1(baseDir, "app");
+	app.framePath = resolve$1(frameBaseDir, "app");
+	app.paths = [{
+		type: "frame",
+		path: app.framePath
+	}, {
+		type: "business",
+		path: app.businessPath
+	}];
+	app.envs = env_default();
+	console.log(`-- [start] env: ${app.envs.get()} --`);
+	/**
+	* 第一个挂载
+	* 方便后续 所有带有app的方法中可以通过 app.config 获取配置
+	*/
+	config_default(app);
+	console.log(`-- [start] loader config done --`);
+	/**
+	* 	第二个挂载 扩展的方法
+	* 	因不确定会在何处调用 app.[extendFN]
+	*  所以需要调高挂载顺序
+	*/
+	extend_default(app);
+	console.log(`-- [start] loader extend done --`);
+	/**
+	*	参数校验规则，在中间件之前即可
+	*/
+	router_schema_default(app);
+	console.log(`-- [start] loader routerSchema done --`);
+	/**
+	*   service 在 controller 之前即可
+	*  以下俩loader在router前即可
+	*/
+	service_default(app);
+	console.log(`-- [start] loader service done --`);
+	controller_default(app);
+	console.log(`-- [start] loader controller done --`);
+	/**
+	* 挂载中间件文件
+	*/
+	middleware_default(app);
+	console.log(`-- [start] loader middleware done --`);
+	mountMiddleware(app);
+	router_default(app);
+	console.log(`-- [start] 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}`);
+	} catch (error) {
+		console.error(error);
+	}
+	return app;
 };
-const mountMiddleware = (app) => {
-    app.paths.forEach((pathInfo) => {
-        let loaded = false;
-        let lastError = undefined;
-        for (const fileSymbol of ["ts", "js"]) {
-            const fileName = `middleware.${fileSymbol}`;
-            try {
-                const fn = runFileFn(require(resolve(pathInfo.path, fileName)));
-                fn?.(app);
-                console.log(`-- [start] loader ${pathInfo.type} appMiddlerare ${fileName} done -- (${pathInfo.path})`);
-                loaded = true;
-                break;
-            }
-            catch (error) {
-                const err = error;
-                const moduleNotFound = err?.code === "MODULE_NOT_FOUND" &&
-                    typeof err?.message === "string" &&
-                    err.message.includes(fileName);
-                if (!moduleNotFound)
-                    lastError = error;
-            }
-        }
-        if (!loaded && lastError) {
-            console.log(`-- [error] loader ${pathInfo.type} appMiddlerare middleware.(ts|js) error -- (${pathInfo.path})`);
-            console.log(lastError);
-        }
-    });
+var mountMiddleware = (app) => {
+	app.paths.forEach((pathInfo) => {
+		let loaded = false;
+		let lastError = void 0;
+		for (const fileSymbol of ["ts", "js"]) {
+			const fileName = `middleware.${fileSymbol}`;
+			try {
+				runFileFn(__require(resolve$1(pathInfo.path, fileName)))?.(app);
+				console.log(`-- [start] loader ${pathInfo.type} appMiddlerare ${fileName} done -- (${pathInfo.path})`);
+				loaded = true;
+				break;
+			} catch (error) {
+				const err = error;
+				if (!(err?.code === "MODULE_NOT_FOUND" && typeof err?.message === "string" && err.message.includes(fileName))) lastError = error;
+			}
+		}
+		if (!loaded && lastError) {
+			console.log(`-- [error] loader ${pathInfo.type} appMiddlerare middleware.(ts|js) error -- (${pathInfo.path})`);
+			console.log(lastError);
+		}
+	});
 };
+//#endregion
+export { loaderModel, start };