Merge pull request #35 from kodadot/uni-v1-query

💥 Uniquery v0.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kodadot1/uniquery",
-  "version": "0.3.1-rc.0",
+  "version": "0.4.0",
   "description": "Universal GraphQL query builder for KodaDot",
   "repository": "kodadot/uniquery",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "test": "vitest run --dir test"
   },
   "dependencies": {
-    "@kodadot1/static": "0.0.3-rc.5",
+    "@kodadot1/static": "0.0.3",
     "gql-query-builder": "^3.8.0",
     "ofetch": "^1.1.1",
     "scule": "^1.0.0",

src/clients/SquidClient.ts

@@ -53,32 +53,32 @@ class SquidClient implements AbstractClient<SquidCollection, SquidNFT> {
   }
 
   eventList(options?: QueryProps<BaseEvent>): GraphQuery {
-    const toQuery = getFields(options?.fields ?? defaultEventField)
+    const toQuery = getFields(options?.fields, defaultEventField, false)
     const optionList = optionToQuery(options, true)
     return build(`events(${optionList})`, toQuery)
   }
 
   eventListByAddress(address: string, options?: QueryProps<BaseEvent>): GraphQuery {
-    const toQuery = getFields(options?.fields ?? defaultEventField)
+    const toQuery = getFields(options?.fields, defaultEventField, false)
     const optionList = optionToQuery(options, true)
     return build(`events(where: {caller_eq: "${address}" } ${optionList})`, toQuery)
   }
 
   eventListByCollectionId(id: string, options?: QueryProps<BaseEvent>): GraphQuery {
-    const toQuery = getFields(options?.fields ?? defaultEventField)
+    const toQuery = getFields(options?.fields, defaultEventField, false)
     const optionList = optionToQuery(options, true)
     return build(`events(where: {nft: {id_eq: "${id}"}} ${optionList})`, toQuery)
     // events(where: { nft: { collection: { id_eq: "" }}})
   }
 
   eventListByInteraction(interaction: string, options?: QueryProps<BaseEvent>): GraphQuery {
-    const toQuery = getFields(options?.fields ?? defaultEventField)
+    const toQuery = getFields(options?.fields, defaultEventField, false)
     const optionList = optionToQuery(options, true)
     return build(`events(where: {interaction_eq: ${interaction}} ${optionList})`, toQuery)
   }
 
   eventListByItemId(id: string, options?: QueryProps<BaseEvent>): GraphQuery {
-    const toQuery = getFields(options?.fields ?? defaultEventField)
+    const toQuery = getFields(options?.fields, defaultEventField, false)
     const optionList = optionToQuery(options, true)
     return build(`events(where: {nft: {id_eq: "${id}"}} ${optionList})`, toQuery)
   }

src/clients/defaults.ts

@@ -17,15 +17,16 @@ export function extendFields<T extends AbstractBase>(fields: ObjProp<T>): ObjPro
   return [...set]
 }
 
-export function getFields<T>(fields?: ObjProp<T>, defaultList: ObjProp<T> | string[] = defaultField): Fields<T> {
+export function getFields<T>(fields?: ObjProp<T>, defaultList: ObjProp<T> | string[] = defaultField, replaceMetaField = true): Fields<T> {
   const list = fields ?? defaultList
 
-  const metaIndex = list.findIndex(hasMetaField)
+  if (replaceMetaField) {
+    const metaIndex = list.findIndex(hasMetaField)
 
-  if (metaIndex !== -1) {
-    list.splice(metaIndex, 1, { meta: ['id', 'name', 'description', 'image', 'animationUrl', 'type'] } as any)
+    if (metaIndex !== -1) {
+      list.splice(metaIndex, 1, { meta: ['id', 'name', 'description', 'image', 'animationUrl', 'type'] } as any)
+    }
   }
-
   return list
 }
 

src/rest/indexers.ts

@@ -1,13 +1,6 @@
+import { INDEXERS } from '@kodadot1/static'
 import { Prefix } from './types'
 
-export const indexers: Record<Prefix, string> = {
-  ksm: 'https://squid.subsquid.io/rubick/v/008',
-  bsx: 'https://squid.subsquid.io/snekk/v/005',
-  snek: 'https://squid.subsquid.io/snekk/v/004',
-  movr: 'https://squid.subsquid.io/antick/v/001-rc0',
-  glmr: 'https://squid.subsquid.io/click/v/002'
-}
+export const getUrl = (chain: Prefix | ''): string => INDEXERS[chain]
 
-export const getUrl = (chain: Prefix | ''): string => indexers[chain]
-
-export const getAvailableChains = (): Prefix[] => Object.keys(indexers) as Prefix[]
+export const getAvailableChains = (): Prefix[] => Object.keys(INDEXERS) as Prefix[]

test/index.test.ts

@@ -19,6 +19,26 @@ describe('UNIQUERY UTILS', () => {
       const fn = () => getUrl('ksm', 'subquery')
       expect(fn).toThrow(ReferenceError)
     })
+
+    it('should return default kusama indexer', () => {
+      const url = getUrl('ksm')
+      expect(url).eq('https://squid.subsquid.io/marck/v/v2/graphql')
+    })
+
+    it('should return default basilisk indexer', () => {
+      const url = getUrl('bsx')
+      expect(url).eq('https://squid.subsquid.io/snekk/graphql')
+    })
+
+    it('should return default Kusama Asset Hub indexer', () => {
+      const url = getUrl('ahk')
+      expect(url).eq('https://squid.subsquid.io/stick/graphql')
+    })
+
+    it('should return default Polkadot Asset Hub indexer', () => {
+      const url = getUrl('ahp')
+      expect(url).eq('https://squid.subsquid.io/speck/graphql')
+    })
   })
 
   describe('getFields', () => {

test/path.test.ts

@@ -40,14 +40,14 @@ describe.only('Path utils', () => {
     for (const test of tests) {
       it(test.input, () => {
         const res = pathToRequest(`/bsx/${test.input}`)
-        expect(res.baseURL).toBe('https://squid.subsquid.io/snekk/v/005')
+        expect(res.baseURL).toBe('https://squid.subsquid.io/snekk/graphql')
         expect(res).haveOwnProperty('query')
         expect(res.query).not.toBeUndefined()
       })
     }
   })
 
-  describe('faioled path to request', () => {
+  describe('failed path to request', () => {
     const tests = [
       { input: 'sbx/collection/2305670031' },
       { input: 'rmrk/itemById/2305670031-1' },