@chidchanun/bcp 0.1.22 → 0.1.23

package/packages/cli/bin/bcp.mjs

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+import fs from "node:fs";
+import path from "node:path";
 import {
     spawn,
 } from "node:child_process";
@@ -7,6 +9,46 @@ import {
     fileURLToPath,
 } from "node:url";
 
+const command =
+    process.argv[2] ??
+    "dev";
+
+const duplicateInstall =
+    findDuplicateFrameworkInstall(
+        process.cwd()
+    );
+
+if (duplicateInstall) {
+    const message = [
+        "BCP Framework: duplicate framework installations detected.",
+        "",
+        `bcp: ${duplicateInstall.bcp}`,
+        `@chidchanun/bcp: ${duplicateInstall.scoped}`,
+        "",
+        "The application and the BCP CLI can load different framework copies. This breaks shared React contexts such as useLoaderData() and may produce misleading missing-loader errors.",
+        "",
+        "Keep only one application dependency named bcp. For local tarball verification install it under the bcp dependency key, for example:",
+        "npm install --no-save --package-lock=false \"bcp@file:D:\\\\path\\\\to\\\\chidchanun-bcp-0.1.22.tgz\"",
+    ].join("\n");
+
+    if (
+        command !== "doctor" &&
+        command !== "inspect"
+    ) {
+        console.error(
+            message
+        );
+        process.exitCode =
+            1;
+        process.exit();
+    }
+
+    console.warn(
+        message
+    );
+    console.warn("");
+}
+
 const bootstrapFile =
     fileURLToPath(
         new URL(
@@ -91,3 +133,72 @@ child.once(
             code ?? 1;
     }
 );
+
+function findDuplicateFrameworkInstall(
+    rootDirectory
+) {
+    const bcp =
+        resolvePackageRoot(
+            path.join(
+                rootDirectory,
+                "node_modules",
+                "bcp"
+            )
+        );
+    const scoped =
+        resolvePackageRoot(
+            path.join(
+                rootDirectory,
+                "node_modules",
+                "@chidchanun",
+                "bcp"
+            )
+        );
+
+    if (
+        !bcp ||
+        !scoped ||
+        normalizePath(bcp) ===
+            normalizePath(scoped)
+    ) {
+        return null;
+    }
+
+    return {
+        bcp,
+        scoped,
+    };
+}
+
+function resolvePackageRoot(
+    directory
+) {
+    if (
+        !fs.existsSync(
+            path.join(
+                directory,
+                "package.json"
+            )
+        )
+    ) {
+        return null;
+    }
+
+    try {
+        return fs.realpathSync(
+            directory
+        );
+    } catch {
+        return path.resolve(
+            directory
+        );
+    }
+}
+
+function normalizePath(
+    value
+) {
+    return process.platform === "win32"
+        ? value.toLowerCase()
+        : value;
+}

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(