@chidchanun/bcp 0.1.21 → 0.1.23

package/packages/cli/src/index.ts

@@ -71,6 +71,20 @@ switch (cliOptions.command) {
     break;
   }
 
+  case "doctor": {
+    await runDeveloperCommand(
+      "doctor"
+    );
+    break;
+  }
+
+  case "inspect": {
+    await runDeveloperCommand(
+      "inspect"
+    );
+    break;
+  }
+
   case "help": {
     printHelp();
     break;
@@ -466,6 +480,59 @@ async function runDatabaseCommand() {
   }
 }
 
+async function runDeveloperCommand(
+  command:
+    "doctor" |
+    "inspect"
+): Promise<void> {
+  const rootDirectory =
+    resolveProjectRoot(
+      cliOptions.rootDirectory
+    );
+
+  const {
+    runDoctor,
+    runInspect,
+  } =
+    await import(
+      "./developer-tools.js"
+    );
+
+  const options = {
+    rootDirectory,
+    frameworkVersion:
+      FRAMEWORK_VERSION,
+    json:
+      cliOptions.json,
+  };
+
+  if (
+    command === "doctor"
+  ) {
+    await runDoctor(
+      options
+    );
+    return;
+  }
+
+  try {
+    await runInspect(
+      options
+    );
+  } catch (error) {
+    if (
+      cliOptions.json &&
+      error instanceof Error &&
+      error.name ===
+        "DeveloperToolJsonError"
+    ) {
+      return;
+    }
+
+    throw error;
+  }
+}
+
 function installShutdownHandlers(
   server: {
     stop(): Promise<void>;
@@ -642,6 +709,8 @@ Commands:
   routes             Print discovered page and API routes
   update [target]    Update BCP Framework (default target: latest)
   db <command>       Manage database migrations
+  doctor             Run project/runtime health diagnostics
+  inspect            Print resolved env, config, dependencies and routes
   help               Show this help message
   version            Show framework version
 
@@ -652,6 +721,7 @@ Options:
   --host <host>         Alias for --hostname
   --check               Check for a BCP update without changing files
   --dry-run             Preview a BCP update without changing files
+  --json                JSON output for doctor/inspect
   -h, --help            Show help
   -v, --version         Show version
 
@@ -664,6 +734,10 @@ Examples:
   bcp build
   bcp start
   bcp routes
+  bcp doctor
+  bcp doctor --json
+  bcp inspect
+  bcp inspect --json
   bcp update
   bcp update --check
   bcp db create create_users

package/packages/client/src/form.tsx

@@ -1,5 +1,6 @@
 import {
     createContext,
+    createElement,
     useContext,
     useMemo,
     useState,
@@ -320,19 +321,25 @@ export function Form({
             null
         );
 
-    return (
-        <FormRuntimeContext.Provider
-            value={runtimeState}
-        >
-            <form
-                {...props}
-                action={progressiveAction}
-                method="post"
-                onSubmit={handleSubmit}
-            >
-                {children}
-            </form>
-        </FormRuntimeContext.Provider>
+    return createElement(
+        FormRuntimeContext.Provider,
+        {
+            value:
+                runtimeState,
+        },
+        createElement(
+            "form",
+            {
+                ...props,
+                action:
+                    progressiveAction,
+                method:
+                    "post",
+                onSubmit:
+                    handleSubmit,
+            },
+            children
+        )
     );
 }
 

package/packages/client/src/server.ts

@@ -15,6 +15,21 @@ export {
     type ResponseCookieOptions,
 } from "../../server/src/request-context.js";
 
+export {
+    attachRequestId,
+    createLogger,
+    logger,
+    requestLogger,
+    resolveEnvironmentLogFormat,
+    resolveEnvironmentLogLevel,
+
+    type LogFields,
+    type LogFormat,
+    type LogLevel,
+    type Logger,
+    type LoggerOptions,
+} from "../../server/src/logger.js";
+
 export {
     json,
     redirect,

package/packages/server/src/dev-hmr.ts

@@ -1,5 +1,9 @@
 import type * as http from "node:http";
 
+import {
+    createLogger,
+} from "./logger.js";
+
 export const DEV_EVENTS_PATH =
     "/_bcp/dev-events";
 
@@ -12,11 +16,28 @@ const INTERNAL_API_PATHS =
     ]);
 
 const HTTP_REQUEST_LOG_PATTERN =
-    /^(?:\[bcp\]\s+)?(?:GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS)\s+(\S+)\s+\d{3}\s+\d+(?:\.\d+)?ms$/i;
+    /^(?:\[bcp\]\s+)?(GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS)\s+(\S+)\s+(\d{3})\s+(\d+(?:\.\d+)?)ms$/i;
+
+const TIMING_LOG_PATTERN =
+    /^(Import|SSR):\s+(\d+(?:\.\d+)?)ms$/i;
 
 let requestLogFilterInstalled =
     false;
 
+export interface DevHttpRequestLog {
+    method: string;
+    path: string;
+    status: number;
+    durationMs: number;
+}
+
+export type DevTimingLog = {
+    event:
+        | "module.import"
+        | "ssr.render";
+    durationMs: number;
+};
+
 export function shouldLogDevApiPath(
     pathname: string
 ): boolean {
@@ -39,20 +60,73 @@ export function shouldLogDevApiPath(
     );
 }
 
-export function shouldWriteDevConsoleLine(
+export function parseDevHttpRequestLog(
     line: string
-): boolean {
+): DevHttpRequestLog | null {
     const match =
         HTTP_REQUEST_LOG_PATTERN.exec(
             line.trim()
         );
 
     if (!match) {
+        return null;
+    }
+
+    return {
+        method:
+            match[1].toUpperCase(),
+        path:
+            match[2],
+        status:
+            Number(
+                match[3]
+            ),
+        durationMs:
+            Number(
+                match[4]
+            ),
+    };
+}
+
+export function parseDevTimingLog(
+    line: string
+): DevTimingLog | null {
+    const match =
+        TIMING_LOG_PATTERN.exec(
+            line.trim()
+        );
+
+    if (!match) {
+        return null;
+    }
+
+    return {
+        event:
+            match[1].toLowerCase() ===
+            "ssr"
+                ? "ssr.render"
+                : "module.import",
+        durationMs:
+            Number(
+                match[2]
+            ),
+    };
+}
+
+export function shouldWriteDevConsoleLine(
+    line: string
+): boolean {
+    const request =
+        parseDevHttpRequestLog(
+            line
+        );
+
+    if (!request) {
         return true;
     }
 
     return shouldLogDevApiPath(
-        match[1]
+        request.path
     );
 }
 
@@ -68,18 +142,66 @@ function installRequestLogFilter(): void {
         console.log.bind(
             console
         );
+    const devLogger =
+        createLogger({
+            name:
+                "bcp-dev",
+            write(
+                line
+            ) {
+                originalLog(
+                    line
+                );
+            },
+        });
 
     console.log = (
         ...args: unknown[]
     ) => {
         if (
             args.length === 1 &&
-            typeof args[0] === "string" &&
-            !shouldWriteDevConsoleLine(
-                args[0]
-            )
+            typeof args[0] === "string"
         ) {
-            return;
+            const request =
+                parseDevHttpRequestLog(
+                    args[0]
+                );
+
+            if (request) {
+                if (
+                    shouldLogDevApiPath(
+                        request.path
+                    )
+                ) {
+                    devLogger.info(
+                        "HTTP request",
+                        {
+                            event:
+                                "http.request",
+                            ...request,
+                        }
+                    );
+                }
+
+                return;
+            }
+
+            const timing =
+                parseDevTimingLog(
+                    args[0]
+                );
+
+            if (timing) {
+                devLogger.debug(
+                    timing.event ===
+                        "ssr.render"
+                        ? "SSR render"
+                        : "Module import",
+                    timing
+                );
+
+                return;
+            }
         }
 
         originalLog(