From 26e8676c8af43e186bcf6ab320603ed6c9c36417 Mon Sep 17 00:00:00 2001 From: rlajous Date: Mon, 21 Aug 2023 13:06:33 +0200 Subject: [PATCH 1/3] PLT-1404 Import new queries --- packages/drops/package.json | 4 +- packages/drops/src/DropsClient.ts | 7 +- packages/drops/src/queries/utils.ts | 58 -------------- packages/moments/package.json | 4 +- packages/moments/src/client/MomentsClient.ts | 7 +- packages/poaps/package.json | 4 +- packages/poaps/src/PoapsClient.ts | 7 +- packages/poaps/src/queries/utils.ts | 80 -------------------- packages/utils/package.json | 2 +- packages/utils/src/index.ts | 1 + yarn.lock | 2 +- 11 files changed, 21 insertions(+), 155 deletions(-) delete mode 100644 packages/drops/src/queries/utils.ts delete mode 100644 packages/poaps/src/queries/utils.ts diff --git a/packages/drops/package.json b/packages/drops/package.json index 935b58ba..6ad6686f 100644 --- a/packages/drops/package.json +++ b/packages/drops/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/drops", - "version": "0.0.32", + "version": "0.0.33", "description": "Drops module for the poap.js library", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", @@ -30,6 +30,6 @@ }, "peerDependencies": { "@poap-xyz/providers": "0.0.31", - "@poap-xyz/utils": "0.0.32" + "@poap-xyz/utils": "0.0.34" } } diff --git a/packages/drops/src/DropsClient.ts b/packages/drops/src/DropsClient.ts index fd6cb351..8a0b6246 100644 --- a/packages/drops/src/DropsClient.ts +++ b/packages/drops/src/DropsClient.ts @@ -5,15 +5,16 @@ import { } from '@poap-xyz/providers'; import { Drop } from './domain/Drop'; import { PaginatedDropsResponse, PAGINATED_DROPS_QUERY } from './queries'; +import { CreateDropsInput, FetchDropsInput, UpdateDropsInput } from './types'; import { + PaginatedResult, + nextCursor, creatPrivateFilter, creatUndefinedOrder, createBetweenFilter, createFilter, createInFilter, -} from './queries/utils'; -import { CreateDropsInput, FetchDropsInput, UpdateDropsInput } from './types'; -import { PaginatedResult, nextCursor } from '@poap-xyz/utils'; +} from '@poap-xyz/utils'; /** * Represents a client for working with POAP drops. diff --git a/packages/drops/src/queries/utils.ts b/packages/drops/src/queries/utils.ts deleted file mode 100644 index ed64ec09..00000000 --- a/packages/drops/src/queries/utils.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -export function filterUndefinedProperties>( - obj: T, -): Partial { - const filteredObj: Partial = {}; - for (const key in obj) { - if (obj[key] !== undefined) { - filteredObj[key] = obj[key]; - } - } - return filteredObj; -} - -export function creatUndefinedOrder( - key: string | undefined, - value?: string | undefined, -): Record { - return key && value ? { [key]: value } : {}; -} - -export function createFilter(key: string, value?: string): Record { - return value ? { [key]: { _ilike: `%${value}%` } } : {}; -} - -export function creatEqFilter( - key: string, - value?: string | number, -): Record { - return value ? { [key]: { _eq: value } } : {}; -} - -export function creatPrivateFilter( - key: string, - value?: boolean, -): Record { - return typeof value === 'boolean' - ? { [key]: { _eq: value ? 'true' : 'false' } } - : {}; -} - -export function createInFilter( - key: string, - values?: Array, -): Record { - return values && values.length ? { [key]: { _in: values } } : {}; -} - -export function createBetweenFilter( - key: string, - from?: string, - to?: string, -): Record { - const dateFilter: { _gte?: string; _lte?: string } = {}; - if (from) dateFilter._gte = from; - if (to) dateFilter._lte = to; - - return from || to ? { [key]: dateFilter } : {}; -} diff --git a/packages/moments/package.json b/packages/moments/package.json index 18be4fec..c9c3e46b 100644 --- a/packages/moments/package.json +++ b/packages/moments/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/moments", - "version": "0.0.32", + "version": "0.0.33", "description": "Moments module for the poap.js library", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", @@ -30,6 +30,6 @@ }, "peerDependencies": { "@poap-xyz/providers": "0.0.31", - "@poap-xyz/utils": "0.0.32" + "@poap-xyz/utils": "0.0.34" } } diff --git a/packages/moments/src/client/MomentsClient.ts b/packages/moments/src/client/MomentsClient.ts index fe980c4e..262d5aee 100644 --- a/packages/moments/src/client/MomentsClient.ts +++ b/packages/moments/src/client/MomentsClient.ts @@ -1,13 +1,14 @@ import { PoapMomentsApi, CompassProvider } from '@poap-xyz/providers'; -import { PaginatedResult, nextCursor } from '@poap-xyz/utils'; -import { Moment } from '../domain/Moment'; import { + PaginatedResult, + nextCursor, createBetweenFilter, createFilter, createInFilter, creatEqFilter, filterUndefinedProperties, -} from '../queries/utils'; +} from '@poap-xyz/utils'; +import { Moment } from '../domain/Moment'; import { MomentResponse, MomentsQueryResponse, diff --git a/packages/poaps/package.json b/packages/poaps/package.json index eb910ebe..1aa361a9 100644 --- a/packages/poaps/package.json +++ b/packages/poaps/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/poaps", - "version": "0.0.32", + "version": "0.0.33", "description": "Poaps module for the poap.js library", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", @@ -30,6 +30,6 @@ }, "peerDependencies": { "@poap-xyz/providers": "0.0.31", - "@poap-xyz/utils": "0.0.32" + "@poap-xyz/utils": "0.0.34" } } diff --git a/packages/poaps/src/PoapsClient.ts b/packages/poaps/src/PoapsClient.ts index 775b3b76..04cbd19c 100644 --- a/packages/poaps/src/PoapsClient.ts +++ b/packages/poaps/src/PoapsClient.ts @@ -1,15 +1,16 @@ import { CompassProvider } from '@poap-xyz/providers'; import { POAP } from './domain/Poap'; import { PaginatedPoapsResponse, PAGINATED_POAPS_QUERY } from './queries'; +import { FetchPoapsInput } from './types'; import { + PaginatedResult, + nextCursor, createBetweenFilter, creatEqFilter, createInFilter, creatUndefinedOrder, creatAddressFilter, -} from './queries/utils'; -import { FetchPoapsInput } from './types'; -import { PaginatedResult, nextCursor } from '@poap-xyz/utils'; +} from '@poap-xyz/utils'; /** * Represents a client for working with POAP drops. diff --git a/packages/poaps/src/queries/utils.ts b/packages/poaps/src/queries/utils.ts deleted file mode 100644 index 94b69ee8..00000000 --- a/packages/poaps/src/queries/utils.ts +++ /dev/null @@ -1,80 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -export function filterUndefinedProperties>( - obj: T, -): Partial { - const filteredObj: Partial = {}; - for (const key in obj) { - if (obj[key] !== undefined) { - filteredObj[key] = obj[key]; - } - } - return filteredObj; -} - -export function creatUndefinedOrder( - key: string | undefined, - value?: string | undefined, -): Record { - return key && value ? { [key]: value } : {}; -} - -export function createFilter(key: string, value?: string): Record { - return value ? { [key]: { _ilike: `%${value}%` } } : {}; -} - -export function creatEqFilter( - key: string, - value?: string | number, -): Record { - return value ? { [key]: { _eq: value } } : {}; -} - -export function creatNeqFilter( - key: string, - value?: string | number, -): Record { - return value ? { [key]: { _neq: value } } : {}; -} - -export function filterZeroAddress(filter: boolean): Record { - return filter ? { _neq: '0x0000000000000000000000000000000000000000' } : {}; -} - -export function creatAddressFilter( - key: string, - filter: boolean, - value?: string, -): Record { - const addressFilter = { - [key]: { - ...filterZeroAddress(filter), - }, - }; - - if (value) { - addressFilter[key]._eq = value.toLocaleLowerCase(); - } - return filter || value ? addressFilter : {}; -} - -export function createInFilter( - key: string, - values?: Array, -): Record { - return values && values.length ? { [key]: { _in: values } } : {}; -} - -export function createBetweenFilter( - key: string, - from?: string, - to?: string, -): Record { - const dateFilter: { _gte?: string; _lte?: string } = {}; - if (from) { - dateFilter._gte = from; - } - if (to) { - dateFilter._lte = to; - } - return from || to ? { [key]: dateFilter } : {}; -} diff --git a/packages/utils/package.json b/packages/utils/package.json index ac5abc83..4fa971d5 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/utils", - "version": "0.0.33", + "version": "0.0.34", "description": "Utils module for the poap.js library", "type": "module", "main": "dist/cjs/index.cjs", diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index e7c9773f..60c4e04b 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -14,4 +14,5 @@ export { creatAddressFilter, createInFilter, createBetweenFilter, + creatPrivateFilter, } from './queries/utils'; diff --git a/yarn.lock b/yarn.lock index 4a4a5ee2..34a25031 100644 --- a/yarn.lock +++ b/yarn.lock @@ -895,7 +895,7 @@ __metadata: rollup: ^3.20.2 peerDependencies: "@poap-xyz/providers": 0.0.31 - "@poap-xyz/utils": 0.0.32 + "@poap-xyz/utils": 0.0.33 languageName: unknown linkType: soft From b4ff346fc674791ad02937954192af859702a89a Mon Sep 17 00:00:00 2001 From: rlajous Date: Mon, 21 Aug 2023 13:07:31 +0200 Subject: [PATCH 2/3] PLT-1404 Delete un used code --- packages/moments/src/queries/utils.ts | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100644 packages/moments/src/queries/utils.ts diff --git a/packages/moments/src/queries/utils.ts b/packages/moments/src/queries/utils.ts deleted file mode 100644 index b436f5aa..00000000 --- a/packages/moments/src/queries/utils.ts +++ /dev/null @@ -1,42 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -export function filterUndefinedProperties>( - obj: T, -): Partial { - const filteredObj: Partial = {}; - for (const key in obj) { - if (obj[key] !== undefined) { - filteredObj[key] = obj[key]; - } - } - return filteredObj; -} - -export function createFilter(key: string, value?: string): Record { - return value ? { [key]: { _ilike: `%${value}%` } } : {}; -} - -export function creatEqFilter( - key: string, - value?: string | number, -): Record { - return value ? { [key]: { _eq: value } } : {}; -} - -export function createInFilter( - key: string, - values?: Array, -): Record { - return values && values.length ? { [key]: { _in: values } } : {}; -} - -export function createBetweenFilter( - key: string, - from?: string, - to?: string, -): Record { - const dateFilter: { _gte?: string; _lte?: string } = {}; - if (from) dateFilter._gte = from; - if (to) dateFilter._lte = to; - - return from || to ? { [key]: dateFilter } : {}; -} From 67b6a7b75b3461ecc315eeee1fa6e5057fcf6b14 Mon Sep 17 00:00:00 2001 From: rlajous Date: Mon, 21 Aug 2023 13:20:42 +0200 Subject: [PATCH 3/3] PLT-1404 Updated yarn --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 34a25031..39f703f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -873,7 +873,7 @@ __metadata: rollup: ^3.20.2 peerDependencies: "@poap-xyz/providers": 0.0.31 - "@poap-xyz/utils": 0.0.32 + "@poap-xyz/utils": 0.0.34 languageName: unknown linkType: soft @@ -884,7 +884,7 @@ __metadata: rollup: ^3.20.2 peerDependencies: "@poap-xyz/providers": 0.0.31 - "@poap-xyz/utils": 0.0.32 + "@poap-xyz/utils": 0.0.34 languageName: unknown linkType: soft @@ -895,7 +895,7 @@ __metadata: rollup: ^3.20.2 peerDependencies: "@poap-xyz/providers": 0.0.31 - "@poap-xyz/utils": 0.0.33 + "@poap-xyz/utils": 0.0.34 languageName: unknown linkType: soft