@bleedingdev/modern-js-app-tools 3.5.0-ultramodern.28 → 3.5.0-ultramodern.29

package/dist/esm-node/plugins/deploy/platforms/templates/cloudflare-entry.mjs

@@ -2,7 +2,7 @@ const ASSETS_BINDING = 'ASSETS';
 const MODERN_WORKER_MANIFEST = p_workerManifest;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
-const effectBffHandlerPromises = new Map();
+const effectBffDispatcherPromises = new Map();
 let effectEdgeRuntimePromise;
 const remoteJsonPromises = new Map();
 const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
@@ -152,17 +152,7 @@ async function createCorsPreflightResponse(request, env) {
             status: 204
         });
     }
-    if (!ASSET_CORS_ENABLED) return null;
-    const assets = env?.[ASSETS_BINDING];
-    if (!assets || 'function' != typeof assets.fetch) return null;
-    const assetResponse = await assets.fetch(new Request(request.url, {
-        method: 'HEAD'
-    }));
-    if (!assetResponse || 404 === assetResponse.status) return null;
-    return new Response(null, {
-        headers: ASSET_CORS_HEADERS,
-        status: 204
-    });
+    return null;
 }
 async function fetchAsset(request, env) {
     if ('GET' !== request.method && 'HEAD' !== request.method) return null;
@@ -798,17 +788,17 @@ async function dispatchBffRequest(request, env) {
     const defaultExport = workerModule.default;
     const runtime = getRuntimeModule(workerModule);
     if ('effect' === bff.runtimeFramework) {
-        let effectHandlerPromise = effectBffHandlerPromises.get(bff.worker);
-        if (!effectHandlerPromise) {
-            const { createEffectBffEdgeHandler } = await loadEffectEdgeRuntime();
-            effectHandlerPromise = createEffectBffEdgeHandler({
+        let effectDispatcherPromise = effectBffDispatcherPromises.get(bff.worker);
+        if (!effectDispatcherPromise) {
+            const { createEffectBffEdgeDispatcher } = await loadEffectEdgeRuntime();
+            effectDispatcherPromise = createEffectBffEdgeDispatcher({
                 module: runtime,
                 prefix: bff.prefix
             });
-            effectBffHandlerPromises.set(bff.worker, effectHandlerPromise);
+            effectBffDispatcherPromises.set(bff.worker, effectDispatcherPromise);
         }
-        const effectHandler = await effectHandlerPromise;
-        return effectHandler.handler(request, {
+        const effectDispatcher = await effectDispatcherPromise;
+        return effectDispatcher.dispatch(request, {
             env
         });
     }
@@ -836,12 +826,33 @@ async function dispatchBffRequest(request, env) {
     };
     return handler(mountedRequest, effectContext);
 }
+async function dispatchServiceBindingRequest(request, env) {
+    const serviceBindings = MODERN_WORKER_MANIFEST.serviceBindings;
+    if (!Array.isArray(serviceBindings) || 0 === serviceBindings.length) return null;
+    const pathname = new URL(request.url).pathname;
+    for (const binding of serviceBindings){
+        if (!binding?.binding || !binding?.prefix) continue;
+        if (!matchesPrefix(pathname, binding.prefix)) continue;
+        const service = env?.[binding.binding];
+        if (!service || 'function' != typeof service.fetch) return new Response(`Cloudflare service binding not available: ${binding.binding}`, {
+            status: 502,
+            headers: {
+                'content-type': 'text/plain; charset=utf-8',
+                'x-modern-js-service-binding': binding.binding
+            }
+        });
+        return service.fetch(request);
+    }
+    return null;
+}
 export default {
     async fetch (request, env, ctx) {
         const corsPreflightResponse = await createCorsPreflightResponse(request, env);
         if (corsPreflightResponse) return finalizeResponseForRequest(corsPreflightResponse, request);
         const bffResponse = await dispatchBffRequest(request, env);
         if (bffResponse) return finalizeResponseForRequest(withAppCorsHeaders(bffResponse, request), request);
+        const serviceBindingResponse = await dispatchServiceBindingRequest(request, env);
+        if (serviceBindingResponse) return finalizeResponseForRequest(withAppCorsHeaders(serviceBindingResponse, request), request);
         const route = findRoute(request);
         const { pathname } = new URL(request.url);
         if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) {

package/dist/types/plugins/backendFederationBuild.d.ts

@@ -0,0 +1,11 @@
+import type { AppTools, CliPlugin } from '../types';
+export type BackendFederationArtifactResult = {
+    appId: string;
+    manifestPath: string;
+    containerPath: string;
+    remoteName: string;
+    remoteType: string;
+};
+export declare const emitBackendFederationArtifacts: (appDirectory: string, distDirectory: string) => Promise<BackendFederationArtifactResult | undefined>;
+export default _default;
+declare function _default(): CliPlugin<AppTools>;

package/dist/types/plugins/deploy/platforms/cloudflare-output-contract.d.ts

@@ -0,0 +1,13 @@
+export declare const CLOUDFLARE_WORKER_ENTRY = "server/index.mjs";
+export declare const CLOUDFLARE_WORKER_MANIFEST = "server/modern-worker-manifest.json";
+export declare const CLOUDFLARE_WRANGLER_CONFIG_FILE = "wrangler.json";
+export declare const CLOUDFLARE_OUTPUT_PACKAGE_FILE = "package.json";
+export declare const CLOUDFLARE_WORKER_PACKAGE_FILE = "worker/package.json";
+export declare const CLOUDFLARE_ASSETS_BINDING = "ASSETS";
+export declare const CLOUDFLARE_PUBLIC_ASSETS_DIRECTORY = "public";
+export declare const CLOUDFLARE_WORKER_BUNDLE_DIRECTORY = "worker";
+export declare const CLOUDFLARE_RUNTIME_TYPE = "cloudflare-module-worker";
+export declare const CLOUDFLARE_OUTPUT_PACKAGE_TYPE = "module";
+export declare const CLOUDFLARE_WORKER_PACKAGE_TYPE = "commonjs";
+export declare const CLOUDFLARE_WORKER_BUNDLE_FORMAT = "commonjs";
+export declare const CLOUDFLARE_REQUIRED_COMPATIBILITY_FLAGS: readonly ['nodejs_compat', 'global_fetch_strictly_public'];

package/dist/types/plugins/deploy/platforms/cloudflare-output-plan.d.ts

@@ -0,0 +1,33 @@
+import { CLOUDFLARE_ASSETS_BINDING, CLOUDFLARE_OUTPUT_PACKAGE_TYPE, CLOUDFLARE_PUBLIC_ASSETS_DIRECTORY, CLOUDFLARE_REQUIRED_COMPATIBILITY_FLAGS, CLOUDFLARE_WORKER_ENTRY, CLOUDFLARE_WORKER_PACKAGE_TYPE } from './cloudflare-output-contract';
+export type CloudflareOutputPlan = {
+    outputDirectory: string;
+    requiredFiles: string[];
+    publicLeakDirectories: string[];
+    paths: {
+        workerEntry: string;
+        workerManifest: string;
+        wranglerConfig: string;
+        outputPackage: string;
+        workerPackage: string;
+        publicAssets: string;
+        workerBundle: string;
+    };
+    packages: {
+        output: {
+            type: typeof CLOUDFLARE_OUTPUT_PACKAGE_TYPE;
+        };
+        worker: {
+            type: typeof CLOUDFLARE_WORKER_PACKAGE_TYPE;
+        };
+    };
+    wrangler: {
+        main: typeof CLOUDFLARE_WORKER_ENTRY;
+        assets: {
+            binding: typeof CLOUDFLARE_ASSETS_BINDING;
+            directory: `./${typeof CLOUDFLARE_PUBLIC_ASSETS_DIRECTORY}`;
+            run_worker_first: true;
+        };
+        requiredCompatibilityFlags: typeof CLOUDFLARE_REQUIRED_COMPATIBILITY_FLAGS;
+    };
+};
+export declare function createCloudflareOutputPlan(outputDirectory: string): CloudflareOutputPlan;

package/dist/types/plugins/deploy/platforms/cloudflare-output-verifier.d.ts

@@ -0,0 +1,32 @@
+export type CloudflareOutputVerifierIssueCode = 'missing-file' | 'invalid-manifest' | 'invalid-wrangler' | 'invalid-package' | 'public-output-leak' | 'missing-worker-bundle' | 'invalid-worker-bundle' | 'worker-import-failed' | 'delivery-unit-drift' | 'missing-delivery-unit' | 'forbidden-mutation-pattern';
+export interface CloudflareOutputVerifierIssue {
+    code: CloudflareOutputVerifierIssueCode;
+    message: string;
+    path?: string;
+}
+export interface CloudflareDeliveryUnitIdentity {
+    unitId: string;
+    buildMarker: string;
+    sourceRevision: string;
+}
+export interface VerifyCloudflareOutputOptions {
+    outputDirectory: string;
+    importWorker?: boolean;
+    /**
+     * Topology-declared delivery-unit record (from the workspace compact config).
+     * When provided, the Cloudflare worker manifest must carry a matching
+     * `deliveryUnit` stamp so the deployed worker snapshot is proven to derive
+     * from the same delivery unit as the Node/API surfaces (ADR-0019 lane D).
+     */
+    deliveryUnit?: CloudflareDeliveryUnitIdentity;
+}
+export interface VerifyCloudflareOutputMutationPolicyOptions {
+    scanRoots: string[];
+}
+export interface CloudflareOutputVerifierResult {
+    ok: boolean;
+    issues: CloudflareOutputVerifierIssue[];
+}
+export declare const verifyCloudflareOutputMutationPolicy: (options: VerifyCloudflareOutputMutationPolicyOptions) => Promise<CloudflareOutputVerifierResult>;
+export declare const verifyCloudflareOutput: (options: VerifyCloudflareOutputOptions) => Promise<CloudflareOutputVerifierResult>;
+export declare const assertCloudflareOutput: (options: VerifyCloudflareOutputOptions) => Promise<void>;

package/dist/types/types/config/cloudflareDeploy.d.ts

@@ -52,6 +52,17 @@ export interface CloudflareWorkerD1DatabaseConfig {
      */
     remote?: boolean;
 }
+export interface CloudflareWorkerServiceBindingConfig {
+    /** Worker binding name exposed on the module worker `env` object. */
+    binding: string;
+    /** Target Cloudflare Worker service name. */
+    service: string;
+    /**
+     * Optional application path prefix that Modern.js should dispatch to this
+     * service binding with `env[binding].fetch(request)`.
+     */
+    prefix?: string;
+}
 export interface CloudflareWorkerSecurityCspConfig {
     mode?: CloudflareWorkerSecurityCspMode;
     directives?: Record<string, string[] | string | false>;

package/dist/types/types/config/deploy.d.ts

@@ -1,5 +1,5 @@
-import type { CloudflareWorkerArtifactConfig, CloudflareWorkerD1DatabaseConfig, CloudflareWorkerPublicAssetConfig, CloudflareWorkerSecurityConfig, DeployTarget, JsonValue } from './cloudflareDeploy';
-export type { CloudflareWorkerArtifactConfig, CloudflareWorkerD1DatabaseConfig, CloudflareWorkerPublicAssetConfig, CloudflareWorkerSecurityConfig, CloudflareWorkerSecurityCorsConfig, CloudflareWorkerSecurityCspConfig, CloudflareWorkerSecurityCspMode, CloudflareWorkerSecurityNoindexConfig, DeployTarget, JsonValue, } from './cloudflareDeploy';
+import type { CloudflareWorkerArtifactConfig, CloudflareWorkerD1DatabaseConfig, CloudflareWorkerPublicAssetConfig, CloudflareWorkerSecurityConfig, CloudflareWorkerServiceBindingConfig, DeployTarget, JsonValue } from './cloudflareDeploy';
+export type { CloudflareWorkerArtifactConfig, CloudflareWorkerD1DatabaseConfig, CloudflareWorkerPublicAssetConfig, CloudflareWorkerSecurityConfig, CloudflareWorkerSecurityCorsConfig, CloudflareWorkerSecurityCspConfig, CloudflareWorkerSecurityCspMode, CloudflareWorkerSecurityNoindexConfig, CloudflareWorkerServiceBindingConfig, DeployTarget, JsonValue, } from './cloudflareDeploy';
 export interface MicroFrontend {
     /**
      * Specifies whether to enable the HTML entry.
@@ -59,6 +59,13 @@ export interface DeployUserConfig {
          * directories into `.output`.
          */
         d1Databases?: CloudflareWorkerD1DatabaseConfig[];
+        /**
+         * First-class Cloudflare service bindings. Modern.js writes these to
+         * `wrangler.json` as `services`; when a binding also has `prefix`,
+         * the generated Worker dispatches matching requests through
+         * `env[binding].fetch(request)`.
+         */
+        services?: CloudflareWorkerServiceBindingConfig[];
         /**
          * Dist output paths that must not be copied into Cloudflare public assets.
          * Entries are slash-normalized path prefixes relative to the app dist root.

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0-ultramodern.28",
+  "version": "3.5.0-ultramodern.29",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -45,6 +45,12 @@
       "require": "./dist/cjs/run/index.js",
       "default": "./dist/cjs/run/index.js"
     },
+    "./cloudflare-output-verifier": {
+      "types": "./dist/types/plugins/deploy/platforms/cloudflare-output-verifier.d.ts",
+      "import": "./dist/esm-node/plugins/deploy/platforms/cloudflare-output-verifier.mjs",
+      "require": "./dist/cjs/plugins/deploy/platforms/cloudflare-output-verifier.js",
+      "default": "./dist/cjs/plugins/deploy/platforms/cloudflare-output-verifier.js"
+    },
     "./types": {
       "types": "./lib/types.d.ts",
       "default": "./lib/types.d.ts"
@@ -90,16 +96,16 @@
     "ndepe": "^0.1.13",
     "pkg-types": "^2.3.1",
     "std-env": "4.1.0",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.5.0-ultramodern.28",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.28",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.28",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.28",
-    "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.5.0-ultramodern.28",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.28",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.28",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.5.0-ultramodern.28",
-    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.5.0-ultramodern.28",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.28"
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.5.0-ultramodern.29",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.29",
+    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.5.0-ultramodern.29",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.29",
+    "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.5.0-ultramodern.29",
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.29",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.29",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.29",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.29",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.5.0-ultramodern.29"
   },
   "devDependencies": {
     "@rslib/core": "0.23.1",