@bleedingdev/modern-js-plugin-bff-extensions 3.9.0-ultramodern.11 → 3.9.0-ultramodern.13

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "ultramodern.js"
   ],
-  "version": "3.9.0-ultramodern.11",
+  "version": "3.9.0-ultramodern.13",
   "files": [
     "dist",
     "src"
@@ -50,13 +50,13 @@
       },
       "default": "./dist/cjs/cross-project-generation/index.js"
     },
-    "./effect-adapter": {
-      "types": "./dist/types/effect-adapter/index.d.ts",
+    "./effect-server": {
+      "types": "./dist/types/effect-server/index.d.ts",
       "node": {
-        "import": "./dist/esm-node/effect-adapter/index.mjs",
-        "require": "./dist/cjs/effect-adapter/index.js"
+        "import": "./dist/esm-node/effect-server/index.mjs",
+        "require": "./dist/cjs/effect-server/index.js"
       },
-      "default": "./dist/cjs/effect-adapter/index.js"
+      "default": "./dist/cjs/effect-server/index.js"
     },
     "./effect-source-loader": {
       "types": "./dist/types/effect-source-loader/index.d.ts",
@@ -147,9 +147,9 @@
         "./dist/types/cross-project-generation/index.d.ts",
         "./src/cross-project-generation/index.ts"
       ],
-      "effect-adapter": [
-        "./dist/types/effect-adapter/index.d.ts",
-        "./src/effect-adapter/index.ts"
+      "effect-server": [
+        "./dist/types/effect-server/index.d.ts",
+        "./src/effect-server/index.ts"
       ],
       "effect-source-loader": [
         "./dist/types/effect-source-loader/index.d.ts",
@@ -193,21 +193,21 @@
     "node": ">=26.7.0"
   },
   "dependencies": {
-    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.11",
-    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.11",
-    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.11",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.11",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.11",
-    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.11",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.11",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.11",
-    "@module-federation/runtime": "2.9.0",
+    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.13",
+    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.13",
+    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.13",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.13",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.13",
+    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.13",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.13",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.13",
+    "@module-federation/runtime": "npm:@bleedingdev/mf-runtime@2.9.1",
     "@swc/core": "1.16.2",
     "esbuild": "^0.28.2"
   },
   "peerDependencies": {
-    "@effect/opentelemetry": "4.0.0-rc.112",
-    "effect": "4.0.0-rc.112"
+    "@effect/opentelemetry": "4.0.0-rc.117",
+    "effect": "4.0.0-rc.117"
   },
   "peerDependenciesMeta": {
     "@effect/opentelemetry": {
@@ -218,15 +218,15 @@
     }
   },
   "devDependencies": {
-    "@effect/opentelemetry": "4.0.0-rc.112",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.11",
-    "@rsbuild/core": "2.2.3",
-    "@rslib/core": "1.0.0",
+    "@effect/opentelemetry": "4.0.0-rc.117",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.13",
+    "@rsbuild/core": "2.2.9",
+    "@rslib/core": "1.0.2",
     "@scripts/rstest-config": "2.66.0",
-    "@types/node": "^26.4.1",
-    "@types/react": "^19.2.18",
+    "@types/node": "^26.6.2",
+    "@types/react": "^19.3.0",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "effect": "4.0.0-rc.112"
+    "effect": "npm:@bleedingdev/effect@4.0.0-rc.117"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/backend-federation/identity.ts

@@ -17,59 +17,51 @@ export type BackendFederationIdentityIssue = {
   message: string;
 };
 
-/**
- * Shared expected-identity validation for loaded backend federation modules.
- * Compares the expose's `backendFederationContract.compatibility` identity
- * (`unitId`, `build`) against the consumer's expected delivery-unit identity.
- * Missing identity metadata is an error.
- */
-export function validateExpectedBackendFederationIdentity(
-  loaded: unknown,
-  expected: BackendFederationExpectedIdentity,
-): BackendFederationIdentityIssue[] {
-  const issues: BackendFederationIdentityIssue[] = [];
+/** Decode independently at each received-manifest / executed-expose boundary. */
+export function backendFederationCompatibility(loaded: unknown) {
   const contract = isRecord(loaded)
     ? loaded.backendFederationContract
     : undefined;
   const compatibility = isRecord(contract) ? contract.compatibility : undefined;
+  return isRecord(compatibility) ? compatibility : undefined;
+}
 
-  if (!isRecord(compatibility)) {
-    return [
-      {
-        path: 'backendFederationContract.compatibility',
-        message:
-          'loaded module declares no compatibility metadata; delivery-unit identity cannot be validated',
-      },
-    ];
-  }
-
-  const unitId = compatibility.unitId;
-  if (typeof unitId !== 'string' || unitId.length === 0) {
-    issues.push({
-      path: 'backendFederationContract.compatibility.unitId',
-      message: `missing delivery-unit id; expected ${expected.unitId}`,
-    });
-  } else if (unitId !== expected.unitId) {
-    issues.push({
-      path: 'backendFederationContract.compatibility.unitId',
-      message: `expected ${expected.unitId}, received ${unitId}`,
-    });
-  }
-
-  const build = compatibility.build;
-  if (typeof build !== 'string' || build.length === 0) {
-    issues.push({
-      path: 'backendFederationContract.compatibility.build',
-      message: `missing build marker; expected ${expected.buildMarker}`,
-    });
-  } else if (build !== expected.buildMarker) {
-    issues.push({
-      path: 'backendFederationContract.compatibility.build',
-      message: `expected ${expected.buildMarker}, received ${build}`,
-    });
-  }
+export function validateBackendFederationCompatibility(
+  compatibility: Record<string, unknown>,
+  expected: Record<string, string | undefined>,
+): BackendFederationIdentityIssue[] {
+  return Object.entries(expected).flatMap(([field, value]) =>
+    value === undefined ||
+    (typeof compatibility[field] === 'string' &&
+      compatibility[field].length > 0 &&
+      compatibility[field] === value)
+      ? []
+      : [
+          {
+            path: `backendFederationContract.compatibility.${field}`,
+            message: `expected ${value}, received ${typeof compatibility[field] === 'string' ? compatibility[field] : typeof compatibility[field]}`,
+          },
+        ],
+  );
+}
 
-  return issues;
+export function validateExpectedBackendFederationIdentity(
+  loaded: unknown,
+  expected: BackendFederationExpectedIdentity,
+): BackendFederationIdentityIssue[] {
+  const compatibility = backendFederationCompatibility(loaded);
+  return compatibility
+    ? validateBackendFederationCompatibility(compatibility, {
+        unitId: expected.unitId,
+        build: expected.buildMarker,
+      })
+    : [
+        {
+          path: 'backendFederationContract.compatibility',
+          message:
+            'loaded module declares no compatibility metadata; delivery-unit identity cannot be validated',
+        },
+      ];
 }
 
 export function formatBackendFederationIdentityIssues(

package/src/backend-federation/node-evaluator.ts

@@ -0,0 +1,13 @@
+import { createRequire } from 'node:module';
+import { evaluateNodeBackendFederationCommonJs } from '@modern-js/server-runtime-extensions/backend-federation-security/node';
+
+const fromAdapter = createRequire(import.meta.url);
+const fromEffectPackage = createRequire(
+  fromAdapter.resolve('@modern-js/bff-effect/package.json'),
+);
+const privateRegistry = fromEffectPackage(`#effect-entry-shape-${'registry'}`);
+
+export const evaluateEffectBackendFederationCommonJs = (
+  source: Parameters<typeof evaluateNodeBackendFederationCommonJs>[0],
+  context: Parameters<typeof evaluateNodeBackendFederationCommonJs>[1],
+) => evaluateNodeBackendFederationCommonJs(source, context, privateRegistry);

package/src/backend-federation/node.ts

@@ -1,6 +1,5 @@
-import { evaluateNodeBackendFederationCommonJs } from '@modern-js/server-runtime-extensions/backend-federation-security/node';
-
 import { loadBackendFederatedEffectApi as loadUniversalBackendFederatedEffectApi } from './load';
+import { evaluateEffectBackendFederationCommonJs } from './node-evaluator';
 import type {
   BackendFederatedEffectApiModule,
   BackendFederationIdentityLoadOptions,
@@ -16,7 +15,7 @@ export function loadBackendFederatedEffectApi(
       ...options.entryPolicy,
       evaluateCommonJs:
         options.entryPolicy?.evaluateCommonJs ??
-        evaluateNodeBackendFederationCommonJs,
+        evaluateEffectBackendFederationCommonJs,
     },
   });
 }

package/src/backend-federation-manifest/node.ts

@@ -1,6 +1,5 @@
-import { evaluateNodeBackendFederationCommonJs } from '@modern-js/server-runtime-extensions/backend-federation-security/node';
-
 import type { BackendFederatedEffectApiModule } from '../backend-federation';
+import { evaluateEffectBackendFederationCommonJs } from '../backend-federation/node-evaluator';
 import { loadBackendFederatedEffectApiFromManifest as loadUniversalBackendFederatedEffectApiFromManifest } from './load';
 import type { BackendFederationManifestAdapterOptions } from './types';
 
@@ -13,7 +12,7 @@ export function loadBackendFederatedEffectApiFromManifest(
       ...options.entryPolicy,
       evaluateCommonJs:
         options.entryPolicy?.evaluateCommonJs ??
-        evaluateNodeBackendFederationCommonJs,
+        evaluateEffectBackendFederationCommonJs,
     },
   });
 }

package/src/backend-federation-manifest/validation.ts

@@ -10,6 +10,11 @@ import {
   type BackendFederatedEffectApiModule,
   type BackendFederationRemote,
 } from '../backend-federation';
+import {
+  backendFederationCompatibility,
+  formatBackendFederationIdentityIssues,
+  validateBackendFederationCompatibility,
+} from '../backend-federation/identity';
 import {
   assertConsistentValue,
   assertManifestAdapter,
@@ -19,7 +24,6 @@ import {
 import {
   backendFederationMetadata,
   manifestDeliveryUnit,
-  recordField,
   stringValue,
   versionBoundaryMetadata,
 } from './metadata';
@@ -166,7 +170,7 @@ export function validateLoadedBackendFederationContract(
   const loadedContract = loaded.backendFederationContract;
   const backendFederation = backendFederationMetadata(manifest);
   const boundary = versionBoundaryMetadata(manifest);
-  const compatibility = recordField(loadedContract, 'compatibility');
+  const compatibility = backendFederationCompatibility(loaded);
 
   assertManifestAdapter(
     compatibility,
@@ -186,26 +190,6 @@ export function validateLoadedBackendFederationContract(
     remote.name,
     'expose name',
   );
-  assertVersionValue(
-    stringValue(compatibility.contractVersion),
-    stringValue(backendFederation?.contractVersion),
-    'expose contractVersion',
-  );
-  assertVersionValue(
-    stringValue(compatibility.nodeAdapterVersion),
-    stringValue(backendFederation?.nodeAdapterVersion),
-    'expose nodeAdapterVersion',
-  );
-  assertVersionValue(
-    stringValue(compatibility.packageName),
-    stringValue(boundary?.packageName),
-    'expose packageName',
-  );
-  assertVersionValue(
-    stringValue(compatibility.build),
-    stringValue(boundary?.buildVersion),
-    'expose buildVersion',
-  );
 
   const deliveryUnit = manifestDeliveryUnit(backendFederation, boundary);
   const manifestUnitId =
@@ -213,15 +197,24 @@ export function validateLoadedBackendFederationContract(
     stringValue(deliveryUnit.top?.unitId);
   const manifestBuildMarker = stringValue(deliveryUnit.boundary?.buildMarker);
 
-  assertVersionValue(
-    stringValue(compatibility.unitId),
-    manifestUnitId,
-    'deliveryUnit.unitId vs expose compatibility.unitId',
-  );
+  const issues = validateBackendFederationCompatibility(compatibility, {
+    contractVersion: stringValue(backendFederation?.contractVersion),
+    nodeAdapterVersion: stringValue(backendFederation?.nodeAdapterVersion),
+    packageName: stringValue(boundary?.packageName),
+    unitId: manifestUnitId,
+    build: manifestBuildMarker ?? stringValue(boundary?.buildVersion),
+  });
+  // Manifest validation establishes buildVersion/buildMarker consistency; the
+  // executed expose is still checked independently against that trusted record.
   assertVersionValue(
     stringValue(compatibility.build),
-    manifestBuildMarker,
-    'deliveryUnit.buildMarker vs expose compatibility.build',
+    stringValue(boundary?.buildVersion),
+    'expose buildVersion',
+  );
+  assertManifestAdapter(
+    issues.length === 0,
+    'version_mismatch',
+    `[BFF][Effect] ${formatBackendFederationIdentityIssues(issues)}.`,
   );
 }
 

package/src/cross-project-policy/node.ts

@@ -1,48 +1,17 @@
-import { readFileSync } from 'node:fs';
-import path from 'node:path';
 import '@modern-js/server-runtime-extensions/server-config';
 import type { ServerPluginAPI } from '@modern-js/server-core';
 import {
-  deriveOperationVersion,
   type OperationContractSource,
   resolveCrossProjectPolicy,
+  resolveOperationProducer,
 } from '@modern-js/server-runtime-extensions/bff-policy/node';
 
 import type { ResolvedCrossProjectPolicy } from './evaluation';
 
-const readNearestPackageVersion = (
-  startDir: string | undefined,
-): string | undefined => {
-  if (!startDir) {
-    return undefined;
-  }
-
-  let current = path.resolve(startDir);
-  for (let depth = 0; depth < 10; depth += 1) {
-    try {
-      const packageJson = JSON.parse(
-        readFileSync(path.join(current, 'package.json'), 'utf8'),
-      ) as { version?: unknown };
-      if (typeof packageJson.version === 'string') {
-        return packageJson.version;
-      }
-    } catch {
-      // The producer package may be nested below its package.json.
-    }
-
-    const parent = path.dirname(current);
-    if (parent === current) {
-      return undefined;
-    }
-    current = parent;
-  }
-
-  return undefined;
-};
-
 export const resolveAdapterCrossProjectPolicy = (
   api: ServerPluginAPI,
   handlers: OperationContractSource[],
+  producer?: ReturnType<typeof resolveOperationProducer>,
 ): ResolvedCrossProjectPolicy | undefined => {
   const bff = api.getServerConfig()?.bff;
   const { apiDirectory, appDirectory } = api.getServerContext() as {
@@ -53,11 +22,11 @@ export const resolveAdapterCrossProjectPolicy = (
   return resolveCrossProjectPolicy({
     crossProjectPolicy: bff?.crossProjectPolicy,
     handlers,
-    requestId: bff?.requestId,
     isCrossProjectServer: bff?.isCrossProjectServer,
-    operationVersion: deriveOperationVersion(
-      readNearestPackageVersion(apiDirectory) ??
-        readNearestPackageVersion(appDirectory),
-    ),
+    ...(producer ??
+      resolveOperationProducer({
+        directories: [apiDirectory, appDirectory],
+        requestId: bff?.requestId || 'default',
+      })),
   });
 };

package/src/{effect-adapter → effect-server}/cross-project-policy.ts

@@ -6,16 +6,18 @@ import {
   toOperationContractSources,
 } from '@modern-js/bff-effect/effect';
 import type { ServerPluginAPI } from '@modern-js/server-core';
+import type { resolveOperationProducer } from '@modern-js/server-runtime-extensions/bff-policy/node';
 import { logger } from '@modern-js/utils';
 import { HttpApi } from 'effect/unstable/httpapi';
 
 import { resolveAdapterCrossProjectPolicy } from '../cross-project-policy';
 import type { ResolvedCrossProjectPolicy } from '../cross-project-policy/evaluation';
 
-export function resolveEffectAdapterCrossProjectPolicy(
+export function resolveEffectServerCrossProjectPolicy(
   api: ServerPluginAPI,
   prefix: string,
   mod: EffectApiModule | null,
+  producer?: ReturnType<typeof resolveOperationProducer>,
 ): Promise<ResolvedCrossProjectPolicy | undefined> {
   const contractSourcesPromise =
     mod === null
@@ -52,7 +54,11 @@ export function resolveEffectAdapterCrossProjectPolicy(
           });
 
   return contractSourcesPromise.then(contractSources => {
-    const policy = resolveAdapterCrossProjectPolicy(api, contractSources);
+    const policy = resolveAdapterCrossProjectPolicy(
+      api,
+      contractSources,
+      producer,
+    );
     if (policy?.enabled === true && contractSources.length === 0) {
       logger.warn(
         '[BFF][Effect] Cross-project policy enabled but no HttpApi endpoints could be reflected; requests fail operation-contract matching unless allowUnknownOperations is enabled.',

package/src/effect-server/entry.ts

@@ -0,0 +1,18 @@
+// @effect-diagnostics nodeBuiltinImport:off strictBooleanExpressions:off
+import path from 'node:path';
+import '@modern-js/server-runtime-extensions/server-config';
+import type { ServerPluginAPI } from '@modern-js/server-core';
+import { API_DIR, isProd } from '@modern-js/utils';
+import { resolveEffectEntry } from '../effect-source-loader/paths';
+
+export function resolveEffectServerEntryFile(api: ServerPluginAPI) {
+  const { appDirectory, apiDirectory, distDirectory } = api.getServerContext();
+  const appDir = path.resolve(appDirectory || process.cwd());
+  return resolveEffectEntry({
+    appDir,
+    apiDir: path.resolve(appDir, apiDirectory || API_DIR),
+    effectEntry: api.getServerConfig()?.bff?.effect?.entry,
+    distDir:
+      isProd() && distDirectory ? path.resolve(distDirectory) : undefined,
+  }).path;
+}

package/src/{effect-adapter → effect-server}/error-response.ts

@@ -2,7 +2,7 @@ import { createSafeFailureResponse } from '@modern-js/runtime-extensions/safe-fa
 import type { Context, ServerPluginAPI } from '@modern-js/server-core';
 import { logger } from '@modern-js/utils';
 
-export function createEffectAdapterRuntimeErrorResponse(
+export function createEffectServerRuntimeErrorResponse(
   api: ServerPluginAPI,
   error: unknown,
   context: Context,