change import signature (#24)

Author: volatilization

.github/workflows/npm-publish.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           node-version: 21
           registry-url: https://registry.npmjs.org/
-      - run: npm run prepublishOnly
+      - run: npm run prepublish
         env:
           RELEASE: ${{github.event.release.name}}
       - run: npm publish

.github/workflows/test.yml

@@ -17,9 +17,9 @@ jobs:
       - uses: oven-sh/setup-bun@v1
         with:
           bun-version: 1.1.4
-      - run: npm run testWithCoverageCheck
+      - run: npm run test:coverage
         env:
           COVERAGE_MIN_PERCENT: ${{vars.coverage_min_percent}}
-      - run: bun run bunTestWithCoverageCheck
+      - run: bun run test:bun:coverage
         env:
           COVERAGE_MIN_PERCENT: ${{vars.coverage_min_percent}}

README.md

@@ -13,23 +13,29 @@ const createServerFunction = require('node:http').createServer;
 const {
     Server,
     LoggedServer,
-    InputRequest,
-    JsonInputRequest,
-    LoggedInputRequest,
-    OutputResponse,
-    JsonOutputResponse,
-    LoggedOutputResponse,
-    Endpoint,
-    LoggedEndpoint,
-    Endpoints
+    endpoint: {
+        Endpoint,
+        LoggedEndpoint,
+        Endpoints
+    },
+    request: {
+        InputRequest,
+        JsonInputRequest,
+        LoggedInputRequest,
+    },
+    response: {
+        OutputResponse,
+        JsonOutputResponse,
+        LoggedOutputResponse
+    }
 } = require('objective-http').server;
 
 new LoggedServer(
     new Server(
         new Endpoints([
-            new MyFirstEndpoint(new LoggedEndpoint(new Endpoint(), console)),
-            new MySecondEndpoint(new LoggedEndpoint(new Endpoint(), console)),
-            new MyThirdEndpoint(new LoggedEndpoint(new Endpoint(), console))
+            new LoggedEndpoint(new MyFirstEndpoint(), console),
+            new LoggedEndpoint(new MySecondEndpoint(), console),
+            new LoggedEndpoint(new MyThirdEndpoint(), console)
         ]),
         {port: server_port},
         new LoggedInputRequest(new JsonInputRequest(new InputRequest()), console),
@@ -77,8 +83,12 @@ class MyEndpoint {
 const requestFunction = require('node:http').request;
 
 const {
-    OutputRequest,
-    InputResponse
+    request: {
+        OutputRequest
+    },
+    response: {
+        InputResponse
+    }
 } = require('objective-http').client;
 
 
@@ -127,23 +137,29 @@ const createServerFunction = require('node:http').createServer;
 const {
     Server,
     LoggedServer,
-    InputRequest,
-    JsonInputRequest,
-    LoggedInputRequest,
-    OutputResponse,
-    JsonOutputResponse,
-    LoggedOutputResponse,
-    Endpoint,
-    LoggedEndpoint,
-    Endpoints
+    endpoint: {
+        Endpoint,
+        LoggedEndpoint,
+        Endpoints
+    },
+    request: {
+        InputRequest,
+        JsonInputRequest,
+        LoggedInputRequest,
+    },
+    response: {
+        OutputResponse,
+        JsonOutputResponse,
+        LoggedOutputResponse
+    }
 } = require('objective-http').server;
 
 new LoggedServer(
     new Server(
         new Endpoints([
-            new MyFirstEndpoint(new LoggedEndpoint(new Endpoint(), console)),
-            new MySecondEndpoint(new LoggedEndpoint(new Endpoint(), console)),
-            new MyThirdEndpoint(new LoggedEndpoint(new Endpoint(), console))
+            new LoggedEndpoint(new MyFirstEndpoint(), console),
+            new LoggedEndpoint(new MySecondEndpoint(), console),
+            new LoggedEndpoint(new MyThirdEndpoint(), console)
         ]),
         {port: server_port},
         new LoggedInputRequest(new JsonInputRequest(new InputRequest()), console),
@@ -163,15 +179,28 @@ const createServerFunction = require('objective-http').bun.bunttp.createServer;
 const {
     Server,
     LoggedServer,
-    InputRequest,
-    JsonInputRequest,
-    LoggedInputRequest,
-    OutputResponse,
-    JsonOutputResponse,
-    LoggedOutputResponse,
-    Endpoint,
-    LoggedEndpoint,
-    Endpoints
+    endpoint: {
+        Endpoint,
+        LoggedEndpoint,
+        Endpoints
+    },
+    request: {
+        JsonInputRequest,
+        LoggedInputRequest,
+    },
+    response: {
+        JsonOutputResponse,
+        LoggedOutputResponse
+    }
+} = require('objective-http').server;
+
+const {
+    request: {
+        InputRequest
+    },
+    response: {
+        OutputResponse
+    }
 } = require('objective-http').bun.server;
 ```
 
@@ -184,8 +213,12 @@ It should work with `node` and `bun`:
 const requestFunction = require('node:http').request;
 
 const {
-    OutputRequest,
-    InputResponse
+    request: {
+        OutputRequest
+    },
+    response: {
+        InputResponse
+    }
 } = require('objective-http').client;
 
 await (new OutputRequest(new InputResponse(), requestFunction)
@@ -203,7 +236,11 @@ In order for the code to be executed only by `bun`, you need to make changes to
 const requestFunction = require('objective-http').bun.bunttp.request;
 
 const {
-    OutputRequest,
-    InputResponse
+    request: {
+        OutputRequest
+    },
+    response: {
+        InputResponse
+    }
 } = require('objective-http').bun.client;
 ```

package.json

@@ -11,11 +11,11 @@
     "oop"
   ],
   "scripts": {
-    "prepublishOnly": "node dist/prepublish.js",
+    "prepublish": "node src/scripts/prepublish.js",
     "test": "node --test  --experimental-test-coverage --test-reporter=spec **/test/**/[!b][!u][!n]*/**/*.js **/test/**/[!b][!u][!n]*/*.js",
-    "testWithCoverageCheck": "node src/test/static/coverageCheck.js",
-    "bunTest": "bun test --coverage **/test/**/bun/**/**",
-    "bunTestWithCoverageCheck": "bun src/test/static/bun/coverageCheck.js"
+    "test:coverage": "node src/scripts/coverage.js",
+    "test:bun": "bun test --coverage **/test/**/bun/**/**",
+    "test:bun:coverage": "bun src/scripts/bun/coverage.js"
   },
   "author": {
     "name": "volatilization",

src/js/bun/client/index.js

@@ -1,4 +1,4 @@
 module.exports = {
-    OutputRequest: require('./request/OutputRequest'),
-    InputResponse: require('./response/InputResponse')
+    request: require('./request'),
+    response: require('./response')
 }

src/js/bun/client/request/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    OutputRequest: require('./OutputRequest')
+};

src/js/bun/client/response/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    InputResponse: require('./InputResponse')
+};

src/js/bun/server/index.js

@@ -1,4 +1,4 @@
 module.exports = {
-    InputRequest: require('./request/InputRequest'),
-    OutputResponse: require('./response/OutputResponse')
+    request: require('./request'),
+    response: require('./response')
 }

src/js/bun/server/request/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    InputRequest: require('./InputRequest')
+};

src/js/bun/server/response/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    OutputResponse: require('./OutputResponse')
+};