@_tc/template-core 0.0.1-bate.16 → 0.0.1-bate.18

package/cjs/app/controller/view.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getViewController = (app) => class ViewController {
     async renderPage(ctx) {
-        app.extends.renderView(`dist/entry.${ctx.params.page}`, ctx, {
+        app.extends.renderView(`dist/${ctx.params.page}.entry`, ctx, {
             projKey: ctx.query.proj_key,
             name: app.options?.name,
             env: app.envs.get(),

package/cjs/app/typings.d.ts

@@ -6,6 +6,7 @@ import type getDB from "./extend/db";
 import type getLogger from "./extend/logger";
 import type generateErrorMessage from "./extend/generateErrorMessage";
 import type parsingParamsOnUrl from "./extend/parsingParamsOnUrl";
+import renderView from "./extend/render-view";
 type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
 type GetInstance<T extends (...args: never[]) => unknown> = T extends (...args: never[]) => infer R ? R extends new () => infer C ? C : R extends Promise<infer P> ? P extends new () => infer C2 ? C2 : never : never : never;
 declare module "../packages/core/index.js" {
@@ -23,7 +24,7 @@ declare module "../packages/core/index.js" {
             generateErrorMessage: ReturnType<typeof generateErrorMessage>;
             parsingParamsOnUrl: ReturnType<typeof parsingParamsOnUrl>;
             nunjucksEnv: import("nunjucks").Environment;
-            renderView: (view: string, ctx: import("koa").DefaultContext, context?: Record<string, unknown>) => void;
+            renderView: ReturnType<typeof renderView>;
         }
         interface IMiddlewaresAugmented {
             errorHandle: import("koa").Middleware;

package/cjs/bundler/utils.js

@@ -100,7 +100,7 @@ function entries() {
             input[key] = path_1.default.resolve(base, fileHtml);
         }
     }
-    // for (const file of fs.readdirSync(base)) {
+    // for (const file of readdirSync(base)) {
     //   if (!file.endsWith(".html")) continue;
     //   const key = path.basename(file, ".html");
     //   input[key] = path.resolve(base, file);
@@ -132,38 +132,68 @@ const watchFiles = async (callback) => {
     console.log(`watching ${runFEPath}/...`);
 };
 exports.watchFiles = watchFiles;
-const customOutputPlugin = {
-    name: "custom-output-paths",
-    generateBundle(_, bundle) {
-        for (const [fileName, chunk] of Object.entries(bundle)) {
-            if (!fileName.endsWith(".html"))
-                continue;
-            const baseName = path_1.default.basename(fileName);
-            const desiredName = `frontend/${baseName}`;
-            delete bundle[fileName];
-            chunk.fileName = desiredName;
-            bundle[desiredName] = chunk;
-        }
-    },
-};
+/**
+ *
+ * 1. 在 build 结束后
+ * 2. 获取输出目录下的html文件
+ * 3. 移动内部的html 至 输出目录的根节点
+ */
+function flattenHtmlPlugin(suffix = ".html") {
+    return {
+        name: "flatten-html",
+        apply: "build",
+        closeBundle() {
+            const feDir = outDir();
+            if (!(0, fs_1.existsSync)(feDir))
+                return;
+            // 移动文件
+            const htmlFiles = glob.sync("**/*.html", { cwd: feDir });
+            for (const file of htmlFiles) {
+                const src = path_1.default.join(feDir, file);
+                const fileName = path_1.default.basename(file, ".html") + suffix;
+                const dest = path_1.default.join(feDir, fileName);
+                if (src !== dest) {
+                    (0, fs_1.copyFileSync)(src, dest);
+                    (0, fs_1.unlinkSync)(src);
+                }
+            }
+            const parents = [...new Set(htmlFiles.map((f) => path_1.default.dirname(f)))]
+                .sort()
+                .reverse();
+            /**
+             *
+             * 删除空的目录
+             */
+            const delEmptyDir = (pathStr) => {
+                const currentDir = (0, fs_1.existsSync)(pathStr) ? (0, fs_1.readdirSync)(pathStr) : [1];
+                if (!currentDir.length) {
+                    (0, fs_1.rmdirSync)(pathStr);
+                    const pa = pathStr.split(path_1.default.sep).slice(0, -1);
+                    pa.length && delEmptyDir(pa.join(path_1.default.sep));
+                }
+            };
+            for (const dir of parents) {
+                if (dir && dir !== ".") {
+                    const fullPath = path_1.default.join(feDir, dir);
+                    delEmptyDir(fullPath);
+                }
+            }
+        },
+    };
+}
 const VBuildFE = async (input) => {
     // 根据入口构建
     await (0, vite_1.build)({
         configFile: false,
         plugins: [
             (await Promise.resolve().then(() => __importStar(require("@vitejs/plugin-react")))).default(),
-            customOutputPlugin,
+            flattenHtmlPlugin('.tpl'),
         ],
         build: {
             outDir: outDir(),
             emptyOutDir: true,
             rollupOptions: {
                 input,
-                output: {
-                    entryFileNames: "frontend/[name].js",
-                    chunkFileNames: "frontend/[name].js",
-                    assetFileNames: "frontend/[name].[ext]",
-                },
             },
         },
         resolve: {

package/esm/app/controller/view.js

@@ -1,6 +1,6 @@
 const getViewController = (app) => class ViewController {
     async renderPage(ctx) {
-        app.extends.renderView(`dist/entry.${ctx.params.page}`, ctx, {
+        app.extends.renderView(`dist/${ctx.params.page}.entry`, ctx, {
             projKey: ctx.query.proj_key,
             name: app.options?.name,
             env: app.envs.get(),

package/esm/app/typings.d.ts

@@ -6,6 +6,7 @@ import type getDB from "./extend/db";
 import type getLogger from "./extend/logger";
 import type generateErrorMessage from "./extend/generateErrorMessage";
 import type parsingParamsOnUrl from "./extend/parsingParamsOnUrl";
+import renderView from "./extend/render-view";
 type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
 type GetInstance<T extends (...args: never[]) => unknown> = T extends (...args: never[]) => infer R ? R extends new () => infer C ? C : R extends Promise<infer P> ? P extends new () => infer C2 ? C2 : never : never : never;
 declare module "../packages/core/index.js" {
@@ -23,7 +24,7 @@ declare module "../packages/core/index.js" {
             generateErrorMessage: ReturnType<typeof generateErrorMessage>;
             parsingParamsOnUrl: ReturnType<typeof parsingParamsOnUrl>;
             nunjucksEnv: import("nunjucks").Environment;
-            renderView: (view: string, ctx: import("koa").DefaultContext, context?: Record<string, unknown>) => void;
+            renderView: ReturnType<typeof renderView>;
         }
         interface IMiddlewaresAugmented {
             errorHandle: import("koa").Middleware;

package/esm/bundler/utils.js

@@ -2,7 +2,7 @@ import path from "path";
 import * as glob from "glob";
 import { build } from "vite";
 import { resolve } from "../packages/utils";
-import { readFileSync, writeFileSync } from "fs";
+import { copyFileSync, existsSync, readdirSync, readFileSync, rmdirSync, unlinkSync, writeFileSync, } from "fs";
 const base = process.cwd();
 // 瞄准输出后的产物路径
 const framePath = path.resolve(__dirname, "../../");
@@ -59,7 +59,7 @@ export function entries() {
             input[key] = path.resolve(base, fileHtml);
         }
     }
-    // for (const file of fs.readdirSync(base)) {
+    // for (const file of readdirSync(base)) {
     //   if (!file.endsWith(".html")) continue;
     //   const key = path.basename(file, ".html");
     //   input[key] = path.resolve(base, file);
@@ -90,38 +90,68 @@ export const watchFiles = async (callback) => {
     });
     console.log(`watching ${runFEPath}/...`);
 };
-const customOutputPlugin = {
-    name: "custom-output-paths",
-    generateBundle(_, bundle) {
-        for (const [fileName, chunk] of Object.entries(bundle)) {
-            if (!fileName.endsWith(".html"))
-                continue;
-            const baseName = path.basename(fileName);
-            const desiredName = `frontend/${baseName}`;
-            delete bundle[fileName];
-            chunk.fileName = desiredName;
-            bundle[desiredName] = chunk;
-        }
-    },
-};
+/**
+ *
+ * 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);
+                const fileName = path.basename(file, ".html") + 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);
+                }
+            }
+        },
+    };
+}
 export const VBuildFE = async (input) => {
     // 根据入口构建
     await build({
         configFile: false,
         plugins: [
             (await import("@vitejs/plugin-react")).default(),
-            customOutputPlugin,
+            flattenHtmlPlugin('.tpl'),
         ],
         build: {
             outDir: outDir(),
             emptyOutDir: true,
             rollupOptions: {
                 input,
-                output: {
-                    entryFileNames: "frontend/[name].js",
-                    chunkFileNames: "frontend/[name].js",
-                    assetFileNames: "frontend/[name].[ext]",
-                },
             },
         },
         resolve: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.0.1-bate.16",
+  "version": "0.0.1-bate.18",
   "description": "A TypeScript Koa framework template - Monorepo root",
   "main": "./index.js",
   "types": "./index.d.ts",