From f0b78b35b89459c27c3a085df7e75f20532135f3 Mon Sep 17 00:00:00 2001 From: Yuripetusko Date: Wed, 17 Jan 2024 13:24:56 +0000 Subject: [PATCH] chore: format --- .../ipfs-utils/src/lib/get-ipfs-cid.test.ts | 18 +++--- packages/ipfs-utils/src/lib/ipfs.test.ts | 4 +- packages/ipfs-utils/src/lib/ipfs.ts | 4 +- packages/nft-renderer/panda.config.ts | 8 +-- packages/nft-renderer/postcss.config.cjs | 2 +- .../src/components/nft-renderer.tsx | 60 +++++++++---------- packages/rmrk-2d-renderer/panda.config.ts | 8 +-- packages/rmrk-2d-renderer/postcss.config.cjs | 2 +- .../src/lib/rmrk-2d-renderer.tsx | 2 +- .../src/lib/chain-mapping.test.ts | 13 ++-- .../lib/get-chain-id-by-network-name.test.ts | 8 +-- .../src/lib/get-is-evm-network.test.ts | 2 +- .../src/lib/get-is-expected-network.test.ts | 2 +- vitest.config.ts | 6 +- 14 files changed, 70 insertions(+), 69 deletions(-) diff --git a/packages/ipfs-utils/src/lib/get-ipfs-cid.test.ts b/packages/ipfs-utils/src/lib/get-ipfs-cid.test.ts index acf5120..0d6c9b1 100644 --- a/packages/ipfs-utils/src/lib/get-ipfs-cid.test.ts +++ b/packages/ipfs-utils/src/lib/get-ipfs-cid.test.ts @@ -1,16 +1,16 @@ -import { expect, test } from "vitest"; -import { getIpfsCidFromGatewayUrl } from "./get-ipfs-cid.js"; +import { expect, test } from 'vitest'; +import { getIpfsCidFromGatewayUrl } from './get-ipfs-cid.js'; -test("getIpfsCidFromGatewayUrl", async () => { +test('getIpfsCidFromGatewayUrl', async () => { expect( - getIpfsCidFromGatewayUrl("https://cloudflare-ipfs.com/ipfs/foo") - ).to.not.eq("bar"); + getIpfsCidFromGatewayUrl('https://cloudflare-ipfs.com/ipfs/foo'), + ).to.not.eq('bar'); expect( - getIpfsCidFromGatewayUrl("https://cloudflare-ipfs.com/ipfs/foo") - ).to.eq("foo"); + getIpfsCidFromGatewayUrl('https://cloudflare-ipfs.com/ipfs/foo'), + ).to.eq('foo'); expect( - getIpfsCidFromGatewayUrl("https://cloudflare-ipfs.com/ipfs/foo/bar") - ).to.eq("foo/bar"); + getIpfsCidFromGatewayUrl('https://cloudflare-ipfs.com/ipfs/foo/bar'), + ).to.eq('foo/bar'); }); diff --git a/packages/ipfs-utils/src/lib/ipfs.test.ts b/packages/ipfs-utils/src/lib/ipfs.test.ts index 9f665cc..f0fa05f 100644 --- a/packages/ipfs-utils/src/lib/ipfs.test.ts +++ b/packages/ipfs-utils/src/lib/ipfs.test.ts @@ -1,10 +1,10 @@ import { expect, test } from 'vitest'; import { + DEFAULT_IPFS_GATEWAY_KEYS, + DEFAULT_IPFS_GATEWAY_URLS, containsCID, convertToDesiredGateway, sanitizeIpfsUrl, - DEFAULT_IPFS_GATEWAY_KEYS, - DEFAULT_IPFS_GATEWAY_URLS, } from './ipfs.js'; test('containsCID', async () => { diff --git a/packages/ipfs-utils/src/lib/ipfs.ts b/packages/ipfs-utils/src/lib/ipfs.ts index 91c63ea..b596d52 100644 --- a/packages/ipfs-utils/src/lib/ipfs.ts +++ b/packages/ipfs-utils/src/lib/ipfs.ts @@ -47,7 +47,9 @@ export const containsCID = (ipfsUrl?: string | null) => { export const convertToDesiredGateway = ( ipfsUrl?: string | null, - gatewayPrefixovider = DEFAULT_IPFS_GATEWAY_URLS[DEFAULT_IPFS_GATEWAY_KEYS.pinata], + gatewayPrefixovider = DEFAULT_IPFS_GATEWAY_URLS[ + DEFAULT_IPFS_GATEWAY_KEYS.pinata + ], ) => { const results = containsCID(ipfsUrl); if (!ipfsUrl || results.containsCid !== true || !results.cid) { diff --git a/packages/nft-renderer/panda.config.ts b/packages/nft-renderer/panda.config.ts index d1101c4..6969414 100644 --- a/packages/nft-renderer/panda.config.ts +++ b/packages/nft-renderer/panda.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from "@pandacss/dev"; +import { defineConfig } from '@pandacss/dev'; export default defineConfig({ // Whether to use css reset @@ -6,7 +6,7 @@ export default defineConfig({ prefix: 'rmrk-nft-renderer', // Where to look for your css declarations - include: ["./src/**/*.{js,jsx,ts,tsx}"], + include: ['./src/**/*.{js,jsx,ts,tsx}'], // Files to exclude exclude: [], @@ -17,6 +17,6 @@ export default defineConfig({ }, // The output directory for your css system - outdir: "styled-system", - jsxFramework: "react", + outdir: 'styled-system', + jsxFramework: 'react', }); diff --git a/packages/nft-renderer/postcss.config.cjs b/packages/nft-renderer/postcss.config.cjs index 573efad..ee939cb 100644 --- a/packages/nft-renderer/postcss.config.cjs +++ b/packages/nft-renderer/postcss.config.cjs @@ -2,4 +2,4 @@ module.exports = { plugins: { '@pandacss/dev/postcss': {}, }, -} \ No newline at end of file +}; diff --git a/packages/nft-renderer/src/components/nft-renderer.tsx b/packages/nft-renderer/src/components/nft-renderer.tsx index 05cb513..07fdb97 100644 --- a/packages/nft-renderer/src/components/nft-renderer.tsx +++ b/packages/nft-renderer/src/components/nft-renderer.tsx @@ -1,27 +1,27 @@ -import "../styles/index.css"; -import { MultiLayer2DRenderer } from "@rmrk-team/rmrk-2d-renderer"; +import { MultiLayer2DRenderer } from '@rmrk-team/rmrk-2d-renderer'; import { RMRKEquippableImpl, mapChainIdToNetwork, -} from "@rmrk-team/rmrk-evm-utils"; +} from '@rmrk-team/rmrk-evm-utils'; import { useFetchIpfsMetadata, useGetAssetData, useGetComposedState, useGetInterfaceSupport, -} from "@rmrk-team/rmrk-hooks"; -import React, { useEffect, useRef, useState } from "react"; -import { isAddress } from "viem"; -import type { Address } from "viem"; -import { usePublicClient, useReadContract } from "wagmi"; -import type { Chain } from "wagmi/chains"; -import type { RenderPart } from "../types/types.js"; +} from '@rmrk-team/rmrk-hooks'; +import React, { useEffect, useRef, useState } from 'react'; +import { css } from 'styled-system/css'; +import { isAddress } from 'viem'; +import type { Address } from 'viem'; +import { usePublicClient, useReadContract } from 'wagmi'; +import type { Chain } from 'wagmi/chains'; +import '../styles/index.css'; +import type { RenderPart } from '../types/types.js'; // import { sanitizeIpfsUrl } from '../lib/ipfs'; -import { Providers } from "./providers.js"; -import { css } from "styled-system/css"; +import { Providers } from './providers.js'; interface INFTRenderer { - chainId: Chain["id"]; + chainId: Chain['id']; contractAddress: Address; tokenId: bigint; advancedMode?: boolean; @@ -82,7 +82,7 @@ export function NFTRenderer({ interfaceSupport: { supports721, supportsEquippable, supportsMultiAsset }, } = useGetInterfaceSupport( { contractAddress, chainId }, - { enabled: isContract } + { enabled: isContract }, ); const { @@ -92,7 +92,7 @@ export function NFTRenderer({ } = useReadContract({ address: contractAddress, abi: RMRKEquippableImpl, - functionName: "tokenURI", + functionName: 'tokenURI', args: [tokenIdBigint], chainId, query: { enabled: isContract && supports721 }, @@ -123,7 +123,7 @@ export function NFTRenderer({ supportsEquippableInterface: supportsEquippable, supportsMultiAssetInterface: supportsMultiAsset, }, - { enabled: isContract } + { enabled: isContract }, ); const { @@ -139,11 +139,11 @@ export function NFTRenderer({ ? [ ...fixedPartsWithMetadatas.map((p) => ({ z: p.z, - src: p.metadata?.mediaUri || "", + src: p.metadata?.mediaUri || '', })), ...slotPartsWithMetadatas.map((p) => ({ z: p.z, - src: p.metadata?.mediaUri || "", + src: p.metadata?.mediaUri || '', })), ] : undefined; @@ -155,13 +155,13 @@ export function NFTRenderer({ src: primaryAsset?.metadata?.mediaUri || primaryAsset?.metadata?.image || - "", + '', }, ] : undefined; const tokenRenderPart: RenderPart[] | undefined = primaryAsset - ? [{ z: 1, src: tokenMetadata?.mediaUri || tokenMetadata?.image || "" }] + ? [{ z: 1, src: tokenMetadata?.mediaUri || tokenMetadata?.image || '' }] : undefined; const renderParts = catalogRenderParts || assetRenderPart || tokenRenderPart; @@ -203,17 +203,17 @@ export function NFTRenderer({
{isLoading ? (
{loader} @@ -254,10 +254,10 @@ export function NFTRenderer({ fillBgWithImageBlur loader={loader} className={css({ - aspectRatio: "1/1", - objectFit: "contain", - width: "100%", - height: "100%", + aspectRatio: '1/1', + objectFit: 'contain', + width: '100%', + height: '100%', })} /> ) : null} diff --git a/packages/rmrk-2d-renderer/panda.config.ts b/packages/rmrk-2d-renderer/panda.config.ts index 2486b0d..26d31e5 100644 --- a/packages/rmrk-2d-renderer/panda.config.ts +++ b/packages/rmrk-2d-renderer/panda.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from "@pandacss/dev"; +import { defineConfig } from '@pandacss/dev'; export default defineConfig({ // Whether to use css reset @@ -6,7 +6,7 @@ export default defineConfig({ prefix: 'rmrk-2d-renderer', // Where to look for your css declarations - include: ["./src/**/*.{js,jsx,ts,tsx}"], + include: ['./src/**/*.{js,jsx,ts,tsx}'], // Files to exclude exclude: [], @@ -17,6 +17,6 @@ export default defineConfig({ }, // The output directory for your css system - outdir: "styled-system", - jsxFramework: "react", + outdir: 'styled-system', + jsxFramework: 'react', }); diff --git a/packages/rmrk-2d-renderer/postcss.config.cjs b/packages/rmrk-2d-renderer/postcss.config.cjs index 573efad..ee939cb 100644 --- a/packages/rmrk-2d-renderer/postcss.config.cjs +++ b/packages/rmrk-2d-renderer/postcss.config.cjs @@ -2,4 +2,4 @@ module.exports = { plugins: { '@pandacss/dev/postcss': {}, }, -} \ No newline at end of file +}; diff --git a/packages/rmrk-2d-renderer/src/lib/rmrk-2d-renderer.tsx b/packages/rmrk-2d-renderer/src/lib/rmrk-2d-renderer.tsx index 792f68f..f58a38e 100644 --- a/packages/rmrk-2d-renderer/src/lib/rmrk-2d-renderer.tsx +++ b/packages/rmrk-2d-renderer/src/lib/rmrk-2d-renderer.tsx @@ -8,10 +8,10 @@ import type { ICanvas } from 'pixi.js'; import type { CSSProperties } from 'react'; import React, { useEffect, useMemo } from 'react'; import { useCallback, useState } from 'react'; +import { css, cx } from 'styled-system/css'; import useImage from 'use-image'; import { Skeleton } from '../ui/skeleton.js'; import { INHERIT_RENDER_CONTEXT } from './consts.js'; -import { css, cx } from 'styled-system/css'; const useObserveElementDimensions = (ref?: React.RefObject) => { const [width, setWidth] = useState(0); diff --git a/packages/rmrk-evm-utils/src/lib/chain-mapping.test.ts b/packages/rmrk-evm-utils/src/lib/chain-mapping.test.ts index 52e2e22..7712e5b 100644 --- a/packages/rmrk-evm-utils/src/lib/chain-mapping.test.ts +++ b/packages/rmrk-evm-utils/src/lib/chain-mapping.test.ts @@ -1,8 +1,11 @@ import { expect, test } from 'vitest'; -import {EVM_NETWORKS, mapEvmNetworkToSupportedChain} from "./chain-mapping.js"; -import {base, mainnet} from "wagmi/chains"; +import { base, mainnet } from 'wagmi/chains'; +import { + EVM_NETWORKS, + mapEvmNetworkToSupportedChain, +} from './chain-mapping.js'; test('mapEvmNetworkToSupportedChain', async () => { - expect(mapEvmNetworkToSupportedChain(EVM_NETWORKS.base)).not.toBe(mainnet); - expect(mapEvmNetworkToSupportedChain(EVM_NETWORKS.base)).toBe(base); -}) + expect(mapEvmNetworkToSupportedChain(EVM_NETWORKS.base)).not.toBe(mainnet); + expect(mapEvmNetworkToSupportedChain(EVM_NETWORKS.base)).toBe(base); +}); diff --git a/packages/rmrk-evm-utils/src/lib/get-chain-id-by-network-name.test.ts b/packages/rmrk-evm-utils/src/lib/get-chain-id-by-network-name.test.ts index 14bd028..975e43e 100644 --- a/packages/rmrk-evm-utils/src/lib/get-chain-id-by-network-name.test.ts +++ b/packages/rmrk-evm-utils/src/lib/get-chain-id-by-network-name.test.ts @@ -1,7 +1,7 @@ import { expect, test } from 'vitest'; +import { base, mainnet } from 'wagmi/chains'; +import { EVM_NETWORKS, mapChainIdToNetwork } from './chain-mapping.js'; import { getChainIdByNetworkName } from './get-chain-id-by-network-name.js'; -import {EVM_NETWORKS, mapChainIdToNetwork} from './chain-mapping.js'; -import {base, mainnet} from 'wagmi/chains'; test('getChainIdByNetworkName', async () => { expect(getChainIdByNetworkName(EVM_NETWORKS.base)).toBe(base.id); @@ -9,6 +9,6 @@ test('getChainIdByNetworkName', async () => { }); test('mapChainIdToNetwork', async () => { - expect(mapChainIdToNetwork(base.id)).toBe(EVM_NETWORKS.base); - expect(mapChainIdToNetwork(mainnet.id)).not.toBe(EVM_NETWORKS.base); + expect(mapChainIdToNetwork(base.id)).toBe(EVM_NETWORKS.base); + expect(mapChainIdToNetwork(mainnet.id)).not.toBe(EVM_NETWORKS.base); }); diff --git a/packages/rmrk-evm-utils/src/lib/get-is-evm-network.test.ts b/packages/rmrk-evm-utils/src/lib/get-is-evm-network.test.ts index 8aba641..a619bdc 100644 --- a/packages/rmrk-evm-utils/src/lib/get-is-evm-network.test.ts +++ b/packages/rmrk-evm-utils/src/lib/get-is-evm-network.test.ts @@ -1,6 +1,6 @@ import { expect, test } from 'vitest'; -import { getIsEvmNetwork } from './get-is-evm-network.js'; import { EVM_NETWORKS } from './chain-mapping.js'; +import { getIsEvmNetwork } from './get-is-evm-network.js'; test('getIsEvmNetwork', async () => { expect(getIsEvmNetwork('foo')).toBe(false); diff --git a/packages/rmrk-evm-utils/src/lib/get-is-expected-network.test.ts b/packages/rmrk-evm-utils/src/lib/get-is-expected-network.test.ts index 58a50aa..ad66a62 100644 --- a/packages/rmrk-evm-utils/src/lib/get-is-expected-network.test.ts +++ b/packages/rmrk-evm-utils/src/lib/get-is-expected-network.test.ts @@ -1,6 +1,6 @@ import { expect, test } from 'vitest'; -import { getIsExpectedNetwork } from './get-is-expected-network.js'; import { EVM_NETWORKS } from './chain-mapping.js'; +import { getIsExpectedNetwork } from './get-is-expected-network.js'; test('getIsExpectedNetwork', async () => { expect(getIsExpectedNetwork('ethereum', [EVM_NETWORKS.base])).toBe(false); diff --git a/vitest.config.ts b/vitest.config.ts index 4e96534..27c99de 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -4,11 +4,7 @@ export default defineConfig({ test: { coverage: { reporter: process.env.CI ? ['lcov'] : ['text', 'json', 'html'], - exclude: [ - '**/dist/**', - '**/*.test.ts', - '**/*.test-d.ts' - ], + exclude: ['**/dist/**', '**/*.test.ts', '**/*.test-d.ts'], }, // globalSetup: ['./packages/test/src/globalSetup.ts'], // setupFiles: ['./packages/test/src/setup.ts'],