@bleedingdev/modern-js-plugin-bff-extensions 3.9.0-ultramodern.10 → 3.9.0-ultramodern.12

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/cross-project-policy.ts

@@ -6,6 +6,7 @@ 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';
 
@@ -16,6 +17,7 @@ export function resolveEffectAdapterCrossProjectPolicy(
   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-adapter/entry.ts

@@ -1,96 +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, findExists, fs, isProd } from '@modern-js/utils';
-
-const JS_OR_TS_EXTS = [
-  '.js',
-  '.jsx',
-  '.ts',
-  '.tsx',
-  '.mjs',
-  '.mts',
-  '.cjs',
-  '.cts',
-] as const;
-
-type JsOrTsExtension = (typeof JS_OR_TS_EXTS)[number];
-
-function resolveJsOrTsEntry(entryWithoutOrWithExt: string) {
-  const extension = path.extname(entryWithoutOrWithExt) as JsOrTsExtension;
-  if (JS_OR_TS_EXTS.includes(extension)) {
-    return fs.existsSync(entryWithoutOrWithExt)
-      ? entryWithoutOrWithExt
-      : undefined;
-  }
-
-  return (
-    findExists(JS_OR_TS_EXTS.map(ext => `${entryWithoutOrWithExt}${ext}`)) ||
-    undefined
-  );
-}
-
-function builtEntryPath(entryPath: string) {
-  return entryPath.replace(/\.(?:[cm]?ts|tsx|jsx)$/u, '.js');
-}
-
-function relativeAppPath(appDirectory: string, entryPath: string) {
-  const relativePath = path.relative(appDirectory, entryPath);
-  return relativePath === '..' || relativePath.startsWith(`..${path.sep}`)
-    ? undefined
-    : relativePath;
-}
-
-function isDependencyPath(relativePath: string | undefined) {
-  return relativePath?.split(/[\\/]/u).includes('node_modules') ?? false;
-}
+import { API_DIR, isProd } from '@modern-js/utils';
+import { resolveEffectEntry } from '../effect-source-loader/paths';
 
 export function resolveEffectAdapterEntryFile(api: ServerPluginAPI) {
   const { appDirectory, apiDirectory, distDirectory } = api.getServerContext();
-  const appRoot = path.resolve(appDirectory || process.cwd());
-  const productionRoot =
-    isProd() && distDirectory ? path.resolve(distDirectory) : undefined;
-  const configuredEntry = api.getServerConfig()?.bff?.effect?.entry;
-
-  if (configuredEntry) {
-    const sourceEntry = path.isAbsolute(configuredEntry)
-      ? configuredEntry
-      : path.resolve(appRoot, configuredEntry);
-    if (productionRoot) {
-      const relativeEntry = relativeAppPath(appRoot, sourceEntry);
-      if (relativeEntry === undefined || isDependencyPath(relativeEntry)) {
-        return resolveJsOrTsEntry(sourceEntry);
-      }
-      return relativeEntry
-        ? resolveJsOrTsEntry(
-            builtEntryPath(path.resolve(productionRoot, relativeEntry)),
-          )
-        : undefined;
-    }
-    return resolveJsOrTsEntry(sourceEntry);
-  }
-
-  const resolvedApiDirectory = path.resolve(appRoot, apiDirectory || API_DIR);
-  const productionApiDirectory = productionRoot
-    ? relativeAppPath(productionRoot, resolvedApiDirectory) !== undefined
-      ? resolvedApiDirectory
-      : (() => {
-          const relativeApiDirectory = relativeAppPath(
-            appRoot,
-            resolvedApiDirectory,
-          );
-          if (isDependencyPath(relativeApiDirectory)) {
-            return resolvedApiDirectory;
-          }
-          return relativeApiDirectory
-            ? path.resolve(productionRoot, relativeApiDirectory)
-            : undefined;
-        })()
-    : resolvedApiDirectory;
-
-  return productionApiDirectory
-    ? resolveJsOrTsEntry(path.resolve(productionApiDirectory, 'index'))
-    : undefined;
+  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/index.ts

@@ -10,6 +10,7 @@ import {
   useEffectContext,
 } from '@modern-js/bff-effect/effect';
 import type { Context, Next, ServerPluginAPI } from '@modern-js/server-core';
+import { resolveOperationProducer } from '@modern-js/server-runtime-extensions/bff-policy/node';
 import {
   createDisposableServerRuntimeHandle,
   type DisposableServerRuntimeHandle,
@@ -161,9 +162,9 @@ export class EffectAdapter {
       return;
     }
 
+    const { appDirectory } = this.api.getServerContext();
     let mod: EffectApiModule;
     try {
-      const { appDirectory } = this.api.getServerContext();
       mod = (await (isProd()
         ? loadEffectBuiltModule(entryFile)
         : loadEffectSourceModule({
@@ -177,6 +178,10 @@ export class EffectAdapter {
       throw error;
     }
 
+    const producer = resolveOperationProducer({
+      directories: [path.dirname(entryFile), appDirectory],
+      requestId: this.api.getServerConfig()?.bff?.requestId,
+    });
     const crossProjectPolicies = new Map(
       await Promise.all(
         this.prefixes.map(
@@ -187,6 +192,7 @@ export class EffectAdapter {
                 this.api,
                 prefix,
                 mod,
+                producer,
               ),
             ] as const,
         ),

package/src/effect-source-loader/built-entry.ts

@@ -1,8 +1,10 @@
 import { fs, upath as path } from '@modern-js/utils';
 
-import { resolveEffectEntryFile } from './paths';
-
-const BUILT_ENTRY_EXT = /\.(?:[cm]?ts|tsx|jsx)$/u;
+import {
+  emittedEffectEntry,
+  relativeEffectAppPath,
+  resolveEffectEntryFile,
+} from './paths';
 
 export function resolveBuiltEffectEntry(
   appDirectory: string,
@@ -12,15 +14,15 @@ export function resolveBuiltEffectEntry(
   if (sourceEntry === undefined || sourceEntry.length === 0) {
     return undefined;
   }
-  const relativeEntry = path.relative(appDirectory, sourceEntry);
-  if (relativeEntry === '..' || relativeEntry.startsWith(`..${path.sep}`)) {
+  const relativeEntry = relativeEffectAppPath(appDirectory, sourceEntry);
+  if (relativeEntry === undefined) {
     throw new Error(
       `Effect BFF entry must be inside the application directory: ${sourceEntry}`,
     );
   }
-  const builtEntry = path
-    .resolve(distDirectory, relativeEntry)
-    .replace(BUILT_ENTRY_EXT, '.js');
+  const builtEntry = emittedEffectEntry(
+    path.resolve(distDirectory, relativeEntry),
+  );
   return fs.existsSync(builtEntry) ? builtEntry : undefined;
 }
 
@@ -62,7 +64,7 @@ export function resolveEffectEntryPaths(options: {
   });
   const relativeEffectEntry =
     sourceEffectEntry !== undefined && sourceEffectEntry.length > 0
-      ? path.relative(appDir, sourceEffectEntry).replace(BUILT_ENTRY_EXT, '.js')
+      ? emittedEffectEntry(path.relative(appDir, sourceEffectEntry))
       : '';
   return { sourceEffectEntry, relativeEffectEntry };
 }

package/src/effect-source-loader/loader.ts

@@ -125,10 +125,9 @@ function isBareSpecifier(specifier: string) {
 }
 
 /**
- * Keep installed registry dependencies external while bundling symlinked
- * workspace source packages. Registry packages remain executable from the
- * deployment node_modules tree; workspace TypeScript is bundled so the
- * generated entry is relocatable and directly executable by Node 26.7.
+ * Keep installed executable dependencies external to preserve runtime identity.
+ * Source requiring compilation is bundled even when pnpm injects a workspace
+ * package into node_modules: Node does not strip types inside that directory.
  */
 function externalizeInstalledDependencies(options: {
   runtimeResolveDir: string;
@@ -167,7 +166,13 @@ function externalizeInstalledDependencies(options: {
         const realPath = await fs.promises
           .realpath(resolution.path)
           .catch(() => resolution.path);
-        if (realPath.includes(`${path.sep}node_modules${path.sep}`)) {
+        const loader = SOURCE_LOADERS.get(path.extname(realPath).toLowerCase());
+        if (
+          realPath.includes(`${path.sep}node_modules${path.sep}`) &&
+          loader !== 'ts' &&
+          loader !== 'tsx' &&
+          loader !== 'jsx'
+        ) {
           const runtimeResolution = await buildApi.resolve(args.path, {
             importer: '',
             kind: args.kind,

package/src/effect-source-loader/operation-contracts.ts

@@ -4,42 +4,11 @@ import {
 } from '@modern-js/bff-effect/effect';
 import {
   buildOperationContractMap,
-  deriveOperationVersion,
+  resolveOperationProducer,
 } from '@modern-js/server-runtime-extensions/bff-policy/node';
-import { fs, upath as path } from '@modern-js/utils';
+import { upath as path } from '@modern-js/utils';
 import { getHttpApiRuntime, loadEffectApi } from './http-api-runtime';
 
-function getPackageInfo(
-  resourcePath: string,
-  appDir: string,
-  onDependency?: (dependency: string) => void,
-): { name?: string; version?: string } {
-  for (const startDir of [path.dirname(resourcePath), appDir]) {
-    let current = path.resolve(startDir);
-    for (let depth = 0; depth < 32; depth += 1) {
-      const packageJsonPath = path.join(current, 'package.json');
-      if (fs.existsSync(packageJsonPath)) {
-        onDependency?.(packageJsonPath);
-        try {
-          const packageJson = fs.readJSONSync(packageJsonPath) as {
-            name?: string;
-            version?: string;
-          };
-          return { name: packageJson.name, version: packageJson.version };
-        } catch {
-          return {};
-        }
-      }
-      const parent = path.dirname(current);
-      if (parent === current) {
-        break;
-      }
-      current = parent;
-    }
-  }
-  return {};
-}
-
 /** Derives server policy metadata without emitting or typing a client. */
 export async function resolveEffectOperationContracts(options: {
   appDir: string;
@@ -58,15 +27,12 @@ export async function resolveEffectOperationContracts(options: {
     api,
     options.prefix,
   );
-  const packageInfo = getPackageInfo(
-    options.resourcePath,
-    options.appDir,
-    options.onDependency,
-  );
-  const requestId = options.requestId?.trim() || packageInfo.name || 'default';
   return buildOperationContractMap({
     handlers: toOperationContractSources(endpoints),
-    requestId,
-    operationVersion: deriveOperationVersion(packageInfo.version),
+    ...resolveOperationProducer({
+      directories: [path.dirname(options.resourcePath), options.appDir],
+      requestId: options.requestId,
+      onDependency: options.onDependency,
+    }),
   });
 }

package/src/effect-source-loader/paths.ts

@@ -9,32 +9,66 @@ const JS_OR_TS_EXTS = [
   '.mts',
   '.cjs',
   '.cts',
-] as const;
+];
 
-export function resolveEffectEntryFile(options: {
+export const emittedEffectEntry = (entry: string) =>
+  entry.replace(/\.(?:[cm]?ts|tsx|jsx)$/u, '.js');
+
+export function relativeEffectAppPath(appDir: string, entry: string) {
+  const relative = path.relative(appDir, entry);
+  return relative === '..' ||
+    relative.startsWith('../') ||
+    relative.split('/').includes('node_modules')
+    ? undefined
+    : relative;
+}
+
+function existingEntry(entry: string): string | undefined {
+  return path.extname(entry)
+    ? fs.existsSync(entry)
+      ? entry
+      : undefined
+    : findExists(JS_OR_TS_EXTS.map(ext => `${entry}${ext}`)) || undefined;
+}
+
+type EffectEntryOptions = {
   appDir: string;
   apiDir: string;
   effectEntry?: string;
-}): string | undefined {
-  const { appDir, apiDir, effectEntry } = options;
+};
+export type EffectEntry =
+  | { kind: 'app-source'; path: string | undefined }
+  | { kind: 'built-output'; path: string | undefined }
+  | { kind: 'external-sdk'; path: string | undefined };
 
-  const resolveEntry = (entryWithoutExt: string) => {
-    if (path.extname(entryWithoutExt) !== '') {
-      return fs.existsSync(entryWithoutExt) ? entryWithoutExt : undefined;
-    }
-
-    return (
-      findExists(JS_OR_TS_EXTS.map(ext => `${entryWithoutExt}${ext}`)) ||
-      undefined
-    );
-  };
-
-  if (effectEntry !== undefined && effectEntry !== '') {
-    const entryWithoutExt = path.isAbsolute(effectEntry)
-      ? effectEntry
-      : path.resolve(appDir, effectEntry);
-    return resolveEntry(entryWithoutExt);
+/** Classify ownership before resolving files: production works without source. */
+export function resolveEffectEntry(
+  options: EffectEntryOptions & { distDir?: string },
+): EffectEntry {
+  const { appDir, apiDir, effectEntry, distDir } = options;
+  const entry = path.resolve(appDir, effectEntry || path.join(apiDir, 'index'));
+  if (distDir && relativeEffectAppPath(distDir, entry) !== undefined) {
+    return {
+      kind: 'built-output',
+      path: existingEntry(emittedEffectEntry(entry)),
+    };
   }
+  const relative = relativeEffectAppPath(appDir, entry);
+  if (relative === undefined) {
+    return { kind: 'external-sdk', path: existingEntry(entry) };
+  }
+  return distDir
+    ? {
+        kind: 'built-output',
+        path: existingEntry(
+          emittedEffectEntry(path.resolve(distDir, relative)),
+        ),
+      }
+    : { kind: 'app-source', path: existingEntry(entry) };
+}
 
-  return resolveEntry(path.resolve(apiDir, 'index'));
+export function resolveEffectEntryFile(
+  options: EffectEntryOptions,
+): string | undefined {
+  return resolveEffectEntry(options).path;
 }