chore(encryption): lint

packages/encryption/package.json

@@ -22,17 +22,20 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
+    "format": "prettier --write src",
     "test": "jest"
   },
   "devDependencies": {
     "@standardnotes/config": "2.4.3",
     "@types/jest": "^27.4.1",
     "@types/node": "^18.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "@typescript-eslint/eslint-plugin": "*",
+    "eslint": "*",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^27.5.1",
+    "prettier": "*",
     "ts-jest": "^27.1.3",
-    "typescript": "^4.7.4"
+    "typescript": "*"
   },
   "dependencies": {
     "@standardnotes/common": "^1.23.1",

packages/encryption/src/Domain/Backups/BackupFile.ts

@@ -1,5 +1,5 @@
-import { BackupFileDecryptedContextualPayload, BackupFileEncryptedContextualPayload } from '@standardnotes/models'
 import { AnyKeyParamsContent, ProtocolVersion } from '@standardnotes/common'
+import { BackupFileDecryptedContextualPayload, BackupFileEncryptedContextualPayload } from '@standardnotes/models'
 
 export type BackupFile = {
   version?: ProtocolVersion

packages/encryption/src/Domain/Backups/BackupFileDecryptor.ts

@@ -1,35 +1,35 @@
 import {
   AnyKeyParamsContent,
+  compareVersions,
   ContentType,
-  ProtocolVersion,
   leftVersionGreaterThanOrEqualToRight,
-  compareVersions,
+  ProtocolVersion,
 } from '@standardnotes/common'
-import { BackupFile } from './BackupFile'
-import { BackupFileType } from './BackupFileType'
-import { extendArray } from '@standardnotes/utils'
-import { EncryptionService } from '../Service/Encryption/EncryptionService'
 import {
-  PayloadInterface,
+  CreateDecryptedItemFromPayload,
+  CreatePayloadSplit,
+  DecryptedPayload,
   DecryptedPayloadInterface,
-  ItemsKeyContent,
+  EncryptedPayload,
   EncryptedPayloadInterface,
-  isEncryptedPayload,
   isDecryptedPayload,
-  isEncryptedTransferPayload,
-  EncryptedPayload,
-  DecryptedPayload,
   isDecryptedTransferPayload,
-  CreateDecryptedItemFromPayload,
+  isEncryptedPayload,
+  isEncryptedTransferPayload,
+  ItemsKeyContent,
   ItemsKeyInterface,
-  CreatePayloadSplit,
+  PayloadInterface,
 } from '@standardnotes/models'
 import { ClientDisplayableError } from '@standardnotes/responses'
+import { extendArray } from '@standardnotes/utils'
+import { isItemsKey, SNItemsKey } from '../Keys/ItemsKey/ItemsKey'
+import { ContentTypeUsesRootKeyEncryption } from '../Keys/RootKey/Functions'
 import { CreateAnyKeyParams } from '../Keys/RootKey/KeyParamsFunctions'
-import { SNRootKeyParams } from '../Keys/RootKey/RootKeyParams'
 import { SNRootKey } from '../Keys/RootKey/RootKey'
-import { ContentTypeUsesRootKeyEncryption } from '../Keys/RootKey/Functions'
-import { isItemsKey, SNItemsKey } from '../Keys/ItemsKey/ItemsKey'
+import { SNRootKeyParams } from '../Keys/RootKey/RootKeyParams'
+import { EncryptionService } from '../Service/Encryption/EncryptionService'
+import { BackupFile } from './BackupFile'
+import { BackupFileType } from './BackupFileType'
 
 export async function DecryptBackupFile(
   file: BackupFile,

packages/encryption/src/Domain/Keys/ItemsKey/ItemsKey.ts

@@ -1,14 +1,14 @@
+import { ContentType, ProtocolVersion } from '@standardnotes/common'
 import {
   ConflictStrategy,
-  ItemsKeyContent,
   DecryptedItem,
-  DecryptedPayloadInterface,
   DecryptedItemInterface,
+  DecryptedPayloadInterface,
   HistoryEntryInterface,
+  ItemsKeyContent,
   ItemsKeyInterface,
   RootKeyInterface,
 } from '@standardnotes/models'
-import { ContentType, ProtocolVersion } from '@standardnotes/common'
 
 export function isItemsKey(x: ItemsKeyInterface | RootKeyInterface): x is ItemsKeyInterface {
   return x.content_type === ContentType.ItemsKey

packages/encryption/src/Domain/Keys/ItemsKey/ItemsKeyMutator.ts

@@ -1,4 +1,4 @@
-import { DecryptedItemMutator, ItemsKeyMutatorInterface, ItemsKeyContent } from '@standardnotes/models'
+import { DecryptedItemMutator, ItemsKeyContent, ItemsKeyMutatorInterface } from '@standardnotes/models'
 
 export class ItemsKeyMutator extends DecryptedItemMutator<ItemsKeyContent> implements ItemsKeyMutatorInterface {
   set isDefault(isDefault: boolean) {

packages/encryption/src/Domain/Keys/ItemsKey/Registration.ts

@@ -1,5 +1,5 @@
 import { ContentType } from '@standardnotes/common'
-import { RegisterItemClass, DecryptedItemMutator, ItemsKeyContent } from '@standardnotes/models'
+import { DecryptedItemMutator, ItemsKeyContent, RegisterItemClass } from '@standardnotes/models'
 import { SNItemsKey } from './ItemsKey'
 import { ItemsKeyMutator } from './ItemsKeyMutator'
 

packages/encryption/src/Domain/Keys/RootKey/Functions.ts

@@ -1,4 +1,4 @@
-import { SNRootKey } from './RootKey'
+import { ContentType, ProtocolVersion } from '@standardnotes/common'
 import {
   DecryptedPayload,
   FillItemContentSpecialized,
@@ -7,7 +7,7 @@ import {
   RootKeyContentSpecialized,
 } from '@standardnotes/models'
 import { UuidGenerator } from '@standardnotes/utils'
-import { ContentType, ProtocolVersion } from '@standardnotes/common'
+import { SNRootKey } from './RootKey'
 
 export function CreateNewRootKey(content: RootKeyContentSpecialized): SNRootKey {
   const uuid = UuidGenerator.GenerateUuid()

packages/encryption/src/Domain/Keys/RootKey/KeyParamsFunctions.ts

@@ -1,13 +1,13 @@
-import { KeyParamsResponse } from '@standardnotes/responses'
 import {
+  AnyKeyParamsContent,
   KeyParamsContent001,
   KeyParamsContent002,
   KeyParamsContent003,
   KeyParamsContent004,
-  AnyKeyParamsContent,
 } from '@standardnotes/common'
-import { SNRootKeyParams } from './RootKeyParams'
+import { KeyParamsResponse } from '@standardnotes/responses'
 import { ProtocolVersionForKeyParams } from './ProtocolVersionForKeyParams'
+import { SNRootKeyParams } from './RootKeyParams'
 
 /**
  *  001, 002:

packages/encryption/src/Domain/Keys/RootKey/ProtocolVersionForKeyParams.ts

@@ -1,6 +1,6 @@
-import { V001Algorithm, V002Algorithm } from '../../Algorithm'
-import { KeyParamsData } from '@standardnotes/responses'
 import { AnyKeyParamsContent, ProtocolVersion } from '@standardnotes/common'
+import { KeyParamsData } from '@standardnotes/responses'
+import { V001Algorithm, V002Algorithm } from '../../Algorithm'
 
 export function ProtocolVersionForKeyParams(response: KeyParamsData | AnyKeyParamsContent): ProtocolVersion {
   if (response.version) {

packages/encryption/src/Domain/Keys/RootKey/RootKey.ts

@@ -1,14 +1,14 @@
-import { SNRootKeyParams } from './RootKeyParams'
+import { ProtocolVersion } from '@standardnotes/common'
 import {
-  RootKeyInterface,
-  RootKeyContent,
   DecryptedItem,
   DecryptedPayloadInterface,
-  RootKeyContentInStorage,
   NamespacedRootKeyInKeychain,
+  RootKeyContent,
+  RootKeyContentInStorage,
+  RootKeyInterface,
 } from '@standardnotes/models'
-import { ProtocolVersion } from '@standardnotes/common'
 import { timingSafeEqual } from '@standardnotes/sncrypto-common'
+import { SNRootKeyParams } from './RootKeyParams'
 
 /**
  * A root key is a local only construct that houses the key used for the encryption

packages/encryption/src/Domain/Keys/RootKey/RootKeyParams.ts

@@ -1,11 +1,11 @@
 import {
+  AnyKeyParamsContent,
   KeyParamsContent001,
   KeyParamsContent002,
   KeyParamsContent003,
   KeyParamsContent004,
-  AnyKeyParamsContent,
-  ProtocolVersion,
   KeyParamsOrigination,
+  ProtocolVersion,
 } from '@standardnotes/common'
 import { RootKeyParamsInterface } from '@standardnotes/models'
 import { pickByCopy } from '@standardnotes/utils'

packages/encryption/src/Domain/Operator/001/Operator001.ts

@@ -1,27 +1,27 @@
 import { ContentType, KeyParamsOrigination, ProtocolVersion, ProtocolVersionLength } from '@standardnotes/common'
-import { Create001KeyParams } from '../../Keys/RootKey/KeyParamsFunctions'
-import { firstHalfOfString, secondHalfOfString, splitString, UuidGenerator } from '@standardnotes/utils'
-import { AsynchronousOperator } from '../Operator'
 import {
   CreateDecryptedItemFromPayload,
-  ItemsKeyContent,
-  ItemsKeyInterface,
-  FillItemContent,
-  ItemContent,
   DecryptedPayload,
   DecryptedPayloadInterface,
+  FillItemContent,
+  ItemContent,
+  ItemsKeyContent,
+  ItemsKeyInterface,
   PayloadTimestampDefaults,
 } from '@standardnotes/models'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
+import { firstHalfOfString, secondHalfOfString, splitString, UuidGenerator } from '@standardnotes/utils'
+import { V001Algorithm } from '../../Algorithm'
+import { isItemsKey } from '../../Keys/ItemsKey/ItemsKey'
+import { CreateNewRootKey } from '../../Keys/RootKey/Functions'
+import { Create001KeyParams } from '../../Keys/RootKey/KeyParamsFunctions'
 import { SNRootKey } from '../../Keys/RootKey/RootKey'
 import { SNRootKeyParams } from '../../Keys/RootKey/RootKeyParams'
-import { V001Algorithm } from '../../Algorithm'
 import { DecryptedParameters, EncryptedParameters, ErrorDecryptingParameters } from '../../Types/EncryptedParameters'
-import { RootKeyEncryptedAuthenticatedData } from '../../Types/RootKeyEncryptedAuthenticatedData'
 import { ItemAuthenticatedData } from '../../Types/ItemAuthenticatedData'
 import { LegacyAttachedData } from '../../Types/LegacyAttachedData'
-import { isItemsKey } from '../../Keys/ItemsKey/ItemsKey'
-import { CreateNewRootKey } from '../../Keys/RootKey/Functions'
+import { RootKeyEncryptedAuthenticatedData } from '../../Types/RootKeyEncryptedAuthenticatedData'
+import { AsynchronousOperator } from '../Operator'
 
 const NO_IV = '00000000000000000000000000000000'
 

packages/encryption/src/Domain/Operator/002/Operator002.ts

@@ -1,19 +1,19 @@
-import { Create002KeyParams } from '../../Keys/RootKey/KeyParamsFunctions'
-import { SNProtocolOperator001 } from '../001/Operator001'
-import { SNRootKey } from '../../Keys/RootKey/RootKey'
-import { SNRootKeyParams } from '../../Keys/RootKey/RootKeyParams'
-import { UuidGenerator } from '@standardnotes/utils'
-import { V002Algorithm } from '../../Algorithm'
 import * as Common from '@standardnotes/common'
 import * as Models from '@standardnotes/models'
+import { ItemContent, PayloadTimestampDefaults } from '@standardnotes/models'
 import * as Utils from '@standardnotes/utils'
+import { UuidGenerator } from '@standardnotes/utils'
+import { V002Algorithm } from '../../Algorithm'
+import { isItemsKey } from '../../Keys/ItemsKey/ItemsKey'
+import { CreateNewRootKey } from '../../Keys/RootKey/Functions'
+import { Create002KeyParams } from '../../Keys/RootKey/KeyParamsFunctions'
+import { SNRootKey } from '../../Keys/RootKey/RootKey'
+import { SNRootKeyParams } from '../../Keys/RootKey/RootKeyParams'
 import { DecryptedParameters, EncryptedParameters, ErrorDecryptingParameters } from '../../Types/EncryptedParameters'
-import { RootKeyEncryptedAuthenticatedData } from '../../Types/RootKeyEncryptedAuthenticatedData'
 import { ItemAuthenticatedData } from '../../Types/ItemAuthenticatedData'
 import { LegacyAttachedData } from '../../Types/LegacyAttachedData'
-import { isItemsKey } from '../../Keys/ItemsKey/ItemsKey'
-import { CreateNewRootKey } from '../../Keys/RootKey/Functions'
-import { ItemContent, PayloadTimestampDefaults } from '@standardnotes/models'
+import { RootKeyEncryptedAuthenticatedData } from '../../Types/RootKeyEncryptedAuthenticatedData'
+import { SNProtocolOperator001 } from '../001/Operator001'
 
 /**
  * @deprecated

packages/encryption/src/Domain/Operator/003/Operator003.ts

@@ -1,19 +1,19 @@
-import { splitString, UuidGenerator } from '@standardnotes/utils'
+import { ContentType, KeyParamsOrigination, ProtocolVersion } from '@standardnotes/common'
 import {
   CreateDecryptedItemFromPayload,
   DecryptedPayload,
+  FillItemContent,
   ItemsKeyContent,
   ItemsKeyInterface,
-  FillItemContent,
   PayloadTimestampDefaults,
 } from '@standardnotes/models'
-import { SNRootKey } from '../../Keys/RootKey/RootKey'
+import { splitString, UuidGenerator } from '@standardnotes/utils'
 import { V003Algorithm } from '../../Algorithm'
+import { CreateNewRootKey } from '../../Keys/RootKey/Functions'
 import { Create003KeyParams } from '../../Keys/RootKey/KeyParamsFunctions'
-import { SNProtocolOperator002 } from '../002/Operator002'
-import { ContentType, KeyParamsOrigination, ProtocolVersion } from '@standardnotes/common'
+import { SNRootKey } from '../../Keys/RootKey/RootKey'
 import { SNRootKeyParams } from '../../Keys/RootKey/RootKeyParams'
-import { CreateNewRootKey } from '../../Keys/RootKey/Functions'
+import { SNProtocolOperator002 } from '../002/Operator002'
 
 /**
  * @legacy

packages/encryption/src/Domain/Operator/004/Operator004.ts

@@ -1,6 +1,5 @@
 import { ContentType, KeyParamsOrigination, ProtocolVersion } from '@standardnotes/common'
-import { Create004KeyParams } from '../../Keys/RootKey/KeyParamsFunctions'
-import { SynchronousOperator } from '../Operator'
+import * as Models from '@standardnotes/models'
 import {
   CreateDecryptedItemFromPayload,
   FillItemContent,
@@ -10,17 +9,18 @@ import {
   PayloadTimestampDefaults,
 } from '@standardnotes/models'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
-import { SNRootKey } from '../../Keys/RootKey/RootKey'
-import { SNRootKeyParams } from '../../Keys/RootKey/RootKeyParams'
-import { V004Algorithm } from '../../Algorithm'
-import * as Models from '@standardnotes/models'
 import * as Utils from '@standardnotes/utils'
+import { V004Algorithm } from '../../Algorithm'
+import { isItemsKey } from '../../Keys/ItemsKey/ItemsKey'
 import { ContentTypeUsesRootKeyEncryption, CreateNewRootKey } from '../../Keys/RootKey/Functions'
+import { Create004KeyParams } from '../../Keys/RootKey/KeyParamsFunctions'
+import { SNRootKey } from '../../Keys/RootKey/RootKey'
+import { SNRootKeyParams } from '../../Keys/RootKey/RootKeyParams'
 import { DecryptedParameters, EncryptedParameters, ErrorDecryptingParameters } from '../../Types/EncryptedParameters'
-import { RootKeyEncryptedAuthenticatedData } from '../../Types/RootKeyEncryptedAuthenticatedData'
 import { ItemAuthenticatedData } from '../../Types/ItemAuthenticatedData'
 import { LegacyAttachedData } from '../../Types/LegacyAttachedData'
-import { isItemsKey } from '../../Keys/ItemsKey/ItemsKey'
+import { RootKeyEncryptedAuthenticatedData } from '../../Types/RootKeyEncryptedAuthenticatedData'
+import { SynchronousOperator } from '../Operator'
 
 type V004StringComponents = [version: string, nonce: string, ciphertext: string, authenticatedData: string]
 

packages/encryption/src/Domain/Operator/Functions.ts

@@ -1,10 +1,10 @@
+import { ProtocolVersion } from '@standardnotes/common'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { SNProtocolOperator001 } from '../Operator/001/Operator001'
 import { SNProtocolOperator002 } from '../Operator/002/Operator002'
 import { SNProtocolOperator003 } from '../Operator/003/Operator003'
 import { SNProtocolOperator004 } from '../Operator/004/Operator004'
 import { AsynchronousOperator, SynchronousOperator } from '../Operator/Operator'
-import { ProtocolVersion } from '@standardnotes/common'
 
 export function createOperatorForVersion(
   version: ProtocolVersion,

packages/encryption/src/Domain/Operator/Operator.ts

@@ -1,12 +1,12 @@
-import { ItemsKeyInterface, RootKeyInterface } from '@standardnotes/models'
+import { KeyParamsOrigination } from '@standardnotes/common'
 import * as Models from '@standardnotes/models'
+import { ItemsKeyInterface, RootKeyInterface } from '@standardnotes/models'
 import { SNRootKey } from '../Keys/RootKey/RootKey'
 import { SNRootKeyParams } from '../Keys/RootKey/RootKeyParams'
-import { KeyParamsOrigination } from '@standardnotes/common'
 import { DecryptedParameters, EncryptedParameters, ErrorDecryptingParameters } from '../Types/EncryptedParameters'
-import { RootKeyEncryptedAuthenticatedData } from '../Types/RootKeyEncryptedAuthenticatedData'
 import { ItemAuthenticatedData } from '../Types/ItemAuthenticatedData'
 import { LegacyAttachedData } from '../Types/LegacyAttachedData'
+import { RootKeyEncryptedAuthenticatedData } from '../Types/RootKeyEncryptedAuthenticatedData'
 
 /**w
  * An operator is responsible for performing crypto operations, such as generating keys

packages/encryption/src/Domain/Operator/OperatorManager.ts

@@ -1,5 +1,5 @@
-import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { ProtocolVersion, ProtocolVersionLatest } from '@standardnotes/common'
+import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { createOperatorForVersion } from './Functions'
 import { AsynchronousOperator, SynchronousOperator } from './Operator'
 

packages/encryption/src/Domain/Operator/OperatorWrapper.ts

@@ -1,12 +1,12 @@
-import { isAsyncOperator } from './Functions'
-import { OperatorManager } from './OperatorManager'
 import * as Models from '@standardnotes/models'
 import {
   DecryptedParameters,
   EncryptedParameters,
   encryptedParametersFromPayload,
   ErrorDecryptingParameters,
 } from '../Types/EncryptedParameters'
+import { isAsyncOperator } from './Functions'
+import { OperatorManager } from './OperatorManager'
 
 export async function encryptPayload(
   payload: Models.DecryptedPayloadInterface,