From d6ac5f3b96228b89bea191b7488f4db4ce64efaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= Date: Tue, 22 Apr 2025 15:14:16 -0400 Subject: [PATCH] rename `generate$` to `generator$` --- .../vault-export-ui/src/components/export.component.ts | 2 +- .../components/src/credential-generator.component.ts | 2 +- .../components/src/password-generator.component.ts | 2 +- .../components/src/username-generator.component.ts | 2 +- .../credential-generator-service.abstraction.ts | 2 +- ...spec.ts => default-credential-generator.service.spec.ts} | 6 +++--- ...r.service.ts => default-credential-generator.service.ts} | 2 +- libs/tools/generator/core/src/services/index.ts | 2 +- .../send-form/components/options/send-options.component.ts | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename libs/tools/generator/core/src/services/{credential-generator.service.spec.ts => default-credential-generator.service.spec.ts} (98%) rename libs/tools/generator/core/src/services/{credential-generator.service.ts => default-credential-generator.service.ts} (98%) diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts index 02e5da7590b..c14dfe78084 100644 --- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts +++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts @@ -249,7 +249,7 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit { }), ); this.generatorService - .generate$({ on$: this.onGenerate$, account$ }) + .generator$({ on$: this.onGenerate$, account$ }) .pipe(takeUntil(this.destroy$)) .subscribe((generated) => { this.exportForm.patchValue({ diff --git a/libs/tools/generator/components/src/credential-generator.component.ts b/libs/tools/generator/components/src/credential-generator.component.ts index 3b396e9785a..53a33a0c90e 100644 --- a/libs/tools/generator/components/src/credential-generator.component.ts +++ b/libs/tools/generator/components/src/credential-generator.component.ts @@ -229,7 +229,7 @@ export class CredentialGeneratorComponent implements OnInit, OnChanges, OnDestro // wire up the generator this.generatorService - .generate$({ + .generator$({ on$: this.generate$, account$: this.account$, }) diff --git a/libs/tools/generator/components/src/password-generator.component.ts b/libs/tools/generator/components/src/password-generator.component.ts index adce3e6febb..4a1a6a90237 100644 --- a/libs/tools/generator/components/src/password-generator.component.ts +++ b/libs/tools/generator/components/src/password-generator.component.ts @@ -182,7 +182,7 @@ export class PasswordGeneratorComponent implements OnInit, OnChanges, OnDestroy // wire up the generator this.generatorService - .generate$({ on$: this.generate$, account$: this.account$ }) + .generator$({ on$: this.generate$, account$: this.account$ }) .pipe( catchError((error: unknown, generator) => { if (typeof error === "string") { diff --git a/libs/tools/generator/components/src/username-generator.component.ts b/libs/tools/generator/components/src/username-generator.component.ts index bb5b710b01e..2001fc13e95 100644 --- a/libs/tools/generator/components/src/username-generator.component.ts +++ b/libs/tools/generator/components/src/username-generator.component.ts @@ -207,7 +207,7 @@ export class UsernameGeneratorComponent implements OnInit, OnChanges, OnDestroy // wire up the generator this.generatorService - .generate$({ + .generator$({ on$: this.generate$, account$: this.account$, }) diff --git a/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts b/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts index 74f78514594..bcfe3c35f40 100644 --- a/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts +++ b/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts @@ -26,7 +26,7 @@ export abstract class CredentialGeneratorService { /** Generates a stream of credentials * @param dependencies.on$ Required. A new credential is emitted when this emits. */ - abstract generate$: ( + abstract generator$: ( dependencies: OnDependency & BoundDependency<"account", Account>, ) => Observable; diff --git a/libs/tools/generator/core/src/services/credential-generator.service.spec.ts b/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts similarity index 98% rename from libs/tools/generator/core/src/services/credential-generator.service.spec.ts rename to libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts index 05d4dac0de5..02e72beaa47 100644 --- a/libs/tools/generator/core/src/services/credential-generator.service.spec.ts +++ b/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts @@ -16,7 +16,7 @@ import { } from "../metadata"; import { CredentialGeneratorProviders } from "../providers"; -import { DefaultCredentialGeneratorService } from "./credential-generator.service"; +import { DefaultCredentialGeneratorService } from "./default-credential-generator.service"; // Custom type for jest.fn() mocks to preserve their type type JestMockFunction any> = jest.Mock, Parameters>; @@ -112,7 +112,7 @@ describe("CredentialGeneratorService", () => { account$: of(account), }; - const result = await firstValueFrom(service.generate$(dependencies)); + const result = await firstValueFrom(service.generator$(dependencies)); expect(result).toBe("generatedPassword"); expect(providers.metadata!.metadata).toHaveBeenCalledWith("testAlgorithm"); @@ -141,7 +141,7 @@ describe("CredentialGeneratorService", () => { account$: of(account), }; - const result = await firstValueFrom(service.generate$(dependencies)); + const result = await firstValueFrom(service.generator$(dependencies)); expect(result).toBe("generatedPassword"); expect(providers.metadata!.metadata).toHaveBeenCalledWith("testAlgorithm"); diff --git a/libs/tools/generator/core/src/services/credential-generator.service.ts b/libs/tools/generator/core/src/services/default-credential-generator.service.ts similarity index 98% rename from libs/tools/generator/core/src/services/credential-generator.service.ts rename to libs/tools/generator/core/src/services/default-credential-generator.service.ts index 91c8dc02fa6..4afb2d2d2d9 100644 --- a/libs/tools/generator/core/src/services/credential-generator.service.ts +++ b/libs/tools/generator/core/src/services/default-credential-generator.service.ts @@ -46,7 +46,7 @@ export class DefaultCredentialGeneratorService implements CredentialGeneratorSer private readonly log: SemanticLogger; - generate$(dependencies: OnDependency & BoundDependency<"account", Account>) { + generator$(dependencies: OnDependency & BoundDependency<"account", Account>) { // `on$` is partitioned into several streams so that the generator // engine and settings refresh only when their respective inputs change const on$ = dependencies.on$.pipe(shareReplay({ refCount: true, bufferSize: 1 })); diff --git a/libs/tools/generator/core/src/services/index.ts b/libs/tools/generator/core/src/services/index.ts index d9e02751eb4..57094e28ddd 100644 --- a/libs/tools/generator/core/src/services/index.ts +++ b/libs/tools/generator/core/src/services/index.ts @@ -1,2 +1,2 @@ export { DefaultGeneratorService } from "./default-generator.service"; -export { DefaultCredentialGeneratorService } from "./credential-generator.service"; +export { DefaultCredentialGeneratorService } from "./default-credential-generator.service"; diff --git a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts index 30775aa8a83..6bfa6ae06c6 100644 --- a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts +++ b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts @@ -127,7 +127,7 @@ export class SendOptionsComponent implements OnInit { pin({ name: () => "send-options.component", distinct: (p, c) => p.id === c.id }), ); const generatedCredential = await firstValueFrom( - this.generatorService.generate$({ on$, account$ }), + this.generatorService.generator$({ on$, account$ }), ); this.sendOptionsForm.patchValue({