@_tc/template-core 0.2.0-bate.0 → 0.2.0-bate.1

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

@@ -1,19 +1,19 @@
-import { getAppPaths as e } from "../paths.js";
-import { loadFileFn as t } from "../../utils/loadFile.js";
-import { runFileFn as n } from "../../utils/runFileFn.js";
+import { loadFileFn as e } from "../../utils/loadFile.js";
+import { runFileFn as t } from "../../utils/runFileFn.js";
 import "../../utils/index.js";
+import { getAppPaths as n } from "../paths.js";
 //#region packages/core/loader/extend.ts
 var r = async (r) => {
 	r.extends = { ...r.extends };
 	let i = [];
-	e(r).forEach((e) => {
-		t(e, "extend", { processingFileCallback: ((e, t, a) => {
+	n(r).forEach((n) => {
+		e(n, "extends", { processingFileCallback: ((e, n, a) => {
 			if (!a) {
 				for (let t in r) if (t === e) {
 					console.log("\x1B[31m%s\x1B[0m", `[extend loader error] name:${e} is already in app`);
 					return;
 				}
-				let a = n(t)(r);
+				let a = t(n)(r);
 				i.push(Promise.resolve(a).then((t) => ({
 					fileName: e,
 					value: t

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

@@ -1,13 +1,13 @@
-import { getAppPaths as e } from "../paths.js";
-import { loadFileFn as t } from "../../utils/loadFile.js";
-import { runFileFn as n } from "../../utils/runFileFn.js";
+import { loadFileFn as e } from "../../utils/loadFile.js";
+import { runFileFn as t } from "../../utils/runFileFn.js";
 import "../../utils/index.js";
+import { getAppPaths as n } from "../paths.js";
 //#region packages/core/loader/middleware.ts
 var r = (r) => {
-	r.middlewares = e(r).reduce((e, i) => {
-		let a = t(i, "middlewares", { loadFileCallback: (e) => n(e)(r) });
+	r.middlewares = n(r).reduce((n, i) => {
+		let a = e(i, "middlewares", { loadFileCallback: (e) => t(e)(r) });
 		return {
-			...e,
+			...n,
 			...a
 		};
 	}, {});

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

@@ -1,16 +1,16 @@
-import { getAppPaths as e } from "../paths.js";
-import { resolve as t } from "../../utils/path.js";
-import { loadFileFn as n } from "../../utils/loadFile.js";
-import { runFileFn as r } from "../../utils/runFileFn.js";
+import { resolve as e } from "../../utils/path.js";
+import { loadFileFn as t } from "../../utils/loadFile.js";
+import { runFileFn as n } from "../../utils/runFileFn.js";
 import "../../utils/index.js";
+import { getAppPaths as r } from "../paths.js";
 //#region packages/core/loader/router-schema.ts
 var i = (i) => {
 	let a = {};
-	e(i).forEach((e) => {
-		n(e, "router-schema", { preProcessingFileCallback(e) {
+	r(i).forEach((r) => {
+		t(r, "router-schema", { preProcessingFileCallback(t) {
 			a = {
 				...a,
-				...r(t(e))
+				...n(e(t))
 			};
 		} });
 	}), i.routerSchema = a;

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

@@ -1,26 +1,26 @@
-import { getAppPath as e, getAppPaths as t } from "../paths.js";
-import { resolve as n } from "../../utils/path.js";
-import { loadFileFn as r } from "../../utils/loadFile.js";
-import { runFileFn as i } from "../../utils/runFileFn.js";
+import { resolve as e } from "../../utils/path.js";
+import { loadFileFn as t } from "../../utils/loadFile.js";
+import { runFileFn as n } from "../../utils/runFileFn.js";
 import "../../utils/index.js";
+import { getAppPath as r, getAppPaths as i } from "../paths.js";
 import { existsSync as a } from "fs";
 import o from "koa-router";
 //#region packages/core/loader/router.ts
 var s = (s) => {
-	let c, l = e(s, "business");
-	if (l) for (let e of ["router-guard.ts", "router-guard.js"]) {
-		let t = n(l, e);
-		if (a(t)) {
-			c = i(t)(s);
+	let c, l = r(s, "business");
+	if (l) for (let t of ["router-guard.ts", "router-guard.js"]) {
+		let r = e(l, t);
+		if (a(r)) {
+			c = n(r)(s);
 			break;
 		}
 	}
 	c || console.info("-- [router-guard] -- not router-guard.(ts|js) file");
 	let u = [];
-	t(s).forEach((e) => {
-		r(e, "router", { preProcessingFileCallback: (e) => {
-			let t = new o();
-			t.level = 0, u.push(t), i(n(e))(s, t);
+	i(s).forEach((r) => {
+		t(r, "router", { preProcessingFileCallback: (t) => {
+			let r = new o();
+			r.level = 0, u.push(r), n(e(t))(s, r);
 		} });
 	});
 	let d = new o();

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

@@ -1,12 +1,12 @@
-import { getAppPaths as e } from "../paths.js";
-import { loadFileFn as t } from "../../utils/loadFile.js";
-import { runFileFn as n } from "../../utils/runFileFn.js";
+import { loadFileFn as e } from "../../utils/loadFile.js";
+import { runFileFn as t } from "../../utils/runFileFn.js";
 import "../../utils/index.js";
+import { getAppPaths as n } from "../paths.js";
 //#region packages/core/loader/service.ts
 var r = (r) => {
-	r.service = e(r).reduce((e, i) => ({
-		...e,
-		...t(i, "service", { loadFileCallback: (e) => new (n(e)(r))() })
+	r.service = n(r).reduce((n, i) => ({
+		...n,
+		...e(i, "service", { loadFileCallback: (e) => new (t(e)(r))() })
 	}), {});
 };
 //#endregion

package/esm/packages/utils/runFileFn.js

@@ -1,6 +1,6 @@
 import { __require as e } from "../../_virtual/_rolldown/runtime.js";
-import { extname as t } from "path";
-import { readFileSync as n } from "fs";
+import { readFileSync as t } from "fs";
+import { extname as n } from "path";
 //#region packages/utils/runFileFn.ts
 var r = !1;
 function i(e) {
@@ -9,12 +9,12 @@ function i(e) {
 function a(e) {
 	return e && typeof e == "object" && "default" in e && e.default !== void 0 ? e.default : e;
 }
-function o(n) {
+function o(t) {
 	try {
-		return e(n);
+		return e(t);
 	} catch (r) {
-		if (t(n) !== ".ts" || !s(r)) throw r;
-		return c(), delete e.cache[e.resolve(n)], e(n);
+		if (n(t) !== ".ts" || !s(r)) throw r;
+		return c(), delete e.cache[e.resolve(t)], e(t);
 	}
 }
 function s(e) {
@@ -23,11 +23,11 @@ function s(e) {
 }
 function c() {
 	if (r) return;
-	let t = l();
+	let n = l();
 	e.extensions[".ts"] = (e, r) => {
-		let { outputText: i } = t.transpileModule(n(r, "utf8"), { compilerOptions: {
-			module: t.ModuleKind.CommonJS,
-			target: t.ScriptTarget.ES2020,
+		let { outputText: i } = n.transpileModule(t(r, "utf8"), { compilerOptions: {
+			module: n.ModuleKind.CommonJS,
+			target: n.ScriptTarget.ES2020,
 			esModuleInterop: !0,
 			allowSyntheticDefaultImports: !0
 		} });

package/fe/packages/common/string/index.d.ts

@@ -1,3 +1,12 @@
 export declare const isBlank: (value: string | null | undefined) => boolean;
 export declare const capitalize: (value: string) => string;
 export declare const kebabCase: (value: string) => string;
+type JoinStrValue = string | number | boolean | null | undefined;
+type JoinStrConditionalValue = readonly [condition: unknown, value: JoinStrValue];
+type JoinStrInput = JoinStrValue | JoinStrConditionalValue;
+type JoinStrOptions = {
+    separator?: string;
+};
+type JoinStrArgs = readonly JoinStrInput[] | readonly [...JoinStrInput[], JoinStrOptions];
+export declare const joinStr: (...strings: JoinStrArgs) => string;
+export {};

package/model/packages/common/string/index.d.ts

@@ -1,3 +1,12 @@
 export declare const isBlank: (value: string | null | undefined) => boolean;
 export declare const capitalize: (value: string) => string;
 export declare const kebabCase: (value: string) => string;
+type JoinStrValue = string | number | boolean | null | undefined;
+type JoinStrConditionalValue = readonly [condition: unknown, value: JoinStrValue];
+type JoinStrInput = JoinStrValue | JoinStrConditionalValue;
+type JoinStrOptions = {
+    separator?: string;
+};
+type JoinStrArgs = readonly JoinStrInput[] | readonly [...JoinStrInput[], JoinStrOptions];
+export declare const joinStr: (...strings: JoinStrArgs) => string;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.2.0-bate.0",
+  "version": "0.2.0-bate.1",
   "description": "A full-stack TypeScript admin framework powered by Koa, React, and Vite - monorepo root",
   "types": "./types/index.d.ts",
   "exports": {

package/types/app/extends/localCacheHtmlEtag.d.ts

@@ -0,0 +1,10 @@
+/**
+ * htmlEtag本地储存
+ */
+declare const localCacheHtmlEtag: (app: import("../../packages/core/index").KoaApp) => {
+    keepFreshFEBuildKey: () => void;
+    hasEtag: (key: string) => boolean;
+    getEtag: (key: string) => string | null;
+    setEtag: (key: string, value: string) => void;
+};
+export default localCacheHtmlEtag;

package/types/app/{extend → extends}/render-view.d.ts

@@ -3,5 +3,5 @@ import type { Ctx, KoaApp } from "../type";
  * 挂载模板资源地址 默认是 public/dist 目录
  *
  */
-declare const _default: (app: KoaApp) => (view: string, ctx: Ctx, context?: Record<string, unknown>) => void;
+declare const _default: (app: KoaApp) => (viewPath: string, ctx: Ctx, context?: Record<string, unknown>) => string;
 export default _default;

package/types/app/service/base.d.ts

@@ -3,7 +3,7 @@ declare const getBaseService: (app: KoaApp) => {
     new (): {
         get app(): KoaApp;
         get config(): KoaApp["config"];
-        get curl(): import("../extend/$fetch").NodeFetch;
+        get curl(): import("../extends/$fetch").NodeFetch;
     };
 };
 export default getBaseService;

package/types/app/service/project.d.ts

@@ -51,7 +51,7 @@ declare const getProjectService: (app: KoaApp) => {
         getProject: (projectKey: string) => ProjectItem | null;
         get app(): KoaApp;
         get config(): KoaApp["config"];
-        get curl(): import("../extend/$fetch").NodeFetch;
+        get curl(): import("../extends/$fetch").NodeFetch;
     };
 };
 export default getProjectService;

package/types/app/type.d.ts

@@ -1,6 +1,6 @@
+import type { IncomingHttpHeaders } from "http";
 import type Koa from "koa";
 import type Router from "koa-router";
-import type { IncomingHttpHeaders } from "http";
 import type { ParsedUrlQuery } from "querystring";
 export type KoaApp = import('./typings').KoaApp;
 export type KoaRouter = import('./typings').KoaRouter;
@@ -28,6 +28,7 @@ export type Ctx = Router.RouterContext<Koa.DefaultState, Koa.DefaultContext> & {
     params: CtxParams;
     reqData?: CtxReqData;
 };
+export type ExtendFN<T extends object = object> = (app: KoaApp) => T;
 export type MiddlewareFN = (app: KoaApp) => (ctx: Ctx, next: Koa.Next) => Promise<void>;
 export type RouterFN = (app: KoaApp, router: KoaRouter) => void;
 export type ControllerFN<T extends object = object> = (app: KoaApp) => new () => T;

package/types/app/typings.d.ts

@@ -1,16 +1,17 @@
 import type { FrameworkAugment, KoaApp, KoaAppExtensions, KoaRouter } from "../packages/core/index";
-import { GetInstance } from "typings/type";
 import type { DefaultAppConfig } from "../config/config.default";
 import type getProjectController from "./controller/project";
 import type getViewController from "./controller/view";
-import type getFetch from "./extend/$fetch";
-import type getCrypto from "./extend/crypto";
-import type getDB from "./extend/db";
-import type generateErrorMessage from "./extend/generateErrorMessage";
-import type getLogger from "./extend/logger";
-import type parsingParamsOnUrl from "./extend/parsingParamsOnUrl";
-import renderView from "./extend/render-view";
+import type getFetch from "./extends/$fetch";
+import type getCrypto from "./extends/crypto";
+import type getDB from "./extends/db";
+import type generateErrorMessage from "./extends/generateErrorMessage";
+import type localCacheHtmlEtag from "./extends/localCacheHtmlEtag";
+import type getLogger from "./extends/logger";
+import type parsingParamsOnUrl from "./extends/parsingParamsOnUrl";
+import type renderView from "./extends/render-view";
 import type getProjectService from "./service/project";
+import { GetInstance } from "typings/type";
 type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
 declare module '../packages/core/index' {
     namespace FrameworkAugment {
@@ -30,6 +31,7 @@ declare module '../packages/core/index' {
             $fetch: ReturnType<typeof getFetch>;
             nunjucksEnv: import('nunjucks').Environment;
             renderView: ReturnType<typeof renderView>;
+            localCacheHtmlEtag: ReturnType<typeof localCacheHtmlEtag>;
         }
         interface IMiddlewaresAugmented {
             errorHandle: import('koa').Middleware;

package/types/bundler/state.d.ts

@@ -11,6 +11,10 @@ export interface BuildFEOptions {
      *   - Maybe you really do not need it.
      */
     output?: 'frame' | 'run' | (() => string);
+    /**
+     * Compress the html content emitted by Vite before writing final `.tpl` / `.html` files.
+     */
+    minifyHtml?: boolean;
 }
 export declare const buildFESharedState: {
     options: BuildFEOptions;

package/types/bundler/utils.d.ts

@@ -1,3 +1,4 @@
+import { Plugin } from "vite";
 /**
  *
  * 寻找 frontend\/**\/*.entry.[j|t]s(x)?
@@ -6,4 +7,8 @@
 export declare function entries(): Record<string, string>;
 export declare function outDir(): string;
 export declare const watchFiles: (callback?: () => Promise<any>) => Promise<void>;
+/**
+ * 打包完成后触发
+ */
+export declare function generateBuildKeyPlugin(): Plugin;
 export declare const VBuildFE: (input: Record<string, string>, OperatingEnv?: "dev" | "prod") => Promise<void>;

package/types/index.d.ts

@@ -3,8 +3,8 @@ import type Router from "koa-router";
 import "./app/typings";
 import { MOmit } from "./typings/type";
 export type { FrameworkAugment, KoaApp } from "./packages/core/index";
-export type { CryptoExtend, CryptoHashAlgorithm, HmacSignOptions, SignedPayloadOptions, VerifySignedPayloadOptions, } from "./app/extend/crypto";
-export type { DB, DBDataOptions, DBDataRecord, DBFactory, DBRunResult, FrameworkDB, ListDBDataOptions, SQLiteParams, SQLiteValue, } from "./app/extend/db";
+export type { CryptoExtend, CryptoHashAlgorithm, HmacSignOptions, SignedPayloadOptions, VerifySignedPayloadOptions, } from "./app/extends/crypto";
+export type { DB, DBDataOptions, DBDataRecord, DBFactory, DBRunResult, FrameworkDB, ListDBDataOptions, SQLiteParams, SQLiteValue, } from "./app/extends/db";
 export type { ControllerFN, Ctx, MiddlewareFN, RouterFN, ServiceFN } from "./app/type";
 export type { Router };
 export declare const serverStart: (options?: MOmit<StartOptions, "frameBaseDir">) => Promise<import("./packages/core/index").KoaApp>;
@@ -23,7 +23,7 @@ export declare const baseFn: {
         new (): {
             get app(): import("./app/type").KoaApp;
             get config(): import("./app/type").KoaApp["config"];
-            get curl(): import("./app/extend/$fetch").NodeFetch;
+            get curl(): import("./app/extends/$fetch").NodeFetch;
         };
     };
 };

package/types/packages/common/string/index.d.ts

@@ -1,3 +1,19 @@
 export declare const isBlank: (value: string | null | undefined) => boolean;
 export declare const capitalize: (value: string) => string;
 export declare const kebabCase: (value: string) => string;
+type JoinStrValue = string | number | boolean | null | undefined;
+type JoinStrConditionalValue = readonly [condition: unknown, value: JoinStrValue];
+type JoinStrInput = JoinStrValue | JoinStrConditionalValue;
+type JoinStrOptions = {
+    separator?: string;
+};
+type JoinStrArgs = readonly JoinStrInput[] | readonly [...JoinStrInput[], JoinStrOptions];
+/**
+ * 拼接字符串片段，自动跳过空值和不满足条件的片段。
+ *
+ * @example
+ * joinStr('btn', isActive && 'active', [disabled, 'disabled'], { separator: ' ' })
+ * // => 'btn active disabled'
+ */
+export declare const joinStr: (...strings: JoinStrArgs) => string;
+export {};

package/types/packages/core/loader/extend.d.ts

@@ -2,7 +2,7 @@ import type { KoaApp } from "../types";
 /**
  *  extend loader  扩展  koa app属性  只加载一级
  *
- *  加载 xx/app/extend 文件，可通过 'app.extends.${文件}' 访问
+ *  加载 xx/app/extends 文件，可通过 'app.extends.${文件}' 访问
  */
 declare const _default: (app: KoaApp) => Promise<void>;
 export default _default;

package/types/packages/core/types.d.ts

@@ -48,6 +48,10 @@ export interface KoaAppExtensions {
      * 存着 框架 以及业务方的 app路径
      */
     paths: AppPathInfo[];
+    /**
+     * 静态资源目录列表
+     */
+    publicsPath: string[];
     /**
      * 服务生命周期
      */

package/cjs/app/extend/render-view.js

@@ -1 +0,0 @@
-const e=require(`../../_virtual/_rolldown/runtime.js`),t=require(`../../packages/core/paths.js`);let n=require(`node:path`);n=e.__toESM(n);let r=require(`nunjucks`);r=e.__toESM(r);var i=e=>{let i=[n.default.resolve(t.getAppPath(e,`frame`),`./public/dist`),n.default.resolve(t.getAppPath(e,`business`),`./public/dist`),...e.options.additionalPublicPaths??[]];console.log(i);let a=r.default.configure(i,{autoescape:!0,throwOnUndefined:!1,trimBlocks:!1,lstripBlocks:!1,noCache:e.envs.get()===`local`,...typeof e.config.nunjucks==`object`?e.config.nunjucks:{}});return e.extends.nunjucksEnv=a,(e,t,n)=>{t.body=a.render(e,Object.assign({},t.state,n))}};module.exports=i;

package/esm/app/extend/render-view.js

@@ -1,25 +0,0 @@
-import { getAppPath as e } from "../../packages/core/paths.js";
-import t from "node:path";
-import n from "nunjucks";
-//#region app/extend/render-view.ts
-var r = (r) => {
-	let i = [
-		t.resolve(e(r, "frame"), "./public/dist"),
-		t.resolve(e(r, "business"), "./public/dist"),
-		...r.options.additionalPublicPaths ?? []
-	];
-	console.log(i);
-	let a = n.configure(i, {
-		autoescape: !0,
-		throwOnUndefined: !1,
-		trimBlocks: !1,
-		lstripBlocks: !1,
-		noCache: r.envs.get() === "local",
-		...typeof r.config.nunjucks == "object" ? r.config.nunjucks : {}
-	});
-	return r.extends.nunjucksEnv = a, (e, t, n) => {
-		t.body = a.render(e, Object.assign({}, t.state, n));
-	};
-};
-//#endregion
-export { r as default };