@modern-js/bff-core 1.0.1-beta.0 → 1.0.1-beta.1

package/dist/js/modern/operators/http.js

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { HttpMetadata, OperatorType, HttpMethod, TriggerType } from "../types";
+import { HttpMetadata, OperatorType, HttpMethod, TriggerType, ResponseMetaType } from "../types";
 import { ValidationError } from "../errors/http";
 
 const validateInput = async (schema, input) => {
@@ -133,14 +133,21 @@ export const Headers = schema => {
 
   };
 };
+
+const setResponseMeta = (helper, type, value) => {
+  const responseMetaData = helper.getMetadata(HttpMetadata.Response) || [];
+  helper.setMetadata(HttpMetadata.Response, [...responseMetaData, {
+    type,
+    value
+  }]);
+};
+
 export const HttpCode = statusCode => {
   return {
     name: 'HttpCode',
 
-    metadata({
-      setMetadata
-    }) {
-      setMetadata(HttpMetadata.StatusCode, statusCode);
+    metadata(helper) {
+      setResponseMeta(helper, ResponseMetaType.StatusCode, statusCode);
     }
 
   };
@@ -149,10 +156,8 @@ export const SetHeaders = headers => {
   return {
     name: 'SetHeaders',
 
-    metadata({
-      setMetadata
-    }) {
-      setMetadata(HttpMetadata.ResponseHeaders, headers);
+    metadata(helper) {
+      setResponseMeta(helper, ResponseMetaType.Headers, headers);
     }
 
   };
@@ -161,10 +166,8 @@ export const Redirect = url => {
   return {
     name: 'Redirect',
 
-    metadata({
-      setMetadata
-    }) {
-      setMetadata(HttpMetadata.Redirect, url);
+    metadata(helper) {
+      setResponseMeta(helper, ResponseMetaType.Redirect, url);
     }
 
   };

package/dist/js/modern/router/index.js

@@ -6,7 +6,8 @@ import 'reflect-metadata';
 import 'esbuild-register';
 import { HttpMethod, httpMethods, OperatorType, TriggerType } from "../types";
 import { APIMode, FRAMEWORK_MODE_LAMBDA_DIR, API_FILE_RULES } from "./constants";
-import { getFiles, getPathFromFilename, requireHandlerModule } from "./utils";
+import { getFiles, getPathFromFilename, requireHandlerModule, sortRoutes } from "./utils";
+import { debug } from 'console';
 export * from "./types";
 export * from "./constants";
 export class ApiRouter {
@@ -109,7 +110,8 @@ export class ApiRouter {
         apiHandlers = apiHandlers.concat(handlerInfos);
       }
     });
-    return apiHandlers;
+    const sortedHandlers = sortRoutes(apiHandlers);
+    return sortedHandlers;
   }
 
   getModuleHandlerInfos(moduleInfo) {
@@ -265,7 +267,9 @@ export class ApiRouter {
   getApiHandlers() {
     const filenames = this.getApiFiles();
     const moduleInfos = this.getModuleInfos(filenames);
-    return this.getHandlerInfos(moduleInfos);
+    const apiHandlers = this.getHandlerInfos(moduleInfos);
+    debug('apiHandlers', apiHandlers);
+    return apiHandlers;
   }
 
 }

package/dist/js/modern/router/utils.js

@@ -50,4 +50,14 @@ export const requireHandlerModule = modulePath => {
   }
 
   return module;
+};
+export const sortRoutes = apiHandlers => {
+  const sortedHandlers = apiHandlers.slice();
+  sortedHandlers.forEach((apiHandler, handlerIndex) => {
+    if (apiHandler.routeName.includes(':')) {
+      sortedHandlers.splice(handlerIndex, 1);
+      sortedHandlers.push(apiHandler);
+    }
+  });
+  return sortedHandlers;
 };

package/dist/js/modern/types.js

@@ -20,11 +20,16 @@ export let HttpMetadata;
   HttpMetadata["Params"] = "PARAMS";
   HttpMetadata["Headers"] = "HEADERS";
   HttpMetadata["Response"] = "RESPONSE";
-  HttpMetadata["StatusCode"] = "STATUS_CODE";
-  HttpMetadata["Redirect"] = "REDIRECT";
-  HttpMetadata["ResponseHeaders"] = "RESPONSE_HEADERS";
 })(HttpMetadata || (HttpMetadata = {}));
 
+export let ResponseMetaType;
+
+(function (ResponseMetaType) {
+  ResponseMetaType[ResponseMetaType["StatusCode"] = 0] = "StatusCode";
+  ResponseMetaType[ResponseMetaType["Redirect"] = 1] = "Redirect";
+  ResponseMetaType[ResponseMetaType["Headers"] = 2] = "Headers";
+})(ResponseMetaType || (ResponseMetaType = {}));
+
 export let HttpMethod;
 
 (function (HttpMethod) {

package/dist/js/modern/utils.js

@@ -1,5 +1,7 @@
 import util from 'util';
-export const HANDLER_WITH_META = 'HANDLER_WITH_SCHEMA'; // export const pick = <T extends Record<string, unknown>, K extends keyof T>(
+import { createDebugger } from '@modern-js/utils';
+export const HANDLER_WITH_META = 'HANDLER_WITH_META';
+export const debug = createDebugger('bff'); // export const pick = <T extends Record<string, unknown>, K extends keyof T>(
 //   obj: T,
 //   keys: readonly K[],
 // ) => {

package/dist/js/node/operators/http.js

@@ -166,14 +166,20 @@ const Headers = schema => {
 
 exports.Headers = Headers;
 
+const setResponseMeta = (helper, type, value) => {
+  const responseMetaData = helper.getMetadata(_types.HttpMetadata.Response) || [];
+  helper.setMetadata(_types.HttpMetadata.Response, [...responseMetaData, {
+    type,
+    value
+  }]);
+};
+
 const HttpCode = statusCode => {
   return {
     name: 'HttpCode',
 
-    metadata({
-      setMetadata
-    }) {
-      setMetadata(_types.HttpMetadata.StatusCode, statusCode);
+    metadata(helper) {
+      setResponseMeta(helper, _types.ResponseMetaType.StatusCode, statusCode);
     }
 
   };
@@ -185,10 +191,8 @@ const SetHeaders = headers => {
   return {
     name: 'SetHeaders',
 
-    metadata({
-      setMetadata
-    }) {
-      setMetadata(_types.HttpMetadata.ResponseHeaders, headers);
+    metadata(helper) {
+      setResponseMeta(helper, _types.ResponseMetaType.Headers, headers);
     }
 
   };
@@ -200,10 +204,8 @@ const Redirect = url => {
   return {
     name: 'Redirect',
 
-    metadata({
-      setMetadata
-    }) {
-      setMetadata(_types.HttpMetadata.Redirect, url);
+    metadata(helper) {
+      setResponseMeta(helper, _types.ResponseMetaType.Redirect, url);
     }
 
   };

package/dist/js/node/router/index.js

@@ -34,6 +34,8 @@ Object.keys(_constants).forEach(function (key) {
 
 var _utils2 = require("./utils");
 
+var _console = require("console");
+
 var _types2 = require("./types");
 
 Object.keys(_types2).forEach(function (key) {
@@ -152,7 +154,8 @@ class ApiRouter {
         apiHandlers = apiHandlers.concat(handlerInfos);
       }
     });
-    return apiHandlers;
+    const sortedHandlers = (0, _utils2.sortRoutes)(apiHandlers);
+    return sortedHandlers;
   }
 
   getModuleHandlerInfos(moduleInfo) {
@@ -309,7 +312,9 @@ class ApiRouter {
   getApiHandlers() {
     const filenames = this.getApiFiles();
     const moduleInfos = this.getModuleInfos(filenames);
-    return this.getHandlerInfos(moduleInfos);
+    const apiHandlers = this.getHandlerInfos(moduleInfos);
+    (0, _console.debug)('apiHandlers', apiHandlers);
+    return apiHandlers;
   }
 
 }

package/dist/js/node/router/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.requireHandlerModule = exports.isHandler = exports.getPathFromFilename = exports.getFiles = void 0;
+exports.sortRoutes = exports.requireHandlerModule = exports.isHandler = exports.getPathFromFilename = exports.getFiles = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -71,4 +71,17 @@ const requireHandlerModule = modulePath => {
   return module;
 };
 
-exports.requireHandlerModule = requireHandlerModule;
+exports.requireHandlerModule = requireHandlerModule;
+
+const sortRoutes = apiHandlers => {
+  const sortedHandlers = apiHandlers.slice();
+  sortedHandlers.forEach((apiHandler, handlerIndex) => {
+    if (apiHandler.routeName.includes(':')) {
+      sortedHandlers.splice(handlerIndex, 1);
+      sortedHandlers.push(apiHandler);
+    }
+  });
+  return sortedHandlers;
+};
+
+exports.sortRoutes = sortRoutes;

package/dist/js/node/types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.httpMethods = exports.TriggerType = exports.OperatorType = exports.HttpMethod = exports.HttpMetadata = void 0;
+exports.httpMethods = exports.TriggerType = exports.ResponseMetaType = exports.OperatorType = exports.HttpMethod = exports.HttpMetadata = void 0;
 let OperatorType;
 exports.OperatorType = OperatorType;
 
@@ -29,11 +29,17 @@ exports.HttpMetadata = HttpMetadata;
   HttpMetadata["Params"] = "PARAMS";
   HttpMetadata["Headers"] = "HEADERS";
   HttpMetadata["Response"] = "RESPONSE";
-  HttpMetadata["StatusCode"] = "STATUS_CODE";
-  HttpMetadata["Redirect"] = "REDIRECT";
-  HttpMetadata["ResponseHeaders"] = "RESPONSE_HEADERS";
 })(HttpMetadata || (exports.HttpMetadata = HttpMetadata = {}));
 
+let ResponseMetaType;
+exports.ResponseMetaType = ResponseMetaType;
+
+(function (ResponseMetaType) {
+  ResponseMetaType[ResponseMetaType["StatusCode"] = 0] = "StatusCode";
+  ResponseMetaType[ResponseMetaType["Redirect"] = 1] = "Redirect";
+  ResponseMetaType[ResponseMetaType["Headers"] = 2] = "Headers";
+})(ResponseMetaType || (exports.ResponseMetaType = ResponseMetaType = {}));
+
 let HttpMethod;
 exports.HttpMethod = HttpMethod;
 

package/dist/js/node/utils.js

@@ -3,13 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateFunction = exports.isWithMetaHandler = exports.getTypeErrorMessage = exports.HANDLER_WITH_META = exports.ERR_INVALID_ARG_TYPE = void 0;
+exports.validateFunction = exports.isWithMetaHandler = exports.getTypeErrorMessage = exports.debug = exports.HANDLER_WITH_META = exports.ERR_INVALID_ARG_TYPE = void 0;
 
 var _util = _interopRequireDefault(require("util"));
 
+var _utils = require("@modern-js/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const HANDLER_WITH_META = 'HANDLER_WITH_SCHEMA'; // export const pick = <T extends Record<string, unknown>, K extends keyof T>(
+const HANDLER_WITH_META = 'HANDLER_WITH_META';
+exports.HANDLER_WITH_META = HANDLER_WITH_META;
+const debug = (0, _utils.createDebugger)('bff'); // export const pick = <T extends Record<string, unknown>, K extends keyof T>(
 //   obj: T,
 //   keys: readonly K[],
 // ) => {
@@ -19,7 +23,7 @@ const HANDLER_WITH_META = 'HANDLER_WITH_SCHEMA'; // export const pick = <T exten
 // };
 // fork from https://github.com/nodejs/node/blob/master/lib/internal/errors.js
 
-exports.HANDLER_WITH_META = HANDLER_WITH_META;
+exports.debug = debug;
 
 const getTypeErrorMessage = actual => {
   let msg = '';

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

@@ -1,5 +1,9 @@
 import { z } from 'zod';
-import { Operator, HttpMethod, ApiMiddleware } from '../types';
+import { Operator, HttpMethod, ApiMiddleware, ResponseMetaType } from '../types';
+export interface ResponseMeta {
+  type: ResponseMetaType;
+  value: unknown;
+}
 export declare const createHttpOperator: (method: HttpMethod) => (urlPath: string) => Operator<void>;
 export declare const Get: (urlPath: string) => Operator<void>;
 export declare const Post: (urlPath: string) => Operator<void>;

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

@@ -1,7 +1,9 @@
 import { MaybeAsync } from '@modern-js/bff-runtime';
+import { APIHandlerInfo } from './types';
 export declare type NormalHandler = (...args: any[]) => any;
 export declare type Handler<I, O> = (input: I) => MaybeAsync<O>;
 export declare const getFiles: (lambdaDir: string, rules: string | string[]) => string[];
 export declare const getPathFromFilename: (baseDir: string, filename: string) => string;
 export declare const isHandler: (input: any) => input is Handler<any, any>;
-export declare const requireHandlerModule: (modulePath: string) => any;
+export declare const requireHandlerModule: (modulePath: string) => any;
+export declare const sortRoutes: (apiHandlers: APIHandlerInfo[]) => APIHandlerInfo[];

package/dist/types/types.d.ts

@@ -13,9 +13,11 @@ export declare enum HttpMetadata {
   Params = "PARAMS",
   Headers = "HEADERS",
   Response = "RESPONSE",
-  StatusCode = "STATUS_CODE",
-  Redirect = "REDIRECT",
-  ResponseHeaders = "RESPONSE_HEADERS",
+}
+export declare enum ResponseMetaType {
+  StatusCode = 0,
+  Redirect = 1,
+  Headers = 2,
 }
 export declare enum HttpMethod {
   Get = "GET",

package/dist/types/utils.d.ts

@@ -1,4 +1,5 @@
-export declare const HANDLER_WITH_META = "HANDLER_WITH_SCHEMA";
+export declare const HANDLER_WITH_META = "HANDLER_WITH_META";
+export declare const debug: import("@modern-js/utils/compiled/debug").Debugger;
 export declare const getTypeErrorMessage: (actual: unknown) => string;
 export declare class ERR_INVALID_ARG_TYPE extends Error {
   constructor(funcName: string, expectedType: string, actual: unknown);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1-beta.0",
+  "version": "1.0.1-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",