@bleedingdev/modern-js-bff-effect 3.9.0-ultramodern.4 → 3.9.0-ultramodern.6

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "ultramodern.js"
   ],
-  "version": "3.9.0-ultramodern.4",
+  "version": "3.9.0-ultramodern.6",
   "files": [
     "dist",
     "src"
@@ -67,14 +67,14 @@
       "import": "./dist/esm/effect-client/index.mjs",
       "default": "./dist/esm/effect-client/index.mjs"
     },
-    "./effect-client-runtime": {
-      "types": "./dist/types/effect-client/runtime.d.ts",
+    "./microvertical-api": {
+      "types": "./dist/types/microvertical-api.d.ts",
       "node": {
-        "import": "./dist/esm-node/effect-client/runtime.mjs",
-        "require": "./dist/cjs/effect-client/runtime.js"
+        "import": "./dist/esm-node/microvertical-api.mjs",
+        "require": "./dist/cjs/microvertical-api.js"
       },
-      "import": "./dist/esm/effect-client/runtime.mjs",
-      "default": "./dist/esm/effect-client/runtime.mjs"
+      "import": "./dist/esm/microvertical-api.mjs",
+      "default": "./dist/esm/microvertical-api.mjs"
     },
     "./data-platform": {
       "types": "./dist/types/data-platform/index.d.ts",
@@ -84,6 +84,14 @@
       },
       "import": "./dist/esm/data-platform/index.mjs",
       "default": "./dist/esm/data-platform/index.mjs"
+    },
+    "./assembly": {
+      "types": "./dist/types/assembly.d.ts",
+      "node": {
+        "import": "./dist/esm-node/assembly.mjs",
+        "require": "./dist/cjs/assembly.js"
+      },
+      "default": "./dist/esm/assembly.mjs"
     }
   },
   "typesVersions": {
@@ -104,13 +112,17 @@
         "./dist/types/effect-client/index.d.ts",
         "./src/effect-client/index.ts"
       ],
-      "effect-client-runtime": [
-        "./dist/types/effect-client/runtime.d.ts",
-        "./src/effect-client/runtime.ts"
+      "microvertical-api": [
+        "./dist/types/microvertical-api.d.ts",
+        "./src/microvertical-api.ts"
       ],
       "data-platform": [
         "./dist/types/data-platform/index.d.ts",
         "./src/data-platform/index.ts"
+      ],
+      "assembly": [
+        "./dist/types/assembly.d.ts",
+        "./src/assembly.ts"
       ]
     }
   },
@@ -118,9 +130,10 @@
     "node": ">=26.7.0"
   },
   "dependencies": {
-    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.4",
-    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.9.0-ultramodern.4",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.4",
+    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.6",
+    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.9.0-ultramodern.6",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.6",
+    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.6",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/api-logs": "0.222.0",
     "@opentelemetry/resources": "2.11.0",

package/src/assembly.ts

@@ -0,0 +1,43 @@
+/** Server-only assembly for the invariant tail of a strict Effect BFF runtime factory. */
+import * as Layer from 'effect/Layer';
+import type { HttpApi, HttpApiGroup } from 'effect/unstable/httpapi';
+import { HttpApiBuilder } from 'effect/unstable/httpapi';
+import { defineEffectBff } from './effect/handler/definition';
+import type { EffectRuntimeRequirements } from './effect/handler/types';
+
+export interface EffectBffRuntimeAssembly<
+  ApiId extends string,
+  Groups extends HttpApiGroup.Constraint,
+  HandlerRequirements extends EffectRuntimeRequirements,
+  TransportRequirements extends EffectRuntimeRequirements = never,
+> {
+  readonly api: HttpApi.HttpApi<ApiId, Groups>;
+  readonly handlers: Layer.Layer<
+    HttpApiGroup.ToService<ApiId, Groups>,
+    never,
+    HandlerRequirements
+  >;
+  readonly transport?: Layer.Layer<never, never, TransportRequirements>;
+}
+
+export const assembleEffectBffRuntime = <
+  ApiId extends string,
+  Groups extends HttpApiGroup.Constraint,
+  HandlerRequirements extends EffectRuntimeRequirements,
+  TransportRequirements extends EffectRuntimeRequirements = never,
+>({
+  api,
+  handlers,
+  transport,
+}: EffectBffRuntimeAssembly<
+  ApiId,
+  Groups,
+  HandlerRequirements,
+  TransportRequirements
+>) => {
+  const apiLayer = HttpApiBuilder.layer(api).pipe(Layer.provide(handlers));
+  const layer =
+    transport === undefined ? apiLayer : apiLayer.pipe(Layer.merge(transport));
+
+  return defineEffectBff({ api, layer });
+};

package/src/data-platform/batch/queue.ts

@@ -307,15 +307,14 @@ export function createBatchTransportQueue({
     abortBatchIfUnused?.();
   };
 
-  const runSingle = (request: QueuedBatchRequest) => {
-    return runWithSignal(request.lifetime.signal, async () => {
+  const runSingle = (request: QueuedBatchRequest) =>
+    runWithSignal(request.lifetime.signal, async () => {
       const response = await baseFetch(
         request.requestInput,
         request.requestInit,
       );
       return parseResponseLikeCreateRequest(response);
     });
-  };
 
   const settleRequests = async (
     items: QueuedBatchRequest[],

package/src/data-platform/trace.ts

@@ -1,5 +1,5 @@
 // @effect-diagnostics asyncFunction:off globalDate:off globalRandom:off globalTimers:off newPromise:off strictBooleanExpressions:off
-import { parseTraceparent } from '@modern-js/create-request';
+import { parseTraceparent } from '@modern-js/runtime-extensions/request-context';
 
 import type { TraceContext } from './types';
 

package/src/effect/edge-dispatcher.ts

@@ -3,7 +3,8 @@ import {
   evaluateCrossProjectPolicy,
   type NormalizedCrossProjectPolicy,
   resolveCrossProjectRequestObservation,
-} from '@modern-js/bff-core/security/cross-project-policy';
+} from '@modern-js/server-runtime-extensions/bff-policy';
+import * as Effect from 'effect/Effect';
 import { toHeaderRecord } from '../headers';
 import {
   type DispatchEffectBffRequestOptions,
@@ -91,7 +92,6 @@ export {
 } from './edge-context';
 export type {
   EffectApiClientFromApi,
-  EffectApiPromiseClientFromApi,
   EffectBffDefinition,
   EffectBffHandlerFactory,
   EffectBffOpenApiConfig,
@@ -285,9 +285,11 @@ export async function createEffectBffEdgeDispatcher(
       disposePromise ??= (async () => {
         acceptingRequests = false;
         if (activeDispatches > 0) {
-          await new Promise<void>(resolve => {
-            resolveDrain = resolve;
-          });
+          await Effect.runPromise(
+            Effect.callback<void>(resume => {
+              resolveDrain = () => resume(Effect.void);
+            }),
+          );
         }
         await loaded.dispose?.();
       })();

package/src/effect/edge.ts

@@ -1 +1,2 @@
 export * from './edge-dispatcher';
+export { createEffectBffEdgeDispatcherFactory } from './generated-entry';

package/src/effect/endpoint-contracts.ts

@@ -1,21 +1,9 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
-/**
- * Shared Effect HttpApi endpoint reflection used by BOTH sides of the
- * cross-project contract:
- *
- * - the `@modern-js/plugin-bff-extensions/client-generator` package stamps
- *   each generated operation with a per-endpoint contract hash;
- * - the `@modern-js/plugin-bff-extensions/effect-adapter` package derives the
- *   expected operation-contract map for the cross-project policy from the
- *   same endpoints.
- *
- * Keeping route-path normalization and the endpoint -> contract mapping in
- * one module is what guarantees the two hashes agree.
- */
+/** Shared endpoint normalization and identity hashing for server policy metadata. */
 import {
   createOperationContractHash,
   type OperationContractSource,
-} from '@modern-js/bff-core';
+} from '@modern-js/server-runtime-extensions/bff-policy/node';
 import {
   classifyEffectBffEntryModule,
   isValidatorAwareHandlerFactory,
@@ -38,13 +26,7 @@ type HttpApiGroupLike = {
 };
 
 type HttpApiEndpointLike = {
-  /**
-   * effect 4.0.0-beta.98 renamed the endpoint `name` property to `identifier`,
-   * matching `HttpApiGroup`. `name` is kept as a fallback so reflection over an
-   * older Effect build does not silently degrade to the class name.
-   */
   identifier?: unknown;
-  name?: unknown;
   method?: unknown;
   path?: unknown;
 };
@@ -53,9 +35,6 @@ function resolveEffectEndpointName(endpoint: HttpApiEndpointLike): string {
   if (typeof endpoint.identifier === 'string' && endpoint.identifier) {
     return endpoint.identifier;
   }
-  if (typeof endpoint.name === 'string' && endpoint.name) {
-    return endpoint.name;
-  }
   return '';
 }
 
@@ -168,7 +147,7 @@ export async function extractHttpApiFromModule(
     isValidatorAwareHandlerFactory,
     isHttpApi,
   });
-  return facts?.legacyShape ||
+  return facts?.unsupportedShape ||
     facts?.api === undefined ||
     !facts.hasRuntimeLayer ||
     (facts.createHandler !== undefined && !facts.createHandlerValidatorAware)

package/src/effect/entry-shape.ts

@@ -42,8 +42,11 @@ function loadNodeValidatorAwareHandlerFactoryRegistry(): ValidatorAwareHandlerFa
   }
 }
 
+declare const __MODERN_EFFECT_NODE_RUNTIME__: boolean;
+
 const validatorAwareHandlerFactoryRegistry =
-  process.env.MODERN_EFFECT_NODE_RUNTIME === 'true'
+  typeof __MODERN_EFFECT_NODE_RUNTIME__ !== 'undefined' &&
+  __MODERN_EFFECT_NODE_RUNTIME__
     ? loadNodeValidatorAwareHandlerFactoryRegistry()
     : createLocalValidatorAwareHandlerFactoryRegistry();
 
@@ -55,11 +58,13 @@ type EffectBffEntryModule = {
   default?: unknown;
 };
 
-type LegacyEffectBffEntryShape = '`handler` export' | 'default request handler';
+type UnsupportedEffectBffEntryShape =
+  | '`handler` export'
+  | 'default request handler';
 
 export type EffectBffEntryShapeFacts = {
   module: EffectBffEntryModule;
-  legacyShape?: LegacyEffectBffEntryShape;
+  unsupportedShape?: UnsupportedEffectBffEntryShape;
   createHandler?: unknown;
   createHandlerValidatorAware: boolean;
   api?: unknown;
@@ -132,7 +137,7 @@ export function classifyEffectBffEntryModule(
 function createEntryShapeFacts(
   module: EffectBffEntryModule,
   predicates: EffectBffEntryShapePredicates,
-  legacyShape?: LegacyEffectBffEntryShape,
+  unsupportedShape?: UnsupportedEffectBffEntryShape,
 ): EffectBffEntryShapeFacts {
   const createHandler =
     typeof module.createHandler === 'function'
@@ -143,7 +148,7 @@ function createEntryShapeFacts(
 
   return {
     module,
-    legacyShape,
+    unsupportedShape,
     createHandler,
     createHandlerValidatorAware:
       createHandler !== undefined &&

package/src/effect/generated-entry.ts

@@ -0,0 +1,36 @@
+import {
+  createEffectBffEdgeDispatcher,
+  type EffectBffEdgeHandlerOptions,
+} from './edge-dispatcher';
+
+type OperationContracts = NonNullable<
+  EffectBffEdgeHandlerOptions['crossProjectPolicy']
+>['expectedOperationContracts'];
+
+export function createEffectBffEdgeDispatcherFactory(
+  module: EffectBffEdgeHandlerOptions['module'],
+  generatedOperationContracts: OperationContracts,
+) {
+  return (options?: Omit<EffectBffEdgeHandlerOptions, 'module'>) => {
+    const policy = options?.crossProjectPolicy;
+    const crossProjectPolicy =
+      policy === undefined ||
+      policy === null ||
+      policy.expectedOperationContracts === null ||
+      typeof policy.expectedOperationContracts !== 'object' ||
+      Array.isArray(policy.expectedOperationContracts)
+        ? policy
+        : {
+            ...policy,
+            expectedOperationContracts: {
+              ...policy.expectedOperationContracts,
+              ...generatedOperationContracts,
+            },
+          };
+    return createEffectBffEdgeDispatcher({
+      ...options,
+      crossProjectPolicy,
+      module,
+    });
+  };
+}

package/src/effect/handler/batch-handler.ts

@@ -1,4 +1,5 @@
 // @effect-diagnostics anyUnknownInErrorContext:off asyncFunction:off globalDate:off globalTimers:off newPromise:off strictBooleanExpressions:off
+import * as Effect from 'effect/Effect';
 import {
   type DataBatchResponsePayload,
   DEFAULT_DATA_BATCH_HEADER,
@@ -417,14 +418,16 @@ export function createDataPlatformBatchRequestHandler<TContext>(options: {
           );
         } catch (error) {
           if (error instanceof BatchItemTimeoutError) {
-            console.error({
-              event: 'bff.batch.item.timeout',
-              batchId: payload.batchId,
-              itemId,
-              method: itemMethod,
-              path: itemPathname,
-              errorName: error.name,
-            });
+            Effect.runSync(
+              Effect.logError({
+                event: 'bff.batch.item.timeout',
+                batchId: payload.batchId,
+                itemId,
+                method: itemMethod,
+                path: itemPathname,
+                errorName: error.name,
+              }),
+            );
             return toBatchItemError(
               itemId,
               504,
@@ -435,14 +438,16 @@ export function createDataPlatformBatchRequestHandler<TContext>(options: {
             return toBatchResponseItem(itemId, error, itemMethod === 'HEAD');
           }
 
-          console.error({
-            event: 'bff.batch.item.failure',
-            batchId: payload.batchId,
-            itemId,
-            method: itemMethod,
-            path: itemPathname,
-            errorName: error instanceof Error ? error.name : 'UnknownError',
-          });
+          Effect.runSync(
+            Effect.logError({
+              event: 'bff.batch.item.failure',
+              batchId: payload.batchId,
+              itemId,
+              method: itemMethod,
+              path: itemPathname,
+              errorName: error instanceof Error ? error.name : 'UnknownError',
+            }),
+          );
           return toBatchItemError(itemId, 500, 'Internal Server Error');
         } finally {
           request.signal.removeEventListener('abort', abortFromBatchRequest);

package/src/effect/handler/batch.ts

@@ -1,5 +1,6 @@
 // @effect-diagnostics anyUnknownInErrorContext:off asyncFunction:off globalDate:off globalTimers:off newPromise:off strictBooleanExpressions:off
 
+import * as Data from 'effect/Data';
 import {
   type DataBatchRequestPayload,
   type DataBatchResponseItem,
@@ -117,7 +118,14 @@ export function toBatchItemError(
   };
 }
 
-export class BatchItemTimeoutError extends Error {}
+export class BatchItemTimeoutError extends Data.TaggedError(
+  'BatchItemTimeoutError',
+)<{ readonly message: string }> {
+  constructor(message: string) {
+    super({ message });
+    this.name = 'Error';
+  }
+}
 
 export function promiseWithTimeout<T>(
   effect: Promise<T>,

package/src/effect/handler/definition.ts

@@ -7,7 +7,6 @@ import { mergeDataPlatformOptions } from './envelope';
 import { createHttpApiHandler } from './http';
 import { createRpcApiHandler } from './rpc';
 import type {
-  EffectApiPromiseClientFromApi,
   EffectBffDefinition,
   EffectBffHandlerFactory,
   EffectBffRuntime,
@@ -51,55 +50,12 @@ export function defineEffectBff<
       validateRequest: options?.validateRequest,
     });
   });
-  const client = createLoaderMaterializedClientPlaceholder<TApi>();
   return {
     ...definition,
     createHandler,
-    client,
   };
 }
 
-const LOADER_CLIENT_IGNORED_KEYS = new Set<PropertyKey>([
-  'then',
-  'catch',
-  'finally',
-  'toJSON',
-  '$$typeof',
-]);
-
-/**
- * `defineEffectBff(...).client` is only materialized when the entry module
- * is imported through the `@api/index` transform (the webpack/rspack
- * loader swaps the module for generated client code). Importing the entry
- * directly (server code, scripts, tests) used to return a `client` typed as
- * fully functional but `undefined` at runtime — a bare TypeError with zero
- * explanation. This placeholder keeps the type contract while failing with
- * an actionable error on first property access.
- */
-function createLoaderMaterializedClientPlaceholder<
-  TApi extends HttpApi.Constraint,
->(): EffectApiPromiseClientFromApi<TApi> {
-  const explain = (property: PropertyKey): never => {
-    throw new Error(
-      `[BFF][Effect] client.${String(property)} is not available here: the typed client only exists when the API entry is imported through the "@api/index" transformed path (the BFF loader replaces it with generated client code). On the server, use HttpApiClient or call the Effect layer directly.`,
-    );
-  };
-
-  return new Proxy(Object.create(null), {
-    get(_target, property) {
-      // Keep async/inspection protocols (await, console.log, React internals)
-      // from throwing so the placeholder stays inert until really used.
-      if (
-        typeof property === 'symbol' ||
-        LOADER_CLIENT_IGNORED_KEYS.has(property)
-      ) {
-        return undefined;
-      }
-      return explain(property);
-    },
-  }) as EffectApiPromiseClientFromApi<TApi>;
-}
-
 export function defineEffectRpcBff<
   TRpcs extends Rpc.Any = Rpc.Any,
   TLayer extends EffectRpcRuntimeLayer<TRpcs> = EffectRpcRuntimeLayer<TRpcs>,

package/src/effect/handler/http.ts

@@ -66,8 +66,8 @@ export function createHttpApiHandler<
   ) => {
     // Policy seam first: every HttpApi request, direct or batched item,
     // passes through here, so batch fan-out cannot bypass validator. The
-    // interceptor receives the original request and may own malformed or
-    // legacy payloads; delegated requests still pass through body validation.
+    // interceptor receives the original request; delegated requests still
+    // pass through body validation.
     const policyDenial = options.validateRequest?.(request);
     if (policyDenial) {
       return policyDenial;

package/src/effect/handler/types.ts

@@ -77,22 +77,6 @@ export type EffectRpcBffHandlerOptions = Pick<
   | 'disableFatalDefects'
 >;
 
-type EffectApiPromiseClient<TClient> = {
-  [GroupName in keyof TClient]: {
-    [EndpointName in keyof TClient[GroupName]]: TClient[GroupName][EndpointName] extends (
-      ...args: infer TArgs
-    ) => infer TResult
-      ? TResult extends EffectType.Effect<unknown, unknown, unknown>
-        ? (
-            ...args: TArgs
-          ) => Promise<
-            Exclude<EffectType.Success<TResult>, readonly [unknown, unknown]>
-          >
-        : never
-      : never;
-  };
-};
-
 export type EffectApiClientFromApi<
   TApi extends HttpApi.Constraint = HttpApi.Top,
 > =
@@ -104,10 +88,6 @@ export type EffectApiClientFromApi<
       >
     : never;
 
-export type EffectApiPromiseClientFromApi<
-  TApi extends HttpApi.Constraint = HttpApi.Top,
-> = EffectApiPromiseClient<EffectApiClientFromApi<TApi>>;
-
 export type EffectBffDefinition<
   TApi extends HttpApi.Constraint = HttpApi.Top,
   TLayer extends EffectRuntimeLayer = EffectRuntimeLayer,
@@ -147,12 +127,6 @@ export type EffectDataPlatformBatchOptions = {
    * Defaults to `65536` (64KiB).
    */
   maxBatchBytes?: number;
-  /**
-   * Client-side micro-batch flush window in milliseconds.
-   * Server runtime ignores this value and passes it through for codegen.
-   * Defaults to `8`.
-   */
-  flushIntervalMs?: number;
   /**
    * Maximum per-batch internal request concurrency.
    * Defaults to `4`.
@@ -241,7 +215,6 @@ export type EffectBffRuntime<
   TLayer extends EffectRuntimeLayer = EffectRuntimeLayer,
 > = {
   createHandler: EffectBffHandlerFactory<TApi, TLayer>;
-  client: EffectApiPromiseClientFromApi<TApi>;
 };
 
 export type EffectBffOpenApiConfig =

package/src/effect/handler.ts

@@ -14,7 +14,6 @@ export { defineEffectBff, defineEffectRpcBff } from './handler/definition';
 export { createHttpApiHandler } from './handler/http';
 export type {
   EffectApiClientFromApi,
-  EffectApiPromiseClientFromApi,
   EffectBffDefinition,
   EffectBffHandlerFactory,
   EffectBffOpenApiConfig,

package/src/effect/module.ts

@@ -67,7 +67,7 @@ function shareDispose(dispose: () => Promise<void>) {
   };
 }
 
-function rejectLegacyEffectModuleShape(
+function rejectUnsupportedEffectModuleShape(
   options: ResolveEffectBffModuleHandlerOptions,
   shape: string,
 ) {
@@ -119,8 +119,8 @@ function resolveClassifiedEffectBffModuleHandler(
     return null;
   }
 
-  if (facts.legacyShape) {
-    if (rejectLegacyEffectModuleShape(options, facts.legacyShape)) {
+  if (facts.unsupportedShape) {
+    if (rejectUnsupportedEffectModuleShape(options, facts.unsupportedShape)) {
       return null;
     }
   }
@@ -137,7 +137,7 @@ function resolveClassifiedEffectBffModuleHandler(
     }
 
     if (facts.api === undefined || !facts.hasRuntimeLayer) {
-      rejectLegacyEffectModuleShape(
+      rejectUnsupportedEffectModuleShape(
         options,
         'unbranded `createHandler` export',
       );

package/src/effect/operation-context.ts

@@ -6,7 +6,7 @@ import {
   BFF_TRACEPARENT_HEADER,
   type OperationContext,
   parseTraceparent,
-} from '@modern-js/create-request';
+} from '@modern-js/runtime-extensions/request-context';
 
 export type EffectContext = {
   request: Request;