@modern-js/bff-core 1.0.1-beta.3 → 1.0.1-beta.6

package/dist/js/modern/errors/http.js

@@ -10,4 +10,13 @@ export class HttpError extends Error {
   }
 
 }
-export class ValidationError extends HttpError {}
+export class ValidationError extends HttpError {
+  constructor(status, message) {
+    super(status, message);
+
+    _defineProperty(this, "code", void 0);
+
+    this.code = 'VALIDATION_ERROR';
+  }
+
+}

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

@@ -1,4 +1,3 @@
-import { z } from 'zod';
 import { HttpMetadata, OperatorType, HttpMethod, TriggerType, ResponseMetaType } from "../types";
 import { ValidationError } from "../errors/http";
 
@@ -6,7 +5,11 @@ const validateInput = async (schema, input) => {
   try {
     await schema.parseAsync(input);
   } catch (error) {
-    if (error instanceof z.ZodError) {
+    const {
+      z: zod
+    } = require('zod');
+
+    if (error instanceof zod.ZodError) {
       throw new ValidationError(400, error.message);
     }
 

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

@@ -3,7 +3,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import path from 'path';
 import { fs, logger } from '@modern-js/utils';
 import 'reflect-metadata';
-import 'esbuild-register';
 import { HttpMethod, httpMethods, OperatorType, TriggerType } from "../types";
 import { debug } from "../utils";
 import { APIMode, FRAMEWORK_MODE_LAMBDA_DIR, API_FILE_RULES } from "./constants";

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

@@ -41,7 +41,16 @@ export const isHandler = input => input && typeof input === 'function';
 const isFunction = input => input && {}.toString.call(input) === '[object Function]';
 
 export const requireHandlerModule = modulePath => {
-  const module = require(modulePath);
+  const {
+    register
+  } = require('esbuild-register/dist/node');
+
+  const {
+    unregister
+  } = register({}); // 测试环境不走缓存，因为缓存的 handler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
+
+  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
+  const module = originRequire(modulePath);
 
   if (isFunction(module)) {
     return {
@@ -49,15 +58,20 @@ export const requireHandlerModule = modulePath => {
     };
   }
 
+  unregister();
   return module;
 };
+
+const routeValue = routePath => {
+  if (routePath.includes(':')) {
+    return 11;
+  }
+
+  return 1;
+};
+
 export const sortRoutes = apiHandlers => {
-  const sortedHandlers = apiHandlers.slice();
-  sortedHandlers.forEach((apiHandler, handlerIndex) => {
-    if (apiHandler.routeName.includes(':')) {
-      sortedHandlers.splice(handlerIndex, 1);
-      sortedHandlers.push(apiHandler);
-    }
+  return apiHandlers.sort((handlerA, handlerB) => {
+    return routeValue(handlerA.routeName) - routeValue(handlerB.routeName);
   });
-  return sortedHandlers;
 };

package/dist/js/node/errors/http.js

@@ -20,6 +20,15 @@ class HttpError extends Error {
 
 exports.HttpError = HttpError;
 
-class ValidationError extends HttpError {}
+class ValidationError extends HttpError {
+  constructor(status, message) {
+    super(status, message);
+
+    _defineProperty(this, "code", void 0);
+
+    this.code = 'VALIDATION_ERROR';
+  }
+
+}
 
 exports.ValidationError = ValidationError;

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createHttpOperator = exports.Trace = exports.SetHeaders = exports.Redirect = exports.Query = exports.Put = exports.Post = exports.Patch = exports.Params = exports.Option = exports.Middleware = exports.HttpCode = exports.Headers = exports.Head = exports.Get = exports.Delete = exports.Data = exports.Connect = void 0;
 
-var _zod = require("zod");
-
 var _types = require("../types");
 
 var _http = require("../errors/http");
@@ -15,7 +13,11 @@ const validateInput = async (schema, input) => {
   try {
     await schema.parseAsync(input);
   } catch (error) {
-    if (error instanceof _zod.z.ZodError) {
+    const {
+      z: zod
+    } = require('zod');
+
+    if (error instanceof zod.ZodError) {
       throw new _http.ValidationError(400, error.message);
     }
 

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

@@ -14,8 +14,6 @@ var _utils = require("@modern-js/utils");
 
 require("reflect-metadata");
 
-require("esbuild-register");
-
 var _types = require("../types");
 
 var _utils2 = require("../utils");

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

@@ -60,7 +60,16 @@ exports.isHandler = isHandler;
 const isFunction = input => input && {}.toString.call(input) === '[object Function]';
 
 const requireHandlerModule = modulePath => {
-  const module = require(modulePath);
+  const {
+    register
+  } = require('esbuild-register/dist/node');
+
+  const {
+    unregister
+  } = register({}); // 测试环境不走缓存，因为缓存的 handler 文件，会被 mockAPI 函数进行 mock，升级 jest28，setupFilesAfterEnv 能做异步操作的话，可解此问题
+
+  const originRequire = process.env.NODE_ENV === 'test' ? jest.requireActual : require;
+  const module = originRequire(modulePath);
 
   if (isFunction(module)) {
     return {
@@ -68,20 +77,24 @@ const requireHandlerModule = modulePath => {
     };
   }
 
+  unregister();
   return module;
 };
 
 exports.requireHandlerModule = requireHandlerModule;
 
+const routeValue = routePath => {
+  if (routePath.includes(':')) {
+    return 11;
+  }
+
+  return 1;
+};
+
 const sortRoutes = apiHandlers => {
-  const sortedHandlers = apiHandlers.slice();
-  sortedHandlers.forEach((apiHandler, handlerIndex) => {
-    if (apiHandler.routeName.includes(':')) {
-      sortedHandlers.splice(handlerIndex, 1);
-      sortedHandlers.push(apiHandler);
-    }
+  return apiHandlers.sort((handlerA, handlerB) => {
+    return routeValue(handlerA.routeName) - routeValue(handlerB.routeName);
   });
-  return sortedHandlers;
 };
 
 exports.sortRoutes = sortRoutes;

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

@@ -1,15 +1,15 @@
-export declare type Err<T = any> = {
+export declare type Err<T = unknown> = {
   kind: 'Err';
   value: T;
   isErr: true;
   isOk: false;
 };
-export declare type Ok<T = any> = {
+export declare type Ok<T = unknown> = {
   kind: 'Ok';
   value: T;
   isErr: false;
   isOk: true;
 };
-export declare type Result<T = any, E = string> = Err<E> | Ok<T>;
+export declare 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>;

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

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

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

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import type { z } from 'zod';
 import { Operator, HttpMethod, ApiMiddleware, ResponseMetaType } from '../types';
 export interface ResponseMeta {
   type: ResponseMetaType;

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

@@ -1,5 +1,4 @@
 import 'reflect-metadata';
-import 'esbuild-register';
 import { HttpMethod } from '../types';
 import { ApiHandler, APIHandlerInfo } from './types';
 export * from './types';

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

@@ -1,9 +1,10 @@
-import { MaybeAsync } from '@modern-js/bff-runtime';
 import { APIHandlerInfo } from './types';
+declare type MaybeAsync<I> = I | Promise<I>;
 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 sortRoutes: (apiHandlers: APIHandlerInfo[]) => APIHandlerInfo[];
+export declare const sortRoutes: (apiHandlers: APIHandlerInfo[]) => APIHandlerInfo[];
+export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1-beta.3",
+  "version": "1.0.1-beta.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,7 +29,6 @@
     "@modern-js/utils": "^1.7.6",
     "esbuild": "^0.14.38",
     "esbuild-register": "^3.3.3",
-    "http-errors": "^2.0.0",
     "koa-compose": "^4.1.0",
     "reflect-metadata": "^0.1.13"
   },

package/CHANGELOG.md

@@ -1,224 +0,0 @@
-# @modern-js/adapter-helpers
-
-## 1.2.4
-
-### Patch Changes
-
-- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
-
-## 1.2.3
-
-### Patch Changes
-
-- 6cffe99d: chore:
-  remove react eslint rules for `modern-js` rule set.
-  add .eslintrc for each package to speed up linting
-- 60f7d8bf: feat: add tests dir to npmignore
-- befd9e5b: fix: compatible with babel-plugin-resolver's handling of relative paths on windows
-- 3bf4f8b0: feat: support start api server only
-
-## 1.2.2
-
-### Patch Changes
-
-- 55e18278: chore: remove unused dependencies and devDependencies
-
-## 1.2.1
-
-### Patch Changes
-
-- 83166714: change .npmignore
-
-## 1.2.0
-
-### Minor Changes
-
-- cfe11628: Make Modern.js self bootstraping
-
-## 1.1.1
-
-### Patch Changes
-
-- 0fa83663: support more .env files
-
-## 1.1.0
-
-### Minor Changes
-
-- 96119db2: Relese v1.1.0
-
-## 1.0.0
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 0fd196e: feat: fix bugs
-- 204c626: feat: initial
-- 63be0a5: fix: #118 #104
-
-## 1.0.0-rc.23
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 0fd196e: feat: fix bugs
-- 204c626: feat: initial
-- 63be0a5: fix: #118 #104
-
-## 1.0.0-rc.22
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 0fd196e: feat: fix bugs
-- 204c626: feat: initial
-- 63be0a5: fix: #118 #104
-
-## 1.0.0-rc.21
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 0fd196e: feat: fix bugs
-- 204c626: feat: initial
-- 63be0a5: fix: #118 #104
-
-## 1.0.0-rc.20
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- feat: fix bugs
-- 204c626: feat: initial
-- 63be0a5: fix: #118 #104
-
-## 1.0.0-rc.19
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 204c626: feat: initial
-- 63be0a5: fix: #118 #104
-
-## 1.0.0-rc.18
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 204c626: feat: initial
-- 63be0a5: fix: #118 #104
-
-## 1.0.0-rc.17
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 204c626: feat: initial
-- fix: #118 #104
-
-## 1.0.0-rc.16
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 204c626: feat: initial
-
-## 1.0.0-rc.15
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 30ac27c: feat: add generator package description
-- 204c626: feat: initial
-
-## 1.0.0-rc.14
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.13
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.12
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.11
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.10
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.9
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.8
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.7
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.6
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.5
-
-### Patch Changes
-
-- 224f7fe: fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.4
-
-### Patch Changes
-
-- fix server route match
-- 204c626: feat: initial
-
-## 1.0.0-rc.3
-
-### Patch Changes
-
-- feat: initial