@bleedingdev/modern-js-plugin-bff 3.8.2-ultramodern.9 → 3.8.3-ultramodern.2

package/dist/esm/runtime/effect/edge-dispatcher.mjs

@@ -1,38 +1 @@
-import { dispatchEffectBffRequestWithContext } from "./dispatch.mjs";
-import { runWithEffectContext, useEffectContext, useOperationContext } from "./edge-context.mjs";
-import { resolveEffectBffModuleHandler } from "./module.mjs";
-export * from "./handler.mjs";
-async function dispatchEffectBffRequest(handler, request, options = {}) {
-    return dispatchEffectBffRequestWithContext(handler, request, {
-        ...options,
-        runWithEffectContext: runWithEffectContext
-    });
-}
-async function createEffectBffEdgeDispatcher(options) {
-    const loaded = await resolveEffectBffModuleHandler(options.module, {
-        openapi: options.openapi,
-        dataPlatform: options.dataPlatform,
-        onWarning: options.onWarning
-    });
-    if (!loaded) throw new Error('[BFF][Effect] Invalid Effect edge module. Export defineEffectBff(...) or a { api, layer } HttpApi module.');
-    return {
-        dispatch: (request, dispatchOptions = {})=>dispatchEffectBffRequest(loaded.handler, request, {
-                ...dispatchOptions,
-                prefix: options.prefix,
-                onError: options.onError
-            }),
-        dispose: async ()=>{
-            await loaded.dispose?.();
-        }
-    };
-}
-const createEffectBffTestHandler = createEffectBffEdgeHandler;
-async function createEffectBffEdgeHandler(options) {
-    const dispatcher = await createEffectBffEdgeDispatcher(options);
-    return {
-        handler: dispatcher.dispatch,
-        dispose: dispatcher.dispose
-    };
-}
-export { createEffectOperationContext } from "./operation-context.mjs";
-export { createEffectBffEdgeDispatcher, createEffectBffEdgeHandler, createEffectBffTestHandler, dispatchEffectBffRequest, runWithEffectContext, useEffectContext, useOperationContext };
+export * from "@modern-js/bff-effect/effect-edge";

package/dist/esm/runtime/effect/edge.mjs

@@ -1,2 +1,2 @@
-export * from "./edge-dispatcher.mjs";
-export { BACKEND_FEDERATION_CONTRACT_VERSION, BACKEND_FEDERATION_EFFECT_EXPOSE, BACKEND_FEDERATION_MANIFEST_FILE, BACKEND_FEDERATION_NODE_ADAPTER_VERSION, createBackendFederationLoadEntryPlugin, createBackendFederationRuntime, loadBackendFederatedEffectApi, validateExpectedBackendFederationIdentity } from "./backend-federation.mjs";
+export * from "@modern-js/bff-effect/effect-edge";
+export * from "@modern-js/plugin-bff-extensions/backend-federation/edge";

package/dist/esm/runtime/effect/index.mjs

@@ -1,8 +1,16 @@
-import * as __rspack_external__effect_opentelemetry_66324c75 from "@effect/opentelemetry";
-export * from "./backend-federation.mjs";
-export * from "./handler.mjs";
-export { BACKEND_FEDERATION_CONTRACT_VERSION, BACKEND_FEDERATION_EFFECT_EXPOSE, BACKEND_FEDERATION_MANIFEST_FILE, BACKEND_FEDERATION_NODE_ADAPTER_VERSION, createBackendFederationLoadEntryPlugin, createBackendFederationRuntime, loadBackendFederatedEffectApi } from "./backend-federation.mjs";
-export { BackendFederationManifestAdapterError, loadBackendFederatedEffectApiFromManifest, loadBackendFederationManifest, resolveBackendFederationRemoteFromManifest } from "./backend-federation-manifest.mjs";
-export { createEffectOperationContext, runWithEffectContext, useEffectContext, useOperationContext } from "./context.mjs";
-export { createEffectBffEdgeHandler, createEffectBffTestHandler, dispatchEffectBffRequest } from "./edge.mjs";
-export { __rspack_external__effect_opentelemetry_66324c75 as OpenTelemetry };
+import * as __rspack_external_effect_Config_76cfa59d from "effect/Config";
+import * as __rspack_external_effect_Effect_41060786 from "effect/Effect";
+import * as __rspack_external_effect_Schema_6065f72d from "effect/Schema";
+import * as __rspack_external_effect_Option_0498e63a from "effect/Option";
+import * as __rspack_external_effect_Layer_69c46453 from "effect/Layer";
+export * from "effect/unstable/http";
+export * from "effect/unstable/httpapi";
+export * from "effect/unstable/rpc";
+export { OpenTelemetry, createEffectBffEdgeHandler, createEffectBffTestHandler, createEffectOperationContext, createHttpApiHandler, defineEffectBff, defineEffectRpcBff, dispatchEffectBffRequest, runWithEffectContext, useEffectContext, useOperationContext } from "@modern-js/bff-effect/effect";
+export { BACKEND_FEDERATION_CONTRACT_VERSION, BACKEND_FEDERATION_EFFECT_EXPOSE, BACKEND_FEDERATION_MANIFEST_FILE, BACKEND_FEDERATION_NODE_ADAPTER_VERSION, createBackendFederationLoadEntryPlugin, createBackendFederationRuntime, validateExpectedBackendFederationIdentity } from "@modern-js/plugin-bff-extensions/backend-federation";
+export { loadBackendFederatedEffectApi } from "@modern-js/plugin-bff-extensions/backend-federation/node";
+export { BackendFederationManifestAdapterError, loadBackendFederationManifest, resolveBackendFederationRemoteFromManifest } from "@modern-js/plugin-bff-extensions/backend-federation-manifest";
+export { loadBackendFederatedEffectApiFromManifest } from "@modern-js/plugin-bff-extensions/backend-federation-manifest/node";
+export { HttpTraceContext } from "effect/unstable/http";
+export { HttpApiBuilder } from "effect/unstable/httpapi";
+export { __rspack_external_effect_Config_76cfa59d as Config, __rspack_external_effect_Effect_41060786 as Effect, __rspack_external_effect_Layer_69c46453 as Layer, __rspack_external_effect_Option_0498e63a as Option, __rspack_external_effect_Schema_6065f72d as Schema };

package/dist/esm/runtime/effect-client/index.mjs

@@ -1,98 +1 @@
-import { createRequestContextHeaders } from "@modern-js/create-request";
-import * as __rspack_external_effect_Effect_41060786 from "effect/Effect";
-import * as __rspack_external_effect_Layer_69c46453 from "effect/Layer";
-import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/unstable/http";
-import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from "effect/unstable/httpapi";
-import { Rpc, RpcClient, RpcGroup, RpcSchema, RpcSerialization } from "effect/unstable/rpc";
-import { getRpcSerializationLayer } from "../effect/rpcSerialization.mjs";
-import * as __rspack_external_effect_Schema_6065f72d from "effect/Schema";
-import * as __rspack_external_effect_unstable_http_HttpClientError_4b9eaee6 from "effect/unstable/http/HttpClientError";
-import * as __rspack_external_effect_Data_2b3f4efb from "effect/Data";
-import * as __rspack_external_effect_Exit_1ca64b33 from "effect/Exit";
-import * as __rspack_external_effect_ManagedRuntime_bfe218e3 from "effect/ManagedRuntime";
-import * as __rspack_external_effect_Scope_f87b0bd6 from "effect/Scope";
-class EffectRpcClientError extends __rspack_external_effect_Data_2b3f4efb.TaggedError('EffectRpcClientError') {
-}
-function isRecord(value) {
-    return 'object' == typeof value && null !== value && !Array.isArray(value);
-}
-function applySelection(value, selection) {
-    if (true === selection || void 0 === selection) return value;
-    if (Array.isArray(value)) return value.map((item)=>applySelection(item, selection));
-    if (!isRecord(value) || !isRecord(selection)) return value;
-    const masked = {};
-    for (const key of Object.keys(selection)){
-        const selected = selection[key];
-        if (void 0 !== selected && key in value && (true === selected || isRecord(selected))) masked[key] = applySelection(value[key], selected);
-    }
-    return masked;
-}
-function view() {
-    return (selection)=>selection;
-}
-function mask(value, selection) {
-    return applySelection(value, selection);
-}
-function runEffectView(request, selection) {
-    return new Promise((resolve, reject)=>{
-        request.then((value)=>resolve(mask(value, selection)), (reason)=>reject(reason));
-    });
-}
-function makeEffectHttpApiClient(api, options) {
-    const requestContextHeaders = createRequestContextHeaders(options?.requestContext);
-    const transformClient = (client)=>{
-        const contextClient = 0 === Object.keys(requestContextHeaders).length ? client : client.pipe(HttpClient.mapRequest((request)=>{
-            let nextRequest = request;
-            for (const [header, value] of Object.entries(requestContextHeaders))if (void 0 === nextRequest.headers[header.toLowerCase()]) nextRequest = HttpClientRequest.setHeader(nextRequest, header, value);
-            return nextRequest;
-        }));
-        return 'function' == typeof options?.transformClient ? options.transformClient(contextClient) : contextClient;
-    };
-    return HttpApiClient.make(api, {
-        baseUrl: options?.baseUrl,
-        transformClient,
-        transformResponse: options?.transformResponse
-    }).pipe(__rspack_external_effect_Effect_41060786.provide(FetchHttpClient.layer));
-}
-function makeEffectRpcClient(group, options) {
-    const protocolLayer = __rspack_external_effect_Layer_69c46453.provide(RpcClient.layerProtocolHttp({
-        url: options.url
-    }), __rspack_external_effect_Layer_69c46453.mergeAll(getRpcSerializationLayer(options.serialization), FetchHttpClient.layer));
-    const middlewareLayer = options.middlewareLayer ?? __rspack_external_effect_Layer_69c46453.empty;
-    const runtimeLayer = __rspack_external_effect_Layer_69c46453.mergeAll(protocolLayer, middlewareLayer);
-    return __rspack_external_effect_Effect_41060786.tryPromise({
-        try: async ()=>{
-            const runtime = __rspack_external_effect_ManagedRuntime_bfe218e3.make(runtimeLayer);
-            const scope = await runtime.runPromise(__rspack_external_effect_Scope_f87b0bd6.make());
-            try {
-                const client = await runtime.runPromise(RpcClient.make(group, {
-                    flatten: options.flatten
-                }).pipe(__rspack_external_effect_Effect_41060786.provideService(__rspack_external_effect_Scope_f87b0bd6.Scope, scope)));
-                let disposed = false;
-                const clientWithDispose = Object.assign(client, {
-                    dispose: async ()=>{
-                        if (!disposed) {
-                            disposed = true;
-                            await runtime.runPromise(__rspack_external_effect_Scope_f87b0bd6.close(scope, __rspack_external_effect_Exit_1ca64b33["void"]));
-                        }
-                        await runtime.dispose();
-                    }
-                });
-                return clientWithDispose;
-            } catch (error) {
-                try {
-                    await runtime.runPromise(__rspack_external_effect_Scope_f87b0bd6.close(scope, __rspack_external_effect_Exit_1ca64b33["void"]));
-                } catch  {}
-                try {
-                    await runtime.dispose();
-                } catch  {}
-                throw error;
-            }
-        },
-        catch: (error)=>new EffectRpcClientError({
-                cause: error
-            })
-    });
-}
-const runEffectRequest = __rspack_external_effect_Effect_41060786.runPromise;
-export { EffectRpcClientError, HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiSchema, Rpc, RpcClient, RpcGroup, RpcSchema, RpcSerialization, __rspack_external_effect_Effect_41060786 as Effect, __rspack_external_effect_Layer_69c46453 as Layer, __rspack_external_effect_Schema_6065f72d as Schema, __rspack_external_effect_unstable_http_HttpClientError_4b9eaee6 as HttpClientError, makeEffectHttpApiClient, makeEffectRpcClient, mask, runEffectRequest, runEffectView, view };
+export * from "@modern-js/bff-effect/effect-client";

package/dist/esm/runtime/effect-client/runtime.mjs

@@ -1,62 +1 @@
-import { configureGeneratedEffectClientRuntime } from "./batch.mjs";
-import { prepareEffectRequest } from "./envelope.mjs";
-import { createEffectRequestContext as external_request_context_mjs_createEffectRequestContext } from "./request-context.mjs";
-const createGeneratedEffectClient = (manifest, config, requestRuntime)=>{
-    const createRequest = requestRuntime.createRequest;
-    const configureRequest = 'function' == typeof requestRuntime.configure ? requestRuntime.configure : void 0;
-    const createRequestContextHeaders = 'function' == typeof requestRuntime.createRequestContextHeaders ? requestRuntime.createRequestContextHeaders : void 0;
-    const httpMethodDecider = config.httpMethodDecider || 'functionName';
-    const port = config.useEnvPort && "u" > typeof process && process.env && process.env.PORT ? process.env.PORT : config.port;
-    configureGeneratedEffectClientRuntime(config, configureRequest);
-    const createEffectRequestContext = (requestContext)=>external_request_context_mjs_createEffectRequestContext(createRequestContextHeaders, requestContext);
-    const client = {};
-    const operationManifest = {};
-    for (const endpoint of manifest.endpoints){
-        const operationId = `${endpoint.method}:${endpoint.routePath}`;
-        const operation = {
-            appNamespace: config.appNamespace,
-            apiId: endpoint.apiId,
-            group: endpoint.group,
-            endpoint: endpoint.endpoint,
-            operationId,
-            routePath: endpoint.routePath,
-            method: endpoint.method,
-            operationVersion: endpoint.operationVersion,
-            schemaHash: endpoint.schemaHash,
-            version: endpoint.operationVersion
-        };
-        const sender = createRequest({
-            path: endpoint.routePath,
-            method: endpoint.method,
-            port,
-            operationContext: {
-                operationId,
-                routePath: endpoint.routePath,
-                method: endpoint.method,
-                schemaHash: endpoint.schemaHash,
-                operationVersion: endpoint.operationVersion
-            },
-            httpMethodDecider,
-            ...config.requestId ? {
-                requestId: config.requestId
-            } : {}
-        });
-        const call = (request = {})=>sender(prepareEffectRequest({
-                endpoint,
-                operation,
-                request,
-                config,
-                createEffectRequestContext
-            }));
-        client[endpoint.group] ??= {};
-        client[endpoint.group][endpoint.endpoint] = call;
-        operationManifest[endpoint.group] ??= {};
-        operationManifest[endpoint.group][endpoint.endpoint] = operation;
-    }
-    return {
-        client,
-        operationManifest,
-        createEffectRequestContext
-    };
-};
-export { createGeneratedEffectClient };
+export * from "@modern-js/bff-effect/effect-client-runtime";

package/dist/esm/runtime/hono/adapter.mjs

@@ -1,7 +1,7 @@
+import { resolveAdapterCrossProjectPolicy } from "@modern-js/plugin-bff-extensions/cross-project-policy";
+import { bindHonoRouteHandlers } from "@modern-js/plugin-bff-extensions/hono";
 import { logger } from "@modern-js/utils";
 import createHonoRoutes from "../../utils/createHonoRoutes.mjs";
-import { checkCrossProjectPolicyResponse, resolveAdapterCrossProjectPolicy } from "../../utils/crossProjectServerPolicy.mjs";
-import { createSafeFailureResponse } from "../safe-failure.mjs";
 const before = [
     'custom-server-hook',
     'custom-server-middleware',
@@ -11,78 +11,37 @@ class HonoAdapter {
     constructor(api){
         this.apiMiddleware = [];
         this.isHono = true;
-        this.prefix = '/api';
         this.setHandlers = async ()=>{
             if (!this.isHono) return;
             const { apiHandlerInfos } = this.api.getServerContext();
-            const honoHandlers = createHonoRoutes(apiHandlerInfos);
+            const handlers = apiHandlerInfos ?? [];
+            const honoHandlers = createHonoRoutes(handlers);
+            const policy = resolveAdapterCrossProjectPolicy(this.api, handlers);
             this.apiMiddleware = honoHandlers.map(({ path, method, handler })=>({
                     name: 'hono-bff-api',
                     path,
                     method,
-                    handler: this.withErrorBoundary(handler),
+                    handler: bindHonoRouteHandlers({
+                        handler,
+                        policy,
+                        routePath: path,
+                        onError: this.api.getServerConfig()?.onError,
+                        reportError: (error)=>logger.error(error)
+                    }),
                     order: 'post',
                     before: before
                 }));
-            this.crossProjectPolicy = resolveAdapterCrossProjectPolicy(this.api, apiHandlerInfos || []);
-            if (this.crossProjectPolicy) {
-                const policyMiddleware = async (c, next)=>{
-                    const denial = checkCrossProjectPolicyResponse(c.req.header(), this.crossProjectPolicy);
-                    if (denial) return denial;
-                    await next();
-                };
-                this.apiMiddleware.unshift({
-                    name: 'bff-cross-project-policy',
-                    path: `${this.prefix}/*`,
-                    method: 'all',
-                    handler: policyMiddleware,
-                    order: 'post',
-                    before: before
-                });
-            }
         };
-        this.registerMiddleware = async (options = {})=>{
+        this.registerMiddleware = async (_options)=>{
             const { bffRuntimeFramework } = this.api.getServerContext();
             if ('hono' !== bffRuntimeFramework) {
                 this.isHono = false;
                 return;
             }
-            const { prefix } = options;
-            this.prefix = prefix || this.prefix;
             const { middlewares: globalMiddlewares } = this.api.getServerContext();
             await this.setHandlers();
             globalMiddlewares.push(...this.apiMiddleware);
         };
-        this.handleRouteError = async (error, c)=>{
-            try {
-                const onErrorHandler = this.api.getServerConfig()?.onError;
-                if (onErrorHandler) {
-                    const result = await onErrorHandler(error, c);
-                    if (result instanceof Response) return result;
-                } else logger.error(error);
-            } catch (configError) {
-                logger.error(`Error in serverConfig.onError handler: ${configError}`);
-            }
-            return createSafeFailureResponse(error);
-        };
-        this.withErrorBoundary = (handler)=>{
-            const handlers = Array.isArray(handler) ? handler : [
-                handler
-            ];
-            const [firstHandler, ...restHandlers] = handlers;
-            if (!firstHandler) return handler;
-            const boundary = async (c, next)=>{
-                try {
-                    return await firstHandler(c, next);
-                } catch (error) {
-                    return this.handleRouteError(error, c);
-                }
-            };
-            return Array.isArray(handler) ? [
-                boundary,
-                ...restHandlers
-            ] : boundary;
-        };
         this.api = api;
     }
 }

package/dist/esm/server.mjs

@@ -7,7 +7,7 @@ const RUNTIME_ADAPTER_LOADERS = {
             new HonoAdapter(api)
         ],
     effect: async (api)=>{
-        const { EffectAdapter } = await import("./runtime/effect/adapter.mjs");
+        const { EffectAdapter } = await import("@modern-js/plugin-bff-extensions/effect-adapter");
         return [
             new EffectAdapter(api)
         ];
@@ -82,7 +82,7 @@ const server = ()=>({
                 }
                 const runtimeAdapters = await RUNTIME_ADAPTER_LOADERS[runtimeFramework](api);
                 await Promise.all(runtimeAdapters.map((adapter)=>adapter.registerMiddleware({
-                        prefix,
+                        prefix: 'effect' === runtimeFramework ? prefixList : prefix,
                         enableHandleWeb
                     })));
             });

package/dist/esm/utils/client-generator/generate.mjs

@@ -1,10 +1,9 @@
 import { generateClient } from "@modern-js/bff-core";
 import { fs, logger } from "@modern-js/utils";
 import path from "path";
-import { generateEffectClient, resolveEffectEntryFile } from "../effectClientGenerator.mjs";
 import { CLIENT_DIR, createFileDetails, readDirectoryFiles, writeTargetFile } from "./files.mjs";
 import { getPackageName } from "./package-json.mjs";
-import { DEFAULT_EXPORT_RE, MissingClientDeclarationError, buildClientTypeFacade } from "./type-facade.mjs";
+import { DEFAULT_EXPORT_RE, buildClientTypeFacade, createMissingClientDeclarationError, isMissingClientDeclarationError } from "./type-facade.mjs";
 import { setPackage, writeClientModuleBoundary } from "./write-package.mjs";
 async function clientGenerator(draftOptions) {
     const generatedClientDir = path.resolve(draftOptions.appDir, draftOptions.relativeDistPath, CLIENT_DIR);
@@ -14,6 +13,7 @@ async function clientGenerator(draftOptions) {
     const generatedSourceList = [
         ...lambdaSourceList
     ];
+    let generatedEffectClient = null;
     const getClitentCode = async (resourcePath, source)=>{
         const warning = `The file ${resourcePath} is not allowed to be imported in src directory, only API definition files are allowed.`;
         if (!draftOptions.existLambda) return void logger.warn(warning);
@@ -36,7 +36,7 @@ async function clientGenerator(draftOptions) {
         return result;
     };
     const writeClientTypeFacade = async (source, clientCode)=>{
-        if (!await fs.pathExists(path.resolve(source.relativeTargetDistDir))) throw new MissingClientDeclarationError(source.resourcePath, source.relativeTargetDistDir);
+        if (!await fs.pathExists(path.resolve(source.relativeTargetDistDir))) throw createMissingClientDeclarationError(source.resourcePath, source.relativeTargetDistDir);
         const clientTypesFile = source.targetDir.replace(/\.js$/, '.d.ts');
         await writeTargetFile(path.resolve(clientTypesFile), buildClientTypeFacade(clientTypesFile, source.relativeTargetDistDir, DEFAULT_EXPORT_RE.test(clientCode), true));
     };
@@ -49,6 +49,7 @@ async function clientGenerator(draftOptions) {
             }
         }
         if ('effect' === draftOptions.bffRuntimeFramework) {
+            const { generateEffectClient, resolveEffectEntryFile } = await import("@modern-js/plugin-bff-extensions/client-generator");
             const effectEntryFile = resolveEffectEntryFile({
                 appDir: draftOptions.appDir,
                 apiDir: draftOptions.apiDir,
@@ -63,32 +64,34 @@ async function clientGenerator(draftOptions) {
                     source: effectSource,
                     relativeDistPath: draftOptions.relativeDistPath
                 });
-                const effectClientArtifacts = await generateEffectClient({
+                generatedEffectClient = await generateEffectClient({
                     appDir: draftOptions.appDir,
                     apiDir: draftOptions.apiDir,
                     resourcePath: effectEntryFile,
                     prefix: Array.isArray(draftOptions.prefix) ? draftOptions.prefix[0] : draftOptions.prefix,
                     port: Number(draftOptions.port),
                     target: 'bundle',
+                    requestId: draftOptions.requestId,
                     requestCreator: draftOptions.requestCreator,
                     httpMethodDecider: draftOptions.httpMethodDecider,
                     dataPlatformBatch: draftOptions.effectDataPlatformBatch
                 });
-                if (effectClientArtifacts) {
+                if (generatedEffectClient) {
                     const targetTypeFile = effectFileDetails.targetDir.replace(/\.js$/, '.d.ts');
-                    await writeTargetFile(effectFileDetails.absTargetDir, effectClientArtifacts.code);
-                    await writeTargetFile(path.resolve(targetTypeFile), effectClientArtifacts.declaration);
+                    await writeTargetFile(effectFileDetails.absTargetDir, generatedEffectClient.code);
+                    await writeTargetFile(path.resolve(targetTypeFile), generatedEffectClient.declaration);
                     generatedSourceList.push(effectFileDetails);
                 }
             }
         }
         logger.info("Client bundle generate succeed");
     } catch (error) {
-        if (error instanceof MissingClientDeclarationError) throw error;
+        if (isMissingClientDeclarationError(error)) throw error;
         logger.error(`Client bundle generate failed: ${error}`);
     }
     if (generatedSourceList.length > 0) await writeClientModuleBoundary(draftOptions.appDir, draftOptions.relativeDistPath);
     await setPackage(generatedSourceList, draftOptions.appDir, draftOptions.relativeDistPath);
+    return generatedEffectClient;
 }
 const generate = clientGenerator;
 export default generate;

package/dist/esm/utils/client-generator/index.mjs

@@ -1,5 +1,5 @@
 export { createFileDetails, readDirectoryFiles, writeTargetFile } from "./files.mjs";
 export { clientGenerator, default } from "./generate.mjs";
 export { getClientPackageName, getPackageName, mergePackageJson } from "./package-json.mjs";
-export { MissingClientDeclarationError, buildClientTypeFacade } from "./type-facade.mjs";
+export { buildClientTypeFacade } from "./type-facade.mjs";
 export { setPackage, writeClientModuleBoundary } from "./write-package.mjs";

package/dist/esm/utils/client-generator/type-facade.mjs

@@ -1,12 +1,15 @@
 import path from "path";
 import { toPosixPath } from "./files.mjs";
 const DEFAULT_EXPORT_RE = /(^|[\s;])export\s+default\b/;
-class MissingClientDeclarationError extends Error {
-    constructor(resourcePath, expectedDeclaration){
-        super(`[plugin-bff] No declaration was emitted for "${resourcePath}", so the published client type for it cannot be generated (expected "${expectedDeclaration}"). Enable "declaration": true in the server tsconfig used by this app.`);
-        this.name = 'MissingClientDeclarationError';
-    }
+const missingClientDeclarationCause = Symbol('MissingClientDeclarationError');
+function createMissingClientDeclarationError(resourcePath, expectedDeclaration) {
+    const error = new Error(`[plugin-bff] No declaration was emitted for "${resourcePath}", so the published client type for it cannot be generated (expected "${expectedDeclaration}"). Enable "declaration": true in the server tsconfig used by this app.`, {
+        cause: missingClientDeclarationCause
+    });
+    error.name = 'MissingClientDeclarationError';
+    return error;
 }
+const isMissingClientDeclarationError = (error)=>error instanceof Error && error.cause === missingClientDeclarationCause;
 function buildClientTypeFacade(clientTypesFile, originTypesFile, hasDefaultExport, esm = false) {
     const originNoExt = originTypesFile.replace(/\.d\.ts$/, '');
     let specifier = toPosixPath(path.relative(path.dirname(clientTypesFile), originNoExt));
@@ -17,4 +20,4 @@ function buildClientTypeFacade(clientTypesFile, originTypesFile, hasDefaultExpor
     lines.push(`export * from '${specifier}';`);
     return `${lines.join('\n')}\n`;
 }
-export { DEFAULT_EXPORT_RE, MissingClientDeclarationError, buildClientTypeFacade };
+export { DEFAULT_EXPORT_RE, buildClientTypeFacade, createMissingClientDeclarationError, isMissingClientDeclarationError };

package/dist/esm/utils/crossProjectApiPlugin.mjs

@@ -1,5 +1,6 @@
 import path from "path";
 const PACKAGE_NAME = '{packageName}';
+const REQUEST_ID = '{requestId}';
 const PREFIX = '{prefix}';
 const API_DIR = '{apiDirectory}';
 const LAMBDA_DIR = '{lambdaDirectory}';
@@ -42,7 +43,7 @@ const crossProjectApiPlugin = ()=>({
                     entry: effectEntry
                 };
                 resolvedConfig.bff.isCrossProjectServer = true;
-                resolvedConfig.bff.requestId = resolvedConfig.bff.requestId || config?.bff?.requestId || PACKAGE_NAME || 'default';
+                resolvedConfig.bff.requestId = resolvedConfig.bff.requestId || config?.bff?.requestId || REQUEST_ID || PACKAGE_NAME || 'default';
                 const generatedOperationContracts = "{operationContracts}" === OPERATION_CONTRACTS_JSON ? {} : JSON.parse(OPERATION_CONTRACTS_JSON);
                 resolvedConfig.bff.crossProjectPolicy = {
                     ...resolvedConfig.bff.crossProjectPolicy || {},
@@ -64,4 +65,4 @@ const crossProjectApiPlugin = ()=>({
     });
 const utils_crossProjectApiPlugin = crossProjectApiPlugin;
 export default utils_crossProjectApiPlugin;
-export { API_DIR, DIST_DIR, EFFECT_ENTRY, LAMBDA_DIR, OPERATION_CONTRACTS_JSON, PACKAGE_NAME, PREFIX, RUNTIME_FRAMEWORK, crossProjectApiPlugin };
+export { API_DIR, DIST_DIR, EFFECT_ENTRY, LAMBDA_DIR, OPERATION_CONTRACTS_JSON, PACKAGE_NAME, PREFIX, REQUEST_ID, RUNTIME_FRAMEWORK, crossProjectApiPlugin };

package/dist/esm/utils/pluginGenerator.mjs

@@ -1,18 +1,18 @@
 import { fs, logger, normalizeToPosixPath } from "@modern-js/utils";
 import path from "path";
-import { API_DIR, DIST_DIR, EFFECT_ENTRY, LAMBDA_DIR, OPERATION_CONTRACTS_JSON, PACKAGE_NAME, PREFIX, RUNTIME_FRAMEWORK } from "./crossProjectApiPlugin.mjs";
-function replaceContent(source, packageName, prefix, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts) {
-    const updatedSource = source.replace(new RegExp(PACKAGE_NAME, 'g'), packageName).replace(new RegExp(PREFIX, 'g'), prefix).replace(new RegExp(DIST_DIR, 'g'), normalizeToPosixPath(relativeDistPath)).replace(new RegExp(API_DIR, 'g'), normalizeToPosixPath(relativeApiPath)).replace(new RegExp(LAMBDA_DIR, 'g'), normalizeToPosixPath(relativeLambdaPath)).replace(new RegExp(RUNTIME_FRAMEWORK, 'g'), runtimeFramework).replace(new RegExp(EFFECT_ENTRY, 'g'), normalizeToPosixPath(relativeEffectEntry)).replace(`'${OPERATION_CONTRACTS_JSON}'`, ()=>JSON.stringify(JSON.stringify(operationContracts)));
+import { API_DIR, DIST_DIR, EFFECT_ENTRY, LAMBDA_DIR, OPERATION_CONTRACTS_JSON, PACKAGE_NAME, PREFIX, REQUEST_ID, RUNTIME_FRAMEWORK } from "./crossProjectApiPlugin.mjs";
+function replaceContent(source, packageName, requestId, prefix, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts) {
+    const updatedSource = source.replace(new RegExp(PACKAGE_NAME, 'g'), packageName).replace(new RegExp(REQUEST_ID, 'g'), requestId).replace(new RegExp(PREFIX, 'g'), prefix).replace(new RegExp(DIST_DIR, 'g'), normalizeToPosixPath(relativeDistPath)).replace(new RegExp(API_DIR, 'g'), normalizeToPosixPath(relativeApiPath)).replace(new RegExp(LAMBDA_DIR, 'g'), normalizeToPosixPath(relativeLambdaPath)).replace(new RegExp(RUNTIME_FRAMEWORK, 'g'), runtimeFramework).replace(new RegExp(EFFECT_ENTRY, 'g'), normalizeToPosixPath(relativeEffectEntry)).replace(`'${OPERATION_CONTRACTS_JSON}'`, ()=>JSON.stringify(JSON.stringify(operationContracts)));
     return updatedSource;
 }
-async function pluginGenerator({ prefix, appDirectory, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts }) {
+async function pluginGenerator({ prefix, appDirectory, requestId, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts }) {
     try {
         const packageContent = await fs.readFile(path.resolve(appDirectory, './package.json'), 'utf8');
         const packageJson = JSON.parse(packageContent);
         const pluginDir = path.resolve(appDirectory, `./${relativeDistPath}`, 'plugin');
         const pluginPath = path.join(pluginDir, 'index.js');
         const pluginTemplate = await fs.readFile(path.resolve(__dirname, 'crossProjectApiPlugin.js'), 'utf8');
-        const updatedPlugin = replaceContent(pluginTemplate, packageJson.name, prefix, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts);
+        const updatedPlugin = replaceContent(pluginTemplate, packageJson.name, requestId, prefix, relativeDistPath, relativeApiPath, relativeLambdaPath, runtimeFramework, relativeEffectEntry, operationContracts);
         await fs.ensureFile(pluginPath);
         await fs.writeFile(pluginPath, updatedPlugin);
         const typeContent = `import type { AppTools, CliPlugin } from '@modern-js/app-tools';

package/dist/esm/utils/runtimeGenerator.mjs

@@ -1,3 +1,4 @@
+import { renderProducerRuntimeDefaults } from "@modern-js/plugin-bff-extensions/cross-project-generation";
 import { fs } from "@modern-js/utils";
 import path from "path";
 const getPackageName = (appDirectory)=>{
@@ -14,21 +15,8 @@ async function runtimeGenerator({ runtime, appDirectory, relativeDistPath, packa
     const requestId = packageName || getPackageName(appDirectory) || process.env.npm_package_name || 'default';
     const runtimeImportPath = JSON.stringify(runtime);
     const requestIdValue = JSON.stringify(requestId);
-    const source = `const { configure: _configure } = require(${runtimeImportPath});
-    const defaultSecureOptions = {
-      requestId: ${requestIdValue},
-      requireEnvelope: true,
-      identityBinding: {
-        enabled: true,
-        strict: true,
-      },
-      operationContract: {
-        enabled: true,
-        strict: true,
-        requireSchemaHash: true,
-        requireOperationVersion: true,
-      },
-    };
+    const source = `'use strict'; const { configure: _configure } = require(${runtimeImportPath});
+    const defaultSecureOptions = ${renderProducerRuntimeDefaults(requestIdValue)};
     const initProducerClient = (options) => {
       return _configure({
         ...defaultSecureOptions,
@@ -79,7 +67,7 @@ async function runtimeGenerator({ runtime, appDirectory, relativeDistPath, packa
         }) => string;
         requestId?: string;
       };
-  export declare const initProducerClient: (options: ProducerClientOptions) => void;
+  export declare const initProducerClient: (options?: ProducerClientOptions) => ReturnType<ProducerRuntimeModule['configure']>;
   export declare const configure: typeof initProducerClient;`;
     const pluginTypePath = path.join(pluginDir, 'index.d.ts');
     await fs.ensureFile(pluginTypePath);