Skip to content

Commit

Permalink
Merge pull request #188 from jeremydaly/v0.11
Browse files Browse the repository at this point in the history 
V0.11
  • Loading branch information
@jeremydaly
jeremydaly authored Jul 2, 2021
2 parents c1fe83e + 93cc0a9 commit 2224ddf
Show file tree
Hide file tree
Showing 30 changed files with 6,025 additions and 3,311 deletions.
37 changes: 9 additions & 28 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,17 @@
{
"env": {
"es6": true,
"node": true,
"jest": true
"es6": true,
"node": true,
"jest": true
},
"extends": "eslint:recommended",
"extends": ["eslint:recommended", "prettier"],
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single",
{ "allowTemplateLiterals": true }
],
"semi": [
"error",
"never"
],
"indent": [
"error",
2,
{ "SwitchCase": 1, "flatTernaryExpressions": true }
]
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {},
"globals": {
"expect": true,
"it": true
"expect": true,
"it": true
}
}
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ name: build

on: [pull_request, push]


jobs:
build:

runs-on: ubuntu-latest

strategy:
Expand Down Expand Up @@ -37,5 +35,3 @@ jobs:
COVERALLS_SERVICE_NAME: GithubActions
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
COVERALLS_GIT_BRANCH: ${{ env.BRANCH_NAME }}


5 changes: 5 additions & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
coverage
node_modules
__tests__
*.test.js
dist
3 changes: 3 additions & 0 deletions .prettierrc.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"singleQuote": true
}
6 changes: 0 additions & 6 deletions .travis.yml
View file

This file was deleted.

814 changes: 460 additions & 354 deletions README.md
View file

Large diffs are not rendered by default.

312 changes: 312 additions & 0 deletions __tests__/executionStacks.unit.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,312 @@
"use strict";

const { expectation } = require("sinon");

// Init API instance
// const api = require("../index")({ version: "v1.0", logger: false });

let event = {
httpMethod: "get",
path: "/",
body: {},
multiValueHeaders: {
"content-type": ["application/json"],
},
};

/******************************************************************************/
/*** DEFINE TEST ROUTES ***/
/******************************************************************************/

// const middleware1 = (res, req, next) => {
// next();
// };
// const middleware2 = (res, req, next) => {
// next();
// };
// const middleware3 = (res, req, next) => {
// next();
// };
// const middleware4 = (res, req, next) => {
// next();
// };
// const getRoute = (res, req) => {};
// const getRoute2 = (res, req) => {};
// const getRoute3 = (res, req) => {};
// const postRoute = (res, req) => {};

// // api.use((err,req,res,next) => {})

// // api.post("/foo/bar", postRoute);

// // api.use(middleware1);
// // api.use(middleware2);

// // api.use("/foo/*", middleware4);

// // // api.get('/*',middleware4,getRoute2)
// // api.get("/foo", getRoute3);
// // api.get("/foo/bar", getRoute);
// // api.use(middleware3);
// // // api.get('/test',getRoute2)
// // // api.use('/foo/:baz',middleware3)

// // api.get("/foo/bar", getRoute2);

// // // api.get("/foo/:bat", getRoute3);

// // //console.log(api.routes())
// // console.log(JSON.stringify(api._routes, null, 2));
// // api.routes(true);

// // api.get('/test/*',getRoute)
// // api.get('/test/testx',getRoute3)

// api.use("/:test", middleware3);
// api.get("/", function baseGetRoute(req, res) {});
// api.get("/p1/p2/:paramName", function getRoute(req, res) {});
// api.get("/p1/p2", function getRoute(req, res, next) {});
// api.get("/p1/p2", function getRoute2(req, res) {});
// api.get("/p1/*", (req, res) => {});

/******************************************************************************/
/*** BEGIN TESTS ***/
/******************************************************************************/

describe("Execution Stacks:", function () {
it("generates basic routes (no middleware)", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.get("/", function getRoute() {});
api.get("/foo", function getFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});

expect(api.routes()).toEqual([
["GET", "/", ["getRoute"]],
["GET", "/foo", ["getFooRoute"]],
["GET", "/foo/bar", ["getBarRoute"]],
]);
});

it("generates basic routes (single middleware)", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.use(function middleware(req, res, next) {});
api.get("/", function getRoute() {});
api.get("/foo", function getFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});

expect(api.routes()).toEqual([
["GET", "/", ["middleware", "getRoute"]],
["GET", "/foo", ["middleware", "getFooRoute"]],
["GET", "/foo/bar", ["middleware", "getBarRoute"]],
]);
});

it("adds single middleware after a route", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.get("/", function getRoute() {});
api.use(function middleware(req, res, next) {});
api.get("/foo", function getFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});

expect(api.routes()).toEqual([
["GET", "/", ["getRoute"]],
["GET", "/foo", ["middleware", "getFooRoute"]],
["GET", "/foo/bar", ["middleware", "getBarRoute"]],
]);
});

it("adds single middleware after a deeper route", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.get("/foo", function getFooRoute() {});
api.use(function middleware(req, res, next) {});
api.get("/", function getRoute() {});
api.get("/foo/bar", function getBarRoute() {});

expect(api.routes()).toEqual([
["GET", "/foo", ["getFooRoute"]],
["GET", "/foo/bar", ["middleware", "getBarRoute"]],
["GET", "/", ["middleware", "getRoute"]],
]);
});

it("adds route-based middleware", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.use("/foo", function middleware(req, res, next) {});
api.get("/", function getRoute() {});
api.get("/foo", function getFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});

expect(api.routes()).toEqual([
["GET", "/foo", ["middleware", "getFooRoute"]],
["GET", "/foo/bar", ["getBarRoute"]],
["GET", "/", ["getRoute"]],
]);
});

it("adds route-based middleware with *", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.use("/foo/*", function middleware(req, res, next) {});
api.get("/", function getRoute() {});
api.get("/foo", function getFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});

expect(api.routes()).toEqual([
["GET", "/foo", ["getFooRoute"]],
["GET", "/foo/bar", ["middleware", "getBarRoute"]],
["GET", "/", ["getRoute"]],
]);
});

it("adds method-based middleware", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.get("/foo", function middleware(req, res, next) {});
api.get("/", function getRoute() {});
api.get("/foo", function getFooRoute() {});
api.post("/foo", function postFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});

expect(api.routes()).toEqual([
["GET", "/foo", ["middleware", "getFooRoute"]],
["POST", "/foo", ["postFooRoute"]],
["GET", "/foo/bar", ["getBarRoute"]],
["GET", "/", ["getRoute"]],
]);
});

it("adds method-based middleware to multiple routes", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.get("/foo", function middleware(req, res, next) {});
api.get("/foo/bar", function middleware2(req, res, next) {});
api.get("/", function getRoute() {});
api.get("/foo", function getFooRoute() {});
api.post("/foo", function postFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});
api.get("/foo/baz", function getBazRoute() {});

expect(api.routes()).toEqual([
["GET", "/foo", ["middleware", "getFooRoute"]],
["POST", "/foo", ["postFooRoute"]],
["GET", "/foo/bar", ["middleware2", "getBarRoute"]],
["GET", "/foo/baz", ["getBazRoute"]],
["GET", "/", ["getRoute"]],
]);
});

it("adds middleware multiple routes", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.use(["/foo", "/foo/baz"], function middleware(req, res, next) {});
api.get("/", function getRoute() {});
api.get("/foo", function getFooRoute() {});
api.post("/foo", function postFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});
api.get("/foo/baz", function getBazRoute() {});

expect(api.routes()).toEqual([
["GET", "/foo", ["middleware", "getFooRoute"]],
["POST", "/foo", ["middleware", "postFooRoute"]],
["GET", "/foo/baz", ["middleware", "getBazRoute"]],
["GET", "/foo/bar", ["getBarRoute"]],
["GET", "/", ["getRoute"]],
]);
});

it("adds method-based middleware using *", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.get("/foo/*", function middleware(req, res, next) {});
api.get("/", function getRoute() {});
api.get("/foo", function getFooRoute() {});
api.post("/foo", function postFooRoute() {});
api.get("/foo/bar", function getBarRoute() {});
api.get("/foo/baz", function getBazRoute() {});

expect(api.routes()).toEqual([
["GET", "/foo", ["getFooRoute"]],
["POST", "/foo", ["postFooRoute"]],
["GET", "/foo/*", ["middleware"]],
["GET", "/foo/bar", ["middleware", "getBarRoute"]],
["GET", "/foo/baz", ["middleware", "getBazRoute"]],
["GET", "/", ["getRoute"]],
]);
});

it("assign multiple middleware to parameterized path", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.use(
function middleware(req, res, next) {},
function middleware2(req, res, next) {}
);
api.get("/foo/:bar", function getParamRoute() {});

expect(api.routes()).toEqual([
["GET", "/foo/:bar", ["middleware", "middleware2", "getParamRoute"]],
]);
});

it("inherit middleware based on * routes and parameterized paths", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.use("/*", function middleware(req, res, next) {});
api.get("/", function baseGetRoute(req, res) {});
api.get("/p1/p2/:paramName", function getRoute(req, res) {});
api.get("/p1/p2", function getRoute(req, res, next) {});
api.get("/p1/p2", function getRoute2(req, res) {});
api.get("/p1/p3", function getRoute3(req, res) {});
api.get("/p1/*", function starRoute(req, res) {});
api.get("/p1/p2/:paramName", function getRoute4(req, res) {});

// console.log(api.routes());
expect(api.routes()).toEqual([
["GET", "/", ["middleware", "baseGetRoute"]],
["GET", "/p1/p2", ["middleware", "getRoute", "getRoute2"]],
["GET", "/p1/p2/:paramName", ["middleware", "getRoute", "getRoute4"]],
["GET", "/p1/p3", ["middleware", "getRoute3"]],
["GET", "/p1/*", ["middleware", "starRoute"]],
]);
});

it.skip("inherit additional middleware after a * middleware is applied", () => {
// Init API instance
const api = require("../index")({ version: "v1.0", logger: false });

api.use(function middleware(req, res, next) {});
// api.use(["/data"], function middlewareX(req, res, next) {});
api.use(["/data/*"], function middleware2(req, res, next) {});
api.use(function middleware3(req, res, next) {});

api.get("/", function getRoute(req, res) {});
api.get("/data", function getDataRoute(req, res) {});
api.get("/data/test", function getNestedDataRoute(req, res) {});

console.log(api.routes());
// expect(api.routes()).toEqual([
// ["GET", "/", ["middleware", "baseGetRoute"]],
// ["GET", "/p1/p2", ["middleware", "getRoute", "getRoute2"]],
// ["GET", "/p1/p2/:paramName", ["middleware", "getRoute", "getRoute4"]],
// ["GET", "/p1/p3", ["middleware", "getRoute3"]],
// ["GET", "/p1/*", ["middleware", "starRoute"]],
// ]);
});
}); // end ROUTE tests
Loading

0 comments on commit 2224ddf

Please sign in to comment.