[PM-328] Move common/importer to libs/importer (tools-migration) (#5060)

* Create and register new libs/importer

Create package.json
Create tsconfig
Create jest.config
Extend shared and root tsconfig and jest.configs
Register with eslint

* Move importer-related files to libs/importer

* Move importer-spec-related files to libs/importer

Move import.service.spec

* Update package-lock.json

* Set CODEOWNERS for new libs/importer

* Register libs/importer with cli and fix imports

* Register libs/importer with web and fix imports

* Move importOption into models

Rename importOptions to import-options

* Fix linting issues after updating prettier

* Only expose necessary files from libs/importer

Fix tsconfig files
- Removes the trailing /index on imports in web/cli

As the spec-files no longer can access the internals via @bitwarden/importer they import by path (../src/importers)

* Add barrel files to vendors with more than one importer

apps/cli/src/bw.ts

@@ -4,7 +4,6 @@ import * as path from "path";
 import * as program from "commander";
 import * as jsdom from "jsdom";
 
-import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { CollectionService } from "@bitwarden/common/admin-console/services/collection.service";
@@ -33,8 +32,6 @@ import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptog
 import { EnvironmentService } from "@bitwarden/common/services/environment.service";
 import { ExportService } from "@bitwarden/common/services/export.service";
 import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
-import { ImportApiService } from "@bitwarden/common/services/import/import-api.service";
-import { ImportService } from "@bitwarden/common/services/import/import.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service";
 import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation";
@@ -56,6 +53,12 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
 import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
 import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
+import {
+  ImportApiService,
+  ImportApiServiceAbstraction,
+  ImportService,
+  ImportServiceAbstraction,
+} from "@bitwarden/importer";
 import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service";
 
 import { Program } from "./program";
@@ -98,7 +101,7 @@ export class Main {
   totpService: TotpService;
   containerService: ContainerService;
   auditService: AuditService;
-  importService: ImportService;
+  importService: ImportServiceAbstraction;
   importApiService: ImportApiServiceAbstraction;
   exportService: ExportService;
   searchService: SearchService;

apps/cli/src/tools/import.command.ts

@@ -1,10 +1,8 @@
 import * as program from "commander";
 import * as inquirer from "inquirer";
 
-import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { ImportType } from "@bitwarden/common/enums/importOptions";
-import { Importer } from "@bitwarden/common/importers/importer";
+import { ImportServiceAbstraction, Importer, ImportType } from "@bitwarden/importer";
 
 import { Response } from "../models/response";
 import { MessageResponse } from "../models/response/message.response";
@@ -12,7 +10,7 @@ import { CliUtils } from "../utils";
 
 export class ImportCommand {
   constructor(
-    private importService: ImportService,
+    private importService: ImportServiceAbstraction,
     private organizationService: OrganizationService
   ) {}
 

apps/cli/src/vault.program.ts

@@ -6,11 +6,11 @@ import { Main } from "./bw";
 import { EditCommand } from "./commands/edit.command";
 import { ExportCommand } from "./commands/export.command";
 import { GetCommand } from "./commands/get.command";
-import { ImportCommand } from "./commands/import.command";
 import { ListCommand } from "./commands/list.command";
 import { RestoreCommand } from "./commands/restore.command";
 import { Response } from "./models/response";
 import { Program } from "./program";
+import { ImportCommand } from "./tools/import.command";
 import { CliUtils } from "./utils";
 import { CreateCommand } from "./vault/create.command";
 import { DeleteCommand } from "./vault/delete.command";

apps/cli/tsconfig.json

@@ -14,6 +14,7 @@
     "paths": {
       "@bitwarden/common/spec/*": ["../../libs/common/spec/*"],
       "@bitwarden/common/*": ["../../libs/common/src/*"],
+      "@bitwarden/importer": ["../../libs/importer/src"],
       "@bitwarden/node/*": ["../../libs/node/src/*"]
     }
   },

apps/web/src/app/admin-console/organizations/tools/import-export/org-import-export.module.ts

@@ -3,13 +3,15 @@ import { NgModule } from "@angular/core";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
-import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import/import.service.abstraction";
 import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
-import { ImportApiService } from "@bitwarden/common/services/import/import-api.service";
-import { ImportService } from "@bitwarden/common/services/import/import.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import {
+  ImportService,
+  ImportServiceAbstraction,
+  ImportApiService,
+  ImportApiServiceAbstraction,
+} from "@bitwarden/importer";
 
 import { LooseComponentsModule, SharedModule } from "../../../../shared";
 

apps/web/src/app/admin-console/organizations/tools/import-export/org-import.component.ts

@@ -3,12 +3,12 @@ import { ActivatedRoute, Router } from "@angular/router";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import { ImportServiceAbstraction } from "@bitwarden/importer";
 
 import { ImportComponent } from "../../../../tools/import-export/import.component";
 
@@ -22,7 +22,7 @@ export class OrganizationImportComponent extends ImportComponent {
 
   constructor(
     i18nService: I18nService,
-    importService: ImportService,
+    importService: ImportServiceAbstraction,
     router: Router,
     private route: ActivatedRoute,
     platformUtilsService: PlatformUtilsService,

apps/web/src/app/tools/import-export/import-export.module.ts

@@ -3,13 +3,15 @@ import { NgModule } from "@angular/core";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportApiServiceAbstraction } from "@bitwarden/common/abstractions/import/import-api.service.abstraction";
-import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import/import.service.abstraction";
 import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
-import { ImportApiService } from "@bitwarden/common/services/import/import-api.service";
-import { ImportService } from "@bitwarden/common/services/import/import.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
+import {
+  ImportService,
+  ImportServiceAbstraction,
+  ImportApiService,
+  ImportApiServiceAbstraction,
+} from "@bitwarden/importer";
 
 import { LooseComponentsModule, SharedModule } from "../../shared";
 

apps/web/src/app/tools/import-export/import.component.ts

@@ -6,14 +6,17 @@ import Swal, { SweetAlertIcon } from "sweetalert2";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { ImportService } from "@bitwarden/common/abstractions/import/import.service.abstraction";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
-import { ImportOption, ImportType } from "@bitwarden/common/enums/importOptions";
-import { ImportError } from "@bitwarden/common/importers/import-error";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
+import {
+  ImportOption,
+  ImportType,
+  ImportError,
+  ImportServiceAbstraction,
+} from "@bitwarden/importer";
 
 import { FilePasswordPromptComponent } from "./file-password-prompt.component";
 
@@ -36,7 +39,7 @@ export class ImportComponent implements OnInit {
 
   constructor(
     protected i18nService: I18nService,
-    protected importService: ImportService,
+    protected importService: ImportServiceAbstraction,
     protected router: Router,
     protected platformUtilsService: PlatformUtilsService,
     protected policyService: PolicyService,

apps/web/tsconfig.json

@@ -8,7 +8,8 @@
       "@bitwarden/web-vault/*": ["src/*"],
       "@bitwarden/common/*": ["../../libs/common/src/*"],
       "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/components": ["../../libs/components/src"]
+      "@bitwarden/components": ["../../libs/components/src"],
+      "@bitwarden/importer": ["../../libs/importer/src"]
     }
   },
   "angularCompilerOptions": {