From 550d004930e7ae67fb4329b040bd2d017f7947c4 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Sat, 4 Jan 2020 00:09:29 -0500 Subject: [PATCH] chore: Re-name package, gitignore dist. --- .gitignore | 1 + dist/index.d.ts | 9 -- dist/index.js | 230 ------------------------------------------------ package.json | 14 +-- src/index.ts | 26 +++--- 5 files changed, 24 insertions(+), 256 deletions(-) delete mode 100644 dist/index.d.ts delete mode 100644 dist/index.js diff --git a/.gitignore b/.gitignore index 123ae94..4867c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ build/Release # Dependency directory # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules +dist \ No newline at end of file diff --git a/dist/index.d.ts b/dist/index.d.ts deleted file mode 100644 index a1b26f4..0000000 --- a/dist/index.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import * as Express from 'express'; -export interface IApiHandler { - ALL?: Express.RequestHandler; - GET?: Express.RequestHandler; - POST?: Express.RequestHandler; - PUT?: Express.RequestHandler; - DELETE?: Express.RequestHandler; -} -export default function api(express: any, apiPath?: string): Express.Express; diff --git a/dist/index.js b/dist/index.js deleted file mode 100644 index 5450894..0000000 --- a/dist/index.js +++ /dev/null @@ -1,230 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -const path = require("path"); -const walk = require("walk"); -const chalk = require("chalk"); -const DEFAULT_API_DIR = path.join(process.cwd(), 'api'); -// If no API endpoint takes the bait, return the properly formatted 400 error -// for the media requested. JSON for ajax, just the http status code for all others -function apiNotFound(req, res, next) { - if (typeof req !== 'object') - return; - res.status(400); - if (req.xhr) { - console.error(chalk.red('✘ Error routing to API path '), chalk.red(req.path)); - return res.json({ code: 404, status: 'error', message: 'Method Not Implemented' }); - } - return next(); -} -const evalAPI = function (func) { - return function (req, res, next) { - return __awaiter(this, void 0, void 0, function* () { - // Evaluate API function - try { - const result = yield func(req, res, next); - if (typeof result === 'object') { - return res.status((result.code || 200)).json(result); - } - console.error('✘ API endpoint returned something other than JSON or a Promise:', result, func); - return res.status(500).json({ status: 'error', message: 'Invalid Response' }); - } - catch (err) { - // If internal API flag is present, just return the result to the next handler - if (req._internalAPI) - throw err; - console.error('✘ API promise rejected and returning non 200 response:', err); - return res.status((err.code || 500)).json(err); - } - }); - }; -}; -function hasValidMethod(handler) { - return typeof handler === 'object' && - (typeof handler.ALL === 'function' - || typeof handler.GET === 'function' - || typeof handler.POST === 'function' - || typeof handler.PUT === 'function' - || typeof handler.DELETE === 'function'); -} -function loadAPI(router, filePath, apiPath) { - let methods = ''; - try { - const handler = require(filePath); - // If handler is a function, register it as a get callback - if (typeof handler === 'function' && (methods += ' GET')) - router.get(apiPath, evalAPI(handler)); - // If handler is an object with any valid http method, register them - else if (hasValidMethod(handler)) { - if (typeof handler.ALL === 'function' && (methods += ' ALL')) - router.all(apiPath, evalAPI(handler.ALL)); - if (typeof handler.GET === 'function' && (methods += ' GET')) - router.get(apiPath, evalAPI(handler.GET)); - if (typeof handler.POST === 'function' && (methods += ' POST')) - router.post(apiPath, evalAPI(handler.POST)); - if (typeof handler.PUT === 'function' && (methods += ' PUT')) - router.put(apiPath, evalAPI(handler.PUT)); - if (typeof handler.DELETE === 'function' && (methods += ' DELETE')) - router.delete(apiPath, evalAPI(handler.DELETE)); - } - // Otherwise, this is an invalid export. Error. - else { - return console.error(chalk.bold.red(' ✘ Error in API:'), chalk.bold.black(apiPath), chalk.gray(' - no valid HTTP method exported')); - } - console.log(chalk.green(' • Registered:'), (apiPath ? apiPath : '/'), chalk.yellow('(' + methods.trim() + ')')); - } - catch (err) { - // If require() failed, error - console.error(chalk.bold.red(' ✘ Error in API:'), chalk.bold.black(apiPath), chalk.gray(' - error in the API file')); - console.error(' ', chalk.underline(filePath)); - console.error(' ', err.toString().replace(/(\r\n|\r|\n)/gm, '$1 ')); - } -} -function discoverAPI(router, apiDir) { - var queue = [], options = { - listeners: { - file: function (root, fileStats, next) { - // Ignore hidden files - if (fileStats.name[0] === '.') - return next(); - // Construct both the absolute file path, and public facing API path - var filePath = path.join(root, fileStats.name), apiPath = filePath.replace(apiDir, '').replace(/\/index.js$/, '').replace(/.js$/, ''); - // Push them to our queue. This later sorted in order of route precedence. - queue.push({ apiPath, filePath }); - // Process next file - next(); - }, - end: function () { - // Sort queue in reverse alphabetical order. - // Has the nice side effect of ordering by route precedence - queue.sort(function (file1, file2) { - return (file1.apiPath > file2.apiPath) ? 1 : -1; - }); - // For each API item in the queue, load it into our router - while (queue.length) { - const file = queue.pop(); // TODO: When ES6 is common in node, make let - loadAPI(router, file.filePath, file.apiPath); - } - // When we have loaded all of our API endpoints, register our catchall route - router.all('*', apiNotFound); - } - } - }; - try { - walk.walkSync(apiDir, options); - } - catch (e) { - console.error(chalk.bold.red('✘ Error reading API directory: '), e); - } -} -class ApiQuery { - constructor(router, method, req, res, path, body) { - this.router = router; - this.path = path; - this.req = Object.create(req, { - url: { writable: true, configurable: true, value: this.path }, - method: { writable: true, configurable: true, value: method }, - ip: { writable: true, configurable: true, value: '127.0.0.1' }, - body: { writable: true, configurable: true, value: (body || {}) }, - query: { writable: true, configurable: true, value: {} }, - params: { writable: true, configurable: true, value: {} }, - originalUrl: { writable: true, configurable: true, value: undefined }, - _internalAPI: { writable: true, configurable: true, value: true } - }); - this.res = res; - return this; - } - then(callback, errCallback) { - return __awaiter(this, void 0, void 0, function* () { - if (typeof this.path !== 'string') - return console.error('✘ API call must be provided a path!'); - if (!errCallback) - throw 'YOU MUST PROVIDE AN ERROR CALLBACK FOR INTERNAL API CALLS'; - // Handle - try { - yield this.router.handle(this.req, this.res, (result) => __awaiter(this, void 0, void 0, function* () { - try { - const data = yield result; - if (typeof data === 'object') { - // If the response is an error, call the error callback. - if (data && data.status === 'error') { - console.error(chalk.bold.red('✘ Internal API promise failed:'), result.message); - callback(data); - } - // Otherwise, call the success response. - return callback(data); - } - // If the response is not an object, panic. - console.error(chalk.bold.red('✘ Internal API returned with invalid response:'), result); - return errCallback(new Error('Internal API returned with invalid response'), { status: 'error', message: 'Invalid Response' }); - } - catch (err) { - console.error(chalk.bold.red('✘ Internal API promise rejected:'), err); - return errCallback(err, { status: 'error', message: 'Server Error' }); - } - })); - } - catch (err) { - console.error(chalk.bold.red('✘ Internal API promise rejected:'), err); - return errCallback(err, { status: 'error', message: 'Server Error' }); - } - }); - } -} -// Register function must be called at the begining of your app.js file. -// Creates a new express Router using the parent application's version of express -// And adds a middleware that attaches a new instance of the api query function -// to each request's locals object. -function api(express, apiPath = DEFAULT_API_DIR) { - const setupRouter = express(); - const router = express.Router(); - // Hacky. Force the parent router to attach the locals.api interface at the begining of each request - setupRouter.on('mount', function (parent) { - parent.use((req, res, next) => { - res.locals.api = { - get: function GET_factory(path, body) { - return new ApiQuery(router, 'GET', req, res, path, body); - }, - post: function POST_factory(path, body) { - return new ApiQuery(router, 'POST', req, res, path, body); - }, - put: function PUT_factory(path, body) { - return new ApiQuery(router, 'PUT', req, res, path, body); - }, - delete: function DELETE_factory(path, body) { - return new ApiQuery(router, 'DELETE', req, res, path, body); - } - }; - next(); - }); - parent._router.stack.splice(2, 0, parent._router.stack.pop()); - }); - // If this is not an ajax request, and request is for an asset that accepts html, - // then this must be a first time render - just send our base page down. - setupRouter.use((req, res, next) => { - if (typeof req === 'object' && !req.xhr && req.accepts(['*/*', 'text/html']) === 'text/html') { - return res.sendfile(path.join(apiPath, '/index.html'), {}, function (err) { - if (err) - res.status((err) ? err.status : 500); - else - res.status(200); - }); - } - next(); - }); - console.log(chalk.bold.green('• Discovering API:')); - discoverAPI(router, apiPath); - setupRouter.use(router); - console.log(chalk.bold.green('✔ API Discovery Complete')); - return setupRouter; -} -exports.default = api; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\n\nimport * as Express from 'express';\nimport * as walk from 'walk';\nimport * as chalk from 'chalk';\n\nconst DEFAULT_API_DIR = path.join(process.cwd(), 'api');\n\ntype Method = 'ALL' | 'GET' | 'POST' | 'PUT' | 'DELETE';\n\nexport interface IApiHandler {\n  ALL?: Express.RequestHandler;\n  GET?: Express.RequestHandler;\n  POST?: Express.RequestHandler;\n  PUT?: Express.RequestHandler;\n  DELETE?: Express.RequestHandler;\n}\n\n// If no API endpoint takes the bait, return the properly formatted 400 error\n// for the media requested. JSON for ajax, just the http status code for all others\nfunction apiNotFound(req: Express.Request, res: Express.Response, next: Express.NextFunction) {\n  if(typeof req !== 'object') return;\n  res.status(400);\n  if(req.xhr){\n    console.error(chalk.red('✘ Error routing to API path '), chalk.red(req.path));\n    return res.json({code: 404, status: 'error', message: 'Method Not Implemented'});\n  }\n  return next();\n}\n\nconst evalAPI = function(func: Express.RequestHandler) {\n  return async function(req: Express.Request, res: Express.Response, next: Express.NextFunction) {\n\n    // Evaluate API function\n    try {\n      const result = await func(req, res, next);\n      if(typeof result === 'object'){\n        return res.status((result.code || 200)).json(result);\n      }\n\n      console.error('✘ API endpoint returned something other than JSON or a Promise:', result, func);\n      return res.status(500).json({status: 'error', message: 'Invalid Response'});\n\n    } catch(err) {\n      // If internal API flag is present, just return the result to the next handler\n      if((req as any)._internalAPI) throw err;\n\n      console.error('✘ API promise rejected and returning non 200 response:', err);\n      return res.status((err.code || 500)).json(err);\n    }\n  }\n };\n\nfunction hasValidMethod(handler: IApiHandler){\n  return typeof handler === 'object' &&\n     (  typeof handler.ALL === 'function'\n        || typeof handler.GET === 'function'\n        || typeof handler.POST === 'function'\n        || typeof handler.PUT === 'function'\n        || typeof handler.DELETE === 'function')\n}\n\nfunction loadAPI(router: Express.Router, filePath: string, apiPath: string){\n  let methods = '';\n  try {\n     const handler = require(filePath) as IApiHandler;\n     // If handler is a function, register it as a get callback\n     if(typeof handler === 'function' && (methods += ' GET')) router.get(apiPath, evalAPI(handler));\n     // If handler is an object with any valid http method, register them\n     else if(hasValidMethod(handler)){\n       if(typeof handler.ALL === 'function' && (methods += ' ALL')) router.all(apiPath, evalAPI(handler.ALL));\n       if(typeof handler.GET === 'function' && (methods += ' GET')) router.get(apiPath, evalAPI(handler.GET));\n       if(typeof handler.POST === 'function' && (methods += ' POST')) router.post(apiPath, evalAPI(handler.POST));\n       if(typeof handler.PUT === 'function' && (methods += ' PUT')) router.put(apiPath, evalAPI(handler.PUT));\n       if(typeof handler.DELETE === 'function' && (methods += ' DELETE')) router.delete(apiPath, evalAPI(handler.DELETE));\n     }\n     // Otherwise, this is an invalid export. Error.\n     else{\n       return console.error(chalk.bold.red('   ✘ Error in API:'), chalk.bold.black(apiPath), chalk.gray(' - no valid HTTP method exported'));\n     }\n     console.log(chalk.green('   • Registered:'), (apiPath ? apiPath : '/'), chalk.yellow('('+methods.trim()+')'));\n  } catch(err) {\n    // If require() failed, error\n    console.error(chalk.bold.red('   ✘ Error in API:'), chalk.bold.black(apiPath), chalk.gray(' - error in the API file'));\n    console.error('    ', chalk.underline(filePath));\n    console.error('    ', err.toString().replace(/(\\r\\n|\\r|\\n)/gm, '$1     '))\n  }\n}\n\ninterface QueueItem {\n  apiPath: string;\n  filePath: string;\n}\n\nfunction discoverAPI(router: Express.Router, apiDir: string){\n  var queue: QueueItem[] = [],\n      options = {\n        listeners: {\n          file: function (root: string, fileStats: walk.WalkStats, next: walk.WalkNext) {\n            // Ignore hidden files\n            if(fileStats.name[0] === '.') return next();\n\n            // Construct both the absolute file path, and public facing API path\n            var filePath = path.join(root, fileStats.name),\n                apiPath = filePath.replace(apiDir, '').replace(/\\/index.js$/, '').replace(/.js$/, '');\n\n            // Push them to our queue. This later sorted in order of route precedence.\n            queue.push({ apiPath, filePath });\n\n            // Process next file\n            next();\n          },\n\n          end: function () {\n            // Sort queue in reverse alphabetical order.\n            // Has the nice side effect of ordering by route precedence\n            queue.sort(function(file1, file2){\n              return (file1.apiPath > file2.apiPath) ? 1 : -1;\n            })\n\n            // For each API item in the queue, load it into our router\n            while(queue.length){\n              const file = queue.pop()!; // TODO: When ES6 is common in node, make let\n              loadAPI(router, file.filePath, file.apiPath);\n            }\n\n            // When we have loaded all of our API endpoints, register our catchall route\n            router.all('*', apiNotFound);\n          }\n        }\n      };\n  try{\n    walk.walkSync(apiDir, options);\n  } catch(e){\n    console.error(chalk.bold.red('✘ Error reading API directory:  '), e);\n  }\n}\n\nclass ApiQuery {\n\n  private path: string;\n  private router: Express.Router;\n  private req: Express.RequestHandler;\n  private res: Express.Response;\n\n  constructor(router: Express.Router, method: Method, req: Express.Request, res: Express.Response, path: string, body: any) {\n    this.router = router;\n    this.path = path;\n    this.req = Object.create(req, {\n      url: { writable: true, configurable: true, value: this.path },\n      method: { writable: true, configurable: true, value: method },\n      ip: { writable: true, configurable: true, value: '127.0.0.1' },\n      body: { writable: true, configurable: true, value: (body || {}) },\n      query: { writable: true, configurable: true, value: {} },\n      params: { writable: true, configurable: true, value: {} },\n      originalUrl: { writable: true, configurable: true, value: undefined },\n      _internalAPI: { writable: true, configurable: true, value: true}\n    });\n    this.res = res;\n    return this;\n  }\n\n  async then(callback: (data: any) => any, errCallback: (err: Error, data: any) => any): Promise<any> {\n\n    if(typeof this.path !== 'string') return console.error('✘ API call must be provided a path!');\n    if(!errCallback) throw 'YOU MUST PROVIDE AN ERROR CALLBACK FOR INTERNAL API CALLS';\n\n    // Handle\n    try {\n      await (this.router as any).handle(this.req, this.res, async (result: Promise<any> | any) => {\n\n        try {\n          const data = await result;\n          if(typeof data === 'object') {\n\n            // If the response is an error, call the error callback.\n            if(data && data.status === 'error') {\n              console.error(chalk.bold.red('✘ Internal API promise failed:'), result.message);\n              callback(data);\n            }\n\n            // Otherwise, call the success response.\n            return callback(data);\n          }\n\n          // If the response is not an object, panic.\n          console.error(chalk.bold.red('✘ Internal API returned with invalid response:'), result);\n          return errCallback(new Error('Internal API returned with invalid response'), { status: 'error', message: 'Invalid Response' });\n        } catch (err) {\n          console.error(chalk.bold.red('✘ Internal API promise rejected:'), err);\n          return errCallback(err, { status: 'error', message: 'Server Error' })\n        }\n      });\n    } catch(err) {\n      console.error(chalk.bold.red('✘ Internal API promise rejected:'), err);\n      return errCallback(err, { status: 'error', message: 'Server Error' });\n    }\n  }\n}\n\n// Register function must be called at the begining of your app.js file.\n// Creates a new express Router using the parent application's version of express\n// And adds a middleware that attaches a new instance of the api query function\n// to each request's locals object.\nexport default function api(express: any, apiPath: string = DEFAULT_API_DIR) {\n  const setupRouter = express() as Express.Express;\n  const router = express.Router() as Express.Router;\n\n  // Hacky. Force the parent router to attach the locals.api interface at the begining of each request\n  setupRouter.on('mount', function(parent){\n    parent.use((req: Express.Request, res: Express.Response, next: Express.NextFunction) => {\n      res.locals.api = {\n        get: function GET_factory(path: string, body: any){\n          return new ApiQuery(router, 'GET', req, res, path, body);\n        },\n        post: function POST_factory(path: string, body: any){\n          return new ApiQuery(router, 'POST', req, res, path, body);\n        },\n        put: function PUT_factory(path: string, body: any){\n          return new ApiQuery(router, 'PUT', req, res, path, body);\n        },\n        delete: function DELETE_factory(path: string, body: any){\n          return new ApiQuery(router, 'DELETE', req, res, path, body);\n        }\n      };\n      next();\n    });\n    parent._router.stack.splice(2, 0, parent._router.stack.pop());\n  });\n\n  // If this is not an ajax request, and request is for an asset that accepts html,\n  // then this must be a first time render - just send our base page down.\n  setupRouter.use((req: Express.Request, res: Express.Response, next: Express.NextFunction) => {\n    if(typeof req === 'object' && !req.xhr && req.accepts(['*/*', 'text/html']) === 'text/html') {\n      return res.sendfile(path.join(apiPath, '/index.html'), {}, function (err: any) {\n        if (err) res.status((err) ? err.status : 500);\n        else res.status(200);\n      });\n    }\n    next();\n  });\n\n  console.log(chalk.bold.green('• Discovering API:'));\n  discoverAPI(router, apiPath);\n  setupRouter.use(router);\n  console.log(chalk.bold.green('✔ API Discovery Complete'));\n  return setupRouter;\n}"]} \ No newline at end of file diff --git a/package.json b/package.json index 4a38704..1eab5fd 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "rebound-api", - "version": "2.0.0-beta.0", - "description": "An Express middleware for elegant API creation", - "main": "index.js", + "name": "loll", + "version": "0.0.1", + "description": "REST apps for the lazy developer.", + "main": "dist/index.js", "scripts": { "build": "rm -rf dist && tsc --jsx preserve -p tsconfig.json", "pretest": "yarn run build", @@ -12,7 +12,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/reboundjs/rebound-api.git" + "url": "git+https://github.com/amiller-gh/loll.git" }, "keywords": [ "express", @@ -24,9 +24,9 @@ "author": "Adam Miller", "license": "MIT", "bugs": { - "url": "https://github.com/reboundjs/rebound-api/issues" + "url": "https://github.com/amiller-gh/loll/issues" }, - "homepage": "https://github.com/reboundjs/rebound-api#readme", + "homepage": "https://github.com/amiller-gh/loll#readme", "dependencies": { "chalk": "^3.0.0", "walk": "^2.3.9" diff --git a/src/index.ts b/src/index.ts index 0dd0f03..f1dfdc2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -34,10 +34,14 @@ const evalAPI = function(func: Express.RequestHandler) { // Evaluate API function try { const result = await func(req, res, next); - if(typeof result === 'object'){ - return res.status((result.code || 200)).json(result); - } + // If they've returned the response object, assume we've sent the result already. + if (result === res) { return result; } + + // If it appears to be a JSON response, send it down. + if (typeof result === 'object') { return res.status((result.code || 200)).json(result); } + + // Otherwise, we're rather confused... alert the world. console.error('✘ API endpoint returned something other than JSON or a Promise:', result, func); return res.status(500).json({status: 'error', message: 'Invalid Response'}); @@ -65,9 +69,9 @@ function loadAPI(router: Express.Router, filePath: string, apiPath: string){ try { const handler = require(filePath) as IApiHandler; // If handler is a function, register it as a get callback - if(typeof handler === 'function' && (methods += ' GET')) router.get(apiPath, evalAPI(handler)); + if (typeof handler === 'function' && (methods += ' GET')) router.get(apiPath, evalAPI(handler)); // If handler is an object with any valid http method, register them - else if(hasValidMethod(handler)){ + else if (hasValidMethod(handler)) { if(typeof handler.ALL === 'function' && (methods += ' ALL')) router.all(apiPath, evalAPI(handler.ALL)); if(typeof handler.GET === 'function' && (methods += ' GET')) router.get(apiPath, evalAPI(handler.GET)); if(typeof handler.POST === 'function' && (methods += ' POST')) router.post(apiPath, evalAPI(handler.POST)); @@ -75,13 +79,13 @@ function loadAPI(router: Express.Router, filePath: string, apiPath: string){ if(typeof handler.DELETE === 'function' && (methods += ' DELETE')) router.delete(apiPath, evalAPI(handler.DELETE)); } // Otherwise, this is an invalid export. Error. - else{ - return console.error(chalk.bold.red(' ✘ Error in API:'), chalk.bold.black(apiPath), chalk.gray(' - no valid HTTP method exported')); + else { + return console.error(chalk.bold.red(' ✘ Error in API:'), chalk.bold(apiPath), chalk.gray(' - no valid HTTP method exported')); } console.log(chalk.green(' • Registered:'), (apiPath ? apiPath : '/'), chalk.yellow('('+methods.trim()+')')); } catch(err) { // If require() failed, error - console.error(chalk.bold.red(' ✘ Error in API:'), chalk.bold.black(apiPath), chalk.gray(' - error in the API file')); + console.error(chalk.bold.red(' ✘ Error in API:'), chalk.bold(apiPath), chalk.gray(' - error in the API file')); console.error(' ', chalk.underline(filePath)); console.error(' ', err.toString().replace(/(\r\n|\r|\n)/gm, '$1 ')) } @@ -98,7 +102,7 @@ function discoverAPI(router: Express.Router, apiDir: string){ listeners: { file: function (root: string, fileStats: walk.WalkStats, next: walk.WalkNext) { // Ignore hidden files - if(fileStats.name[0] === '.') return next(); + if(fileStats.name[0] === '.' || !~fileStats.name.indexOf('.js')) return next(); // Construct both the absolute file path, and public facing API path var filePath = path.join(root, fileStats.name), @@ -206,7 +210,7 @@ export default function api(express: any, apiPath: string = DEFAULT_API_DIR) { const setupRouter = express() as Express.Express; const router = express.Router() as Express.Router; - // Hacky. Force the parent router to attach the locals.api interface at the begining of each request + // Hacky. Force the parent router to attach the locals.api interface at the beginning of each request setupRouter.on('mount', function(parent){ parent.use((req: Express.Request, res: Express.Response, next: Express.NextFunction) => { res.locals.api = { @@ -225,6 +229,7 @@ export default function api(express: any, apiPath: string = DEFAULT_API_DIR) { }; next(); }); + parent._router.stack.splice(2, 0, parent._router.stack.pop()); }); @@ -242,6 +247,7 @@ export default function api(express: any, apiPath: string = DEFAULT_API_DIR) { console.log(chalk.bold.green('• Discovering API:')); discoverAPI(router, apiPath); + console.log(router); setupRouter.use(router); console.log(chalk.bold.green('✔ API Discovery Complete')); return setupRouter;