From a5610bee0c0ac552d806bd323508a1778ea0e23a Mon Sep 17 00:00:00 2001 From: Eric Peterson Date: Tue, 30 Aug 2022 13:49:47 +0200 Subject: [PATCH] withApis -> fromApis, non-optional actualApis argument, etc Signed-off-by: Eric Peterson --- .changeset/veka-fingrar-drar.md | 2 +- packages/core-app-api/api-report.md | 2 +- .../AnalyticsApi/MultipleAnalyticsApi.test.ts | 2 +- .../AnalyticsApi/MultipleAnalyticsApi.ts | 11 ++++++----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.changeset/veka-fingrar-drar.md b/.changeset/veka-fingrar-drar.md index 8f5281632d..cff2f45919 100644 --- a/.changeset/veka-fingrar-drar.md +++ b/.changeset/veka-fingrar-drar.md @@ -20,7 +20,7 @@ createApiFactory({ api: analyticsApiRef, deps: { configApi: configApiRef, identityApi: identityApiRef, storageApi: storageApiRef }, factory: ({ configApi, identityApi, storageApi }) => - MultipleAnalyticsApi.withApis([ + MultipleAnalyticsApi.fromApis([ VendorAnalyticsApi.fromConfig(configApi, { identityApi }), CustomAnalyticsApi.fromConfig(configApi, { identityApi, storageApi }), ]), diff --git a/packages/core-app-api/api-report.md b/packages/core-app-api/api-report.md index 9d528b6bef..f2bc4b6665 100644 --- a/packages/core-app-api/api-report.md +++ b/packages/core-app-api/api-report.md @@ -412,7 +412,7 @@ export class MicrosoftAuth { // @public export class MultipleAnalyticsApi implements AnalyticsApi { captureEvent(event: AnalyticsEvent): void; - static withApis(actualApis?: AnalyticsApi[]): MultipleAnalyticsApi; + static fromApis(actualApis: AnalyticsApi[]): MultipleAnalyticsApi; } // @public diff --git a/packages/core-app-api/src/apis/implementations/AnalyticsApi/MultipleAnalyticsApi.test.ts b/packages/core-app-api/src/apis/implementations/AnalyticsApi/MultipleAnalyticsApi.test.ts index e020c7b073..ebbff04b92 100644 --- a/packages/core-app-api/src/apis/implementations/AnalyticsApi/MultipleAnalyticsApi.test.ts +++ b/packages/core-app-api/src/apis/implementations/AnalyticsApi/MultipleAnalyticsApi.test.ts @@ -18,7 +18,7 @@ import { MultipleAnalyticsApi } from './MultipleAnalyticsApi'; describe('MultipleAnalyticsApi', () => { const analyticsApiOne = { captureEvent: jest.fn() }; const analyticsApiTwo = { captureEvent: jest.fn() }; - const multipleApis = MultipleAnalyticsApi.withApis([ + const multipleApis = MultipleAnalyticsApi.fromApis([ analyticsApiOne, analyticsApiTwo, ]); diff --git a/packages/core-app-api/src/apis/implementations/AnalyticsApi/MultipleAnalyticsApi.ts b/packages/core-app-api/src/apis/implementations/AnalyticsApi/MultipleAnalyticsApi.ts index 72f04dc242..91ac53f62a 100644 --- a/packages/core-app-api/src/apis/implementations/AnalyticsApi/MultipleAnalyticsApi.ts +++ b/packages/core-app-api/src/apis/implementations/AnalyticsApi/MultipleAnalyticsApi.ts @@ -28,7 +28,7 @@ import { AnalyticsApi, AnalyticsEvent } from '@backstage/core-plugin-api'; * api: analyticsApiRef, * deps: { configApi: configApiRef, identityApi: identityApiRef, storageApi: storageApiRef }, * factory: ({ configApi, identityApi, storageApi }) => - * MultipleAnalyticsApi.withApis([ + * MultipleAnalyticsApi.fromApis([ * VendorAnalyticsApi.fromConfig(configApi, { identityApi }), * CustomAnalyticsApi.fromConfig(configApi, { identityApi, storageApi }), * ]), @@ -45,13 +45,13 @@ export class MultipleAnalyticsApi implements AnalyticsApi { * @example * * ```jsx - * MultipleAnalyticsApi.withApis([ + * MultipleAnalyticsApi.fromApis([ * SomeAnalyticsApi.fromConfig(configApi), * new CustomAnalyticsApi(), * ]); * ``` */ - static withApis(actualApis: AnalyticsApi[] = []) { + static fromApis(actualApis: AnalyticsApi[]) { return new MultipleAnalyticsApi(actualApis); } @@ -60,10 +60,11 @@ export class MultipleAnalyticsApi implements AnalyticsApi { */ captureEvent(event: AnalyticsEvent): void { this.actualApis.forEach(analyticsApi => { - /* eslint no-empty: ["error", { "allowEmptyCatch": true }] */ try { analyticsApi.captureEvent(event); - } catch {} + } catch { + /* ignored */ + } }); } }