refactor: convert to typescript, move logic inside service

.github/workflows/ci.yml

@@ -17,6 +17,7 @@ jobs:
       - run: yarn install
       - run: yarn format
       - run: yarn lint
+      - run: yarn build
       - run: yarn test:bin
       - run: yarn test --coverage
       - run: yarn check-git

.gitignore

@@ -9,6 +9,7 @@
 **/node_modules
 **/*.log
 coverage
+dist
 
 # Other
 **/.idea

.npmignore

@@ -7,3 +7,9 @@ coverage
 *.iml
 **/__tests__
 **/__mocks__
+.github
+.yarn
+.yarnrc.yml
+src
+test
+.tsconfig

package.json

@@ -14,21 +14,29 @@
   "author": "DevSide",
   "license": "MIT",
   "type": "module",
-  "bin": "bin/dynamock.js",
-  "main": "src/createServer.js",
+  "bin": "./dist/bin/dynamock.js",
+  "main": "dist/createServer.js",
   "scripts": {
+    "build": "rm -rf dist/ && tsc && chmod +x ./dist/bin/dynamock.js && yarn link",
     "check-git": "git status -uno --porcelain && [ -z \"$(git status -uno --porcelain)\" ] || (echo 'Git working directory not clean'; false)",
     "format": "npx @biomejs/biome format --write src",
     "lint": "npx @biomejs/biome lint --write src",
     "release": "semantic-release",
+    "ts": "tsc --noEmit",
     "test": "NODE_OPTIONS='--enable-source-maps --experimental-vm-modules' jest src --coverage",
     "test:bin": "node test/bin.js"
   },
   "engines": {
     "node": ">=20"
   },
   "jest": {
-    "transform": {}
+    "preset": "ts-jest",
+    "transform": {
+      "^.+\\.ts$": "ts-jest"
+    },
+    "moduleNameMapper": {
+      "^(\\.\\.?\\/.+)\\.js$": "$1"
+    }
   },
   "dependencies": {
     "@hapi/joi": "17.1.1",
@@ -43,9 +51,15 @@
     "@semantic-release/github": "^11.0.0",
     "@semantic-release/npm": "^12.0.1",
     "@semantic-release/release-notes-generator": "^14.0.1",
+    "@types/cookie-parser": "^1.4.7",
+    "@types/express": "^5.0.0",
+    "@types/hapi__joi": "^17.1.14",
+    "@types/supertest": "^6.0.2",
     "jest": "^29.7.0",
     "semantic-release": "^24.1.2",
-    "supertest": "^7.0.0"
+    "supertest": "^7.0.0",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3"
   },
   "packageManager": "yarn@4.5.0"
 }

src/__tests__/integrations.js → src/__tests__/integrations.ts

@@ -2,11 +2,13 @@ import { beforeAll, afterEach, afterAll, describe, test } from '@jest/globals'
 import { dirname } from 'node:path'
 import { mkdirSync, writeFileSync } from 'node:fs'
 import supertest from 'supertest'
-import { createServer } from '../createServer'
+import { createServer } from '../createServer.js'
+
+type Method = 'options' | 'put' | 'get' | 'post' | 'head' | 'delete' | 'patch'
 
 describe('integrations.js', () => {
-  let server
-  let request
+  let server = createServer()
+  let request = supertest.agent(server)
 
   beforeAll((done) => {
     server = createServer()
@@ -18,7 +20,6 @@ describe('integrations.js', () => {
 
   afterAll((done) => {
     server.close(done)
-    server = null
   })
 
   describe('manipulate configuration', () => {
@@ -444,7 +445,7 @@ describe('integrations.js', () => {
           })
           .expect(201)
 
-        await request[method](path)
+        await request[method as Method](path)
           .set({
             'Access-Control-Allow-Origin': '*',
             'Access-Control-Allow-Methods': '*',
@@ -539,7 +540,7 @@ describe('integrations.js', () => {
           })
           .expect(201)
 
-        await request[method](path).expect(shouldMatch ? 200 : 404)
+        await request[method as Method](path).expect(shouldMatch ? 200 : 404)
       },
     )
   })
@@ -680,6 +681,7 @@ describe('integrations.js', () => {
 
         const cookies = Object.entries(values)
           .reduce((acc, [key, value]) => {
+            // @ts-ignore
             acc.push(`${key}=${value}`)
             return acc
           }, [])
@@ -1006,12 +1008,14 @@ describe('integrations.js', () => {
 
         if (property === 'headers') {
           for (const key in expectedPropertyValue) {
+            // @ts-ignore
             r.expect(key, expectedPropertyValue[key])
           }
         } else {
           const cookieValue = []
 
           for (const key in expectedPropertyValue) {
+            // @ts-ignore
             cookieValue.push(`${key}=${expectedPropertyValue[key]}; Path=/`)
           }
 

bin/dynamock.js → src/bin/dynamock.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { createServer } from "../src/createServer.js"
+import { createServer } from '../createServer.js'
 
 const [, , port, host = '127.0.0.1'] = process.argv
 
@@ -10,11 +10,11 @@ if (!port) {
 
 const server = createServer()
 
-server.listen(port, host, () => {
+server.listen(Number(port), host, () => {
   console.log(`dynamock is running on port ${port}...`)
 })
 
-function shutDown () {
+function shutDown() {
   console.log('dynamock is shutting down gracefully')
   server.close(() => {
     process.exit(0)

src/configuration.js → src/configuration.ts

@@ -1,17 +1,30 @@
 import Joi from '@hapi/joi'
 
+export type ConfigurationObjectType = {
+  [key: string]: {
+    [key: string]: string
+  }
+}
+
+export type ConfigurationType = {
+  cors: null | '*'
+  headers: ConfigurationObjectType
+  query: ConfigurationObjectType
+  cookies: ConfigurationObjectType
+}
+
 const schema = Joi.object({
   cors: Joi.alternatives([Joi.string().valid('*'), Joi.object().valid(null)]),
   headers: Joi.object(),
   query: Joi.object(),
   cookies: Joi.object(),
 }).required()
 
-export function validateConfiguration(unsafeConfiguration) {
+export function validateConfiguration(unsafeConfiguration: unknown) {
   return schema.validate(unsafeConfiguration).error
 }
 
-export function createConfiguration() {
+export function createConfiguration(): ConfigurationType {
   return {
     cors: null,
     headers: {},
@@ -20,7 +33,13 @@ export function createConfiguration() {
   }
 }
 
-export function updateConfiguration(configuration, cors, headers, query, cookies) {
+export function updateConfiguration(
+  configuration: ConfigurationType,
+  cors: undefined | null | '*',
+  headers: undefined | ConfigurationObjectType,
+  query: undefined | ConfigurationObjectType,
+  cookies: undefined | ConfigurationObjectType,
+) {
   if (cors !== undefined) {
     configuration.cors = cors === '*' ? '*' : null
   }