Update linter to support explicit extensions, fix errors

ProtonMail · Nov 27, 2023 · 1edf643 · 1edf643
1 parent 0ba28d1
commit 1edf643
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 256 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -10,7 +10,11 @@
         "sourceType": "module",
         "project": "tsconfig.eslint.json"
     },
-
+    "settings": {
+        "import/resolver": {
+          "typescript": { "alwaysTryTypes": true }
+        }
+      },
     "globals": {
         "window": "readonly",
         "btoa": "readonly",
@@ -60,7 +64,7 @@
         "import/no-extraneous-dependencies": "off",
         "import/no-unassigned-import": "error",
         "import/named": "error",
-        "import/extensions": "error",
+        "import/extensions": ["error", { "js": "ignorePackages" }],
         "max-len": ["error", {
             "ignoreComments": true,
             "code": 120,

diff --git a/lib/key/check.js b/lib/key/check.js
@@ -1,5 +1,4 @@
 import { enums } from '../openpgp.js';
-import { serverTime } from '../serverTime.js';
 
 /**
  * Checks whether the primary key and the subkeys meet our recommended security requirements.

diff --git a/lib/key/forwarding.ts b/lib/key/forwarding.ts
@@ -1,6 +1,6 @@
+import type { BigInteger as BigIntegerInterface } from '@openpgp/noble-hashes/biginteger';
 import { KDFParams, PrivateKey, UserID, SecretSubkeyPacket, SecretKeyPacket, MaybeArray, Subkey, config as defaultConfig, SubkeyOptions, enums } from '../openpgp.js';
 import { generateKey, reformatKey } from './utils.js';
-import type { BigInteger as BigIntegerInterface } from '@openpgp/noble-hashes/biginteger';
 
 let MaybeUninitializedBigInteger: typeof BigIntegerInterface;
 const getBigInteger = async () => {
@@ -9,7 +9,7 @@ const getBigInteger = async () => {
     // so we do the same here.
     if (MaybeUninitializedBigInteger) return MaybeUninitializedBigInteger;
 
-    MaybeUninitializedBigInteger = await import('@openpgp/noble-hashes/biginteger').then(mod => mod.default);
+    MaybeUninitializedBigInteger = await import('@openpgp/noble-hashes/biginteger').then((mod) => mod.default);
     return MaybeUninitializedBigInteger;
 };
 

diff --git a/lib/message/verify.d.ts b/lib/message/verify.d.ts
@@ -33,6 +33,10 @@ export function verifyMessage<DataType extends Data, FormatType extends VerifyOp
         VerifyMessageResult<Uint8Array> :
     never
 >;
+export function handleVerificationResult<DataType extends Data>(
+    verificationResult: openpgp_VerifyMessageResult<DataType>,
+    context: ContextVerificationOptions
+): Promise<VerifyMessageResult<DataType>>;
 
 export interface VerifyCleartextOptionsPmcrypto extends Omit<VerifyOptions, 'message' | 'signature' | 'format'> {
     cleartextMessage: CleartextMessage