diff --git a/packages/auth/src/invitation/possession.ts b/packages/auth/src/invitation/possession.ts index b59bf606..7a516633 100644 --- a/packages/auth/src/invitation/possession.ts +++ b/packages/auth/src/invitation/possession.ts @@ -1,5 +1,5 @@ import { verifyGraphProof } from './verifiedGraphProof.js' -import { type TeamLink } from 'team/types.js' +import { type TeamLink } from '../team/types.js' import { redactKeys } from '@localfirst/crdx' import { signatures, DEVICE_POSSESSION, type Base58, type Payload } from '@localfirst/crypto' import { assert } from '@localfirst/shared' diff --git a/packages/auth/src/invitation/validate.ts b/packages/auth/src/invitation/validate.ts index f493e0d0..e031ac05 100644 --- a/packages/auth/src/invitation/validate.ts +++ b/packages/auth/src/invitation/validate.ts @@ -1,5 +1,5 @@ import { verifyGraphProof } from './verifiedGraphProof.js' -import { type TeamLink } from 'team/types.js' +import { type TeamLink } from '../team/types.js' import { INVITATION_PROOF, type Base58 } from '@localfirst/crypto' import { deviceIdentityIsValid } from 'device/index.js' import { diff --git a/packages/auth/src/invitation/verifiedGraphProof.ts b/packages/auth/src/invitation/verifiedGraphProof.ts index 88d9559a..e20616a7 100644 --- a/packages/auth/src/invitation/verifiedGraphProof.ts +++ b/packages/auth/src/invitation/verifiedGraphProof.ts @@ -1,5 +1,5 @@ import { hash, signatures, type SignedMessage, type Payload } from '@localfirst/crypto' -import { type TeamLink } from 'team/types.js' +import { type TeamLink } from '../team/types.js' import { pack, unpack } from 'msgpackr' import { getLinkValidationOwner } from '@localfirst/crdx' diff --git a/packages/auth/src/lockbox/CheckedKeyStore.ts b/packages/auth/src/lockbox/CheckedKeyStore.ts index 7eaab8e7..95467555 100644 --- a/packages/auth/src/lockbox/CheckedKeyStore.ts +++ b/packages/auth/src/lockbox/CheckedKeyStore.ts @@ -2,7 +2,7 @@ import { type KeysetWithSecrets } from '@localfirst/crdx' import { asymmetric, hash, type Payload } from '@localfirst/crypto' import { assert } from '@localfirst/shared' import { pack, unpack } from 'msgpackr' -import { isUnsafeScopeName } from 'team/unsafeScopeName.js' +import { isUnsafeScopeName } from '../team/unsafeScopeName.js' import { keysetCommitment } from './keysetCommitment.js' import { isLockboxCollection, snapshotLockbox } from './snapshot.js' import { isKeyManifest, isRecipientManifest, type Lockbox } from './types.js' diff --git a/packages/auth/src/team/Team.ts b/packages/auth/src/team/Team.ts index 17db3009..c4580aa6 100644 --- a/packages/auth/src/team/Team.ts +++ b/packages/auth/src/team/Team.ts @@ -30,7 +30,7 @@ import * as invitations from 'invitation/index.js' import { type InvitationClaim, type ProofOfInvitation } from 'invitation/index.js' import { normalize } from 'invitation/normalize.js' import * as lockbox from 'lockbox/index.js' -import { CheckedKeyStore } from 'lockbox/CheckedKeyStore.js' +import { CheckedKeyStore } from '../lockbox/CheckedKeyStore.js' import { type AddRoleInput, ADMIN, type Role } from 'role/index.js' import { castServer } from 'server/castServer.js' import { type Host, type Server } from 'server/types.js' diff --git a/packages/auth/src/team/decryptTeamGraph.ts b/packages/auth/src/team/decryptTeamGraph.ts index cf22577a..32738a8d 100644 --- a/packages/auth/src/team/decryptTeamGraph.ts +++ b/packages/auth/src/team/decryptTeamGraph.ts @@ -17,7 +17,7 @@ import { type TeamState, } from './types.js' import { assert, Logger } from '@localfirst/shared' -import { CheckedKeyStore } from 'lockbox/CheckedKeyStore.js' +import { CheckedKeyStore } from '../lockbox/CheckedKeyStore.js' /** * Decrypts a graph. diff --git a/packages/auth/src/team/lockboxAuthorization.ts b/packages/auth/src/team/lockboxAuthorization.ts index 89ea58f4..a8040091 100644 --- a/packages/auth/src/team/lockboxAuthorization.ts +++ b/packages/auth/src/team/lockboxAuthorization.ts @@ -1,5 +1,5 @@ -import { CommitmentIndex } from 'lockbox/commitmentIndex.js' -import { isLockboxCollection, isLockboxSnapshot } from 'lockbox/snapshot.js' +import { CommitmentIndex } from '../lockbox/commitmentIndex.js' +import { isLockboxCollection, isLockboxSnapshot } from '../lockbox/snapshot.js' import { ROOT, type Keyset } from '@localfirst/crdx' import { isBase58KeyOfLength } from '@localfirst/crypto' import { type Logger } from '@localfirst/shared' diff --git a/packages/auth/src/team/selectors/keyMap.ts b/packages/auth/src/team/selectors/keyMap.ts index c6f00798..30914084 100644 --- a/packages/auth/src/team/selectors/keyMap.ts +++ b/packages/auth/src/team/selectors/keyMap.ts @@ -1,12 +1,12 @@ import { type KeysetWithSecrets } from '@localfirst/crdx' -import { CheckedKeyStore } from 'lockbox/CheckedKeyStore.js' +import { CheckedKeyStore, type KeyMap } from '../../lockbox/CheckedKeyStore.js' import { type TeamState } from 'team/types.js' -export type { KeyMap } from 'lockbox/CheckedKeyStore.js' - /** Select reachable keysets by scope and generation from the current state's deliveries. */ export const keyMap = ( state: TeamState, deviceKeys: KeysetWithSecrets, checkedKeys = new CheckedKeyStore() -) => checkedKeys.keyMap(state.lockboxes, deviceKeys) +): KeyMap => checkedKeys.keyMap(state.lockboxes, deviceKeys) + +export { type KeyMap } from '../../lockbox/CheckedKeyStore.js' diff --git a/packages/auth/src/team/selectors/keys.ts b/packages/auth/src/team/selectors/keys.ts index a785ddca..6daea3d1 100644 --- a/packages/auth/src/team/selectors/keys.ts +++ b/packages/auth/src/team/selectors/keys.ts @@ -1,6 +1,6 @@ import { type KeyMetadata, type KeyScope, type KeysetWithSecrets } from '@localfirst/crdx' import { keyMap } from './keyMap.js' -import { type CheckedKeyStore } from 'lockbox/CheckedKeyStore.js' +import { type CheckedKeyStore } from '../../lockbox/CheckedKeyStore.js' import { type TeamState } from 'team/types.js' import { assert } from '@localfirst/shared' diff --git a/packages/auth/src/team/selectors/teamKeyring.ts b/packages/auth/src/team/selectors/teamKeyring.ts index 9c2c4d5d..94560e8f 100644 --- a/packages/auth/src/team/selectors/teamKeyring.ts +++ b/packages/auth/src/team/selectors/teamKeyring.ts @@ -2,7 +2,7 @@ import { type KeysetWithSecrets, createKeyring } from '@localfirst/crdx' import { type TeamState } from 'team/types.js' import { KeyType } from 'util/types.js' import { keyMap } from './keyMap.js' -import { type CheckedKeyStore } from 'lockbox/CheckedKeyStore.js' +import { type CheckedKeyStore } from '../../lockbox/CheckedKeyStore.js' const { TEAM } = KeyType diff --git a/packages/auth/src/team/selectors/visibleKeys.ts b/packages/auth/src/team/selectors/visibleKeys.ts index 8dffb391..8a3e9b2f 100644 --- a/packages/auth/src/team/selectors/visibleKeys.ts +++ b/packages/auth/src/team/selectors/visibleKeys.ts @@ -1,5 +1,5 @@ import { type KeysetWithSecrets } from '@localfirst/crdx' -import { CheckedKeyStore } from 'lockbox/CheckedKeyStore.js' +import { CheckedKeyStore } from '../../lockbox/CheckedKeyStore.js' import { type TeamState } from 'team/types.js' /** Keysets reachable through the supplied state's lockboxes, excluding the starting keyset. */ diff --git a/packages/auth/src/team/transforms/collectLockboxes.ts b/packages/auth/src/team/transforms/collectLockboxes.ts index 23640d49..f5431775 100644 --- a/packages/auth/src/team/transforms/collectLockboxes.ts +++ b/packages/auth/src/team/transforms/collectLockboxes.ts @@ -1,6 +1,6 @@ -import { appendLockboxes } from 'lockbox/snapshot.js' +import { appendLockboxes } from '../../lockbox/snapshot.js' import { type Logger } from '@localfirst/shared' -import { authorizedLockboxes, extendEstablishedCommitments } from 'team/lockboxAuthorization.js' +import { authorizedLockboxes, extendEstablishedCommitments } from '../lockboxAuthorization.js' import { isLockboxCarrierAction, SignerKind, diff --git a/packages/crdx/src/graph/validationOwner.ts b/packages/crdx/src/graph/validationOwner.ts index 35d03a59..2a752ce0 100644 --- a/packages/crdx/src/graph/validationOwner.ts +++ b/packages/crdx/src/graph/validationOwner.ts @@ -1,4 +1,4 @@ -import { type Hash } from 'util/types.js' +import { type Hash } from '../util/types.js' type Owner = { hash: Hash }