Skip to content

Commit 93bab73

Browse files
committed
refactor: group logging code into log folder
1 parent 5640e40 commit 93bab73

File tree

7 files changed

+62
-59
lines changed

7 files changed

+62
-59
lines changed

packages/pranx/src/bin/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { build } from "@/cmd/build";
44
import { dev } from "@/cmd/dev";
55
import { start } from "@/cmd/start";
6-
import { logger } from "@/utils/logger";
6+
import { logger } from "@/log/logger";
77
import { defineCommand, runMain } from "citty";
88

99
const main = defineCommand({

packages/pranx/src/cmd/build.ts

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { filePathToRoutingPath } from "@/build/filepath-to-routing-path";
22
import { get_user_pranx_config, load_user_pranx_config } from "@/config/index";
3-
import { logger } from "@/utils/logger";
3+
import { logger } from "@/log/logger.js";
44
import { measureTime } from "@/utils/time-perf";
55
import fse from "fs-extra";
66
import kleur from "kleur";
@@ -13,7 +13,6 @@ import type {
1313
PageModule,
1414
SERVER_MANIFEST,
1515
ServerEntryModule,
16-
ServerManifestRoute,
1716
} from "../../types/index.js";
1817
import { bundle_browser } from "../build/bundle/browser.js";
1918
import { bundle_server } from "../build/bundle/server.js";
@@ -25,6 +24,7 @@ import {
2524
SITE_MANIFEST_OUTPUT_PATH,
2625
} from "../build/constants.js";
2726
import { generate_html_template } from "../build/generate_html_template.js";
27+
import { log_routes_tree } from "../log/log_routes_tree.js";
2828

2929
export async function build() {
3030
logger.log(kleur.bold().magenta("Pranx Build\n"));
@@ -335,59 +335,7 @@ export async function build() {
335335

336336
const BUILD_TIME = measureTime("build_measure_time");
337337

338-
printRoutesTreeForUser(server_site_manifest.routes);
338+
log_routes_tree(server_site_manifest.routes);
339339

340340
logger.success(`Project builded in ${BUILD_TIME} ms\n`);
341341
}
342-
343-
export function printRoutesTreeForUser(input_routes: ServerManifestRoute[]) {
344-
// Loggin Routes
345-
logger.log(kleur.bold().blue().underline("Routes"));
346-
347-
function buildTree(routes: ServerManifestRoute[]) {
348-
const tree: any = {};
349-
for (const route of routes) {
350-
const parts = route.path === "/" ? [] : route.path.split("/").filter(Boolean);
351-
let node = tree;
352-
for (const part of parts) {
353-
node.children = node.children || {};
354-
node.children[part] = node.children[part] || {};
355-
node = node.children[part];
356-
}
357-
node.route = route;
358-
}
359-
return tree;
360-
}
361-
362-
function printTree(node: any, prefix = "", isLast = true) {
363-
if (node.route) {
364-
const icon = node.route.rendering_kind === "static" ? "●" : kleur.yellow("λ");
365-
let extra = "";
366-
if (
367-
node.route.rendering_kind === "static" &&
368-
node.route.static_generated_routes &&
369-
node.route.static_generated_routes.length > 0
370-
) {
371-
extra = ` (${kleur.cyan(`${node.route.static_generated_routes.length}`)})`;
372-
}
373-
logger.log(
374-
`${prefix}${isLast ? "└-" : "├-"} ${icon} ${kleur.white(node.route.path)}${extra}`
375-
);
376-
}
377-
if (node.children) {
378-
const keys = Object.keys(node.children);
379-
keys.forEach((key, idx) => {
380-
printTree(node.children[key], prefix + (node.route ? "| " : ""), idx === keys.length - 1);
381-
});
382-
}
383-
}
384-
385-
const tree = buildTree(input_routes);
386-
387-
logger.log(".");
388-
printTree(tree, "", true);
389-
390-
logger.log(`\n${kleur.yellow("λ")} Server-side Page`);
391-
logger.log("● Static Page");
392-
logger.log(`${kleur.cyan("(#)")} Count of Static Generated Routes\n`);
393-
}

packages/pranx/src/cmd/dev.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { logger } from "@/utils/logger";
1+
import { logger } from "@/log/logger";
22
import kleur from "kleur";
33

44
export async function dev() {

packages/pranx/src/cmd/start.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { SERVER_MANIFEST_OUTPUT_PATH } from "@/build/constants";
2+
import { logger } from "@/log/logger";
23
import { define_api_handlers } from "@/server/runtime/define-api-handlers";
34
import { defineServeStaticHandler } from "@/server/runtime/define-serve-static";
45
import { define_ssr_handlers } from "@/server/runtime/define-ssr-handlers";
5-
import { logger } from "@/utils/logger";
66
import { measureTime } from "@/utils/time-perf";
77
import fse from "fs-extra";
88
import { H3, serve } from "h3";
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import kleur from "kleur";
2+
import type { ServerManifestRoute } from "types";
3+
import { logger } from "./logger";
4+
5+
export function log_routes_tree(input_routes: ServerManifestRoute[]) {
6+
// Loggin Routes
7+
logger.log(kleur.bold().blue().underline("Routes"));
8+
9+
function buildTree(routes: ServerManifestRoute[]) {
10+
const tree: any = {};
11+
for (const route of routes) {
12+
const parts = route.path === "/" ? [] : route.path.split("/").filter(Boolean);
13+
let node = tree;
14+
for (const part of parts) {
15+
node.children = node.children || {};
16+
node.children[part] = node.children[part] || {};
17+
node = node.children[part];
18+
}
19+
node.route = route;
20+
}
21+
return tree;
22+
}
23+
24+
function printTree(node: any, prefix = "", isLast = true) {
25+
if (node.route) {
26+
const icon = node.route.rendering_kind === "static" ? "●" : kleur.yellow("λ");
27+
let extra = "";
28+
if (
29+
node.route.rendering_kind === "static" &&
30+
node.route.static_generated_routes &&
31+
node.route.static_generated_routes.length > 0
32+
) {
33+
extra = ` (${kleur.cyan(`${node.route.static_generated_routes.length}`)})`;
34+
}
35+
logger.log(
36+
`${prefix}${isLast ? "└-" : "├-"} ${icon} ${kleur.white(node.route.path)}${extra}`
37+
);
38+
}
39+
if (node.children) {
40+
const keys = Object.keys(node.children);
41+
keys.forEach((key, idx) => {
42+
printTree(node.children[key], prefix + (node.route ? "| " : ""), idx === keys.length - 1);
43+
});
44+
}
45+
}
46+
47+
const tree = buildTree(input_routes);
48+
49+
logger.log(".");
50+
printTree(tree, "", true);
51+
52+
logger.log(`\n${kleur.yellow("λ")} Server-side Page`);
53+
logger.log("● Static Page");
54+
logger.log(`${kleur.cyan("(#)")} Count of Static Generated Routes\n`);
55+
}

packages/pranx/src/server/runtime/define-ssr-handlers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { OUTPUT_BUNDLE_SERVER_DIR, SITE_MANIFEST_OUTPUT_PATH } from "@/build/constants";
22
import { filePathToRoutingPath } from "@/build/filepath-to-routing-path";
33
import { generate_html_template } from "@/build/generate_html_template";
4-
import { logger } from "@/utils/logger";
4+
import { logger } from "@/log/logger";
55
import fse from "fs-extra";
66
import { defineHandler, type H3, html } from "h3";
77
import { extname, join, resolve } from "pathe";

0 commit comments

Comments
 (0)