chore(utils): move isArrayMember to utils

packages/coinjoin/package.json

@@ -28,7 +28,6 @@
         "@trezor/blockchain-link": "workspace:*",
         "@trezor/blockchain-link-types": "workspace:*",
         "@trezor/blockchain-link-utils": "workspace:*",
-        "@trezor/type-utils": "workspace:*",
         "@trezor/utils": "workspace:*",
         "@trezor/utxo-lib": "workspace:*",
         "cross-fetch": "^4.0.0",

packages/coinjoin/tests/tools/discovery.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable @typescript-eslint/no-var-requires */
 
-import { isArrayMember } from '@trezor/type-utils';
+import { isArrayMember } from '@trezor/utils';
 
 import { CoinjoinBackend } from '../../src/backend/CoinjoinBackend';
 import type { CoinjoinBackendSettings } from '../../src/types';

packages/coinjoin/tsconfig.json

@@ -5,7 +5,6 @@
         { "path": "../blockchain-link" },
         { "path": "../blockchain-link-types" },
         { "path": "../blockchain-link-utils" },
-        { "path": "../type-utils" },
         { "path": "../utils" },
         { "path": "../utxo-lib" }
     ]

packages/suite/src/components/suite/banners/SuiteBanners/FirmwareRevisionCheckBanner.tsx

@@ -2,7 +2,7 @@ import { TranslationKey } from '@suite-common/intl-types';
 import { Banner } from '@trezor/components';
 import { FirmwareHashCheckError, FirmwareRevisionCheckError } from '@trezor/connect';
 import { HELP_CENTER_FIRMWARE_REVISION_CHECK } from '@trezor/urls';
-import { isArrayMember } from '@trezor/type-utils';
+import { isArrayMember } from '@trezor/utils';
 
 import { Translation, TrezorLink } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';

packages/suite/src/components/suite/banners/SuiteBanners/SuiteBanners.tsx

@@ -3,7 +3,7 @@ import styled from 'styled-components';
 
 import { selectBannerMessage } from '@suite-common/message-system';
 import { selectDevice } from '@suite-common/wallet-core';
-import { isArrayMember } from '@trezor/type-utils';
+import { isArrayMember } from '@trezor/utils';
 import { isDesktop } from '@trezor/env-utils';
 import { spacingsPx } from '@trezor/theme';
 

packages/suite/src/constants/wallet/coinmarket/regional.ts

@@ -1,4 +1,4 @@
-import { isArrayMember } from '@trezor/type-utils';
+import { isArrayMember } from '@trezor/utils';
 
 class Regional {
     unknownCountry = 'unknown';

packages/suite/src/utils/wallet/coinmarket/commonUtils.ts

@@ -1,5 +1,5 @@
 import { Account } from '@suite-common/wallet-types';
-import { isArrayMember } from '@trezor/type-utils';
+import { isArrayMember } from '@trezor/utils';
 
 export function hasNetworkTypeTradableTokens(networkType: Account['networkType']) {
     return isArrayMember(networkType, ['ethereum', 'solana'] satisfies Account['networkType'][]);

packages/type-utils/src/utils.ts

@@ -58,17 +58,3 @@ export type PartialRecord<K extends keyof any, T> = {
 
 // distributive conditional types to the rescue! This way we can infer union literal type from ReturnType but exclude undefined
 export type DefinedUnionMember<T> = T extends string ? T : never;
-
-/**
- * Type-guard if a value is a subset of an array.
- * Useful to narrow down a union type `value` to a subset of the union (typeof `arr`).
- *
- * Example:
- * type Variant = 'a' | 'b' | 'c' | 'd';
- * const skippedVariants = ['a', 'b'] satisfies Variant[];
- * if(isArrayMember(variant, skippedVariants)) // variant is 'a' | 'b', else 'c' | 'd'
- */
-export const isArrayMember = <Value extends string, Subset extends Value>(
-    value: Value,
-    arr: readonly Subset[],
-): value is Subset => arr.some(v => v === value);

packages/utils/src/index.ts

@@ -25,6 +25,7 @@ export * from './getRandomInt';
 export * from './getWeakRandomId';
 export * from './getWeakRandomInt';
 export * from './hasUppercaseLetter';
+export * from './isArrayMember';
 export * from './isAscii';
 export * from './isHex';
 export * from './isNotUndefined';

packages/utils/src/isArrayMember.ts

@@ -0,0 +1,13 @@
+/**
+ * Type-guard if a value is a subset of an array.
+ * Useful to narrow down a union type `value` to a subset of the union (typeof `arr`).
+ *
+ * Example:
+ * type Variant = 'a' | 'b' | 'c' | 'd';
+ * const skippedVariants = ['a', 'b'] satisfies Variant[];
+ * if(isArrayMember(variant, skippedVariants)) // variant is 'a' | 'b', else 'c' | 'd'
+ */
+export const isArrayMember = <Value extends string, Subset extends Value>(
+    value: Value,
+    arr: readonly Subset[],
+): value is Subset => arr.some(v => v === value);

suite-common/graph/package.json

@@ -22,7 +22,6 @@
         "@suite-common/wallet-utils": "workspace:*",
         "@trezor/blockchain-link": "workspace:*",
         "@trezor/connect": "workspace:*",
-        "@trezor/type-utils": "workspace:*",
         "@trezor/utils": "workspace:*",
         "date-fns": "^2.30.0",
         "react": "18.2.0",

suite-common/graph/src/constants.ts

@@ -1,5 +1,5 @@
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { isArrayMember } from '@trezor/type-utils';
+import { isArrayMember } from '@trezor/utils';
 
 // Going over 180 will broke graph in mobile app
 export const NUMBER_OF_POINTS = 40;

suite-common/graph/tsconfig.json

@@ -12,7 +12,6 @@
             "path": "../../packages/blockchain-link"
         },
         { "path": "../../packages/connect" },
-        { "path": "../../packages/type-utils" },
         { "path": "../../packages/utils" }
     ]
 }

suite-common/wallet-core/src/stake/stakeTypes.ts

@@ -10,7 +10,7 @@ import {
 } from '@suite-common/wallet-types';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 import { FeeLevel } from '@trezor/connect';
-import { isArrayMember } from '@trezor/type-utils';
+import { isArrayMember } from '@trezor/utils';
 
 // Used when Everstake pool stats are not available from the API.
 export const BACKUP_ETH_APY = 4.13;

yarn.lock

@@ -9179,7 +9179,6 @@ __metadata:
     "@suite-common/wallet-utils": "workspace:*"
     "@trezor/blockchain-link": "workspace:*"
     "@trezor/connect": "workspace:*"
-    "@trezor/type-utils": "workspace:*"
     "@trezor/utils": "workspace:*"
     date-fns: "npm:^2.30.0"
     react: "npm:18.2.0"
@@ -11247,7 +11246,6 @@ __metadata:
     "@trezor/blockchain-link": "workspace:*"
     "@trezor/blockchain-link-types": "workspace:*"
     "@trezor/blockchain-link-utils": "workspace:*"
-    "@trezor/type-utils": "workspace:*"
     "@trezor/utils": "workspace:*"
     "@trezor/utxo-lib": "workspace:*"
     cross-fetch: "npm:^4.0.0"