@modern-js/bff-core 1.0.1-beta.4 → 1.0.1-beta.7

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/utils.js

@@ -38,17 +38,30 @@ const clearRouteName = routeName => {
 
 export const isHandler = input => input && typeof input === 'function';
 
-const isFunction = input => input && {}.toString.call(input) === '[object Function]';
+const enableRegister = requireFn => {
+  return modulePath => {
+    // eslint-disable-next-line node/no-deprecated-api
+    if (!require.extensions['.ts']) {
+      const {
+        register
+      } = require('esbuild-register/dist/node');
 
-export const requireHandlerModule = modulePath => {
-  const {
-    register
-  } = require('esbuild-register/dist/node');
+      const {
+        unregister
+      } = register({});
+      const requiredModule = requireFn(modulePath);
+      unregister();
+      return requiredModule;
+    }
 
-  const {
-    unregister
-  } = register({});
+    const requiredModule = requireFn(modulePath);
+    return requiredModule;
+  };
+};
+
+const isFunction = input => input && {}.toString.call(input) === '[object Function]';
 
+export const requireHandlerModule = enableRegister(modulePath => {
   const module = require(modulePath);
 
   if (isFunction(module)) {
@@ -57,16 +70,19 @@ 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/utils.js

@@ -57,17 +57,30 @@ const isHandler = input => input && typeof input === 'function';
 
 exports.isHandler = isHandler;
 
-const isFunction = input => input && {}.toString.call(input) === '[object Function]';
+const enableRegister = requireFn => {
+  return modulePath => {
+    // eslint-disable-next-line node/no-deprecated-api
+    if (!require.extensions['.ts']) {
+      const {
+        register
+      } = require('esbuild-register/dist/node');
+
+      const {
+        unregister
+      } = register({});
+      const requiredModule = requireFn(modulePath);
+      unregister();
+      return requiredModule;
+    }
 
-const requireHandlerModule = modulePath => {
-  const {
-    register
-  } = require('esbuild-register/dist/node');
+    const requiredModule = requireFn(modulePath);
+    return requiredModule;
+  };
+};
 
-  const {
-    unregister
-  } = register({});
+const isFunction = input => input && {}.toString.call(input) === '[object Function]';
 
+const requireHandlerModule = enableRegister(modulePath => {
   const module = require(modulePath);
 
   if (isFunction(module)) {
@@ -76,21 +89,22 @@ 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/utils.d.ts

@@ -1,10 +1,10 @@
-import { APIHandlerInfo } from './types';
+import { APIHandlerInfo, HandlerModule } 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 requireHandlerModule: (modulePath: string) => HandlerModule;
 export declare const sortRoutes: (apiHandlers: APIHandlerInfo[]) => APIHandlerInfo[];
 export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1-beta.4",
+  "version": "1.0.1-beta.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -24,12 +24,11 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
+    "@babel/runtime": "^7.18.0",
     "@modern-js/bff-runtime": "^1.2.3",
     "@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"
   },