Chore/upgrade chai

.depcheckrc

@@ -1,9 +1 @@
-ignores: [
-  "concurrently",
-  "pino-colada",
-  "nodemon",
-  "multer",
-  "pg",
-  "undici",
-  "supertest",
-]
+ignores: ['concurrently', 'pino-colada', 'nodemon', 'multer', 'pg', 'ts-node', 'undici', 'supertest']

nodemon.json

@@ -0,0 +1,7 @@
+{
+  "exec": "node --import 'data:text/javascript,import { register } from \"node:module\"; import { pathToFileURL } from \"node:url\"; register(\"ts-node/esm\", pathToFileURL(\"./\"));' src/index.ts",
+  "watch": [
+    "src"
+  ],
+  "ext": "ts"
+}

package.json

@@ -1,28 +1,30 @@
 {
   "name": "@digicatapult/dscp-hyproof-api",
-  "version": "0.7.17",
+  "version": "0.7.18",
   "description": "An OpenAPI API service for DSCP",
   "main": "src/index.ts",
+  "type": "module",
   "scripts": {
     "lint": "eslint .",
     "depcheck": "depcheck",
     "build:tsoa": "tsoa spec-and-routes",
     "build": "tsoa spec-and-routes && tsc",
     "start": "node build/index.js",
-    "dev": "npm run build && NODE_ENV=dev concurrently \"npx tsc --watch\" \"nodemon -q build/index.js | pino-colada\"",
-    "test:offchain": "NODE_ENV=test ./node_modules/.bin/mocha --config ./test/mocharc.json -r ts-node/register ./test/integration/offchain/*.test.ts",
-    "test:onchain": "NODE_ENV=test ./node_modules/.bin/mocha --config ./test/mocharc.json -r ts-node/register ./test/integration/onchain/*.test.ts",
-    "test:unit": "NODE_ENV=test ./node_modules/.bin/mocha --config ./test/mocharc.json -r ts-node/register ./src/**/*.test.ts",
-    "db:migrate": "npx knex migrate:latest --knexfile src/lib/db/knexfile.ts",
-    "db:rollback": "npx knex migrate:rollback --knexfile src/lib/db/knexfile.ts",
+    "dev": "concurrently \"NODE_ENV=dev nodemon | pino-colada\" \"nodemon -x tsoa spec-and-routes --ignore src/routes.ts --ignore src/swagger.json\"",
+    "test:offchain": "NODE_ENV=test ./node_modules/.bin/mocha --config ./test/mocharc.json ./test/integration/offchain/*.test.ts",
+    "test:onchain": "NODE_ENV=test ./node_modules/.bin/mocha --config ./test/mocharc.json ./test/integration/onchain/*.test.ts",
+    "test:unit": "NODE_ENV=test ./node_modules/.bin/mocha --config ./test/mocharc.json ./src/**/*.test.ts",
+    "db:cmd": "node --import='data:text/javascript,import { register } from \"node:module\"; import { pathToFileURL } from \"node:url\"; register(\"ts-node/esm\", pathToFileURL(\"./\"));' ./node_modules/.bin/knex",
+    "db:migrate": "npm run db:cmd -- migrate:latest --knexfile src/lib/db/knexfile.ts",
+    "db:rollback": "npm run db:cmd -- migrate:rollback --knexfile src/lib/db/knexfile.ts",
     "flows": "npx @digicatapult/dscp-process-management@latest create -h localhost -p 9944 -u //Alice -f ./processFlows.json"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/digicatapult/dscp-hyproof-api.git"
   },
   "engines": {
-    "node": "20.x.x",
+    "node": ">=20.8",
     "npm": "10.x.x"
   },
   "keywords": [
@@ -47,7 +49,7 @@
     "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^6.17.0",
     "@typescript-eslint/parser": "^6.17.0",
-    "chai": "^4.3.10",
+    "chai": "^5.0.0",
     "concurrently": "^8.2.2",
     "depcheck": "^1.4.7",
     "eslint": "^8.56.0",

src/controllers/health/index.ts

@@ -1,12 +1,13 @@
 import { Controller, Get, Response, Route, SuccessResponse, Hidden } from 'tsoa'
-import type { Health } from '../../models'
-import { logger } from '../../lib/logger'
-import { serviceState } from '../../lib/service-watcher/statusPoll'
-import { ServiceUnavailable } from '../../lib/error-handler/index'
-
-import { ServiceWatcher } from '../../lib/service-watcher'
 import { injectable } from 'tsyringe'
 
+import type { Health } from '../../models/index.js'
+import { logger } from '../../lib/logger.js'
+import { serviceState } from '../../lib/service-watcher/statusPoll.js'
+import { ServiceUnavailable } from '../../lib/error-handler/index.js'
+
+import { ServiceWatcher } from '../../lib/service-watcher/index.js'
+
 const packageVersion = process.env.npm_package_version ? process.env.npm_package_version : 'unknown'
 
 const serviceStatusStrings = {

src/controllers/v1/attachment/index.ts

@@ -16,15 +16,15 @@ import {
 } from 'tsoa'
 import { Logger } from 'pino'
 import express from 'express'
+import { injectable } from 'tsyringe'
 import { Readable } from 'node:stream'
 
-import { logger } from '../../../lib/logger'
-import Database from '../../../lib/db'
-import type * as Attachment from '../../../models'
-import { BadRequest, InternalServerError, NotFound } from '../../../lib/error-handler'
-import type { UUID, DATE } from '../../../models/strings'
-import Ipfs from '../../../lib/ipfs'
-import { injectable } from 'tsyringe'
+import { logger } from '../../../lib/logger.js'
+import Database from '../../../lib/db/index.js'
+import type * as Attachment from '../../../models/index.js'
+import { BadRequest, InternalServerError, NotFound } from '../../../lib/error-handler/index.js'
+import type { UUID, DATE } from '../../../models/strings.js'
+import Ipfs from '../../../lib/ipfs.js'
 
 const parseAccept = (acceptHeader: string) =>
   acceptHeader

src/controllers/v1/certificate/__tests__/index.test.ts

@@ -1,15 +1,15 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 
-import { CertificateController } from '../index'
-import Identity from '../../../../lib/services/identity'
-import { Env } from '../../../../env'
-import Database from '../../../../lib/db'
-import ChainNode from '../../../../lib/chainNode'
-import Commitment from '../../../../lib/services/commitment'
-import EmissionsCalculator from '../../../../lib/services/emissionsCalculator'
-import { BadRequest, InternalServerError, NotFound } from '../../../../lib/error-handler'
-import { CertificateRow, TransactionRow } from '../../../../lib/db/types'
+import { CertificateController } from '../index.js'
+import Identity from '../../../../lib/services/identity.js'
+import { Env } from '../../../../env.js'
+import Database from '../../../../lib/db/index.js'
+import ChainNode from '../../../../lib/chainNode.js'
+import Commitment from '../../../../lib/services/commitment.js'
+import EmissionsCalculator from '../../../../lib/services/emissionsCalculator.js'
+import { BadRequest, InternalServerError, NotFound } from '../../../../lib/error-handler/index.js'
+import { CertificateRow, TransactionRow } from '../../../../lib/db/types.js'
 
 const attachmentExample = {
   filename: 'testing-revocation',

src/controllers/v1/certificate/index.ts

@@ -16,19 +16,19 @@ import {
 import type { Logger } from 'pino'
 import { injectable } from 'tsyringe'
 
-import { logger } from '../../../lib/logger'
-import { CertificateRow, Where } from '../../../lib/db/types'
-import Database from '../../../lib/db'
-import { BadRequest, InternalServerError, NotFound } from '../../../lib/error-handler/index'
-import Identity from '../../../lib/services/identity'
-import * as Certificate from '../../../models/certificate'
-import * as Transaction from '../../../models/transaction'
-import { DATE, UUID } from '../../../models/strings'
-import ChainNode from '../../../lib/chainNode'
-import { processInitiateCert, processIssueCert, processRevokeCert } from '../../../lib/payload'
-import { TransactionState } from '../../../models/transaction'
-import Commitment from '../../../lib/services/commitment'
-import EmissionsCalculator from '../../../lib/services/emissionsCalculator'
+import { logger } from '../../../lib/logger.js'
+import { CertificateRow, Where } from '../../../lib/db/types.js'
+import Database from '../../../lib/db/index.js'
+import { BadRequest, InternalServerError, NotFound } from '../../../lib/error-handler/index.js'
+import Identity from '../../../lib/services/identity.js'
+import * as Certificate from '../../../models/certificate.js'
+import * as Transaction from '../../../models/transaction.js'
+import { DATE, UUID } from '../../../models/strings.js'
+import ChainNode from '../../../lib/chainNode.js'
+import { processInitiateCert, processIssueCert, processRevokeCert } from '../../../lib/payload.js'
+import { TransactionState } from '../../../models/transaction.js'
+import Commitment from '../../../lib/services/commitment.js'
+import EmissionsCalculator from '../../../lib/services/emissionsCalculator.js'
 
 @Route('v1/certificate')
 @injectable()

src/controllers/v1/transaction/index.ts

@@ -1,16 +1,17 @@
 import { Controller, Get, Route, Path, Response, Tags, Security, Query } from 'tsoa'
 import type { Logger } from 'pino'
-import { logger } from '../../../lib/logger'
-import Database from '../../../lib/db'
-import { DATE, UUID } from '../../../models/strings'
-import { BadRequest, NotFound } from '../../../lib/error-handler/index'
+import { injectable } from 'tsyringe'
+
+import { logger } from '../../../lib/logger.js'
+import Database from '../../../lib/db/index.js'
+import { DATE, UUID } from '../../../models/strings.js'
+import { BadRequest, NotFound } from '../../../lib/error-handler/index.js'
 import {
   TransactionApiType,
   GetTransactionResponse,
   ListTransactionResponse,
   TransactionState,
-} from '../../../models/transaction'
-import { injectable } from 'tsyringe'
+} from '../../../models/transaction.js'
 
 @injectable()
 @Route('v1/transaction')

src/index.ts

@@ -3,13 +3,13 @@ import 'reflect-metadata'
 import { Express } from 'express'
 import { container } from 'tsyringe'
 
-import Indexer from './lib/indexer'
-import ChainNode from './lib/chainNode'
-import Database from './lib/db'
-import Server from './server'
-import { Env } from './env'
+import Indexer from './lib/indexer/index.js'
+import ChainNode from './lib/chainNode.js'
+import Database from './lib/db/index.js'
+import Server from './server.js'
+import { Env } from './env.js'
 
-import { logger } from './lib/logger'
+import { logger } from './lib/logger.js'
 ;(async () => {
   const app: Express = await Server()
   const env = container.resolve(Env)

src/ioc.ts

@@ -1,8 +1,8 @@
 import { IocContainer } from '@tsoa/runtime'
 import { container } from 'tsyringe'
 
-import Commitment from './lib/services/commitment'
-import Database from './lib/db'
+import Commitment from './lib/services/commitment.js'
+import Database from './lib/db/index.js'
 
 container.register(Commitment, { useValue: new Commitment('shake128') })
 container.register(Database, { useValue: new Database() })