@curveball/core - npm Package Compare versions

Comparing version 0.14.3 to 0.15.0

changelog.md

 Changelog
 =========
 
+0.15.0 (2020-12-05)
+-------------------
+
+* Curveball now required Node 12.
+* `esModuleInterop` flag is no longer required to use curveball.
+
+
 0.14.3 (2020-09-23)
@@ -5,0 +12,0 @@ -------------------

dist/application.d.ts

 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import http from 'http';
+import * as http from 'http';
 import { Context } from './context';
@@ -9,3 +9,3 @@ import { HeadersInterface, HeadersObject } from './headers';
 import Response from './response';
-import WebSocket from 'ws';
+import * as WebSocket from 'ws';
 import * as net from 'net';
@@ -12,0 +12,0 @@ /**

dist/application.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -9,11 +6,11 @@ exports.invokeMiddlewares = exports.middlewareCall = void 0;
 const events_1 = require("events");
-const http_1 = __importDefault(require("http"));
-const base_context_1 = __importDefault(require("./base-context"));
-const memory_request_1 = __importDefault(require("./memory-request"));
-const memory_response_1 = __importDefault(require("./memory-response"));
-const not_found_1 = __importDefault(require("./middleware/not-found"));
+const http = require("http");
+const base_context_1 = require("./base-context");
+const memory_request_1 = require("./memory-request");
+const memory_response_1 = require("./memory-response");
+const not_found_1 = require("./middleware/not-found");
 const http_utils_1 = require("./node/http-utils");
-const request_1 = __importDefault(require("./node/request"));
-const response_1 = __importDefault(require("./node/response"));
-const ws_1 = __importDefault(require("ws"));
+const request_1 = require("./node/request");
+const response_1 = require("./node/response");
+const WebSocket = require("ws");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -75,3 +72,3 @@ const pkg = require('../package.json');
     listen(port, host) {
-        const server = http_1.default.createServer(this.callback());
+        const server = http.createServer(this.callback());
         server.on('upgrade', this.upgradeCallback.bind(this));
@@ -81,3 +78,3 @@ return server.listen(port, host);
     listenWs(port, host) {
-        const wss = new ws_1.default.Server({
+        const wss = new WebSocket.Server({
             port,
@@ -116,5 +113,3 @@ host
                 res.setHeader('Content-Type', 'text/plain');
-                res.end(
-                // @ts-expect-error string error let's ignore 
-                'Uncaught exception. No middleware was defined to handle it. We got the following HTTP status: ' +
+                res.end('Uncaught exception. No middleware was defined to handle it. We got the following HTTP status: ' +
                     res.statusCode);
@@ -135,3 +130,3 @@ if (this.listenerCount('error')) {
             // We don't have an existing Websocket server. Lets make one.
-            this.wss = new ws_1.default.Server({ noServer: true });
+            this.wss = new WebSocket.Server({ noServer: true });
         }
@@ -138,0 +133,0 @@ this.wss.handleUpgrade(request, socket, head, (ws) => {

dist/base-context.d.ts

@@ -6,3 +6,3 @@ import { Middleware } from './application';
 import Response from './response';
-import WebSocket from 'ws';
+import * as WebSocket from 'ws';
 /**
@@ -9,0 +9,0 @@ * The Context object encapsulates a single HTTP request.

dist/context.d.ts

@@ -5,3 +5,3 @@ import { Middleware } from './application';
 import Response from './response';
-import WebSocket from 'ws';
+import * as WebSocket from 'ws';
 export interface Context<ReqT = any, ResT = any> {
@@ -8,0 +8,0 @@ /**

dist/index.js

 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryResponse = exports.MemoryRequest = exports.Response = exports.Request = exports.middlewareCall = exports.invokeMiddlewares = exports.Headers = exports.conditionalCheck = exports.BaseContext = exports.Application = void 0;
-const application_1 = __importStar(require("./application"));
+const application_1 = require("./application");
 Object.defineProperty(exports, "Application", { enumerable: true, get: function () { return application_1.default; } });
 Object.defineProperty(exports, "invokeMiddlewares", { enumerable: true, get: function () { return application_1.invokeMiddlewares; } });
 Object.defineProperty(exports, "middlewareCall", { enumerable: true, get: function () { return application_1.middlewareCall; } });
-const base_context_1 = __importDefault(require("./base-context"));
+const base_context_1 = require("./base-context");
 exports.BaseContext = base_context_1.default;
-const headers_1 = __importDefault(require("./headers"));
+const headers_1 = require("./headers");
 exports.Headers = headers_1.default;
-const memory_request_1 = __importDefault(require("./memory-request"));
+const memory_request_1 = require("./memory-request");
 exports.MemoryRequest = memory_request_1.default;
-const memory_response_1 = __importDefault(require("./memory-response"));
+const memory_response_1 = require("./memory-response");
 exports.MemoryResponse = memory_response_1.default;
-const request_1 = __importDefault(require("./request"));
+const request_1 = require("./request");
 exports.Request = request_1.default;
-const response_1 = __importDefault(require("./response"));
+const response_1 = require("./response");
 exports.Response = response_1.default;
@@ -42,0 +20,0 @@ const conditional_1 = require("./conditional");

dist/memory-request.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -9,3 +6,3 @@ exports.MemoryRequest = void 0;
 const headers_1 = require("./headers");
-const request_1 = __importDefault(require("./request"));
+const request_1 = require("./request");
 class MemoryRequest extends request_1.default {
@@ -12,0 +9,0 @@ constructor(method, requestTarget, headers, body = null) {

dist/memory-response.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryResponse = void 0;
 const headers_1 = require("./headers");
-const response_1 = __importDefault(require("./response"));
+const response_1 = require("./response");
 class MemoryResponse extends response_1.default {
@@ -10,0 +7,0 @@ constructor() {

dist/node/http-utils.d.ts

 /// <reference types="node" />
-import http from 'http';
-import http2 from 'http2';
+import * as http from 'http';
+import * as http2 from 'http2';
 /**
@@ -5,0 +5,0 @@ * A node.js Http request

dist/node/http-utils.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendBody = exports.isHttp2Response = void 0;
-const stream_1 = __importDefault(require("stream"));
+const stream_1 = require("stream");
 /**
@@ -21,10 +18,8 @@ * A type guard to see if a Response object is a HTTP2 response.
     else if (typeof body === 'string') {
-        // @ts-expect-error - not sure why this line fails
         res.end(body);
     }
     else if (body instanceof Buffer) {
-        // @ts-expect-error - not sure why this line fails
         res.end(body);
     }
-    else if (body instanceof stream_1.default) {
+    else if (body instanceof stream_1.Readable) {
         // @ts-expect-error - not sure why this line fails
@@ -34,3 +29,2 @@ body.pipe(res);
     else if (typeof body === 'object') {
-        // @ts-expect-error - not sure why this line fails
         res.end(JSON.stringify(body));
@@ -37,0 +31,0 @@ }

dist/node/push.d.ts

 /// <reference types="node" />
-import http2 from 'http2';
+import * as http2 from 'http2';
 import { Context } from '../context';
@@ -4,0 +4,0 @@ /**

dist/node/push.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const http2_1 = __importDefault(require("http2"));
+const http2 = require("http2");
 const http_utils_1 = require("./http-utils");
@@ -28,3 +25,3 @@ /**
     pushStream.on('error', err => {
-        const isRefusedStream = pushStream.rstCode === http2_1.default.constants.NGHTTP2_REFUSED_STREAM;
+        const isRefusedStream = pushStream.rstCode === http2.constants.NGHTTP2_REFUSED_STREAM;
         if (!isRefusedStream) {
@@ -31,0 +28,0 @@ throw err;

dist/node/request.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeRequest = void 0;
-const raw_body_1 = __importDefault(require("raw-body"));
+const rawBody = require("raw-body");
 const headers_1 = require("../headers");
-const request_1 = __importDefault(require("../request"));
+const request_1 = require("../request");
 class NodeRequest extends request_1.default {
@@ -29,3 +26,3 @@ constructor(inner) {
         }
-        return raw_body_1.default(this.inner, options);
+        return rawBody(this.inner, options);
     }
@@ -32,0 +29,0 @@ /**

dist/node/response.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeResponse = void 0;
-const http_1 = __importDefault(require("http"));
+const http = require("http");
 const util_1 = require("util");
 const application_1 = require("../application");
-const base_context_1 = __importDefault(require("../base-context"));
-const memory_request_1 = __importDefault(require("../memory-request"));
-const memory_response_1 = __importDefault(require("../memory-response"));
+const base_context_1 = require("../base-context");
+const memory_request_1 = require("../memory-request");
+const memory_response_1 = require("../memory-response");
 const http_utils_1 = require("./http-utils");
-const push_1 = __importDefault(require("./push"));
-const response_headers_1 = __importDefault(require("./response-headers"));
+const push_1 = require("./push");
+const response_headers_1 = require("./response-headers");
 const header_helpers_1 = require("./../header-helpers");
@@ -102,3 +99,3 @@ class NodeResponse {
             const writeRaw = util_1.promisify(this.inner._writeRaw.bind(this.inner));
-            const message = `HTTP/1.1 ${status} ${http_1.default.STATUS_CODES[status]}\r\n${rawHeaders.join('')}\r\n`;
+            const message = `HTTP/1.1 ${status} ${http.STATUS_CODES[status]}\r\n${rawHeaders.join('')}\r\n`;
             await writeRaw(message, 'ascii');
@@ -105,0 +102,0 @@ }

dist/request.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
-const accepts_1 = __importDefault(require("accepts"));
-const url_1 = __importDefault(require("url"));
+const accepts = require("accepts");
+const url = require("url");
 const header_helpers_1 = require("./header-helpers");
@@ -26,3 +23,3 @@ const headers_1 = require("./headers");
     get path() {
-        return url_1.default.parse(this.requestTarget).pathname;
+        return url.parse(this.requestTarget).pathname;
     }
@@ -39,3 +36,3 @@ /**
     get query() {
-        return url_1.default.parse(this.requestTarget, true).query;
+        return url.parse(this.requestTarget, true).query;
     }
@@ -73,3 +70,3 @@ /**
         };
-        const result = accepts_1.default(mockRequestObj).type(types);
+        const result = accepts(mockRequestObj).type(types);
         return result === false ? null : result;
@@ -76,0 +73,0 @@ }

package.json

 {
   "name": "@curveball/core",
-  "version": "0.14.3",
+  "version": "0.15.0",
   "description": "Curveball is a framework writting in Typescript for Node.js",
@@ -37,18 +37,18 @@ "main": "dist/index.js",
     "@types/accepts": "^1.3.5",
-    "@types/chai": "^4.2.12",
+    "@types/chai": "^4.2.14",
     "@types/co-body": "^5.1.0",
-    "@types/mocha": "^8.0.3",
-    "@types/node": "^10.17.35",
+    "@types/mocha": "^8.0.4",
+    "@types/node": "^12.19.8",
     "@types/node-fetch": "^2.5.7",
-    "@types/sinon": "^9.0.5",
-    "@typescript-eslint/eslint-plugin": "^4.2.0",
-    "@typescript-eslint/parser": "^4.2.0",
+    "@types/sinon": "^9.0.9",
+    "@typescript-eslint/eslint-plugin": "^4.9.0",
+    "@typescript-eslint/parser": "^4.9.0",
     "chai": "^4.2.0",
-    "eslint": "^7.9.0",
-    "mocha": "^8.1.3",
+    "eslint": "^7.15.0",
+    "mocha": "^8.2.1",
     "node-fetch": "^2.6.1",
     "nyc": "^15.1.0",
-    "sinon": "^9.0.3",
-    "ts-node": "^9.0.0",
-    "typescript": "^4.0.3"
+    "sinon": "^9.2.1",
+    "ts-node": "^9.1.0",
+    "typescript": "^4.1.2"
   },
@@ -63,6 +63,6 @@ "types": "dist/",
     "@curveball/http-errors": "^0.3.0",
-    "@types/ws": "^7.2.6",
+    "@types/ws": "^7.2.9",
     "accepts": "^1.3.7",
     "raw-body": "^2.4.1",
-    "ws": "^7.3.1"
+    "ws": "^7.4.1"
   },
@@ -69,0 +69,0 @@ "engines": {

src/application.ts

 import { isHttpError } from '@curveball/http-errors';
 import { EventEmitter } from 'events';
-import http from 'http';
+import * as http from 'http';
 import BaseContext from './base-context';
@@ -20,3 +20,3 @@ import { Context } from './context';
 import Response from './response';
-import WebSocket from 'ws';
+import * as WebSocket from 'ws';
 import * as net from 'net';
@@ -155,3 +155,2 @@
         res.end(
-          // @ts-expect-error string error let's ignore 
           'Uncaught exception. No middleware was defined to handle it. We got the following HTTP status: ' +
@@ -158,0 +157,0 @@ res.statusCode

src/base-context.ts

@@ -6,3 +6,3 @@ import { Middleware } from './application';
 import Response from './response';
-import WebSocket from 'ws';
+import * as WebSocket from 'ws';
 
@@ -9,0 +9,0 @@ /**

src/context.ts

@@ -5,3 +5,3 @@ import { Middleware } from './application';
 import Response from './response';
-import WebSocket from 'ws';
+import * as WebSocket from 'ws';
 
@@ -8,0 +8,0 @@ export interface Context<ReqT = any, ResT = any> {

src/headers.ts

@@ -24,5 +24,5 @@ /**
    * Gets all values of a HTTP header
-   * 
-   * This function will return an array with 0 or more values of a header. 
-   * 
+   *
+   * This function will return an array with 0 or more values of a header.
+   *
    */
@@ -118,5 +118,5 @@ getMany(name: string): string[];
    * Gets all values of a HTTP header
-   * 
-   * This function will return an array with 0 or more values of a header. 
-   * 
+   *
+   * This function will return an array with 0 or more values of a header.
+   *
    */
@@ -123,0 +123,0 @@ getMany(name: string): string[] {

src/node/http-utils.ts

@@ -1,4 +0,4 @@
-import http from 'http';
-import http2 from 'http2';
-import Readable from 'stream';
+import * as http from 'http';
+import * as http2 from 'http2';
+import { Readable } from 'stream';
 
@@ -30,6 +30,4 @@ /**
   } else if (typeof body === 'string') {
-    // @ts-expect-error - not sure why this line fails
     res.end(body);
   } else if (body instanceof Buffer) {
-    // @ts-expect-error - not sure why this line fails
     res.end(body);
@@ -40,3 +38,2 @@ } else if (body instanceof Readable) {
   } else if (typeof body === 'object') {
-    // @ts-expect-error - not sure why this line fails
     res.end(JSON.stringify(body));
@@ -43,0 +40,0 @@ } else {

src/node/push.ts

@@ -1,2 +0,2 @@
-import http2 from 'http2';
+import * as http2 from 'http2';
 import { Context } from '../context';
@@ -3,0 +3,0 @@ import { sendBody } from './http-utils';

src/node/request.ts

@@ -1,2 +0,2 @@
-import rawBody from 'raw-body';
+import * as rawBody from 'raw-body';
 import { Readable } from 'stream';
@@ -3,0 +3,0 @@ import { Headers } from '../headers';

src/node/response-headers.ts

@@ -53,5 +53,5 @@ import { HeadersInterface, HeadersObject } from '../headers';
    * Gets all values of a HTTP header
-   * 
-   * This function will return an array with 0 or more values of a header. 
-   * 
+   *
+   * This function will return an array with 0 or more values of a header.
+   *
    */
@@ -58,0 +58,0 @@ getMany(name: string): string[] {

src/node/response.ts

@@ -1,2 +0,2 @@
-import http from 'http';
+import * as http from 'http';
 import { promisify } from 'util';
@@ -3,0 +3,0 @@ import { invokeMiddlewares, Middleware } from '../application';

src/request.ts

@@ -1,5 +0,5 @@
-import accepts from 'accepts';
-import http from 'http';
+import * as accepts from 'accepts';
+import * as http from 'http';
 import { Readable } from 'stream';
-import url from 'url';
+import * as url from 'url';
 import { is, parsePrefer } from './header-helpers';
@@ -6,0 +6,0 @@ import { HeadersInterface } from './headers';

No alert changes

Worsened metrics

Total package byte prevSize

171621

-9.78%

Number of package files

73

-7.59%

Lines of code

3919

-10.3%

Dependency changes

• Updated

  @types/ws@^7.2.9

• Updated

  ws@^7.4.1