@bleedingdev/modern-js-plugin-bff-extensions 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

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

@@ -0,0 +1,74 @@
+import { findExists, fs, upath as path } from '@modern-js/utils';
+
+const JS_OR_TS_EXTS = [
+  '.js',
+  '.jsx',
+  '.ts',
+  '.tsx',
+  '.mjs',
+  '.mts',
+  '.cjs',
+  '.cts',
+];
+
+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;
+};
+export type EffectEntry =
+  | { kind: 'app-source'; path: string | undefined }
+  | { kind: 'built-output'; path: string | undefined }
+  | { kind: 'external-sdk'; path: string | undefined };
+
+/** 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) };
+}
+
+export function resolveEffectEntryFile(
+  options: EffectEntryOptions,
+): string | undefined {
+  return resolveEffectEntry(options).path;
+}

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

@@ -0,0 +1,71 @@
+import { realpathSync } from 'node:fs';
+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/backend-federation/entry.js

@@ -1,94 +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__, {
-    loadBackendFederationExpose: ()=>loadBackendFederationExpose
-});
-const backend_federation_security_namespaceObject = require("@modern-js/server-runtime-extensions/backend-federation-security");
-const external_utils_js_namespaceObject = require("./utils.js");
-function decodeDataUrl(url) {
-    const commaIndex = url.indexOf(',');
-    if (commaIndex < 0) throw new Error('[BFF][Effect] Invalid backend federation data URL entry.');
-    return decodeURIComponent(url.slice(commaIndex + 1));
-}
-async function readCommonJsEntrySource(remote) {
-    if (remote.entry.startsWith('data:')) return decodeDataUrl(remote.entry);
-    throw new Error(`[BFF][Effect] Backend federation remote ${remote.name} cannot load CommonJS entry ${remote.entry}.`);
-}
-async function importModuleEntry(remote) {
-    const entry = await import(remote.entry);
-    return entry.default ?? entry;
-}
-async function resolvePluginEntry(remote, plugins) {
-    for (const plugin of plugins ?? []){
-        const loadEntry = plugin.loadEntry;
-        if ('function' != typeof loadEntry) continue;
-        const entry = await loadEntry({
-            remoteInfo: remote
-        });
-        if (entry) return entry;
-    }
-}
-async function loadBackendFederationEntry(remote, options) {
-    const requiresVerification = Boolean(remote.verification || options.entryPolicy?.expected);
-    const isNetworkEntry = /^https?:\/\//iu.test(remote.entry);
-    if (isNetworkEntry && !requiresVerification) throw new Error(`[BFF][Effect] Backend federation remote ${remote.name} requires verified entry bytes before network execution.`);
-    if (requiresVerification) return (0, backend_federation_security_namespaceObject.loadVerifiedBackendFederationEntry)({
-        ...options.entryPolicy,
-        remote,
-        ...remote.verification ? {
-            verification: remote.verification
-        } : {}
-    });
-    const pluginEntry = await resolvePluginEntry(remote, options.plugins);
-    if (pluginEntry) return pluginEntry;
-    if (remote.entryGlobalName) {
-        const globalEntry = globalThis[remote.entryGlobalName];
-        if ((0, external_utils_js_namespaceObject.isRecord)(globalEntry)) return globalEntry;
-    }
-    if ('module' === remote.type || remote.entry.startsWith('file:')) return importModuleEntry(remote);
-    return (0, backend_federation_security_namespaceObject.evaluateBackendFederationCommonJsEntry)(remote, new TextEncoder().encode(await readCommonJsEntrySource(remote)), options.entryPolicy?.evaluateCommonJs);
-}
-async function loadBackendFederationExpose(remote, expose, options) {
-    const entry = await loadBackendFederationEntry(remote, options);
-    if ('function' == typeof entry.init) await entry.init({
-        hostName: options.hostName
-    });
-    if ('function' != typeof entry.get) throw new Error(`[BFF][Effect] Backend federation remote ${remote.name} entry must expose get().`);
-    const factory = await entry.get(expose);
-    if ('function' != typeof factory) throw new Error(`[BFF][Effect] Backend federation expose ${remote.name}/${(0, external_utils_js_namespaceObject.normalizeExpose)(expose)} must load factory function.`);
-    return factory();
-}
-exports.loadBackendFederationExpose = __webpack_exports__.loadBackendFederationExpose;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "loadBackendFederationExpose"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});

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
-});