Merge pull request #21 from hatsyjs/v3

v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hatsy/hatsy",
-  "version": "2.5.3",
+  "version": "3.0.0-pre.0",
   "description": "Asynchronous TypeScript-friendly HTTP server for Node.js",
   "keywords": [
     "http-framework",
@@ -22,10 +22,10 @@
   "types": "./dist/hatsy.d.ts",
   "typesVersions": {
     "*": {
-      "core": [
+      "core.js": [
         "./dist/hatsy.core.d.ts"
       ],
-      "testing": [
+      "testing.js": [
         "./dist/hatsy.testing.d.ts"
       ]
     }
@@ -35,30 +35,28 @@
       "types": "./dist/hatsy.d.ts",
       "default": "./dist/hatsy.js"
     },
-    "./core": {
+    "./core.js": {
       "types": "./dist/hatsy.core.d.ts",
       "default": "./dist/hatsy.core.js"
     },
     "./package.json": "./package.json",
-    "./testing": {
+    "./testing.js": {
       "types": "./dist/hatsy.testing.d.ts",
       "default": "./dist/hatsy.testing.js"
     }
   },
   "sideEffects": false,
   "dependencies": {
-    "@frontmeans/httongue": "^2.4.0",
-    "@hatsy/http-header-value": "^3.7.1",
-    "@proc7ts/logger": "^1.3.2",
-    "@proc7ts/primitives": "^3.0.2"
+    "@proc7ts/logger": "^2.0.0",
+    "@proc7ts/primitives": "^4.0.1",
+    "httongue": "^3.1.0",
+    "http-header-value": "^4.0.0"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=18"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@proc7ts/context-values": "^7.1.1",
-    "@proc7ts/logger": "^1.3.2",
     "@run-z/eslint-config": "^3.5.0",
     "@run-z/prettier-config": "^2.0.0",
     "@run-z/project-config": "^0.20.0",

src/core/dispatch-error.ts

@@ -1,6 +1,6 @@
-import type { ErrorMeans } from './error.means';
-import type { RequestHandler } from './request-handler';
-import { requestExtension } from './request-modification';
+import type { ErrorMeans } from './error.means.js';
+import type { RequestHandler } from './request-handler.js';
+import { requestExtension } from './request-modification.js';
 
 /**
  * Dispatches request processing error.

src/core/logging/logger.means.ts

@@ -1,4 +1,4 @@
-import type { RequestLogger } from './request-logger';
+import type { RequestLogger } from './request-logger.js';
 
 /**
  * Request logger means.

src/core/logging/logging.capability.ts

@@ -1,9 +1,9 @@
 import { consoleLogger } from '@proc7ts/logger';
-import { RequestCapability } from '../request-capability';
-import type { RequestHandler } from '../request-handler';
-import { requestExtension } from '../request-modification';
-import type { LoggerMeans } from './logger.means';
-import type { RequestLogger } from './request-logger';
+import { RequestCapability } from '../request-capability.js';
+import type { RequestHandler } from '../request-handler.js';
+import { requestExtension } from '../request-modification.js';
+import type { LoggerMeans } from './logger.means.js';
+import type { RequestLogger } from './request-logger.js';
 
 /**
  * Request logging capability.

src/core/logging/logging.spec.ts

@@ -2,13 +2,13 @@ import { beforeEach, describe, expect, it, jest } from '@jest/globals';
 import { consoleLogger, silentLogger } from '@proc7ts/logger';
 import { noop } from '@proc7ts/primitives';
 import type { Mock } from 'jest-mock';
-import type { RequestContext } from '../request-context';
-import type { RequestHandler } from '../request-handler';
-import type { RequestProcessor } from '../request-processor';
-import { requestProcessor } from '../request-processor';
-import type { LoggerMeans } from './logger.means';
-import { Logging } from './logging.capability';
-import type { RequestLogger } from './request-logger';
+import type { RequestContext } from '../request-context.js';
+import type { RequestHandler } from '../request-handler.js';
+import type { RequestProcessor } from '../request-processor.js';
+import { requestProcessor } from '../request-processor.js';
+import type { LoggerMeans } from './logger.means.js';
+import { Logging } from './logging.capability.js';
+import type { RequestLogger } from './request-logger.js';
 
 describe('Logging', () => {
   let handler: Mock<(context: RequestContext<LoggerMeans>) => void>;

src/core/logging/mod.ts

@@ -0,0 +1,3 @@
+export * from './logger.means.js';
+export * from './logging.capability.js';
+export * from './request-logger.js';

src/core/mod.ts

@@ -0,0 +1,13 @@
+/**
+ * @module @hatsy/hatsy/core.js
+ */
+export * from './dispatch-error.js';
+export * from './error.means.js';
+export * from './logging/mod.js';
+export * from './request-body.means.js';
+export * from './request-capability.js';
+export * from './request-context.js';
+export * from './request-handler.js';
+export * from './request-modification.js';
+export * from './request-processor.js';
+export * from './request-value-transformer.js';

src/core/request-capability.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler } from './request-handler';
+import type { RequestHandler } from './request-handler.js';
 
 /**
  * Request processing capability.

src/core/request-context.ts

@@ -1,5 +1,5 @@
-import type { RequestHandler } from './request-handler';
-import type { RequestModification } from './request-modification';
+import type { RequestHandler } from './request-handler.js';
+import type { RequestModification } from './request-modification.js';
 
 /**
  * Request processing context.

src/core/request-handler.spec.ts

@@ -1,8 +1,8 @@
 import { beforeEach, describe, expect, it } from '@jest/globals';
 import { valueProvider } from '@proc7ts/primitives';
 import type { ServerResponse } from 'node:http';
-import type { RequestContext } from './request-context';
-import { requestHandler, RequestHandler } from './request-handler';
+import type { RequestContext } from './request-context.js';
+import { requestHandler, RequestHandler } from './request-handler.js';
 
 describe('requestHandler', () => {
   let context: RequestContext<object>;

src/core/request-handler.ts

@@ -1,11 +1,11 @@
-import type { RequestContext } from './request-context';
+import type { RequestContext } from './request-context.js';
 
 /**
  * Request processing handler signature.
  *
  * Handler implementations expect a request processing context containing specific processing means.
  * E.g. the ones for {@link HttpMeans HTTP request processing}. The handler may either respond using the provided means,
- * or delegate to {@link RequestContext.Agent.next next handler}.
+ * or delegate to {@link RequestContext.Agent#next next handler}.
  *
  * The handler may be asynchronous.
  *

src/core/request-processor.ts

@@ -1,6 +1,6 @@
-import type { RequestContext } from './request-context';
-import type { RequestHandler, RequestHandlerMethod } from './request-handler';
-import type { RequestModification } from './request-modification';
+import type { RequestContext } from './request-context.js';
+import type { RequestHandler, RequestHandlerMethod } from './request-handler.js';
+import type { RequestModification } from './request-modification.js';
 
 /**
  * Generic request processor.

src/core/request-value-transformer.ts

@@ -1,4 +1,4 @@
-import type { RequestContext } from './request-context';
+import type { RequestContext } from './request-context.js';
 
 /**
  * Signature of request value transformer function.

src/http/dispatch/dispatch-by-accepted.handler.spec.ts

@@ -1,12 +1,13 @@
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from '@jest/globals';
 import { silentLogger } from '@proc7ts/logger';
-import type { RequestContext } from '../../core';
-import { Logging } from '../../core';
-import { TestHttpServer } from '../../testing';
-import type { HttpMeans } from '../http.means';
-import { Rendering, RenderMeans } from '../render';
-import { addResponseHeader } from '../util';
-import { dispatchByAccepted } from './dispatch-by-accepted.handler';
+import { Logging } from '../../core/logging/logging.capability.js';
+import { RequestContext } from '../../core/request-context.js';
+import { TestHttpServer } from '../../testing/test-http-server.js';
+import { HttpMeans } from '../http.means.js';
+import { RenderMeans } from '../render/render.means.js';
+import { Rendering } from '../render/rendering.capability.js';
+import { addResponseHeader } from '../util/add-response-header.js';
+import { dispatchByAccepted } from './dispatch-by-accepted.handler.js';
 
 describe('dispatchByAccepted', () => {
   let server: TestHttpServer;

src/http/dispatch/dispatch-by-accepted.handler.ts

@@ -1,8 +1,8 @@
-import { httpMimeNegotiator } from '@hatsy/http-header-value/headers';
-import type { RequestHandler, RequestHandlerMethod } from '../../core';
-import { HttpError } from '../http-error';
-import type { HttpMeans } from '../http.means';
-import { addResponseHeader } from '../util';
+import { httpMimeNegotiator } from 'http-header-value/headers.js';
+import { HttpError } from '../http-error.js';
+import type { HttpMeans } from '../http.means.js';
+import { RequestHandler, RequestHandlerMethod } from '../../core/request-handler.js';
+import { addResponseHeader } from '../util/add-response-header.js';
 
 /**
  * Request processing handlers for accepted MIME types.

src/http/dispatch/dispatch-by-language.handler.spec.ts

@@ -1,9 +1,9 @@
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from '@jest/globals';
 import { silentLogger } from '@proc7ts/logger';
-import { Logging } from '../../core';
-import { TestHttpServer } from '../../testing';
-import { Rendering } from '../render';
-import { dispatchByLanguage } from './dispatch-by-language.handler';
+import { Logging } from '../../core/logging/logging.capability.js';
+import { TestHttpServer } from '../../testing/test-http-server.js';
+import { Rendering } from '../render/rendering.capability.js';
+import { dispatchByLanguage } from './dispatch-by-language.handler.js';
 
 describe('dispatchByLanguage', () => {
   let server: TestHttpServer;

src/http/dispatch/dispatch-by-language.handler.ts

@@ -1,8 +1,8 @@
-import { httpLanguageNegotiator } from '@hatsy/http-header-value/headers';
-import type { RequestHandler, RequestHandlerMethod } from '../../core';
-import { HttpError } from '../http-error';
-import type { HttpMeans } from '../http.means';
-import { addResponseHeader } from '../util';
+import { httpLanguageNegotiator } from 'http-header-value/headers.js';
+import { RequestHandler, RequestHandlerMethod } from '../../core/request-handler.js';
+import { HttpError } from '../http-error.js';
+import type { HttpMeans } from '../http.means.js';
+import { addResponseHeader } from '../util/add-response-header.js';
 
 /**
  * Request processing handlers for accepted languages.

src/http/dispatch/dispatch-by-method.handler.spec.ts

@@ -1,12 +1,15 @@
 import { afterAll, afterEach, beforeAll, describe, expect, it } from '@jest/globals';
 import { silentLogger } from '@proc7ts/logger';
 import { noop } from '@proc7ts/primitives';
-import { Logging, RequestContext, requestHandler } from '../../core';
-import { TestHttpServer } from '../../testing';
-import { HttpError } from '../http-error';
-import type { HttpMeans } from '../http.means';
-import { Rendering, RenderMeans } from '../render';
-import { dispatchByMethod } from './dispatch-by-method.handler';
+import { TestHttpServer } from '../../testing/test-http-server.js';
+import { Rendering } from '../render/rendering.capability.js';
+import { dispatchByMethod } from './dispatch-by-method.handler.js';
+import { RequestContext } from '../../core/request-context.js';
+import { HttpMeans } from '../http.means.js';
+import { RenderMeans } from '../render/render.means.js';
+import { requestHandler } from '../../core/request-handler.js';
+import { Logging } from '../../core/logging/logging.capability.js';
+import { HttpError } from '../http-error.js';
 
 describe('dispatchByName', () => {
   let server: TestHttpServer;

src/http/dispatch/dispatch-by-method.handler.ts

@@ -1,5 +1,5 @@
-import type { RequestHandler, RequestHandlerMethod } from '../../core';
-import type { HttpMeans } from '../http.means';
+import { RequestHandler, RequestHandlerMethod } from '../../core/request-handler.js';
+import type { HttpMeans } from '../http.means.js';
 
 /**
  * Request processing handlers for HTTP request methods.

src/http/dispatch/mod.ts

@@ -0,0 +1,3 @@
+export * from './dispatch-by-accepted.handler.js';
+export * from './dispatch-by-language.handler.js';
+export * from './dispatch-by-method.handler.js';

src/http/http-config.ts

@@ -1,5 +1,6 @@
-import type { ErrorMeans, RequestHandler } from '../core';
-import type { HttpMeans } from './http.means';
+import { ErrorMeans } from '../core/error.means.js';
+import { RequestHandler } from '../core/request-handler.js';
+import type { HttpMeans } from './http.means.js';
 
 /**
  * HTTP processing configuration.

src/http/http-error.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from '@jest/globals';
 import { dueLog } from '@proc7ts/logger';
-import { HttpError } from './http-error';
+import { HttpError } from './http-error.js';
 
 describe('HttpError', () => {
   describe('message', () => {
@@ -33,11 +33,11 @@ describe('HttpError', () => {
       ]);
     });
     it('expands reason at output stage', () => {
-      const reason = new Error('test');
+      const cause = new Error('test');
 
-      expect(dueLog({ on: 'out', line: [new HttpError(500, { reason })] }).line).toEqual([
+      expect(dueLog({ on: 'out', line: [new HttpError(500, { cause })] }).line).toEqual([
         '500',
-        reason,
+        cause,
       ]);
     });
   });