@modern-js/bff-core 2.69.5 → 3.0.0-alpha.0

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

@@ -17,5 +17,5 @@ export type GenClientOptions = {
     domain?: string;
 };
 export declare const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
-export declare const INNER_CLIENT_REQUEST_CREATOR = "@modern-js/plugin-bff/runtime/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/dist/types/router/constants.d.ts

@@ -1,14 +1,4 @@
 export declare const AllHttpMethods: string[];
-export declare enum APIMode {
-    /**
-     * 框架模式
-     */
-    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";

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

@@ -1,12 +1,10 @@
 import 'reflect-metadata';
 import type { HttpMethodDecider } from '@modern-js/types';
 import { HttpMethod } from '../types';
-import { APIMode } from './constants';
 import type { APIHandlerInfo, ApiHandler } from './types';
 export * from './types';
 export * from './constants';
 export declare class ApiRouter {
-    private apiMode;
     private appDir?;
     private apiDir;
     private existLambdaDir;
@@ -24,7 +22,6 @@ export declare class ApiRouter {
         httpMethodDecider?: HttpMethodDecider;
     });
     isExistLambda(): boolean;
-    getApiMode(): APIMode;
     getLambdaDir(): string;
     isApiFile(filename: string): boolean;
     getSingleModuleHandlers(filename: string): Promise<APIHandlerInfo[] | null>;
@@ -42,8 +39,6 @@ export declare class ApiRouter {
      */
     private initPrefix;
     private validateAbsolute;
-    private getExactApiMode;
-    private createExistChecker;
     private getExactLambdaDir;
     private getModuleInfos;
     private getModuleInfo;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.69.5",
+  "version": "3.0.0-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -30,26 +30,27 @@
   "dependencies": {
     "@swc/helpers": "^0.5.17",
     "koa-compose": "^4.1.0",
-    "reflect-metadata": "^0.1.13",
-    "type-fest": "2.15.0",
-    "@modern-js/utils": "2.69.5"
+    "reflect-metadata": "^0.2.2",
+    "type-fest": "2.19.0",
+    "@modern-js/utils": "3.0.0-alpha.0"
   },
   "devDependencies": {
-    "@types/jest": "^29",
-    "@types/koa-compose": "^3.2.5",
-    "@types/node": "^18",
-    "jest": "^29",
-    "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.1.2",
+    "@types/jest": "^29.5.14",
+    "@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.18.5",
     "typescript": "^5",
     "zod": "^3.22.3",
-    "@modern-js/types": "2.69.5",
-    "@scripts/build": "2.66.0",
-    "@scripts/jest-config": "2.66.0"
+    "@modern-js/types": "3.0.0-alpha.0",
+    "@scripts/jest-config": "2.66.0",
+    "@modern-js/rslib": "2.68.10"
   },
   "peerDependencies": {
-    "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.1.2",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
     "zod": "^3.22.3"
   },
   "peerDependenciesMeta": {
@@ -62,9 +63,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern-lib new",
-    "dev": "modern-lib build --watch",
-    "build": "modern-lib build",
+    "dev": "rslib build --watch",
+    "build": "rslib build",
     "test": "jest --passWithNoTests"
   }
 }

package/rslib.config.mts

@@ -0,0 +1,4 @@
+import { rslibConfig } from '@modern-js/rslib';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig(rslibConfig);

package/dist/esm/api.js

@@ -1,50 +0,0 @@
-import "reflect-metadata";
-import compose from "koa-compose";
-import { HANDLER_WITH_META, validateFunction } from "./utils";
-function Api(...args) {
-  const handler = args.pop();
-  validateFunction(handler, "Apihandler");
-  const operators = args;
-  const metadataHelper = {
-    getMetadata(key) {
-      return Reflect.getMetadata(key, runner);
-    },
-    setMetadata(key, value) {
-      return Reflect.defineMetadata(key, value, runner);
-    }
-  };
-  for (const operator of operators) {
-    if (operator.metadata) {
-      operator.metadata(metadataHelper);
-    }
-  }
-  const validateHandlers = operators.filter((operator) => operator.validate).map((operator) => operator.validate);
-  const pipeHandlers = operators.filter((operator) => operator.execute).map((operator) => operator.execute);
-  async function runner(inputs) {
-    const executeHelper = {
-      result: null,
-      get inputs() {
-        return inputs;
-      },
-      set inputs(val) {
-        inputs = val;
-      }
-    };
-    const stack = [
-      ...validateHandlers,
-      ...pipeHandlers
-    ];
-    stack.push(async (helper, next) => {
-      const res = await handler(helper.inputs);
-      helper.result = res;
-      return next();
-    });
-    await compose(stack)(executeHelper);
-    return executeHelper.result;
-  }
-  runner[HANDLER_WITH_META] = true;
-  return runner;
-}
-export {
-  Api
-};

package/dist/esm/client/generateClient.js

@@ -1,60 +0,0 @@
-import { ApiRouter } from "../router";
-import { Err, Ok } from "./result";
-const DEFAULT_CLIENT_REQUEST_CREATOR = "@modern-js/create-request";
-const INNER_CLIENT_REQUEST_CREATOR = "@modern-js/plugin-bff/runtime/create-request";
-const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix, port, target, requestCreator, fetcher, requireResolve = require.resolve, httpMethodDecider, domain }) => {
-  requestCreator = requestCreator || INNER_CLIENT_REQUEST_CREATOR;
-  const apiRouter = new ApiRouter({
-    appDir,
-    apiDir,
-    lambdaDir,
-    prefix,
-    httpMethodDecider
-  });
-  const handlerInfos = await apiRouter.getSingleModuleHandlers(resourcePath);
-  if (!handlerInfos) {
-    return Err(`generate client error: Cannot require module ${resourcePath}`);
-  }
-  let handlersCode = "";
-  for (const handlerInfo of handlerInfos) {
-    const { name, httpMethod, routePath, action } = handlerInfo;
-    let exportStatement = `var ${name} =`;
-    if (name.toLowerCase() === "default") {
-      exportStatement = "default";
-    }
-    const upperHttpMethod = httpMethod.toUpperCase();
-    const routeName = routePath;
-    const requestId = target === "bundle" ? process.env.npm_package_name : void 0;
-    if (action === "upload") {
-      const requestOptions = {
-        path: routeName,
-        domain,
-        requestId
-      };
-      handlersCode += `export ${exportStatement} createUploader(${JSON.stringify(requestOptions)});`;
-    } else {
-      const portValue = target === "server" ? `process.env.PORT || ${String(port)}` : String(port);
-      const optionsStr = `{
-        path: '${routeName}',
-        method: '${upperHttpMethod}',
-        port: ${portValue},
-        httpMethodDecider: '${httpMethodDecider || "functionName"}'
-        ${domain ? `, domain: '${domain}'` : ""}
-        ${fetcher ? ", fetch: 'fetch'" : ""}
-        ${requestId ? `, requestId: '${requestId}'` : ""}
-      }`.replace(/\n\s*/g, "");
-      handlersCode += `export ${exportStatement} createRequest(${optionsStr});
-      `;
-    }
-  }
-  const importCode = `import { createRequest${handlerInfos.find((i) => i.action === "upload") ? ", createUploader" : ""} } from '${requestCreator}';
-${fetcher ? `import { fetch } from '${fetcher}';
-` : ""}`;
-  return Ok(`${importCode}
-${handlersCode}`);
-};
-export {
-  DEFAULT_CLIENT_REQUEST_CREATOR,
-  INNER_CLIENT_REQUEST_CREATOR,
-  generateClient
-};

package/dist/esm/client/result.js

@@ -1,22 +0,0 @@
-const Err = (value) => {
-  const err = {
-    kind: "Err",
-    value,
-    isErr: true,
-    isOk: false
-  };
-  return err;
-};
-const Ok = (value) => {
-  const ok = {
-    kind: "Ok",
-    value,
-    isErr: false,
-    isOk: true
-  };
-  return ok;
-};
-export {
-  Err,
-  Ok
-};

package/dist/esm/errors/http.js

@@ -1,16 +0,0 @@
-class HttpError extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-}
-class ValidationError extends HttpError {
-  constructor(status, message) {
-    super(status, message);
-    this.code = "VALIDATION_ERROR";
-  }
-}
-export {
-  HttpError,
-  ValidationError
-};

package/dist/esm/index.js

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

package/dist/esm/operators/http.js

@@ -1,178 +0,0 @@
-import { ValidationError } from "../errors/http";
-import { HttpMetadata, HttpMethod, OperatorType, ResponseMetaType, TriggerType } from "../types";
-const validateInput = async (schema, input) => {
-  try {
-    return await schema.parseAsync(input);
-  } catch (error) {
-    if ("name" in error && error.name === "ZodError") {
-      throw new ValidationError(400, error.message);
-    }
-    throw error;
-  }
-};
-const createHttpOperator = (method) => {
-  return (urlPath) => {
-    return {
-      name: method,
-      metadata({ setMetadata }) {
-        setMetadata(OperatorType.Trigger, {
-          type: TriggerType.Http,
-          path: urlPath,
-          method
-        });
-      }
-    };
-  };
-};
-const Get = createHttpOperator(HttpMethod.Get);
-const Post = createHttpOperator(HttpMethod.Post);
-const Put = createHttpOperator(HttpMethod.Put);
-const Delete = createHttpOperator(HttpMethod.Delete);
-const Connect = createHttpOperator(HttpMethod.Connect);
-const Trace = createHttpOperator(HttpMethod.Trace);
-const Patch = createHttpOperator(HttpMethod.Patch);
-const Options = createHttpOperator(HttpMethod.Options);
-const Head = createHttpOperator(HttpMethod.Head);
-const Data = (schema) => {
-  return {
-    name: HttpMetadata.Data,
-    metadata({ setMetadata }) {
-      setMetadata(HttpMetadata.Data, schema);
-    },
-    async validate(helper, next) {
-      const { inputs: { data } } = helper;
-      helper.inputs = {
-        ...helper.inputs,
-        data: await validateInput(schema, data)
-      };
-      return next();
-    }
-  };
-};
-const Query = (schema) => {
-  return {
-    name: HttpMetadata.Query,
-    metadata({ setMetadata }) {
-      setMetadata(HttpMetadata.Query, schema);
-    },
-    async validate(helper, next) {
-      const { inputs: { query } } = helper;
-      helper.inputs = {
-        ...helper.inputs,
-        query: await validateInput(schema, query)
-      };
-      return next();
-    }
-  };
-};
-const Params = (schema) => {
-  return {
-    name: HttpMetadata.Params,
-    metadata({ setMetadata }) {
-      setMetadata(HttpMetadata.Params, schema);
-    },
-    async validate(helper, next) {
-      const { inputs: { params } } = helper;
-      helper.inputs = {
-        ...helper.inputs,
-        params: await validateInput(schema, params)
-      };
-      return next();
-    }
-  };
-};
-const Headers = (schema) => {
-  return {
-    name: HttpMetadata.Headers,
-    metadata({ setMetadata }) {
-      setMetadata(HttpMetadata.Headers, schema);
-    },
-    async validate(helper, next) {
-      const { inputs: { headers } } = helper;
-      helper.inputs = {
-        ...helper.inputs,
-        headers: await validateInput(schema, headers)
-      };
-      return next();
-    }
-  };
-};
-const setResponseMeta = (helper, type, value) => {
-  const responseMetaData = helper.getMetadata(HttpMetadata.Response) || [];
-  helper.setMetadata(HttpMetadata.Response, [
-    ...responseMetaData,
-    {
-      type,
-      value
-    }
-  ]);
-};
-const HttpCode = (statusCode) => {
-  return {
-    name: "HttpCode",
-    metadata(helper) {
-      setResponseMeta(helper, ResponseMetaType.StatusCode, statusCode);
-    }
-  };
-};
-const SetHeaders = (headers) => {
-  return {
-    name: "SetHeaders",
-    metadata(helper) {
-      setResponseMeta(helper, ResponseMetaType.Headers, headers);
-    }
-  };
-};
-const Redirect = (url) => {
-  return {
-    name: "Redirect",
-    metadata(helper) {
-      setResponseMeta(helper, ResponseMetaType.Redirect, url);
-    }
-  };
-};
-const Upload = (urlPath, schema) => {
-  return {
-    name: "Upload",
-    metadata({ setMetadata }) {
-      setMetadata(OperatorType.Trigger, {
-        type: TriggerType.Http,
-        path: urlPath,
-        method: HttpMethod.Post,
-        action: "upload"
-      });
-      setMetadata(HttpMetadata.Files, schema);
-    },
-    async validate(helper, next) {
-      if (!schema) {
-        return next();
-      }
-      const { inputs: { formData: files } } = helper;
-      helper.inputs = {
-        ...helper.inputs,
-        files: await validateInput(schema, files)
-      };
-      return next();
-    }
-  };
-};
-export {
-  Connect,
-  Data,
-  Delete,
-  Get,
-  Head,
-  Headers,
-  HttpCode,
-  Options,
-  Params,
-  Patch,
-  Post,
-  Put,
-  Query,
-  Redirect,
-  SetHeaders,
-  Trace,
-  Upload,
-  createHttpOperator
-};

package/dist/esm/router/constants.js

@@ -1,32 +0,0 @@
-import { HttpMethod } from "../types";
-const AllHttpMethods = Object.values(HttpMethod);
-var APIMode;
-(function(APIMode2) {
-  APIMode2["FARMEWORK"] = "framework";
-  APIMode2["FUNCTION"] = "function";
-})(APIMode || (APIMode = {}));
-const FRAMEWORK_MODE_LAMBDA_DIR = "lambda";
-const FRAMEWORK_MODE_APP_DIR = "app";
-const INDEX_SUFFIX = "index";
-const API_DIR = "api";
-const API_FILE_RULES = [
-  "**/*.[tj]s",
-  "!**/_*",
-  "!**/_*/**/*.[tj]s",
-  "!**/*.test.js",
-  "!**/*.test.ts",
-  "!**/*.d.ts",
-  "!__test__/*.ts",
-  "!__tests__/*.ts",
-  "!node_modules/**",
-  "!bootstrap.jsx"
-];
-export {
-  APIMode,
-  API_DIR,
-  API_FILE_RULES,
-  AllHttpMethods,
-  FRAMEWORK_MODE_APP_DIR,
-  FRAMEWORK_MODE_LAMBDA_DIR,
-  INDEX_SUFFIX
-};