@modern-js/bff-core 3.0.0-alpha.1 → 3.0.0-alpha.2

package/dist/cjs/client/generateClient.js

@@ -24,9 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    generateClient: ()=>generateClient,
-    DEFAULT_CLIENT_REQUEST_CREATOR: ()=>DEFAULT_CLIENT_REQUEST_CREATOR,
-    INNER_CLIENT_REQUEST_CREATOR: ()=>INNER_CLIENT_REQUEST_CREATOR
+    INNER_CLIENT_REQUEST_CREATOR: ()=>INNER_CLIENT_REQUEST_CREATOR,
+    generateClient: ()=>generateClient
 });
 const external_path_namespaceObject = require("path");
 const index_js_namespaceObject = require("../router/index.js");
@@ -40,7 +39,6 @@ const getPackageName = (appDir)=>{
         return;
     }
 };
-const DEFAULT_CLIENT_REQUEST_CREATOR = '@modern-js/create-request';
 const INNER_CLIENT_REQUEST_CREATOR = '@modern-js/plugin-bff/client';
 const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve = require.resolve, httpMethodDecider, domain })=>{
     requestCreator = requestCreator || INNER_CLIENT_REQUEST_CREATOR;
@@ -87,11 +85,9 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
 ${fetcher ? `import { fetch } from '${fetcher}';\n` : ''}`;
     return (0, external_result_js_namespaceObject.Ok)(`${importCode}\n${handlersCode}`);
 };
-exports.DEFAULT_CLIENT_REQUEST_CREATOR = __webpack_exports__.DEFAULT_CLIENT_REQUEST_CREATOR;
 exports.INNER_CLIENT_REQUEST_CREATOR = __webpack_exports__.INNER_CLIENT_REQUEST_CREATOR;
 exports.generateClient = __webpack_exports__.generateClient;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "DEFAULT_CLIENT_REQUEST_CREATOR",
     "INNER_CLIENT_REQUEST_CREATOR",
     "generateClient"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/router/utils.js

@@ -69,7 +69,7 @@ const clearRouteName = (routeName)=>{
 const isHandler = (input)=>input && 'function' == typeof input;
 const isFunction = (input)=>input && '[object Function]' === ({}).toString.call(input);
 const requireHandlerModule = async (modulePath)=>{
-    const originRequire = 'test' === process.env.NODE_ENV ? jest.requireActual : utils_namespaceObject.compatibleRequire;
+    const originRequire = 'test' === process.env.NODE_ENV ? require : utils_namespaceObject.compatibleRequire;
     const module = await originRequire(modulePath, false);
     if (isFunction(module)) return {
         default: module

package/dist/esm/api.mjs

@@ -1,6 +1,6 @@
 import "reflect-metadata";
 import koa_compose from "koa-compose";
-import { HANDLER_WITH_META, validateFunction } from "./utils";
+import { HANDLER_WITH_META, validateFunction } from "./utils/index.mjs";
 function Api(...args) {
     const handler = args.pop();
     validateFunction(handler, 'Apihandler');

package/dist/esm/client/generateClient.mjs

@@ -1,6 +1,6 @@
 import { resolve } from "path";
-import { ApiRouter } from "../router";
-import { Err, Ok } from "./result";
+import { ApiRouter } from "../router/index.mjs";
+import { Err, Ok } from "./result.mjs";
 const getPackageName = (appDir)=>{
     try {
         const packageJsonPath = resolve(appDir, './package.json');
@@ -10,7 +10,6 @@ const getPackageName = (appDir)=>{
         return;
     }
 };
-const DEFAULT_CLIENT_REQUEST_CREATOR = '@modern-js/create-request';
 const INNER_CLIENT_REQUEST_CREATOR = '@modern-js/plugin-bff/client';
 const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve = require.resolve, httpMethodDecider, domain })=>{
     requestCreator = requestCreator || INNER_CLIENT_REQUEST_CREATOR;
@@ -57,4 +56,4 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
 ${fetcher ? `import { fetch } from '${fetcher}';\n` : ''}`;
     return Ok(`${importCode}\n${handlersCode}`);
 };
-export { DEFAULT_CLIENT_REQUEST_CREATOR, INNER_CLIENT_REQUEST_CREATOR, generateClient };
+export { INNER_CLIENT_REQUEST_CREATOR, generateClient };

package/dist/esm/client/index.mjs

@@ -1 +1 @@
-export * from "./generateClient";
+export * from "./generateClient.mjs";

package/dist/esm/index.mjs

@@ -1,8 +1,8 @@
-import { Api } from "./api";
-import { HttpError, ValidationError } from "./errors/http";
-import { HANDLER_WITH_META, INPUT_PARAMS_DECIDER, createStorage, getRelativeRuntimePath, isInputParamsDeciderHandler, isWithMetaHandler, registerPaths } from "./utils";
-export * from "./router";
-export * from "./types";
-export * from "./client";
-export * from "./operators/http";
+import { Api } from "./api.mjs";
+import { HttpError, ValidationError } from "./errors/http.mjs";
+import { HANDLER_WITH_META, INPUT_PARAMS_DECIDER, createStorage, getRelativeRuntimePath, isInputParamsDeciderHandler, isWithMetaHandler, registerPaths } from "./utils/index.mjs";
+export * from "./router/index.mjs";
+export * from "./types.mjs";
+export * from "./client/index.mjs";
+export * from "./operators/http.mjs";
 export { Api, HANDLER_WITH_META, HttpError, INPUT_PARAMS_DECIDER, ValidationError, createStorage, getRelativeRuntimePath, isInputParamsDeciderHandler, isWithMetaHandler, registerPaths };

package/dist/esm/operators/http.mjs

@@ -1,5 +1,5 @@
-import { ValidationError } from "../errors/http";
-import { HttpMetadata, HttpMethod, OperatorType, ResponseMetaType, TriggerType } from "../types";
+import { ValidationError } from "../errors/http.mjs";
+import { HttpMetadata, HttpMethod, OperatorType, ResponseMetaType, TriggerType } from "../types.mjs";
 const validateInput = async (schema, input)=>{
     try {
         return await schema.parseAsync(input);

package/dist/esm/router/constants.mjs

@@ -1,4 +1,4 @@
-import { HttpMethod } from "../types";
+import { HttpMethod } from "../types.mjs";
 const AllHttpMethods = Object.values(HttpMethod);
 const FRAMEWORK_MODE_LAMBDA_DIR = 'lambda';
 const FRAMEWORK_MODE_APP_DIR = 'app';

package/dist/esm/router/index.mjs

@@ -1,12 +1,12 @@
 import path from "path";
 import { fs, logger } from "@modern-js/utils";
 import "reflect-metadata";
-import { HttpMethod, OperatorType, TriggerType, httpMethods } from "../types";
-import { INPUT_PARAMS_DECIDER, debug } from "../utils";
-import { API_FILE_RULES, FRAMEWORK_MODE_LAMBDA_DIR } from "./constants";
-import { getFiles, getPathFromFilename, requireHandlerModule, sortRoutes } from "./utils";
-export * from "./types";
-export * from "./constants";
+import { HttpMethod, OperatorType, TriggerType, httpMethods } from "../types.mjs";
+import { INPUT_PARAMS_DECIDER, debug } from "../utils/index.mjs";
+import { API_FILE_RULES, FRAMEWORK_MODE_LAMBDA_DIR } from "./constants.mjs";
+import { getFiles, getPathFromFilename, requireHandlerModule, sortRoutes } from "./utils.mjs";
+export * from "./types.mjs";
+export * from "./constants.mjs";
 class ApiRouter {
     isExistLambda() {
         return this.existLambdaDir;

package/dist/esm/router/utils.mjs

@@ -1,6 +1,6 @@
 import path from "path";
 import { compatibleRequire, globby } from "@modern-js/utils";
-import { INDEX_SUFFIX } from "./constants";
+import { INDEX_SUFFIX } from "./constants.mjs";
 const getFiles = (lambdaDir, rules)=>globby.sync(rules, {
         cwd: lambdaDir,
         gitignore: true
@@ -27,7 +27,7 @@ const clearRouteName = (routeName)=>{
 const isHandler = (input)=>input && 'function' == typeof input;
 const isFunction = (input)=>input && '[object Function]' === ({}).toString.call(input);
 const requireHandlerModule = async (modulePath)=>{
-    const originRequire = 'test' === process.env.NODE_ENV ? jest.requireActual : compatibleRequire;
+    const originRequire = 'test' === process.env.NODE_ENV ? require : compatibleRequire;
     const module = await originRequire(modulePath, false);
     if (isFunction(module)) return {
         default: module

package/dist/esm/utils/index.mjs

@@ -1,6 +1,6 @@
-import { debug } from "./debug";
-export * from "./storage";
-export * from "./alias";
-export * from "./meta";
-export * from "./validate";
+import { debug } from "./debug.mjs";
+export * from "./storage.mjs";
+export * from "./alias.mjs";
+export * from "./meta.mjs";
+export * from "./validate.mjs";
 export { debug };

package/dist/esm-node/api.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import "reflect-metadata";
 import koa_compose from "koa-compose";
 import { HANDLER_WITH_META, validateFunction } from "./utils/index.mjs";

package/dist/esm-node/client/generateClient.mjs

@@ -1,3 +1,5 @@
+import __rslib_shim_module__ from "node:module";
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(import.meta.url);
 import { resolve } from "path";
 import { ApiRouter } from "../router/index.mjs";
 import { Err, Ok } from "./result.mjs";
@@ -10,7 +12,6 @@ const getPackageName = (appDir)=>{
         return;
     }
 };
-const DEFAULT_CLIENT_REQUEST_CREATOR = '@modern-js/create-request';
 const INNER_CLIENT_REQUEST_CREATOR = '@modern-js/plugin-bff/client';
 const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve = require.resolve, httpMethodDecider, domain })=>{
     requestCreator = requestCreator || INNER_CLIENT_REQUEST_CREATOR;
@@ -57,4 +58,4 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
 ${fetcher ? `import { fetch } from '${fetcher}';\n` : ''}`;
     return Ok(`${importCode}\n${handlersCode}`);
 };
-export { DEFAULT_CLIENT_REQUEST_CREATOR, INNER_CLIENT_REQUEST_CREATOR, generateClient };
+export { INNER_CLIENT_REQUEST_CREATOR, generateClient };

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

@@ -1 +1,3 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 export * from "./generateClient.mjs";

package/dist/esm-node/client/result.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const Err = (value)=>{
     const err = {
         kind: 'Err',

package/dist/esm-node/compatible.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/errors/http.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 class HttpError extends Error {
     constructor(status, message){
         super(message);

package/dist/esm-node/index.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { Api } from "./api.mjs";
 import { HttpError, ValidationError } from "./errors/http.mjs";
 import { HANDLER_WITH_META, INPUT_PARAMS_DECIDER, createStorage, getRelativeRuntimePath, isInputParamsDeciderHandler, isWithMetaHandler, registerPaths } from "./utils/index.mjs";

package/dist/esm-node/operators/http.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { ValidationError } from "../errors/http.mjs";
 import { HttpMetadata, HttpMethod, OperatorType, ResponseMetaType, TriggerType } from "../types.mjs";
 const validateInput = async (schema, input)=>{

package/dist/esm-node/router/constants.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { HttpMethod } from "../types.mjs";
 const AllHttpMethods = Object.values(HttpMethod);
 const FRAMEWORK_MODE_LAMBDA_DIR = 'lambda';

package/dist/esm-node/router/index.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import path from "path";
 import { fs, logger } from "@modern-js/utils";
 import "reflect-metadata";

package/dist/esm-node/router/types.mjs

@@ -0,0 +1,2 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;

package/dist/esm-node/router/utils.mjs

@@ -1,3 +1,5 @@
+import __rslib_shim_module__ from "node:module";
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(import.meta.url);
 import path from "path";
 import { compatibleRequire, globby } from "@modern-js/utils";
 import { INDEX_SUFFIX } from "./constants.mjs";
@@ -27,7 +29,7 @@ const clearRouteName = (routeName)=>{
 const isHandler = (input)=>input && 'function' == typeof input;
 const isFunction = (input)=>input && '[object Function]' === ({}).toString.call(input);
 const requireHandlerModule = async (modulePath)=>{
-    const originRequire = 'test' === process.env.NODE_ENV ? jest.requireActual : compatibleRequire;
+    const originRequire = 'test' === process.env.NODE_ENV ? require : compatibleRequire;
     const module = await originRequire(modulePath, false);
     if (isFunction(module)) return {
         default: module

package/dist/esm-node/types.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 var types_OperatorType = /*#__PURE__*/ function(OperatorType) {
     OperatorType[OperatorType["Trigger"] = 0] = "Trigger";
     OperatorType[OperatorType["Middleware"] = 1] = "Middleware";

package/dist/esm-node/utils/alias.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import fs from "fs";
 import module_0 from "module";
 import { platform } from "os";

package/dist/esm-node/utils/debug.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { createDebugger } from "@modern-js/utils";
 const debug = createDebugger('bff');
 export { debug };

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

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { debug } from "./debug.mjs";
 export * from "./storage.mjs";
 export * from "./alias.mjs";

package/dist/esm-node/utils/meta.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 const HANDLER_WITH_META = 'HANDLER_WITH_META';
 const INPUT_PARAMS_DECIDER = 'INPUT_PARAMS_DECIDER';
 const isWithMetaHandler = (handler)=>'function' == typeof handler && handler[HANDLER_WITH_META];

package/dist/esm-node/utils/storage.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import { AsyncLocalStorage } from "async_hooks";
 const createStorage = ()=>{
     let storage;

package/dist/esm-node/utils/validate.mjs

@@ -1,3 +1,5 @@
+import "node:module";
+/*#__PURE__*/ import.meta.url;
 import util from "util";
 const getTypeErrorMessage = (actual)=>{
     let msg = '';

package/dist/types/client/generateClient.d.ts

@@ -16,6 +16,5 @@ export type GenClientOptions = {
     httpMethodDecider?: HttpMethodDecider;
     domain?: string;
 };
-export declare const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
 export declare const INNER_CLIENT_REQUEST_CREATOR = "@modern-js/plugin-bff/client";
 export declare const generateClient: ({ appDir, resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve, httpMethodDecider, domain, }: GenClientOptions) => Promise<GenClientResult>;

package/package.json

@@ -15,15 +15,16 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-alpha.1",
-  "jsnext:source": "./src/index.ts",
+  "version": "3.0.0-alpha.2",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
-      "jsnext:source": "./src/index.ts",
+      "node": {
+        "import": "./dist/esm-node/index.mjs",
+        "require": "./dist/cjs/index.js"
+      },
       "default": "./dist/cjs/index.js"
     }
   },
@@ -32,21 +33,19 @@
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.2.2",
     "type-fest": "2.19.0",
-    "@modern-js/utils": "3.0.0-alpha.1"
+    "@modern-js/utils": "3.0.0-alpha.2"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.14",
+    "@rslib/core": "0.19.3",
     "@types/koa-compose": "^3.2.9",
     "@types/node": "^20",
-    "jest": "^29.7.0",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "@rslib/core": "0.19.1",
     "typescript": "^5",
     "zod": "^3.25.76",
-    "@modern-js/types": "3.0.0-alpha.1",
-    "@scripts/jest-config": "2.66.0",
-    "@modern-js/rslib": "2.68.10"
+    "@modern-js/rslib": "2.68.10",
+    "@modern-js/types": "3.0.0-alpha.2",
+    "@scripts/rstest-config": "2.66.0"
   },
   "peerDependencies": {
     "ts-node": "^10.9.2",
@@ -65,6 +64,6 @@
   "scripts": {
     "dev": "rslib build --watch",
     "build": "rslib build",
-    "test": "jest --passWithNoTests"
+    "test": "rstest --passWithNoTests"
   }
 }

package/rstest.config.ts

@@ -0,0 +1,10 @@
+import { withTestPreset } from '@scripts/rstest-config';
+
+export default withTestPreset({
+  setupFiles: ['@scripts/rstest-config/setup.ts'],
+  root: __dirname,
+  globals: true,
+  env: {
+    npm_package_name: 'tests',
+  },
+});