@modern-js/bff-core 2.40.1-alpha.0 → 2.42.0

package/dist/cjs/router/constants.js

@@ -31,18 +31,8 @@ var import_types = require("../types");
 const AllHttpMethods = Object.values(import_types.HttpMethod);
 var APIMode;
 (function(APIMode2) {
-  APIMode2[
-    /**
-    * 框架模式
-    */
-    "FARMEWORK"
-  ] = "framework";
-  APIMode2[
-    /**
-    * 函数模式
-    */
-    "FUNCTION"
-  ] = "function";
+  APIMode2["FARMEWORK"] = "framework";
+  APIMode2["FUNCTION"] = "function";
 })(APIMode || (APIMode = {}));
 const FRAMEWORK_MODE_LAMBDA_DIR = "lambda";
 const FRAMEWORK_MODE_APP_DIR = "app";

package/dist/cjs/router/index.js

@@ -45,17 +45,12 @@ __reExport(router_exports, require("./constants"), module.exports);
 class ApiRouter {
   enableRegister() {
     const existTsLoader = Boolean(require.extensions[".ts"]);
-    if (!existTsLoader && (process.env.NODE_ENV !== "production" || this.isBuild)) {
+    if (!existTsLoader) {
       try {
         const projectSearchDir = this.appDir || this.apiDir;
-        let tsconfigPath = import_path.default.join(this.appDir || process.cwd(), "tsconfig.json");
-        const serverTsconfigPath = import_path.default.resolve(this.appDir || process.cwd(), "tsconfig.server.json");
-        if (import_utils.fs.existsSync(serverTsconfigPath)) {
-          tsconfigPath = serverTsconfigPath;
-        }
         const tsNode = require("ts-node");
         tsNode.register({
-          project: tsconfigPath,
+          projectSearchDir,
           compilerOptions: {
             allowJs: false
           },
@@ -228,6 +223,7 @@ class ApiRouter {
     return filenames.map((filename) => this.getModuleInfo(filename)).filter((moduleInfo) => Boolean(moduleInfo));
   }
   getModuleInfo(filename) {
+    this.enableRegister();
     try {
       const module2 = (0, import_utils3.requireHandlerModule)(filename);
       return {
@@ -318,7 +314,6 @@ class ApiRouter {
     this.lambdaDir = this.getExactLambdaDir(this.apiDir, lambdaDir);
     this.existLambdaDir = import_utils.fs.existsSync(this.lambdaDir);
     (0, import_utils2.debug)(`apiDir:`, this.apiDir, `lambdaDir:`, this.lambdaDir);
-    this.enableRegister();
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/esm/router/constants.js

@@ -2,18 +2,8 @@ import { HttpMethod } from "../types";
 const AllHttpMethods = Object.values(HttpMethod);
 var APIMode;
 (function(APIMode2) {
-  APIMode2[
-    /**
-    * 框架模式
-    */
-    "FARMEWORK"
-  ] = "framework";
-  APIMode2[
-    /**
-    * 函数模式
-    */
-    "FUNCTION"
-  ] = "function";
+  APIMode2["FARMEWORK"] = "framework";
+  APIMode2["FUNCTION"] = "function";
 })(APIMode || (APIMode = {}));
 const FRAMEWORK_MODE_LAMBDA_DIR = "lambda";
 const FRAMEWORK_MODE_APP_DIR = "app";

package/dist/esm/router/index.js

@@ -11,17 +11,12 @@ export * from "./constants";
 class ApiRouter {
   enableRegister() {
     const existTsLoader = Boolean(require.extensions[".ts"]);
-    if (!existTsLoader && (process.env.NODE_ENV !== "production" || this.isBuild)) {
+    if (!existTsLoader) {
       try {
         const projectSearchDir = this.appDir || this.apiDir;
-        let tsconfigPath = path.join(this.appDir || process.cwd(), "tsconfig.json");
-        const serverTsconfigPath = path.resolve(this.appDir || process.cwd(), "tsconfig.server.json");
-        if (fs.existsSync(serverTsconfigPath)) {
-          tsconfigPath = serverTsconfigPath;
-        }
         const tsNode = require("ts-node");
         tsNode.register({
-          project: tsconfigPath,
+          projectSearchDir,
           compilerOptions: {
             allowJs: false
           },
@@ -194,6 +189,7 @@ class ApiRouter {
     return filenames.map((filename) => this.getModuleInfo(filename)).filter((moduleInfo) => Boolean(moduleInfo));
   }
   getModuleInfo(filename) {
+    this.enableRegister();
     try {
       const module = requireHandlerModule(filename);
       return {
@@ -284,7 +280,6 @@ class ApiRouter {
     this.lambdaDir = this.getExactLambdaDir(this.apiDir, lambdaDir);
     this.existLambdaDir = fs.existsSync(this.lambdaDir);
     debug(`apiDir:`, this.apiDir, `lambdaDir:`, this.lambdaDir);
-    this.enableRegister();
   }
 }
 export {

package/dist/types/api.d.ts

@@ -1,3 +1,6 @@
 import 'reflect-metadata';
 import type { ApiRunner, ArrayToObject, ExtractInputType, ExtractOuputType, Operator, MaybeAsync } from './types';
-export declare function Api<Operators extends Operator<any, any>[], Res extends MaybeAsync<any>>(...args: [...operators: Operators, handler: (arg: ArrayToObject<ExtractOuputType<Operators>>) => Res]): ApiRunner<ExtractInputType<Operators> extends void[] ? void : ArrayToObject<ExtractInputType<Operators>>, Res>;
+export declare function Api<Operators extends Operator<any, any>[], Res extends MaybeAsync<any>>(...args: [
+    ...operators: Operators,
+    handler: (arg: ArrayToObject<ExtractOuputType<Operators>>) => Res
+]): ApiRunner<ExtractInputType<Operators> extends void[] ? void : ArrayToObject<ExtractInputType<Operators>>, Res>;

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

@@ -2,30 +2,18 @@ import type { HttpMethodDecider } from '@modern-js/types';
 import { Result } from './result';
 export type GenClientResult = Result<string>;
 export type GenClientOptions = {
-  resourcePath: string;
-  source: string;
-  appDir: string;
-  apiDir: string;
-  lambdaDir: string;
-  prefix: string;
-  port: number;
-  requestCreator?: string;
-  fetcher?: string;
-  target?: string;
-  requireResolve?: typeof require.resolve;
-  httpMethodDecider?: HttpMethodDecider;
+    resourcePath: string;
+    source: string;
+    appDir: string;
+    apiDir: string;
+    lambdaDir: string;
+    prefix: string;
+    port: number;
+    requestCreator?: string;
+    fetcher?: string;
+    target?: string;
+    requireResolve?: typeof require.resolve;
+    httpMethodDecider?: HttpMethodDecider;
 };
 export declare const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
-export declare const generateClient: ({
-  appDir,
-  resourcePath,
-  apiDir,
-  lambdaDir,
-  prefix,
-  port,
-  target,
-  requestCreator,
-  fetcher,
-  requireResolve,
-  httpMethodDecider
-}: GenClientOptions) => Promise<GenClientResult>;
+export declare const generateClient: ({ appDir, resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve, httpMethodDecider, }: GenClientOptions) => Promise<GenClientResult>;

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

@@ -1 +1 @@
-export * from './generateClient';
+export * from './generateClient';

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

@@ -1,15 +1,15 @@
 export type Err<T = unknown> = {
-  kind: 'Err';
-  value: T;
-  isErr: true;
-  isOk: false;
+    kind: 'Err';
+    value: T;
+    isErr: true;
+    isOk: false;
 };
 export type Ok<T = unknown> = {
-  kind: 'Ok';
-  value: T;
-  isErr: false;
-  isOk: true;
+    kind: 'Ok';
+    value: T;
+    isErr: false;
+    isOk: true;
 };
 export type Result<T = unknown, E = string> = Err<E> | Ok<T>;
 export declare const Err: <E = string>(value: E) => Err<E>;
-export declare const Ok: <T, E = string>(value: T) => Result<T, E>;
+export declare const Ok: <T, E = string>(value: T) => Result<T, E>;

package/dist/types/errors/http.d.ts

@@ -1,8 +1,8 @@
 export declare class HttpError extends Error {
-  status: number;
-  constructor(status: number, message: string);
+    status: number;
+    constructor(status: number, message: string);
 }
 export declare class ValidationError extends HttpError {
-  private code;
-  constructor(status: number, message: string);
-}
+    private code;
+    constructor(status: number, message: string);
+}

package/dist/types/index.d.ts

@@ -4,4 +4,4 @@ export * from './router';
 export * from './types';
 export * from './client';
 export * from './operators/http';
-export { getRelativeRuntimePath, HANDLER_WITH_META, isWithMetaHandler, INPUT_PARAMS_DECIDER, isInputParamsDeciderHandler, createStorage, registerPaths } from './utils';
+export { getRelativeRuntimePath, HANDLER_WITH_META, isWithMetaHandler, INPUT_PARAMS_DECIDER, isInputParamsDeciderHandler, createStorage, registerPaths, } from './utils';

package/dist/types/operators/http.d.ts

@@ -1,8 +1,8 @@
 import type { z } from 'zod';
 import { Operator, HttpMethod, ResponseMetaType } from '../types';
 export interface ResponseMeta {
-  type: ResponseMetaType;
-  value: unknown;
+    type: ResponseMetaType;
+    value: unknown;
 }
 export declare const createHttpOperator: (method: HttpMethod) => (urlPath: string) => Operator<void>;
 export declare const Get: (urlPath: string) => Operator<void>;
@@ -15,25 +15,25 @@ export declare const Patch: (urlPath: string) => Operator<void>;
 export declare const Options: (urlPath: string) => Operator<void>;
 export declare const Head: (urlPath: string) => Operator<void>;
 export declare const Data: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(schema: Schema) => Operator<{
-  data: z.input<Schema>;
+    data: z.input<Schema>;
 }, {
-  data: z.output<Schema>;
+    data: z.output<Schema>;
 }>;
 export declare const Query: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(schema: Schema) => Operator<{
-  query: z.input<Schema>;
+    query: z.input<Schema>;
 }, {
-  query: z.output<Schema>;
+    query: z.output<Schema>;
 }>;
 export declare const Params: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(schema: Schema) => Operator<{
-  params: z.input<Schema>;
+    params: z.input<Schema>;
 }, {
-  params: z.output<Schema>;
+    params: z.output<Schema>;
 }>;
 export declare const Headers: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(schema: Schema) => Operator<{
-  headers: z.input<Schema>;
+    headers: z.input<Schema>;
 }, {
-  headers: z.output<Schema>;
+    headers: z.output<Schema>;
 }>;
 export declare const HttpCode: (statusCode: number) => Operator<void>;
 export declare const SetHeaders: (headers: Record<string, string>) => Operator<void>;
-export declare const Redirect: (url: string) => Operator<void>;
+export declare const Redirect: (url: string) => Operator<void>;

package/dist/types/router/constants.d.ts

@@ -1,16 +1,16 @@
 export declare const AllHttpMethods: string[];
 export declare enum APIMode {
-  /**
-   * 框架模式
-   */
-  FARMEWORK = "framework",
-  /**
-   * 函数模式
-   */
-  FUNCTION = "function",
+    /**
+     * 框架模式
+     */
+    FARMEWORK = "framework",
+    /**
+     * 函数模式
+     */
+    FUNCTION = "function"
 }
 export declare const FRAMEWORK_MODE_LAMBDA_DIR = "lambda";
 export declare const FRAMEWORK_MODE_APP_DIR = "app";
 export declare const INDEX_SUFFIX = "index";
 export declare const API_DIR = "api";
-export declare const API_FILE_RULES: string[];
+export declare const API_FILE_RULES: string[];

package/dist/types/router/index.d.ts

@@ -6,56 +6,49 @@ import { ApiHandler, APIHandlerInfo } from './types';
 export * from './types';
 export * from './constants';
 export declare class ApiRouter {
-  private apiMode;
-  private appDir?;
-  private apiDir;
-  private existLambdaDir;
-  private httpMethodDecider;
-  private lambdaDir;
-  private prefix;
-  private apiFiles;
-  private isBuild?;
-  constructor({
-    appDir,
-    apiDir,
-    lambdaDir,
-    prefix,
-    isBuild,
-    httpMethodDecider
-  }: {
-    appDir?: string;
-    apiDir: string;
-    lambdaDir?: string;
-    prefix?: string;
-    isBuild?: boolean;
-    httpMethodDecider?: HttpMethodDecider;
-  });
-  private enableRegister;
-  isExistLambda(): boolean;
-  getApiMode(): APIMode;
-  getLambdaDir(): string;
-  isApiFile(filename: string): boolean;
-  getSingleModuleHandlers(filename: string): APIHandlerInfo[] | null;
-  getHandlerInfo(filename: string, originFuncName: string, handler: ApiHandler): APIHandlerInfo | null;
-  getSafeRoutePath(filename: string, handler?: ApiHandler): string;
-  getRouteName(filename: string, handler?: ApiHandler): string;
-  getHttpMethod(originHandlerName: string, handler?: ApiHandler): HttpMethod | null;
-  loadApiFiles(): string[];
-  getApiFiles(): string[];
-  getApiHandlers(): APIHandlerInfo[];
-  /**
-   * 如果用户未传入或传入空串，默认为 /api
-   * 如果传入 /，则 prefix 为 /
-   */
-  private initPrefix;
-  private validateAbsolute;
-  private getExactApiMode;
-  private createExistChecker;
-  private getExactLambdaDir;
-  private getModuleInfos;
-  private getModuleInfo;
-  private getHandlerInfos;
-  private getModuleHandlerInfos;
-  private validateValidApifile;
-  private getRoutePath;
-}
+    private apiMode;
+    private appDir?;
+    private apiDir;
+    private existLambdaDir;
+    private httpMethodDecider;
+    private lambdaDir;
+    private prefix;
+    private apiFiles;
+    private isBuild?;
+    constructor({ appDir, apiDir, lambdaDir, prefix, isBuild, httpMethodDecider, }: {
+        appDir?: string;
+        apiDir: string;
+        lambdaDir?: string;
+        prefix?: string;
+        isBuild?: boolean;
+        httpMethodDecider?: HttpMethodDecider;
+    });
+    private enableRegister;
+    isExistLambda(): boolean;
+    getApiMode(): APIMode;
+    getLambdaDir(): string;
+    isApiFile(filename: string): boolean;
+    getSingleModuleHandlers(filename: string): APIHandlerInfo[] | null;
+    getHandlerInfo(filename: string, originFuncName: string, handler: ApiHandler): APIHandlerInfo | null;
+    getSafeRoutePath(filename: string, handler?: ApiHandler): string;
+    getRouteName(filename: string, handler?: ApiHandler): string;
+    getHttpMethod(originHandlerName: string, handler?: ApiHandler): HttpMethod | null;
+    loadApiFiles(): string[];
+    getApiFiles(): string[];
+    getApiHandlers(): APIHandlerInfo[];
+    /**
+     * 如果用户未传入或传入空串，默认为 /api
+     * 如果传入 /，则 prefix 为 /
+     */
+    private initPrefix;
+    private validateAbsolute;
+    private getExactApiMode;
+    private createExistChecker;
+    private getExactLambdaDir;
+    private getModuleInfos;
+    private getModuleInfo;
+    private getHandlerInfos;
+    private getModuleHandlerInfos;
+    private validateValidApifile;
+    private getRoutePath;
+}

package/dist/types/router/types.d.ts

@@ -1,17 +1,17 @@
 import { HttpMethod } from '../types';
 export type ModuleInfo = {
-  filename: string;
-  module: HandlerModule;
+    filename: string;
+    module: HandlerModule;
 };
 type Handler = (...args: any) => any | Promise<any>;
 export type ApiHandler = Handler;
 export type HandlerModule = Record<string, ApiHandler>;
 export type APIHandlerInfo = {
-  handler: ApiHandler;
-  name: string;
-  httpMethod: HttpMethod;
-  filename: string;
-  routeName: string;
-  routePath: string;
+    handler: ApiHandler;
+    name: string;
+    httpMethod: HttpMethod;
+    filename: string;
+    routeName: string;
+    routePath: string;
 };
-export {};
+export {};

package/dist/types/router/utils.d.ts

@@ -7,4 +7,4 @@ export declare const getPathFromFilename: (baseDir: string, filename: string) =>
 export declare const isHandler: (input: any) => input is Handler<any, any>;
 export declare const requireHandlerModule: (modulePath: string) => any;
 export declare const sortRoutes: (apiHandlers: APIHandlerInfo[]) => APIHandlerInfo[];
-export {};
+export {};

package/dist/types/types.d.ts

@@ -1,58 +1,62 @@
 import { Merge } from 'type-fest';
 export declare enum OperatorType {
-  Trigger = 0,
-  Middleware = 1,
+    Trigger = 0,
+    Middleware = 1
 }
 export declare enum TriggerType {
-  Http = 0,
+    Http = 0
 }
 export declare enum HttpMetadata {
-  Method = "METHOD",
-  Data = "DATA",
-  Query = "QUERY",
-  Params = "PARAMS",
-  Headers = "HEADERS",
-  Response = "RESPONSE",
+    Method = "METHOD",
+    Data = "DATA",
+    Query = "QUERY",
+    Params = "PARAMS",
+    Headers = "HEADERS",
+    Response = "RESPONSE"
 }
 export declare enum ResponseMetaType {
-  StatusCode = 0,
-  Redirect = 1,
-  Headers = 2,
+    StatusCode = 0,
+    Redirect = 1,
+    Headers = 2
 }
 export declare enum HttpMethod {
-  Get = "GET",
-  Post = "POST",
-  Put = "PUT",
-  Delete = "DELETE",
-  Connect = "CONNECT",
-  Trace = "TRACE",
-  Patch = "PATCH",
-  Options = "OPTIONS",
-  Head = "HEAD",
+    Get = "GET",
+    Post = "POST",
+    Put = "PUT",
+    Delete = "DELETE",
+    Connect = "CONNECT",
+    Trace = "TRACE",
+    Patch = "PATCH",
+    Options = "OPTIONS",
+    Head = "HEAD"
 }
 export type InputSchemaMeata = Extract<HttpMetadata, HttpMetadata.Data | HttpMetadata.Query | HttpMetadata.Headers | HttpMetadata.Params>;
 export type ExecuteFunc<Outputs> = (helper: ExecuteHelper<Outputs>, next: () => Promise<any>) => Promise<any>;
 export type ExecuteHelper<Outputs> = {
-  result?: any;
-  inputs: Outputs;
+    result?: any;
+    inputs: Outputs;
 };
 export type MetadataHelper = {
-  setMetadata: <T = any>(key: any, value: T) => void;
-  getMetadata: <T = any>(key: any) => T;
+    setMetadata: <T = any>(key: any, value: T) => void;
+    getMetadata: <T = any>(key: any) => T;
 };
 export type Operator<Input = any, Output = Input> = {
-  name: string;
-  inputType?: Input;
-  outputType?: Output;
-  metadata?: (helper: MetadataHelper) => void;
-  validate?: ExecuteFunc<Output>;
-  execute?: ExecuteFunc<Output>;
+    name: string;
+    inputType?: Input;
+    outputType?: Output;
+    metadata?: (helper: MetadataHelper) => void;
+    validate?: ExecuteFunc<Output>;
+    execute?: ExecuteFunc<Output>;
 };
 export type MaybeAsync<T> = Promise<T> | T;
 export type ApiRunner<Input extends object | void | unknown, Output extends MaybeAsync<any>> = (...args: Input extends void ? [] : [input: Input]) => Output;
 export type NonNullable<T> = Exclude<T, null | undefined>;
-export type ExtractInputType<T> = { [key in keyof T]: T[key] extends Operator<any, any> ? NonNullable<T[key]['inputType']> : void };
-export type ExtractOuputType<T> = { [key in keyof T]: T[key] extends Operator<any, any> ? NonNullable<T[key]['outputType']> : void };
+export type ExtractInputType<T> = {
+    [key in keyof T]: T[key] extends Operator<any, any> ? NonNullable<T[key]['inputType']> : void;
+};
+export type ExtractOuputType<T> = {
+    [key in keyof T]: T[key] extends Operator<any, any> ? NonNullable<T[key]['outputType']> : void;
+};
 export type ArrayToObject<T, R = {}> = T extends [infer First, ...infer Rest] ? First extends PromiseLike<infer PromiseValue> ? PromiseValue : First extends object ? Merge<First, ArrayToObject<Rest, R>> : ArrayToObject<Rest, R> : R;
 export type AsyncFunction = (...args: any[]) => Promise<any>;
-export declare const httpMethods: HttpMethod[];
+export declare const httpMethods: HttpMethod[];

package/dist/types/utils/alias.d.ts

@@ -1,7 +1,7 @@
 interface Paths {
-  [key: string]: string[] | string;
+    [key: string]: string[] | string;
 }
 export declare const getRelativeRuntimePath: (appDirectory: string, serverRuntimePath: string) => string;
 export declare const createMatchPath: (paths: Paths) => (request: string) => string | null;
 export declare const registerPaths: (paths: Paths) => () => void;
-export {};
+export {};

package/dist/types/utils/debug.d.ts

@@ -1 +1 @@
-export declare const debug: import("@modern-js/utils/compiled/debug").Debugger;
+export declare const debug: import("@modern-js/utils/compiled/debug").Debugger;

package/dist/types/utils/index.d.ts

@@ -2,4 +2,4 @@ export * from './storage';
 export * from './alias';
 export { debug } from './debug';
 export * from './meta';
-export * from './validate';
+export * from './validate';

package/dist/types/utils/meta.d.ts

@@ -1,4 +1,4 @@
 export declare const HANDLER_WITH_META = "HANDLER_WITH_META";
 export declare const INPUT_PARAMS_DECIDER = "INPUT_PARAMS_DECIDER";
 export declare const isWithMetaHandler: (handler: any) => any;
-export declare const isInputParamsDeciderHandler: (handler: any) => any;
+export declare const isInputParamsDeciderHandler: (handler: any) => any;

package/dist/types/utils/storage.d.ts

@@ -1,5 +1,5 @@
 declare const createStorage: <T>() => {
-  run: <O>(context: T, cb: () => O | Promise<O>) => Promise<O>;
-  useContext: () => T;
+    run: <O>(context: T, cb: () => O | Promise<O>) => Promise<O>;
+    useContext: () => T;
 };
-export { createStorage };
+export { createStorage };

package/dist/types/utils/validate.d.ts

@@ -1,5 +1,5 @@
 export declare const getTypeErrorMessage: (actual: unknown) => string;
 export declare class ERR_INVALID_ARG_TYPE extends Error {
-  constructor(funcName: string, expectedType: string, actual: unknown);
+    constructor(funcName: string, expectedType: string, actual: unknown);
 }
-export declare const validateFunction: (maybeFunc: unknown, name: string) => boolean;
+export declare const validateFunction: (maybeFunc: unknown, name: string) => boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.40.1-alpha.0",
+  "version": "2.42.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -30,8 +30,8 @@
   "dependencies": {
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.1.13",
-    "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.40.0"
+    "@swc/helpers": "0.5.3",
+    "@modern-js/utils": "2.42.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -43,9 +43,9 @@
     "type-fest": "2.15.0",
     "typescript": "^5",
     "zod": "^3.22.3",
-    "@scripts/build": "2.40.0",
-    "@scripts/jest-config": "2.40.0",
-    "@modern-js/types": "2.40.0"
+    "@modern-js/types": "2.42.0",
+    "@scripts/build": "2.42.0",
+    "@scripts/jest-config": "2.42.0"
   },
   "peerDependencies": {
     "zod": "^3.22.3",