@modern-js/bff-core 2.60.5 → 2.61.0

package/dist/cjs/client/generateClient.js

@@ -60,14 +60,16 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
   }
   let handlersCode = "";
   for (const handlerInfo of handlerInfos) {
-    const { name, httpMethod, routePath } = handlerInfo;
+    const { name, httpMethod, routePath, action } = handlerInfo;
     let exportStatement = `var ${name} =`;
     if (name.toLowerCase() === "default") {
       exportStatement = "default";
     }
     const upperHttpMethod = httpMethod.toUpperCase();
     const routeName = routePath;
-    if (target === "server") {
+    if (action) {
+      handlersCode += `export ${exportStatement} createUploader('${routeName}');`;
+    } else if (target === "server") {
       handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', process.env.PORT || ${String(port)}, '${httpMethodDecider ? httpMethodDecider : "functionName"}' ${fetcher ? `, fetch` : ""});
       `;
     } else {
@@ -75,7 +77,7 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
       `;
     }
   }
-  const importCode = `import { createRequest } from '${requestCreator}';
+  const importCode = `import { createRequest${handlerInfos.find((i) => i.action) ? ", createUploader" : ""} } from '${requestCreator}';
 ${fetcher ? `import { fetch } from '${fetcher}';
 ` : ""}`;
   return (0, import_result.Ok)(`${importCode}

package/dist/cjs/operators/http.js

@@ -34,6 +34,7 @@ __export(http_exports, {
   Redirect: () => Redirect,
   SetHeaders: () => SetHeaders,
   Trace: () => Trace,
+  Upload: () => Upload,
   createHttpOperator: () => createHttpOperator
 });
 module.exports = __toCommonJS(http_exports);
@@ -170,6 +171,31 @@ const Redirect = (url) => {
     }
   };
 };
+const Upload = (urlPath, schema) => {
+  return {
+    name: "Upload",
+    metadata({ setMetadata }) {
+      setMetadata(import_types.OperatorType.Trigger, {
+        type: import_types.TriggerType.Http,
+        path: urlPath,
+        method: import_types.HttpMethod.Post,
+        action: "upload"
+      });
+      setMetadata(import_types.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();
+    }
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Connect,
@@ -188,5 +214,6 @@ const Redirect = (url) => {
   Redirect,
   SetHeaders,
   Trace,
+  Upload,
   createHttpOperator
 });

package/dist/cjs/router/index.js

@@ -67,15 +67,20 @@ class ApiRouter {
   getHandlerInfo(filename, originFuncName, handler) {
     const httpMethod = this.getHttpMethod(originFuncName, handler);
     const routeName = this.getRouteName(filename, handler);
+    const action = this.getAction(handler);
+    const responseObj = {
+      handler,
+      name: originFuncName,
+      httpMethod,
+      routeName,
+      filename,
+      routePath: this.getRoutePath(this.prefix, routeName)
+    };
+    if (action) {
+      responseObj.action = action;
+    }
     if (httpMethod && routeName) {
-      return {
-        handler,
-        name: originFuncName,
-        httpMethod,
-        routeName,
-        filename,
-        routePath: this.getRoutePath(this.prefix, routeName)
-      };
+      return responseObj;
     }
     return null;
   }
@@ -151,6 +156,14 @@ class ApiRouter {
       return import_types.HttpMethod.Get;
     }
   }
+  getAction(handler) {
+    if (handler) {
+      const trigger = Reflect.getMetadata(import_types.OperatorType.Trigger, handler);
+      if (trigger === null || trigger === void 0 ? void 0 : trigger.action) {
+        return trigger.action;
+      }
+    }
+  }
   loadApiFiles() {
     if (!this.existLambdaDir) {
       return [];

package/dist/cjs/types.js

@@ -43,6 +43,7 @@ var HttpMetadata;
   HttpMetadata2["Params"] = "PARAMS";
   HttpMetadata2["Headers"] = "HEADERS";
   HttpMetadata2["Response"] = "RESPONSE";
+  HttpMetadata2["Files"] = "Files";
 })(HttpMetadata || (HttpMetadata = {}));
 var ResponseMetaType;
 (function(ResponseMetaType2) {

package/dist/esm/client/generateClient.js

@@ -26,14 +26,16 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
   }
   let handlersCode = "";
   for (const handlerInfo of handlerInfos) {
-    const { name, httpMethod, routePath } = handlerInfo;
+    const { name, httpMethod, routePath, action } = handlerInfo;
     let exportStatement = `var ${name} =`;
     if (name.toLowerCase() === "default") {
       exportStatement = "default";
     }
     const upperHttpMethod = httpMethod.toUpperCase();
     const routeName = routePath;
-    if (target === "server") {
+    if (action) {
+      handlersCode += `export ${exportStatement} createUploader('${routeName}');`;
+    } else if (target === "server") {
       handlersCode += `export ${exportStatement} createRequest('${routeName}', '${upperHttpMethod}', process.env.PORT || ${String(port)}, '${httpMethodDecider ? httpMethodDecider : "functionName"}' ${fetcher ? `, fetch` : ""});
       `;
     } else {
@@ -41,7 +43,7 @@ const generateClient = async ({ appDir, resourcePath, apiDir, lambdaDir, prefix,
       `;
     }
   }
-  const importCode = `import { createRequest } from '${requestCreator}';
+  const importCode = `import { createRequest${handlerInfos.find((i) => i.action) ? ", createUploader" : ""} } from '${requestCreator}';
 ${fetcher ? `import { fetch } from '${fetcher}';
 ` : ""}`;
   return Ok(`${importCode}

package/dist/esm/operators/http.js

@@ -131,6 +131,31 @@ const 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,
@@ -148,5 +173,6 @@ export {
   Redirect,
   SetHeaders,
   Trace,
+  Upload,
   createHttpOperator
 };

package/dist/esm/router/index.js

@@ -33,15 +33,20 @@ class ApiRouter {
   getHandlerInfo(filename, originFuncName, handler) {
     const httpMethod = this.getHttpMethod(originFuncName, handler);
     const routeName = this.getRouteName(filename, handler);
+    const action = this.getAction(handler);
+    const responseObj = {
+      handler,
+      name: originFuncName,
+      httpMethod,
+      routeName,
+      filename,
+      routePath: this.getRoutePath(this.prefix, routeName)
+    };
+    if (action) {
+      responseObj.action = action;
+    }
     if (httpMethod && routeName) {
-      return {
-        handler,
-        name: originFuncName,
-        httpMethod,
-        routeName,
-        filename,
-        routePath: this.getRoutePath(this.prefix, routeName)
-      };
+      return responseObj;
     }
     return null;
   }
@@ -117,6 +122,14 @@ class ApiRouter {
       return HttpMethod.Get;
     }
   }
+  getAction(handler) {
+    if (handler) {
+      const trigger = Reflect.getMetadata(OperatorType.Trigger, handler);
+      if (trigger === null || trigger === void 0 ? void 0 : trigger.action) {
+        return trigger.action;
+      }
+    }
+  }
   loadApiFiles() {
     if (!this.existLambdaDir) {
       return [];

package/dist/esm/types.js

@@ -15,6 +15,7 @@ var HttpMetadata;
   HttpMetadata2["Params"] = "PARAMS";
   HttpMetadata2["Headers"] = "HEADERS";
   HttpMetadata2["Response"] = "RESPONSE";
+  HttpMetadata2["Files"] = "Files";
 })(HttpMetadata || (HttpMetadata = {}));
 var ResponseMetaType;
 (function(ResponseMetaType2) {

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

@@ -37,3 +37,8 @@ export declare const Headers: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>
 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 Upload: <Schema extends z.ZodType<any, z.ZodTypeDef, any>>(urlPath: string, schema?: Schema | undefined) => Operator<{
+    files: z.input<Schema>;
+}, {
+    formData: z.output<Schema>;
+}>;

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

@@ -32,6 +32,7 @@ export declare class ApiRouter {
     getSafeRoutePath(filename: string, handler?: ApiHandler): string;
     getRouteName(filename: string, handler?: ApiHandler): string;
     getHttpMethod(originHandlerName: string, handler?: ApiHandler): HttpMethod | null;
+    getAction(handler?: ApiHandler): string | undefined;
     loadApiFiles(): string[];
     getApiFiles(): string[];
     getApiHandlers(): Promise<APIHandlerInfo[]>;

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

@@ -13,5 +13,6 @@ export type APIHandlerInfo = {
     filename: string;
     routeName: string;
     routePath: string;
+    action?: string;
 };
 export {};

package/dist/types/types.d.ts

@@ -12,7 +12,8 @@ export declare enum HttpMetadata {
     Query = "QUERY",
     Params = "PARAMS",
     Headers = "HEADERS",
-    Response = "RESPONSE"
+    Response = "RESPONSE",
+    Files = "Files"
 }
 export declare enum ResponseMetaType {
     StatusCode = 0,
@@ -30,7 +31,7 @@ export declare enum HttpMethod {
     Options = "OPTIONS",
     Head = "HEAD"
 }
-export type InputSchemaMeata = Extract<HttpMetadata, HttpMetadata.Data | HttpMetadata.Query | HttpMetadata.Headers | HttpMetadata.Params>;
+export type InputSchemaMeata = Extract<HttpMetadata, HttpMetadata.Data | HttpMetadata.Query | HttpMetadata.Headers | HttpMetadata.Params | HttpMetadata.Files>;
 export type ExecuteFunc<Outputs> = (helper: ExecuteHelper<Outputs>, next: () => Promise<any>) => Promise<any>;
 export type ExecuteHelper<Outputs> = {
     result?: any;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.5",
+  "version": "2.61.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -32,7 +32,7 @@
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.1.13",
     "type-fest": "2.15.0",
-    "@modern-js/utils": "2.60.5"
+    "@modern-js/utils": "2.61.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -43,9 +43,9 @@
     "tsconfig-paths": "^4.1.2",
     "typescript": "^5",
     "zod": "^3.22.3",
-    "@modern-js/types": "2.60.5",
-    "@scripts/build": "2.60.5",
-    "@scripts/jest-config": "2.60.5"
+    "@modern-js/types": "2.61.0",
+    "@scripts/jest-config": "2.61.0",
+    "@scripts/build": "2.61.0"
   },
   "peerDependencies": {
     "ts-node": "^10.9.1",