@curveball/kernel - npm Package Compare versions

Comparing version 0.21.0-beta.7 to 0.21.0-beta.9

cjs/application.d.ts

 /// <reference types="node" />
-import { EventEmitter } from 'events';
-import { Context } from './context';
-import { HeadersInterface, HeadersObject } from './headers';
-import { Request as CurveballRequest } from './request';
-import { Response as CurveballResponse } from './response';
+import { EventEmitter } from 'node:events';
+import { Context } from './context.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import { Request as CurveballRequest } from './request.js';
+import { Response as CurveballResponse } from './response.js';
 /**
@@ -18,7 +18,7 @@ * The middleware-call Symbol is a special symbol that might exist as a
  */
-declare type MiddlewareFunction = (ctx: Context, next: () => Promise<void>) => Promise<void> | void;
-declare type MiddlewareObject = {
+type MiddlewareFunction = (ctx: Context, next: () => Promise<void>) => Promise<void> | void;
+type MiddlewareObject = {
     [middlewareCall]: MiddlewareFunction;
 };
-export declare type Middleware = MiddlewareFunction | MiddlewareObject;
+export type Middleware = MiddlewareFunction | MiddlewareObject;
 export declare function invokeMiddlewares(ctx: Context, fns: Middleware[]): Promise<void>;
@@ -25,0 +25,0 @@ export default class Application extends EventEmitter {

cjs/application.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.invokeMiddlewares = exports.middlewareCall = void 0;
-const events_1 = require("events");
+const node_events_1 = require("node:events");
 const http_errors_1 = require("@curveball/http-errors");
-const context_1 = require("./context");
-const memory_request_1 = require("./memory-request");
-const memory_response_1 = require("./memory-response");
-const not_found_1 = require("./middleware/not-found");
-const fetch_util_1 = require("./fetch-util");
-const global_origin_1 = require("./global-origin");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const pkg = require('../package.json');
+const context_js_1 = require("./context.js");
+const memory_request_js_1 = require("./memory-request.js");
+const memory_response_js_1 = require("./memory-response.js");
+const not_found_js_1 = require("./middleware/not-found.js");
+const fetch_util_js_1 = require("./fetch-util.js");
+const global_origin_js_1 = require("./global-origin.js");
 /**
+ * Package version
+ *
+ * This line gets automatically replaced during the build phase
+ */
+const VERSION = 'Curveball/0.21.0-beta.9 (esm)';
+/**
  * The middleware-call Symbol is a special symbol that might exist as a
@@ -43,3 +47,3 @@ * property on an object.
 }
-class Application extends events_1.EventEmitter {
+class Application extends node_events_1.EventEmitter {
     constructor() {
@@ -61,5 +65,5 @@ super(...arguments);
     async handle(ctx) {
-        ctx.response.headers.set('Server', 'curveball/' + pkg.version);
+        ctx.response.headers.set('Server', VERSION);
         ctx.response.type = 'application/hal+json';
-        await invokeMiddlewares(ctx, [...this.middlewares, not_found_1.default]);
+        await invokeMiddlewares(ctx, [...this.middlewares, not_found_js_1.default]);
     }
@@ -77,4 +81,4 @@ /**
     async fetch(request) {
-        const response = await this.subRequest(await (0, fetch_util_1.fetchRequestToCurveballRequest)(request, this.origin));
-        return (0, fetch_util_1.curveballResponseToFetchResponse)(response);
+        const response = await this.subRequest(await (0, fetch_util_js_1.fetchRequestToCurveballRequest)(request, this.origin));
+        return (0, fetch_util_js_1.curveballResponseToFetchResponse)(response);
     }
@@ -84,3 +88,3 @@ async subRequest(arg1, path, headers, body = '') {
         if (typeof arg1 === 'string') {
-            request = new memory_request_1.default(arg1, path, this.origin, headers, body);
+            request = new memory_request_js_1.default(arg1, path, this.origin, headers, body);
         }
@@ -90,3 +94,3 @@ else {
         }
-        const context = new context_1.Context(request, new memory_response_1.default(this.origin));
+        const context = new context_js_1.Context(request, new memory_response_js_1.default(this.origin));
         try {
@@ -124,3 +128,3 @@ await this.handle(context);
         }
-        return (0, global_origin_1.getGlobalOrigin)();
+        return (0, global_origin_js_1.getGlobalOrigin)();
     }
@@ -127,0 +131,0 @@ set origin(baseUrl) {

cjs/conditional.d.ts

@@ -1,2 +0,2 @@
-import RequestInterface from './request';
+import RequestInterface from './request.js';
 /**
@@ -3,0 +3,0 @@ * This method will check the following request headers:

cjs/context.d.ts

@@ -1,6 +0,6 @@
-import { Middleware } from './application';
-import { HeadersInterface, HeadersObject } from './headers';
-import Request from './request';
-import Response from './response';
 import * as WebSocket from 'ws';
+import { Middleware } from './application.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import Request from './request.js';
+import Response from './response.js';
 /**
@@ -119,3 +119,3 @@ * The Context object encapsulates a single HTTP request.
  */
-export declare type WsContext = Context & {
+export type WsContext = Context & {
     /**
@@ -122,0 +122,0 @@ * WebSocket object.

cjs/fetch-util.d.ts

@@ -1,4 +0,4 @@
-import { MemoryRequest as CurveballRequest } from './memory-request';
-import { Response as CurveballResponse } from './response';
+import { MemoryRequest as CurveballRequest } from './memory-request.js';
+import { Response as CurveballResponse } from './response.js';
 export declare function fetchRequestToCurveballRequest(request: Request, origin: string): Promise<CurveballRequest<unknown>>;
 export declare function curveballResponseToFetchResponse(response: CurveballResponse): Promise<Response>;

cjs/fetch-util.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.curveballResponseToFetchResponse = exports.fetchRequestToCurveballRequest = void 0;
-const memory_request_1 = require("./memory-request");
-const headers_1 = require("./headers");
 const stream_1 = require("stream");
+const memory_request_js_1 = require("./memory-request.js");
+const headers_js_1 = require("./headers.js");
 async function fetchRequestToCurveballRequest(request, origin) {
-    const headers = new headers_1.Headers();
+    const headers = new headers_js_1.Headers();
     // @ts-expect-error apparently our types don't have an 'entries' on headers, but it's there!
@@ -19,3 +19,3 @@ for (const [key, value] of request.headers.entries()) {
         headers.set('host', url.host);
-    return new memory_request_1.MemoryRequest(request.method, relativeUrl, origin, headers, await request.arrayBuffer());
+    return new memory_request_js_1.MemoryRequest(request.method, relativeUrl, origin, headers, await request.arrayBuffer());
 }
@@ -22,0 +22,0 @@ exports.fetchRequestToCurveballRequest = fetchRequestToCurveballRequest;

cjs/header-helpers.d.ts

@@ -1,3 +0,3 @@
-import RequestInterface from './request';
-import ResponseInterface from './response';
+import RequestInterface from './request.js';
+import ResponseInterface from './response.js';
 /**
@@ -17,3 +17,3 @@ * This method will return true or false if a Request or Response has a
 export declare function is(message: RequestInterface<any> | ResponseInterface<any>, type: string): boolean;
-declare type Preferences = {
+type Preferences = {
     [preference: string]: true | string;
@@ -20,0 +20,0 @@ };

cjs/headers.d.ts

@@ -50,3 +50,3 @@ /**
  */
-export declare type HeadersObject = {
+export type HeadersObject = {
     [headerName: string]: string | string[] | number;
@@ -53,0 +53,0 @@ };

cjs/index.d.ts

@@ -1,10 +0,10 @@
-export { conditionalCheck } from './conditional';
-export { default as Request } from './request';
-export { default as Response, Body } from './response';
-export { default as MemoryRequest } from './memory-request';
-export { default as MemoryResponse } from './memory-response';
-export { default as Application, invokeMiddlewares, Middleware, middlewareCall } from './application';
-export { Context, WsContext } from './context';
-export { Headers, HeadersInterface, HeadersObject } from './headers';
-export { getGlobalOrigin, setGlobalOrigin, } from './global-origin';
-export * as headerHelpers from './header-helpers';
+export { conditionalCheck } from './conditional.js';
+export { default as Request } from './request.js';
+export { default as Response, Body } from './response.js';
+export { default as MemoryRequest } from './memory-request.js';
+export { default as MemoryResponse } from './memory-response.js';
+export { default as Application, invokeMiddlewares, Middleware, middlewareCall } from './application.js';
+export { Context, WsContext } from './context.js';
+export { Headers, HeadersInterface, HeadersObject } from './headers.js';
+export { getGlobalOrigin, setGlobalOrigin, } from './global-origin.js';
+export * as headerHelpers from './header-helpers.js';

cjs/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.headerHelpers = exports.setGlobalOrigin = exports.getGlobalOrigin = exports.Headers = exports.Context = exports.middlewareCall = exports.invokeMiddlewares = exports.Application = exports.MemoryResponse = exports.MemoryRequest = exports.Response = exports.Request = exports.conditionalCheck = void 0;
-var conditional_1 = require("./conditional");
-Object.defineProperty(exports, "conditionalCheck", { enumerable: true, get: function () { return conditional_1.conditionalCheck; } });
-var request_1 = require("./request");
-Object.defineProperty(exports, "Request", { enumerable: true, get: function () { return request_1.default; } });
-var response_1 = require("./response");
-Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return response_1.default; } });
-var memory_request_1 = require("./memory-request");
-Object.defineProperty(exports, "MemoryRequest", { enumerable: true, get: function () { return memory_request_1.default; } });
-var memory_response_1 = require("./memory-response");
-Object.defineProperty(exports, "MemoryResponse", { enumerable: true, get: function () { return memory_response_1.default; } });
-var 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; } });
-var context_1 = require("./context");
-Object.defineProperty(exports, "Context", { enumerable: true, get: function () { return context_1.Context; } });
-var headers_1 = require("./headers");
-Object.defineProperty(exports, "Headers", { enumerable: true, get: function () { return headers_1.Headers; } });
-var global_origin_1 = require("./global-origin");
-Object.defineProperty(exports, "getGlobalOrigin", { enumerable: true, get: function () { return global_origin_1.getGlobalOrigin; } });
-Object.defineProperty(exports, "setGlobalOrigin", { enumerable: true, get: function () { return global_origin_1.setGlobalOrigin; } });
-exports.headerHelpers = require("./header-helpers");
+var conditional_js_1 = require("./conditional.js");
+Object.defineProperty(exports, "conditionalCheck", { enumerable: true, get: function () { return conditional_js_1.conditionalCheck; } });
+var request_js_1 = require("./request.js");
+Object.defineProperty(exports, "Request", { enumerable: true, get: function () { return request_js_1.default; } });
+var response_js_1 = require("./response.js");
+Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return response_js_1.default; } });
+var memory_request_js_1 = require("./memory-request.js");
+Object.defineProperty(exports, "MemoryRequest", { enumerable: true, get: function () { return memory_request_js_1.default; } });
+var memory_response_js_1 = require("./memory-response.js");
+Object.defineProperty(exports, "MemoryResponse", { enumerable: true, get: function () { return memory_response_js_1.default; } });
+var application_js_1 = require("./application.js");
+Object.defineProperty(exports, "Application", { enumerable: true, get: function () { return application_js_1.default; } });
+Object.defineProperty(exports, "invokeMiddlewares", { enumerable: true, get: function () { return application_js_1.invokeMiddlewares; } });
+Object.defineProperty(exports, "middlewareCall", { enumerable: true, get: function () { return application_js_1.middlewareCall; } });
+var context_js_1 = require("./context.js");
+Object.defineProperty(exports, "Context", { enumerable: true, get: function () { return context_js_1.Context; } });
+var headers_js_1 = require("./headers.js");
+Object.defineProperty(exports, "Headers", { enumerable: true, get: function () { return headers_js_1.Headers; } });
+var global_origin_js_1 = require("./global-origin.js");
+Object.defineProperty(exports, "getGlobalOrigin", { enumerable: true, get: function () { return global_origin_js_1.getGlobalOrigin; } });
+Object.defineProperty(exports, "setGlobalOrigin", { enumerable: true, get: function () { return global_origin_js_1.setGlobalOrigin; } });
+exports.headerHelpers = require("./header-helpers.js");
 //# sourceMappingURL=index.js.map

cjs/memory-request.d.ts

 /// <reference types="node" />
 /// <reference types="node" />
-import { Readable } from 'stream';
-import { HeadersInterface, HeadersObject } from './headers';
-import { Request, Encoding } from './request';
+import { Readable } from 'node:stream';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import { Request, Encoding } from './request.js';
 export declare class MemoryRequest<T> extends Request<T> {
@@ -7,0 +7,0 @@ /**

cjs/memory-request.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryRequest = void 0;
-const stream_1 = require("stream");
-const headers_1 = require("./headers");
-const request_1 = require("./request");
-class MemoryRequest extends request_1.Request {
+const node_stream_1 = require("node:stream");
+const headers_js_1 = require("./headers.js");
+const request_js_1 = require("./request.js");
+class MemoryRequest extends request_js_1.Request {
     constructor(method, requestTarget, origin, headers, body = null, absoluteUrl) {
@@ -14,3 +14,3 @@ super(method, requestTarget, origin);
         else {
-            this.headers = new headers_1.Headers(headers);
+            this.headers = new headers_js_1.Headers(headers);
         }
@@ -31,3 +31,3 @@ this.originalBody = body;
     getStream() {
-        const s = new stream_1.Readable();
+        const s = new node_stream_1.Readable();
         s.push(this.getBody());
@@ -34,0 +34,0 @@ s.push(null);

cjs/memory-response.d.ts

@@ -1,3 +0,3 @@
-import { Headers } from './headers';
-import { Response, Body } from './response';
+import { Headers } from './headers.js';
+import { Response, Body } from './response.js';
 export declare class MemoryResponse<T = Body> extends Response<T> {
@@ -4,0 +4,0 @@ constructor(origin: string);

cjs/memory-response.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryResponse = void 0;
-const headers_1 = require("./headers");
-const response_1 = require("./response");
-class MemoryResponse extends response_1.Response {
+const headers_js_1 = require("./headers.js");
+const response_js_1 = require("./response.js");
+class MemoryResponse extends response_js_1.Response {
     constructor(origin) {
         super(origin);
-        this.headers = new headers_1.Headers();
+        this.headers = new headers_js_1.Headers();
         this.status = 200;
@@ -11,0 +11,0 @@ this.body = null;

cjs/middleware/not-found.d.ts

@@ -1,2 +0,2 @@
-import { Context } from '../context';
+import { Context } from '../context.js';
 export default function mw(ctx: Context): void;

cjs/request.d.ts

 /// <reference types="node" />
 /// <reference types="node" />
-import { Readable } from 'stream';
-import { HeadersInterface } from './headers';
-export declare type Encoding = 'utf-8' | 'ascii' | 'hex';
+import { Readable } from 'node:stream';
+import { HeadersInterface } from './headers.js';
+export type Encoding = 'utf-8' | 'ascii' | 'hex';
 /**
@@ -7,0 +7,0 @@ * This interface represents an incoming server request.

cjs/request.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
-const accepts = require("accepts");
-const url = require("url");
-const header_helpers_1 = require("./header-helpers");
-const headers_1 = require("./headers");
+const AcceptsImp = require("accepts");
+const url = require("node:url");
+const header_helpers_js_1 = require("./header-helpers.js");
+const headers_js_1 = require("./headers.js");
 /**
+ * We gotta do this ugly thing to make this work in CommonJS and ESM
+ */
+// @ts-expect-error https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/64233
+const Accepts = AcceptsImp.default ?? AcceptsImp;
+/**
  * This interface represents an incoming server request.
@@ -15,3 +20,3 @@ */
         this.requestTarget = requestTarget;
-        this.headers = new headers_1.Headers();
+        this.headers = new headers_js_1.Headers();
         this.origin = origin;
@@ -70,3 +75,3 @@ }
         };
-        const result = accepts(mockRequestObj).type(types);
+        const result = new Accepts(mockRequestObj).type(types);
         return result === false ? null : result;
@@ -88,6 +93,6 @@ }
     is(type) {
-        return (0, header_helpers_1.is)(this, type);
+        return (0, header_helpers_js_1.is)(this, type);
     }
     prefer(preference) {
-        const prefer = (0, header_helpers_1.parsePrefer)(this.headers.get('Prefer'));
+        const prefer = (0, header_helpers_js_1.parsePrefer)(this.headers.get('Prefer'));
         const val = prefer[preference];
@@ -94,0 +99,0 @@ if (val === undefined) {

cjs/response.d.ts

 /// <reference types="node" />
 /// <reference types="node" />
-import { Middleware } from './application';
-import { HeadersInterface, HeadersObject } from './headers';
-import { Readable, Writable } from 'stream';
-export declare type Body = Buffer | Record<string, any> | string | null | Readable | ((writeable: Writable) => void);
+import { Readable, Writable } from 'node:stream';
+import { Middleware } from './application.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+export type Body = Buffer | Record<string, any> | string | null | Readable | ((writeable: Writable) => void);
 /**
@@ -8,0 +8,0 @@ * This interface represents an incoming server request.

cjs/response.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Response = void 0;
-const header_helpers_1 = require("./header-helpers");
-const headers_1 = require("./headers");
+const header_helpers_js_1 = require("./header-helpers.js");
+const headers_js_1 = require("./headers.js");
 /**
@@ -11,3 +11,3 @@ * This interface represents an incoming server request.
     constructor(origin) {
-        this.headers = new headers_1.Headers();
+        this.headers = new headers_js_1.Headers();
         this.status = 200;
@@ -67,3 +67,3 @@ this.origin = origin;
     is(type) {
-        return (0, header_helpers_1.is)(this, type);
+        return (0, header_helpers_js_1.is)(this, type);
     }
@@ -70,0 +70,0 @@ /**

esm/application.d.ts

 /// <reference types="node" />
-import { EventEmitter } from 'events';
-import { Context } from './context';
-import { HeadersInterface, HeadersObject } from './headers';
-import { Request as CurveballRequest } from './request';
-import { Response as CurveballResponse } from './response';
+import { EventEmitter } from 'node:events';
+import { Context } from './context.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import { Request as CurveballRequest } from './request.js';
+import { Response as CurveballResponse } from './response.js';
 /**
@@ -18,7 +18,7 @@ * The middleware-call Symbol is a special symbol that might exist as a
  */
-declare type MiddlewareFunction = (ctx: Context, next: () => Promise<void>) => Promise<void> | void;
-declare type MiddlewareObject = {
+type MiddlewareFunction = (ctx: Context, next: () => Promise<void>) => Promise<void> | void;
+type MiddlewareObject = {
     [middlewareCall]: MiddlewareFunction;
 };
-export declare type Middleware = MiddlewareFunction | MiddlewareObject;
+export type Middleware = MiddlewareFunction | MiddlewareObject;
 export declare function invokeMiddlewares(ctx: Context, fns: Middleware[]): Promise<void>;
@@ -25,0 +25,0 @@ export default class Application extends EventEmitter {

esm/application.js

@@ -1,12 +0,16 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import { isHttpError } from '@curveball/http-errors';
-import { Context } from './context';
-import MemoryRequest from './memory-request';
-import MemoryResponse from './memory-response';
-import NotFoundMw from './middleware/not-found';
-import { curveballResponseToFetchResponse, fetchRequestToCurveballRequest } from './fetch-util';
-import { getGlobalOrigin } from './global-origin';
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const pkg = require('../package.json');
+import { Context } from './context.js';
+import MemoryRequest from './memory-request.js';
+import MemoryResponse from './memory-response.js';
+import NotFoundMw from './middleware/not-found.js';
+import { curveballResponseToFetchResponse, fetchRequestToCurveballRequest } from './fetch-util.js';
+import { getGlobalOrigin } from './global-origin.js';
 /**
+ * Package version
+ *
+ * This line gets automatically replaced during the build phase
+ */
+const VERSION = 'Curveball/dev';
+/**
  * The middleware-call Symbol is a special symbol that might exist as a
@@ -56,3 +60,3 @@ * property on an object.
     async handle(ctx) {
-        ctx.response.headers.set('Server', 'curveball/' + pkg.version);
+        ctx.response.headers.set('Server', VERSION);
         ctx.response.type = 'application/hal+json';
@@ -59,0 +63,0 @@ await invokeMiddlewares(ctx, [...this.middlewares, NotFoundMw]);

esm/conditional.d.ts

@@ -1,2 +0,2 @@
-import RequestInterface from './request';
+import RequestInterface from './request.js';
 /**
@@ -3,0 +3,0 @@ * This method will check the following request headers:

esm/context.d.ts

@@ -1,6 +0,6 @@
-import { Middleware } from './application';
-import { HeadersInterface, HeadersObject } from './headers';
-import Request from './request';
-import Response from './response';
 import * as WebSocket from 'ws';
+import { Middleware } from './application.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import Request from './request.js';
+import Response from './response.js';
 /**
@@ -119,3 +119,3 @@ * The Context object encapsulates a single HTTP request.
  */
-export declare type WsContext = Context & {
+export type WsContext = Context & {
     /**
@@ -122,0 +122,0 @@ * WebSocket object.

esm/fetch-util.d.ts

@@ -1,4 +0,4 @@
-import { MemoryRequest as CurveballRequest } from './memory-request';
-import { Response as CurveballResponse } from './response';
+import { MemoryRequest as CurveballRequest } from './memory-request.js';
+import { Response as CurveballResponse } from './response.js';
 export declare function fetchRequestToCurveballRequest(request: Request, origin: string): Promise<CurveballRequest<unknown>>;
 export declare function curveballResponseToFetchResponse(response: CurveballResponse): Promise<Response>;

esm/fetch-util.js

@@ -1,4 +0,4 @@
-import { MemoryRequest as CurveballRequest } from './memory-request';
-import { Headers as CurveballHeaders } from './headers';
 import { PassThrough, Readable } from 'stream';
+import { MemoryRequest as CurveballRequest } from './memory-request.js';
+import { Headers as CurveballHeaders } from './headers.js';
 export async function fetchRequestToCurveballRequest(request, origin) {
@@ -5,0 +5,0 @@ const headers = new CurveballHeaders();

esm/header-helpers.d.ts

@@ -1,3 +0,3 @@
-import RequestInterface from './request';
-import ResponseInterface from './response';
+import RequestInterface from './request.js';
+import ResponseInterface from './response.js';
 /**
@@ -17,3 +17,3 @@ * This method will return true or false if a Request or Response has a
 export declare function is(message: RequestInterface<any> | ResponseInterface<any>, type: string): boolean;
-declare type Preferences = {
+type Preferences = {
     [preference: string]: true | string;
@@ -20,0 +20,0 @@ };

esm/headers.d.ts

@@ -50,3 +50,3 @@ /**
  */
-export declare type HeadersObject = {
+export type HeadersObject = {
     [headerName: string]: string | string[] | number;
@@ -53,0 +53,0 @@ };

esm/index.d.ts

@@ -1,10 +0,10 @@
-export { conditionalCheck } from './conditional';
-export { default as Request } from './request';
-export { default as Response, Body } from './response';
-export { default as MemoryRequest } from './memory-request';
-export { default as MemoryResponse } from './memory-response';
-export { default as Application, invokeMiddlewares, Middleware, middlewareCall } from './application';
-export { Context, WsContext } from './context';
-export { Headers, HeadersInterface, HeadersObject } from './headers';
-export { getGlobalOrigin, setGlobalOrigin, } from './global-origin';
-export * as headerHelpers from './header-helpers';
+export { conditionalCheck } from './conditional.js';
+export { default as Request } from './request.js';
+export { default as Response, Body } from './response.js';
+export { default as MemoryRequest } from './memory-request.js';
+export { default as MemoryResponse } from './memory-response.js';
+export { default as Application, invokeMiddlewares, Middleware, middlewareCall } from './application.js';
+export { Context, WsContext } from './context.js';
+export { Headers, HeadersInterface, HeadersObject } from './headers.js';
+export { getGlobalOrigin, setGlobalOrigin, } from './global-origin.js';
+export * as headerHelpers from './header-helpers.js';

esm/index.js

@@ -1,11 +0,11 @@
-export { conditionalCheck } from './conditional';
-export { default as Request } from './request';
-export { default as Response } from './response';
-export { default as MemoryRequest } from './memory-request';
-export { default as MemoryResponse } from './memory-response';
-export { default as Application, invokeMiddlewares, middlewareCall } from './application';
-export { Context } from './context';
-export { Headers } from './headers';
-export { getGlobalOrigin, setGlobalOrigin, } from './global-origin';
-export * as headerHelpers from './header-helpers';
+export { conditionalCheck } from './conditional.js';
+export { default as Request } from './request.js';
+export { default as Response } from './response.js';
+export { default as MemoryRequest } from './memory-request.js';
+export { default as MemoryResponse } from './memory-response.js';
+export { default as Application, invokeMiddlewares, middlewareCall } from './application.js';
+export { Context } from './context.js';
+export { Headers } from './headers.js';
+export { getGlobalOrigin, setGlobalOrigin, } from './global-origin.js';
+export * as headerHelpers from './header-helpers.js';
 //# sourceMappingURL=index.js.map

esm/memory-request.d.ts

 /// <reference types="node" />
 /// <reference types="node" />
-import { Readable } from 'stream';
-import { HeadersInterface, HeadersObject } from './headers';
-import { Request, Encoding } from './request';
+import { Readable } from 'node:stream';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import { Request, Encoding } from './request.js';
 export declare class MemoryRequest<T> extends Request<T> {
@@ -7,0 +7,0 @@ /**

esm/memory-request.js

@@ -1,4 +0,4 @@
-import { Readable } from 'stream';
-import { Headers } from './headers';
-import { Request } from './request';
+import { Readable } from 'node:stream';
+import { Headers } from './headers.js';
+import { Request } from './request.js';
 export class MemoryRequest extends Request {
@@ -5,0 +5,0 @@ constructor(method, requestTarget, origin, headers, body = null, absoluteUrl) {

esm/memory-response.d.ts

@@ -1,3 +0,3 @@
-import { Headers } from './headers';
-import { Response, Body } from './response';
+import { Headers } from './headers.js';
+import { Response, Body } from './response.js';
 export declare class MemoryResponse<T = Body> extends Response<T> {
@@ -4,0 +4,0 @@ constructor(origin: string);

esm/memory-response.js

@@ -1,3 +0,3 @@
-import { Headers } from './headers';
-import { Response } from './response';
+import { Headers } from './headers.js';
+import { Response } from './response.js';
 export class MemoryResponse extends Response {
@@ -4,0 +4,0 @@ constructor(origin) {

esm/middleware/not-found.d.ts

@@ -1,2 +0,2 @@
-import { Context } from '../context';
+import { Context } from '../context.js';
 export default function mw(ctx: Context): void;

esm/request.d.ts

 /// <reference types="node" />
 /// <reference types="node" />
-import { Readable } from 'stream';
-import { HeadersInterface } from './headers';
-export declare type Encoding = 'utf-8' | 'ascii' | 'hex';
+import { Readable } from 'node:stream';
+import { HeadersInterface } from './headers.js';
+export type Encoding = 'utf-8' | 'ascii' | 'hex';
 /**
@@ -7,0 +7,0 @@ * This interface represents an incoming server request.

esm/request.js

@@ -1,6 +0,11 @@
-import * as accepts from 'accepts';
-import * as url from 'url';
-import { is, parsePrefer } from './header-helpers';
-import { Headers } from './headers';
+import * as AcceptsImp from 'accepts';
+import * as url from 'node:url';
+import { is, parsePrefer } from './header-helpers.js';
+import { Headers } from './headers.js';
 /**
+ * We gotta do this ugly thing to make this work in CommonJS and ESM
+ */
+// @ts-expect-error https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/64233
+const Accepts = AcceptsImp.default ?? AcceptsImp;
+/**
  * This interface represents an incoming server request.
@@ -66,3 +71,3 @@ */
         };
-        const result = accepts(mockRequestObj).type(types);
+        const result = new Accepts(mockRequestObj).type(types);
         return result === false ? null : result;
@@ -69,0 +74,0 @@ }

esm/response.d.ts

 /// <reference types="node" />
 /// <reference types="node" />
-import { Middleware } from './application';
-import { HeadersInterface, HeadersObject } from './headers';
-import { Readable, Writable } from 'stream';
-export declare type Body = Buffer | Record<string, any> | string | null | Readable | ((writeable: Writable) => void);
+import { Readable, Writable } from 'node:stream';
+import { Middleware } from './application.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+export type Body = Buffer | Record<string, any> | string | null | Readable | ((writeable: Writable) => void);
 /**
@@ -8,0 +8,0 @@ * This interface represents an incoming server request.

esm/response.js

@@ -1,3 +0,3 @@
-import { is } from './header-helpers';
-import { Headers } from './headers';
+import { is } from './header-helpers.js';
+import { Headers } from './headers.js';
 /**
@@ -4,0 +4,0 @@ * This interface represents an incoming server request.

package.json

 {
   "name": "@curveball/kernel",
-  "version": "0.21.0-beta.7",
+  "version": "0.21.0-beta.9",
   "description": "Curveball is a framework writting in Typescript for Node.js",
   "main": "cjs/index.js",
+  "type": "module",
   "exports": {
     "require": "./cjs/index.js",
-    "import": "./esm/index.js",
-    "export": "./esm/index.js"
+    "import": "./esm/index.js"
   },
@@ -57,6 +57,4 @@ "scripts": {
     "ts-node": "^10.4.0",
-    "typescript": "^4.1.5",
-    "webpack-cli": "^4.10.0"
+    "typescript": "^4.9.5"
   },
-  "types": "dist/",
   "nyc": {
@@ -79,5 +77,7 @@ "extension": [
     "require": [
-      "ts-node/register",
-      "./test/polyfills.js"
+      "./test/polyfills.mjs"
     ],
+    "loader": [
+      "ts-node/esm"
+    ],
     "recursive": true,
@@ -84,0 +84,0 @@ "extension": [

src/application.ts

@@ -1,22 +0,24 @@
-import { EventEmitter } from 'events';
-
+import { EventEmitter } from 'node:events';
 import { isHttpError } from '@curveball/http-errors';
 
-import { Context } from './context';
-import { HeadersInterface, HeadersObject } from './headers';
-import MemoryRequest from './memory-request';
-import MemoryResponse from './memory-response';
-import NotFoundMw from './middleware/not-found';
-import { Request as CurveballRequest } from './request';
-import { Response as CurveballResponse } from './response';
+import { Context } from './context.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import MemoryRequest from './memory-request.js';
+import MemoryResponse from './memory-response.js';
+import NotFoundMw from './middleware/not-found.js';
+import { Request as CurveballRequest } from './request.js';
+import { Response as CurveballResponse } from './response.js';
 import {
   curveballResponseToFetchResponse,
   fetchRequestToCurveballRequest
-} from './fetch-util';
-import { getGlobalOrigin } from './global-origin';
+} from './fetch-util.js';
+import { getGlobalOrigin } from './global-origin.js';
 
+/**
+ * Package version
+ *
+ * This line gets automatically replaced during the build phase
+ */
+const VERSION = 'Curveball/dev';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const pkg = require('../package.json');
-
 /**
@@ -88,3 +90,3 @@ * The middleware-call Symbol is a special symbol that might exist as a
   async handle(ctx: Context): Promise<void> {
-    ctx.response.headers.set('Server', 'curveball/' + pkg.version);
+    ctx.response.headers.set('Server', VERSION);
     ctx.response.type = 'application/hal+json';
@@ -91,0 +93,0 @@ await invokeMiddlewares(ctx, [...this.middlewares, NotFoundMw]);

src/conditional.ts

@@ -1,2 +0,2 @@
-import RequestInterface from './request';
+import RequestInterface from './request.js';
 
@@ -3,0 +3,0 @@ /**

src/context.ts

@@ -1,7 +0,8 @@
-import { Middleware } from './application';
-import { HeadersInterface, HeadersObject } from './headers';
-import Request from './request';
-import Response from './response';
 import * as WebSocket from 'ws';
 
+import { Middleware } from './application.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import Request from './request.js';
+import Response from './response.js';
+
 /**
@@ -8,0 +9,0 @@ * The Context object encapsulates a single HTTP request.

src/fetch-util.ts

@@ -1,6 +0,7 @@
-import { MemoryRequest as CurveballRequest } from './memory-request';
-import { Response as CurveballResponse } from './response';
-import { Headers as CurveballHeaders } from './headers';
 import { PassThrough, Readable, Writable } from 'stream';
 
+import { MemoryRequest as CurveballRequest } from './memory-request.js';
+import { Response as CurveballResponse } from './response.js';
+import { Headers as CurveballHeaders } from './headers.js';
+
 export async function fetchRequestToCurveballRequest(request: Request, origin: string): Promise<CurveballRequest<unknown>> {
@@ -7,0 +8,0 @@

src/header-helpers.ts

@@ -1,3 +0,3 @@
-import RequestInterface from './request';
-import ResponseInterface from './response';
+import RequestInterface from './request.js';
+import ResponseInterface from './response.js';
 
@@ -4,0 +4,0 @@ /**

src/index.ts

@@ -1,7 +0,7 @@
-export { conditionalCheck } from './conditional';
+export { conditionalCheck } from './conditional.js';
 
-export { default as Request } from './request';
-export { default as Response, Body } from './response';
-export { default as MemoryRequest } from './memory-request';
-export { default as MemoryResponse } from './memory-response';
+export { default as Request } from './request.js';
+export { default as Response, Body } from './response.js';
+export { default as MemoryRequest } from './memory-request.js';
+export { default as MemoryResponse } from './memory-response.js';
 
@@ -13,3 +13,3 @@ export{
   middlewareCall
-} from './application';
+} from './application.js';
 
@@ -19,3 +19,3 @@ export {
   WsContext
-} from './context';
+} from './context.js';
 
@@ -26,3 +26,3 @@ export {
   HeadersObject
-} from './headers';
+} from './headers.js';
 
@@ -32,4 +32,4 @@ export {
   setGlobalOrigin,
-} from './global-origin';
+} from './global-origin.js';
 
-export * as headerHelpers from './header-helpers';
+export * as headerHelpers from './header-helpers.js';

src/memory-request.ts

@@ -1,5 +0,6 @@
-import { Readable } from 'stream';
-import { Headers, HeadersInterface, HeadersObject } from './headers';
-import { Request, Encoding } from './request';
+import { Readable } from 'node:stream';
 
+import { Headers, HeadersInterface, HeadersObject } from './headers.js';
+import { Request, Encoding } from './request.js';
+
 export class MemoryRequest<T> extends Request<T> {
@@ -6,0 +7,0 @@

src/memory-response.ts

@@ -1,3 +0,3 @@
-import { Headers } from './headers';
-import { Response, Body } from './response';
+import { Headers } from './headers.js';
+import { Response, Body } from './response.js';
 
@@ -4,0 +4,0 @@ export class MemoryResponse<T = Body> extends Response<T> {

src/middleware/not-found.ts

 import { HttpProblem } from '@curveball/http-errors';
-import { Context } from '../context';
 
+import { Context } from '../context.js';
+
 /**
@@ -5,0 +6,0 @@ * This middleware simply triggers a 'NotFound' error.

src/request.ts

@@ -1,12 +0,19 @@
-import * as accepts from 'accepts';
-import * as http from 'http';
-import { Readable } from 'stream';
-import * as url from 'url';
-import { is, parsePrefer } from './header-helpers';
-import { HeadersInterface } from './headers';
-import { Headers } from './headers';
+import * as AcceptsImp from 'accepts';
+import * as http from 'node:http';
+import { Readable } from 'node:stream';
+import * as url from 'node:url';
 
+import { is, parsePrefer } from './header-helpers.js';
+import { HeadersInterface } from './headers.js';
+import { Headers } from './headers.js';
+
 export type Encoding = 'utf-8' | 'ascii' | 'hex';
 
 /**
+ * We gotta do this ugly thing to make this work in CommonJS and ESM
+ */
+// @ts-expect-error https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/64233
+const Accepts = AcceptsImp.default ?? AcceptsImp;
+
+/**
  * This interface represents an incoming server request.
@@ -149,3 +156,4 @@ */
 
-    const result = accepts(mockRequestObj as http.IncomingMessage).type(types) as string|false;
+
+    const result = new Accepts(mockRequestObj as http.IncomingMessage).type(types) as string|false;
     return result === false ? null : result;
@@ -152,0 +160,0 @@

src/response.ts

@@ -1,7 +0,8 @@
-import { Middleware } from './application';
-import { is } from './header-helpers';
-import { HeadersInterface, HeadersObject } from './headers';
-import { Headers } from './headers';
-import { Readable, Writable } from 'stream';
+import { Readable, Writable } from 'node:stream';
 
+import { Middleware } from './application.js';
+import { is } from './header-helpers.js';
+import { HeadersInterface, HeadersObject } from './headers.js';
+import { Headers } from './headers.js';
+
 export type Body =
@@ -8,0 +9,0 @@ Buffer |

No alert changes

Improved metrics

Total package byte prevSize

188356

0.74%

Dev dependency count

14

-6.67%

Lines of code

4487

0.61%

Is type module

Yes

NaN

No dependency changes