@subsquid/openreader 4.6.0 → 5.0.0-beta.b87ffb

package/src/test/lookup.test.ts

@@ -1,3 +1,4 @@
+import {Dialect} from '../dialect'
 import {isCockroach, useDatabase, useServer} from "./setup"
 
 describe('lookup test', function () {
@@ -13,105 +14,211 @@ describe('lookup test', function () {
         `insert into issue_cancellation (id, issue_id, height) values ('3', '3', 10)`,
     ])
 
-    const client = useServer(`
-        type Issue @entity {
-            id: ID!
-            payment: IssuePayment @derivedFrom(field: "issue")
-            cancellation: IssueCancellation @derivedFrom(field: "issue")
-        }
-        
-        type IssuePayment @entity {
-            id: ID!
-            issue: Issue! @unique
-            amount: Int!
-        }
-        
-        type IssueCancellation @entity {
-            id: ID!
-            issue: Issue! @unique
-            height: Int!
-        }
-    `)
-
-    it('fetches correctly', function () {
-        return client.test(`
-            query {
-                issues(orderBy: [id_ASC]) {
-                    id
-                    payment {
-                        amount
-                    }
-                    cancellation {
-                        height
-                        issue {
-                            cancellation {
-                                id
+    describe('opencrud', function () {
+        const client = useServer(`
+            type Issue @entity {
+                id: ID!
+                payment: IssuePayment @derivedFrom(field: "issue")
+                cancellation: IssueCancellation @derivedFrom(field: "issue")
+            }
+            
+            type IssuePayment @entity {
+                id: ID!
+                issue: Issue! @unique
+                amount: Int!
+            }
+            
+            type IssueCancellation @entity {
+                id: ID!
+                issue: Issue! @unique
+                height: Int!
+            }
+        `)
+    
+        it('fetches correctly', function () {
+            return client.test(`
+                query {
+                    issues(orderBy: [id_ASC]) {
+                        id
+                        payment {
+                            amount
+                        }
+                        cancellation {
+                            height
+                            issue {
+                                cancellation {
+                                    id
+                                }
                             }
                         }
                     }
                 }
-            }
-        `, {
-            issues: [
-                {
-                    id: '1',
-                    payment: {amount: 2},
-                    cancellation: null
-                },
-                {
-                    id: '2',
-                    payment: {amount: 1},
-                    cancellation: null
-                },
-                {
-                    id: '3',
-                    payment: null,
-                    cancellation: {
-                        height: 10,
-                        issue: {
-                            cancellation: {
-                                id: '3'
+            `, {
+                issues: [
+                    {
+                        id: '1',
+                        payment: {amount: 2},
+                        cancellation: null
+                    },
+                    {
+                        id: '2',
+                        payment: {amount: 1},
+                        cancellation: null
+                    },
+                    {
+                        id: '3',
+                        payment: null,
+                        cancellation: {
+                            height: 10,
+                            issue: {
+                                cancellation: {
+                                    id: '3'
+                                }
                             }
                         }
                     }
+                ]
+            })
+        })
+    
+        it('supports sorting on lookup fields', function () {
+            return client.test(`
+                query {
+                    issues(orderBy: [payment_amount_ASC]) {
+                        id
+                    }
                 }
-            ]
+            `, {
+                issues: isCockroach()
+                    ? [
+                        {id: '3'},
+                        {id: '2'},
+                        {id: '1'}
+                    ]
+                    : [
+                        {id: '2'},
+                        {id: '1'},
+                        {id: '3'}
+                    ]
+            })
         })
-    })
-
-    it('supports sorting on lookup fields', function () {
-        return client.test(`
-            query {
-                issues(orderBy: [payment_amount_ASC]) {
-                    id
+    
+        it('supports where conditions', function () {
+            return client.test(`
+                query {
+                    issues(where: {payment: {amount_gt: 1}}) {
+                        id
+                    }
                 }
-            }
-        `, {
-            issues: isCockroach()
-                ? [
-                    {id: '3'},
-                    {id: '2'},
+            `, {
+                issues: [
                     {id: '1'}
                 ]
-                : [
-                    {id: '2'},
-                    {id: '1'},
-                    {id: '3'}
-                ]
+            })
         })
     })
 
-    it('supports where conditions', function () {
-        return client.test(`
-            query {
-                issues(where: {payment: {amount_gt: 1}}) {
-                    id
-                }
+    describe('thegraph', function () {
+        const client = useServer(`
+            type Issue @entity {
+                id: ID!
+                payment: IssuePayment @derivedFrom(field: "issue")
+                cancellation: IssueCancellation @derivedFrom(field: "issue")
+            }
+            
+            type IssuePayment @entity {
+                id: ID!
+                issue: Issue! @unique
+                amount: Int!
+            }
+            
+            type IssueCancellation @entity {
+                id: ID!
+                issue: Issue! @unique
+                height: Int!
             }
-        `, {
-            issues: [
-                {id: '1'}
-            ]
+        `, {dialect: Dialect.TheGraph})
+    
+        it('fetches correctly', function () {
+            return client.test(`
+                query {
+                    issues(orderBy: id, orderDirection: asc) {
+                        id
+                        payment {
+                            amount
+                        }
+                        cancellation {
+                            height
+                            issue {
+                                cancellation {
+                                    id
+                                }
+                            }
+                        }
+                    }
+                }
+            `, {
+                issues: [
+                    {
+                        id: '1',
+                        payment: {amount: 2},
+                        cancellation: null
+                    },
+                    {
+                        id: '2',
+                        payment: {amount: 1},
+                        cancellation: null
+                    },
+                    {
+                        id: '3',
+                        payment: null,
+                        cancellation: {
+                            height: 10,
+                            issue: {
+                                cancellation: {
+                                    id: '3'
+                                }
+                            }
+                        }
+                    }
+                ]
+            })
+        })
+    
+        it('supports sorting on lookup fields', function () {
+            return client.test(`
+                query {
+                    issues(orderBy: payment__amount, orderDirection: asc) {
+                        id
+                    }
+                }
+            `, {
+                issues: isCockroach()
+                    ? [
+                        {id: '3'},
+                        {id: '2'},
+                        {id: '1'}
+                    ]
+                    : [
+                        {id: '2'},
+                        {id: '1'},
+                        {id: '3'}
+                    ]
+            })
+        })
+    
+        it('supports where conditions', function () {
+            return client.test(`
+                query {
+                    issues(where: {payment_: {amount_gt: 1}}) {
+                        id
+                    }
+                }
+            `, {
+                issues: [
+                    {id: '1'}
+                ]
+            })
         })
     })
 })

package/src/test/setup.ts

@@ -69,12 +69,12 @@ export function useServer(schema: string, options?: Partial<ServerOptions>): Cli
             connection: db,
             model: buildModel(buildSchema(parse(schema))),
             port: 0,
-            dialect: isCockroach() ? 'cockroach' : 'postgres',
+            dbType: isCockroach() ? 'cockroach' : 'postgres',
             subscriptions: true,
             subscriptionPollInterval: 500,
             maxRootFields: 10,
             // log: createLogger('sqd:openreader'),
-            ...options
+            ...options,
         })
         client.endpoint = `http://localhost:${info.port}/graphql`
     })

package/src/test/where.test.ts

@@ -1,3 +1,4 @@
+import {Dialect} from '../dialect'
 import {useDatabase, useServer} from "./setup"
 
 describe('AND, OR on entity filters', function () {
@@ -11,125 +12,251 @@ describe('AND, OR on entity filters', function () {
         `insert into item (id, a, b) values ('6', 5, 6)`,
     ])
 
-    const client = useServer(`
-        type Item @entity {
-            id: ID!
-            a: Int
-            b: Int
-        }
-    `)
-
-    it('{c, and: {c}}', function () {
-        return client.test(`
-            query {
-                items(where: {a_eq: 1, AND: {b_eq: 1}} orderBy: id_ASC) { id }
+    describe('opencrud', function() {
+        const client = useServer(`
+            type Item @entity {
+                id: ID!
+                a: Int
+                b: Int
             }
-        `, {
-            items: [
-                {id: '1'}
-            ]
+        `)
+    
+        it('{c, and: {c}}', function () {
+            return client.test(`
+                query {
+                    items(where: {a_eq: 1, AND: {b_eq: 1}} orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '1'}
+                ]
+            })
         })
-    })
-
-    it('{and: {and: {c}, c}}', function () {
-        return client.test(`
-            query {
-                items(where: {AND: {b_eq: 2, AND: {a_eq: 3}}} orderBy: id_ASC) { id }
-            }
-        `, {
-            items: [
-                {id: '3'}
-            ]
+    
+        it('{and: {and: {c}, c}}', function () {
+            return client.test(`
+                query {
+                    items(where: {AND: {b_eq: 2, AND: {a_eq: 3}}} orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '3'}
+                ]
+            })
         })
-    })
-
-    it('{and: [{c}, {c}]}', function () {
-        return client.test(`
-            query {
-                items(where: {AND: [{a_eq: 2}, {b_eq: 2}]} orderBy: id_ASC) { id }
-            }
-        `, {
-            items: [
-                {id: '2'}
-            ]
+    
+        it('{and: [{c}, {c}]}', function () {
+            return client.test(`
+                query {
+                    items(where: {AND: [{a_eq: 2}, {b_eq: 2}]} orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '2'}
+                ]
+            })
         })
-    })
-
-    it('{c, {or: {c}}}', function () {
-        return client.test(`
-            query {
-                items(where: {a_eq: 1, OR: {a_eq: 2}} orderBy: id_ASC) { id }
-            }
-        `, {
-            items: [
-                {id: '1'},
-                {id: '2'}
-            ]
+    
+        it('{c, {or: {c}}}', function () {
+            return client.test(`
+                query {
+                    items(where: {a_eq: 1, OR: {a_eq: 2}} orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '1'},
+                    {id: '2'}
+                ]
+            })
         })
-    })
-
-    it('{or: [{c}, {c}]}', function () {
-        return client.test(`
-            query {
-                items(where: {OR: [{a_eq: 2}, {a_eq: 3}]} orderBy: id_ASC) { id }
-            }
-        `, {
-            items: [
-                {id: '2'},
-                {id: '3'}
-            ]
+    
+        it('{or: [{c}, {c}]}', function () {
+            return client.test(`
+                query {
+                    items(where: {OR: [{a_eq: 2}, {a_eq: 3}]} orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '2'},
+                    {id: '3'}
+                ]
+            })
         })
-    })
-
-    it('{or: {or: {c}, c}}', function () {
-        return client.test(`
-            query {
-                items(where: {OR: {a_eq: 1, OR: {b_eq: 2}}} orderBy: id_ASC) { id }
-            }
-        `, {
-            items: [
-                {id: '1'},
-                {id: '2'},
-                {id: '3'}
-            ]
+    
+        it('{or: {or: {c}, c}}', function () {
+            return client.test(`
+                query {
+                    items(where: {OR: {a_eq: 1, OR: {b_eq: 2}}} orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '1'},
+                    {id: '2'},
+                    {id: '3'}
+                ]
+            })
         })
-    })
-
-    it('{and: [{or: {c}, c}, {or: {c}, c}]}', function () {
-        return client.test(`
-            query {
-                items(where: {AND: [{OR: {a_eq: 5}, a_eq: 4}, {OR: {b_eq: 2}, b_eq: 4}]} orderBy: id_ASC) { id }
-            }
-        `, {
-            items: [
-                {id: '4'},
-                {id: '5'}
-            ]
+    
+        it('{and: [{or: {c}, c}, {or: {c}, c}]}', function () {
+            return client.test(`
+                query {
+                    items(where: {AND: [{OR: {a_eq: 5}, a_eq: 4}, {OR: {b_eq: 2}, b_eq: 4}]} orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '4'},
+                    {id: '5'}
+                ]
+            })
         })
-    })
-
-    it('{c, and: {c}, or: {c}}', function () {
-        return client.test(`
-            query {
-                items(where: { a_eq: 4, AND: {b_eq: 4}, OR: {b_eq: 6} } orderBy: id_ASC) { id }
-            }
-        `, {
-            items: [
-                {id: '4'},
-                {id: '6'}
-            ]
+    
+        it('{c, and: {c}, or: {c}}', function () {
+            return client.test(`
+                query {
+                    items(where: { a_eq: 4, AND: {b_eq: 4}, OR: {b_eq: 6} } orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '4'},
+                    {id: '6'}
+                ]
+            })
+        })
+    
+        it('handles empty wheres', function () {
+            return client.test(`
+                query {
+                    items(where: { a_eq: 4, AND: { OR: {}, AND: {} }, OR: { OR: {AND: {} } } } orderBy: id_ASC) { id }
+                }
+            `, {
+                items: [
+                    {id: '4'}
+                ]
+            })
         })
     })
-
-    it('handles empty wheres', function () {
-        return client.test(`
-            query {
-                items(where: { a_eq: 4, AND: { OR: {}, AND: {} }, OR: { OR: {AND: {} } } } orderBy: id_ASC) { id }
+    
+    describe('thegraph', function() {
+        const client = useServer(`
+            type Item @entity {
+                id: ID!
+                a: Int
+                b: Int
             }
-        `, {
-            items: [
-                {id: '4'}
-            ]
+        `, {dialect: Dialect.TheGraph})
+    
+        it('{c, and: {c}}', function () {
+            return client.test(`
+                query {
+                    items(where: {a: 1, and: {b: 1}}, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '1'}
+                ]
+            })
+        })
+    
+        it('{and: {and: {c}, c}}', function () {
+            return client.test(`
+                query {
+                    items(where: {and: {b: 2, and: {a: 3}}}, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '3'}
+                ]
+            })
+        })
+    
+        it('{and: [{c}, {c}]}', function () {
+            return client.test(`
+                query {
+                    items(where: {and: [{a: 2}, {b: 2}]}, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '2'}
+                ]
+            })
+        })
+    
+        it('{c, {or: {c}}}', function () {
+            return client.test(`
+                query {
+                    items(where: {a: 1, or: {a: 2}}, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '1'},
+                    {id: '2'}
+                ]
+            })
+        })
+    
+        it('{or: [{c}, {c}]}', function () {
+            return client.test(`
+                query {
+                    items(where: {or: [{a: 2}, {a: 3}]}, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '2'},
+                    {id: '3'}
+                ]
+            })
+        })
+    
+        it('{or: {or: {c}, c}}', function () {
+            return client.test(`
+                query {
+                    items(where: {or: {a: 1, or: {b: 2}}}, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '1'},
+                    {id: '2'},
+                    {id: '3'}
+                ]
+            })
+        })
+    
+        it('{and: [{or: {c}, c}, {or: {c}, c}]}', function () {
+            return client.test(`
+                query {
+                    items(where: {and: [{or: {a: 5}, a: 4}, {or: {b: 2}, b: 4}]}, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '4'},
+                    {id: '5'}
+                ]
+            })
+        })
+    
+        it('{c, and: {c}, or: {c}}', function () {
+            return client.test(`
+                query {
+                    items(where: { a: 4, and: {b: 4}, or: {b: 6} }, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '4'},
+                    {id: '6'}
+                ]
+            })
+        })
+    
+        it('handles empty wheres', function () {
+            return client.test(`
+                query {
+                    items(where: { a: 4, and: { or: {}, and: {} }, or: { or: {and: {} } } }, orderBy: id, orderDirection: asc) { id }
+                }
+            `, {
+                items: [
+                    {id: '4'}
+                ]
+            })
         })
     })
 })

package/lib/dialect.d.ts

@@ -1,2 +0,0 @@
-export type Dialect = 'postgres' | 'cockroach';
-//# sourceMappingURL=dialect.d.ts.map