Allow husky to run in CI again

* Unpackage-ify jslib

* Adjust .tsconfig path for root and apply to jslib

* Rebuild package-lock.json

* Disable husky in CI

* Revert an incorrect find/replace

* Add jslib/shared/.eslintrc rules to root eslintrc

* Revert package.json change to ignore spec files when linting

* Ensure custom matcher gets imported in jslib tests

* Fix small workflow bugs from merging

* Try and get CI builds moving again

* Always sign and notorize builds in CI

* Revert erroneous verion bump

.eslintrc.json

@@ -4,8 +4,32 @@
     "browser": true,
     "node": true
   },
-  "extends": ["./jslib/shared/eslintrc.json"],
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:import/recommended",
+    "plugin:import/typescript",
+    "prettier"
+  ],
   "rules": {
+    "@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled
+    "@typescript-eslint/no-unused-vars": ["warn", { "args": "none" }],
+    "@typescript-eslint/explicit-member-accessibility": [
+      "error",
+      {
+        "accessibility": "no-public"
+      }
+    ],
+    "@typescript-eslint/no-this-alias": [
+      "error",
+      {
+        "allowedNames": ["self"]
+      }
+    ],
+    "no-console": "warn",
+    "import/no-unresolved": "off", // TODO: Look into turning off once each package is an actual package.
     "import/order": [
       "error",
       {

.github/renovate.json

@@ -8,34 +8,23 @@
     ":pinAllExceptPeerDependencies",
     ":prConcurrentLimit10",
     ":rebaseStalePrs",
-    "schedule:weekends",
-    ":separateMajorReleases"
+    ":separateMajorReleases",
+    "group:monorepos",
+    "schedule:weekends"
   ],
   "enabledManagers": ["github-actions", "npm"],
+  "commitMessagePrefix": "[deps]:",
+  "commitMessageTopic": "{{depName}}",
   "packageRules": [
-    {
-      "groupName": "gh minor",
-      "matchManagers": ["github-actions"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
     {
       "groupName": "npm minor",
       "matchManagers": ["npm"],
       "matchUpdateTypes": ["minor", "patch"]
     },
     {
-      "packageNames": ["typescript"],
-      "matchUpdateTypes": ["major", "minor"],
-      "enabled": false
-    },
-    {
-      "packageNames": ["typescript"],
-      "matchUpdateTypes": "patch"
-    },
-    {
-      "groupName": "jest",
-      "packageNames": ["@types/jest", "jest", "ts-jest", "jest-preset-angular"],
-      "matchUpdateTypes": "major"
+      "matchFileNames": ["package.json"],
+      "description": "Admin Console owns general dependencies",
+      "reviewers": ["team:team-admin-console-dev"]
     }
   ]
 }

.github/workflows/build.yml

@@ -2,14 +2,9 @@
 name: Build
 
 on:
-  push:
-    branches-ignore:
-      - 'l10n_master'
-    paths-ignore:
-      - '.github/workflows/**'
+  pull_request: {}
   workflow_dispatch: {}
 
-
 jobs:
   cloc:
     name: CLOC
@@ -39,7 +34,7 @@ jobs:
       - name: Get Package Version
         id: retrieve-version
         run: |
-          PKG_VERSION=$(jq -r .version src/package.json)
+          PKG_VERSION=$(jq -r .version package.json)
           echo "package_version=$PKG_VERSION" >> $GITHUB_OUTPUT
 
 
@@ -77,7 +72,7 @@ jobs:
 
       - name: Keytar
         run: |
-          keytarVersion=$(cat src/package.json | jq -r '.dependencies.keytar')
+          keytarVersion=$(cat package.json | jq -r '.dependencies.keytar')
           keytarTar="keytar-v$keytarVersion-napi-v3-linux-x64.tar"
 
           keytarTarGz="$keytarTar.gz"
@@ -172,7 +167,7 @@ jobs:
 
       - name: Keytar
         run: |
-          keytarVersion=$(cat src/package.json | jq -r '.dependencies.keytar')
+          keytarVersion=$(cat package.json | jq -r '.dependencies.keytar')
           keytarTar="keytar-v$keytarVersion-napi-v3-darwin-x64.tar"
 
           keytarTarGz="$keytarTar.gz"
@@ -268,7 +263,7 @@ jobs:
       - name: Keytar
         shell: pwsh
         run: |
-          $keytarVersion = (Get-Content -Raw -Path ./src/package.json | ConvertFrom-Json).dependencies.keytar
+          $keytarVersion = (Get-Content -Raw -Path ./package.json | ConvertFrom-Json).dependencies.keytar
           $keytarTar = "keytar-v${keytarVersion}-napi-v3-{0}-x64.tar"
           $keytarTarGz = "${keytarTar}.gz"
           $keytarUrl = "https://github.com/atom/node-keytar/releases/download/v${keytarVersion}/${keytarTarGz}"
@@ -337,8 +332,7 @@ jobs:
 
       - name: Zip
         shell: cmd
-        run: |
-          7z a .\dist-cli\bwdc-windows-%_PACKAGE_VERSION%.zip .\dist-cli\windows\bwdc.exe .\keytar\windows\keytar.node
+        run: 7z a .\dist-cli\bwdc-windows-%_PACKAGE_VERSION%.zip .\dist-cli\windows\bwdc.exe .\keytar\windows\keytar.node
 
       - name: Version Test
         shell: pwsh
@@ -400,7 +394,7 @@ jobs:
           npm --version
 
       - name: Install AST
-        uses: bitwarden/gh-actions/install-ast@main
+        run: dotnet tool install --global AzureSignTool --version 4.0.1
 
       - name: Install Node dependencies
         run: npm install
@@ -569,7 +563,7 @@ jobs:
       - name: Load package version
         run: |
           $rootPath = $env:GITHUB_WORKSPACE;
-          $packageVersion = (Get-Content -Raw -Path $rootPath\src\package.json | ConvertFrom-Json).version;
+          $packageVersion = (Get-Content -Raw -Path $rootPath\package.json | ConvertFrom-Json).version;
 
           Write-Output "Setting package version to $packageVersion";
           Write-Output "PACKAGE_VERSION=$packageVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append;
@@ -583,6 +577,7 @@ jobs:
         env:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          CSC_FOR_PULL_REQUEST: true
 
       - name: Upload .zip artifact
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
@@ -627,7 +622,7 @@ jobs:
       - macos-gui
     steps:
       - name: Check if any job failed
-        if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }}
+        if: ${{ (github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/rc') }}
         env:
           CLOC_STATUS: ${{ needs.cloc.result }}
           SETUP_STATUS: ${{ needs.setup.result }}

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
         with:
           release-type: ${{ github.event.inputs.release_type }}
           project-type: ts
-          file: src/package.json
+          file: package.json
 
   release:
     name: Release
@@ -71,7 +71,7 @@ jobs:
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: master
+          branch: main
 
       - name: Create release
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}

.github/workflows/version-bump.yml

@@ -1,22 +1,25 @@
 ---
 name: Version Bump
+run-name: Version Bump - v${{ inputs.version_number }}
 
 on:
   workflow_dispatch:
     inputs:
       version_number:
-        description: "New Version"
+        description: "New version (example: '2024.1.0')"
         required: true
+        type: string
+      cut_rc_branch:
+        description: "Cut RC branch?"
+        default: true
+        type: boolean
 
 jobs:
   bump_version:
-    name: "Create version_bump_${{ github.event.inputs.version_number }} branch"
+    name: "Bump Version to v${{ inputs.version_number }}"
     runs-on: ubuntu-22.04
     steps:
-      - name: Checkout Branch
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Login to Azure - Prod Subscription
+      - name: Login to Azure - CI Subscription
         uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
         with:
           creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
@@ -26,7 +29,15 @@ jobs:
         uses: bitwarden/gh-actions/get-keyvault-secrets@main
         with:
           keyvault: "bitwarden-ci"
-          secrets: "github-gpg-private-key, github-gpg-private-key-passphrase"
+          secrets: "github-gpg-private-key,
+            github-gpg-private-key-passphrase,
+            github-pat-bitwarden-devops-bot-repo-scope"
+
+      - name: Checkout Branch
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: main
+          repository: bitwarden/directory-connector
 
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6.0.0
@@ -37,39 +48,74 @@ jobs:
           git_commit_gpgsign: true
 
       - name: Create Version Branch
+        id: create-branch
         run: |
-          git switch -c version_bump_${{ github.event.inputs.version_number }}
-          git push -u origin version_bump_${{ github.event.inputs.version_number }}
+          NAME=version_bump_${{ github.ref_name }}_${{ inputs.version_number }}
+          git switch -c $NAME
+          echo "name=$NAME" >> $GITHUB_OUTPUT
 
-      - name: Checkout Version Branch
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-        with:
-          ref: version_bump_${{ github.event.inputs.version_number }}
+      - name: Verify input version
+        env:
+          NEW_VERSION: ${{ inputs.version_number }}
+        run: |
+          CURRENT_VERSION=$(cat package.json | jq -r '.version')
+
+          # Error if version has not changed.
+          if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then
+            echo "Version has not changed."
+            exit 1
+          fi
+
+          # Check if version is newer.
+          printf '%s\n' "${CURRENT_VERSION}" "${NEW_VERSION}" | sort -C -V
+          if [ $? -eq 0 ]; then
+            echo "Version check successful."
+          else
+            echo "Version check failed."
+            exit 1
+          fi
 
       - name: Bump Version - Package
         uses: bitwarden/gh-actions/version-bump@main
         with:
-          version: ${{ github.event.inputs.version_number }}
-          file_path: "./src/package.json"
+          version: ${{ inputs.version_number }}
+          file_path: "./package.json"
 
-      - name: Commit files
+      - name: Setup git
         run: |
           git config --local user.email "106330231+bitwarden-devops-bot@users.noreply.github.com"
           git config --local user.name "bitwarden-devops-bot"
-          git commit -m "Bumped version to ${{ github.event.inputs.version_number }}" -a
+
+      - name: Check if version changed
+        id: version-changed
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "changes_to_commit=TRUE" >> $GITHUB_OUTPUT
+          else
+            echo "changes_to_commit=FALSE" >> $GITHUB_OUTPUT
+            echo "No changes to commit!";
+          fi
+
+      - name: Commit files
+        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
+        run: git commit -m "Bumped version to ${{ inputs.version_number }}" -a
 
       - name: Push changes
-        run: git push -u origin version_bump_${{ github.event.inputs.version_number }}
+        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
+        env:
+          PR_BRANCH: ${{ steps.create-branch.outputs.name }}
+        run: git push -u origin $PR_BRANCH
 
       - name: Create Version PR
+        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
+        id: create-pr
         env:
-          PR_BRANCH: "version_bump_${{ github.event.inputs.version_number }}"
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          BASE_BRANCH: master
-          TITLE: "Bump version to ${{ github.event.inputs.version_number }}"
+          GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
+          PR_BRANCH: ${{ steps.create-branch.outputs.name }}
+          TITLE: "Bump version to ${{ inputs.version_number }}"
         run: |
-          gh pr create --title "$TITLE" \
-            --base "$BASE" \
+          PR_URL=$(gh pr create --title "$TITLE" \
+            --base "main" \
             --head "$PR_BRANCH" \
             --label "version update" \
             --label "automated pr" \
@@ -82,4 +128,42 @@ jobs:
               - [X] Other
 
               ## Objective
-              Automated version bump to ${{ github.event.inputs.version_number }}"
+              Automated version bump to ${{ inputs.version_number }}")
+          echo "pr_number=${PR_URL##*/}" >> $GITHUB_OUTPUT
+
+      - name: Approve PR
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
+        run: gh pr review $PR_NUMBER --approve
+
+      - name: Merge PR
+        env:
+          GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
+          PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
+        run: gh pr merge $PR_NUMBER --squash --auto --delete-branch
+
+  cut_rc:
+    name: Cut RC branch
+    needs: bump_version
+    if: ${{ inputs.cut_rc_branch == true }}
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Branch
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: main
+
+      - name: Check if RC branch exists
+        run: |
+          remote_rc_branch_check=$(git ls-remote --heads origin rc | wc -l)
+          if [[ "${remote_rc_branch_check}" -gt 0 ]]; then
+            echo "Remote RC branch exists."
+            echo "Please delete current RC branch before running again."
+            exit 1
+          fi
+
+      - name: Cut RC branch
+        run: |
+          git switch --quiet --create rc
+          git push --quiet --set-upstream origin rc

.github/workflows/workflow-linter.yml

@@ -8,4 +8,4 @@ on:
 
 jobs:
   call-workflow:
-    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@c970b0fb89bd966749280e832928db62040812bf
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@main

.gitignore

@@ -37,3 +37,4 @@ junit.xml
 *.pem
 *.zip
 *.provisionprofile
+.swp

jest.config.js

@@ -0,0 +1,27 @@
+const { pathsToModuleNameMapper } = require("ts-jest");
+
+const { compilerOptions } = require("./tsconfig");
+
+/** @type {import('jest').Config} */
+module.exports = {
+  reporters: ["default", "jest-junit"],
+
+  collectCoverage: true,
+  coverageReporters: ["html", "lcov"],
+  coverageDirectory: "coverage",
+
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
+    prefix: "<rootDir>/",
+  }),
+  projects: [
+    "<rootDir>/jslib/angular/jest.config.js",
+    "<rootDir>/jslib/common/jest.config.js",
+    "<rootDir>/jslib/electron/jest.config.js",
+    "<rootDir>/jslib/node/jest.config.js",
+  ],
+
+  // Workaround for a memory leak that crashes tests in CI:
+  // https://github.com/facebook/jest/issues/9430#issuecomment-1149882002
+  // Also anecdotally improves performance when run locally
+  maxWorkers: 3,
+};

jslib/.prettierrc.json

@@ -1,3 +0,0 @@
-{
-  "printWidth": 100
-}

jslib/angular/jest.config.js

@@ -1,16 +1,15 @@
-const { pathsToModuleNameMapper } = require("ts-jest/utils");
+const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../shared/tsconfig.libs");
 
+const sharedConfig = require("../shared/jest.config.angular");
+
+/** @type {import('jest').Config} */
 module.exports = {
-  name: "angular",
-  displayName: "angular tests",
+  ...sharedConfig,
+  displayName: "libs/angular tests",
   preset: "jest-preset-angular",
-  testMatch: ["**/+(*.)+(spec).+(ts)"],
-  setupFilesAfterEnv: ["<rootDir>/spec/test.ts"],
-  collectCoverage: true,
-  coverageReporters: ["html", "lcov"],
-  coverageDirectory: "coverage",
+  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),

jslib/angular/package-lock.json

@@ -1,13 +0,0 @@
-{
-  "name": "@bitwarden/jslib-angular",
-  "version": "0.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@bitwarden/jslib-angular",
-      "version": "0.0.0",
-      "license": "GPL-3.0"
-    }
-  }
-}

jslib/angular/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "@bitwarden/jslib-angular",
-  "version": "0.0.0",
-  "description": "Common code used across Bitwarden JavaScript projects.",
-  "keywords": [
-    "bitwarden"
-  ],
-  "author": "Bitwarden Inc.",
-  "homepage": "https://bitwarden.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/bitwarden/jslib"
-  },
-  "license": "GPL-3.0",
-  "scripts": {
-    "clean": "rimraf dist/**/*",
-    "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
-  },
-  "dependencies": {}
-}

jslib/angular/src/components/callout.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from "@angular/core";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { MasterPasswordPolicyOptions } from "@/jslib/common/src/models/domain/masterPasswordPolicyOptions";
 
 @Component({
   selector: "app-callout",

jslib/angular/src/components/environment.component.ts

@@ -1,8 +1,8 @@
 import { Directive, EventEmitter, Output } from "@angular/core";
 
-import { EnvironmentService } from "jslib-common/abstractions/environment.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { EnvironmentService } from "@/jslib/common/src/abstractions/environment.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
 
 @Directive()
 export class EnvironmentComponent {

jslib/angular/src/components/icon.component.ts

@@ -1,10 +1,10 @@
 import { Component, Input, OnChanges } from "@angular/core";
 
-import { EnvironmentService } from "jslib-common/abstractions/environment.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { CipherType } from "jslib-common/enums/cipherType";
-import { Utils } from "jslib-common/misc/utils";
-import { CipherView } from "jslib-common/models/view/cipherView";
+import { EnvironmentService } from "@/jslib/common/src/abstractions/environment.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { Utils } from "@/jslib/common/src/misc/utils";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
 
 /**
  * Provides a mapping from supported card brands to

jslib/angular/src/components/password-reprompt.component.ts

@@ -1,8 +1,8 @@
 import { Directive } from "@angular/core";
 
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
 
 import { ModalRef } from "./modal/modal.ref";
 

jslib/angular/src/components/user-verification.component.html

@@ -1,46 +0,0 @@
-<ng-container *ngIf="!usesKeyConnector">
-  <label for="masterPassword">{{ "masterPass" | i18n }}</label>
-  <input
-    id="masterPassword"
-    type="password"
-    name="MasterPasswordHash"
-    class="form-control"
-    [formControl]="secret"
-    required
-    appAutofocus
-    appInputVerbatim
-  />
-  <small class="form-text text-muted">{{ "confirmIdentity" | i18n }}</small>
-</ng-container>
-<ng-container *ngIf="usesKeyConnector">
-  <div class="form-group">
-    <label class="d-block">{{ "sendVerificationCode" | i18n }}</label>
-    <button
-      type="button"
-      class="btn btn-outline-secondary"
-      (click)="requestOTP()"
-      [disabled]="disableRequestOTP"
-    >
-      {{ "sendCode" | i18n }}
-    </button>
-    <span class="ml-2 text-success" role="alert" @sent *ngIf="sentCode">
-      <i class="bwi bwi-check-circle" aria-hidden="true"></i>
-      {{ "codeSent" | i18n }}
-    </span>
-  </div>
-
-  <div class="form-group">
-    <label for="verificationCode">{{ "verificationCode" | i18n }}</label>
-    <input
-      id="verificationCode"
-      type="input"
-      name="verificationCode"
-      class="form-control"
-      [formControl]="secret"
-      required
-      appAutofocus
-      appInputVerbatim
-    />
-    <small class="form-text text-muted">{{ "confirmIdentity" | i18n }}</small>
-  </div>
-</ng-container>

jslib/angular/src/components/user-verification.component.ts

@@ -1,96 +0,0 @@
-import { animate, style, transition, trigger } from "@angular/animations";
-import { Component, OnInit } from "@angular/core";
-import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from "@angular/forms";
-
-import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
-import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
-import { VerificationType } from "jslib-common/enums/verificationType";
-import { Verification } from "jslib-common/types/verification";
-
-/**
- * Used for general-purpose user verification throughout the app.
- * Collects the user's master password, or if they are using Key Connector, prompts for an OTP via email.
- * This is exposed to the parent component via the ControlValueAccessor interface (e.g. bind it to a FormControl).
- * Use UserVerificationService to verify the user's input.
- */
-@Component({
-  selector: "app-user-verification",
-  templateUrl: "user-verification.component.html",
-  providers: [
-    {
-      provide: NG_VALUE_ACCESSOR,
-      multi: true,
-      useExisting: UserVerificationComponent,
-    },
-  ],
-  animations: [
-    trigger("sent", [
-      transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
-    ]),
-  ],
-})
-export class UserVerificationComponent implements ControlValueAccessor, OnInit {
-  usesKeyConnector = false;
-  disableRequestOTP = false;
-  sentCode = false;
-
-  secret = new FormControl("");
-
-  private onChange: (value: Verification) => void;
-
-  constructor(
-    private keyConnectorService: KeyConnectorService,
-    private userVerificationService: UserVerificationService
-  ) {}
-
-  async ngOnInit() {
-    this.usesKeyConnector = await this.keyConnectorService.getUsesKeyConnector();
-    this.processChanges(this.secret.value);
-
-    this.secret.valueChanges.subscribe((secret: string) => this.processChanges(secret));
-  }
-
-  async requestOTP() {
-    if (this.usesKeyConnector) {
-      this.disableRequestOTP = true;
-      try {
-        await this.userVerificationService.requestOTP();
-        this.sentCode = true;
-      } finally {
-        this.disableRequestOTP = false;
-      }
-    }
-  }
-
-  writeValue(obj: any): void {
-    this.secret.setValue(obj);
-  }
-
-  registerOnChange(fn: any): void {
-    this.onChange = fn;
-  }
-
-  registerOnTouched(fn: any): void {
-    // Not implemented
-  }
-
-  setDisabledState?(isDisabled: boolean): void {
-    this.disableRequestOTP = isDisabled;
-    if (isDisabled) {
-      this.secret.disable();
-    } else {
-      this.secret.enable();
-    }
-  }
-
-  private processChanges(secret: string) {
-    if (this.onChange == null) {
-      return;
-    }
-
-    this.onChange({
-      type: this.usesKeyConnector ? VerificationType.OTP : VerificationType.MasterPassword,
-      secret: secret,
-    });
-  }
-}

jslib/angular/src/directives/api-action.directive.ts

@@ -1,7 +1,7 @@
 import { Directive, ElementRef, Input, OnChanges } from "@angular/core";
 
-import { LogService } from "jslib-common/abstractions/log.service";
-import { ErrorResponse } from "jslib-common/models/response/errorResponse";
+import { LogService } from "@/jslib/common/src/abstractions/log.service";
+import { ErrorResponse } from "@/jslib/common/src/models/response/errorResponse";
 
 import { ValidationService } from "../services/validation.service";
 

jslib/angular/src/directives/autofocus.directive.ts

@@ -1,7 +1,7 @@
 import { Directive, ElementRef, Input, NgZone } from "@angular/core";
 import { take } from "rxjs/operators";
 
-import { Utils } from "jslib-common/misc/utils";
+import { Utils } from "@/jslib/common/src/misc/utils";
 
 @Directive({
   selector: "[appAutofocus]",

jslib/angular/src/pipes/i18n.pipe.ts

@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from "@angular/core";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
 
 @Pipe({
   name: "i18n",

jslib/angular/src/pipes/search-ciphers.pipe.ts

@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from "@angular/core";
 
-import { CipherView } from "jslib-common/models/view/cipherView";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
 
 @Pipe({
   name: "searchCiphers",

jslib/angular/src/scss/bwicons/styles/style.scss

@@ -1,5 +1,5 @@
 $icomoon-font-family: "bwi-font" !default;
-$icomoon-font-path: "~@bitwarden/jslib-angular/src/scss/bwicons/fonts/" !default;
+$icomoon-font-path: "/jslib/angular/src/scss/bwicons/fonts/" !default;
 
 // New font sheet? Update the font-face information below
 @font-face {

jslib/angular/src/services/auth-guard.service.ts

@@ -1,10 +1,10 @@
 import { Injectable } from "@angular/core";
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router";
 
-import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
+import { KeyConnectorService } from "@/jslib/common/src/abstractions/keyConnector.service";
+import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
 
 @Injectable()
 export class AuthGuardService implements CanActivate {

jslib/angular/src/services/broadcaster.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 
-import { BroadcasterService as BaseBroadcasterService } from "jslib-common/services/broadcaster.service";
+import { BroadcasterService as BaseBroadcasterService } from "@/jslib/common/src/services/broadcaster.service";
 
 @Injectable()
 export class BroadcasterService extends BaseBroadcasterService {}

jslib/angular/src/services/jslib-services.module.ts

@@ -1,78 +1,78 @@
 import { Injector, LOCALE_ID, NgModule } from "@angular/core";
 
-import { ApiService as ApiServiceAbstraction } from "jslib-common/abstractions/api.service";
-import { AppIdService as AppIdServiceAbstraction } from "jslib-common/abstractions/appId.service";
-import { AuditService as AuditServiceAbstraction } from "jslib-common/abstractions/audit.service";
-import { AuthService as AuthServiceAbstraction } from "jslib-common/abstractions/auth.service";
-import { BroadcasterService as BroadcasterServiceAbstraction } from "jslib-common/abstractions/broadcaster.service";
-import { CipherService as CipherServiceAbstraction } from "jslib-common/abstractions/cipher.service";
-import { CollectionService as CollectionServiceAbstraction } from "jslib-common/abstractions/collection.service";
-import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service";
-import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "jslib-common/abstractions/cryptoFunction.service";
-import { EnvironmentService as EnvironmentServiceAbstraction } from "jslib-common/abstractions/environment.service";
-import { EventService as EventServiceAbstraction } from "jslib-common/abstractions/event.service";
-import { ExportService as ExportServiceAbstraction } from "jslib-common/abstractions/export.service";
-import { FileUploadService as FileUploadServiceAbstraction } from "jslib-common/abstractions/fileUpload.service";
-import { FolderService as FolderServiceAbstraction } from "jslib-common/abstractions/folder.service";
-import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service";
-import { KeyConnectorService as KeyConnectorServiceAbstraction } from "jslib-common/abstractions/keyConnector.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { MessagingService as MessagingServiceAbstraction } from "jslib-common/abstractions/messaging.service";
-import { NotificationsService as NotificationsServiceAbstraction } from "jslib-common/abstractions/notifications.service";
-import { OrganizationService as OrganizationServiceAbstraction } from "jslib-common/abstractions/organization.service";
-import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "jslib-common/abstractions/passwordGeneration.service";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service";
-import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service";
-import { PolicyService as PolicyServiceAbstraction } from "jslib-common/abstractions/policy.service";
-import { ProviderService as ProviderServiceAbstraction } from "jslib-common/abstractions/provider.service";
-import { SearchService as SearchServiceAbstraction } from "jslib-common/abstractions/search.service";
-import { SendService as SendServiceAbstraction } from "jslib-common/abstractions/send.service";
-import { SettingsService as SettingsServiceAbstraction } from "jslib-common/abstractions/settings.service";
-import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service";
-import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service";
-import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service";
-import { SyncService as SyncServiceAbstraction } from "jslib-common/abstractions/sync.service";
-import { TokenService as TokenServiceAbstraction } from "jslib-common/abstractions/token.service";
-import { TotpService as TotpServiceAbstraction } from "jslib-common/abstractions/totp.service";
-import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service";
-import { UserVerificationService as UserVerificationServiceAbstraction } from "jslib-common/abstractions/userVerification.service";
-import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "jslib-common/abstractions/usernameGeneration.service";
-import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service";
-import { StateFactory } from "jslib-common/factories/stateFactory";
-import { Account } from "jslib-common/models/domain/account";
-import { GlobalState } from "jslib-common/models/domain/globalState";
-import { ApiService } from "jslib-common/services/api.service";
-import { AppIdService } from "jslib-common/services/appId.service";
-import { AuditService } from "jslib-common/services/audit.service";
-import { AuthService } from "jslib-common/services/auth.service";
-import { CipherService } from "jslib-common/services/cipher.service";
-import { CollectionService } from "jslib-common/services/collection.service";
-import { ConsoleLogService } from "jslib-common/services/consoleLog.service";
-import { CryptoService } from "jslib-common/services/crypto.service";
-import { EnvironmentService } from "jslib-common/services/environment.service";
-import { EventService } from "jslib-common/services/event.service";
-import { ExportService } from "jslib-common/services/export.service";
-import { FileUploadService } from "jslib-common/services/fileUpload.service";
-import { FolderService } from "jslib-common/services/folder.service";
-import { KeyConnectorService } from "jslib-common/services/keyConnector.service";
-import { NotificationsService } from "jslib-common/services/notifications.service";
-import { OrganizationService } from "jslib-common/services/organization.service";
-import { PasswordGenerationService } from "jslib-common/services/passwordGeneration.service";
-import { PolicyService } from "jslib-common/services/policy.service";
-import { ProviderService } from "jslib-common/services/provider.service";
-import { SearchService } from "jslib-common/services/search.service";
-import { SendService } from "jslib-common/services/send.service";
-import { SettingsService } from "jslib-common/services/settings.service";
-import { StateService } from "jslib-common/services/state.service";
-import { StateMigrationService } from "jslib-common/services/stateMigration.service";
-import { SyncService } from "jslib-common/services/sync.service";
-import { TokenService } from "jslib-common/services/token.service";
-import { TotpService } from "jslib-common/services/totp.service";
-import { TwoFactorService } from "jslib-common/services/twoFactor.service";
-import { UserVerificationService } from "jslib-common/services/userVerification.service";
-import { UsernameGenerationService } from "jslib-common/services/usernameGeneration.service";
-import { VaultTimeoutService } from "jslib-common/services/vaultTimeout.service";
-import { WebCryptoFunctionService } from "jslib-common/services/webCryptoFunction.service";
+import { ApiService as ApiServiceAbstraction } from "@/jslib/common/src/abstractions/api.service";
+import { AppIdService as AppIdServiceAbstraction } from "@/jslib/common/src/abstractions/appId.service";
+import { AuditService as AuditServiceAbstraction } from "@/jslib/common/src/abstractions/audit.service";
+import { AuthService as AuthServiceAbstraction } from "@/jslib/common/src/abstractions/auth.service";
+import { BroadcasterService as BroadcasterServiceAbstraction } from "@/jslib/common/src/abstractions/broadcaster.service";
+import { CipherService as CipherServiceAbstraction } from "@/jslib/common/src/abstractions/cipher.service";
+import { CollectionService as CollectionServiceAbstraction } from "@/jslib/common/src/abstractions/collection.service";
+import { CryptoService as CryptoServiceAbstraction } from "@/jslib/common/src/abstractions/crypto.service";
+import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@/jslib/common/src/abstractions/cryptoFunction.service";
+import { EnvironmentService as EnvironmentServiceAbstraction } from "@/jslib/common/src/abstractions/environment.service";
+import { EventService as EventServiceAbstraction } from "@/jslib/common/src/abstractions/event.service";
+import { ExportService as ExportServiceAbstraction } from "@/jslib/common/src/abstractions/export.service";
+import { FileUploadService as FileUploadServiceAbstraction } from "@/jslib/common/src/abstractions/fileUpload.service";
+import { FolderService as FolderServiceAbstraction } from "@/jslib/common/src/abstractions/folder.service";
+import { I18nService as I18nServiceAbstraction } from "@/jslib/common/src/abstractions/i18n.service";
+import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@/jslib/common/src/abstractions/keyConnector.service";
+import { LogService } from "@/jslib/common/src/abstractions/log.service";
+import { MessagingService as MessagingServiceAbstraction } from "@/jslib/common/src/abstractions/messaging.service";
+import { NotificationsService as NotificationsServiceAbstraction } from "@/jslib/common/src/abstractions/notifications.service";
+import { OrganizationService as OrganizationServiceAbstraction } from "@/jslib/common/src/abstractions/organization.service";
+import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@/jslib/common/src/abstractions/passwordGeneration.service";
+import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@/jslib/common/src/abstractions/passwordReprompt.service";
+import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@/jslib/common/src/abstractions/platformUtils.service";
+import { PolicyService as PolicyServiceAbstraction } from "@/jslib/common/src/abstractions/policy.service";
+import { ProviderService as ProviderServiceAbstraction } from "@/jslib/common/src/abstractions/provider.service";
+import { SearchService as SearchServiceAbstraction } from "@/jslib/common/src/abstractions/search.service";
+import { SendService as SendServiceAbstraction } from "@/jslib/common/src/abstractions/send.service";
+import { SettingsService as SettingsServiceAbstraction } from "@/jslib/common/src/abstractions/settings.service";
+import { StateService as StateServiceAbstraction } from "@/jslib/common/src/abstractions/state.service";
+import { StateMigrationService as StateMigrationServiceAbstraction } from "@/jslib/common/src/abstractions/stateMigration.service";
+import { StorageService as StorageServiceAbstraction } from "@/jslib/common/src/abstractions/storage.service";
+import { SyncService as SyncServiceAbstraction } from "@/jslib/common/src/abstractions/sync.service";
+import { TokenService as TokenServiceAbstraction } from "@/jslib/common/src/abstractions/token.service";
+import { TotpService as TotpServiceAbstraction } from "@/jslib/common/src/abstractions/totp.service";
+import { TwoFactorService as TwoFactorServiceAbstraction } from "@/jslib/common/src/abstractions/twoFactor.service";
+import { UserVerificationService as UserVerificationServiceAbstraction } from "@/jslib/common/src/abstractions/userVerification.service";
+import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@/jslib/common/src/abstractions/usernameGeneration.service";
+import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@/jslib/common/src/abstractions/vaultTimeout.service";
+import { StateFactory } from "@/jslib/common/src/factories/stateFactory";
+import { Account } from "@/jslib/common/src/models/domain/account";
+import { GlobalState } from "@/jslib/common/src/models/domain/globalState";
+import { ApiService } from "@/jslib/common/src/services/api.service";
+import { AppIdService } from "@/jslib/common/src/services/appId.service";
+import { AuditService } from "@/jslib/common/src/services/audit.service";
+import { AuthService } from "@/jslib/common/src/services/auth.service";
+import { CipherService } from "@/jslib/common/src/services/cipher.service";
+import { CollectionService } from "@/jslib/common/src/services/collection.service";
+import { ConsoleLogService } from "@/jslib/common/src/services/consoleLog.service";
+import { CryptoService } from "@/jslib/common/src/services/crypto.service";
+import { EnvironmentService } from "@/jslib/common/src/services/environment.service";
+import { EventService } from "@/jslib/common/src/services/event.service";
+import { ExportService } from "@/jslib/common/src/services/export.service";
+import { FileUploadService } from "@/jslib/common/src/services/fileUpload.service";
+import { FolderService } from "@/jslib/common/src/services/folder.service";
+import { KeyConnectorService } from "@/jslib/common/src/services/keyConnector.service";
+import { NotificationsService } from "@/jslib/common/src/services/notifications.service";
+import { OrganizationService } from "@/jslib/common/src/services/organization.service";
+import { PasswordGenerationService } from "@/jslib/common/src/services/passwordGeneration.service";
+import { PolicyService } from "@/jslib/common/src/services/policy.service";
+import { ProviderService } from "@/jslib/common/src/services/provider.service";
+import { SearchService } from "@/jslib/common/src/services/search.service";
+import { SendService } from "@/jslib/common/src/services/send.service";
+import { SettingsService } from "@/jslib/common/src/services/settings.service";
+import { StateService } from "@/jslib/common/src/services/state.service";
+import { StateMigrationService } from "@/jslib/common/src/services/stateMigration.service";
+import { SyncService } from "@/jslib/common/src/services/sync.service";
+import { TokenService } from "@/jslib/common/src/services/token.service";
+import { TotpService } from "@/jslib/common/src/services/totp.service";
+import { TwoFactorService } from "@/jslib/common/src/services/twoFactor.service";
+import { UserVerificationService } from "@/jslib/common/src/services/userVerification.service";
+import { UsernameGenerationService } from "@/jslib/common/src/services/usernameGeneration.service";
+import { VaultTimeoutService } from "@/jslib/common/src/services/vaultTimeout.service";
+import { WebCryptoFunctionService } from "@/jslib/common/src/services/webCryptoFunction.service";
 
 import { AuthGuardService } from "./auth-guard.service";
 import { BroadcasterService } from "./broadcaster.service";

jslib/angular/src/services/lock-guard.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from "@angular/core";
 import { CanActivate, Router } from "@angular/router";
 
-import { StateService } from "jslib-common/abstractions/state.service";
-import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
 
 @Injectable()
 export class LockGuardService implements CanActivate {

jslib/angular/src/services/passwordReprompt.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 
-import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service";
+import { KeyConnectorService } from "@/jslib/common/src/abstractions/keyConnector.service";
+import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@/jslib/common/src/abstractions/passwordReprompt.service";
 
 import { PasswordRepromptComponent } from "../components/password-reprompt.component";
 

jslib/angular/src/services/unauth-guard.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from "@angular/core";
 import { CanActivate, Router } from "@angular/router";
 
-import { StateService } from "jslib-common/abstractions/state.service";
-import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
 
 @Injectable()
 export class UnauthGuardService implements CanActivate {

jslib/angular/src/services/validation.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from "@angular/core";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { ErrorResponse } from "jslib-common/models/response/errorResponse";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
+import { ErrorResponse } from "@/jslib/common/src/models/response/errorResponse";
 
 @Injectable()
 export class ValidationService {

jslib/angular/test.setup.ts

@@ -0,0 +1,28 @@
+import { webcrypto } from "crypto";
+import "jest-preset-angular/setup-jest";
+
+Object.defineProperty(window, "CSS", { value: null });
+Object.defineProperty(window, "getComputedStyle", {
+  value: () => {
+    return {
+      display: "none",
+      appearance: ["-webkit-appearance"],
+    };
+  },
+});
+
+Object.defineProperty(document, "doctype", {
+  value: "<!DOCTYPE html>",
+});
+Object.defineProperty(document.body.style, "transform", {
+  value: () => {
+    return {
+      enumerable: true,
+      configurable: true,
+    };
+  },
+});
+
+Object.defineProperty(window, "crypto", {
+  value: webcrypto,
+});

jslib/angular/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "jslib-common/*": ["../common/src/*"],
-      "jslib-angular/*": ["./src/"]
-    }
-  },
-  "include": ["src", "spec"],
-  "exclude": ["node_modules", "dist"]
-}

jslib/angular/tsconfig.spec.json

@@ -1,3 +0,0 @@
-{
-  "extends": "./tsconfig.json"
-}

jslib/common/custom-matchers.d.ts

@@ -0,0 +1,15 @@
+import type { CustomMatchers } from "./test.setup";
+
+// This declares the types for our custom matchers so that they're recognised by Typescript
+// This file must also be included in the TS compilation (via the tsconfig.json "include" property) to be recognised by
+// vscode
+
+/* eslint-disable */
+declare global {
+  namespace jest {
+    interface Expect extends CustomMatchers {}
+    interface Matchers<R> extends CustomMatchers<R> {}
+    interface InverseAsymmetricMatchers extends CustomMatchers {}
+  }
+}
+/* eslint-enable */

jslib/common/jest.config.js

@@ -1,17 +1,16 @@
-const { pathsToModuleNameMapper } = require("ts-jest/utils");
+const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../shared/tsconfig.libs");
 
+const sharedConfig = require("../shared/jest.config.ts");
+
+/** @type {import('jest').Config} */
 module.exports = {
-  name: "common",
-  displayName: "common jslib tests",
+  ...sharedConfig,
+  displayName: "libs/common tests",
   preset: "ts-jest",
   testEnvironment: "jsdom",
-  testMatch: ["**/+(*.)+(spec).+(ts)"],
-  setupFilesAfterEnv: ["<rootDir>/spec/test.ts"],
-  collectCoverage: true,
-  coverageReporters: ["html", "lcov"],
-  coverageDirectory: "coverage",
+  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),

jslib/common/package-lock.json

@@ -1,13 +0,0 @@
-{
-  "name": "@bitwarden/jslib-common",
-  "version": "0.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@bitwarden/jslib-common",
-      "version": "0.0.0",
-      "license": "GPL-3.0"
-    }
-  }
-}

jslib/common/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "@bitwarden/jslib-common",
-  "version": "0.0.0",
-  "description": "Common code used across Bitwarden JavaScript projects.",
-  "keywords": [
-    "bitwarden"
-  ],
-  "author": "Bitwarden Inc.",
-  "homepage": "https://bitwarden.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/bitwarden/jslib"
-  },
-  "license": "GPL-3.0",
-  "scripts": {
-    "clean": "rimraf dist/**/*",
-    "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
-  },
-  "dependencies": {}
-}

jslib/common/spec/domain/attachment.spec.ts

@@ -1,10 +1,10 @@
 import Substitute, { Arg } from "@fluffy-spoon/substitute";
 
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { AttachmentData } from "jslib-common/models/data/attachmentData";
-import { Attachment } from "jslib-common/models/domain/attachment";
-import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey";
-import { ContainerService } from "jslib-common/services/container.service";
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { AttachmentData } from "@/jslib/common/src/models/data/attachmentData";
+import { Attachment } from "@/jslib/common/src/models/domain/attachment";
+import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey";
+import { ContainerService } from "@/jslib/common/src/services/container.service";
 
 import { makeStaticByteArray, mockEnc } from "../utils";
 

jslib/common/spec/domain/card.spec.ts

@@ -1,5 +1,5 @@
-import { CardData } from "jslib-common/models/data/cardData";
-import { Card } from "jslib-common/models/domain/card";
+import { CardData } from "@/jslib/common/src/models/data/cardData";
+import { Card } from "@/jslib/common/src/models/domain/card";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/cipher.spec.ts

@@ -1,19 +1,19 @@
 import Substitute, { Arg } from "@fluffy-spoon/substitute";
 
-import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType";
-import { CipherType } from "jslib-common/enums/cipherType";
-import { FieldType } from "jslib-common/enums/fieldType";
-import { SecureNoteType } from "jslib-common/enums/secureNoteType";
-import { UriMatchType } from "jslib-common/enums/uriMatchType";
-import { CipherData } from "jslib-common/models/data/cipherData";
-import { Card } from "jslib-common/models/domain/card";
-import { Cipher } from "jslib-common/models/domain/cipher";
-import { Identity } from "jslib-common/models/domain/identity";
-import { Login } from "jslib-common/models/domain/login";
-import { SecureNote } from "jslib-common/models/domain/secureNote";
-import { CardView } from "jslib-common/models/view/cardView";
-import { IdentityView } from "jslib-common/models/view/identityView";
-import { LoginView } from "jslib-common/models/view/loginView";
+import { CipherRepromptType } from "@/jslib/common/src/enums/cipherRepromptType";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { FieldType } from "@/jslib/common/src/enums/fieldType";
+import { SecureNoteType } from "@/jslib/common/src/enums/secureNoteType";
+import { UriMatchType } from "@/jslib/common/src/enums/uriMatchType";
+import { CipherData } from "@/jslib/common/src/models/data/cipherData";
+import { Card } from "@/jslib/common/src/models/domain/card";
+import { Cipher } from "@/jslib/common/src/models/domain/cipher";
+import { Identity } from "@/jslib/common/src/models/domain/identity";
+import { Login } from "@/jslib/common/src/models/domain/login";
+import { SecureNote } from "@/jslib/common/src/models/domain/secureNote";
+import { CardView } from "@/jslib/common/src/models/view/cardView";
+import { IdentityView } from "@/jslib/common/src/models/view/identityView";
+import { LoginView } from "@/jslib/common/src/models/view/loginView";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/collection.spec.ts

@@ -1,5 +1,5 @@
-import { CollectionData } from "jslib-common/models/data/collectionData";
-import { Collection } from "jslib-common/models/domain/collection";
+import { CollectionData } from "@/jslib/common/src/models/data/collectionData";
+import { Collection } from "@/jslib/common/src/models/domain/collection";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/encString.spec.ts

@@ -1,10 +1,10 @@
 import Substitute, { Arg } from "@fluffy-spoon/substitute";
 
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { EncryptionType } from "jslib-common/enums/encryptionType";
-import { EncString } from "jslib-common/models/domain/encString";
-import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey";
-import { ContainerService } from "jslib-common/services/container.service";
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { EncryptionType } from "@/jslib/common/src/enums/encryptionType";
+import { EncString } from "@/jslib/common/src/models/domain/encString";
+import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey";
+import { ContainerService } from "@/jslib/common/src/services/container.service";
 
 describe("EncString", () => {
   afterEach(() => {

jslib/common/spec/domain/field.spec.ts

@@ -1,6 +1,6 @@
-import { FieldType } from "jslib-common/enums/fieldType";
-import { FieldData } from "jslib-common/models/data/fieldData";
-import { Field } from "jslib-common/models/domain/field";
+import { FieldType } from "@/jslib/common/src/enums/fieldType";
+import { FieldData } from "@/jslib/common/src/models/data/fieldData";
+import { Field } from "@/jslib/common/src/models/domain/field";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/folder.spec.ts

@@ -1,5 +1,5 @@
-import { FolderData } from "jslib-common/models/data/folderData";
-import { Folder } from "jslib-common/models/domain/folder";
+import { FolderData } from "@/jslib/common/src/models/data/folderData";
+import { Folder } from "@/jslib/common/src/models/domain/folder";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/identity.spec.ts

@@ -1,5 +1,5 @@
-import { IdentityData } from "jslib-common/models/data/identityData";
-import { Identity } from "jslib-common/models/domain/identity";
+import { IdentityData } from "@/jslib/common/src/models/data/identityData";
+import { Identity } from "@/jslib/common/src/models/domain/identity";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/login.spec.ts

@@ -1,10 +1,10 @@
 import Substitute, { Arg } from "@fluffy-spoon/substitute";
 
-import { UriMatchType } from "jslib-common/enums/uriMatchType";
-import { LoginData } from "jslib-common/models/data/loginData";
-import { Login } from "jslib-common/models/domain/login";
-import { LoginUri } from "jslib-common/models/domain/loginUri";
-import { LoginUriView } from "jslib-common/models/view/loginUriView";
+import { UriMatchType } from "@/jslib/common/src/enums/uriMatchType";
+import { LoginData } from "@/jslib/common/src/models/data/loginData";
+import { Login } from "@/jslib/common/src/models/domain/login";
+import { LoginUri } from "@/jslib/common/src/models/domain/loginUri";
+import { LoginUriView } from "@/jslib/common/src/models/view/loginUriView";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/loginUri.spec.ts

@@ -1,6 +1,6 @@
-import { UriMatchType } from "jslib-common/enums/uriMatchType";
-import { LoginUriData } from "jslib-common/models/data/loginUriData";
-import { LoginUri } from "jslib-common/models/domain/loginUri";
+import { UriMatchType } from "@/jslib/common/src/enums/uriMatchType";
+import { LoginUriData } from "@/jslib/common/src/models/data/loginUriData";
+import { LoginUri } from "@/jslib/common/src/models/domain/loginUri";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/password.spec.ts

@@ -1,5 +1,5 @@
-import { PasswordHistoryData } from "jslib-common/models/data/passwordHistoryData";
-import { Password } from "jslib-common/models/domain/password";
+import { PasswordHistoryData } from "@/jslib/common/src/models/data/passwordHistoryData";
+import { Password } from "@/jslib/common/src/models/domain/password";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/secureNote.spec.ts

@@ -1,6 +1,6 @@
-import { SecureNoteType } from "jslib-common/enums/secureNoteType";
-import { SecureNoteData } from "jslib-common/models/data/secureNoteData";
-import { SecureNote } from "jslib-common/models/domain/secureNote";
+import { SecureNoteType } from "@/jslib/common/src/enums/secureNoteType";
+import { SecureNoteData } from "@/jslib/common/src/models/data/secureNoteData";
+import { SecureNote } from "@/jslib/common/src/models/domain/secureNote";
 
 describe("SecureNote", () => {
   let data: SecureNoteData;

jslib/common/spec/domain/send.spec.ts

@@ -1,12 +1,12 @@
 import Substitute, { Arg, SubstituteOf } from "@fluffy-spoon/substitute";
 
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { SendType } from "jslib-common/enums/sendType";
-import { SendData } from "jslib-common/models/data/sendData";
-import { EncString } from "jslib-common/models/domain/encString";
-import { Send } from "jslib-common/models/domain/send";
-import { SendText } from "jslib-common/models/domain/sendText";
-import { ContainerService } from "jslib-common/services/container.service";
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { SendType } from "@/jslib/common/src/enums/sendType";
+import { SendData } from "@/jslib/common/src/models/data/sendData";
+import { EncString } from "@/jslib/common/src/models/domain/encString";
+import { Send } from "@/jslib/common/src/models/domain/send";
+import { SendText } from "@/jslib/common/src/models/domain/sendText";
+import { ContainerService } from "@/jslib/common/src/services/container.service";
 
 import { makeStaticByteArray, mockEnc } from "../utils";
 

jslib/common/spec/domain/sendAccess.spec.ts

@@ -1,9 +1,9 @@
 import Substitute, { Arg } from "@fluffy-spoon/substitute";
 
-import { SendType } from "jslib-common/enums/sendType";
-import { SendAccess } from "jslib-common/models/domain/sendAccess";
-import { SendText } from "jslib-common/models/domain/sendText";
-import { SendAccessResponse } from "jslib-common/models/response/sendAccessResponse";
+import { SendType } from "@/jslib/common/src/enums/sendType";
+import { SendAccess } from "@/jslib/common/src/models/domain/sendAccess";
+import { SendText } from "@/jslib/common/src/models/domain/sendText";
+import { SendAccessResponse } from "@/jslib/common/src/models/response/sendAccessResponse";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/sendFile.spec.ts

@@ -1,5 +1,5 @@
-import { SendFileData } from "jslib-common/models/data/sendFileData";
-import { SendFile } from "jslib-common/models/domain/sendFile";
+import { SendFileData } from "@/jslib/common/src/models/data/sendFileData";
+import { SendFile } from "@/jslib/common/src/models/domain/sendFile";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/sendText.spec.ts

@@ -1,5 +1,5 @@
-import { SendTextData } from "jslib-common/models/data/sendTextData";
-import { SendText } from "jslib-common/models/domain/sendText";
+import { SendTextData } from "@/jslib/common/src/models/data/sendTextData";
+import { SendText } from "@/jslib/common/src/models/domain/sendText";
 
 import { mockEnc } from "../utils";
 

jslib/common/spec/domain/symmetricCryptoKey.spec.ts

@@ -1,5 +1,5 @@
-import { EncryptionType } from "jslib-common/enums/encryptionType";
-import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey";
+import { EncryptionType } from "@/jslib/common/src/enums/encryptionType";
+import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey";
 
 import { makeStaticByteArray } from "../utils";
 

jslib/common/spec/importers/bitwardenJsonImporter.spec.ts

@@ -1,8 +1,8 @@
 import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { BitwardenJsonImporter } from "jslib-common/importers/bitwardenJsonImporter";
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { BitwardenJsonImporter } from "@/jslib/common/src/importers/bitwardenJsonImporter";
 
 import { data as passwordProtectedData } from "./testData/bitwardenJson/passwordProtected.json";
 

jslib/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts

@@ -1,11 +1,11 @@
 import Substitute, { Arg, SubstituteOf } from "@fluffy-spoon/substitute";
 
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { KdfType } from "jslib-common/enums/kdfType";
-import { BitwardenPasswordProtectedImporter } from "jslib-common/importers/bitwardenPasswordProtectedImporter";
-import { Utils } from "jslib-common/misc/utils";
-import { ImportResult } from "jslib-common/models/domain/importResult";
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { KdfType } from "@/jslib/common/src/enums/kdfType";
+import { BitwardenPasswordProtectedImporter } from "@/jslib/common/src/importers/bitwardenPasswordProtectedImporter";
+import { Utils } from "@/jslib/common/src/misc/utils";
+import { ImportResult } from "@/jslib/common/src/models/domain/importResult";
 
 import { data as emptyDecryptedData } from "./testData/bitwardenJson/empty.json";
 

jslib/common/spec/importers/dashlaneCsvImporter.spec.ts

@@ -1,5 +1,5 @@
-import { CipherType } from "jslib-common/enums/cipherType";
-import { DashlaneCsvImporter as Importer } from "jslib-common/importers/dashlaneImporters/dashlaneCsvImporter";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { DashlaneCsvImporter as Importer } from "@/jslib/common/src/importers/dashlaneImporters/dashlaneCsvImporter";
 
 import { credentialsData } from "./testData/dashlaneCsv/credentials.csv";
 import { identityData } from "./testData/dashlaneCsv/id.csv";

jslib/common/spec/importers/firefoxCsvImporter.spec.ts

@@ -1,7 +1,7 @@
-import { FirefoxCsvImporter as Importer } from "jslib-common/importers/firefoxCsvImporter";
-import { CipherView } from "jslib-common/models/view/cipherView";
-import { LoginUriView } from "jslib-common/models/view/loginUriView";
-import { LoginView } from "jslib-common/models/view/loginView";
+import { FirefoxCsvImporter as Importer } from "@/jslib/common/src/importers/firefoxCsvImporter";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
+import { LoginUriView } from "@/jslib/common/src/models/view/loginUriView";
+import { LoginView } from "@/jslib/common/src/models/view/loginView";
 
 import { data as firefoxAccountsData } from "./testData/firefoxCsv/firefoxAccountsData.csv";
 import { data as simplePasswordData } from "./testData/firefoxCsv/simplePasswordData.csv";

jslib/common/spec/importers/fsecureFskImporter.spec.ts

@@ -1,4 +1,4 @@
-import { FSecureFskImporter as Importer } from "jslib-common/importers/fsecureFskImporter";
+import { FSecureFskImporter as Importer } from "@/jslib/common/src/importers/fsecureFskImporter";
 
 const TestDataWithStyleSetToWebsite: string = JSON.stringify({
   data: {

jslib/common/spec/importers/keepass2XmlImporter.spec.ts

@@ -1,4 +1,4 @@
-import { KeePass2XmlImporter as Importer } from "jslib-common/importers/keepass2XmlImporter";
+import { KeePass2XmlImporter as Importer } from "@/jslib/common/src/importers/keepass2XmlImporter";
 
 const TestData = `<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <KeePassFile>

jslib/common/spec/importers/keeperJsonImporter.spec.ts

@@ -1,5 +1,5 @@
-import { KeeperJsonImporter as Importer } from "jslib-common/importers/keeperImporters/keeperJsonImporter";
-import { Utils } from "jslib-common/misc/utils";
+import { KeeperJsonImporter as Importer } from "@/jslib/common/src/importers/keeperImporters/keeperJsonImporter";
+import { Utils } from "@/jslib/common/src/misc/utils";
 
 import { testData as TestData } from "./testData/keeperJson/testData";
 

jslib/common/spec/importers/lastpassCsvImporter.spec.ts

@@ -1,9 +1,9 @@
-import { CipherType } from "jslib-common/enums/cipherType";
-import { FieldType } from "jslib-common/enums/fieldType";
-import { LastPassCsvImporter as Importer } from "jslib-common/importers/lastpassCsvImporter";
-import { ImportResult } from "jslib-common/models/domain/importResult";
-import { CipherView } from "jslib-common/models/view/cipherView";
-import { FieldView } from "jslib-common/models/view/fieldView";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { FieldType } from "@/jslib/common/src/enums/fieldType";
+import { LastPassCsvImporter as Importer } from "@/jslib/common/src/importers/lastpassCsvImporter";
+import { ImportResult } from "@/jslib/common/src/models/domain/importResult";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
+import { FieldView } from "@/jslib/common/src/models/view/fieldView";
 
 function baseExcept(result: ImportResult) {
   expect(result).not.toBeNull();

jslib/common/spec/importers/mykiCsvImporter.spec.ts

@@ -1,6 +1,6 @@
-import { CipherType } from "jslib-common/enums/cipherType";
-import { MykiCsvImporter as Importer } from "jslib-common/importers/mykiCsvImporter";
-import { CipherView } from "jslib-common/models/view/cipherView";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { MykiCsvImporter as Importer } from "@/jslib/common/src/importers/mykiCsvImporter";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
 
 import { userAccountData } from "./testData/mykiCsv/UserAccount.csv";
 import { userCreditCardData } from "./testData/mykiCsv/UserCreditCard.csv";

jslib/common/spec/importers/nordpassCsvImporter.spec.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "jslib-common/enums/cipherType";
-import { SecureNoteType } from "jslib-common/enums/secureNoteType";
-import { NordPassCsvImporter as Importer } from "jslib-common/importers/nordpassCsvImporter";
-import { CipherView } from "jslib-common/models/view/cipherView";
-import { IdentityView } from "jslib-common/models/view/identityView";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { SecureNoteType } from "@/jslib/common/src/enums/secureNoteType";
+import { NordPassCsvImporter as Importer } from "@/jslib/common/src/importers/nordpassCsvImporter";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
+import { IdentityView } from "@/jslib/common/src/models/view/identityView";
 
 import { data as creditCardData } from "./testData/nordpassCsv/nordpass.card.csv";
 import { data as identityData } from "./testData/nordpassCsv/nordpass.identity.csv";

jslib/common/spec/importers/onepassword1PifImporter.spec.ts

@@ -1,5 +1,5 @@
-import { FieldType } from "jslib-common/enums/fieldType";
-import { OnePassword1PifImporter as Importer } from "jslib-common/importers/onepasswordImporters/onepassword1PifImporter";
+import { FieldType } from "@/jslib/common/src/enums/fieldType";
+import { OnePassword1PifImporter as Importer } from "@/jslib/common/src/importers/onepasswordImporters/onepassword1PifImporter";
 
 const TestData: string =
   "***aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee***\n" +

jslib/common/spec/importers/onepassword1PuxImporter.spec.ts

@@ -1,9 +1,9 @@
-import { CipherType } from "jslib-common/enums/cipherType";
-import { FieldType } from "jslib-common/enums/fieldType";
-import { SecureNoteType } from "jslib-common/enums/secureNoteType";
-import { OnePassword1PuxImporter as Importer } from "jslib-common/importers/onepasswordImporters/onepassword1PuxImporter";
-import { Utils } from "jslib-common/misc/utils";
-import { FieldView } from "jslib-common/models/view/fieldView";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { FieldType } from "@/jslib/common/src/enums/fieldType";
+import { SecureNoteType } from "@/jslib/common/src/enums/secureNoteType";
+import { OnePassword1PuxImporter as Importer } from "@/jslib/common/src/importers/onepasswordImporters/onepassword1PuxImporter";
+import { Utils } from "@/jslib/common/src/misc/utils";
+import { FieldView } from "@/jslib/common/src/models/view/fieldView";
 
 import { APICredentialsData } from "./testData/onePassword1Pux/APICredentials";
 import { BankAccountData } from "./testData/onePassword1Pux/BankAccount";

jslib/common/spec/importers/onepasswordMacCsvImporter.spec.ts

@@ -1,6 +1,6 @@
-import { CipherType } from "jslib-common/enums/cipherType";
-import { OnePasswordMacCsvImporter as Importer } from "jslib-common/importers/onepasswordImporters/onepasswordMacCsvImporter";
-import { CipherView } from "jslib-common/models/view/cipherView";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { OnePasswordMacCsvImporter as Importer } from "@/jslib/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
 
 import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.mac.csv";
 import { data as identityData } from "./testData/onePasswordCsv/identity.mac.csv";

jslib/common/spec/importers/onepasswordWinCsvImporter.spec.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "jslib-common/enums/cipherType";
-import { FieldType } from "jslib-common/enums/fieldType";
-import { OnePasswordWinCsvImporter as Importer } from "jslib-common/importers/onepasswordImporters/onepasswordWinCsvImporter";
-import { CipherView } from "jslib-common/models/view/cipherView";
-import { FieldView } from "jslib-common/models/view/fieldView";
+import { CipherType } from "@/jslib/common/src/enums/cipherType";
+import { FieldType } from "@/jslib/common/src/enums/fieldType";
+import { OnePasswordWinCsvImporter as Importer } from "@/jslib/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
+import { FieldView } from "@/jslib/common/src/models/view/fieldView";
 
 import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.windows.csv";
 import { data as identityData } from "./testData/onePasswordCsv/identity.windows.csv";

jslib/common/spec/importers/safariCsvImporter.spec.ts

@@ -1,7 +1,7 @@
-import { SafariCsvImporter as Importer } from "jslib-common/importers/safariCsvImporter";
-import { CipherView } from "jslib-common/models/view/cipherView";
-import { LoginUriView } from "jslib-common/models/view/loginUriView";
-import { LoginView } from "jslib-common/models/view/loginView";
+import { SafariCsvImporter as Importer } from "@/jslib/common/src/importers/safariCsvImporter";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
+import { LoginUriView } from "@/jslib/common/src/models/view/loginUriView";
+import { LoginView } from "@/jslib/common/src/models/view/loginView";
 
 import { data as oldSimplePasswordData } from "./testData/safariCsv/oldSimplePasswordData.csv";
 import { data as simplePasswordData } from "./testData/safariCsv/simplePasswordData.csv";

jslib/common/spec/importers/testData/keeperJson/testData.ts

@@ -1,4 +1,4 @@
-import { KeeperJsonExport } from "jslib-common/importers/keeperImporters/types/keeperJsonTypes";
+import { KeeperJsonExport } from "@/jslib/common/src/importers/keeperImporters/types/keeperJsonTypes";
 
 export const testData: KeeperJsonExport = {
   shared_folders: [

jslib/common/spec/importers/testData/onePassword1Pux/APICredentials.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const APICredentialsData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/BankAccount.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const BankAccountData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/CreditCard.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const CreditCardData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/Database.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const DatabaseData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const DriversLicenseData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const EmailAccountData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/Emailfield.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const EmailFieldData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const EmailFieldOnIdentityData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const EmailFieldOnIdentityPrefilledData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/IdentityData.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const IdentityData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/LoginData.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const LoginData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const MedicalRecordData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/Membership.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const MembershipData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const OnePuxExampleFile: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const OutdoorLicenseData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/Passport.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const PassportData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/Password.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const PasswordData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const RewardsProgramData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/SSN.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const SSNData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const SanitizedExport: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/SecureNote.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const SecureNoteData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/Server.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const ServerData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const SoftwareLicenseData: ExportData = {
   accounts: [

jslib/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "jslib-common/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
+import { ExportData } from "@/jslib/common/src/importers/onepasswordImporters/types/onepassword1PuxImporterTypes";
 
 export const WirelessRouterData: ExportData = {
   accounts: [

jslib/common/spec/index.ts

@@ -0,0 +1 @@
+export * from "./matchers";

jslib/common/spec/matchers/index.ts

@@ -0,0 +1 @@
+export * from "./to-equal-buffer";

jslib/common/spec/matchers/to-equal-buffer.spec.ts

@@ -0,0 +1,25 @@
+import { makeStaticByteArray } from "../utils";
+
+describe("toEqualBuffer custom matcher", () => {
+  it("matches identical ArrayBuffers", () => {
+    const array = makeStaticByteArray(10);
+    expect(array.buffer).toEqualBuffer(array.buffer);
+  });
+
+  it("matches an identical ArrayBuffer and Uint8Array", () => {
+    const array = makeStaticByteArray(10);
+    expect(array.buffer).toEqualBuffer(array);
+  });
+
+  it("doesn't match different ArrayBuffers", () => {
+    const array1 = makeStaticByteArray(10);
+    const array2 = makeStaticByteArray(10, 11);
+    expect(array1.buffer).not.toEqualBuffer(array2.buffer);
+  });
+
+  it("doesn't match a different ArrayBuffer and Uint8Array", () => {
+    const array1 = makeStaticByteArray(10);
+    const array2 = makeStaticByteArray(10, 11);
+    expect(array1.buffer).not.toEqualBuffer(array2);
+  });
+});

jslib/common/spec/matchers/to-equal-buffer.ts

@@ -0,0 +1,31 @@
+/**
+ * The inbuilt toEqual() matcher will always return TRUE when provided with 2 ArrayBuffers.
+ * This is because an ArrayBuffer must be wrapped in a new Uint8Array to be accessible.
+ * This custom matcher will automatically instantiate a new Uint8Array on the received value
+ * (and optionally, the expected value) and then call toEqual() on the resulting Uint8Arrays.
+ */
+export const toEqualBuffer: jest.CustomMatcher = function (
+  received: ArrayBuffer | Uint8Array,
+  expected: ArrayBuffer | Uint8Array,
+) {
+  received = new Uint8Array(received);
+  expected = new Uint8Array(expected);
+
+  if (this.equals(received, expected)) {
+    return {
+      message: () => `expected
+${received}
+not to match
+${expected}`,
+      pass: true,
+    };
+  }
+
+  return {
+    message: () => `expected
+${received}
+to match
+${expected}`,
+    pass: false,
+  };
+};

jslib/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts

@@ -1,19 +1,19 @@
 import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { AppIdService } from "jslib-common/abstractions/appId.service";
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { EnvironmentService } from "jslib-common/abstractions/environment.service";
-import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { TokenService } from "jslib-common/abstractions/token.service";
-import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
-import { ApiLogInStrategy } from "jslib-common/misc/logInStrategies/apiLogin.strategy";
-import { Utils } from "jslib-common/misc/utils";
-import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials";
+import { ApiService } from "@/jslib/common/src/abstractions/api.service";
+import { AppIdService } from "@/jslib/common/src/abstractions/appId.service";
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { EnvironmentService } from "@/jslib/common/src/abstractions/environment.service";
+import { KeyConnectorService } from "@/jslib/common/src/abstractions/keyConnector.service";
+import { LogService } from "@/jslib/common/src/abstractions/log.service";
+import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
+import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { TokenService } from "@/jslib/common/src/abstractions/token.service";
+import { TwoFactorService } from "@/jslib/common/src/abstractions/twoFactor.service";
+import { ApiLogInStrategy } from "@/jslib/common/src/misc/logInStrategies/apiLogin.strategy";
+import { Utils } from "@/jslib/common/src/misc/utils";
+import { ApiLogInCredentials } from "@/jslib/common/src/models/domain/logInCredentials";
 
 import { identityTokenResponseFactory } from "./logIn.strategy.spec";
 

jslib/common/spec/misc/logInStrategies/logIn.strategy.spec.ts

@@ -1,27 +1,27 @@
 import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
 
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { AppIdService } from "jslib-common/abstractions/appId.service";
-import { AuthService } from "jslib-common/abstractions/auth.service";
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { TokenService } from "jslib-common/abstractions/token.service";
-import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
-import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
-import { PasswordLogInStrategy } from "jslib-common/misc/logInStrategies/passwordLogin.strategy";
-import { Utils } from "jslib-common/misc/utils";
-import { Account, AccountProfile, AccountTokens } from "jslib-common/models/domain/account";
-import { AuthResult } from "jslib-common/models/domain/authResult";
-import { EncString } from "jslib-common/models/domain/encString";
-import { PasswordLogInCredentials } from "jslib-common/models/domain/logInCredentials";
-import { PasswordTokenRequest } from "jslib-common/models/request/identityToken/passwordTokenRequest";
-import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor";
-import { IdentityCaptchaResponse } from "jslib-common/models/response/identityCaptchaResponse";
-import { IdentityTokenResponse } from "jslib-common/models/response/identityTokenResponse";
-import { IdentityTwoFactorResponse } from "jslib-common/models/response/identityTwoFactorResponse";
+import { ApiService } from "@/jslib/common/src/abstractions/api.service";
+import { AppIdService } from "@/jslib/common/src/abstractions/appId.service";
+import { AuthService } from "@/jslib/common/src/abstractions/auth.service";
+import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service";
+import { LogService } from "@/jslib/common/src/abstractions/log.service";
+import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
+import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { TokenService } from "@/jslib/common/src/abstractions/token.service";
+import { TwoFactorService } from "@/jslib/common/src/abstractions/twoFactor.service";
+import { TwoFactorProviderType } from "@/jslib/common/src/enums/twoFactorProviderType";
+import { PasswordLogInStrategy } from "@/jslib/common/src/misc/logInStrategies/passwordLogin.strategy";
+import { Utils } from "@/jslib/common/src/misc/utils";
+import { Account, AccountProfile, AccountTokens } from "@/jslib/common/src/models/domain/account";
+import { AuthResult } from "@/jslib/common/src/models/domain/authResult";
+import { EncString } from "@/jslib/common/src/models/domain/encString";
+import { PasswordLogInCredentials } from "@/jslib/common/src/models/domain/logInCredentials";
+import { PasswordTokenRequest } from "@/jslib/common/src/models/request/identityToken/passwordTokenRequest";
+import { TokenRequestTwoFactor } from "@/jslib/common/src/models/request/identityToken/tokenRequestTwoFactor";
+import { IdentityCaptchaResponse } from "@/jslib/common/src/models/response/identityCaptchaResponse";
+import { IdentityTokenResponse } from "@/jslib/common/src/models/response/identityTokenResponse";
+import { IdentityTwoFactorResponse } from "@/jslib/common/src/models/response/identityTwoFactorResponse";
 
 const email = "hello@world.com";
 const masterPassword = "password";