@server/next 0.20.18 → 0.20.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.20.18",
+  "version": "0.20.20",
   "description": "An experimental reimplementation of server.js focused on the DX",
   "homepage": "https://node-server.com/",
   "repository": "https://github.com/franciscop/server-next.git",

package/src/index.js

@@ -116,19 +116,7 @@ const extendWithDefaults = (ctx) => {
 export default function server(options = {}) {
   // Make it so that the exported one is a prototype of function()
   if (!(this instanceof server)) {
-    const inst = new server(options);
-    const cb = inst.netlify;
-    const keys = Object.keys(Object.getPrototypeOf(inst)).concat(
-      Object.keys(inst)
-    );
-    keys.forEach((key) => {
-      if (typeof inst[key] === "function") {
-        cb[key] = inst[key].bind(inst);
-      } else {
-        cb[key] = inst[key];
-      }
-    });
-    return cb;
+    return new server(options).self();
   }
 
   // Skip "forbidden methods" https://fetch.spec.whatwg.org/#concept-method
@@ -193,6 +181,17 @@ export default function server(options = {}) {
   };
 }
 
+server.prototype.self = function () {
+  const cb = this.netlify;
+  const keys = Object.keys(Object.getPrototypeOf(this)).concat(
+    Object.keys(this)
+  );
+  keys.forEach((key) => {
+    cb[key] = this[key];
+  });
+  return cb;
+};
+
 // INTERNAL
 server.prototype.handle = function (method, path, ...middleware) {
   if (method === "*") {
@@ -203,7 +202,7 @@ server.prototype.handle = function (method, path, ...middleware) {
     this.handlers[method].push([method, path, ...middleware]);
   }
 
-  return this;
+  return this.self();
 };
 
 server.prototype.socket = function (path, ...middleware) {
@@ -252,7 +251,7 @@ server.prototype.router = function (basePath, router) {
       this.handle(method, basePath + path.replace(/^\//, ""), ...callbacks);
     });
   }
-  return this;
+  return this.self();
 };
 
 server.prototype.test = function () {

package/src/index.test.js

@@ -2,6 +2,24 @@ import "./test/toSucceed.js";
 
 import server, { status } from "./index.js";
 
+describe("exports", () => {
+  it("exports as a function", () => {
+    expect(typeof server()).toBe("function");
+  });
+
+  it("nested is also a function", () => {
+    expect(typeof server().get("/", () => {})).toBe("function");
+  });
+
+  it("export has a fetch", () => {
+    expect(typeof server().fetch).toBe("function");
+  });
+
+  it("nested is also a function", () => {
+    expect(typeof server().get("/", () => {}).fetch).toBe("function");
+  });
+});
+
 describe("return different types", () => {
   const api = server()
     .get("/", () => "Hello world")