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

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

@@ -39,31 +39,37 @@ function preserveSourceModuleSemantics(): Plugin {
   return {
     name: 'modern-js-effect-source-semantics',
     setup(buildApi) {
-      buildApi.onLoad({ filter: /\.[cm]?[jt]sx?$/ }, async args => {
-        const loader = sourceLoader(args);
-        if (!loader) {
-          return undefined;
-        }
+      buildApi.onLoad(
+        { filter: /\.[cm]?[jt]sx?$/, namespace: 'file' },
+        async args => {
+          const loader = sourceLoader(args);
+          if (!loader) {
+            return undefined;
+          }
 
-        const source = await fs.promises.readFile(args.path, 'utf8');
-        const compiled = await transform(source, {
-          define: {
-            __dirname: JSON.stringify(path.dirname(args.path)),
-            __filename: JSON.stringify(args.path),
-            'import.meta.url': JSON.stringify(pathToFileURL(args.path).href),
-          },
-          jsx: 'automatic',
-          loader,
-          sourcefile: args.path,
-          target: NODE_TARGET,
-        });
+          const source = await fs.promises.readFile(args.path, 'utf8');
+          const canonicalSourcePath = await fs.promises.realpath(args.path);
+          const compiled = await transform(source, {
+            define: {
+              __dirname: JSON.stringify(path.dirname(canonicalSourcePath)),
+              __filename: JSON.stringify(canonicalSourcePath),
+              'import.meta.url': JSON.stringify(
+                pathToFileURL(canonicalSourcePath).href,
+              ),
+            },
+            jsx: 'automatic',
+            loader,
+            sourcefile: args.path,
+            target: NODE_TARGET,
+          });
 
-        return {
-          contents: compiled.code,
-          loader: 'js',
-          resolveDir: path.dirname(args.path),
-        };
-      });
+          return {
+            contents: compiled.code,
+            loader: 'js',
+            resolveDir: path.dirname(args.path),
+          };
+        },
+      );
     },
   };
 }
@@ -125,12 +131,8 @@ function isBareSpecifier(specifier: string) {
  * generated entry is relocatable and directly executable by Node 26.7.
  */
 function externalizeInstalledDependencies(options: {
-  format: 'cjs' | 'esm';
   runtimeResolveDir: string;
 }): Plugin {
-  const runtimeRequire = createRequire(
-    path.join(options.runtimeResolveDir, '__modern_effect_entry.cjs'),
-  );
   return {
     name: 'modern-js-effect-installed-dependencies',
     setup(buildApi) {
@@ -176,24 +178,8 @@ function externalizeInstalledDependencies(options: {
             resolveDir: options.runtimeResolveDir,
           });
           if (runtimeResolution.errors.length === 0 && runtimeResolution.path) {
-            if (options.format === 'cjs') {
-              let requiredPath: string;
-              try {
-                requiredPath = runtimeRequire.resolve(args.path);
-              } catch {
-                requiredPath = runtimeResolution.path;
-              }
-              if (await isEsmOnlyFile(requiredPath)) {
-                return {
-                  namespace: resolution.namespace,
-                  path: resolution.path,
-                  pluginData: resolution.pluginData,
-                  sideEffects: resolution.sideEffects,
-                  suffix: resolution.suffix,
-                  warnings: resolution.warnings,
-                };
-              }
-            }
+            // Node 26 loads installed ESM from CommonJS natively. Rebundling
+            // it here would split dependency identity from the BFF runtime.
             return { external: true, path: args.path };
           }
         }
@@ -227,7 +213,6 @@ export async function bundleEffectEntryForNode(options: {
     platform: 'node',
     plugins: [
       externalizeInstalledDependencies({
-        format: options.format,
         runtimeResolveDir: options.appDir,
       }),
       preserveSourceModuleSemantics(),
@@ -365,7 +350,6 @@ export async function loadEffectSourceModule(
     platform: 'node',
     plugins: [
       externalizeInstalledDependencies({
-        format: 'esm',
         runtimeResolveDir: appDir,
       }),
       preserveSourceModuleSemantics(),

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

@@ -0,0 +1,72 @@
+import {
+  collectEffectEndpoints,
+  toOperationContractSources,
+} from '@modern-js/bff-effect/effect';
+import {
+  buildOperationContractMap,
+  deriveOperationVersion,
+} from '@modern-js/server-runtime-extensions/bff-policy/node';
+import { fs, 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;
+  resourcePath: string;
+  prefix: string;
+  requestId?: string;
+  onDependency?: (dependency: string) => void;
+}) {
+  const api = await loadEffectApi(options);
+  if (api === null) {
+    return null;
+  }
+  const runtime = await getHttpApiRuntime();
+  const endpoints = collectEffectEndpoints(
+    runtime.reflect,
+    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),
+  });
+}

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

@@ -0,0 +1,72 @@
+import { realpathSync } from 'node:fs';
+import path from 'node:path';
+import type { Rspack } from '@rsbuild/core';
+import {
+  bundleEffectWorkerRuntimeSource,
+  generateEffectWorkerRuntimeWrapper,
+  resolveEffectEntryFile,
+} from './index';
+
+export interface EffectBffLoaderOptions {
+  prefix: string;
+  appDir: string;
+  apiDir: string;
+  effectEntry: string;
+  requestId?: string;
+}
+
+export default async function loader(
+  this: Rspack.LoaderContext<EffectBffLoaderOptions>,
+  source: string,
+) {
+  this.cacheable();
+  delete require.cache[this.resourcePath];
+  const callback = this.async();
+  try {
+    const options = this.getOptions();
+    const entry = resolveEffectEntryFile(options);
+    if (!entry || realpathSync(entry) !== realpathSync(this.resourcePath))
+      throw new Error(
+        `Unexpected Effect BFF loader resource: ${this.resourcePath}`,
+      );
+    const query = new URLSearchParams(this.resourceQuery);
+    if (query.has('modern-bff-runtime-source')) {
+      const { transform } = await import('@swc/core');
+      const transformed = await transform(source, {
+        filename: this.resourcePath,
+        sourceMaps: false,
+        jsc: {
+          parser: {
+            syntax: 'typescript',
+            tsx: /\.[jt]sx$/.test(this.resourcePath),
+          },
+          target: 'es2024',
+        },
+        module: { type: 'es6' },
+      });
+      callback(
+        undefined,
+        await bundleEffectWorkerRuntimeSource(
+          transformed.code,
+          this.resourcePath,
+          this,
+        ),
+      );
+    } else if (query.has('modern-bff-runtime')) {
+      callback(
+        undefined,
+        await generateEffectWorkerRuntimeWrapper(
+          this,
+          options,
+          this.resourcePath,
+        ),
+      );
+    } else {
+      throw new Error(
+        'Effect BFF entries are server-only. Import the shared HttpApi contract and use HttpApiClient.make (or makeEffectHttpApiClient) for a fully inferred client.',
+      );
+    }
+  } catch (error) {
+    callback(error instanceof Error ? error : new Error(String(error)));
+  }
+}

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

@@ -0,0 +1,34 @@
+import path from 'node:path';
+import { build } from 'esbuild';
+
+/** Keep the worker implementation graph out of the API-to-client loader. */
+export async function bundleEffectWorkerRuntimeSource(
+  source: string,
+  resourcePath: string,
+  loader: { addDependency: (dependency: string) => void },
+) {
+  const result = await build({
+    absWorkingDir: path.dirname(resourcePath),
+    bundle: true,
+    format: 'esm',
+    metafile: true,
+    packages: 'external',
+    platform: 'neutral',
+    stdin: {
+      contents: source,
+      loader: 'js',
+      resolveDir: path.dirname(resourcePath),
+      sourcefile: resourcePath,
+    },
+    target: 'es2024',
+    write: false,
+  });
+  for (const dependency of Object.keys(result.metafile.inputs)) {
+    if (dependency !== '<stdin>') {
+      loader.addDependency(
+        path.resolve(path.dirname(resourcePath), dependency),
+      );
+    }
+  }
+  return result.outputFiles[0].text;
+}

package/src/effect-source-loader/worker-runtime-wrapper.ts

@@ -1,90 +1,20 @@
-// @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
-import type { HttpMethodDecider } from '@modern-js/types';
-import type { EffectClientCodegenOptions } from '../client-generator/types';
-
-type EffectWorkerRuntimeGenerationOptions = {
-  apiDir: string;
-  appDir: string;
-  effectDataPlatformBatch?: {
-    allowedMethods?: string[];
-    enabled?: boolean;
-    endpoint?: string;
-    flushIntervalMs?: number;
-    maxBatchBytes?: number;
-    maxBatchSize?: number;
-    requestTimeoutMs?: number;
-  };
-  httpMethodDecider?: HttpMethodDecider;
-  port: number;
-  prefix: string;
-  requestCreator?: string;
-  requestId?: string;
-};
+import { resolveEffectOperationContracts } from './operation-contracts';
 
 export async function generateEffectWorkerRuntimeWrapper(
   loader: { addDependency: (dependency: string) => void },
-  options: EffectWorkerRuntimeGenerationOptions,
+  options: { appDir: string; prefix: string; requestId?: string },
   resourcePath: string,
 ) {
-  const { generateEffectClient } = await import(
-    '../client-generator/generator'
-  );
-  const artifacts = await generateEffectClient({
+  const operationContracts = await resolveEffectOperationContracts({
     appDir: options.appDir,
-    apiDir: options.apiDir,
     resourcePath,
     prefix: options.prefix,
-    port: Number(options.port),
-    target: 'bundle',
     requestId: options.requestId,
-    requestCreator: options.requestCreator,
-    httpMethodDecider: options.httpMethodDecider,
-    dataPlatformBatch: options.effectDataPlatformBatch,
     onDependency: dependency => loader.addDependency(dependency),
   });
   const sourceRequest = `${resourcePath}?modern-bff-runtime-source`;
-  const operationContracts = artifacts?.operationContracts ?? {};
-
   return `import * as effectBffModule from ${JSON.stringify(sourceRequest)};
-import { createEffectBffEdgeDispatcher } from '@modern-js/plugin-bff/effect-edge/dispatcher';
-
-const __generatedOperationContracts = ${JSON.stringify(operationContracts)};
-
-const __mergeGeneratedOperationContracts = policy => {
-  if (
-    !policy ||
-    !policy.expectedOperationContracts ||
-    typeof policy.expectedOperationContracts !== 'object' ||
-    Array.isArray(policy.expectedOperationContracts)
-  ) {
-    return policy;
-  }
-  return {
-    ...policy,
-    expectedOperationContracts: {
-      ...policy.expectedOperationContracts,
-      ...__generatedOperationContracts,
-    },
-  };
-};
-
-export const __modern_create_effect_bff_dispatcher = options =>
-  createEffectBffEdgeDispatcher({
-    ...options,
-    crossProjectPolicy: __mergeGeneratedOperationContracts(
-      options?.crossProjectPolicy,
-    ),
-    module: effectBffModule,
-  });
+import { createEffectBffEdgeDispatcherFactory } from '@modern-js/bff-effect/effect-edge';
+export const __modern_create_effect_bff_dispatcher = createEffectBffEdgeDispatcherFactory(effectBffModule, ${JSON.stringify(operationContracts ?? {})});
 `;
 }
-
-export async function generateEffectClientCode(
-  options: EffectClientCodegenOptions,
-) {
-  const { generateEffectClient } = await import(
-    '../client-generator/generator'
-  );
-  const artifacts = await generateEffectClient(options);
-  return artifacts === null ? null : artifacts.code;
-}

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

@@ -22,5 +22,6 @@ export const createHonoCrossProjectPolicyMiddleware = (
       return denial;
     }
 
-    return next();
+    const result: unknown = await next();
+    return result instanceof Response ? result : undefined;
   };

package/src/hono/node.ts

@@ -0,0 +1,24 @@
+import type { ServerPluginAPI } from '@modern-js/server-core';
+import type { OperationContractSource } from '@modern-js/server-runtime-extensions/bff-policy/node';
+import { logger } from '@modern-js/utils';
+import { resolveAdapterCrossProjectPolicy } from '../cross-project-policy/node';
+import {
+  type BindHonoRouteHandlersOptions,
+  bindHonoRouteHandlers,
+} from './bind-route-handlers';
+
+export const createHonoRouteBinder = (
+  api: ServerPluginAPI,
+  handlers: OperationContractSource[],
+) => {
+  const policy = resolveAdapterCrossProjectPolicy(api, handlers);
+  return (
+    options: Pick<BindHonoRouteHandlersOptions, 'handler' | 'routePath'>,
+  ) =>
+    bindHonoRouteHandlers({
+      ...options,
+      policy,
+      onError: api.getServerConfig()?.onError,
+      reportError: error => logger.error(error),
+    });
+};

package/dist/cjs/client-generator/generator.js

@@ -1,73 +0,0 @@
-"use strict";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.d = (exports1, getters, values)=>{
-        var define = (defs, kind)=>{
-            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-                enumerable: true,
-                [kind]: defs[key]
-            });
-        };
-        define(getters, "get");
-        define(values, "value");
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports1)=>{
-        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports1, '__esModule', {
-            value: true
-        });
-    };
-})();
-var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    generateEffectClient: ()=>generateEffectClient,
-    generateEffectClientCode: ()=>generateEffectClientCode
-});
-const effect_namespaceObject = require("@modern-js/bff-effect/effect");
-const utils_namespaceObject = require("@modern-js/utils");
-const external_rendering_js_namespaceObject = require("./rendering.js");
-const external_runtime_js_namespaceObject = require("./runtime.js");
-function generateEffectClient(options) {
-    return (0, external_runtime_js_namespaceObject.loadEffectApi)({
-        appDir: options.appDir,
-        resourcePath: options.resourcePath,
-        onDependency: options.onDependency
-    }).then((api)=>{
-        if (null === api) {
-            utils_namespaceObject.logger.warn(`[BFF][Effect] Failed to generate client for ${options.resourcePath}: unable to resolve exported HttpApi.`);
-            return null;
-        }
-        return (0, external_runtime_js_namespaceObject.getHttpApiRuntime)().then((httpApiRuntime)=>{
-            const endpoints = (0, effect_namespaceObject.collectEffectEndpoints)(httpApiRuntime.reflect, api, options.prefix);
-            const generation = (0, external_rendering_js_namespaceObject.createEffectClientGeneration)(endpoints, options);
-            return {
-                code: (0, external_rendering_js_namespaceObject.renderEffectClientCode)(generation),
-                declaration: (0, external_rendering_js_namespaceObject.renderEffectClientDeclaration)(endpoints),
-                endpoints,
-                operationContracts: generation.operationContracts,
-                operationVersion: generation.operationVersion,
-                requestId: generation.requestId
-            };
-        });
-    });
-}
-function generateEffectClientCode(options) {
-    return generateEffectClient(options).then((artifacts)=>null === artifacts ? null : artifacts.code);
-}
-exports.generateEffectClient = __webpack_exports__.generateEffectClient;
-exports.generateEffectClientCode = __webpack_exports__.generateEffectClientCode;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "generateEffectClient",
-    "generateEffectClientCode"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});

package/dist/cjs/client-generator/index.js

@@ -1,54 +0,0 @@
-"use strict";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.d = (exports1, getters, values)=>{
-        var define = (defs, kind)=>{
-            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-                enumerable: true,
-                [kind]: defs[key]
-            });
-        };
-        define(getters, "get");
-        define(values, "value");
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports1)=>{
-        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports1, '__esModule', {
-            value: true
-        });
-    };
-})();
-var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    bundleBuiltEffectEntryForNode: ()=>external_built_entry_js_namespaceObject.bundleBuiltEffectEntryForNode,
-    generateEffectClient: ()=>external_generator_js_namespaceObject.generateEffectClient,
-    generateEffectClientCode: ()=>external_generator_js_namespaceObject.generateEffectClientCode,
-    resolveEffectEntryFile: ()=>external_paths_js_namespaceObject.resolveEffectEntryFile,
-    resolveEffectEntryPaths: ()=>external_built_entry_js_namespaceObject.resolveEffectEntryPaths
-});
-const external_built_entry_js_namespaceObject = require("./built-entry.js");
-const external_generator_js_namespaceObject = require("./generator.js");
-const external_paths_js_namespaceObject = require("./paths.js");
-exports.bundleBuiltEffectEntryForNode = __webpack_exports__.bundleBuiltEffectEntryForNode;
-exports.generateEffectClient = __webpack_exports__.generateEffectClient;
-exports.generateEffectClientCode = __webpack_exports__.generateEffectClientCode;
-exports.resolveEffectEntryFile = __webpack_exports__.resolveEffectEntryFile;
-exports.resolveEffectEntryPaths = __webpack_exports__.resolveEffectEntryPaths;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "bundleBuiltEffectEntryForNode",
-    "generateEffectClient",
-    "generateEffectClientCode",
-    "resolveEffectEntryFile",
-    "resolveEffectEntryPaths"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});