@bleedingdev/modern-js-plugin-bff 3.2.0-ultramodern.102 → 3.2.0-ultramodern.104

package/dist/esm-node/runtime/effect/module.mjs

@@ -1,6 +1,7 @@
 import "node:module";
 import { HttpApi } from "effect/unstable/httpapi";
 import { createHttpApiHandler } from "./handler.mjs";
+import * as __rspack_external_effect_Context_f1289ca3 from "effect/Context";
 function isRecord(value) {
     return 'object' == typeof value && null !== value;
 }
@@ -13,15 +14,29 @@ function isRequestHandler(value) {
 function isEffectApiDefinition(module) {
     return HttpApi.isHttpApi(module.api) && void 0 !== module.layer;
 }
-async function resolveEffectBffModuleHandler(mod, options = {}) {
-    let normalizedModule = mod;
-    const mergeRuntimeExports = (value)=>{
-        if (!isRecord(value) || !includesRuntimeExports(value)) return;
-        normalizedModule = {
-            ...normalizedModule,
-            ...value
-        };
+function isEffectServiceContext(context) {
+    return 'object' == typeof context && null !== context && 'mapUnsafe' in context;
+}
+const emptyEffectServiceContext = __rspack_external_effect_Context_f1289ca3.empty();
+function callEffectBffRequestHandler(handler, request, context) {
+    return void 0 === context ? handler(request) : handler(request, context);
+}
+function createLoadedHandler(webHandler) {
+    return {
+        handler: (request, context)=>callEffectBffRequestHandler(webHandler.handler, request, context),
+        dispose: webHandler.dispose
     };
+}
+function createLoadedHttpApiHandler(webHandler) {
+    return {
+        handler: (request, context)=>{
+            const effectContext = isEffectServiceContext(context) ? context : emptyEffectServiceContext;
+            return webHandler.handler(request, effectContext);
+        },
+        dispose: webHandler.dispose
+    };
+}
+function resolveNormalizedEffectBffModuleHandler(normalizedModule, options = {}) {
     if (isRequestHandler(normalizedModule.handler)) return {
         handler: normalizedModule.handler
     };
@@ -29,13 +44,6 @@ async function resolveEffectBffModuleHandler(mod, options = {}) {
     if (isRequestHandler(entry)) return {
         handler: entry
     };
-    if ('function' == typeof entry && 0 === entry.length) {
-        const out = await entry();
-        if (isRequestHandler(out)) return {
-            handler: out
-        };
-        mergeRuntimeExports(out);
-    }
     if (isRecord(entry)) normalizedModule = {
         ...normalizedModule,
         ...entry
@@ -55,12 +63,7 @@ async function resolveEffectBffModuleHandler(mod, options = {}) {
             openapi: options.openapi,
             dataPlatform: options.dataPlatform
         });
-        return {
-            handler: async (request, context)=>webHandler.handler(request, context),
-            dispose: async ()=>{
-                await webHandler.dispose();
-            }
-        };
+        return createLoadedHandler(webHandler);
     }
     if (isEffectApiDefinition(normalizedModule)) {
         options.onWarning?.('[BFF][Effect] Detected { api, layer } export without createHandler. Prefer `defineEffectBff(...)` from @modern-js/plugin-bff/server to avoid module instance mismatch.');
@@ -70,13 +73,33 @@ async function resolveEffectBffModuleHandler(mod, options = {}) {
             openapi: options.openapi,
             dataPlatform: options.dataPlatform
         });
-        return {
-            handler: async (request, context)=>webHandler.handler(request, context),
-            dispose: async ()=>{
-                await webHandler.dispose();
-            }
-        };
+        return createLoadedHttpApiHandler(webHandler);
     }
     return null;
 }
+function resolveEffectBffModuleHandler(mod, options = {}) {
+    let normalizedModule = mod;
+    const mergeRuntimeExports = (value)=>{
+        if (!isRecord(value) || !includesRuntimeExports(value)) return;
+        normalizedModule = {
+            ...normalizedModule,
+            ...value
+        };
+    };
+    if (isRequestHandler(normalizedModule.handler)) return Promise.resolve({
+        handler: normalizedModule.handler
+    });
+    const entry = normalizedModule.default;
+    if (isRequestHandler(entry)) return Promise.resolve({
+        handler: entry
+    });
+    if ('function' == typeof entry && 0 === entry.length) return Promise.resolve(entry()).then((out)=>{
+        if (isRequestHandler(out)) return {
+            handler: out
+        };
+        mergeRuntimeExports(out);
+        return resolveNormalizedEffectBffModuleHandler(normalizedModule, options);
+    });
+    return Promise.resolve(resolveNormalizedEffectBffModuleHandler(normalizedModule, options));
+}
 export { resolveEffectBffModuleHandler };

package/dist/esm-node/runtime/effect-client/index.mjs

@@ -56,7 +56,7 @@ function makeEffectHttpApiClient(api, options) {
             for (const [header, value] of Object.entries(requestContextHeaders))if (void 0 === nextRequest.headers[header.toLowerCase()]) nextRequest = HttpClientRequest.setHeader(nextRequest, header, value);
             return nextRequest;
         }));
-        return options?.transformClient ? options.transformClient(contextClient) : contextClient;
+        return 'function' == typeof options?.transformClient ? options.transformClient(contextClient) : contextClient;
     };
     return HttpApiClient.make(api, {
         baseUrl: options?.baseUrl,

package/dist/types/runtime/effect/context.d.ts

@@ -2,4 +2,4 @@ import type { EffectContext } from './operation-context';
 export { type CreateEffectOperationContextOptions, createEffectOperationContext, type EffectContext, } from './operation-context';
 export declare const runWithEffectContext: <T>(context: EffectContext, cb: () => T) => T;
 export declare const useEffectContext: () => EffectContext;
-export declare const useOperationContext: () => OperationContext;
+export declare const useOperationContext: () => import("@modern-js/create-request").OperationContext;

package/dist/types/runtime/effect/handler.d.ts

@@ -1,8 +1,10 @@
+import type { FileSystem, Path } from 'effect';
+import * as Context from 'effect/Context';
 import type * as EffectType from 'effect/Effect';
 import * as Layer from 'effect/Layer';
+import { Etag, HttpPlatform, HttpRouter } from 'effect/unstable/http';
 import { type HttpApi, type HttpApiClient, type HttpApiGroup } from 'effect/unstable/httpapi';
 import { type Rpc, type RpcGroup } from 'effect/unstable/rpc';
-export * as OpenTelemetry from '@effect/opentelemetry';
 export * as Config from 'effect/Config';
 export * as Effect from 'effect/Effect';
 export * as Layer from 'effect/Layer';
@@ -13,7 +15,8 @@ export { HttpTraceContext } from 'effect/unstable/http';
 export * from 'effect/unstable/httpapi';
 export { HttpApiBuilder } from 'effect/unstable/httpapi';
 export * from 'effect/unstable/rpc';
-export type EffectRuntimeLayer = Layer.Layer<never, unknown, unknown>;
+export type EffectRuntimeRequirements = Etag.Generator | FileSystem.FileSystem | HttpPlatform.HttpPlatform | HttpRouter.HttpRouter | HttpRouter.Request<'Error', any> | HttpRouter.Request<'GlobalError', any> | HttpRouter.Request<'GlobalRequires', any> | HttpRouter.Request<'Requires', any> | Path.Path;
+export type EffectRuntimeLayer = Layer.Layer<never, never, EffectRuntimeRequirements>;
 export type EffectRpcSerialization = 'json' | 'ndjson' | 'jsonRpc' | 'ndJsonRpc' | 'msgPack';
 export type EffectRpcRuntimeLayer<TRpcs extends Rpc.Any = Rpc.Any> = Layer.Layer<Rpc.ToHandler<TRpcs> | Rpc.Middleware<TRpcs> | Rpc.ServicesServer<TRpcs>, unknown, never>;
 export type EffectRpcBffDefinition<TRpcs extends Rpc.Any = Rpc.Any, TRpcLayer extends EffectRpcRuntimeLayer<TRpcs> = EffectRpcRuntimeLayer<TRpcs>> = {
@@ -141,7 +144,7 @@ export type EffectBffOpenApiConfig = boolean | {
 };
 export type EffectRpcBffHandlerFactory<TRpcs extends Rpc.Any = Rpc.Any> = (options?: Partial<EffectRpcBffHandlerOptions>) => ReturnType<typeof createRpcApiHandler<TRpcs>>;
 declare function createRpcApiHandler<TRpcs extends Rpc.Any = Rpc.Any>(options: EffectRpcBffDefinition<TRpcs>): {
-    readonly handler: (request: globalThis.Request, context?: import("effect/Context").Context<never> | undefined) => Promise<Response>;
+    readonly handler: (request: globalThis.Request, context?: Context.Context<never> | undefined) => Promise<Response>;
     readonly dispose: () => Promise<void>;
 };
 export declare function defineEffectBff<TApi extends HttpApi.AnyWithProps, TLayer extends EffectRuntimeLayer, TRpcs extends Rpc.Any = Rpc.Any>(definition: {
@@ -165,6 +168,6 @@ export declare function createHttpApiHandler<TApi extends HttpApi.AnyWithProps =
     rpc?: EffectRpcBffDefinition<TRpcs>;
     dataPlatform?: EffectDataPlatformValidationOptions;
 }): {
-    handler: (request: Request, context?: Parameters<(request: globalThis.Request, context: import("effect/Context").Context<any>) => Promise<Response>>[1]) => Promise<Response>;
+    handler: (request: Request, context?: Parameters<(request: globalThis.Request, context: Context.Context<any>) => Promise<Response>>[1]) => Promise<Response>;
     dispose: () => Promise<void>;
 };

package/dist/types/runtime/effect/index.d.ts

@@ -1,2 +1,3 @@
+export * as OpenTelemetry from '@effect/opentelemetry';
 export { type CreateEffectOperationContextOptions, createEffectOperationContext, type EffectContext, useEffectContext, useOperationContext, } from './context';
 export * from './handler';

package/dist/types/runtime/effect/module.d.ts

@@ -1,7 +1,7 @@
 import type * as EffectServiceContext from 'effect/Context';
 import { type EffectBffOpenApiConfig, type EffectDataPlatformValidationOptions } from './handler';
 import type { EffectContext } from './operation-context';
-export type EffectBffRequestHandler = (request: Request, context?: EffectServiceContext.Context<never> | EffectContext) => Promise<Response> | Response;
+export type EffectBffRequestHandler = (request: Request, context?: EffectServiceContext.Context<any> | EffectContext) => Promise<Response> | Response;
 export type EffectBffHandlerFactory = (options?: {
     openapi?: EffectBffOpenApiConfig;
     dataPlatform?: EffectDataPlatformValidationOptions;

package/dist/types/utils/createHonoRoutes.d.ts

@@ -3,8 +3,8 @@ import type { Context } from '@modern-js/server-core';
 type Handler = APIHandlerInfo['handler'];
 declare const createHonoRoutes: (handlerInfos?: APIHandlerInfo[]) => {
     method: any;
-    path: APIHandlerInfo;
-    handler: any[] | ((c: Context) => Promise<any>);
+    path: string;
+    handler: any[] | ((c: Context) => Promise<void | Response>);
 }[];
-export declare const createHonoHandler: (handler: Handler) => (c: Context) => Promise<any>;
+export declare const createHonoHandler: (handler: Handler) => (c: Context) => Promise<void | Response>;
 export default createHonoRoutes;

package/dist/types/utils/effectClientGenerator.d.ts

@@ -24,4 +24,4 @@ export declare function resolveEffectEntryFile(options: {
     appDir: string;
     apiDir: string;
     effectEntry?: string;
-}): any;
+}): string | false | undefined;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.0-ultramodern.102",
+  "version": "3.2.0-ultramodern.104",
   "types": "./dist/types/cli.d.ts",
   "main": "./dist/cjs/cli.js",
   "exports": {
@@ -145,15 +145,15 @@
     "effect": "4.0.0-beta.66",
     "qs": "^6.15.2",
     "type-is": "^2.1.0",
-    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.2.0-ultramodern.102",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.102",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.2.0-ultramodern.102",
-    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.2.0-ultramodern.102",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.2.0-ultramodern.102",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.102"
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.2.0-ultramodern.104",
+    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.2.0-ultramodern.104",
+    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.2.0-ultramodern.104",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.104",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.2.0-ultramodern.104",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.104"
   },
   "devDependencies": {
-    "@rsbuild/core": "2.0.7",
+    "@rsbuild/core": "2.0.10",
     "@rslib/core": "0.21.5",
     "@types/node": "^25.9.1",
     "@types/qs": "^6.15.1",
@@ -161,12 +161,12 @@
     "@typescript/native-preview": "7.0.0-dev.20260527.2",
     "memfs": "^4.57.2",
     "zod": "^4.4.3",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.102",
-    "@modern-js/bff-runtime": "npm:@bleedingdev/modern-js-bff-runtime@3.2.0-ultramodern.102",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.102",
+    "@modern-js/bff-runtime": "npm:@bleedingdev/modern-js-bff-runtime@3.2.0-ultramodern.104",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.104",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.104",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.104",
     "@scripts/rstest-config": "2.66.0",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.102",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.102"
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.104"
   },
   "sideEffects": false,
   "publishConfig": {