From ad4af87ed7cdf702e8bffbc02fe6392c8046e0ce Mon Sep 17 00:00:00 2001 From: Nathanael DEMACON Date: Mon, 23 Jan 2023 15:38:23 +0100 Subject: [PATCH] feat: use `T[]` array style part2 --- packages/clients/src/api/account/v2alpha1/types.gen.ts | 2 +- packages/clients/src/helpers/marshalling.ts | 6 +++--- packages/clients/src/scw/custom-types.ts | 2 +- .../src/scw/errors/standard/invalid-arguments-error.ts | 4 ++-- .../src/scw/errors/standard/permissions-denied-error.ts | 4 ++-- .../src/scw/errors/standard/quotas-exceeded-error.ts | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/clients/src/api/account/v2alpha1/types.gen.ts b/packages/clients/src/api/account/v2alpha1/types.gen.ts index 302014415..def7336ec 100644 --- a/packages/clients/src/api/account/v2alpha1/types.gen.ts +++ b/packages/clients/src/api/account/v2alpha1/types.gen.ts @@ -11,7 +11,7 @@ export type ListSSHKeysRequestOrderBy = /** List ssh keys response */ export interface ListSSHKeysResponse { - sshKeys: Array + sshKeys: SSHKey[] totalCount: number } diff --git a/packages/clients/src/helpers/marshalling.ts b/packages/clients/src/helpers/marshalling.ts index 5880da39d..c7bc0dd00 100644 --- a/packages/clients/src/helpers/marshalling.ts +++ b/packages/clients/src/helpers/marshalling.ts @@ -119,11 +119,11 @@ export const unmarshalArrayOfObject = ( data: unknown, unmarshaller: (input: unknown) => T, emptyFallback: B = true as B, -): B extends true ? Array | undefined : Array => { +): B extends true ? T[] | undefined : T[] => { if (!Array.isArray(data)) { return (emptyFallback ? [] : undefined) as B extends true - ? Array | undefined - : Array + ? T[] | undefined + : T[] } return data.map(elt => unmarshaller(elt)) diff --git a/packages/clients/src/scw/custom-types.ts b/packages/clients/src/scw/custom-types.ts index f738c387c..34e79d060 100644 --- a/packages/clients/src/scw/custom-types.ts +++ b/packages/clients/src/scw/custom-types.ts @@ -53,7 +53,7 @@ export interface TimeSeries { /** Name of the metric. */ name: string /** Points contains all the points that composed the series. */ - points: Array + points: TimeSeriesPoint[] /** Metadata contains some string metadata related to a metric. */ metadata: Record } diff --git a/packages/clients/src/scw/errors/standard/invalid-arguments-error.ts b/packages/clients/src/scw/errors/standard/invalid-arguments-error.ts index 49747970c..179d85c35 100644 --- a/packages/clients/src/scw/errors/standard/invalid-arguments-error.ts +++ b/packages/clients/src/scw/errors/standard/invalid-arguments-error.ts @@ -21,7 +21,7 @@ export type InvalidArgumentsErrorDetails = { * * @internal */ -const buildMessage = (list: Array): string => { +const buildMessage = (list: InvalidArgumentsErrorDetails[]): string => { const invalidArgs: string[] = list.reduce((acc, details) => { let readableReason = '' switch (details.reason) { @@ -58,7 +58,7 @@ export class InvalidArgumentsError extends ScalewayError { constructor( readonly status: number, readonly body: JSONObject, - readonly details: Array, + readonly details: InvalidArgumentsErrorDetails[], ) { super(status, body, buildMessage(details)) this.name = 'InvalidArgumentsError' diff --git a/packages/clients/src/scw/errors/standard/permissions-denied-error.ts b/packages/clients/src/scw/errors/standard/permissions-denied-error.ts index 6031e3dac..f27902a2a 100644 --- a/packages/clients/src/scw/errors/standard/permissions-denied-error.ts +++ b/packages/clients/src/scw/errors/standard/permissions-denied-error.ts @@ -20,7 +20,7 @@ export type PermissionsDeniedErrorDetails = { * * @internal */ -const buildMessage = (list: Array): string => +const buildMessage = (list: PermissionsDeniedErrorDetails[]): string => `insufficient permissions: ${list .map(({ action, resource }) => `${action} ${resource}`) .join('; ')}` @@ -34,7 +34,7 @@ export class PermissionsDeniedError extends ScalewayError { constructor( readonly status: number, readonly body: JSONObject, - readonly list: Array, + readonly list: PermissionsDeniedErrorDetails[], ) { super(status, body, buildMessage(list)) this.name = 'PermissionsDeniedError' diff --git a/packages/clients/src/scw/errors/standard/quotas-exceeded-error.ts b/packages/clients/src/scw/errors/standard/quotas-exceeded-error.ts index 8507f58ce..67d26927e 100644 --- a/packages/clients/src/scw/errors/standard/quotas-exceeded-error.ts +++ b/packages/clients/src/scw/errors/standard/quotas-exceeded-error.ts @@ -32,7 +32,7 @@ export type QuotasExceededErrorDetails = { * * @internal */ -const buildMessage = (list: Array): string => +const buildMessage = (list: QuotasExceededErrorDetails[]): string => `quota exceeded(s): ${list .map(details => { const message = `${details.resource} has reached its quota (${details.current}/${details.quota})` @@ -68,7 +68,7 @@ export class QuotasExceededError extends ScalewayError { constructor( readonly status: number, readonly body: JSONObject, - readonly list: Array, + readonly list: QuotasExceededErrorDetails[], ) { super(status, body, buildMessage(list)) this.name = 'QuotasExceededError'