feat: use @jest/globals

addImports.sh

@@ -0,0 +1,14 @@
+#!/bin/zsh
+
+# enable globstar
+setopt EXTENDED_GLOB
+setopt NO_NOMATCH
+
+importLine="import {jest, beforeEach, afterEach, afterAll, expect, test, describe, it, beforeAll} from '@jest/globals';"
+
+for file in packages/niq-privacypass-noble/{src,test}/**/*.test.{mts,ts}; do
+  if [ -f "$file" ]; then
+    echo "Processing $file"
+    printf "%s\n%s" "$importLine" "$(cat $file)" > "$file"
+  fi
+done

packages/niq-privacypass-noble/package.json

@@ -36,8 +36,5 @@
   "dependencies": {
     "@noble/curves": "^1.0.0",
     "@noble/hashes": "^1.3.0"
-  },
-  "devDependencies": {
-    "@types/jest": "29.5.1"
   }
 }

packages/niq-privacypass-noble/test/jest/crypto/blindrsa/blindrsa.test.ts

@@ -1,8 +1,10 @@
+import { describe, expect, jest, test } from '@jest/globals'
+
 import * as blindRSA from '../../../../src/crypto/blindrsa/blindrsa'
 
 // Test vector
 // https://www.ietf.org/archive/id/draft-irtf-cfrg-rsa-blind-signatures-03.html#appendix-A
-import { modInv, mod } from '../../../../src/crypto/blindrsa/modular'
+import { mod, modInv } from '../../../../src/crypto/blindrsa/modular'
 
 import vectors from './testdata/rsablind_vectors.json'
 

packages/niq-privacypass-noble/test/jest/crypto/blindrsa/util.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it, jest } from '@jest/globals'
+
 import { emsa_pss_encode } from '../../../../src/crypto/blindrsa/util'
 
 // Test vector in file pss_test.go from: https://cs.opensource.google/go/go/+/refs/tags/go1.18.2:src/crypto/rsa/pss_test.go

packages/niq-privacypass-noble/test/jest/crypto/voprf/b64.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { b64db, b64eb } from '../../../../src/crypto/voprf/b64'
 
 describe('base64 functions', () => {

packages/niq-privacypass-noble/test/jest/crypto/voprf/computeComposites.test.ts

@@ -1,7 +1,8 @@
+import { describe, expect, it } from '@jest/globals'
 import { bytesToHex } from '@noble/hashes/utils'
 
 import { computeComposites } from '../../../../src/crypto/voprf/computeComposites'
-import { testConfig, testContext } from '../../testconfig'
+import { testContext } from '../../testconfig'
 
 const P = (hex: string) => testContext.decodePoint(hex)
 

packages/niq-privacypass-noble/test/jest/crypto/voprf/dleq.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { DLEQ } from '../../../../src/crypto/voprf/dleq'
 import { testContext } from '../../testconfig'
 

packages/niq-privacypass-noble/test/jest/crypto/voprf/hashAndInc.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { hexToBytes } from '@noble/hashes/utils'
 
 import { hashAndInc } from '../../../../src/crypto/voprf/hashAndInc'

packages/niq-privacypass-noble/test/jest/crypto/voprf/randomScalar.test.ts

@@ -1,4 +1,5 @@
-import { shake256, Keccak } from '@noble/hashes/sha3'
+import { describe, expect, it } from '@jest/globals'
+import { Keccak, shake256 } from '@noble/hashes/sha3'
 import { p256 } from '@noble/curves/p256'
 import { hexToBytes } from '@noble/hashes/utils'
 

packages/niq-privacypass-noble/test/jest/explorations/codeprehension.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { randomBytes } from '@noble/hashes/utils'
 import { p256 } from '@noble/curves/p256'
 import { bytesToNumberBE } from '@noble/curves/abstract/utils'

packages/niq-privacypass-noble/test/jest/explorations/go-fixtures/issuanceRequest.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { PrivacyPassRequestSer } from '../../../../src/protocol/types/ser'
 import { b64dj, b64ds } from '../../../../src/crypto/voprf/b64'
 import { testContext } from '../../testconfig'

packages/niq-privacypass-noble/test/jest/explorations/go-fixtures/issuanceResponse.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { IssueResponseInnerSer } from '../../../../src/protocol/types/ser'
 import { b64dbn, b64ds } from '../../../../src/crypto/voprf/b64'
 

packages/niq-privacypass-noble/test/jest/explorations/helpers/utils.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it, test } from '@jest/globals'
+
 import { computeSecret, divPoint } from './utils'
 import { createBlindToken } from './tokens'
 

packages/niq-privacypass-noble/test/jest/explorations/issuance.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals'
 import { p256 } from '@noble/curves/p256'
 
 const REQUEST = {

packages/niq-privacypass-noble/test/jest/protocol/issue/client/makeIssueRequest.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { makeIssueRequest } from '../../../../../src/protocol/issue/client/makeIssueRequest'
 import { testContext } from '../../../testconfig'
 

packages/niq-privacypass-noble/test/jest/protocol/issue/client/verifyIssueResponse.test.ts

@@ -1,8 +1,10 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { makeIssueResponse } from '../../../../../src/protocol/issue/server/makeIssueResponse'
 import { testContext } from '../../../testconfig'
 import { verifyIssueResponse } from '../../../../../src/protocol/issue/client/verifyIssueResponse'
 import { parseIssueResponse } from '../../../../../src/protocol/serdes'
-import { commitment, issueResponseRaw, issueRequestDes } from '../../fixtures'
+import { commitment, issueRequestDes, issueResponseRaw } from '../../fixtures'
 
 describe('makeIssueResponse', () => {
   it('should be defined', () => {

packages/niq-privacypass-noble/test/jest/protocol/issue/server/makeIssueResponse.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { makeIssueRequest } from '../../../../../src/protocol/issue/client/makeIssueRequest'
 import { testContext } from '../../../testconfig'
 import { makeIssueResponse } from '../../../../../src/protocol/issue/server/makeIssueResponse'

packages/niq-privacypass-noble/test/jest/protocol/redeem/client/makeRedeemRequest.test.ts

@@ -1,10 +1,12 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { makeRedeemRequest } from '../../../../../src/protocol/redeem/client/makeRedeemRequest'
 import { SignedToken } from '../../../../../src/crypto/voprf/types'
 import { testContext } from '../../../testconfig'
 import { IssueResponseInnerSer } from '../../../../../src/protocol/types/ser'
 import { b64dj } from '../../../../../src/crypto/voprf/b64'
 import { wrapAndSerializeRequest } from '../../../../../src/protocol/serdes'
-import { issueResponseRaw, issueRequestUntyped } from '../../fixtures'
+import { issueRequestUntyped, issueResponseRaw } from '../../fixtures'
 
 describe('makeRedeemRequest', () => {
   it('should be possible to create a request to redeem a token', () => {

packages/niq-privacypass-noble/test/jest/protocol/redeem/server/verifyRedeemRequest.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals'
+
 import { testContext } from '../../../testconfig'
 import { commitment, serverKey, wrappedRedeemRequest } from '../../fixtures'
 import { verifyRedeemRequest } from '../../../../../src/protocol/redeem/server/verifyRedeemRequest'