Fixing import type declarations.

.eslintrc.json

@@ -2,7 +2,8 @@
  "root": true,
  "parserOptions": {
  "ecmaVersion": 2020,
- "sourceType": "module"
+ "sourceType": "module",
+ "project": true
  },
  "extends": [
  "eslint:recommended",
@@ -76,15 +77,15 @@
  "error",
  "never"
  ],
- "@typescript-eslint/no-namespace": [
- "warn"
- ],
+ "@typescript-eslint/no-namespace": "warn",
  "@typescript-eslint/no-unused-vars": [
  "error",
  {
  "argsIgnorePattern": "^_"
  }
- ]
+ ],
+ "@typescript-eslint/consistent-type-imports": "error",
+ "@typescript-eslint/consistent-type-exports": "error"
  }
  }
  ]

bench/group.bench.ts

@@ -3,8 +3,8 @@
 // Licensed under the BSD-3-Clause license found in the LICENSE file or
 // at https://opensource.org/licenses/BSD-3-Clause
 
-import Benchmark from 'benchmark'
-import { type CryptoProvider } from '@cloudflare/voprf-ts'
+import type Benchmark from 'benchmark'
+import type { CryptoProvider } from '../src/cryptoTypes.js'
 
 function asyncFn(call: CallableFunction) {
  return {

bench/index.ts

@@ -10,7 +10,7 @@ import { benchGroup } from './group.bench.js'
 import { benchOPRF } from './oprf.bench.js'
 import { getCryptoProviders } from './testProviders.js'
 
-import { type CryptoProvider } from '../src/index.js'
+import type { CryptoProvider } from '../src/cryptoTypes.js'
 
 if (typeof crypto === 'undefined') {
  Object.assign(global, { crypto: webcrypto })

bench/oprf.bench.ts

@@ -17,7 +17,7 @@ import {
  randomPrivateKey
 } from '../src/index.js'
 
-import Benchmark from 'benchmark'
+import type Benchmark from 'benchmark'
 
 function asyncFn(call: CallableFunction) {
  return {

bench/tsconfig.json

@@ -1,12 +1,5 @@
 {
  "extends": "../tsconfig.json",
- "compilerOptions": {
- "paths": {
- "@cloudflare/voprf-ts": ["../src/index.js"],
- "@cloudflare/voprf-ts/crypto-noble": ["../src/cryptoNoble.js"],
- "@cloudflare/voprf-ts/facade": ["../src/facade/index.js"]
- }
- },
  "include": ["."],
  "references": [
  {

src/client.ts

@@ -4,14 +4,8 @@
 // at https://opensource.org/licenses/BSD-3-Clause
 
 import type { Elt, Scalar } from './groupTypes.js'
-import {
- Evaluation,
- EvaluationRequest,
- FinalizeData,
- type ModeID,
- Oprf,
- type SuiteID
-} from './oprf.js'
+import type { Evaluation, ModeID, SuiteID } from './oprf.js'
+import { EvaluationRequest, FinalizeData, Oprf } from './oprf.js'
 
 import { zip } from './util.js'
 import type { CryptoProviderArg } from './cryptoImpl.js'

src/keys.ts

@@ -5,7 +5,7 @@
 
 import { type ModeID, Oprf, type SuiteID } from './oprf.js'
 import { joinAll, toU16LenPrefix } from './util.js'
-import { type Scalar } from './groupTypes.js'
+import type { Scalar } from './groupTypes.js'
 import { type CryptoProviderArg, getSuiteGroup } from './cryptoImpl.js'
 
 export function getKeySizes(id: SuiteID, ...arg: CryptoProviderArg): { Nsk: number; Npk: number } {

src/noble/hashes.ts

@@ -5,8 +5,10 @@
 
 import { sha256 } from '@noble/hashes/sha256'
 import { sha384, sha512 } from '@noble/hashes/sha512'
-import { type CHash, Hash, wrapConstructor } from '@noble/hashes/utils'
-import { Keccak, shake256 } from '@noble/hashes/sha3'
+import type { Hash, CHash } from '@noble/hashes/utils'
+import { wrapConstructor } from '@noble/hashes/utils'
+import type { Keccak } from '@noble/hashes/sha3'
+import { shake256 } from '@noble/hashes/sha3'
 import type { HashID } from '../cryptoTypes.js'
 
 export const shake256_512 = wrapConstructor<Hash<Keccak>>(() => shake256.create({ dkLen: 64 }))

src/noble/types.ts

@@ -3,11 +3,11 @@
 // Licensed under the BSD-3-Clause license found in the LICENSE file or
 // at https://opensource.org/licenses/BSD-3-Clause
 
-import { Field } from '@noble/curves/abstract/modular'
+import type { Field } from '@noble/curves/abstract/modular'
 import type { CHash } from '@noble/hashes/utils'
-import * as p256 from '@noble/curves/p256'
-import * as ed25519 from '@noble/curves/ed25519'
-import * as ed448 from '@noble/curves/ed448'
+import type * as p256 from '@noble/curves/p256'
+import type * as ed25519 from '@noble/curves/ed25519'
+import type * as ed448 from '@noble/curves/ed448'
 import type { Hex } from '@noble/curves/abstract/utils'
 
 import type { HashID } from '../cryptoTypes.js'

src/server.ts

@@ -5,7 +5,8 @@
 
 import { DLEQProver } from './dleq.js'
 import type { Elt, Scalar } from './groupTypes.js'
-import { Evaluation, EvaluationRequest, type ModeID, Oprf, type SuiteID } from './oprf.js'
+import type { EvaluationRequest, ModeID, SuiteID } from './oprf.js'
+import { Evaluation, Oprf } from './oprf.js'
 import { ctEqual, zip } from './util.js'
 import type { CryptoProviderArg } from './cryptoImpl.js'