Feature: Update jest unit test & packages

packages/proof-service/jest-resolver.cjs

@@ -1,5 +1,5 @@
-module.exports = (request, options) => {
-  return options.defaultResolver(request, {
+module.exports = (request, options) =>
+  options.defaultResolver(request, {
     ...options,
     packageFilter: (pkg) => {
       // When importing o1js, we specify the Node ESM import as Jest by default imports the web version
@@ -18,4 +18,3 @@ module.exports = (request, options) => {
       };
     },
   });
-};

packages/proof-service/jest.config.mjs → packages/proof-service/jest.config.js

@@ -3,14 +3,10 @@ export default {
   verbose: true,
   preset: 'ts-jest/presets/default-esm',
   testEnvironment: 'node',
-  testTimeout: 1_000_000,
-  globals: {
-    'ts-jest': {
-      useESM: true,
-    },
-  },
+  modulePaths: ['<rootDir>'],
+  testTimeout: 1000000,
   transform: {
-    '^.+\\.(t)s$': 'ts-jest',
+    '^.+\\.(t)s$': ['ts-jest', { useESM: true }],
     '^.+\\.(j)s$': 'babel-jest', // Use ts-jest for both .ts and .js files
   },
   resolver: '<rootDir>/jest-resolver.cjs',

packages/proof-service/package.json

@@ -17,7 +17,7 @@
     "build": "tsc",
     "buildw": "tsc --watch",
     "dev": "tsc && node ./build/src/index.js",
-    "coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
+    "coverage": "node --experimental-vm-modules node_modules/.bin/jest --coverage",
     "format": "prettier --write --ignore-unknown **/*",
     "test": "echo 'hello world'",
     "testw": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
@@ -44,11 +44,11 @@
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^27.6.3",
+    "eslint-plugin-jest": "28.9.0",
     "eslint-plugin-require-extensions": "^0.1.3",
     "jest": "29.7.0",
     "prettier": "^3.0.3",
-    "ts-jest": "^29.2.4",
+    "ts-jest": "29.2.5",
     "typedoc": "^0.26.7",
     "typescript": "^5.6.2"
   },

packages/serverless/jest.config.mjs → packages/serverless/jest.config.js

@@ -3,7 +3,7 @@ export default {
   verbose: true,
   preset: 'ts-jest/presets/default-esm',
   testEnvironment: 'node',
-  testTimeout: 1_000_000,
+  testTimeout: 1000000,
   globals: {
     'ts-jest': {
       useESM: true,

packages/serverless/package.json

@@ -25,11 +25,12 @@
   "types": "./build/src/index.d.ts",
   "scripts": {
     "build": "tsc -p tsconfig.json",
+    "coverage": "node --experimental-vm-modules node_modules/.bin/jest --coverage",
     "buildw": "tsc -p tsconfig.json --watch",
     "format": "prettier --write --ignore-unknown **/*",
     "dev": "tsx --watch ./src/index.ts",
     "test": "echo 'hello world'",
-    "testw": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
+    "testw": "node --experimental-vm-modules node_modules/.bin/jest --watch",
     "lint": "eslint ./src/**/*.ts --fix && prettier . --write",
     "lint-check": "eslint ./src/**/*.ts --debug"
   },
@@ -63,7 +64,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^27.6.3",
+    "eslint-plugin-jest": "28.9.0",
     "eslint-plugin-require-extensions": "^0.1.3",
     "graphql-request": "^7.1.0",
     "jest": "29.7.0",

packages/storage/babel.config.json

@@ -0,0 +1,16 @@
+{
+  "presets": [
+    ["@babel/preset-env", { "targets": { "node": "current" }, "modules": "auto" }],
+    "@babel/preset-typescript"
+  ],
+  "plugins": [
+    "@babel/plugin-transform-modules-commonjs"
+  ],
+  "env": {
+    "test": {
+      "plugins": [
+        "@babel/plugin-transform-modules-commonjs"
+      ]
+    }
+  }
+}

packages/storage/jest-resolver.cjs

@@ -1,5 +1,5 @@
-module.exports = (request, options) => {
-  return options.defaultResolver(request, {
+module.exports = (request, options) =>
+  options.defaultResolver(request, {
     ...options,
     packageFilter: (pkg) => {
       // When importing o1js, we specify the Node ESM import as Jest by default imports the web version
@@ -18,4 +18,3 @@ module.exports = (request, options) => {
       };
     },
   });
-};

packages/storage/jest.config.mjs → packages/storage/jest.config.js

@@ -3,14 +3,10 @@ export default {
   verbose: true,
   preset: 'ts-jest/presets/default-esm',
   testEnvironment: 'node',
-  testTimeout: 1_000_000,
-  globals: {
-    'ts-jest': {
-      useESM: true,
-    },
-  },
+  testPathIgnorePatterns: ['<rootDir>/build/'],
+  testTimeout: 1000000,
   transform: {
-    '^.+\\.(t)s$': 'ts-jest',
+    '^.+\\.(t)s$': ['ts-jest', { useESM: true }],
     '^.+\\.(j)s$': 'babel-jest', // Use ts-jest for both .ts and .js files
   },
   resolver: '<rootDir>/jest-resolver.cjs',
@@ -20,5 +16,14 @@ export default {
   modulePathIgnorePatterns: ['<rootDir>/build/'],
   moduleNameMapper: {
     '^(\\.{1,2}/.+)\\.js$': '$1',
+    '^@orochi-network/framework$':
+      '<rootDir>/../../node_modules/@orochi-network/framework',
+    '^@orochi-network/utilities$':
+      '<rootDir>/../../node_modules/@orochi-network/utilities',
+    '^graphql$': 'graphql/index.js',
+    '^@orochi-network/vault$':
+      '<rootDir>/../../node_modules/@orochi-network/vault',
+    '^@orochi-network/queue$':
+      '<rootDir>/../../node_modules/@orochi-network/queue',
   },
 };

packages/storage/package.json

@@ -20,16 +20,16 @@
   "scripts": {
     "build": "tsc",
     "buildw": "tsc --watch",
-    "coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
+    "coverage": "node --experimental-vm-modules node_modules/.bin/jest --coverage",
     "format": "prettier --write --ignore-unknown **/*",
     "test": "echo 'hello world'",
-    "testw": "node --experimental-vm-modules ../../node_modules/jest/bin/jest.js --watch",
+    "testw": "node --experimental-vm-modules node_modules/.bin/jest --watch",
     "lint": "eslint ./src/**/*.ts --fix && prettier . --write"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-    "@babel/preset-env": "^7.25.4",
+    "@babel/preset-env": "^7.26.0",
     "@babel/preset-typescript": "^7.23.3",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.12.0",
@@ -48,7 +48,7 @@
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^3.6.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^27.6.3",
+    "eslint-plugin-jest": "28.9.0",
     "eslint-plugin-require-extensions": "^0.1.3",
     "jest": "29.7.0",
     "prettier": "^3.0.3",

packages/storage/src/helper/config.ts

@@ -18,10 +18,10 @@ type TApplicationConfig = {
 
 const configLoader = new ConfigLoader<TApplicationConfig>((raw: any) => raw, {
   NODE_ENV: Joi.string()
-    .required()
+    .optional()
     .trim()
-    .valid(...NODE_ENV_VALUES)
-    .default('production'),
+    .default('production')
+    .valid(...NODE_ENV_VALUES),
   MONGODB_URL: Joi.string()
     .trim()
     .required()

packages/storage/test/common/merkle-tree.test.ts

@@ -9,7 +9,7 @@ describe('ModelMerkleTree', () => {
   let dbEngine: DatabaseEngine;
 
   beforeAll(async () => {
-    dbEngine = DatabaseEngine.getInstance(config.mongodbUrl);
+    dbEngine = DatabaseEngine.getInstance(config.MONGODB_URL);
     if (!dbEngine.isConnected()) {
       await dbEngine.connect();
     }
@@ -48,8 +48,7 @@ describe('ModelMerkleTree', () => {
   });
 
   test('should correctly set leaf nodes and match root with in-memory MerkleTree', async () => {
-    const modelMerkleTree = ModelMerkleTree.getInstance(DB_NAME);
-    modelMerkleTree.setHeight(MERKLE_HEIGHT);
+    const modelMerkleTree = await ModelMerkleTree.load(DB_NAME);
 
     const merkleTree = new MerkleTree(MERKLE_HEIGHT);
 
@@ -66,8 +65,7 @@ describe('ModelMerkleTree', () => {
   });
 
   test('should correctly retrieve Merkle witnesses for leaf nodes', async () => {
-    const modelMerkleTree = ModelMerkleTree.getInstance(DB_NAME);
-    modelMerkleTree.setHeight(MERKLE_HEIGHT);
+    const modelMerkleTree = await ModelMerkleTree.load(DB_NAME);
 
     const merkleTree = new MerkleTree(MERKLE_HEIGHT);
 

packages/storage/test/general/collection.test.ts

@@ -1,11 +1,11 @@
 import { DatabaseEngine, ModelCollection } from '../../src';
-import config from '../../src/helper/config';
+import { config } from '../../src/helper/config.js';
 
 describe('ModelCollection', () => {
   let dbEngine: DatabaseEngine;
 
   beforeAll(async () => {
-    dbEngine = DatabaseEngine.getInstance(config.mongodbUrl);
+    dbEngine = DatabaseEngine.getInstance(config.MONGODB_URL);
     if (!dbEngine.isConnected()) {
       await dbEngine.connect();
     }
@@ -50,6 +50,7 @@ describe('ModelCollection', () => {
 
       const modelCollection = ModelCollection.getInstance(
         DB_NAME,
+        dbEngine,
         COLLECTION_NAME
       );