diff --git a/jslib/angular/src/components/callout.component.ts b/jslib/angular/src/components/callout.component.ts index a1785fe5..9b7a7e0d 100644 --- a/jslib/angular/src/components/callout.component.ts +++ b/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", diff --git a/jslib/angular/src/components/environment.component.ts b/jslib/angular/src/components/environment.component.ts index 8b7689de..17fa2ceb 100644 --- a/jslib/angular/src/components/environment.component.ts +++ b/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 { diff --git a/jslib/angular/src/components/icon.component.ts b/jslib/angular/src/components/icon.component.ts index 9cb8e907..2fa45197 100644 --- a/jslib/angular/src/components/icon.component.ts +++ b/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 diff --git a/jslib/angular/src/components/password-reprompt.component.ts b/jslib/angular/src/components/password-reprompt.component.ts index 03b40802..ef36218e 100644 --- a/jslib/angular/src/components/password-reprompt.component.ts +++ b/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"; diff --git a/jslib/angular/src/directives/api-action.directive.ts b/jslib/angular/src/directives/api-action.directive.ts index 3d121726..25dba7f2 100644 --- a/jslib/angular/src/directives/api-action.directive.ts +++ b/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"; diff --git a/jslib/angular/src/directives/autofocus.directive.ts b/jslib/angular/src/directives/autofocus.directive.ts index 5c5997fa..f7b60b1f 100644 --- a/jslib/angular/src/directives/autofocus.directive.ts +++ b/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]", diff --git a/jslib/angular/src/pipes/i18n.pipe.ts b/jslib/angular/src/pipes/i18n.pipe.ts index 8fc09434..50651740 100644 --- a/jslib/angular/src/pipes/i18n.pipe.ts +++ b/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", diff --git a/jslib/angular/src/pipes/search-ciphers.pipe.ts b/jslib/angular/src/pipes/search-ciphers.pipe.ts index e8bdd13e..aae299af 100644 --- a/jslib/angular/src/pipes/search-ciphers.pipe.ts +++ b/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", diff --git a/jslib/angular/src/services/auth-guard.service.ts b/jslib/angular/src/services/auth-guard.service.ts index 8c06e438..ea16b739 100644 --- a/jslib/angular/src/services/auth-guard.service.ts +++ b/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 { diff --git a/jslib/angular/src/services/broadcaster.service.ts b/jslib/angular/src/services/broadcaster.service.ts index 36218405..786327f6 100644 --- a/jslib/angular/src/services/broadcaster.service.ts +++ b/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 {} diff --git a/jslib/angular/src/services/jslib-services.module.ts b/jslib/angular/src/services/jslib-services.module.ts index 8d8aa85b..9333d016 100644 --- a/jslib/angular/src/services/jslib-services.module.ts +++ b/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"; diff --git a/jslib/angular/src/services/lock-guard.service.ts b/jslib/angular/src/services/lock-guard.service.ts index 992c6e5d..926fc521 100644 --- a/jslib/angular/src/services/lock-guard.service.ts +++ b/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 { diff --git a/jslib/angular/src/services/passwordReprompt.service.ts b/jslib/angular/src/services/passwordReprompt.service.ts index 723c41f7..99db5437 100644 --- a/jslib/angular/src/services/passwordReprompt.service.ts +++ b/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"; diff --git a/jslib/angular/src/services/unauth-guard.service.ts b/jslib/angular/src/services/unauth-guard.service.ts index ee2da045..264677e7 100644 --- a/jslib/angular/src/services/unauth-guard.service.ts +++ b/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 { diff --git a/jslib/angular/src/services/validation.service.ts b/jslib/angular/src/services/validation.service.ts index 865f6458..85c5a0d5 100644 --- a/jslib/angular/src/services/validation.service.ts +++ b/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 { diff --git a/jslib/common/spec/domain/attachment.spec.ts b/jslib/common/spec/domain/attachment.spec.ts index f625adbf..318a2a80 100644 --- a/jslib/common/spec/domain/attachment.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/card.spec.ts b/jslib/common/spec/domain/card.spec.ts index f4709bcc..ca41084b 100644 --- a/jslib/common/spec/domain/card.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/cipher.spec.ts b/jslib/common/spec/domain/cipher.spec.ts index 0e6ed452..936cc08a 100644 --- a/jslib/common/spec/domain/cipher.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/collection.spec.ts b/jslib/common/spec/domain/collection.spec.ts index 713bf2eb..e5cf1d66 100644 --- a/jslib/common/spec/domain/collection.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/encString.spec.ts b/jslib/common/spec/domain/encString.spec.ts index e2477447..8caaaf87 100644 --- a/jslib/common/spec/domain/encString.spec.ts +++ b/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(() => { diff --git a/jslib/common/spec/domain/field.spec.ts b/jslib/common/spec/domain/field.spec.ts index 40ceb710..452b0cd9 100644 --- a/jslib/common/spec/domain/field.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/folder.spec.ts b/jslib/common/spec/domain/folder.spec.ts index 64ee40b9..dc22f829 100644 --- a/jslib/common/spec/domain/folder.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/identity.spec.ts b/jslib/common/spec/domain/identity.spec.ts index ffaf5049..f77459aa 100644 --- a/jslib/common/spec/domain/identity.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/login.spec.ts b/jslib/common/spec/domain/login.spec.ts index 88c31a5f..56f8c2c3 100644 --- a/jslib/common/spec/domain/login.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/loginUri.spec.ts b/jslib/common/spec/domain/loginUri.spec.ts index 2ea5ab59..1522d374 100644 --- a/jslib/common/spec/domain/loginUri.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/password.spec.ts b/jslib/common/spec/domain/password.spec.ts index 4054c951..1ddbb46f 100644 --- a/jslib/common/spec/domain/password.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/secureNote.spec.ts b/jslib/common/spec/domain/secureNote.spec.ts index 50ca67ed..710b96cc 100644 --- a/jslib/common/spec/domain/secureNote.spec.ts +++ b/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; diff --git a/jslib/common/spec/domain/send.spec.ts b/jslib/common/spec/domain/send.spec.ts index d63c622a..c25bab3a 100644 --- a/jslib/common/spec/domain/send.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/sendAccess.spec.ts b/jslib/common/spec/domain/sendAccess.spec.ts index fc3001a5..f10dfe4d 100644 --- a/jslib/common/spec/domain/sendAccess.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/sendFile.spec.ts b/jslib/common/spec/domain/sendFile.spec.ts index 9fde0b76..70da0b03 100644 --- a/jslib/common/spec/domain/sendFile.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/sendText.spec.ts b/jslib/common/spec/domain/sendText.spec.ts index 776a4c57..eb82c93c 100644 --- a/jslib/common/spec/domain/sendText.spec.ts +++ b/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"; diff --git a/jslib/common/spec/domain/symmetricCryptoKey.spec.ts b/jslib/common/spec/domain/symmetricCryptoKey.spec.ts index 62f096c1..5d379129 100644 --- a/jslib/common/spec/domain/symmetricCryptoKey.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/bitwardenJsonImporter.spec.ts b/jslib/common/spec/importers/bitwardenJsonImporter.spec.ts index 94b03528..9dc6d020 100644 --- a/jslib/common/spec/importers/bitwardenJsonImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts b/jslib/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts index ed2434ee..e44ce987 100644 --- a/jslib/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/dashlaneCsvImporter.spec.ts b/jslib/common/spec/importers/dashlaneCsvImporter.spec.ts index 666e3232..8aab8351 100644 --- a/jslib/common/spec/importers/dashlaneCsvImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/firefoxCsvImporter.spec.ts b/jslib/common/spec/importers/firefoxCsvImporter.spec.ts index e15b86e9..fdc786b5 100644 --- a/jslib/common/spec/importers/firefoxCsvImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/fsecureFskImporter.spec.ts b/jslib/common/spec/importers/fsecureFskImporter.spec.ts index 63d082df..4fe4af56 100644 --- a/jslib/common/spec/importers/fsecureFskImporter.spec.ts +++ b/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: { diff --git a/jslib/common/spec/importers/keepass2XmlImporter.spec.ts b/jslib/common/spec/importers/keepass2XmlImporter.spec.ts index 6b539468..b3305dd5 100644 --- a/jslib/common/spec/importers/keepass2XmlImporter.spec.ts +++ b/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 = ` diff --git a/jslib/common/spec/importers/keeperJsonImporter.spec.ts b/jslib/common/spec/importers/keeperJsonImporter.spec.ts index 3da6ac48..70b8f3c3 100644 --- a/jslib/common/spec/importers/keeperJsonImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/lastpassCsvImporter.spec.ts b/jslib/common/spec/importers/lastpassCsvImporter.spec.ts index 9cca6c4f..5014d8c8 100644 --- a/jslib/common/spec/importers/lastpassCsvImporter.spec.ts +++ b/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(); diff --git a/jslib/common/spec/importers/mykiCsvImporter.spec.ts b/jslib/common/spec/importers/mykiCsvImporter.spec.ts index d9538ee7..72283b3c 100644 --- a/jslib/common/spec/importers/mykiCsvImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/nordpassCsvImporter.spec.ts b/jslib/common/spec/importers/nordpassCsvImporter.spec.ts index 4022b7e3..1c1f14cd 100644 --- a/jslib/common/spec/importers/nordpassCsvImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/onepassword1PifImporter.spec.ts b/jslib/common/spec/importers/onepassword1PifImporter.spec.ts index ffa2417a..739b0fad 100644 --- a/jslib/common/spec/importers/onepassword1PifImporter.spec.ts +++ b/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" + diff --git a/jslib/common/spec/importers/onepassword1PuxImporter.spec.ts b/jslib/common/spec/importers/onepassword1PuxImporter.spec.ts index a56e080a..2d73ffea 100644 --- a/jslib/common/spec/importers/onepassword1PuxImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/onepasswordMacCsvImporter.spec.ts b/jslib/common/spec/importers/onepasswordMacCsvImporter.spec.ts index 73569fc6..a9c53a52 100644 --- a/jslib/common/spec/importers/onepasswordMacCsvImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/onepasswordWinCsvImporter.spec.ts b/jslib/common/spec/importers/onepasswordWinCsvImporter.spec.ts index bfc1044a..49693f3c 100644 --- a/jslib/common/spec/importers/onepasswordWinCsvImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/safariCsvImporter.spec.ts b/jslib/common/spec/importers/safariCsvImporter.spec.ts index f1e1186f..4cbc56f8 100644 --- a/jslib/common/spec/importers/safariCsvImporter.spec.ts +++ b/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"; diff --git a/jslib/common/spec/importers/testData/keeperJson/testData.ts b/jslib/common/spec/importers/testData/keeperJson/testData.ts index fee8f54c..d537c1ee 100644 --- a/jslib/common/spec/importers/testData/keeperJson/testData.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/APICredentials.ts b/jslib/common/spec/importers/testData/onePassword1Pux/APICredentials.ts index 41b75331..fb44e7c5 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/APICredentials.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/BankAccount.ts b/jslib/common/spec/importers/testData/onePassword1Pux/BankAccount.ts index 1ada2714..8278e2e6 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/BankAccount.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/CreditCard.ts b/jslib/common/spec/importers/testData/onePassword1Pux/CreditCard.ts index ccdd4aa9..8b24d1b9 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/CreditCard.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/Database.ts b/jslib/common/spec/importers/testData/onePassword1Pux/Database.ts index 594f5384..8e80874c 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/Database.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts b/jslib/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts index 468069ae..e35aed1e 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/DriversLicense.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts b/jslib/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts index 1f83a6d8..e345891d 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/EmailAccount.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/Emailfield.ts b/jslib/common/spec/importers/testData/onePassword1Pux/Emailfield.ts index ae2723f3..205fc402 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/Emailfield.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts b/jslib/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts index e33404e3..69e89f2d 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts b/jslib/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts index c383ebc8..8e7150ad 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/EmailfieldOnIdentity_Prefilled.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/IdentityData.ts b/jslib/common/spec/importers/testData/onePassword1Pux/IdentityData.ts index 9a37f946..f504a3ab 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/IdentityData.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/LoginData.ts b/jslib/common/spec/importers/testData/onePassword1Pux/LoginData.ts index b7c28353..54b0dc40 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/LoginData.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts b/jslib/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts index 0358b2a3..50deff94 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/MedicalRecord.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/Membership.ts b/jslib/common/spec/importers/testData/onePassword1Pux/Membership.ts index 62b5e101..82e8e309 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/Membership.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts b/jslib/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts index e73705cb..2c55d3c6 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/Onepux_example.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts b/jslib/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts index ea59e4f5..3e6bd18e 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/OutdoorLicense.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/Passport.ts b/jslib/common/spec/importers/testData/onePassword1Pux/Passport.ts index 635b7eae..cc31585f 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/Passport.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/Password.ts b/jslib/common/spec/importers/testData/onePassword1Pux/Password.ts index fc6c662d..b82a08e9 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/Password.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts b/jslib/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts index a0f0712e..35fc83e8 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/RewardsProgram.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/SSN.ts b/jslib/common/spec/importers/testData/onePassword1Pux/SSN.ts index 058e5bdb..4aad39dd 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/SSN.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts b/jslib/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts index 657b26b5..08d879bb 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/SanitizedExport.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/SecureNote.ts b/jslib/common/spec/importers/testData/onePassword1Pux/SecureNote.ts index 238cb667..e11ffd5d 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/SecureNote.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/Server.ts b/jslib/common/spec/importers/testData/onePassword1Pux/Server.ts index c614d03f..cc89cc1d 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/Server.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts b/jslib/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts index 769aa088..ec77eee1 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/SoftwareLicense.ts +++ b/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: [ diff --git a/jslib/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts b/jslib/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts index 1fe6350e..71df0474 100644 --- a/jslib/common/spec/importers/testData/onePassword1Pux/WirelessRouter.ts +++ b/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: [ diff --git a/jslib/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts b/jslib/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts index 2f4fe6c3..37b19f84 100644 --- a/jslib/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts +++ b/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"; diff --git a/jslib/common/spec/misc/logInStrategies/logIn.strategy.spec.ts b/jslib/common/spec/misc/logInStrategies/logIn.strategy.spec.ts index 5f68881b..9cffb31b 100644 --- a/jslib/common/spec/misc/logInStrategies/logIn.strategy.spec.ts +++ b/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"; diff --git a/jslib/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts b/jslib/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts index 65bf5367..9e95f7f2 100644 --- a/jslib/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts +++ b/jslib/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts @@ -1,20 +1,20 @@ 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 { HashPurpose } from "jslib-common/enums/hashPurpose"; -import { PasswordLogInStrategy } from "jslib-common/misc/logInStrategies/passwordLogin.strategy"; -import { Utils } from "jslib-common/misc/utils"; -import { PasswordLogInCredentials } from "jslib-common/models/domain/logInCredentials"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +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 { HashPurpose } from "@/jslib/common/src/enums/hashPurpose"; +import { PasswordLogInStrategy } from "@/jslib/common/src/misc/logInStrategies/passwordLogin.strategy"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { PasswordLogInCredentials } from "@/jslib/common/src/models/domain/logInCredentials"; +import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey"; import { identityTokenResponseFactory } from "./logIn.strategy.spec"; diff --git a/jslib/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts b/jslib/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts index 826a16a5..25fc4ba0 100644 --- a/jslib/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts +++ b/jslib/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts @@ -1,18 +1,18 @@ 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 { 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 { SsoLogInStrategy } from "jslib-common/misc/logInStrategies/ssoLogin.strategy"; -import { Utils } from "jslib-common/misc/utils"; -import { SsoLogInCredentials } 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 { 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 { SsoLogInStrategy } from "@/jslib/common/src/misc/logInStrategies/ssoLogin.strategy"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { SsoLogInCredentials } from "@/jslib/common/src/models/domain/logInCredentials"; import { identityTokenResponseFactory } from "./logIn.strategy.spec"; diff --git a/jslib/common/spec/misc/sequentialize.spec.ts b/jslib/common/spec/misc/sequentialize.spec.ts index 4165eca2..7a1be5f7 100644 --- a/jslib/common/spec/misc/sequentialize.spec.ts +++ b/jslib/common/spec/misc/sequentialize.spec.ts @@ -1,4 +1,4 @@ -import { sequentialize } from "jslib-common/misc/sequentialize"; +import { sequentialize } from "@/jslib/common/src/misc/sequentialize"; describe("sequentialize decorator", () => { it("should call the function once", async () => { diff --git a/jslib/common/spec/misc/throttle.spec.ts b/jslib/common/spec/misc/throttle.spec.ts index 5a8cd27e..f9f3bd2c 100644 --- a/jslib/common/spec/misc/throttle.spec.ts +++ b/jslib/common/spec/misc/throttle.spec.ts @@ -1,5 +1,5 @@ -import { sequentialize } from "jslib-common/misc/sequentialize"; -import { throttle } from "jslib-common/misc/throttle"; +import { sequentialize } from "@/jslib/common/src/misc/sequentialize"; +import { throttle } from "@/jslib/common/src/misc/throttle"; describe("throttle decorator", () => { it("should call the function once at a time", async () => { diff --git a/jslib/common/spec/misc/utils.spec.ts b/jslib/common/spec/misc/utils.spec.ts index eec41e4b..cada0117 100644 --- a/jslib/common/spec/misc/utils.spec.ts +++ b/jslib/common/spec/misc/utils.spec.ts @@ -1,4 +1,4 @@ -import { Utils } from "jslib-common/misc/utils"; +import { Utils } from "@/jslib/common/src/misc/utils"; describe("Utils Service", () => { describe("getDomain", () => { diff --git a/jslib/common/spec/services/cipher.service.spec.ts b/jslib/common/spec/services/cipher.service.spec.ts index 79b75787..f36612f2 100644 --- a/jslib/common/spec/services/cipher.service.spec.ts +++ b/jslib/common/spec/services/cipher.service.spec.ts @@ -1,19 +1,19 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FileUploadService } from "jslib-common/abstractions/fileUpload.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { SearchService } from "jslib-common/abstractions/search.service"; -import { SettingsService } from "jslib-common/abstractions/settings.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { Utils } from "jslib-common/misc/utils"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { EncArrayBuffer } from "jslib-common/models/domain/encArrayBuffer"; -import { EncString } from "jslib-common/models/domain/encString"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { CipherService } from "jslib-common/services/cipher.service"; +import { ApiService } from "@/jslib/common/src/abstractions/api.service"; +import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service"; +import { FileUploadService } from "@/jslib/common/src/abstractions/fileUpload.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { SearchService } from "@/jslib/common/src/abstractions/search.service"; +import { SettingsService } from "@/jslib/common/src/abstractions/settings.service"; +import { StateService } from "@/jslib/common/src/abstractions/state.service"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { Cipher } from "@/jslib/common/src/models/domain/cipher"; +import { EncArrayBuffer } from "@/jslib/common/src/models/domain/encArrayBuffer"; +import { EncString } from "@/jslib/common/src/models/domain/encString"; +import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey"; +import { CipherService } from "@/jslib/common/src/services/cipher.service"; const ENCRYPTED_TEXT = "This data has been encrypted"; const ENCRYPTED_BYTES = new EncArrayBuffer(Utils.fromUtf8ToArray(ENCRYPTED_TEXT).buffer); diff --git a/jslib/common/spec/services/consoleLog.service.spec.ts b/jslib/common/spec/services/consoleLog.service.spec.ts index 3f3059f7..59c08882 100644 --- a/jslib/common/spec/services/consoleLog.service.spec.ts +++ b/jslib/common/spec/services/consoleLog.service.spec.ts @@ -1,4 +1,4 @@ -import { ConsoleLogService } from "jslib-common/services/consoleLog.service"; +import { ConsoleLogService } from "@/jslib/common/src/services/consoleLog.service"; const originalConsole = console; let caughtMessage: any; diff --git a/jslib/common/spec/services/export.service.spec.ts b/jslib/common/spec/services/export.service.spec.ts index c96d9f0a..7361e292 100644 --- a/jslib/common/spec/services/export.service.spec.ts +++ b/jslib/common/spec/services/export.service.spec.ts @@ -1,20 +1,20 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { CipherType } from "jslib-common/enums/cipherType"; -import { KdfType } from "jslib-common/enums/kdfType"; -import { Utils } from "jslib-common/misc/utils"; -import { Cipher } from "jslib-common/models/domain/cipher"; -import { EncString } from "jslib-common/models/domain/encString"; -import { Login } from "jslib-common/models/domain/login"; -import { CipherWithIds as CipherExport } from "jslib-common/models/export/cipherWithIds"; -import { CipherView } from "jslib-common/models/view/cipherView"; -import { LoginView } from "jslib-common/models/view/loginView"; -import { ExportService } from "jslib-common/services/export.service"; +import { ApiService } from "@/jslib/common/src/abstractions/api.service"; +import { CipherService } from "@/jslib/common/src/abstractions/cipher.service"; +import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service"; +import { CryptoFunctionService } from "@/jslib/common/src/abstractions/cryptoFunction.service"; +import { FolderService } from "@/jslib/common/src/abstractions/folder.service"; +import { CipherType } from "@/jslib/common/src/enums/cipherType"; +import { KdfType } from "@/jslib/common/src/enums/kdfType"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { Cipher } from "@/jslib/common/src/models/domain/cipher"; +import { EncString } from "@/jslib/common/src/models/domain/encString"; +import { Login } from "@/jslib/common/src/models/domain/login"; +import { CipherWithIds as CipherExport } from "@/jslib/common/src/models/export/cipherWithIds"; +import { CipherView } from "@/jslib/common/src/models/view/cipherView"; +import { LoginView } from "@/jslib/common/src/models/view/loginView"; +import { ExportService } from "@/jslib/common/src/services/export.service"; import { BuildTestObject, GetUniqueString } from "../utils"; diff --git a/jslib/common/spec/services/import.service.spec.ts b/jslib/common/spec/services/import.service.spec.ts index dbf31cb2..9625667a 100644 --- a/jslib/common/spec/services/import.service.spec.ts +++ b/jslib/common/spec/services/import.service.spec.ts @@ -1,16 +1,16 @@ import Substitute, { SubstituteOf } from "@fluffy-spoon/substitute"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CipherService } from "jslib-common/abstractions/cipher.service"; -import { CollectionService } from "jslib-common/abstractions/collection.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { FolderService } from "jslib-common/abstractions/folder.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { BitwardenPasswordProtectedImporter } from "jslib-common/importers/bitwardenPasswordProtectedImporter"; -import { Importer } from "jslib-common/importers/importer"; -import { Utils } from "jslib-common/misc/utils"; -import { ImportService } from "jslib-common/services/import.service"; +import { ApiService } from "@/jslib/common/src/abstractions/api.service"; +import { CipherService } from "@/jslib/common/src/abstractions/cipher.service"; +import { CollectionService } from "@/jslib/common/src/abstractions/collection.service"; +import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service"; +import { FolderService } from "@/jslib/common/src/abstractions/folder.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; +import { BitwardenPasswordProtectedImporter } from "@/jslib/common/src/importers/bitwardenPasswordProtectedImporter"; +import { Importer } from "@/jslib/common/src/importers/importer"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { ImportService } from "@/jslib/common/src/services/import.service"; describe("ImportService", () => { let importService: ImportService; diff --git a/jslib/common/spec/services/stateMigration.service.ts b/jslib/common/spec/services/stateMigration.service.ts index d325585a..32b65bd7 100644 --- a/jslib/common/spec/services/stateMigration.service.ts +++ b/jslib/common/spec/services/stateMigration.service.ts @@ -1,11 +1,11 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { StateVersion } from "jslib-common/enums/stateVersion"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { Account } from "jslib-common/models/domain/account"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { StateMigrationService } from "jslib-common/services/stateMigration.service"; +import { StorageService } from "@/jslib/common/src/abstractions/storage.service"; +import { StateVersion } from "@/jslib/common/src/enums/stateVersion"; +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 { StateMigrationService } from "@/jslib/common/src/services/stateMigration.service"; const userId = "USER_ID"; diff --git a/jslib/common/spec/utils.ts b/jslib/common/spec/utils.ts index 58963d0f..c4a5fb6f 100644 --- a/jslib/common/spec/utils.ts +++ b/jslib/common/spec/utils.ts @@ -1,6 +1,6 @@ import Substitute, { Arg } from "@fluffy-spoon/substitute"; -import { EncString } from "jslib-common/models/domain/encString"; +import { EncString } from "@/jslib/common/src/models/domain/encString"; function newGuid() { return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => { diff --git a/jslib/common/spec/web/services/webCryptoFunction.service.spec.ts b/jslib/common/spec/web/services/webCryptoFunction.service.spec.ts index 3e437c6a..f4940397 100644 --- a/jslib/common/spec/web/services/webCryptoFunction.service.spec.ts +++ b/jslib/common/spec/web/services/webCryptoFunction.service.spec.ts @@ -1,9 +1,9 @@ import Substitute from "@fluffy-spoon/substitute"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Utils } from "jslib-common/misc/utils"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { WebCryptoFunctionService } from "jslib-common/services/webCryptoFunction.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey"; +import { WebCryptoFunctionService } from "@/jslib/common/src/services/webCryptoFunction.service"; const RsaPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0Vawl/toXzkEvB82FEtqHP" + diff --git a/jslib/common/src/misc/sequentialize.ts b/jslib/common/src/misc/sequentialize.ts index c2421147..2983758d 100644 --- a/jslib/common/src/misc/sequentialize.ts +++ b/jslib/common/src/misc/sequentialize.ts @@ -6,7 +6,7 @@ * * Results are not cached, once the promise has returned, the next call will result in a fresh call * - * Read more at https://github.com/bitwarden/jslib/pull/7 + * Read more at https://github.com/bitwarden/@/jslib/pull/7 */ export function sequentialize(cacheKey: (args: any[]) => string) { return (target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) => { diff --git a/jslib/common/src/models/request/identityToken/tokenRequestTwoFactor.ts b/jslib/common/src/models/request/identityToken/tokenRequestTwoFactor.ts index 567e8c66..95f688c8 100644 --- a/jslib/common/src/models/request/identityToken/tokenRequestTwoFactor.ts +++ b/jslib/common/src/models/request/identityToken/tokenRequestTwoFactor.ts @@ -1,4 +1,4 @@ -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; +import { TwoFactorProviderType } from "@/jslib/common/src/enums/twoFactorProviderType"; export class TokenRequestTwoFactor { constructor( diff --git a/jslib/common/src/services/api.service.ts b/jslib/common/src/services/api.service.ts index da2fcd5d..b9edf7b5 100644 --- a/jslib/common/src/services/api.service.ts +++ b/jslib/common/src/services/api.service.ts @@ -1,6 +1,6 @@ -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { DeviceRequest } from "jslib-common/models/request/deviceRequest"; -import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor"; +import { AppIdService } from "@/jslib/common/src/abstractions/appId.service"; +import { DeviceRequest } from "@/jslib/common/src/models/request/deviceRequest"; +import { TokenRequestTwoFactor } from "@/jslib/common/src/models/request/identityToken/tokenRequestTwoFactor"; import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service"; import { EnvironmentService } from "../abstractions/environment.service"; diff --git a/jslib/electron/spec/services/electronLog.service.spec.ts b/jslib/electron/spec/services/electronLog.service.spec.ts index 5952da43..925c7d82 100644 --- a/jslib/electron/spec/services/electronLog.service.spec.ts +++ b/jslib/electron/spec/services/electronLog.service.spec.ts @@ -1,4 +1,4 @@ -import { ElectronLogService } from "jslib-electron/services/electronLog.service"; +import { ElectronLogService } from "@/jslib/electron/src/services/electronLog.service"; describe("ElectronLogService", () => { it("sets dev based on electron method", () => { diff --git a/jslib/electron/spec/utils.spec.ts b/jslib/electron/spec/utils.spec.ts index f9e95a2d..f24d961e 100644 --- a/jslib/electron/spec/utils.spec.ts +++ b/jslib/electron/spec/utils.spec.ts @@ -1,4 +1,4 @@ -import { cleanUserAgent } from "jslib-electron/utils"; +import { cleanUserAgent } from "@/jslib/electron/src/utils"; const expectedUserAgent = `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${process.versions.chrome} Safari/537.36`; diff --git a/jslib/electron/src/baseMenu.ts b/jslib/electron/src/baseMenu.ts index 09d47f7e..d2ccd643 100644 --- a/jslib/electron/src/baseMenu.ts +++ b/jslib/electron/src/baseMenu.ts @@ -1,6 +1,6 @@ import { Menu, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; import { WindowMain } from "./window.main"; diff --git a/jslib/electron/src/services/electronCrypto.service.ts b/jslib/electron/src/services/electronCrypto.service.ts index 36ea8132..52fd68e0 100644 --- a/jslib/electron/src/services/electronCrypto.service.ts +++ b/jslib/electron/src/services/electronCrypto.service.ts @@ -1,10 +1,10 @@ -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { CryptoService } from "jslib-common/services/crypto.service"; +import { CryptoFunctionService } from "@/jslib/common/src/abstractions/cryptoFunction.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; +import { StateService } from "@/jslib/common/src/abstractions/state.service"; +import { KeySuffixOptions } from "@/jslib/common/src/enums/keySuffixOptions"; +import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey"; +import { CryptoService } from "@/jslib/common/src/services/crypto.service"; export class ElectronCryptoService extends CryptoService { constructor( diff --git a/jslib/electron/src/services/electronLog.service.ts b/jslib/electron/src/services/electronLog.service.ts index c6195416..b596d1cf 100644 --- a/jslib/electron/src/services/electronLog.service.ts +++ b/jslib/electron/src/services/electronLog.service.ts @@ -2,8 +2,8 @@ import * as path from "path"; import log from "electron-log"; -import { LogLevelType } from "jslib-common/enums/logLevelType"; -import { ConsoleLogService as BaseLogService } from "jslib-common/services/consoleLog.service"; +import { LogLevelType } from "@/jslib/common/src/enums/logLevelType"; +import { ConsoleLogService as BaseLogService } from "@/jslib/common/src/services/consoleLog.service"; import { isDev } from "../utils"; diff --git a/jslib/electron/src/services/electronMainMessaging.service.ts b/jslib/electron/src/services/electronMainMessaging.service.ts index f79a32b4..db85b3f0 100644 --- a/jslib/electron/src/services/electronMainMessaging.service.ts +++ b/jslib/electron/src/services/electronMainMessaging.service.ts @@ -1,7 +1,7 @@ import { app, dialog, ipcMain, Menu, MenuItem, nativeTheme } from "electron"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service"; +import { ThemeType } from "@/jslib/common/src/enums/themeType"; import { RendererMenuItem } from "../utils"; import { WindowMain } from "../window.main"; diff --git a/jslib/electron/src/services/electronPlatformUtils.service.ts b/jslib/electron/src/services/electronPlatformUtils.service.ts index c80218d2..3bea8402 100644 --- a/jslib/electron/src/services/electronPlatformUtils.service.ts +++ b/jslib/electron/src/services/electronPlatformUtils.service.ts @@ -1,12 +1,12 @@ import { clipboard, ipcRenderer, shell } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.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 { ClientType } from "jslib-common/enums/clientType"; -import { DeviceType } from "jslib-common/enums/deviceType"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.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 { ClientType } from "@/jslib/common/src/enums/clientType"; +import { DeviceType } from "@/jslib/common/src/enums/deviceType"; +import { ThemeType } from "@/jslib/common/src/enums/themeType"; import { isDev, isMacAppStore } from "../utils"; diff --git a/jslib/electron/src/services/electronRendererMessaging.service.ts b/jslib/electron/src/services/electronRendererMessaging.service.ts index 89350a65..26eac13e 100644 --- a/jslib/electron/src/services/electronRendererMessaging.service.ts +++ b/jslib/electron/src/services/electronRendererMessaging.service.ts @@ -1,7 +1,7 @@ import { ipcRenderer } from "electron"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { BroadcasterService } from "@/jslib/common/src/abstractions/broadcaster.service"; +import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service"; export class ElectronRendererMessagingService implements MessagingService { constructor(private broadcasterService: BroadcasterService) { diff --git a/jslib/electron/src/services/electronRendererSecureStorage.service.ts b/jslib/electron/src/services/electronRendererSecureStorage.service.ts index 5c3f3c74..472650e5 100644 --- a/jslib/electron/src/services/electronRendererSecureStorage.service.ts +++ b/jslib/electron/src/services/electronRendererSecureStorage.service.ts @@ -1,7 +1,7 @@ import { ipcRenderer } from "electron"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; +import { StorageService } from "@/jslib/common/src/abstractions/storage.service"; +import { StorageOptions } from "@/jslib/common/src/models/domain/storageOptions"; export class ElectronRendererSecureStorageService implements StorageService { async get(key: string, options?: StorageOptions): Promise { diff --git a/jslib/electron/src/services/electronRendererStorage.service.ts b/jslib/electron/src/services/electronRendererStorage.service.ts index 69436bfe..bde381f2 100644 --- a/jslib/electron/src/services/electronRendererStorage.service.ts +++ b/jslib/electron/src/services/electronRendererStorage.service.ts @@ -1,6 +1,6 @@ import { ipcRenderer } from "electron"; -import { StorageService } from "jslib-common/abstractions/storage.service"; +import { StorageService } from "@/jslib/common/src/abstractions/storage.service"; export class ElectronRendererStorageService implements StorageService { get(key: string): Promise { diff --git a/jslib/electron/src/services/electronStorage.service.ts b/jslib/electron/src/services/electronStorage.service.ts index fdabf2a2..0c0596da 100644 --- a/jslib/electron/src/services/electronStorage.service.ts +++ b/jslib/electron/src/services/electronStorage.service.ts @@ -2,8 +2,8 @@ import * as fs from "fs"; import { ipcMain } from "electron"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; +import { StorageService } from "@/jslib/common/src/abstractions/storage.service"; +import { NodeUtils } from "@/jslib/common/src/misc/nodeUtils"; // eslint-disable-next-line const Store = require("electron-store"); diff --git a/jslib/electron/src/tray.main.ts b/jslib/electron/src/tray.main.ts index ebbc5687..b30338b4 100644 --- a/jslib/electron/src/tray.main.ts +++ b/jslib/electron/src/tray.main.ts @@ -2,8 +2,8 @@ import * as path from "path"; import { app, BrowserWindow, Menu, MenuItemConstructorOptions, nativeImage, Tray } from "electron"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { StateService } from "@/jslib/common/src/abstractions/state.service"; import { WindowMain } from "./window.main"; diff --git a/jslib/electron/src/updater.main.ts b/jslib/electron/src/updater.main.ts index 881208f8..dfeef617 100644 --- a/jslib/electron/src/updater.main.ts +++ b/jslib/electron/src/updater.main.ts @@ -2,7 +2,7 @@ import { dialog, shell } from "electron"; import log from "electron-log"; import { autoUpdater } from "electron-updater"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; import { isAppImage, isDev, isMacAppStore, isWindowsPortable, isWindowsStore } from "./utils"; import { WindowMain } from "./window.main"; diff --git a/jslib/electron/src/window.main.ts b/jslib/electron/src/window.main.ts index 66d4c780..dcc481ff 100644 --- a/jslib/electron/src/window.main.ts +++ b/jslib/electron/src/window.main.ts @@ -3,8 +3,8 @@ import * as url from "url"; import { app, BrowserWindow, screen } from "electron"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { StateService } from "@/jslib/common/src/abstractions/state.service"; import { cleanUserAgent, isDev, isMacAppStore, isSnapStore } from "./utils"; diff --git a/jslib/node/spec/cli/consoleLog.service.spec.ts b/jslib/node/spec/cli/consoleLog.service.spec.ts index cb8f5f0e..d5970cdf 100644 --- a/jslib/node/spec/cli/consoleLog.service.spec.ts +++ b/jslib/node/spec/cli/consoleLog.service.spec.ts @@ -1,9 +1,9 @@ import { interceptConsole, restoreConsole, -} from "jslib-common-spec/services/consoleLog.service.spec"; +} from "@/jslib/common/spec/services/consoleLog.service.spec"; -import { ConsoleLogService } from "jslib-node/cli/services/consoleLog.service"; +import { ConsoleLogService } from "@/jslib/node/src/cli/services/consoleLog.service"; let caughtMessage: any = {}; diff --git a/jslib/node/spec/services/nodeCryptoFunction.service.spec.ts b/jslib/node/spec/services/nodeCryptoFunction.service.spec.ts index 79572fcc..b2b7f1b8 100644 --- a/jslib/node/spec/services/nodeCryptoFunction.service.spec.ts +++ b/jslib/node/spec/services/nodeCryptoFunction.service.spec.ts @@ -1,6 +1,6 @@ -import { Utils } from "jslib-common/misc/utils"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; -import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey"; +import { NodeCryptoFunctionService } from "@/jslib/node/src/services/nodeCryptoFunction.service"; const RsaPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0Vawl/toXzkEvB82FEtqHP" + diff --git a/jslib/node/src/cli/baseProgram.ts b/jslib/node/src/cli/baseProgram.ts index 4a2ec904..fb32b5b8 100644 --- a/jslib/node/src/cli/baseProgram.ts +++ b/jslib/node/src/cli/baseProgram.ts @@ -1,6 +1,6 @@ import * as chalk from "chalk"; -import { StateService } from "jslib-common/abstractions/state.service"; +import { StateService } from "@/jslib/common/src/abstractions/state.service"; import { Response } from "./models/response"; import { ListResponse } from "./models/response/listResponse"; diff --git a/jslib/node/src/cli/commands/login.command.ts b/jslib/node/src/cli/commands/login.command.ts index ee6f8228..088b20e6 100644 --- a/jslib/node/src/cli/commands/login.command.ts +++ b/jslib/node/src/cli/commands/login.command.ts @@ -4,30 +4,30 @@ import * as program from "commander"; import * as inquirer from "inquirer"; import Separator from "inquirer/lib/objects/separator"; -import { ApiService } from "jslib-common/abstractions/api.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { CryptoService } from "jslib-common/abstractions/crypto.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { PolicyService } from "jslib-common/abstractions/policy.service"; -import { StateService } from "jslib-common/abstractions/state.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; -import { Utils } from "jslib-common/misc/utils"; -import { AuthResult } from "jslib-common/models/domain/authResult"; +import { ApiService } from "@/jslib/common/src/abstractions/api.service"; +import { AuthService } from "@/jslib/common/src/abstractions/auth.service"; +import { CryptoService } from "@/jslib/common/src/abstractions/crypto.service"; +import { CryptoFunctionService } from "@/jslib/common/src/abstractions/cryptoFunction.service"; +import { EnvironmentService } from "@/jslib/common/src/abstractions/environment.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { PasswordGenerationService } from "@/jslib/common/src/abstractions/passwordGeneration.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; +import { PolicyService } from "@/jslib/common/src/abstractions/policy.service"; +import { StateService } from "@/jslib/common/src/abstractions/state.service"; +import { TwoFactorService } from "@/jslib/common/src/abstractions/twoFactor.service"; +import { TwoFactorProviderType } from "@/jslib/common/src/enums/twoFactorProviderType"; +import { NodeUtils } from "@/jslib/common/src/misc/nodeUtils"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { AuthResult } from "@/jslib/common/src/models/domain/authResult"; import { ApiLogInCredentials, PasswordLogInCredentials, SsoLogInCredentials, -} from "jslib-common/models/domain/logInCredentials"; -import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor"; -import { TwoFactorEmailRequest } from "jslib-common/models/request/twoFactorEmailRequest"; -import { UpdateTempPasswordRequest } from "jslib-common/models/request/updateTempPasswordRequest"; -import { ErrorResponse } from "jslib-common/models/response/errorResponse"; +} from "@/jslib/common/src/models/domain/logInCredentials"; +import { TokenRequestTwoFactor } from "@/jslib/common/src/models/request/identityToken/tokenRequestTwoFactor"; +import { TwoFactorEmailRequest } from "@/jslib/common/src/models/request/twoFactorEmailRequest"; +import { UpdateTempPasswordRequest } from "@/jslib/common/src/models/request/updateTempPasswordRequest"; +import { ErrorResponse } from "@/jslib/common/src/models/response/errorResponse"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/messageResponse"; diff --git a/jslib/node/src/cli/commands/logout.command.ts b/jslib/node/src/cli/commands/logout.command.ts index 6074ba9c..77d65e3f 100644 --- a/jslib/node/src/cli/commands/logout.command.ts +++ b/jslib/node/src/cli/commands/logout.command.ts @@ -1,5 +1,5 @@ -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { AuthService } from "@/jslib/common/src/abstractions/auth.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/messageResponse"; diff --git a/jslib/node/src/cli/commands/update.command.ts b/jslib/node/src/cli/commands/update.command.ts index 1b9408a3..a1221995 100644 --- a/jslib/node/src/cli/commands/update.command.ts +++ b/jslib/node/src/cli/commands/update.command.ts @@ -1,7 +1,7 @@ import * as fetch from "node-fetch"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/messageResponse"; diff --git a/jslib/node/src/cli/services/cliPlatformUtils.service.ts b/jslib/node/src/cli/services/cliPlatformUtils.service.ts index 520170c2..d82effd6 100644 --- a/jslib/node/src/cli/services/cliPlatformUtils.service.ts +++ b/jslib/node/src/cli/services/cliPlatformUtils.service.ts @@ -1,9 +1,9 @@ import * as child_process from "child_process"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { ClientType } from "jslib-common/enums/clientType"; -import { DeviceType } from "jslib-common/enums/deviceType"; -import { ThemeType } from "jslib-common/enums/themeType"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; +import { ClientType } from "@/jslib/common/src/enums/clientType"; +import { DeviceType } from "@/jslib/common/src/enums/deviceType"; +import { ThemeType } from "@/jslib/common/src/enums/themeType"; // eslint-disable-next-line const open = require("open"); diff --git a/jslib/node/src/cli/services/consoleLog.service.ts b/jslib/node/src/cli/services/consoleLog.service.ts index 73dfcc55..ffea26f9 100644 --- a/jslib/node/src/cli/services/consoleLog.service.ts +++ b/jslib/node/src/cli/services/consoleLog.service.ts @@ -1,5 +1,5 @@ -import { LogLevelType } from "jslib-common/enums/logLevelType"; -import { ConsoleLogService as BaseConsoleLogService } from "jslib-common/services/consoleLog.service"; +import { LogLevelType } from "@/jslib/common/src/enums/logLevelType"; +import { ConsoleLogService as BaseConsoleLogService } from "@/jslib/common/src/services/consoleLog.service"; export class ConsoleLogService extends BaseConsoleLogService { constructor(isDev: boolean, filter: (level: LogLevelType) => boolean = null) { diff --git a/jslib/node/src/services/lowdbStorage.service.ts b/jslib/node/src/services/lowdbStorage.service.ts index e78fe2e4..407b7d81 100644 --- a/jslib/node/src/services/lowdbStorage.service.ts +++ b/jslib/node/src/services/lowdbStorage.service.ts @@ -4,11 +4,11 @@ import * as path from "path"; import * as lowdb from "lowdb"; import * as FileSync from "lowdb/adapters/FileSync"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; -import { sequentialize } from "jslib-common/misc/sequentialize"; -import { Utils } from "jslib-common/misc/utils"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { StorageService } from "@/jslib/common/src/abstractions/storage.service"; +import { NodeUtils } from "@/jslib/common/src/misc/nodeUtils"; +import { sequentialize } from "@/jslib/common/src/misc/sequentialize"; +import { Utils } from "@/jslib/common/src/misc/utils"; export class LowdbStorageService implements StorageService { protected dataFilePath: string; diff --git a/jslib/node/src/services/nodeApi.service.ts b/jslib/node/src/services/nodeApi.service.ts index 7dd03412..983cdb38 100644 --- a/jslib/node/src/services/nodeApi.service.ts +++ b/jslib/node/src/services/nodeApi.service.ts @@ -2,11 +2,11 @@ import * as FormData from "form-data"; import { HttpsProxyAgent } from "https-proxy-agent"; import * as fe from "node-fetch"; -import { AppIdService } from "jslib-common/abstractions/appId.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { TokenService } from "jslib-common/abstractions/token.service"; -import { ApiService } from "jslib-common/services/api.service"; +import { AppIdService } from "@/jslib/common/src/abstractions/appId.service"; +import { EnvironmentService } from "@/jslib/common/src/abstractions/environment.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; +import { TokenService } from "@/jslib/common/src/abstractions/token.service"; +import { ApiService } from "@/jslib/common/src/services/api.service"; (global as any).fetch = fe.default; (global as any).Request = fe.Request; diff --git a/jslib/node/src/services/nodeCryptoFunction.service.ts b/jslib/node/src/services/nodeCryptoFunction.service.ts index 90a04574..3b19aeb7 100644 --- a/jslib/node/src/services/nodeCryptoFunction.service.ts +++ b/jslib/node/src/services/nodeCryptoFunction.service.ts @@ -2,10 +2,10 @@ import * as crypto from "crypto"; import * as forge from "node-forge"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { Utils } from "jslib-common/misc/utils"; -import { DecryptParameters } from "jslib-common/models/domain/decryptParameters"; -import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey"; +import { CryptoFunctionService } from "@/jslib/common/src/abstractions/cryptoFunction.service"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { DecryptParameters } from "@/jslib/common/src/models/domain/decryptParameters"; +import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey"; export class NodeCryptoFunctionService implements CryptoFunctionService { pbkdf2( diff --git a/src/abstractions/state.service.ts b/src/abstractions/state.service.ts index fdd61a40..029f09e8 100644 --- a/src/abstractions/state.service.ts +++ b/src/abstractions/state.service.ts @@ -1,5 +1,5 @@ -import { StateService as BaseStateServiceAbstraction } from "jslib-common/abstractions/state.service"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; +import { StateService as BaseStateServiceAbstraction } from "@/jslib/common/src/abstractions/state.service"; +import { StorageOptions } from "@/jslib/common/src/models/domain/storageOptions"; import { DirectoryType } from "src/enums/directoryType"; import { Account } from "src/models/account"; diff --git a/src/app/accounts/apiKey.component.ts b/src/app/accounts/apiKey.component.ts index dd6cd63b..21ae191d 100644 --- a/src/app/accounts/apiKey.component.ts +++ b/src/app/accounts/apiKey.component.ts @@ -1,13 +1,13 @@ import { Component, Input, ViewChild, ViewContainerRef } from "@angular/core"; import { Router } from "@angular/router"; -import { ModalService } from "jslib-angular/services/modal.service"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; -import { Utils } from "jslib-common/misc/utils"; -import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials"; +import { ModalService } from "@/jslib/angular/src/services/modal.service"; +import { AuthService } from "@/jslib/common/src/abstractions/auth.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { ApiLogInCredentials } from "@/jslib/common/src/models/domain/logInCredentials"; import { StateService } from "../../abstractions/state.service"; diff --git a/src/app/accounts/environment.component.ts b/src/app/accounts/environment.component.ts index b316818e..c45942ab 100644 --- a/src/app/accounts/environment.component.ts +++ b/src/app/accounts/environment.component.ts @@ -1,9 +1,9 @@ import { Component } from "@angular/core"; -import { EnvironmentComponent as BaseEnvironmentComponent } from "jslib-angular/components/environment.component"; -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 { EnvironmentComponent as BaseEnvironmentComponent } from "@/jslib/angular/src/components/environment.component"; +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"; @Component({ selector: "app-environment", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index ebbca57a..12201f4d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,13 +10,13 @@ import { DomSanitizer } from "@angular/platform-browser"; import { Router } from "@angular/router"; import { IndividualConfig, ToastrService } from "ngx-toastr"; -import { AuthService } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { I18nService } from "jslib-common/abstractions/i18n.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 { TokenService } from "jslib-common/abstractions/token.service"; +import { AuthService } from "@/jslib/common/src/abstractions/auth.service"; +import { BroadcasterService } from "@/jslib/common/src/abstractions/broadcaster.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.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 { TokenService } from "@/jslib/common/src/abstractions/token.service"; import { StateService } from "../abstractions/state.service"; import { SyncService } from "../services/sync.service"; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 15fad975..c22a6d00 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -6,19 +6,19 @@ import { FormsModule } from "@angular/forms"; import { BrowserModule } from "@angular/platform-browser"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { CalloutComponent } from "jslib-angular/components/callout.component"; -import { IconComponent } from "jslib-angular/components/icon.component"; -import { BitwardenToastModule } from "jslib-angular/components/toastr.component"; -import { A11yTitleDirective } from "jslib-angular/directives/a11y-title.directive"; -import { ApiActionDirective } from "jslib-angular/directives/api-action.directive"; -import { AutofocusDirective } from "jslib-angular/directives/autofocus.directive"; -import { BlurClickDirective } from "jslib-angular/directives/blur-click.directive"; -import { BoxRowDirective } from "jslib-angular/directives/box-row.directive"; -import { FallbackSrcDirective } from "jslib-angular/directives/fallback-src.directive"; -import { StopClickDirective } from "jslib-angular/directives/stop-click.directive"; -import { StopPropDirective } from "jslib-angular/directives/stop-prop.directive"; -import { I18nPipe } from "jslib-angular/pipes/i18n.pipe"; -import { SearchCiphersPipe } from "jslib-angular/pipes/search-ciphers.pipe"; +import { CalloutComponent } from "@/jslib/angular/src/components/callout.component"; +import { IconComponent } from "@/jslib/angular/src/components/icon.component"; +import { BitwardenToastModule } from "@/jslib/angular/src/components/toastr.component"; +import { A11yTitleDirective } from "@/jslib/angular/src/directives/a11y-title.directive"; +import { ApiActionDirective } from "@/jslib/angular/src/directives/api-action.directive"; +import { AutofocusDirective } from "@/jslib/angular/src/directives/autofocus.directive"; +import { BlurClickDirective } from "@/jslib/angular/src/directives/blur-click.directive"; +import { BoxRowDirective } from "@/jslib/angular/src/directives/box-row.directive"; +import { FallbackSrcDirective } from "@/jslib/angular/src/directives/fallback-src.directive"; +import { StopClickDirective } from "@/jslib/angular/src/directives/stop-click.directive"; +import { StopPropDirective } from "@/jslib/angular/src/directives/stop-prop.directive"; +import { I18nPipe } from "@/jslib/angular/src/pipes/i18n.pipe"; +import { SearchCiphersPipe } from "@/jslib/angular/src/pipes/search-ciphers.pipe"; import { ApiKeyComponent } from "./accounts/apiKey.component"; import { EnvironmentComponent } from "./accounts/environment.component"; diff --git a/src/app/main.ts b/src/app/main.ts index d3075155..985222bb 100644 --- a/src/app/main.ts +++ b/src/app/main.ts @@ -1,7 +1,7 @@ import { enableProdMode } from "@angular/core"; import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"; -import { isDev } from "jslib-electron/utils"; +import { isDev } from "@/jslib/electron/src/utils"; // tslint:disable-next-line require("../scss/styles.scss"); diff --git a/src/app/services/auth-guard.service.ts b/src/app/services/auth-guard.service.ts index 367cd286..402e3149 100644 --- a/src/app/services/auth-guard.service.ts +++ b/src/app/services/auth-guard.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { CanActivate } from "@angular/router"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; +import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service"; import { StateService } from "../../abstractions/state.service"; diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index db41029b..d8449b08 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -1,32 +1,32 @@ import { APP_INITIALIZER, NgModule } from "@angular/core"; -import { JslibServicesModule } from "jslib-angular/services/jslib-services.module"; -import { ApiService as ApiServiceAbstraction } from "jslib-common/abstractions/api.service"; -import { AppIdService as AppIdServiceAbstraction } from "jslib-common/abstractions/appId.service"; -import { AuthService as AuthServiceAbstraction } from "jslib-common/abstractions/auth.service"; -import { BroadcasterService as BroadcasterServiceAbstraction } from "jslib-common/abstractions/broadcaster.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 { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service"; -import { KeyConnectorService as KeyConnectorServiceAbstraction } from "jslib-common/abstractions/keyConnector.service"; -import { LogService as LogServiceAbstraction } from "jslib-common/abstractions/log.service"; -import { MessagingService as MessagingServiceAbstraction } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service"; -import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service"; -import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service"; -import { TokenService as TokenServiceAbstraction } from "jslib-common/abstractions/token.service"; -import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { ContainerService } from "jslib-common/services/container.service"; -import { ElectronLogService } from "jslib-electron/services/electronLog.service"; -import { ElectronPlatformUtilsService } from "jslib-electron/services/electronPlatformUtils.service"; -import { ElectronRendererMessagingService } from "jslib-electron/services/electronRendererMessaging.service"; -import { ElectronRendererSecureStorageService } from "jslib-electron/services/electronRendererSecureStorage.service"; -import { ElectronRendererStorageService } from "jslib-electron/services/electronRendererStorage.service"; -import { NodeApiService } from "jslib-node/services/nodeApi.service"; -import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service"; +import { JslibServicesModule } from "@/jslib/angular/src/services/jslib-services.module"; +import { ApiService as ApiServiceAbstraction } from "@/jslib/common/src/abstractions/api.service"; +import { AppIdService as AppIdServiceAbstraction } from "@/jslib/common/src/abstractions/appId.service"; +import { AuthService as AuthServiceAbstraction } from "@/jslib/common/src/abstractions/auth.service"; +import { BroadcasterService as BroadcasterServiceAbstraction } from "@/jslib/common/src/abstractions/broadcaster.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 { I18nService as I18nServiceAbstraction } from "@/jslib/common/src/abstractions/i18n.service"; +import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@/jslib/common/src/abstractions/keyConnector.service"; +import { LogService as LogServiceAbstraction } from "@/jslib/common/src/abstractions/log.service"; +import { MessagingService as MessagingServiceAbstraction } from "@/jslib/common/src/abstractions/messaging.service"; +import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@/jslib/common/src/abstractions/platformUtils.service"; +import { StateMigrationService as StateMigrationServiceAbstraction } from "@/jslib/common/src/abstractions/stateMigration.service"; +import { StorageService as StorageServiceAbstraction } from "@/jslib/common/src/abstractions/storage.service"; +import { TokenService as TokenServiceAbstraction } from "@/jslib/common/src/abstractions/token.service"; +import { TwoFactorService as TwoFactorServiceAbstraction } from "@/jslib/common/src/abstractions/twoFactor.service"; +import { StateFactory } from "@/jslib/common/src/factories/stateFactory"; +import { GlobalState } from "@/jslib/common/src/models/domain/globalState"; +import { ContainerService } from "@/jslib/common/src/services/container.service"; +import { ElectronLogService } from "@/jslib/electron/src/services/electronLog.service"; +import { ElectronPlatformUtilsService } from "@/jslib/electron/src/services/electronPlatformUtils.service"; +import { ElectronRendererMessagingService } from "@/jslib/electron/src/services/electronRendererMessaging.service"; +import { ElectronRendererSecureStorageService } from "@/jslib/electron/src/services/electronRendererSecureStorage.service"; +import { ElectronRendererStorageService } from "@/jslib/electron/src/services/electronRendererStorage.service"; +import { NodeApiService } from "@/jslib/node/src/services/nodeApi.service"; +import { NodeCryptoFunctionService } from "@/jslib/node/src/services/nodeCryptoFunction.service"; import { StateService as StateServiceAbstraction } from "../../abstractions/state.service"; import { Account } from "../../models/account"; diff --git a/src/app/tabs/dashboard.component.ts b/src/app/tabs/dashboard.component.ts index 46e8d62f..c0ef2f51 100644 --- a/src/app/tabs/dashboard.component.ts +++ b/src/app/tabs/dashboard.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angular/core"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { BroadcasterService } from "@/jslib/common/src/abstractions/broadcaster.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; import { GroupEntry } from "../../models/groupEntry"; diff --git a/src/app/tabs/more.component.ts b/src/app/tabs/more.component.ts index 198638bd..ef781c46 100644 --- a/src/app/tabs/more.component.ts +++ b/src/app/tabs/more.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectorRef, Component, NgZone, OnInit } from "@angular/core"; -import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service"; +import { BroadcasterService } from "@/jslib/common/src/abstractions/broadcaster.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service"; +import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; diff --git a/src/app/tabs/settings.component.ts b/src/app/tabs/settings.component.ts index 5e1ccefa..76b94480 100644 --- a/src/app/tabs/settings.component.ts +++ b/src/app/tabs/settings.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angular/core"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; import { StateService } from "../../abstractions/state.service"; import { DirectoryType } from "../../enums/directoryType"; diff --git a/src/bwdc.ts b/src/bwdc.ts index 35a8189e..c8232819 100644 --- a/src/bwdc.ts +++ b/src/bwdc.ts @@ -1,34 +1,34 @@ import * as fs from "fs"; import * as path from "path"; -import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service"; -import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service"; -import { ClientType } from "jslib-common/enums/clientType"; -import { LogLevelType } from "jslib-common/enums/logLevelType"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { AppIdService } from "jslib-common/services/appId.service"; -import { CipherService } from "jslib-common/services/cipher.service"; -import { CollectionService } from "jslib-common/services/collection.service"; -import { ContainerService } from "jslib-common/services/container.service"; -import { CryptoService } from "jslib-common/services/crypto.service"; -import { EnvironmentService } from "jslib-common/services/environment.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 { NoopMessagingService } from "jslib-common/services/noopMessaging.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 { TokenService } from "jslib-common/services/token.service"; -import { CliPlatformUtilsService } from "jslib-node/cli/services/cliPlatformUtils.service"; -import { ConsoleLogService } from "jslib-node/cli/services/consoleLog.service"; -import { NodeApiService } from "jslib-node/services/nodeApi.service"; -import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service"; +import { StorageService as StorageServiceAbstraction } from "@/jslib/common/src/abstractions/storage.service"; +import { TwoFactorService as TwoFactorServiceAbstraction } from "@/jslib/common/src/abstractions/twoFactor.service"; +import { ClientType } from "@/jslib/common/src/enums/clientType"; +import { LogLevelType } from "@/jslib/common/src/enums/logLevelType"; +import { StateFactory } from "@/jslib/common/src/factories/stateFactory"; +import { GlobalState } from "@/jslib/common/src/models/domain/globalState"; +import { AppIdService } from "@/jslib/common/src/services/appId.service"; +import { CipherService } from "@/jslib/common/src/services/cipher.service"; +import { CollectionService } from "@/jslib/common/src/services/collection.service"; +import { ContainerService } from "@/jslib/common/src/services/container.service"; +import { CryptoService } from "@/jslib/common/src/services/crypto.service"; +import { EnvironmentService } from "@/jslib/common/src/services/environment.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 { NoopMessagingService } from "@/jslib/common/src/services/noopMessaging.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 { TokenService } from "@/jslib/common/src/services/token.service"; +import { CliPlatformUtilsService } from "@/jslib/node/src/cli/services/cliPlatformUtils.service"; +import { ConsoleLogService } from "@/jslib/node/src/cli/services/consoleLog.service"; +import { NodeApiService } from "@/jslib/node/src/services/nodeApi.service"; +import { NodeCryptoFunctionService } from "@/jslib/node/src/services/nodeCryptoFunction.service"; import { Account } from "./models/account"; import { Program } from "./program"; diff --git a/src/commands/clearCache.command.ts b/src/commands/clearCache.command.ts index a5fd35bd..e629e8ab 100644 --- a/src/commands/clearCache.command.ts +++ b/src/commands/clearCache.command.ts @@ -1,8 +1,8 @@ import * as program from "commander"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { Response } from "@/jslib/node/src/cli/models/response"; +import { MessageResponse } from "@/jslib/node/src/cli/models/response/messageResponse"; import { StateService } from "../abstractions/state.service"; diff --git a/src/commands/config.command.ts b/src/commands/config.command.ts index d3e4d64c..fdf6ba67 100644 --- a/src/commands/config.command.ts +++ b/src/commands/config.command.ts @@ -1,10 +1,10 @@ import * as program from "commander"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { NodeUtils } from "jslib-common/misc/nodeUtils"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { EnvironmentService } from "@/jslib/common/src/abstractions/environment.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { NodeUtils } from "@/jslib/common/src/misc/nodeUtils"; +import { Response } from "@/jslib/node/src/cli/models/response"; +import { MessageResponse } from "@/jslib/node/src/cli/models/response/messageResponse"; import { StateService } from "../abstractions/state.service"; import { DirectoryType } from "../enums/directoryType"; diff --git a/src/commands/lastSync.command.ts b/src/commands/lastSync.command.ts index 9d03fd2b..b969f8cf 100644 --- a/src/commands/lastSync.command.ts +++ b/src/commands/lastSync.command.ts @@ -1,5 +1,5 @@ -import { Response } from "jslib-node/cli/models/response"; -import { StringResponse } from "jslib-node/cli/models/response/stringResponse"; +import { Response } from "@/jslib/node/src/cli/models/response"; +import { StringResponse } from "@/jslib/node/src/cli/models/response/stringResponse"; import { StateService } from "../abstractions/state.service"; diff --git a/src/commands/sync.command.ts b/src/commands/sync.command.ts index 27d18980..8ef70587 100644 --- a/src/commands/sync.command.ts +++ b/src/commands/sync.command.ts @@ -1,6 +1,6 @@ -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { Response } from "jslib-node/cli/models/response"; -import { MessageResponse } from "jslib-node/cli/models/response/messageResponse"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { Response } from "@/jslib/node/src/cli/models/response"; +import { MessageResponse } from "@/jslib/node/src/cli/models/response/messageResponse"; import { SyncService } from "../services/sync.service"; diff --git a/src/commands/test.command.ts b/src/commands/test.command.ts index 7a8bb06c..0f1a5d19 100644 --- a/src/commands/test.command.ts +++ b/src/commands/test.command.ts @@ -1,7 +1,7 @@ import * as program from "commander"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { Response } from "jslib-node/cli/models/response"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { Response } from "@/jslib/node/src/cli/models/response"; import { TestResponse } from "../models/response/testResponse"; import { SyncService } from "../services/sync.service"; diff --git a/src/main.ts b/src/main.ts index 4e24d67b..715be018 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,14 +2,14 @@ import * as path from "path"; import { app } from "electron"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { ElectronLogService } from "jslib-electron/services/electronLog.service"; -import { ElectronMainMessagingService } from "jslib-electron/services/electronMainMessaging.service"; -import { ElectronStorageService } from "jslib-electron/services/electronStorage.service"; -import { TrayMain } from "jslib-electron/tray.main"; -import { UpdaterMain } from "jslib-electron/updater.main"; -import { WindowMain } from "jslib-electron/window.main"; +import { StateFactory } from "@/jslib/common/src/factories/stateFactory"; +import { GlobalState } from "@/jslib/common/src/models/domain/globalState"; +import { ElectronLogService } from "@/jslib/electron/src/services/electronLog.service"; +import { ElectronMainMessagingService } from "@/jslib/electron/src/services/electronMainMessaging.service"; +import { ElectronStorageService } from "@/jslib/electron/src/services/electronStorage.service"; +import { TrayMain } from "@/jslib/electron/src/tray.main"; +import { UpdaterMain } from "@/jslib/electron/src/updater.main"; +import { WindowMain } from "@/jslib/electron/src/window.main"; import { DCCredentialStorageListener } from "./main/credential-storage-listener"; import { MenuMain } from "./main/menu.main"; diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts index 268728ea..b1a7e328 100644 --- a/src/main/menu.main.ts +++ b/src/main/menu.main.ts @@ -1,6 +1,6 @@ import { Menu, MenuItemConstructorOptions } from "electron"; -import { BaseMenu } from "jslib-electron/baseMenu"; +import { BaseMenu } from "@/jslib/electron/src/baseMenu"; import { Main } from "../main"; diff --git a/src/main/messaging.main.ts b/src/main/messaging.main.ts index 4db5f68a..79fc987a 100644 --- a/src/main/messaging.main.ts +++ b/src/main/messaging.main.ts @@ -1,8 +1,8 @@ import { ipcMain } from "electron"; -import { TrayMain } from "jslib-electron/tray.main"; -import { UpdaterMain } from "jslib-electron/updater.main"; -import { WindowMain } from "jslib-electron/window.main"; +import { TrayMain } from "@/jslib/electron/src/tray.main"; +import { UpdaterMain } from "@/jslib/electron/src/updater.main"; +import { WindowMain } from "@/jslib/electron/src/window.main"; import { MenuMain } from "./menu.main"; diff --git a/src/misc/logInStrategies/organizationLogIn.strategy.ts b/src/misc/logInStrategies/organizationLogIn.strategy.ts index e242e1a3..9e9e69ed 100644 --- a/src/misc/logInStrategies/organizationLogIn.strategy.ts +++ b/src/misc/logInStrategies/organizationLogIn.strategy.ts @@ -1,9 +1,13 @@ -import { LogInStrategy } from "jslib-common/misc/logInStrategies/logIn.strategy"; -import { AccountKeys, AccountProfile, AccountTokens } from "jslib-common/models/domain/account"; -import { AuthResult } from "jslib-common/models/domain/authResult"; -import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials"; -import { ApiTokenRequest } from "jslib-common/models/request/identityToken/apiTokenRequest"; -import { IdentityTokenResponse } from "jslib-common/models/response/identityTokenResponse"; +import { LogInStrategy } from "@/jslib/common/src/misc/logInStrategies/logIn.strategy"; +import { + AccountKeys, + AccountProfile, + AccountTokens, +} from "@/jslib/common/src/models/domain/account"; +import { AuthResult } from "@/jslib/common/src/models/domain/authResult"; +import { ApiLogInCredentials } from "@/jslib/common/src/models/domain/logInCredentials"; +import { ApiTokenRequest } from "@/jslib/common/src/models/request/identityToken/apiTokenRequest"; +import { IdentityTokenResponse } from "@/jslib/common/src/models/response/identityTokenResponse"; import { Account, DirectoryConfigurations, DirectorySettings } from "src/models/account"; diff --git a/src/models/account.ts b/src/models/account.ts index c80e687d..6d973973 100644 --- a/src/models/account.ts +++ b/src/models/account.ts @@ -1,4 +1,4 @@ -import { Account as BaseAccount } from "jslib-common/models/domain/account"; +import { Account as BaseAccount } from "@/jslib/common/src/models/domain/account"; import { DirectoryType } from "src/enums/directoryType"; diff --git a/src/models/response/testResponse.ts b/src/models/response/testResponse.ts index 6c7f1d14..0e4f722b 100644 --- a/src/models/response/testResponse.ts +++ b/src/models/response/testResponse.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "jslib-node/cli/models/response/baseResponse"; +import { BaseResponse } from "@/jslib/node/src/cli/models/response/baseResponse"; import { SimResult } from "../simResult"; diff --git a/src/program.ts b/src/program.ts index 2c9ebcfb..24e89fb4 100644 --- a/src/program.ts +++ b/src/program.ts @@ -3,13 +3,13 @@ import * as path from "path"; import * as chalk from "chalk"; import * as program from "commander"; -import { Utils } from "jslib-common/misc/utils"; -import { BaseProgram } from "jslib-node/cli/baseProgram"; -import { LoginCommand } from "jslib-node/cli/commands/login.command"; -import { LogoutCommand } from "jslib-node/cli/commands/logout.command"; -import { UpdateCommand } from "jslib-node/cli/commands/update.command"; -import { Response } from "jslib-node/cli/models/response"; -import { StringResponse } from "jslib-node/cli/models/response/stringResponse"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { BaseProgram } from "@/jslib/node/src/cli/baseProgram"; +import { LoginCommand } from "@/jslib/node/src/cli/commands/login.command"; +import { LogoutCommand } from "@/jslib/node/src/cli/commands/logout.command"; +import { UpdateCommand } from "@/jslib/node/src/cli/commands/update.command"; +import { Response } from "@/jslib/node/src/cli/models/response"; +import { StringResponse } from "@/jslib/node/src/cli/models/response/stringResponse"; import { Main } from "./bwdc"; import { ClearCacheCommand } from "./commands/clearCache.command"; diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts index 54f81b52..6c34dfd4 100644 --- a/src/services/auth.service.ts +++ b/src/services/auth.service.ts @@ -1,17 +1,17 @@ -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 { I18nService } from "jslib-common/abstractions/i18n.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 { TokenService } from "jslib-common/abstractions/token.service"; -import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; -import { AuthResult } from "jslib-common/models/domain/authResult"; -import { ApiLogInCredentials } from "jslib-common/models/domain/logInCredentials"; -import { AuthService as AuthServiceBase } from "jslib-common/services/auth.service"; +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 { I18nService } from "@/jslib/common/src/abstractions/i18n.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 { TokenService } from "@/jslib/common/src/abstractions/token.service"; +import { TwoFactorService } from "@/jslib/common/src/abstractions/twoFactor.service"; +import { AuthResult } from "@/jslib/common/src/models/domain/authResult"; +import { ApiLogInCredentials } from "@/jslib/common/src/models/domain/logInCredentials"; +import { AuthService as AuthServiceBase } from "@/jslib/common/src/services/auth.service"; import { StateService } from "../abstractions/state.service"; import { OrganizationLogInStrategy } from "../misc/logInStrategies/organizationLogIn.strategy"; diff --git a/src/services/azure-directory.service.ts b/src/services/azure-directory.service.ts index 4a278296..cb83a804 100644 --- a/src/services/azure-directory.service.ts +++ b/src/services/azure-directory.service.ts @@ -4,8 +4,8 @@ import * as querystring from "querystring"; import * as graph from "@microsoft/microsoft-graph-client"; import * as graphType from "@microsoft/microsoft-graph-types"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; import { StateService } from "../abstractions/state.service"; import { DirectoryType } from "../enums/directoryType"; diff --git a/src/services/gsuite-directory.service.ts b/src/services/gsuite-directory.service.ts index 895c657b..2c43d4dc 100644 --- a/src/services/gsuite-directory.service.ts +++ b/src/services/gsuite-directory.service.ts @@ -1,8 +1,8 @@ import { JWT } from "google-auth-library"; import { admin_directory_v1, google } from "googleapis"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; import { StateService } from "../abstractions/state.service"; import { DirectoryType } from "../enums/directoryType"; diff --git a/src/services/i18n.service.ts b/src/services/i18n.service.ts index ed89d73c..1a8027e2 100644 --- a/src/services/i18n.service.ts +++ b/src/services/i18n.service.ts @@ -1,7 +1,7 @@ import * as fs from "fs"; import * as path from "path"; -import { I18nService as BaseI18nService } from "jslib-common/services/i18n.service"; +import { I18nService as BaseI18nService } from "@/jslib/common/src/services/i18n.service"; export class I18nService extends BaseI18nService { constructor(systemLanguage: string, localesDirectory: string) { diff --git a/src/services/keytarSecureStorage.service.ts b/src/services/keytarSecureStorage.service.ts index be06aa49..f3046456 100644 --- a/src/services/keytarSecureStorage.service.ts +++ b/src/services/keytarSecureStorage.service.ts @@ -1,6 +1,6 @@ import { deletePassword, getPassword, setPassword } from "keytar"; -import { StorageService } from "jslib-common/abstractions/storage.service"; +import { StorageService } from "@/jslib/common/src/abstractions/storage.service"; export class KeytarSecureStorageService implements StorageService { constructor(private serviceName: string) {} diff --git a/src/services/ldap-directory.service.ts b/src/services/ldap-directory.service.ts index e5b4b993..266ef7fd 100644 --- a/src/services/ldap-directory.service.ts +++ b/src/services/ldap-directory.service.ts @@ -3,9 +3,9 @@ import { checkServerIdentity, PeerCertificate } from "tls"; import * as ldap from "ldapjs"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { Utils } from "jslib-common/misc/utils"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { Utils } from "@/jslib/common/src/misc/utils"; import { StateService } from "../abstractions/state.service"; import { DirectoryType } from "../enums/directoryType"; diff --git a/src/services/lowdbStorage.service.ts b/src/services/lowdbStorage.service.ts index c0f47f7b..6c0f0d4e 100644 --- a/src/services/lowdbStorage.service.ts +++ b/src/services/lowdbStorage.service.ts @@ -1,8 +1,8 @@ import * as lock from "proper-lockfile"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { Utils } from "jslib-common/misc/utils"; -import { LowdbStorageService as LowdbStorageServiceBase } from "jslib-node/services/lowdbStorage.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { LowdbStorageService as LowdbStorageServiceBase } from "@/jslib/node/src/services/lowdbStorage.service"; export class LowdbStorageService extends LowdbStorageServiceBase { constructor( diff --git a/src/services/noop/noopTwoFactor.service.ts b/src/services/noop/noopTwoFactor.service.ts index 827c4cfb..5e9910b9 100644 --- a/src/services/noop/noopTwoFactor.service.ts +++ b/src/services/noop/noopTwoFactor.service.ts @@ -1,9 +1,9 @@ import { TwoFactorProviderDetails, TwoFactorService, -} from "jslib-common/abstractions/twoFactor.service"; -import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { IdentityTwoFactorResponse } from "jslib-common/models/response/identityTwoFactorResponse"; +} from "@/jslib/common/src/abstractions/twoFactor.service"; +import { TwoFactorProviderType } from "@/jslib/common/src/enums/twoFactorProviderType"; +import { IdentityTwoFactorResponse } from "@/jslib/common/src/models/response/identityTwoFactorResponse"; export class NoopTwoFactorService implements TwoFactorService { init() { diff --git a/src/services/okta-directory.service.ts b/src/services/okta-directory.service.ts index d1e64245..54031080 100644 --- a/src/services/okta-directory.service.ts +++ b/src/services/okta-directory.service.ts @@ -1,7 +1,7 @@ import * as https from "https"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; import { StateService } from "../abstractions/state.service"; import { DirectoryType } from "../enums/directoryType"; diff --git a/src/services/onelogin-directory.service.ts b/src/services/onelogin-directory.service.ts index f6386841..285ca403 100644 --- a/src/services/onelogin-directory.service.ts +++ b/src/services/onelogin-directory.service.ts @@ -1,5 +1,5 @@ -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; import { StateService } from "../abstractions/state.service"; import { DirectoryType } from "../enums/directoryType"; diff --git a/src/services/state.service.ts b/src/services/state.service.ts index 808a5c1d..2fe85971 100644 --- a/src/services/state.service.ts +++ b/src/services/state.service.ts @@ -1,11 +1,11 @@ -import { LogService } from "jslib-common/abstractions/log.service"; -import { StateMigrationService } from "jslib-common/abstractions/stateMigration.service"; -import { StorageService } from "jslib-common/abstractions/storage.service"; -import { StateFactory } from "jslib-common/factories/stateFactory"; -import { EnvironmentUrls } from "jslib-common/models/domain/environmentUrls"; -import { GlobalState } from "jslib-common/models/domain/globalState"; -import { StorageOptions } from "jslib-common/models/domain/storageOptions"; -import { StateService as BaseStateService } from "jslib-common/services/state.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { StateMigrationService } from "@/jslib/common/src/abstractions/stateMigration.service"; +import { StorageService } from "@/jslib/common/src/abstractions/storage.service"; +import { StateFactory } from "@/jslib/common/src/factories/stateFactory"; +import { EnvironmentUrls } from "@/jslib/common/src/models/domain/environmentUrls"; +import { GlobalState } from "@/jslib/common/src/models/domain/globalState"; +import { StorageOptions } from "@/jslib/common/src/models/domain/storageOptions"; +import { StateService as BaseStateService } from "@/jslib/common/src/services/state.service"; import { StateService as StateServiceAbstraction } from "src/abstractions/state.service"; import { DirectoryType } from "src/enums/directoryType"; diff --git a/src/services/stateMigration.service.ts b/src/services/stateMigration.service.ts index 57ace6e6..ad549c21 100644 --- a/src/services/stateMigration.service.ts +++ b/src/services/stateMigration.service.ts @@ -1,5 +1,5 @@ -import { StateVersion } from "jslib-common/enums/stateVersion"; -import { StateMigrationService as BaseStateMigrationService } from "jslib-common/services/stateMigration.service"; +import { StateVersion } from "@/jslib/common/src/enums/stateVersion"; +import { StateMigrationService as BaseStateMigrationService } from "@/jslib/common/src/services/stateMigration.service"; import { DirectoryType } from "src/enums/directoryType"; import { Account, DirectoryConfigurations, DirectorySettings } from "src/models/account"; diff --git a/src/services/sync.service.ts b/src/services/sync.service.ts index e9128cde..c37bc06c 100644 --- a/src/services/sync.service.ts +++ b/src/services/sync.service.ts @@ -1,11 +1,11 @@ -import { ApiService } from "jslib-common/abstractions/api.service"; -import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "jslib-common/abstractions/environment.service"; -import { I18nService } from "jslib-common/abstractions/i18n.service"; -import { LogService } from "jslib-common/abstractions/log.service"; -import { MessagingService } from "jslib-common/abstractions/messaging.service"; -import { Utils } from "jslib-common/misc/utils"; -import { OrganizationImportRequest } from "jslib-common/models/request/organizationImportRequest"; +import { ApiService } from "@/jslib/common/src/abstractions/api.service"; +import { CryptoFunctionService } from "@/jslib/common/src/abstractions/cryptoFunction.service"; +import { EnvironmentService } from "@/jslib/common/src/abstractions/environment.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; +import { LogService } from "@/jslib/common/src/abstractions/log.service"; +import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service"; +import { Utils } from "@/jslib/common/src/misc/utils"; +import { OrganizationImportRequest } from "@/jslib/common/src/models/request/organizationImportRequest"; import { StateService } from "../abstractions/state.service"; import { DirectoryType } from "../enums/directoryType"; diff --git a/src/utils.ts b/src/utils.ts index afb5ec6f..8be3949a 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,4 +1,4 @@ -import { I18nService } from "jslib-common/abstractions/i18n.service"; +import { I18nService } from "@/jslib/common/src/abstractions/i18n.service"; import { Entry } from "./models/entry"; import { LdapConfiguration } from "./models/ldapConfiguration"; diff --git a/tsconfig.json b/tsconfig.json index c6d89d54..e69224ee 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,12 +19,8 @@ "baseUrl": ".", "resolveJsonModule": true, "paths": { - "tldjs": ["jslib/src/misc/tldjs.noop"], - "jslib-common/*": ["./jslib/common/src/*"], - "jslib-common-spec/*": ["./jslib/common/spec/*"], - "jslib-angular/*": ["./jslib/angular/src/*"], - "jslib-electron/*": ["./jslib/electron/src/*"], - "jslib-node/*": ["./jslib/node/src/*"] + "tldjs": ["@/jslib/src/misc/tldjs.noop"], + "@/*": ["./*"] }, "useDefineForClassFields": false },