bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

Add jslib as a "real" dependency (#321)

Browse Source 
* Split jslib

* Bump jslib

* Bump jslib, replace alias with tsconfig-paths-webpack-plugin
This commit is contained in:
Oscar Hinton
2021-06-07 19:25:55 +02:00
committed by GitHub
parent 3539d490d5
commit 477066118e
53 changed files with 1313 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: dddcc2bc93...1016bbfb9e

1191
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

29
package.json
View File

@@ -49,21 +49,14 @@
"assets": "./build/**/*" "assets": "./build/**/*"
}, },
"devDependencies": { "devDependencies": {
"@types/inquirer": "^7.3.1",
"@types/jsdom": "^16.2.10", "@types/jsdom": "^16.2.10",
"@types/lowdb": "^1.0.9", "@types/node": "^14.17.1",
"@types/lunr": "^2.3.3",
"@types/node": "^14.14.44",
"@types/node-fetch": "^2.5.10",
"@types/node-forge": "^0.9.7",
"@types/papaparse": "^5.2.0",
"@types/tldjs": "^2.3.0",
"@types/zxcvbn": "^4.4.1",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.4.0", "copy-webpack-plugin": "^6.4.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"pkg": "^5.1.0", "pkg": "^5.1.0",
"ts-loader": "^8.2.0", "ts-loader": "^8.2.0",
"tsconfig-paths-webpack-plugin": "^3.5.1",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-loader": "^3.5.4", "tslint-loader": "^3.5.4",
"typescript": "4.1.5", "typescript": "4.1.5",
@@ -72,22 +65,14 @@
"webpack-node-externals": "^3.0.0" "webpack-node-externals": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"big-integer": "1.6.48", "@bitwarden/jslib-common": "file:jslib/common",
"browser-hrtime": "^1.1.8", "@bitwarden/jslib-node": "file:jslib/node",
"chalk": "^4.1.1", "commander": "7.2.0",
"commander": "^7.2.0", "form-data": "4.0.0",
"form-data": "^4.0.0",
"https-proxy-agent": "5.0.0",
"inquirer": "8.0.0", "inquirer": "8.0.0",
"jsdom": "^16.5.3", "jsdom": "^16.5.3",
"lowdb": "1.0.0",
"lunr": "^2.3.9",
"node-fetch": "2.6.1",
"node-forge": "0.10.0", "node-forge": "0.10.0",
"open": "^8.0.8", "open": "^8.0.8"
"papaparse": "^5.3.0",
"tldjs": "2.3.1",
"zxcvbn": "4.4.2"
}, },
"engines": { "engines": {
"node": "~14", "node": "~14",

60
src/bw.ts
View File

@@ -3,42 +3,42 @@ import * as fs from 'fs';
import * as jsdom from 'jsdom'; import * as jsdom from 'jsdom';
import * as path from 'path'; import * as path from 'path';
import { LogLevelType } from 'jslib/enums/logLevelType'; import { LogLevelType } from 'jslib-common/enums/logLevelType';
import { AuthService } from 'jslib/services/auth.service'; import { AuthService } from 'jslib-common/services/auth.service';
import { I18nService } from './services/i18n.service'; import { I18nService } from './services/i18n.service';
import { NodeEnvSecureStorageService } from './services/nodeEnvSecureStorage.service'; import { NodeEnvSecureStorageService } from './services/nodeEnvSecureStorage.service';
import { CliPlatformUtilsService } from 'jslib/cli/services/cliPlatformUtils.service'; import { CliPlatformUtilsService } from 'jslib-node/cli/services/cliPlatformUtils.service';
import { ConsoleLogService } from 'jslib/cli/services/consoleLog.service'; import { ConsoleLogService } from 'jslib-node/cli/services/consoleLog.service';
import { AppIdService } from 'jslib/services/appId.service'; import { AppIdService } from 'jslib-common/services/appId.service';
import { AuditService } from 'jslib/services/audit.service'; import { AuditService } from 'jslib-common/services/audit.service';
import { CipherService } from 'jslib/services/cipher.service'; import { CipherService } from 'jslib-common/services/cipher.service';
import { CollectionService } from 'jslib/services/collection.service'; import { CollectionService } from 'jslib-common/services/collection.service';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { ContainerService } from 'jslib/services/container.service'; import { ContainerService } from 'jslib-common/services/container.service';
import { CryptoService } from 'jslib/services/crypto.service'; import { CryptoService } from 'jslib-common/services/crypto.service';
import { EnvironmentService } from 'jslib/services/environment.service'; import { EnvironmentService } from 'jslib-common/services/environment.service';
import { ExportService } from 'jslib/services/export.service'; import { ExportService } from 'jslib-common/services/export.service';
import { FileUploadService } from 'jslib/services/fileUpload.service'; import { FileUploadService } from 'jslib-common/services/fileUpload.service';
import { FolderService } from 'jslib/services/folder.service'; import { FolderService } from 'jslib-common/services/folder.service';
import { ImportService } from 'jslib/services/import.service'; import { ImportService } from 'jslib-common/services/import.service';
import { LowdbStorageService } from 'jslib/services/lowdbStorage.service'; import { NodeCryptoFunctionService } from 'jslib-common/services/nodeCryptoFunction.service';
import { NodeApiService } from 'jslib/services/nodeApi.service'; import { NoopMessagingService } from 'jslib-common/services/noopMessaging.service';
import { NodeCryptoFunctionService } from 'jslib/services/nodeCryptoFunction.service'; import { PasswordGenerationService } from 'jslib-common/services/passwordGeneration.service';
import { NoopMessagingService } from 'jslib/services/noopMessaging.service'; import { PolicyService } from 'jslib-common/services/policy.service';
import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service'; import { SearchService } from 'jslib-common/services/search.service';
import { PolicyService } from 'jslib/services/policy.service'; import { SendService } from 'jslib-common/services/send.service';
import { SearchService } from 'jslib/services/search.service'; import { SettingsService } from 'jslib-common/services/settings.service';
import { SendService } from 'jslib/services/send.service'; import { SyncService } from 'jslib-common/services/sync.service';
import { SettingsService } from 'jslib/services/settings.service'; import { TokenService } from 'jslib-common/services/token.service';
import { SyncService } from 'jslib/services/sync.service'; import { TotpService } from 'jslib-common/services/totp.service';
import { TokenService } from 'jslib/services/token.service'; import { UserService } from 'jslib-common/services/user.service';
import { TotpService } from 'jslib/services/totp.service'; import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service';
import { UserService } from 'jslib/services/user.service'; import { LowdbStorageService } from 'jslib-node/services/lowdbStorage.service';
import { VaultTimeoutService } from 'jslib/services/vaultTimeout.service'; import { NodeApiService } from 'jslib-node/services/nodeApi.service';
import { Program } from './program'; import { Program } from './program';
import { SendProgram } from './send.program'; import { SendProgram } from './send.program';

4
src/commands/completion.command.ts
View File

@@ -1,7 +1,7 @@
import * as program from 'commander'; import * as program from 'commander';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
interface IOption { interface IOption {
long?: string; long?: string;

8
src/commands/config.command.ts
View File

@@ -1,10 +1,10 @@
import * as program from 'commander'; import * as program from 'commander';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
import { StringResponse } from 'jslib/cli/models/response/stringResponse'; import { StringResponse } from 'jslib-node/cli/models/response/stringResponse';
export class ConfigCommand { export class ConfigCommand {
constructor(private environmentService: EnvironmentService) { } constructor(private environmentService: EnvironmentService) { }

10
src/commands/confirm.command.ts
View File

@@ -1,13 +1,13 @@
import * as program from 'commander'; import * as program from 'commander';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { OrganizationUserConfirmRequest } from 'jslib/models/request/organizationUserConfirmRequest'; import { OrganizationUserConfirmRequest } from 'jslib-common/models/request/organizationUserConfirmRequest';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class ConfirmCommand { export class ConfirmCommand {
constructor(private apiService: ApiService, private cryptoService: CryptoService) { } constructor(private apiService: ApiService, private cryptoService: CryptoService) { }

24
src/commands/create.command.ts
View File

@@ -2,20 +2,20 @@ import * as program from 'commander';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { Cipher } from 'jslib/models/export/cipher'; import { Cipher } from 'jslib-common/models/export/cipher';
import { Collection } from 'jslib/models/export/collection'; import { Collection } from 'jslib-common/models/export/collection';
import { Folder } from 'jslib/models/export/folder'; import { Folder } from 'jslib-common/models/export/folder';
import { CollectionRequest } from 'jslib/models/request/collectionRequest'; import { CollectionRequest } from 'jslib-common/models/request/collectionRequest';
import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; import { SelectionReadOnlyRequest } from 'jslib-common/models/request/selectionReadOnlyRequest';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { CipherResponse } from '../models/response/cipherResponse'; import { CipherResponse } from '../models/response/cipherResponse';
import { FolderResponse } from '../models/response/folderResponse'; import { FolderResponse } from '../models/response/folderResponse';
@@ -25,7 +25,7 @@ import { OrganizationCollectionRequest } from '../models/request/organizationCol
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class CreateCommand { export class CreateCommand {
constructor(private cipherService: CipherService, private folderService: FolderService, constructor(private cipherService: CipherService, private folderService: FolderService,

12
src/commands/delete.command.ts
View File

@@ -1,13 +1,13 @@
import * as program from 'commander'; import * as program from 'commander';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class DeleteCommand { export class DeleteCommand {
constructor(private cipherService: CipherService, private folderService: FolderService, constructor(private cipherService: CipherService, private folderService: FolderService,

6
src/commands/download.command.ts
View File

@@ -1,10 +1,10 @@
import * as fet from 'node-fetch'; import * as fet from 'node-fetch';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';

22
src/commands/edit.command.ts
View File

@@ -1,18 +1,18 @@
import * as program from 'commander'; import * as program from 'commander';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { Cipher } from 'jslib/models/export/cipher'; import { Cipher } from 'jslib-common/models/export/cipher';
import { Collection } from 'jslib/models/export/collection'; import { Collection } from 'jslib-common/models/export/collection';
import { Folder } from 'jslib/models/export/folder'; import { Folder } from 'jslib-common/models/export/folder';
import { CollectionRequest } from 'jslib/models/request/collectionRequest'; import { CollectionRequest } from 'jslib-common/models/request/collectionRequest';
import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; import { SelectionReadOnlyRequest } from 'jslib-common/models/request/selectionReadOnlyRequest';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { CipherResponse } from '../models/response/cipherResponse'; import { CipherResponse } from '../models/response/cipherResponse';
import { FolderResponse } from '../models/response/folderResponse'; import { FolderResponse } from '../models/response/folderResponse';
@@ -22,7 +22,7 @@ import { OrganizationCollectionRequest } from '../models/request/organizationCol
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class EditCommand { export class EditCommand {
constructor(private cipherService: CipherService, private folderService: FolderService, constructor(private cipherService: CipherService, private folderService: FolderService,

4
src/commands/encode.command.ts
View File

@@ -1,7 +1,7 @@
import * as program from 'commander'; import * as program from 'commander';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { StringResponse } from 'jslib/cli/models/response/stringResponse'; import { StringResponse } from 'jslib-node/cli/models/response/stringResponse';
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';

8
src/commands/export.command.ts
View File

@@ -1,14 +1,14 @@
import * as program from 'commander'; import * as program from 'commander';
import * as inquirer from 'inquirer'; import * as inquirer from 'inquirer';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { ExportService } from 'jslib/abstractions/export.service'; import { ExportService } from 'jslib-common/abstractions/export.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class ExportCommand { export class ExportCommand {
constructor(private cryptoService: CryptoService, private exportService: ExportService) { } constructor(private cryptoService: CryptoService, private exportService: ExportService) { }

6
src/commands/generate.command.ts
View File

@@ -1,9 +1,9 @@
import * as program from 'commander'; import * as program from 'commander';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { StringResponse } from 'jslib/cli/models/response/stringResponse'; import { StringResponse } from 'jslib-node/cli/models/response/stringResponse';
export class GenerateCommand { export class GenerateCommand {
constructor(private passwordGenerationService: PasswordGenerationService) { } constructor(private passwordGenerationService: PasswordGenerationService) { }

62
src/commands/get.command.ts
View File

@@ -1,42 +1,42 @@
import * as program from 'commander'; import * as program from 'commander';
import { CipherType } from 'jslib/enums/cipherType'; import { CipherType } from 'jslib-common/enums/cipherType';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuditService } from 'jslib/abstractions/audit.service'; import { AuditService } from 'jslib-common/abstractions/audit.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { TotpService } from 'jslib/abstractions/totp.service'; import { TotpService } from 'jslib-common/abstractions/totp.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { Organization } from 'jslib/models/domain/organization'; import { Organization } from 'jslib-common/models/domain/organization';
import { Card } from 'jslib/models/export/card'; import { Card } from 'jslib-common/models/export/card';
import { Cipher } from 'jslib/models/export/cipher'; import { Cipher } from 'jslib-common/models/export/cipher';
import { Collection } from 'jslib/models/export/collection'; import { Collection } from 'jslib-common/models/export/collection';
import { Field } from 'jslib/models/export/field'; import { Field } from 'jslib-common/models/export/field';
import { Folder } from 'jslib/models/export/folder'; import { Folder } from 'jslib-common/models/export/folder';
import { Identity } from 'jslib/models/export/identity'; import { Identity } from 'jslib-common/models/export/identity';
import { Login } from 'jslib/models/export/login'; import { Login } from 'jslib-common/models/export/login';
import { LoginUri } from 'jslib/models/export/loginUri'; import { LoginUri } from 'jslib-common/models/export/loginUri';
import { SecureNote } from 'jslib/models/export/secureNote'; import { SecureNote } from 'jslib-common/models/export/secureNote';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib-common/models/view/cipherView';
import { CollectionView } from 'jslib/models/view/collectionView'; import { CollectionView } from 'jslib-common/models/view/collectionView';
import { FolderView } from 'jslib/models/view/folderView'; import { FolderView } from 'jslib-common/models/view/folderView';
import { EncString } from 'jslib/models/domain/encString'; import { EncString } from 'jslib-common/models/domain/encString';
import { Response } from 'jslib/cli/models/response'; import { ErrorResponse } from 'jslib-common/models/response/errorResponse';
import { StringResponse } from 'jslib/cli/models/response/stringResponse'; import { Response } from 'jslib-node/cli/models/response';
import { ErrorResponse } from 'jslib/models/response/errorResponse'; import { StringResponse } from 'jslib-node/cli/models/response/stringResponse';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
import { CipherResponse } from '../models/response/cipherResponse'; import { CipherResponse } from '../models/response/cipherResponse';
import { CollectionResponse } from '../models/response/collectionResponse'; import { CollectionResponse } from '../models/response/collectionResponse';
@@ -54,7 +54,7 @@ import { DownloadCommand } from './download.command';
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class GetCommand extends DownloadCommand { export class GetCommand extends DownloadCommand {
constructor(private cipherService: CipherService, private folderService: FolderService, constructor(private cipherService: CipherService, private folderService: FolderService,

6
src/commands/import.command.ts
View File

@@ -1,8 +1,8 @@
import * as program from 'commander'; import * as program from 'commander';
import { ImportService } from 'jslib/abstractions/import.service'; import { ImportService } from 'jslib-common/abstractions/import.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';

28
src/commands/list.command.ts
View File

@@ -1,26 +1,26 @@
import * as program from 'commander'; import * as program from 'commander';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib-common/models/view/cipherView';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { import {
CollectionDetailsResponse as ApiCollectionDetailsResponse, CollectionDetailsResponse as ApiCollectionDetailsResponse,
CollectionResponse as ApiCollectionResponse, CollectionResponse as ApiCollectionResponse,
} from 'jslib/models/response/collectionResponse'; } from 'jslib-common/models/response/collectionResponse';
import { ListResponse as ApiListResponse } from 'jslib/models/response/listResponse'; import { ListResponse as ApiListResponse } from 'jslib-common/models/response/listResponse';
import { CollectionData } from 'jslib/models/data/collectionData'; import { CollectionData } from 'jslib-common/models/data/collectionData';
import { Collection } from 'jslib/models/domain/collection'; import { Collection } from 'jslib-common/models/domain/collection';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { ListResponse } from 'jslib/cli/models/response/listResponse'; import { ListResponse } from 'jslib-node/cli/models/response/listResponse';
import { CipherResponse } from '../models/response/cipherResponse'; import { CipherResponse } from '../models/response/cipherResponse';
import { CollectionResponse } from '../models/response/collectionResponse'; import { CollectionResponse } from '../models/response/collectionResponse';
@@ -30,7 +30,7 @@ import { OrganizationUserResponse } from '../models/response/organizationUserRes
import { CliUtils } from '../utils'; import { CliUtils } from '../utils';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class ListCommand { export class ListCommand {
constructor(private cipherService: CipherService, private folderService: FolderService, constructor(private cipherService: CipherService, private folderService: FolderService,

6
src/commands/lock.command.ts
View File

@@ -1,9 +1,9 @@
import * as program from 'commander'; import * as program from 'commander';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
export class LockCommand { export class LockCommand {
constructor(private vaultTimeoutService: VaultTimeoutService) { } constructor(private vaultTimeoutService: VaultTimeoutService) { }

22
src/commands/login.command.ts
View File

@@ -1,19 +1,19 @@
import * as program from 'commander'; import * as program from 'commander';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
import { LoginCommand as BaseLoginCommand } from 'jslib/cli/commands/login.command'; import { LoginCommand as BaseLoginCommand } from 'jslib-node/cli/commands/login.command';
export class LoginCommand extends BaseLoginCommand { export class LoginCommand extends BaseLoginCommand {
private options: program.OptionValues; private options: program.OptionValues;

4
src/commands/restore.command.ts
View File

@@ -1,8 +1,8 @@
import * as program from 'commander'; import * as program from 'commander';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
export class RestoreCommand { export class RestoreCommand {
constructor(private cipherService: CipherService) { } constructor(private cipherService: CipherService) { }

14
src/commands/send/create.command.ts
View File

@@ -2,16 +2,16 @@ import * as program from 'commander';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
import { NodeUtils } from 'jslib/misc/nodeUtils'; import { NodeUtils } from 'jslib-common/misc/nodeUtils';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { StringResponse } from 'jslib/cli/models/response/stringResponse'; import { StringResponse } from 'jslib-node/cli/models/response/stringResponse';
import { SendResponse } from '../../models/response/sendResponse'; import { SendResponse } from '../../models/response/sendResponse';
import { SendTextResponse } from '../../models/response/sendTextResponse'; import { SendTextResponse } from '../../models/response/sendTextResponse';

4
src/commands/send/delete.command.ts
View File

@@ -1,6 +1,6 @@
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
export class SendDeleteCommand { export class SendDeleteCommand {
constructor(private sendService: SendService) { } constructor(private sendService: SendService) { }

10
src/commands/send/edit.command.ts
View File

@@ -1,11 +1,11 @@
import * as program from 'commander'; import * as program from 'commander';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { Response } from 'jslib/cli/models/response'; import { SendType } from 'jslib-common/enums/sendType';
import { SendType } from 'jslib/enums/sendType'; import { Response } from 'jslib-node/cli/models/response';
import { SendResponse } from '../../models/response/sendResponse'; import { SendResponse } from '../../models/response/sendResponse';

16
src/commands/send/get.command.ts
View File

@@ -1,20 +1,20 @@
import * as program from 'commander'; import * as program from 'commander';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { SendView } from 'jslib/models/view/sendView'; import { SendView } from 'jslib-common/models/view/sendView';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { DownloadCommand } from '../download.command'; import { DownloadCommand } from '../download.command';
import { SendResponse } from '../../models/response/sendResponse'; import { SendResponse } from '../../models/response/sendResponse';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class SendGetCommand extends DownloadCommand { export class SendGetCommand extends DownloadCommand {
constructor(private sendService: SendService, private environmentService: EnvironmentService, constructor(private sendService: SendService, private environmentService: EnvironmentService,

10
src/commands/send/list.command.ts
View File

@@ -1,11 +1,11 @@
import * as program from 'commander'; import * as program from 'commander';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { ListResponse } from 'jslib/cli/models/response/listResponse'; import { ListResponse } from 'jslib-node/cli/models/response/listResponse';
import { SendResponse } from '../..//models/response/sendResponse'; import { SendResponse } from '../..//models/response/sendResponse';

28
src/commands/send/receive.command.ts
View File

@@ -1,25 +1,25 @@
import * as program from 'commander'; import * as program from 'commander';
import * as inquirer from 'inquirer'; import * as inquirer from 'inquirer';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { SendAccessRequest } from 'jslib/models/request/sendAccessRequest'; import { SendAccessRequest } from 'jslib-common/models/request/sendAccessRequest';
import { ErrorResponse } from 'jslib/models/response/errorResponse'; import { ErrorResponse } from 'jslib-common/models/response/errorResponse';
import { SendAccessView } from 'jslib/models/view/sendAccessView'; import { SendAccessView } from 'jslib-common/models/view/sendAccessView';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { SendAccess } from 'jslib/models/domain/sendAccess'; import { SendAccess } from 'jslib-common/models/domain/sendAccess';
import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
import { NodeUtils } from 'jslib/misc/nodeUtils'; import { NodeUtils } from 'jslib-common/misc/nodeUtils';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
import { SendAccessResponse } from '../../models/response/sendAccessResponse'; import { SendAccessResponse } from '../../models/response/sendAccessResponse';

4
src/commands/send/removePassword.command.ts
View File

@@ -1,6 +1,6 @@
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { SendResponse } from '../../models/response/sendResponse'; import { SendResponse } from '../../models/response/sendResponse';

4
src/commands/share.command.ts
View File

@@ -1,8 +1,8 @@
import * as program from 'commander'; import * as program from 'commander';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { CipherResponse } from '../models/response/cipherResponse'; import { CipherResponse } from '../models/response/cipherResponse';

10
src/commands/status.command.ts
View File

@@ -1,11 +1,11 @@
import * as program from 'commander'; import * as program from 'commander';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { TemplateResponse } from '../models/response/templateResponse'; import { TemplateResponse } from '../models/response/templateResponse';

8
src/commands/sync.command.ts
View File

@@ -1,10 +1,10 @@
import * as program from 'commander'; import * as program from 'commander';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
import { StringResponse } from 'jslib/cli/models/response/stringResponse'; import { StringResponse } from 'jslib-node/cli/models/response/stringResponse';
export class SyncCommand { export class SyncCommand {
constructor(private syncService: SyncService) { } constructor(private syncService: SyncService) { }

16
src/commands/unlock.command.ts
View File

@@ -1,17 +1,17 @@
import * as program from 'commander'; import * as program from 'commander';
import * as inquirer from 'inquirer'; import * as inquirer from 'inquirer';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class UnlockCommand { export class UnlockCommand {
constructor(private cryptoService: CryptoService, private userService: UserService, constructor(private cryptoService: CryptoService, private userService: UserService,

2
src/models/request/organizationCollectionRequest.ts
View File

@@ -1,4 +1,4 @@
import { Collection } from 'jslib/models/export/collection'; import { Collection } from 'jslib-common/models/export/collection';
import { SelectionReadOnly } from '../selectionReadOnly'; import { SelectionReadOnly } from '../selectionReadOnly';

2
src/models/response/attachmentResponse.ts
View File

@@ -1,4 +1,4 @@
import { AttachmentView } from 'jslib/models/view/attachmentView'; import { AttachmentView } from 'jslib-common/models/view/attachmentView';
export class AttachmentResponse { export class AttachmentResponse {
id: string; id: string;

8
src/models/response/cipherResponse.ts
View File

@@ -1,13 +1,13 @@
import { CipherWithIds } from 'jslib/models/export/cipherWithIds'; import { CipherWithIds } from 'jslib-common/models/export/cipherWithIds';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib-common/models/view/cipherView';
import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse';
import { AttachmentResponse } from './attachmentResponse'; import { AttachmentResponse } from './attachmentResponse';
import { LoginResponse } from './loginResponse'; import { LoginResponse } from './loginResponse';
import { PasswordHistoryResponse } from './passwordHistoryResponse'; import { PasswordHistoryResponse } from './passwordHistoryResponse';
import { CipherType } from 'jslib/enums'; import { CipherType } from 'jslib-common/enums';
export class CipherResponse extends CipherWithIds implements BaseResponse { export class CipherResponse extends CipherWithIds implements BaseResponse {
object: string; object: string;

6
src/models/response/collectionResponse.ts
View File

@@ -1,7 +1,7 @@
import { CollectionWithId } from 'jslib/models/export/collectionWithId'; import { CollectionWithId } from 'jslib-common/models/export/collectionWithId';
import { CollectionView } from 'jslib/models/view/collectionView'; import { CollectionView } from 'jslib-common/models/view/collectionView';
import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse';
export class CollectionResponse extends CollectionWithId implements BaseResponse { export class CollectionResponse extends CollectionWithId implements BaseResponse {
object: string; object: string;

6
src/models/response/folderResponse.ts
View File

@@ -1,7 +1,7 @@
import { FolderWithId } from 'jslib/models/export/folderWithId'; import { FolderWithId } from 'jslib-common/models/export/folderWithId';
import { FolderView } from 'jslib/models/view/folderView'; import { FolderView } from 'jslib-common/models/view/folderView';
import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse';
export class FolderResponse extends FolderWithId implements BaseResponse { export class FolderResponse extends FolderWithId implements BaseResponse {
object: string; object: string;

4
src/models/response/loginResponse.ts
View File

@@ -1,5 +1,5 @@
import { Login } from 'jslib/models/export/login'; import { Login } from 'jslib-common/models/export/login';
import { LoginView } from 'jslib/models/view/loginView'; import { LoginView } from 'jslib-common/models/view/loginView';
export class LoginResponse extends Login { export class LoginResponse extends Login {
passwordRevisionDate: Date; passwordRevisionDate: Date;

2
src/models/response/organizationCollectionResponse.ts
View File

@@ -1,4 +1,4 @@
import { CollectionView } from 'jslib/models/view/collectionView'; import { CollectionView } from 'jslib-common/models/view/collectionView';
import { SelectionReadOnly } from '../selectionReadOnly'; import { SelectionReadOnly } from '../selectionReadOnly';

8
src/models/response/organizationResponse.ts
View File

@@ -1,9 +1,9 @@
import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse';
import { Organization } from 'jslib/models/domain/organization'; import { Organization } from 'jslib-common/models/domain/organization';
import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType'; import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType';
import { OrganizationUserType } from 'jslib/enums/organizationUserType'; import { OrganizationUserType } from 'jslib-common/enums/organizationUserType';
export class OrganizationResponse implements BaseResponse { export class OrganizationResponse implements BaseResponse {
object: string; object: string;

6
src/models/response/organizationUserResponse.ts
View File

@@ -1,7 +1,7 @@
import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse';
import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType'; import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType';
import { OrganizationUserType } from 'jslib/enums/organizationUserType'; import { OrganizationUserType } from 'jslib-common/enums/organizationUserType';
export class OrganizationUserResponse implements BaseResponse { export class OrganizationUserResponse implements BaseResponse {
object: string; object: string;

2
src/models/response/passwordHistoryResponse.ts
View File

@@ -1,4 +1,4 @@
import { PasswordHistoryView } from 'jslib/models/view/passwordHistoryView'; import { PasswordHistoryView } from 'jslib-common/models/view/passwordHistoryView';
export class PasswordHistoryResponse { export class PasswordHistoryResponse {
lastUsedDate: Date; lastUsedDate: Date;

6
src/models/response/sendAccessResponse.ts
View File

@@ -1,8 +1,8 @@
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
import { SendAccessView } from 'jslib/models/view/sendAccessView'; import { SendAccessView } from 'jslib-common/models/view/sendAccessView';
import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse';
import { SendFileResponse } from './sendFileResponse'; import { SendFileResponse } from './sendFileResponse';
import { SendTextResponse } from './sendTextResponse'; import { SendTextResponse } from './sendTextResponse';

2
src/models/response/sendFileResponse.ts
View File

@@ -1,4 +1,4 @@
import { SendFileView } from 'jslib/models/view/sendFileView'; import { SendFileView } from 'jslib-common/models/view/sendFileView';
export class SendFileResponse { export class SendFileResponse {
static template(fileName = 'file attachment location'): SendFileResponse { static template(fileName = 'file attachment location'): SendFileResponse {

8
src/models/response/sendResponse.ts
View File

@@ -1,10 +1,10 @@
import { SendView } from 'jslib/models/view/sendView'; import { SendView } from 'jslib-common/models/view/sendView';
import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
import { SendFileResponse } from './sendFileResponse'; import { SendFileResponse } from './sendFileResponse';
import { SendTextResponse } from './sendTextResponse'; import { SendTextResponse } from './sendTextResponse';

2
src/models/response/sendTextResponse.ts
View File

@@ -1,4 +1,4 @@
import { SendTextView } from 'jslib/models/view/sendTextView'; import { SendTextView } from 'jslib-common/models/view/sendTextView';
export class SendTextResponse { export class SendTextResponse {
static template(text = 'Text contained in the send.', hidden = false): SendTextResponse { static template(text = 'Text contained in the send.', hidden = false): SendTextResponse {

2
src/models/response/templateResponse.ts
View File

@@ -1,4 +1,4 @@
import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse';
export class TemplateResponse implements BaseResponse { export class TemplateResponse implements BaseResponse {
object: string; object: string;

10
src/program.ts
View File

@@ -14,16 +14,16 @@ import { UnlockCommand } from './commands/unlock.command';
import { CompletionCommand } from './commands/completion.command'; import { CompletionCommand } from './commands/completion.command';
import { LogoutCommand } from 'jslib/cli/commands/logout.command'; import { LogoutCommand } from 'jslib-node/cli/commands/logout.command';
import { UpdateCommand } from 'jslib/cli/commands/update.command'; import { UpdateCommand } from 'jslib-node/cli/commands/update.command';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
import { TemplateResponse } from './models/response/templateResponse'; import { TemplateResponse } from './models/response/templateResponse';
import { CliUtils } from './utils'; import { CliUtils } from './utils';
import { BaseProgram } from 'jslib/cli/baseProgram'; import { BaseProgram } from 'jslib-node/cli/baseProgram';
const writeLn = CliUtils.writeLn; const writeLn = CliUtils.writeLn;

6
src/send.program.ts
View File

@@ -3,11 +3,11 @@ import * as program from 'commander';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
import { GetCommand } from './commands/get.command'; import { GetCommand } from './commands/get.command';
import { SendCreateCommand } from './commands/send/create.command'; import { SendCreateCommand } from './commands/send/create.command';

2
src/services/i18n.service.ts
View File

@@ -1,7 +1,7 @@
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { I18nService as BaseI18nService } from 'jslib/services/i18n.service'; import { I18nService as BaseI18nService } from 'jslib-common/services/i18n.service';
export class I18nService extends BaseI18nService { export class I18nService extends BaseI18nService {
constructor(systemLanguage: string, localesDirectory: string) { constructor(systemLanguage: string, localesDirectory: string) {

10
src/services/nodeEnvSecureStorage.service.ts
View File

@@ -1,9 +1,9 @@
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { LogService } from 'jslib/abstractions/log.service'; import { LogService } from 'jslib-common/abstractions/log.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class NodeEnvSecureStorageService implements StorageService { export class NodeEnvSecureStorageService implements StorageService {
constructor(private storageService: StorageService, private logService: LogService, constructor(private storageService: StorageService, private logService: LogService,

12
src/utils.ts
View File

@@ -1,14 +1,14 @@
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
import { Organization } from 'jslib/models/domain/organization'; import { Organization } from 'jslib-common/models/domain/organization';
import { CollectionView } from 'jslib/models/view/collectionView'; import { CollectionView } from 'jslib-common/models/view/collectionView';
import { FolderView } from 'jslib/models/view/folderView'; import { FolderView } from 'jslib-common/models/view/folderView';
import { NodeUtils } from 'jslib/misc/nodeUtils'; import { NodeUtils } from 'jslib-common/misc/nodeUtils';
export class CliUtils { export class CliUtils {
static writeLn(s: string, finalLine: boolean = false, error: boolean = false) { static writeLn(s: string, finalLine: boolean = false, error: boolean = false) {

24
tsconfig.json
View File

@@ -11,23 +11,15 @@
"sourceMap": true, "sourceMap": true,
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"jslib/*": [ "jslib-common/*": [
"jslib/src/*" "jslib/common/src/*"
],
"jslib-node/*": [
"jslib/node/src/*"
] ]
}, }
"typeRoots": [
"node_modules/@types"
]
}, },
"exclude": [ "include": [
"node_modules", "src"
"jslib/node_modules",
"dist",
"jslib/dist",
"jslib/spec",
"jslib/src/electron",
"jslib/src/angular",
"jslib/src/services/notifications.service.ts",
"build"
] ]
} }

5
webpack.config.js
View File

@@ -3,6 +3,7 @@ const webpack = require('webpack');
const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin');
const nodeExternals = require('webpack-node-externals'); const nodeExternals = require('webpack-node-externals');
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
if (process.env.NODE_ENV == null) { if (process.env.NODE_ENV == null) {
process.env.NODE_ENV = 'development'; process.env.NODE_ENV = 'development';
@@ -55,11 +56,9 @@ const config = {
}, },
resolve: { resolve: {
extensions: ['.ts', '.js'], extensions: ['.ts', '.js'],
alias: {
jslib: path.join(__dirname, 'jslib/src'),
},
symlinks: false, symlinks: false,
modules: [path.resolve('node_modules')], modules: [path.resolve('node_modules')],
plugins: [new TsconfigPathsPlugin({ configFile: './tsconfig.json' })],
}, },
output: { output: {
filename: '[name].js', filename: '[name].js',