@bleedingdev/modern-js-plugin-bff 3.8.1-ultramodern.4 → 3.8.2-ultramodern.10

package/dist/cjs/cli/generator.js

@@ -163,6 +163,7 @@ const createBffGenerator = (api)=>{
                         httpMethodDecider,
                         relativeDistPath,
                         relativeApiPath,
+                        apiFiles: apiRouter.getApiFiles(),
                         bffRuntimeFramework,
                         effectEntry: bff?.effect?.entry,
                         effectDataPlatformBatch: bff?.effect?.dataPlatform?.batch

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

@@ -44,7 +44,6 @@ __webpack_require__.d(__webpack_exports__, {
     PLUGIN_DIR: ()=>PLUGIN_DIR,
     RUNTIME_DIR: ()=>RUNTIME_DIR,
     TYPE_PREFIX: ()=>TYPE_PREFIX,
-    copyFiles: ()=>copyFiles,
     createFileDetails: ()=>createFileDetails,
     posixJoin: ()=>posixJoin,
     readDirectoryFiles: ()=>readDirectoryFiles,
@@ -85,29 +84,18 @@ function createFileDetails(options) {
         exportKey: toPosixPath(external_path_default().join(parsedPath.dir, parsedPath.name))
     };
 }
-async function readDirectoryFiles(appDirectory, directory, relativeDistPath) {
+async function readDirectoryFiles(appDirectory, directory, relativeDistPath, apiFiles) {
     const filesList = [];
-    async function readFiles(currentPath) {
-        const entries = await utils_namespaceObject.fs.readdir(currentPath, {
-            withFileTypes: true
-        });
-        for (const entry of entries){
-            if ('_app.ts' === entry.name) continue;
-            const resourcePath = external_path_default().join(currentPath, entry.name);
-            if (entry.isDirectory()) await readFiles(resourcePath);
-            else {
-                const source = await utils_namespaceObject.fs.readFile(resourcePath, 'utf8');
-                filesList.push(createFileDetails({
-                    appDirectory,
-                    baseDirectory: directory,
-                    resourcePath,
-                    source,
-                    relativeDistPath
-                }));
-            }
-        }
+    for (const resourcePath of apiFiles){
+        const source = await utils_namespaceObject.fs.readFile(resourcePath, 'utf8');
+        filesList.push(createFileDetails({
+            appDirectory,
+            baseDirectory: directory,
+            resourcePath,
+            source,
+            relativeDistPath
+        }));
     }
-    await readFiles(directory);
     return filesList;
 }
 async function writeTargetFile(absTargetDir, content) {
@@ -116,9 +104,6 @@ async function writeTargetFile(absTargetDir, content) {
     });
     await utils_namespaceObject.fs.writeFile(absTargetDir, content);
 }
-async function copyFiles(from, to) {
-    if (await utils_namespaceObject.fs.pathExists(from)) await utils_namespaceObject.fs.copy(toPosixPath(from), toPosixPath(to));
-}
 exports.API_DIR = __webpack_exports__.API_DIR;
 exports.CLIENT_DIR = __webpack_exports__.CLIENT_DIR;
 exports.EXPORT_PREFIX = __webpack_exports__.EXPORT_PREFIX;
@@ -126,7 +111,6 @@ exports.GENERATED_RUNTIME_DIRS = __webpack_exports__.GENERATED_RUNTIME_DIRS;
 exports.PLUGIN_DIR = __webpack_exports__.PLUGIN_DIR;
 exports.RUNTIME_DIR = __webpack_exports__.RUNTIME_DIR;
 exports.TYPE_PREFIX = __webpack_exports__.TYPE_PREFIX;
-exports.copyFiles = __webpack_exports__.copyFiles;
 exports.createFileDetails = __webpack_exports__.createFileDetails;
 exports.posixJoin = __webpack_exports__.posixJoin;
 exports.readDirectoryFiles = __webpack_exports__.readDirectoryFiles;
@@ -140,7 +124,6 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "PLUGIN_DIR",
     "RUNTIME_DIR",
     "TYPE_PREFIX",
-    "copyFiles",
     "createFileDetails",
     "posixJoin",
     "readDirectoryFiles",

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

@@ -47,12 +47,13 @@ var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_na
 const external_effectClientGenerator_js_namespaceObject = require("../effectClientGenerator.js");
 const external_files_js_namespaceObject = require("./files.js");
 const external_package_json_js_namespaceObject = require("./package-json.js");
+const external_type_facade_js_namespaceObject = require("./type-facade.js");
 const external_write_package_js_namespaceObject = require("./write-package.js");
 async function clientGenerator(draftOptions) {
     const generatedClientDir = external_path_default().resolve(draftOptions.appDir, draftOptions.relativeDistPath, external_files_js_namespaceObject.CLIENT_DIR);
     await utils_namespaceObject.fs.remove(generatedClientDir);
     const requestId = (0, external_package_json_js_namespaceObject.getPackageName)(draftOptions.appDir) || process.env.npm_package_name;
-    const lambdaSourceList = draftOptions.existLambda ? await (0, external_files_js_namespaceObject.readDirectoryFiles)(draftOptions.appDir, draftOptions.lambdaDir, draftOptions.relativeDistPath) : [];
+    const lambdaSourceList = draftOptions.existLambda ? await (0, external_files_js_namespaceObject.readDirectoryFiles)(draftOptions.appDir, draftOptions.lambdaDir, draftOptions.relativeDistPath, draftOptions.apiFiles) : [];
     const generatedSourceList = [
         ...lambdaSourceList
     ];
@@ -77,12 +78,17 @@ async function clientGenerator(draftOptions) {
         const result = await (0, bff_core_namespaceObject.generateClient)(options);
         return result;
     };
+    const writeClientTypeFacade = async (source, clientCode)=>{
+        if (!await utils_namespaceObject.fs.pathExists(external_path_default().resolve(source.relativeTargetDistDir))) throw new external_type_facade_js_namespaceObject.MissingClientDeclarationError(source.resourcePath, source.relativeTargetDistDir);
+        const clientTypesFile = source.targetDir.replace(/\.js$/, '.d.ts');
+        await (0, external_files_js_namespaceObject.writeTargetFile)(external_path_default().resolve(clientTypesFile), (0, external_type_facade_js_namespaceObject.buildClientTypeFacade)(clientTypesFile, source.relativeTargetDistDir, external_type_facade_js_namespaceObject.DEFAULT_EXPORT_RE.test(clientCode), true));
+    };
     try {
         for (const source of lambdaSourceList){
             const code = await getClitentCode(source.resourcePath, source.source);
             if (code?.value) {
                 await (0, external_files_js_namespaceObject.writeTargetFile)(source.absTargetDir, code.value);
-                await (0, external_files_js_namespaceObject.copyFiles)(source.relativeTargetDistDir, source.targetDir.replace("js", 'd.ts'));
+                await writeClientTypeFacade(source, code.value);
             }
         }
         if ('effect' === draftOptions.bffRuntimeFramework) {
@@ -121,6 +127,7 @@ async function clientGenerator(draftOptions) {
         }
         utils_namespaceObject.logger.info("Client bundle generate succeed");
     } catch (error) {
+        if (error instanceof external_type_facade_js_namespaceObject.MissingClientDeclarationError) throw error;
         utils_namespaceObject.logger.error(`Client bundle generate failed: ${error}`);
     }
     if (generatedSourceList.length > 0) await (0, external_write_package_js_namespaceObject.writeClientModuleBoundary)(draftOptions.appDir, draftOptions.relativeDistPath);

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

@@ -37,8 +37,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    MissingClientDeclarationError: ()=>external_type_facade_js_namespaceObject.MissingClientDeclarationError,
+    buildClientTypeFacade: ()=>external_type_facade_js_namespaceObject.buildClientTypeFacade,
     clientGenerator: ()=>external_generate_js_namespaceObject.clientGenerator,
-    copyFiles: ()=>external_files_js_namespaceObject.copyFiles,
     createFileDetails: ()=>external_files_js_namespaceObject.createFileDetails,
     default: ()=>external_generate_js_default(),
     getClientPackageName: ()=>external_package_json_js_namespaceObject.getClientPackageName,
@@ -53,9 +54,11 @@ const external_files_js_namespaceObject = require("./files.js");
 const external_generate_js_namespaceObject = require("./generate.js");
 var external_generate_js_default = /*#__PURE__*/ __webpack_require__.n(external_generate_js_namespaceObject);
 const external_package_json_js_namespaceObject = require("./package-json.js");
+const external_type_facade_js_namespaceObject = require("./type-facade.js");
 const external_write_package_js_namespaceObject = require("./write-package.js");
+exports.MissingClientDeclarationError = __webpack_exports__.MissingClientDeclarationError;
+exports.buildClientTypeFacade = __webpack_exports__.buildClientTypeFacade;
 exports.clientGenerator = __webpack_exports__.clientGenerator;
-exports.copyFiles = __webpack_exports__.copyFiles;
 exports.createFileDetails = __webpack_exports__.createFileDetails;
 exports["default"] = __webpack_exports__["default"];
 exports.getClientPackageName = __webpack_exports__.getClientPackageName;
@@ -66,8 +69,9 @@ exports.setPackage = __webpack_exports__.setPackage;
 exports.writeClientModuleBoundary = __webpack_exports__.writeClientModuleBoundary;
 exports.writeTargetFile = __webpack_exports__.writeTargetFile;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "MissingClientDeclarationError",
+    "buildClientTypeFacade",
     "clientGenerator",
-    "copyFiles",
     "createFileDetails",
     "default",
     "getClientPackageName",

package/dist/cjs/utils/client-generator/type-facade.js

@@ -0,0 +1,74 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __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__, {
+    DEFAULT_EXPORT_RE: ()=>DEFAULT_EXPORT_RE,
+    MissingClientDeclarationError: ()=>MissingClientDeclarationError,
+    buildClientTypeFacade: ()=>buildClientTypeFacade
+});
+const external_path_namespaceObject = require("path");
+var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+const external_files_js_namespaceObject = require("./files.js");
+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';
+    }
+}
+function buildClientTypeFacade(clientTypesFile, originTypesFile, hasDefaultExport, esm = false) {
+    const originNoExt = originTypesFile.replace(/\.d\.ts$/, '');
+    let specifier = (0, external_files_js_namespaceObject.toPosixPath)(external_path_default().relative(external_path_default().dirname(clientTypesFile), originNoExt));
+    if (!specifier.startsWith('.')) specifier = `./${specifier}`;
+    if (esm) specifier = `${specifier}.js`;
+    const lines = [];
+    if (hasDefaultExport) lines.push(`export { default } from '${specifier}';`);
+    lines.push(`export * from '${specifier}';`);
+    return `${lines.join('\n')}\n`;
+}
+exports.DEFAULT_EXPORT_RE = __webpack_exports__.DEFAULT_EXPORT_RE;
+exports.MissingClientDeclarationError = __webpack_exports__.MissingClientDeclarationError;
+exports.buildClientTypeFacade = __webpack_exports__.buildClientTypeFacade;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "DEFAULT_EXPORT_RE",
+    "MissingClientDeclarationError",
+    "buildClientTypeFacade"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

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

@@ -62,7 +62,8 @@ async function setPackage(files, appDirectory, relativeDistPath) {
     const addFiles = [
         (0, external_files_js_namespaceObject.posixJoin)(relativeDistPath, external_files_js_namespaceObject.CLIENT_DIR, '**', '*'),
         (0, external_files_js_namespaceObject.posixJoin)(relativeDistPath, external_files_js_namespaceObject.RUNTIME_DIR, '**', '*'),
-        (0, external_files_js_namespaceObject.posixJoin)(relativeDistPath, external_files_js_namespaceObject.PLUGIN_DIR, '**', '*')
+        (0, external_files_js_namespaceObject.posixJoin)(relativeDistPath, external_files_js_namespaceObject.PLUGIN_DIR, '**', '*'),
+        (0, external_files_js_namespaceObject.posixJoin)(relativeDistPath, '**', '*.d.ts')
     ];
     const typesVersions = {
         '*': sortedFiles.reduce((acc, file)=>{

package/dist/esm/cli/generator.mjs

@@ -119,6 +119,7 @@ const createBffGenerator = (api)=>{
                         httpMethodDecider,
                         relativeDistPath,
                         relativeApiPath,
+                        apiFiles: apiRouter.getApiFiles(),
                         bffRuntimeFramework,
                         effectEntry: bff?.effect?.entry,
                         effectDataPlatformBatch: bff?.effect?.dataPlatform?.batch

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

@@ -31,29 +31,18 @@ function createFileDetails(options) {
         exportKey: toPosixPath(path.join(parsedPath.dir, parsedPath.name))
     };
 }
-async function readDirectoryFiles(appDirectory, directory, relativeDistPath) {
+async function readDirectoryFiles(appDirectory, directory, relativeDistPath, apiFiles) {
     const filesList = [];
-    async function readFiles(currentPath) {
-        const entries = await fs.readdir(currentPath, {
-            withFileTypes: true
-        });
-        for (const entry of entries){
-            if ('_app.ts' === entry.name) continue;
-            const resourcePath = path.join(currentPath, entry.name);
-            if (entry.isDirectory()) await readFiles(resourcePath);
-            else {
-                const source = await fs.readFile(resourcePath, 'utf8');
-                filesList.push(createFileDetails({
-                    appDirectory,
-                    baseDirectory: directory,
-                    resourcePath,
-                    source,
-                    relativeDistPath
-                }));
-            }
-        }
+    for (const resourcePath of apiFiles){
+        const source = await fs.readFile(resourcePath, 'utf8');
+        filesList.push(createFileDetails({
+            appDirectory,
+            baseDirectory: directory,
+            resourcePath,
+            source,
+            relativeDistPath
+        }));
     }
-    await readFiles(directory);
     return filesList;
 }
 async function writeTargetFile(absTargetDir, content) {
@@ -62,7 +51,4 @@ async function writeTargetFile(absTargetDir, content) {
     });
     await fs.writeFile(absTargetDir, content);
 }
-async function copyFiles(from, to) {
-    if (await fs.pathExists(from)) await fs.copy(toPosixPath(from), toPosixPath(to));
-}
-export { API_DIR, CLIENT_DIR, EXPORT_PREFIX, GENERATED_RUNTIME_DIRS, PLUGIN_DIR, RUNTIME_DIR, TYPE_PREFIX, copyFiles, createFileDetails, posixJoin, readDirectoryFiles, toPosixPath, writeTargetFile };
+export { API_DIR, CLIENT_DIR, EXPORT_PREFIX, GENERATED_RUNTIME_DIRS, PLUGIN_DIR, RUNTIME_DIR, TYPE_PREFIX, createFileDetails, posixJoin, readDirectoryFiles, toPosixPath, writeTargetFile };

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

@@ -2,14 +2,15 @@ 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, copyFiles, createFileDetails, readDirectoryFiles, writeTargetFile } from "./files.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 { setPackage, writeClientModuleBoundary } from "./write-package.mjs";
 async function clientGenerator(draftOptions) {
     const generatedClientDir = path.resolve(draftOptions.appDir, draftOptions.relativeDistPath, CLIENT_DIR);
     await fs.remove(generatedClientDir);
     const requestId = getPackageName(draftOptions.appDir) || process.env.npm_package_name;
-    const lambdaSourceList = draftOptions.existLambda ? await readDirectoryFiles(draftOptions.appDir, draftOptions.lambdaDir, draftOptions.relativeDistPath) : [];
+    const lambdaSourceList = draftOptions.existLambda ? await readDirectoryFiles(draftOptions.appDir, draftOptions.lambdaDir, draftOptions.relativeDistPath, draftOptions.apiFiles) : [];
     const generatedSourceList = [
         ...lambdaSourceList
     ];
@@ -34,12 +35,17 @@ async function clientGenerator(draftOptions) {
         const result = await generateClient(options);
         return result;
     };
+    const writeClientTypeFacade = async (source, clientCode)=>{
+        if (!await fs.pathExists(path.resolve(source.relativeTargetDistDir))) throw new MissingClientDeclarationError(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));
+    };
     try {
         for (const source of lambdaSourceList){
             const code = await getClitentCode(source.resourcePath, source.source);
             if (code?.value) {
                 await writeTargetFile(source.absTargetDir, code.value);
-                await copyFiles(source.relativeTargetDistDir, source.targetDir.replace("js", 'd.ts'));
+                await writeClientTypeFacade(source, code.value);
             }
         }
         if ('effect' === draftOptions.bffRuntimeFramework) {
@@ -78,6 +84,7 @@ async function clientGenerator(draftOptions) {
         }
         logger.info("Client bundle generate succeed");
     } catch (error) {
+        if (error instanceof MissingClientDeclarationError) throw error;
         logger.error(`Client bundle generate failed: ${error}`);
     }
     if (generatedSourceList.length > 0) await writeClientModuleBoundary(draftOptions.appDir, draftOptions.relativeDistPath);

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

@@ -1,4 +1,5 @@
-export { copyFiles, createFileDetails, readDirectoryFiles, writeTargetFile } from "./files.mjs";
+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 { setPackage, writeClientModuleBoundary } from "./write-package.mjs";

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

@@ -0,0 +1,20 @@
+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';
+    }
+}
+function buildClientTypeFacade(clientTypesFile, originTypesFile, hasDefaultExport, esm = false) {
+    const originNoExt = originTypesFile.replace(/\.d\.ts$/, '');
+    let specifier = toPosixPath(path.relative(path.dirname(clientTypesFile), originNoExt));
+    if (!specifier.startsWith('.')) specifier = `./${specifier}`;
+    if (esm) specifier = `${specifier}.js`;
+    const lines = [];
+    if (hasDefaultExport) lines.push(`export { default } from '${specifier}';`);
+    lines.push(`export * from '${specifier}';`);
+    return `${lines.join('\n')}\n`;
+}
+export { DEFAULT_EXPORT_RE, MissingClientDeclarationError, buildClientTypeFacade };

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

@@ -19,7 +19,8 @@ async function setPackage(files, appDirectory, relativeDistPath) {
     const addFiles = [
         posixJoin(relativeDistPath, CLIENT_DIR, '**', '*'),
         posixJoin(relativeDistPath, RUNTIME_DIR, '**', '*'),
-        posixJoin(relativeDistPath, PLUGIN_DIR, '**', '*')
+        posixJoin(relativeDistPath, PLUGIN_DIR, '**', '*'),
+        posixJoin(relativeDistPath, '**', '*.d.ts')
     ];
     const typesVersions = {
         '*': sortedFiles.reduce((acc, file)=>{

package/dist/esm-node/cli/generator.mjs

@@ -120,6 +120,7 @@ const createBffGenerator = (api)=>{
                         httpMethodDecider,
                         relativeDistPath,
                         relativeApiPath,
+                        apiFiles: apiRouter.getApiFiles(),
                         bffRuntimeFramework,
                         effectEntry: bff?.effect?.entry,
                         effectDataPlatformBatch: bff?.effect?.dataPlatform?.batch

package/dist/esm-node/utils/client-generator/files.mjs

@@ -32,29 +32,18 @@ function createFileDetails(options) {
         exportKey: toPosixPath(path.join(parsedPath.dir, parsedPath.name))
     };
 }
-async function readDirectoryFiles(appDirectory, directory, relativeDistPath) {
+async function readDirectoryFiles(appDirectory, directory, relativeDistPath, apiFiles) {
     const filesList = [];
-    async function readFiles(currentPath) {
-        const entries = await fs.readdir(currentPath, {
-            withFileTypes: true
-        });
-        for (const entry of entries){
-            if ('_app.ts' === entry.name) continue;
-            const resourcePath = path.join(currentPath, entry.name);
-            if (entry.isDirectory()) await readFiles(resourcePath);
-            else {
-                const source = await fs.readFile(resourcePath, 'utf8');
-                filesList.push(createFileDetails({
-                    appDirectory,
-                    baseDirectory: directory,
-                    resourcePath,
-                    source,
-                    relativeDistPath
-                }));
-            }
-        }
+    for (const resourcePath of apiFiles){
+        const source = await fs.readFile(resourcePath, 'utf8');
+        filesList.push(createFileDetails({
+            appDirectory,
+            baseDirectory: directory,
+            resourcePath,
+            source,
+            relativeDistPath
+        }));
     }
-    await readFiles(directory);
     return filesList;
 }
 async function writeTargetFile(absTargetDir, content) {
@@ -63,7 +52,4 @@ async function writeTargetFile(absTargetDir, content) {
     });
     await fs.writeFile(absTargetDir, content);
 }
-async function copyFiles(from, to) {
-    if (await fs.pathExists(from)) await fs.copy(toPosixPath(from), toPosixPath(to));
-}
-export { API_DIR, CLIENT_DIR, EXPORT_PREFIX, GENERATED_RUNTIME_DIRS, PLUGIN_DIR, RUNTIME_DIR, TYPE_PREFIX, copyFiles, createFileDetails, posixJoin, readDirectoryFiles, toPosixPath, writeTargetFile };
+export { API_DIR, CLIENT_DIR, EXPORT_PREFIX, GENERATED_RUNTIME_DIRS, PLUGIN_DIR, RUNTIME_DIR, TYPE_PREFIX, createFileDetails, posixJoin, readDirectoryFiles, toPosixPath, writeTargetFile };

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

@@ -3,14 +3,15 @@ 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, copyFiles, createFileDetails, readDirectoryFiles, writeTargetFile } from "./files.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 { setPackage, writeClientModuleBoundary } from "./write-package.mjs";
 async function clientGenerator(draftOptions) {
     const generatedClientDir = path.resolve(draftOptions.appDir, draftOptions.relativeDistPath, CLIENT_DIR);
     await fs.remove(generatedClientDir);
     const requestId = getPackageName(draftOptions.appDir) || process.env.npm_package_name;
-    const lambdaSourceList = draftOptions.existLambda ? await readDirectoryFiles(draftOptions.appDir, draftOptions.lambdaDir, draftOptions.relativeDistPath) : [];
+    const lambdaSourceList = draftOptions.existLambda ? await readDirectoryFiles(draftOptions.appDir, draftOptions.lambdaDir, draftOptions.relativeDistPath, draftOptions.apiFiles) : [];
     const generatedSourceList = [
         ...lambdaSourceList
     ];
@@ -35,12 +36,17 @@ async function clientGenerator(draftOptions) {
         const result = await generateClient(options);
         return result;
     };
+    const writeClientTypeFacade = async (source, clientCode)=>{
+        if (!await fs.pathExists(path.resolve(source.relativeTargetDistDir))) throw new MissingClientDeclarationError(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));
+    };
     try {
         for (const source of lambdaSourceList){
             const code = await getClitentCode(source.resourcePath, source.source);
             if (code?.value) {
                 await writeTargetFile(source.absTargetDir, code.value);
-                await copyFiles(source.relativeTargetDistDir, source.targetDir.replace("js", 'd.ts'));
+                await writeClientTypeFacade(source, code.value);
             }
         }
         if ('effect' === draftOptions.bffRuntimeFramework) {
@@ -79,6 +85,7 @@ async function clientGenerator(draftOptions) {
         }
         logger.info("Client bundle generate succeed");
     } catch (error) {
+        if (error instanceof MissingClientDeclarationError) throw error;
         logger.error(`Client bundle generate failed: ${error}`);
     }
     if (generatedSourceList.length > 0) await writeClientModuleBoundary(draftOptions.appDir, draftOptions.relativeDistPath);

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

@@ -1,5 +1,6 @@
 import "node:module";
-export { copyFiles, createFileDetails, readDirectoryFiles, writeTargetFile } from "./files.mjs";
+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 { setPackage, writeClientModuleBoundary } from "./write-package.mjs";

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

@@ -0,0 +1,21 @@
+import "node:module";
+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';
+    }
+}
+function buildClientTypeFacade(clientTypesFile, originTypesFile, hasDefaultExport, esm = false) {
+    const originNoExt = originTypesFile.replace(/\.d\.ts$/, '');
+    let specifier = toPosixPath(path.relative(path.dirname(clientTypesFile), originNoExt));
+    if (!specifier.startsWith('.')) specifier = `./${specifier}`;
+    if (esm) specifier = `${specifier}.js`;
+    const lines = [];
+    if (hasDefaultExport) lines.push(`export { default } from '${specifier}';`);
+    lines.push(`export * from '${specifier}';`);
+    return `${lines.join('\n')}\n`;
+}
+export { DEFAULT_EXPORT_RE, MissingClientDeclarationError, buildClientTypeFacade };

package/dist/esm-node/utils/client-generator/write-package.mjs

@@ -20,7 +20,8 @@ async function setPackage(files, appDirectory, relativeDistPath) {
     const addFiles = [
         posixJoin(relativeDistPath, CLIENT_DIR, '**', '*'),
         posixJoin(relativeDistPath, RUNTIME_DIR, '**', '*'),
-        posixJoin(relativeDistPath, PLUGIN_DIR, '**', '*')
+        posixJoin(relativeDistPath, PLUGIN_DIR, '**', '*'),
+        posixJoin(relativeDistPath, '**', '*.d.ts')
     ];
     const typesVersions = {
         '*': sortedFiles.reduce((acc, file)=>{

package/dist/types/utils/client-generator/files.d.ts

@@ -23,6 +23,15 @@ export declare function createFileDetails(options: {
     source: string;
     relativeDistPath: string;
 }): FileDetails;
-export declare function readDirectoryFiles(appDirectory: string, directory: string, relativeDistPath: string): Promise<FileDetails[]>;
+/**
+ * Turn the API files ApiRouter resolved into client-generation inputs.
+ *
+ * `apiFiles` are absolute paths produced with the very same `API_FILE_RULES`
+ * the runtime router uses, which keeps the client generator and the router in
+ * agreement about what an API module is. A bare recursive read of `directory`
+ * also swept in whatever else happened to sit next to the sources — emitted
+ * `.d.ts` and compiled `.js`, tests, private `_`-prefixed modules — and handed
+ * them to `generateClient`.
+ */
+export declare function readDirectoryFiles(appDirectory: string, directory: string, relativeDistPath: string, apiFiles: string[]): Promise<FileDetails[]>;
 export declare function writeTargetFile(absTargetDir: string, content: string): Promise<void>;
-export declare function copyFiles(from: string, to: string): Promise<void>;

package/dist/types/utils/client-generator/generate.d.ts

@@ -10,6 +10,14 @@ export type APILoaderOptions = {
     httpMethodDecider?: HttpMethodDecider;
     relativeDistPath: string;
     relativeApiPath: string;
+    /**
+     * Absolute paths of the valid API files, resolved by ApiRouter with the same
+     * `API_FILE_RULES` the runtime router uses. Passing them in keeps the client
+     * generator and the router in agreement about what an API module is, so
+     * stray artifacts next to the sources (compiled `.d.ts`/`.js`, tests,
+     * private files) never reach `generateClient`.
+     */
+    apiFiles: string[];
     bffRuntimeFramework?: 'hono' | 'effect';
     effectEntry?: string;
     effectDataPlatformBatch?: {

package/dist/types/utils/client-generator/index.d.ts

@@ -1,7 +1,8 @@
 export type { FileDetails } from './files';
-export { copyFiles, createFileDetails, readDirectoryFiles, writeTargetFile, } from './files';
+export { createFileDetails, readDirectoryFiles, writeTargetFile, } from './files';
 export type { APILoaderOptions } from './generate';
 export { clientGenerator, default } from './generate';
 export type { PackageJsonLike } from './package-json';
 export { getClientPackageName, getPackageName, mergePackageJson, } from './package-json';
+export { buildClientTypeFacade, MissingClientDeclarationError, } from './type-facade';
 export { setPackage, writeClientModuleBoundary } from './write-package';

package/dist/types/utils/client-generator/type-facade.d.ts

@@ -0,0 +1,24 @@
+export declare const DEFAULT_EXPORT_RE: RegExp;
+/**
+ * Raised when the handler declaration the client facade must re-export was
+ * never emitted. `setPackage` unconditionally publishes `types` entries for
+ * every generated client, so a missing declaration means the published package
+ * advertises a type surface it cannot resolve. Failing the build is the only
+ * honest outcome: the previous behaviour (copy the declaration if it happens to
+ * exist, otherwise carry on) shipped tarballs whose clients silently degraded
+ * to `any` in consumer projects.
+ */
+export declare class MissingClientDeclarationError extends Error {
+    constructor(resourcePath: string, expectedDeclaration: string);
+}
+/**
+ * Build the `.d.ts` that sits next to a generated client module.
+ *
+ * The published client re-exports the handler's own declaration instead of
+ * copying it. A verbatim copy landed the `.d.ts` one directory shallower than
+ * the compiler emitted it (`dist/client/*` vs `dist/<lambda>/*`), breaking
+ * every relative specifier inside. A facade leaves the original declarations in
+ * place (relative refs intact, and published via `**\/*.d.ts`) and only points
+ * at them.
+ */
+export declare function buildClientTypeFacade(clientTypesFile: string, originTypesFile: string, hasDefaultExport: boolean, esm?: boolean): string;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.8.1-ultramodern.4",
+  "version": "3.8.2-ultramodern.10",
   "types": "./dist/types/cli.d.ts",
   "main": "./dist/cjs/cli.js",
   "exports": {
@@ -169,12 +169,12 @@
     }
   },
   "dependencies": {
-    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.8.1-ultramodern.4",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.8.1-ultramodern.4",
-    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.8.1-ultramodern.4",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.8.1-ultramodern.4",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.8.1-ultramodern.4",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.1-ultramodern.4",
+    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.8.2-ultramodern.10",
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.8.2-ultramodern.10",
+    "@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.8.2-ultramodern.10",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.8.2-ultramodern.10",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.8.2-ultramodern.10",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.2-ultramodern.10",
     "@module-federation/runtime": "2.8.2",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/api-logs": "0.220.0",
@@ -205,12 +205,12 @@
   },
   "devDependencies": {
     "@effect/opentelemetry": "4.0.0-beta.107",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.1-ultramodern.4",
-    "@modern-js/bff-runtime": "npm:@bleedingdev/modern-js-bff-runtime@3.8.1-ultramodern.4",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.1-ultramodern.4",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.1-ultramodern.4",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.1-ultramodern.4",
-    "@rsbuild/core": "2.1.5",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.2-ultramodern.10",
+    "@modern-js/bff-runtime": "npm:@bleedingdev/modern-js-bff-runtime@3.8.2-ultramodern.10",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.2-ultramodern.10",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.2-ultramodern.10",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.2-ultramodern.10",
+    "@rsbuild/core": "2.2.0-rc.0",
     "@rslib/core": "0.23.2",
     "@scripts/rstest-config": "2.66.0",
     "@types/node": "^26.2.0",