@teambit/express 0.0.864 → 0.0.865

package/dist/express.main.runtime.js

@@ -1,9 +1,9 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.flat-map.js");
+require("core-js/modules/es.array.flat.js");
 require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.array.unscopables.flat-map.js");
+require("core-js/modules/es.array.unscopables.flat.js");
 require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -147,7 +147,15 @@ class ExpressMain {
       return next();
     });
     if (!(options !== null && options !== void 0 && options.disableBodyParser)) this.bodyParser(app);
-    this.middlewareSlot.toArray().flatMap(([, middlewares]) => middlewares.flatMap(middlewareManifest => app.use(middlewareManifest.middleware)));
+    const middlewaresSlot = this.middlewareSlot.values().flat();
+    middlewaresSlot.forEach(({
+      route,
+      middleware
+    }) => {
+      if (!route) app.use(middleware);
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      if (route) app.use(route, middleware);
+    });
     sortedRoutes.forEach(routeInfo => {
       const {
         method,

package/dist/express.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_cli","data","require","_harmony","_logger","_express","_interopRequireDefault","_lodash","_bodyParser","_express2","_middlewares","_types","ExpressMain","constructor","config","moduleSlot","logger","middlewareSlot","listen","port","serverPort","app","createApp","register","routes","registerMiddleware","middlewares","createRootRoutes","namespace","ExpressAspect","id","method","path","disableNamespace","priority","req","res","send","expressApp","options","internalRoutes","createRoutes","allRoutes","concat","sortedRoutes","sortBy","r","reverse","express","use","next","loggerIgnorePath","includes","url","debug","headers","disableBodyParser","bodyParser","toArray","flatMap","middlewareManifest","middleware","forEach","routeInfo","catchErrorsMiddlewares","routesSlots","routeEntries","map","route","flatten","verbValidation","lowerCase","verb","Verb","READ","status","jsonp","message","error","catchErrors","json","limit","raw","type","provider","loggerFactory","routeSlot","createLogger","exports","_defineProperty2","default","MainRuntime","Slot","withType","LoggerAspect","addRuntime"],"sources":["express.main.runtime.ts"],"sourcesContent":["import { MainRuntime } from '@teambit/cli';\nimport { Slot, SlotRegistry } from '@teambit/harmony';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport express, { Express } from 'express';\nimport { concat, flatten, lowerCase, sortBy } from 'lodash';\nimport bodyParser from 'body-parser';\nimport { ExpressAspect } from './express.aspect';\nimport { catchErrors } from './middlewares';\nimport { Middleware, Request, Response, Route, Verb } from './types';\nimport { MiddlewareManifest } from './middleware-manifest';\n\nexport type ExpressConfig = {\n  port: number;\n  namespace: string;\n  loggerIgnorePath: string[];\n};\n\nexport type MiddlewareSlot = SlotRegistry<MiddlewareManifest[]>;\n\nexport type RouteSlot = SlotRegistry<Route[]>;\n\nexport class ExpressMain {\n  static runtime = MainRuntime;\n\n  constructor(\n    /**\n     * extension config\n     */\n    readonly config: ExpressConfig,\n\n    /**\n     * slot for registering graphql modules\n     */\n    private moduleSlot: RouteSlot,\n\n    /**\n     * logger extension.\n     */\n    readonly logger: Logger,\n\n    readonly middlewareSlot: MiddlewareSlot\n  ) {}\n\n  /**\n   * start a express server.\n   */\n  async listen(port?: number) {\n    const serverPort = port || this.config.port;\n    const app = this.createApp();\n    app.listen(serverPort);\n  }\n\n  /**\n   * register a new express routes.\n   * route will be added as `/api/${route}`\n   */\n  register(routes: Route[]) {\n    this.moduleSlot.register(routes);\n    return this;\n  }\n\n  /**\n   * register a new middleware into express.\n   */\n  registerMiddleware(middlewares: MiddlewareManifest[]) {\n    this.middlewareSlot.register(middlewares);\n    return this;\n  }\n\n  private createRootRoutes() {\n    // TODO: @guy refactor health to service aspect.\n    return [\n      {\n        namespace: ExpressAspect.id,\n        method: 'get',\n        path: '/_health',\n        disableNamespace: false,\n        priority: 0,\n        middlewares: [async (req: Request, res: Response) => res.send('ok')],\n      },\n    ];\n  }\n\n  createApp(expressApp?: Express, options?: { disableBodyParser: true }): Express {\n    const internalRoutes = this.createRootRoutes();\n    const routes = this.createRoutes();\n    const allRoutes = concat(routes, internalRoutes);\n    const sortedRoutes = sortBy(allRoutes, (r) => r.priority).reverse();\n    const app = expressApp || express();\n    app.use((req, res, next) => {\n      if (this.config.loggerIgnorePath.includes(req.url)) return next();\n      this.logger.debug(`express got a request to a URL: ${req.url}', headers:`, req.headers);\n      return next();\n    });\n    if (!options?.disableBodyParser) this.bodyParser(app);\n\n    this.middlewareSlot\n      .toArray()\n      .flatMap(([, middlewares]) =>\n        middlewares.flatMap((middlewareManifest) => app.use(middlewareManifest.middleware))\n      );\n    sortedRoutes.forEach((routeInfo) => {\n      const { method, path, middlewares, disableNamespace } = routeInfo;\n      // TODO: @guy make sure to support single middleware here.\n      const namespace = disableNamespace ? '' : `/${this.config.namespace}`;\n      app[method](`${namespace}${path}`, this.catchErrorsMiddlewares(middlewares));\n    });\n\n    return app;\n  }\n\n  private createRoutes() {\n    const routesSlots = this.moduleSlot.toArray();\n    const routeEntries = routesSlots.map(([, routes]) => {\n      return routes.map((route) => {\n        const middlewares = flatten([this.verbValidation(route), route.middlewares]);\n        return {\n          method: lowerCase(route.method),\n          path: route.route,\n          disableNamespace: route.disableNamespace,\n          middlewares,\n          priority: route.priority || 0,\n        };\n      });\n    });\n\n    return flatten(routeEntries);\n  }\n\n  private verbValidation(route: Route): Middleware {\n    return async (req: express.Request, res: express.Response, next: express.NextFunction) => {\n      if (!route.verb) return next();\n      const verb = req.headers['x-verb'] || Verb.READ;\n      if (verb !== route.verb) {\n        res.status(403);\n        return res.jsonp({ message: 'You are not authorized', error: 'forbidden' });\n      }\n      return next();\n    };\n  }\n\n  private catchErrorsMiddlewares(middlewares: Middleware[]) {\n    return middlewares.map((middleware) => catchErrors(middleware));\n  }\n\n  private bodyParser(app: Express) {\n    app.use(bodyParser.json({ limit: '5000mb' }));\n    app.use(bodyParser.raw({ type: 'application/octet-stream', limit: '5000mb' }));\n  }\n\n  static slots = [Slot.withType<Route[]>(), Slot.withType<MiddlewareManifest[]>()];\n  static dependencies = [LoggerAspect];\n\n  static defaultConfig = {\n    port: 4001,\n    namespace: 'api',\n    loggerIgnorePath: ['/api/_health'],\n  };\n\n  static async provider(\n    [loggerFactory]: [LoggerMain],\n    config: ExpressConfig,\n    [routeSlot, middlewareSlot]: [RouteSlot, MiddlewareSlot]\n  ) {\n    const logger = loggerFactory.createLogger(ExpressAspect.id);\n    return new ExpressMain(config, routeSlot, logger, middlewareSlot);\n  }\n}\n\nExpressAspect.addRuntime(ExpressMain);\n"],"mappings":"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"}
+{"version":3,"names":["_cli","data","require","_harmony","_logger","_express","_interopRequireDefault","_lodash","_bodyParser","_express2","_middlewares","_types","ExpressMain","constructor","config","moduleSlot","logger","middlewareSlot","listen","port","serverPort","app","createApp","register","routes","registerMiddleware","middlewares","createRootRoutes","namespace","ExpressAspect","id","method","path","disableNamespace","priority","req","res","send","expressApp","options","internalRoutes","createRoutes","allRoutes","concat","sortedRoutes","sortBy","r","reverse","express","use","next","loggerIgnorePath","includes","url","debug","headers","disableBodyParser","bodyParser","middlewaresSlot","values","flat","forEach","route","middleware","routeInfo","catchErrorsMiddlewares","routesSlots","toArray","routeEntries","map","flatten","verbValidation","lowerCase","verb","Verb","READ","status","jsonp","message","error","catchErrors","json","limit","raw","type","provider","loggerFactory","routeSlot","createLogger","exports","_defineProperty2","default","MainRuntime","Slot","withType","LoggerAspect","addRuntime"],"sources":["express.main.runtime.ts"],"sourcesContent":["import { MainRuntime } from '@teambit/cli';\nimport { Slot, SlotRegistry } from '@teambit/harmony';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport express, { Express } from 'express';\nimport { concat, flatten, lowerCase, sortBy } from 'lodash';\nimport bodyParser from 'body-parser';\nimport { ExpressAspect } from './express.aspect';\nimport { catchErrors } from './middlewares';\nimport { Middleware, Request, Response, Route, Verb } from './types';\nimport { MiddlewareManifest } from './middleware-manifest';\n\nexport type ExpressConfig = {\n  port: number;\n  namespace: string;\n  loggerIgnorePath: string[];\n};\n\nexport type MiddlewareSlot = SlotRegistry<MiddlewareManifest[]>;\n\nexport type RouteSlot = SlotRegistry<Route[]>;\n\nexport class ExpressMain {\n  static runtime = MainRuntime;\n\n  constructor(\n    /**\n     * extension config\n     */\n    readonly config: ExpressConfig,\n\n    /**\n     * slot for registering graphql modules\n     */\n    private moduleSlot: RouteSlot,\n\n    /**\n     * logger extension.\n     */\n    readonly logger: Logger,\n\n    readonly middlewareSlot: MiddlewareSlot\n  ) {}\n\n  /**\n   * start a express server.\n   */\n  async listen(port?: number) {\n    const serverPort = port || this.config.port;\n    const app = this.createApp();\n    app.listen(serverPort);\n  }\n\n  /**\n   * register a new express routes.\n   * route will be added as `/api/${route}`\n   */\n  register(routes: Route[]) {\n    this.moduleSlot.register(routes);\n    return this;\n  }\n\n  /**\n   * register a new middleware into express.\n   */\n  registerMiddleware(middlewares: MiddlewareManifest[]) {\n    this.middlewareSlot.register(middlewares);\n    return this;\n  }\n\n  private createRootRoutes() {\n    // TODO: @guy refactor health to service aspect.\n    return [\n      {\n        namespace: ExpressAspect.id,\n        method: 'get',\n        path: '/_health',\n        disableNamespace: false,\n        priority: 0,\n        middlewares: [async (req: Request, res: Response) => res.send('ok')],\n      },\n    ];\n  }\n\n  createApp(expressApp?: Express, options?: { disableBodyParser: true }): Express {\n    const internalRoutes = this.createRootRoutes();\n    const routes = this.createRoutes();\n    const allRoutes = concat(routes, internalRoutes);\n    const sortedRoutes = sortBy(allRoutes, (r) => r.priority).reverse();\n    const app = expressApp || express();\n    app.use((req, res, next) => {\n      if (this.config.loggerIgnorePath.includes(req.url)) return next();\n      this.logger.debug(`express got a request to a URL: ${req.url}', headers:`, req.headers);\n      return next();\n    });\n    if (!options?.disableBodyParser) this.bodyParser(app);\n\n    const middlewaresSlot = this.middlewareSlot.values().flat();\n    middlewaresSlot.forEach(({ route, middleware }) => {\n      if (!route) app.use(middleware);\n      // eslint-disable-next-line @typescript-eslint/no-misused-promises\n      if (route) app.use(route, middleware);\n    });\n\n    sortedRoutes.forEach((routeInfo) => {\n      const { method, path, middlewares, disableNamespace } = routeInfo;\n      // TODO: @guy make sure to support single middleware here.\n      const namespace = disableNamespace ? '' : `/${this.config.namespace}`;\n      app[method](`${namespace}${path}`, this.catchErrorsMiddlewares(middlewares));\n    });\n\n    return app;\n  }\n\n  private createRoutes() {\n    const routesSlots = this.moduleSlot.toArray();\n    const routeEntries = routesSlots.map(([, routes]) => {\n      return routes.map((route) => {\n        const middlewares = flatten([this.verbValidation(route), route.middlewares]);\n        return {\n          method: lowerCase(route.method),\n          path: route.route,\n          disableNamespace: route.disableNamespace,\n          middlewares,\n          priority: route.priority || 0,\n        };\n      });\n    });\n\n    return flatten(routeEntries);\n  }\n\n  private verbValidation(route: Route): Middleware {\n    return async (req: express.Request, res: express.Response, next: express.NextFunction) => {\n      if (!route.verb) return next();\n      const verb = req.headers['x-verb'] || Verb.READ;\n      if (verb !== route.verb) {\n        res.status(403);\n        return res.jsonp({ message: 'You are not authorized', error: 'forbidden' });\n      }\n      return next();\n    };\n  }\n\n  private catchErrorsMiddlewares(middlewares: Middleware[]) {\n    return middlewares.map((middleware) => catchErrors(middleware));\n  }\n\n  private bodyParser(app: Express) {\n    app.use(bodyParser.json({ limit: '5000mb' }));\n    app.use(bodyParser.raw({ type: 'application/octet-stream', limit: '5000mb' }));\n  }\n\n  static slots = [Slot.withType<Route[]>(), Slot.withType<MiddlewareManifest[]>()];\n  static dependencies = [LoggerAspect];\n\n  static defaultConfig = {\n    port: 4001,\n    namespace: 'api',\n    loggerIgnorePath: ['/api/_health'],\n  };\n\n  static async provider(\n    [loggerFactory]: [LoggerMain],\n    config: ExpressConfig,\n    [routeSlot, middlewareSlot]: [RouteSlot, MiddlewareSlot]\n  ) {\n    const logger = loggerFactory.createLogger(ExpressAspect.id);\n    return new ExpressMain(config, routeSlot, logger, middlewareSlot);\n  }\n}\n\nExpressAspect.addRuntime(ExpressMain);\n"],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { RouteSlot } from './express.main.runtime';
 export { Route, Verb } from './types';
-export { Request, Response, NextFunction } from './types';
+export { Request, Response, NextFunction, Middleware } from './types';
+export type { MiddlewareManifest } from './middleware-manifest';
 export type { ExpressMain } from './express.main.runtime';
 export { ExpressAspect } from './express.aspect';

package/dist/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "ExpressAspect", {
     return _express().ExpressAspect;
   }
 });
+Object.defineProperty(exports, "Middleware", {
+  enumerable: true,
+  get: function () {
+    return _types().Middleware;
+  }
+});
 Object.defineProperty(exports, "NextFunction", {
   enumerable: true,
   get: function () {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_expressMain","data","require","_types","_express"],"sources":["index.ts"],"sourcesContent":["export { RouteSlot } from './express.main.runtime';\nexport { Route, Verb } from './types';\nexport { Request, Response, NextFunction } from './types';\nexport type { ExpressMain } from './express.main.runtime';\nexport { ExpressAspect } from './express.aspect';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,aAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,YAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,OAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,MAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAG,SAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,QAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA"}
+{"version":3,"names":["_expressMain","data","require","_types","_express"],"sources":["index.ts"],"sourcesContent":["export { RouteSlot } from './express.main.runtime';\nexport { Route, Verb } from './types';\nexport { Request, Response, NextFunction, Middleware } from './types';\nexport type { MiddlewareManifest } from './middleware-manifest';\nexport type { ExpressMain } from './express.main.runtime';\nexport { ExpressAspect } from './express.aspect';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,aAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,YAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,OAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,MAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAG,SAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,QAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA"}

package/dist/middleware-manifest.d.ts

@@ -1,4 +1,5 @@
 import { Middleware } from './types';
 export interface MiddlewareManifest {
+    route?: string;
     middleware: Middleware;
 }

package/dist/middleware-manifest.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["middleware-manifest.ts"],"sourcesContent":["import { Middleware } from './types';\n\nexport interface MiddlewareManifest {\n  middleware: Middleware;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["middleware-manifest.ts"],"sourcesContent":["import { Middleware } from './types';\n\nexport interface MiddlewareManifest {\n  route?: string;\n  middleware: Middleware;\n}\n"],"mappings":""}

package/dist/{preview-1693474270980.js → preview-1693538278577.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_express@0.0.864/dist/express.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_express@0.0.864/dist/express.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_express@0.0.865/dist/express.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_express@0.0.865/dist/express.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/types/route.d.ts

@@ -5,7 +5,7 @@ import { Response } from './response';
 /**
  * define express Middleware
  */
-export declare type Middleware = (req: Request, res: Response, next: NextFunction) => Promise<any>;
+export declare type Middleware = (req: Request, res: Response, next: NextFunction) => void | Promise<any>;
 export declare enum Verb {
     WRITE = "write",
     READ = "read"

package/dist/types/route.js.map

@@ -1 +1 @@
-{"version":3,"names":["Verb","exports"],"sources":["route.ts"],"sourcesContent":["import { NextFunction } from './next';\nimport { Request } from './request';\nimport { Response } from './response';\n\n/**\n * define express Middleware\n */\nexport type Middleware = (req: Request, res: Response, next: NextFunction) => Promise<any>;\n\nexport enum Verb {\n  WRITE = 'write',\n  READ = 'read',\n}\n\n/**\n * express new Route\n */\n\nexport interface Route {\n  method: string;\n  route: string | RegExp;\n  disableNamespace?: boolean;\n  verb?: Verb;\n  middlewares: Middleware[];\n  /** route priority if 2 route with the same name default is 0 */\n  priority?: number;\n}\n"],"mappings":";;;;;;AAIA;AACA;AACA;AAFA,IAKYA,IAAI,0BAAJA,IAAI;EAAJA,IAAI;EAAJA,IAAI;EAAA,OAAJA,IAAI;AAAA;AAKhB;AACA;AACA;AAFAC,OAAA,CAAAD,IAAA,GAAAA,IAAA"}
+{"version":3,"names":["Verb","exports"],"sources":["route.ts"],"sourcesContent":["import { NextFunction } from './next';\nimport { Request } from './request';\nimport { Response } from './response';\n\n/**\n * define express Middleware\n */\nexport type Middleware = (req: Request, res: Response, next: NextFunction) => void | Promise<any>;\n\nexport enum Verb {\n  WRITE = 'write',\n  READ = 'read',\n}\n\n/**\n * express new Route\n */\n\nexport interface Route {\n  method: string;\n  route: string | RegExp;\n  disableNamespace?: boolean;\n  verb?: Verb;\n  middlewares: Middleware[];\n  /** route priority if 2 route with the same name default is 0 */\n  priority?: number;\n}\n"],"mappings":";;;;;;AAIA;AACA;AACA;AAFA,IAKYA,IAAI,0BAAJA,IAAI;EAAJA,IAAI;EAAJA,IAAI;EAAA,OAAJA,IAAI;AAAA;AAKhB;AACA;AACA;AAFAC,OAAA,CAAAD,IAAA,GAAAA,IAAA"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/express",
-  "version": "0.0.864",
+  "version": "0.0.865",
   "homepage": "https://bit.cloud/teambit/harmony/express",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.harmony",
     "name": "express",
-    "version": "0.0.864"
+    "version": "0.0.865"
   },
   "dependencies": {
     "body-parser": "1.19.0",

package/types/route.ts

@@ -5,7 +5,7 @@ import { Response } from './response';
 /**
  * define express Middleware
  */
-export type Middleware = (req: Request, res: Response, next: NextFunction) => Promise<any>;
+export type Middleware = (req: Request, res: Response, next: NextFunction) => void | Promise<any>;
 
 export enum Verb {
   WRITE = 'write',