[PM-17628] Move all files from libs/importer/spec into libs/importer/src (#13202)

* Move all files from libs/importer/spec into libs/importer/src

* Ignore ts-strict on spec-data

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>

libs/importer/src/importers/base-importer.spec.ts

@@ -2,7 +2,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { CardView } from "@bitwarden/common/vault/models/view/card.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import { BaseImporter } from "../src/importers/base-importer";
+import { BaseImporter } from "./base-importer";
 
 class FakeBaseImporter extends BaseImporter {
   initLoginCipher(): CipherView {

libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.spec.ts

@@ -8,13 +8,11 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { KdfType, KeyService } from "@bitwarden/key-management";
 
-import {
-  BitwardenPasswordProtectedImporter,
-  BitwardenJsonImporter,
-} from "../src/importers/bitwarden";
+import { emptyAccountEncrypted } from "../spec-data/bitwarden-json/account-encrypted.json";
+import { emptyUnencryptedExport } from "../spec-data/bitwarden-json/unencrypted.json";
 
-import { emptyAccountEncrypted } from "./test-data/bitwarden-json/account-encrypted.json";
-import { emptyUnencryptedExport } from "./test-data/bitwarden-json/unencrypted.json";
+import { BitwardenJsonImporter } from "./bitwarden-json-importer";
+import { BitwardenPasswordProtectedImporter } from "./bitwarden-password-protected-importer";
 
 describe("BitwardenPasswordProtectedImporter", () => {
   let importer: BitwardenPasswordProtectedImporter;

libs/importer/src/importers/chrome-csv-importer.spec.ts

@@ -2,10 +2,9 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 
-import { ChromeCsvImporter } from "../src/importers";
-
-import { data as androidData } from "./test-data/chrome-csv/android-data.csv";
-import { data as simplePasswordData } from "./test-data/chrome-csv/simple-password-data.csv";
+import { ChromeCsvImporter } from "./chrome-csv-importer";
+import { data as androidData } from "./spec-data/chrome-csv/android-data.csv";
+import { data as simplePasswordData } from "./spec-data/chrome-csv/simple-password-data.csv";
 
 const CipherData = [
   {

libs/importer/src/importers/dashlane/dashlane-csv-importer.spec.ts

@@ -1,14 +1,13 @@
 import { CipherType } from "@bitwarden/common/vault/enums";
 
-import { DashlaneCsvImporter } from "../src/importers";
-
-import { credentialsData_otpUrl } from "./test-data/dashlane-csv/credentials-otpurl.csv";
-import { credentialsData } from "./test-data/dashlane-csv/credentials.csv";
-import { identityData } from "./test-data/dashlane-csv/id.csv";
-import { multiplePersonalInfoData } from "./test-data/dashlane-csv/multiple-personal-info.csv";
-import { paymentsData } from "./test-data/dashlane-csv/payments.csv";
-import { personalInfoData } from "./test-data/dashlane-csv/personal-info.csv";
-import { secureNoteData } from "./test-data/dashlane-csv/securenotes.csv";
+import { DashlaneCsvImporter } from "..";
+import { credentialsData_otpUrl } from "../spec-data/dashlane-csv/credentials-otpurl.csv";
+import { credentialsData } from "../spec-data/dashlane-csv/credentials.csv";
+import { identityData } from "../spec-data/dashlane-csv/id.csv";
+import { multiplePersonalInfoData } from "../spec-data/dashlane-csv/multiple-personal-info.csv";
+import { paymentsData } from "../spec-data/dashlane-csv/payments.csv";
+import { personalInfoData } from "../spec-data/dashlane-csv/personal-info.csv";
+import { secureNoteData } from "../spec-data/dashlane-csv/securenotes.csv";
 
 describe("Dashlane CSV Importer", () => {
   let importer: DashlaneCsvImporter;

libs/importer/src/importers/enpass/enpass-json-importer.spec.ts

@@ -1,13 +1,13 @@
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
-import { EnpassJsonImporter } from "../src/importers";
+import { creditCard } from "../spec-data/enpass-json/credit-card";
+import { folders } from "../spec-data/enpass-json/folders";
+import { login } from "../spec-data/enpass-json/login";
+import { loginAndroidUrl } from "../spec-data/enpass-json/login-android-url";
+import { note } from "../spec-data/enpass-json/note";
 
-import { creditCard } from "./test-data/enpass-json/credit-card";
-import { folders } from "./test-data/enpass-json/folders";
-import { login } from "./test-data/enpass-json/login";
-import { loginAndroidUrl } from "./test-data/enpass-json/login-android-url";
-import { note } from "./test-data/enpass-json/note";
+import { EnpassJsonImporter } from "./enpass-json-importer";
 
 function validateCustomField(fields: FieldView[], fieldName: string, expectedValue: any) {
   expect(fields).toBeDefined();

libs/importer/src/importers/firefox-csv-importer.spec.ts

@@ -2,10 +2,9 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 
-import { FirefoxCsvImporter } from "../src/importers";
-
-import { data as firefoxAccountsData } from "./test-data/firefox-csv/firefox-accounts-data.csv";
-import { data as simplePasswordData } from "./test-data/firefox-csv/simple-password-data.csv";
+import { FirefoxCsvImporter } from "./firefox-csv-importer";
+import { data as firefoxAccountsData } from "./spec-data/firefox-csv/firefox-accounts-data.csv";
+import { data as simplePasswordData } from "./spec-data/firefox-csv/simple-password-data.csv";
 
 const CipherData = [
   {

libs/importer/src/importers/index.ts

@@ -22,7 +22,7 @@ export { KasperskyTxtImporter } from "./kaspersky-txt-importer";
 export { KeePass2XmlImporter } from "./keepass2-xml-importer";
 export { KeePassXCsvImporter } from "./keepassx-csv-importer";
 export { KeeperCsvImporter, KeeperJsonImporter } from "./keeper";
-export { LastPassCsvImporter } from "./lastpass-csv-importer";
+export { LastPassCsvImporter } from "./lastpass";
 export { LogMeOnceCsvImporter } from "./logmeonce-csv-importer";
 export { MeldiumCsvImporter } from "./meldium-csv-importer";
 export { MSecureCsvImporter } from "./msecure-csv-importer";

libs/importer/src/importers/keepass2-xml-importer.spec.ts

@@ -1,12 +1,11 @@
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
-import { KeePass2XmlImporter } from "../src/importers";
-
+import { KeePass2XmlImporter } from "./keepass2-xml-importer";
 import {
   TestData,
   TestData1,
   TestData2,
-} from "./test-data/keepass2-xml/keepass2-xml-importer-testdata";
+} from "./spec-data/keepass2-xml/keepass2-xml-importer-testdata";
 
 describe("KeePass2 Xml Importer", () => {
   it("should parse XML data", async () => {

libs/importer/src/importers/keepassx-csv-importer.spec.ts

@@ -1,6 +1,5 @@
-import { KeePassXCsvImporter } from "../src/importers";
-
-import { keepassxTestData } from "./test-data/keepassx-csv/testdata.csv";
+import { KeePassXCsvImporter } from "./keepassx-csv-importer";
+import { keepassxTestData } from "./spec-data/keepassx-csv/testdata.csv";
 
 describe("KeePassX CSV Importer", () => {
   let importer: KeePassXCsvImporter;

libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts

@@ -1,8 +1,8 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
-import { KeeperCsvImporter } from "../src/importers";
+import { testData as TestData } from "../spec-data/keeper-csv/testdata.csv";
 
-import { testData as TestData } from "./test-data/keeper-csv/testdata.csv";
+import { KeeperCsvImporter } from "./keeper-csv-importer";
 
 describe("Keeper CSV Importer", () => {
   let importer: KeeperCsvImporter;

libs/importer/src/importers/keeper/keeper-json-importer.spec.ts

@@ -1,8 +1,8 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
-import { KeeperJsonImporter } from "../src/importers";
+import { testData as TestData } from "../spec-data/keeper-json/testdata.json";
 
-import { testData as TestData } from "./test-data/keeper-json/testdata.json";
+import { KeeperJsonImporter } from "./keeper-json-importer";
 
 describe("Keeper Json Importer", () => {
   const testDataJson = JSON.stringify(TestData);

libs/importer/src/importers/lastpass/index.ts

@@ -0,0 +1 @@
+export { LastPassCsvImporter } from "./lastpass-csv-importer";

libs/importer/src/importers/lastpass/lastpass-csv-importer.spec.ts

@@ -2,8 +2,9 @@ import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
-import { LastPassCsvImporter } from "../src/importers";
-import { ImportResult } from "../src/models/import-result";
+import { ImportResult } from "../../models/import-result";
+
+import { LastPassCsvImporter } from "./lastpass-csv-importer";
 
 function baseExcept(result: ImportResult) {
   expect(result).not.toBeNull();

libs/importer/src/importers/lastpass/lastpass-csv-importer.ts

@@ -8,10 +8,9 @@ import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";
 
-import { ImportResult } from "../models/import-result";
-
-import { BaseImporter } from "./base-importer";
-import { Importer } from "./importer";
+import { ImportResult } from "../../models/import-result";
+import { BaseImporter } from "../base-importer";
+import { Importer } from "../importer";
 
 export class LastPassCsvImporter extends BaseImporter implements Importer {
   parse(data: string): Promise<ImportResult> {

libs/importer/src/importers/msecure-csv-importer.spec.ts

@@ -1,6 +1,6 @@
 import { CipherType } from "@bitwarden/common/vault/enums";
 
-import { MSecureCsvImporter } from "../src/importers/msecure-csv-importer";
+import { MSecureCsvImporter } from "./msecure-csv-importer";
 
 describe("MSecureCsvImporter.parse", () => {
   let importer: MSecureCsvImporter;

libs/importer/src/importers/myki-csv-importer.spec.ts

@@ -1,14 +1,13 @@
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import { MykiCsvImporter } from "../src/importers";
-
-import { userAccountData } from "./test-data/myki-csv/user-account.csv";
-import { userCreditCardData } from "./test-data/myki-csv/user-credit-card.csv";
-import { userIdCardData } from "./test-data/myki-csv/user-id-card.csv";
-import { userIdentityData } from "./test-data/myki-csv/user-identity.csv";
-import { userNoteData } from "./test-data/myki-csv/user-note.csv";
-import { userTwoFaData } from "./test-data/myki-csv/user-twofa.csv";
+import { MykiCsvImporter } from "./myki-csv-importer";
+import { userAccountData } from "./spec-data/myki-csv/user-account.csv";
+import { userCreditCardData } from "./spec-data/myki-csv/user-credit-card.csv";
+import { userIdCardData } from "./spec-data/myki-csv/user-id-card.csv";
+import { userIdentityData } from "./spec-data/myki-csv/user-identity.csv";
+import { userNoteData } from "./spec-data/myki-csv/user-note.csv";
+import { userTwoFaData } from "./spec-data/myki-csv/user-twofa.csv";
 
 function expectDriversLicense(cipher: CipherView) {
   expect(cipher.type).toBe(CipherType.Identity);

libs/importer/src/importers/netwrix/netwrix-passwordsecure-csv-importer.spec.ts

@@ -1,8 +1,8 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
-import { NetwrixPasswordSecureCsvImporter } from "../src/importers";
+import { credentialsData } from "../spec-data/netwrix-csv/login-export.csv";
 
-import { credentialsData } from "./test-data/netwrix-csv/login-export.csv";
+import { NetwrixPasswordSecureCsvImporter } from "./netwrix-passwordsecure-csv-importer";
 
 describe("Netwrix Password Secure CSV Importer", () => {
   let importer: NetwrixPasswordSecureCsvImporter;

libs/importer/src/importers/nordpass-csv-importer.spec.ts

@@ -3,13 +3,12 @@ import { SecureNoteType, CipherType, FieldType } from "@bitwarden/common/vault/e
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
 
-import { NordPassCsvImporter } from "../src/importers";
-
-import { data as creditCardData } from "./test-data/nordpass-csv/nordpass.card.csv";
-import { data as identityData } from "./test-data/nordpass-csv/nordpass.identity.csv";
-import { data as loginDataWithAdditionalUrls } from "./test-data/nordpass-csv/nordpass.login-with-additinal-urls.csv";
-import { data as loginData } from "./test-data/nordpass-csv/nordpass.login.csv";
-import { data as secureNoteData } from "./test-data/nordpass-csv/nordpass.secure-note.csv";
+import { NordPassCsvImporter } from "./nordpass-csv-importer";
+import { data as creditCardData } from "./spec-data/nordpass-csv/nordpass.card.csv";
+import { data as identityData } from "./spec-data/nordpass-csv/nordpass.identity.csv";
+import { data as loginDataWithAdditionalUrls } from "./spec-data/nordpass-csv/nordpass.login-with-additinal-urls.csv";
+import { data as loginData } from "./spec-data/nordpass-csv/nordpass.login.csv";
+import { data as secureNoteData } from "./spec-data/nordpass-csv/nordpass.secure-note.csv";
 
 const namesTestData = [
   {

libs/importer/src/importers/onepassword/onepassword-1pif-importer.spec.ts

@@ -1,6 +1,6 @@
 import { FieldType } from "@bitwarden/common/vault/enums";
 
-import { OnePassword1PifImporter } from "../src/importers";
+import { OnePassword1PifImporter } from "./onepassword-1pif-importer";
 
 const TestData: string =
   "***aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee***\n" +

libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts

@@ -2,32 +2,32 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
-import { OnePassword1PuxImporter } from "../src/importers";
+import { APICredentialsData } from "../spec-data/onepassword-1pux/api-credentials";
+import { BankAccountData } from "../spec-data/onepassword-1pux/bank-account";
+import { CreditCardData } from "../spec-data/onepassword-1pux/credit-card";
+import { DatabaseData } from "../spec-data/onepassword-1pux/database";
+import { DriversLicenseData } from "../spec-data/onepassword-1pux/drivers-license";
+import { EmailAccountData } from "../spec-data/onepassword-1pux/email-account";
+import { EmailFieldData } from "../spec-data/onepassword-1pux/email-field";
+import { EmailFieldOnIdentityData } from "../spec-data/onepassword-1pux/email-field-on-identity";
+import { EmailFieldOnIdentityPrefilledData } from "../spec-data/onepassword-1pux/email-field-on-identity_prefilled";
+import { IdentityData } from "../spec-data/onepassword-1pux/identity-data";
+import { LoginData } from "../spec-data/onepassword-1pux/login-data";
+import { MedicalRecordData } from "../spec-data/onepassword-1pux/medical-record";
+import { MembershipData } from "../spec-data/onepassword-1pux/membership";
+import { OnePuxExampleFile } from "../spec-data/onepassword-1pux/onepux_example";
+import { OutdoorLicenseData } from "../spec-data/onepassword-1pux/outdoor-license";
+import { PassportData } from "../spec-data/onepassword-1pux/passport";
+import { PasswordData } from "../spec-data/onepassword-1pux/password";
+import { RewardsProgramData } from "../spec-data/onepassword-1pux/rewards-program";
+import { SanitizedExport } from "../spec-data/onepassword-1pux/sanitized-export";
+import { SecureNoteData } from "../spec-data/onepassword-1pux/secure-note";
+import { ServerData } from "../spec-data/onepassword-1pux/server";
+import { SoftwareLicenseData } from "../spec-data/onepassword-1pux/software-license";
+import { SSNData } from "../spec-data/onepassword-1pux/ssn";
+import { WirelessRouterData } from "../spec-data/onepassword-1pux/wireless-router";
 
-import { APICredentialsData } from "./test-data/onepassword-1pux/api-credentials";
-import { BankAccountData } from "./test-data/onepassword-1pux/bank-account";
-import { CreditCardData } from "./test-data/onepassword-1pux/credit-card";
-import { DatabaseData } from "./test-data/onepassword-1pux/database";
-import { DriversLicenseData } from "./test-data/onepassword-1pux/drivers-license";
-import { EmailAccountData } from "./test-data/onepassword-1pux/email-account";
-import { EmailFieldData } from "./test-data/onepassword-1pux/email-field";
-import { EmailFieldOnIdentityData } from "./test-data/onepassword-1pux/email-field-on-identity";
-import { EmailFieldOnIdentityPrefilledData } from "./test-data/onepassword-1pux/email-field-on-identity_prefilled";
-import { IdentityData } from "./test-data/onepassword-1pux/identity-data";
-import { LoginData } from "./test-data/onepassword-1pux/login-data";
-import { MedicalRecordData } from "./test-data/onepassword-1pux/medical-record";
-import { MembershipData } from "./test-data/onepassword-1pux/membership";
-import { OnePuxExampleFile } from "./test-data/onepassword-1pux/onepux_example";
-import { OutdoorLicenseData } from "./test-data/onepassword-1pux/outdoor-license";
-import { PassportData } from "./test-data/onepassword-1pux/passport";
-import { PasswordData } from "./test-data/onepassword-1pux/password";
-import { RewardsProgramData } from "./test-data/onepassword-1pux/rewards-program";
-import { SanitizedExport } from "./test-data/onepassword-1pux/sanitized-export";
-import { SecureNoteData } from "./test-data/onepassword-1pux/secure-note";
-import { ServerData } from "./test-data/onepassword-1pux/server";
-import { SoftwareLicenseData } from "./test-data/onepassword-1pux/software-license";
-import { SSNData } from "./test-data/onepassword-1pux/ssn";
-import { WirelessRouterData } from "./test-data/onepassword-1pux/wireless-router";
+import { OnePassword1PuxImporter } from "./onepassword-1pux-importer";
 
 function validateCustomField(fields: FieldView[], fieldName: string, expectedValue: any) {
   expect(fields).toBeDefined();

libs/importer/src/importers/onepassword/onepassword-mac-csv-importer.spec.ts

@@ -1,11 +1,11 @@
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 
-import { OnePasswordMacCsvImporter } from "../src/importers";
+import { data as creditCardData } from "../spec-data/onepassword-csv/credit-card.mac.csv";
+import { data as identityData } from "../spec-data/onepassword-csv/identity.mac.csv";
+import { data as multiTypeData } from "../spec-data/onepassword-csv/multiple-items.mac.csv";
 
-import { data as creditCardData } from "./test-data/onepassword-csv/credit-card.mac.csv";
-import { data as identityData } from "./test-data/onepassword-csv/identity.mac.csv";
-import { data as multiTypeData } from "./test-data/onepassword-csv/multiple-items.mac.csv";
+import { OnePasswordMacCsvImporter } from "./onepassword-mac-csv-importer";
 
 function expectIdentity(cipher: CipherView) {
   expect(cipher.type).toBe(CipherType.Identity);

libs/importer/src/importers/onepassword/onepassword-win-csv-importer.spec.ts

@@ -2,11 +2,11 @@ import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
-import { OnePasswordWinCsvImporter } from "../src/importers";
+import { data as creditCardData } from "../spec-data/onepassword-csv/credit-card.windows.csv";
+import { data as identityData } from "../spec-data/onepassword-csv/identity.windows.csv";
+import { data as multiTypeData } from "../spec-data/onepassword-csv/multiple-items.windows.csv";
 
-import { data as creditCardData } from "./test-data/onepassword-csv/credit-card.windows.csv";
-import { data as identityData } from "./test-data/onepassword-csv/identity.windows.csv";
-import { data as multiTypeData } from "./test-data/onepassword-csv/multiple-items.windows.csv";
+import { OnePasswordWinCsvImporter } from "./onepassword-win-csv-importer";
 
 function expectIdentity(cipher: CipherView) {
   expect(cipher.type).toBe(CipherType.Identity);

libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts

@@ -120,7 +120,7 @@ export interface Value {
 
 export interface Email {
   email_address: string;
-  provider: string;
+  provider: string | null;
 }
 
 export interface Address {

libs/importer/src/importers/passky/passky-json-importer.spec.ts

@@ -1,7 +1,7 @@
-import { PasskyJsonImporter } from "../src/importers";
+import { testData as EncryptedData } from "../spec-data/passky-json/passky-encrypted.json";
+import { testData as UnencryptedData } from "../spec-data/passky-json/passky-unencrypted.json";
 
-import { testData as EncryptedData } from "./test-data/passky-json/passky-encrypted.json";
-import { testData as UnencryptedData } from "./test-data/passky-json/passky-unencrypted.json";
+import { PasskyJsonImporter } from "./passky-json-importer";
 
 describe("Passky Json Importer", () => {
   let importer: PasskyJsonImporter;

libs/importer/src/importers/passsordxp/passwordxp-csv-importer.spec.ts

@@ -1,13 +1,13 @@
 import { CipherType } from "@bitwarden/common/vault/enums";
 
-import { PasswordXPCsvImporter } from "../src/importers";
-import { ImportResult } from "../src/models/import-result";
+import { ImportResult } from "../../models/import-result";
+import { dutchHeaders } from "../spec-data/passwordxp-csv/dutch-headers";
+import { germanHeaders } from "../spec-data/passwordxp-csv/german-headers";
+import { noFolder } from "../spec-data/passwordxp-csv/no-folder.csv";
+import { withFolders } from "../spec-data/passwordxp-csv/passwordxp-with-folders.csv";
+import { withoutFolders } from "../spec-data/passwordxp-csv/passwordxp-without-folders.csv";
 
-import { dutchHeaders } from "./test-data/passwordxp-csv/dutch-headers";
-import { germanHeaders } from "./test-data/passwordxp-csv/german-headers";
-import { noFolder } from "./test-data/passwordxp-csv/no-folder.csv";
-import { withFolders } from "./test-data/passwordxp-csv/passwordxp-with-folders.csv";
-import { withoutFolders } from "./test-data/passwordxp-csv/passwordxp-without-folders.csv";
+import { PasswordXPCsvImporter } from "./passwordxp-csv-importer";
 
 async function importLoginWithCustomFields(importer: PasswordXPCsvImporter, csvData: string) {
   const result: ImportResult = await importer.parse(csvData);

libs/importer/src/importers/protonpass/protonpass-json-importer.spec.ts

@@ -4,9 +4,9 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 
-import { ProtonPassJsonImporter } from "../src/importers";
+import { testData } from "../spec-data/protonpass-json/protonpass.json";
 
-import { testData } from "./test-data/protonpass-json/protonpass.json";
+import { ProtonPassJsonImporter } from "./protonpass-json-importer";
 
 describe("Protonpass Json Importer", () => {
   let importer: ProtonPassJsonImporter;

libs/importer/src/importers/psono/psono-json-importer.spec.ts

@@ -1,19 +1,19 @@
 import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
-import { PsonoJsonImporter } from "../src/importers";
+import { ApplicationPasswordsData } from "../spec-data/psono-json/application-passwords";
+import { BookmarkData } from "../spec-data/psono-json/bookmark.json";
+import { EmptyTestFolderData } from "../spec-data/psono-json/empty-folders";
+import { EnvVariablesData } from "../spec-data/psono-json/environment-variables";
+import { FoldersTestData } from "../spec-data/psono-json/folders";
+import { GPGData } from "../spec-data/psono-json/gpg";
+import { NotesData } from "../spec-data/psono-json/notes";
+import { ReducedWebsiteLoginsData } from "../spec-data/psono-json/reduced-website-logins";
+import { SubFoldersTestData } from "../spec-data/psono-json/subfolders";
+import { TOTPData } from "../spec-data/psono-json/totp";
+import { WebsiteLoginsData } from "../spec-data/psono-json/website-logins";
 
-import { ApplicationPasswordsData } from "./test-data/psono-json/application-passwords";
-import { BookmarkData } from "./test-data/psono-json/bookmark.json";
-import { EmptyTestFolderData } from "./test-data/psono-json/empty-folders";
-import { EnvVariablesData } from "./test-data/psono-json/environment-variables";
-import { FoldersTestData } from "./test-data/psono-json/folders";
-import { GPGData } from "./test-data/psono-json/gpg";
-import { NotesData } from "./test-data/psono-json/notes";
-import { ReducedWebsiteLoginsData } from "./test-data/psono-json/reduced-website-logins";
-import { SubFoldersTestData } from "./test-data/psono-json/subfolders";
-import { TOTPData } from "./test-data/psono-json/totp";
-import { WebsiteLoginsData } from "./test-data/psono-json/website-logins";
+import { PsonoJsonImporter } from "./psono-json-importer";
 
 function validateCustomField(
   fields: FieldView[],

libs/importer/src/importers/roboform-csv-importer.spec.ts

@@ -1,8 +1,8 @@
-import { CipherType } from "../../common/src/vault/enums/cipher-type";
-import { RoboFormCsvImporter } from "../src/importers";
+import { CipherType } from "@bitwarden/common/vault/enums";
 
-import { data as dataNoFolder } from "./test-data/roboform-csv/empty-folders";
-import { data as dataFolder } from "./test-data/roboform-csv/with-folders";
+import { RoboFormCsvImporter } from "./roboform-csv-importer";
+import { data as dataNoFolder } from "./spec-data/roboform-csv/empty-folders";
+import { data as dataFolder } from "./spec-data/roboform-csv/with-folders";
 
 describe("Roboform CSV Importer", () => {
   it("should parse CSV data", async () => {

libs/importer/src/importers/safari-csv-importer.spec.ts

@@ -2,10 +2,9 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 
-import { SafariCsvImporter } from "../src/importers";
-
-import { data as oldSimplePasswordData } from "./test-data/safari-csv/old-simple-password-data.csv";
-import { data as simplePasswordData } from "./test-data/safari-csv/simple-password-data.csv";
+import { SafariCsvImporter } from "./safari-csv-importer";
+import { data as oldSimplePasswordData } from "./spec-data/safari-csv/old-simple-password-data.csv";
+import { data as simplePasswordData } from "./spec-data/safari-csv/simple-password-data.csv";
 
 const CipherData = [
   {

libs/importer/src/importers/securesafe-csv-importer.spec.ts

@@ -2,9 +2,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
 
-import { SecureSafeCsvImporter } from "../src/importers";
-
-import { data_upperUrl, data_lowerUrl } from "./test-data/securesafe-csv/securesafe-example.csv";
+import { SecureSafeCsvImporter } from "./securesafe-csv-importer";
+import { data_upperUrl, data_lowerUrl } from "./spec-data/securesafe-csv/securesafe-example.csv";
 
 const CipherData = [
   {

libs/importer/src/importers/spec-data/enpass-json/credit-card.ts

@@ -1,4 +1,4 @@
-import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type";
+import { EnpassJsonFile } from "../../enpass/types/enpass-json-type";
 
 export const creditCard: EnpassJsonFile = {
   folders: [],

libs/importer/src/importers/spec-data/enpass-json/folders.ts

@@ -1,4 +1,4 @@
-import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type";
+import { EnpassJsonFile } from "../../enpass/types/enpass-json-type";
 
 export const folders: EnpassJsonFile = {
   folders: [

libs/importer/src/importers/spec-data/enpass-json/login-android-url.ts

@@ -1,4 +1,5 @@
-import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type";
+// @ts-strict-ignore
+import { EnpassJsonFile } from "../../enpass/types/enpass-json-type";
 
 import { login } from "./login";
 

libs/importer/src/importers/spec-data/enpass-json/login.ts

@@ -1,4 +1,4 @@
-import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type";
+import { EnpassJsonFile } from "../../enpass/types/enpass-json-type";
 
 export const login: EnpassJsonFile = {
   folders: [],

libs/importer/src/importers/spec-data/enpass-json/note.ts

@@ -1,4 +1,4 @@
-import { EnpassJsonFile } from "../../../src/importers/enpass/types/enpass-json-type";
+import { EnpassJsonFile } from "../../enpass/types/enpass-json-type";
 
 export const note: EnpassJsonFile = {
   folders: [],

libs/importer/src/importers/spec-data/keeper-json/testdata.json.ts

@@ -1,4 +1,4 @@
-import { KeeperJsonExport } from "../../../src/importers/keeper/types/keeper-json-types";
+import { KeeperJsonExport } from "../../keeper/types/keeper-json-types";
 
 export const testData: KeeperJsonExport = {
   shared_folders: [

libs/importer/src/importers/spec-data/onepassword-1pux/api-credentials.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const APICredentialsData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/bank-account.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const BankAccountData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/credit-card.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const CreditCardData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/database.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const DatabaseData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/drivers-license.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const DriversLicenseData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/email-account.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const EmailAccountData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/email-field-on-identity.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const EmailFieldOnIdentityData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/email-field-on-identity_prefilled.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const EmailFieldOnIdentityPrefilledData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/email-field.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const EmailFieldData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/identity-data.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const IdentityData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/login-data.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const LoginData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/medical-record.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const MedicalRecordData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/membership.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const MembershipData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/onepux_example.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const OnePuxExampleFile: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/outdoor-license.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const OutdoorLicenseData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/passport.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const PassportData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/password.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const PasswordData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/rewards-program.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const RewardsProgramData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/sanitized-export.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const SanitizedExport: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/secure-note.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const SecureNoteData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/server.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const ServerData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/software-license.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const SoftwareLicenseData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/ssn.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const SSNData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/onepassword-1pux/wireless-router.ts

@@ -1,4 +1,4 @@
-import { ExportData } from "../../../src/importers/onepassword/types/onepassword-1pux-importer-types";
+import { ExportData } from "../../onepassword/types/onepassword-1pux-importer-types";
 
 export const WirelessRouterData: ExportData = {
   accounts: [

libs/importer/src/importers/spec-data/passky-json/passky-encrypted.json.ts

@@ -1,4 +1,4 @@
-import { PasskyJsonExport } from "../../../src/importers/passky/passky-json-types";
+import { PasskyJsonExport } from "../../passky/passky-json-types";
 
 export const testData: PasskyJsonExport = {
   encrypted: true,

libs/importer/src/importers/spec-data/passky-json/passky-unencrypted.json.ts

@@ -1,4 +1,4 @@
-import { PasskyJsonExport } from "../../../src/importers/passky/passky-json-types";
+import { PasskyJsonExport } from "../../passky/passky-json-types";
 
 export const testData: PasskyJsonExport = {
   encrypted: false,