@subsquid/openreader 4.5.1 → 5.0.0-beta.62d187

package/lib/test/where.test.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const dialect_1 = require("../dialect");
 const setup_1 = require("./setup");
 describe('AND, OR on entity filters', function () {
     (0, setup_1.useDatabase)([
@@ -11,116 +12,232 @@ describe('AND, OR on entity filters', function () {
         `insert into item (id, a, b) values ('5', 5, 4)`,
         `insert into item (id, a, b) values ('6', 5, 6)`,
     ]);
-    const client = (0, setup_1.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 = (0, setup_1.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 = (0, setup_1.useServer)(`
+            type Item @entity {
+                id: ID!
+                a: Int
+                b: Int
             }
-        `, {
-            items: [
-                { id: '4' }
-            ]
+        `, { dialect: dialect_1.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/test/where.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"where.test.js","sourceRoot":"","sources":["../../src/test/where.test.ts"],"names":[],"mappings":";;AAAA,mCAA8C;AAE9C,QAAQ,CAAC,2BAA2B,EAAE;IAClC,IAAA,mBAAW,EAAC;QACR,uDAAuD;QACvD,gDAAgD;QAChD,gDAAgD;QAChD,gDAAgD;QAChD,gDAAgD;QAChD,gDAAgD;QAChD,gDAAgD;KACnD,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC;;;;;;KAMxB,CAAC,CAAA;IAEF,EAAE,CAAC,eAAe,EAAE;QAChB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sBAAsB,EAAE;QACvB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mBAAmB,EAAE;QACpB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gBAAgB,EAAE;QACjB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;gBACT,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kBAAkB,EAAE;QACnB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;gBACT,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oBAAoB,EAAE;QACrB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;gBACT,EAAC,EAAE,EAAE,GAAG,EAAC;gBACT,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qCAAqC,EAAE;QACtC,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;gBACT,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wBAAwB,EAAE;QACzB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;gBACT,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sBAAsB,EAAE;QACvB,OAAO,MAAM,CAAC,IAAI,CAAC;;;;SAIlB,EAAE;YACC,KAAK,EAAE;gBACH,EAAC,EAAE,EAAE,GAAG,EAAC;aACZ;SACJ,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
+{"version":3,"file":"where.test.js","sourceRoot":"","sources":["../../src/test/where.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subsquid/openreader",
-  "version": "4.5.1",
+  "version": "5.0.0-beta.62d187",
   "description": "GraphQL server for postgres-compatible databases",
   "keywords": [
     "graphql",
@@ -24,11 +24,11 @@
     "@graphql-tools/merge": "^9.0.1",
     "@subsquid/graphiql-console": "^0.3.0",
     "@subsquid/logger": "^1.3.3",
-    "@subsquid/util-internal": "^3.1.0",
-    "@subsquid/util-internal-commander": "^1.3.2",
+    "@subsquid/util-internal": "^3.2.0",
+    "@subsquid/util-internal-commander": "^1.4.0",
     "@subsquid/util-internal-hex": "^1.2.2",
     "@subsquid/util-internal-http-server": "^2.0.0",
-    "@subsquid/util-naming": "^1.2.2",
+    "@subsquid/util-naming": "^1.3.0",
     "apollo-server-core": "^3.13.0",
     "apollo-server-express": "^3.13.0",
     "commander": "^11.1.0",
@@ -38,7 +38,8 @@
     "graphql-parse-resolve-info": "^4.14.0",
     "graphql-ws": "^5.14.2",
     "pg": "^8.11.3",
-    "ws": "^8.14.2"
+    "ws": "^8.14.2",
+    "inflected": "^2.1.0"
   },
   "peerDependencies": {
     "@subsquid/big-decimal": "^1.0.0"
@@ -59,7 +60,8 @@
     "expect": "^29.7.0",
     "gql-test-client": "^0.0.0",
     "mocha": "^10.2.0",
-    "typescript": "~5.3.2"
+    "typescript": "~5.3.2",
+    "@types/inflected": "^2.1.3"
   },
   "scripts": {
     "build": "rm -rf lib && tsc",

package/src/context.ts

@@ -1,5 +1,5 @@
 import type {Logger} from '@subsquid/logger'
-import type {Dialect} from './dialect'
+import type {DbType} from './db'
 import type {Query} from './sql/query'
 import type {Limit} from './util/limit'
 
@@ -11,7 +11,7 @@ export interface Context {
 
 export interface OpenreaderContext {
     id: number
-    dialect: Dialect
+    dbType: DbType
     executeQuery<T>(query: Query<T>): Promise<T>
     subscription<T>(query: Query<T>): AsyncIterable<T>
     responseSizeLimit?: Limit

package/src/db.ts

@@ -3,7 +3,6 @@ import {addErrorContext} from '@subsquid/util-internal'
 import type {ClientBase, Pool} from 'pg'
 import {QueryResult} from 'pg'
 import {OpenreaderContext} from './context'
-import {Dialect} from './dialect'
 import {Query} from './sql/query'
 import {Subscription} from './subscription'
 import {LazyTransaction} from './util/lazy-transaction'
@@ -12,6 +11,9 @@ import {LazyTransaction} from './util/lazy-transaction'
 let CTX_COUNTER = 0
 
 
+export type DbType = 'postgres' | 'cockroach'
+
+
 export class PoolOpenreaderContext implements OpenreaderContext {
     public id = (CTX_COUNTER = (CTX_COUNTER + 1) % Number.MAX_SAFE_INTEGER)
     public log?: Logger
@@ -20,7 +22,7 @@ export class PoolOpenreaderContext implements OpenreaderContext {
     private queryCounter = 0
 
     constructor(
-        public readonly dialect: Dialect,
+        public readonly dbType: DbType,
         pool: Pool,
         subscriptionPool?: Pool,
         private subscriptionPollInterval: number = 1000,

package/src/dialect/common.ts

@@ -0,0 +1,49 @@
+import {GraphQLFieldConfigMap, GraphQLSchema} from 'graphql'
+import {Model} from '../model'
+import {Context} from '../context'
+import {OrderBy, Where} from '../ir/args'
+import assert from 'assert'
+
+export enum Dialect {
+    OpenCrud = 'opencrud',
+    TheGraph = 'thegraph',
+}
+
+export interface SchemaBuilder {
+    build(): GraphQLSchema
+}
+
+export interface SchemaOptions {
+    model: Model
+    subscriptions?: boolean
+}
+
+export type GqlFieldMap = GraphQLFieldConfigMap<unknown, Context>
+
+export function mergeOrderBy(list: OrderBy[]): OrderBy {
+    let result: OrderBy = {}
+    list.forEach((item) => {
+        for (let key in item) {
+            let current = result[key]
+            if (current == null) {
+                result[key] = item[key]
+            } else if (typeof current != 'string') {
+                let it = item[key]
+                assert(typeof it == 'object')
+                result[key] = mergeOrderBy([current, it])
+            }
+        }
+    })
+    return result
+}
+
+export function toCondition(op: 'AND' | 'OR', operands: Where[]): Where | undefined {
+    switch(operands.length) {
+        case 0:
+            return undefined
+        case 1:
+            return operands[0]
+        default:
+            return {op, args: operands}
+    }
+}

package/src/dialect/index.ts

@@ -0,0 +1,20 @@
+import {unexpectedCase} from '@subsquid/util-internal'
+import {Dialect, SchemaBuilder, SchemaOptions} from './common'
+
+export * from './common'
+
+export async function getSchemaBuilder(options: SchemaOptions & {dialect?: Dialect}): Promise<SchemaBuilder> {
+    switch (options.dialect) {
+        case undefined:
+        case Dialect.OpenCrud: {
+            const {SchemaBuilder} = await import('./opencrud/schema')
+            return new SchemaBuilder(options)
+        }
+        case Dialect.TheGraph: {
+            const {SchemaBuilder} = await import('./thegraph/schema')
+            return new SchemaBuilder(options)
+        }
+        default:
+            throw unexpectedCase(options.dialect)
+    }
+}

package/src/{opencrud → dialect/opencrud}/orderBy.ts

@@ -1,7 +1,8 @@
 import assert from "assert"
-import type { Model } from "../model"
-import { getUniversalProperties } from '../model.tools'
-import { OrderBy } from "../ir/args"
+import type { Model } from "../../model"
+import { getUniversalProperties } from '../../model.tools'
+import { OrderBy } from "../../ir/args"
+import {mergeOrderBy} from '../common'
 
 
 /**
@@ -43,8 +44,9 @@ function buildOrderByMapping(model: Model, typeName: string, depth: number): Ope
                     m.set(key + '_ASC', { [key]: 'ASC' })
                     m.set(key + '_DESC', { [key]: 'DESC' })
                     m.set(key + '_ASC_NULLS_FIRST', { [key]: 'ASC NULLS FIRST' });
+                    m.set(key + '_ASC_NULLS_LAST', { [key]: 'ASC NULLS LAST' });
+                    m.set(key + '_DESC_NULLS_FIRST', { [key]: 'DESC NULLS FIRST' });
                     m.set(key + '_DESC_NULLS_LAST', { [key]: 'DESC NULLS LAST' });
-                    
                 }
                 break
             case 'object':
@@ -79,21 +81,3 @@ export function parseOrderBy(model: Model, typeName: string, input: OpenCrudOrde
         })
     )
 }
-
-
-export function mergeOrderBy(list: OrderBy[]): OrderBy {
-    let result: OrderBy = {}
-    list.forEach(item => {
-        for (let key in item) {
-            let current = result[key]
-            if (current == null) {
-                result[key] = item[key]
-            } else if (typeof current != 'string') {
-                let it = item[key]
-                assert(typeof it == 'object')
-                result[key] = mergeOrderBy([current, it])
-            }
-        }
-    })
-    return result
-}