@subsquid/openreader 0.5.1 → 0.7.1

package/dist/where.js

@@ -13,6 +13,8 @@ const ENDINGS = [
     'not_in',
     'contains',
     'not_contains',
+    'containsInsensitive',
+    'not_containsInsensitive',
     'startsWith',
     'not_startsWith',
     'endsWith',
@@ -22,7 +24,9 @@ const ENDINGS = [
     'containsNone',
     'some',
     'every',
-    'none'
+    'none',
+    'jsonContains',
+    'jsonHasKey',
 ].sort((a, b) => b.length - a.length).map(e => '_' + e);
 function parseEnding(field) {
     for (let i = 0; i < ENDINGS.length; i++) {

package/dist/where.js.map

@@ -1 +1 @@
-{"version":3,"file":"where.js","sourceRoot":"","sources":["../src/where.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"where.js","sourceRoot":"","sources":["../src/where.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subsquid/openreader",
-  "version": "0.5.1",
+  "version": "0.7.1",
   "description": "GraphQL server for squid framework",
   "keywords": [
     "graphql",
@@ -23,13 +23,13 @@
     "@graphql-tools/merge": "^8",
     "@graphql-tools/utils": "^8",
     "@subsquid/graphiql-console": "^0.2.0",
-    "@subsquid/util": "^0.0.4",
+    "@subsquid/util": "^0.0.5",
     "apollo-server-core": "^3.6.2",
     "apollo-server-express": "^3.6.2",
     "express": "^4.17.2",
     "graphql": "^15.8.0",
     "graphql-parse-resolve-info": "^4.12.0",
-    "pg": "^8.7.1"
+    "pg": "^8.7.3"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
@@ -44,7 +44,7 @@
   },
   "scripts": {
     "build": "rm -rf dist && tsc",
-    "test": "make up && sleep 1 && make test && make down || (make down && exit 1)"
+    "test": "make up && sleep 1 && make test test-cockroach && make down || (make down && exit 1)"
   },
-  "readme": "# OpenReader\n\nGraphQL server for squid framework. Given [data schema](https://docs.subsquid.io/schema-spec) \nand compatible Postgres database it serves \"read part\" of [OpenCRUD spec](https://www.opencrud.org).\n\n## Usage\n\n```bash\nopenreader schema.graphql\n```\n\nDatabase connection and server port are configured via environment variables:\n\n```\nDB_NAME\nDB_USER\nDB_PASS\nDB_HOST\nDB_PORT\nGRAPHQL_SERVER_PORT\n```\n"
+  "readme": "# OpenReader\n\nGraphQL server for squid framework. Given [data schema](https://docs.subsquid.io/reference/openreader-schema) \nand compatible Postgres database it serves \"read part\" of [OpenCRUD spec](https://www.opencrud.org).\n\n## Usage\n\n```bash\nopenreader schema.graphql\n```\n\nDatabase connection and server port are configured via environment variables:\n\n```\nDB_NAME\nDB_USER\nDB_PASS\nDB_HOST\nDB_PORT\nGRAPHQL_SERVER_PORT\n```\n"
 }

package/src/dialect.ts

@@ -0,0 +1,2 @@
+
+export type Dialect = 'postgres' | 'cockroach'

package/src/gql/opencrud.ts

@@ -1,13 +1,14 @@
 import {Output, toCamelCase, toPlural} from "@subsquid/util"
 import assert from "assert"
 import {DocumentNode, parse, print} from "graphql"
-import {Entity, Enum, FTS_Query, Interface, JsonObject, Model, Prop, Union} from "../model"
+import type {Dialect} from "../dialect"
+import type {Entity, Enum, FTS_Query, Interface, JsonObject, Model, Prop, Union} from "../model"
 import {getOrderByMapping} from "../orderBy"
-import {scalars_list} from "../scalars"
 import {toQueryListField} from "../util"
+import {customScalars} from "./scalars"
 
 
-export function generateOpenCrudQueries(model: Model): string {
+export function generateOpenCrudQueries(model: Model, dialect: Dialect): string {
     let out = new Output()
 
     generatePageInfoType()
@@ -39,6 +40,7 @@ export function generateOpenCrudQueries(model: Model): string {
                 generateEnumType(name, item)
                 break
             case 'fts':
+                assert(dialect == 'postgres', `Full-text search queries are not supported by ${dialect}`)
                 generateFtsTypes(name, item)
                 break
         }
@@ -250,6 +252,8 @@ export function generateOpenCrudQueries(model: Model): string {
         if (graphqlType == 'String' || graphqlType == 'ID') {
             out.line(`${fieldName}_contains: ${graphqlType}`)
             out.line(`${fieldName}_not_contains: ${graphqlType}`)
+            out.line(`${fieldName}_containsInsensitive: ${graphqlType}`)
+            out.line(`${fieldName}_not_containsInsensitive: ${graphqlType}`)
             out.line(`${fieldName}_startsWith: ${graphqlType}`)
             out.line(`${fieldName}_not_startsWith: ${graphqlType}`)
             out.line(`${fieldName}_endsWith: ${graphqlType}`)
@@ -260,6 +264,11 @@ export function generateOpenCrudQueries(model: Model): string {
             out.line(`${fieldName}_in: [${graphqlType}!]`)
             out.line(`${fieldName}_not_in: [${graphqlType}!]`)
         }
+
+        if (graphqlType == 'JSON') {
+            out.line(`${fieldName}_jsonContains: ${graphqlType}`)
+            out.line(`${fieldName}_jsonHasKey: ${graphqlType}`)
+        }
     }
 
     function generateUnionType(name: string, union: Union) {
@@ -333,8 +342,8 @@ export function generateOpenCrudQueries(model: Model): string {
 }
 
 
-export function buildServerSchema(model: Model): DocumentNode {
-    let scalars = scalars_list.map(name => 'scalar ' + name).join('\n')
-    let queries = generateOpenCrudQueries(model)
+export function buildServerSchema(model: Model, dialect: Dialect): DocumentNode {
+    let scalars = ['ID'].concat(Object.keys(customScalars)).map(name => 'scalar ' + name).join('\n')
+    let queries = generateOpenCrudQueries(model, dialect)
     return parse(scalars  + '\n\n' + queries)
 }

package/src/gql/scalars/BigInt.ts

@@ -0,0 +1,34 @@
+import {GraphQLScalarType} from "graphql"
+import {invalidFormat} from "../../util"
+
+
+export const BigIntScalar = new GraphQLScalarType({
+    name: 'BigInt',
+    description: 'Big number integer',
+    serialize(value: number | string | bigint) {
+        return ''+value
+    },
+    parseValue(value: string) {
+        if (!isBigInt(value)) throw invalidFormat('BigInt', value)
+        return BigInt(value)
+    },
+    parseLiteral(ast) {
+        switch(ast.kind) {
+            case "StringValue":
+                if (isBigInt(ast.value)) {
+                    return BigInt(ast.value)
+                } else {
+                    throw invalidFormat('BigInt', ast.value)
+                }
+            case "IntValue":
+                return BigInt(ast.value)
+            default:
+                return null
+        }
+    }
+})
+
+
+function isBigInt(s: string): boolean {
+    return /^[+\-]?\d+$/.test(s)
+}

package/src/gql/scalars/Bytes.ts

@@ -0,0 +1,28 @@
+import {decodeHex, isHex} from "@subsquid/util"
+import {GraphQLScalarType} from "graphql"
+import {invalidFormat} from "../../util"
+
+
+export const BytesScalar = new GraphQLScalarType({
+    name: 'Bytes',
+    description: 'Binary data encoded as a hex string always prefixed with 0x',
+    serialize(value: string | Buffer) {
+        if (typeof value == 'string') {
+            if (!isHex(value)) throw invalidFormat('Bytes', value)
+            return value.toLowerCase()
+        } else {
+            return '0x' + value.toString('hex')
+        }
+    },
+    parseValue(value: string) {
+        return decodeHex(value)
+    },
+    parseLiteral(ast) {
+        switch(ast.kind) {
+            case "StringValue":
+                return decodeHex(ast.value)
+            default:
+                return null
+        }
+    }
+})

package/src/gql/scalars/DateTime.ts

@@ -0,0 +1,45 @@
+import {GraphQLScalarType} from "graphql"
+import {invalidFormat} from "../../util"
+
+
+export const DateTimeScalar = new GraphQLScalarType({
+    name: 'DateTime',
+    description:
+        'A date-time string in simplified extended ISO 8601 format (YYYY-MM-DDTHH:mm:ss.sssZ)',
+    serialize(value: Date | string) {
+        if (value instanceof Date) {
+            return value.toISOString()
+        } else {
+            if (!isIsoDateTimeString(value)) throw invalidFormat('DateTime', value)
+            return value
+        }
+    },
+    parseValue(value: string) {
+        return parseDateTime(value)
+    },
+    parseLiteral(ast) {
+        switch(ast.kind) {
+            case "StringValue":
+                return parseDateTime(ast.value)
+            default:
+                return null
+        }
+    }
+})
+
+
+// credit - https://github.com/Urigo/graphql-scalars/blob/91b4ea8df891be8af7904cf84751930cc0c6613d/src/scalars/iso-date/validator.ts#L122
+const RFC_3339_REGEX = /^(\d{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60))(\.\d{1,})?([Z])$/
+
+
+function isIsoDateTimeString(s: string): boolean {
+    return RFC_3339_REGEX.test(s)
+}
+
+
+function parseDateTime(s: string): Date {
+    if (!isIsoDateTimeString(s)) throw invalidFormat('DateTime', s)
+    let timestamp = Date.parse(s)
+    if (isNaN(timestamp)) throw invalidFormat('DateTime', s)
+    return new Date(timestamp)
+}

package/src/gql/scalars/JSON.ts

@@ -0,0 +1,7 @@
+import {GraphQLScalarType} from "graphql"
+
+
+export const JSONScalar = new GraphQLScalarType({
+    name: 'JSON',
+    description: 'A scalar that can represent any JSON value',
+})

package/src/gql/scalars/index.ts

@@ -0,0 +1,12 @@
+import {BigIntScalar} from "./BigInt"
+import {BytesScalar} from "./Bytes"
+import {DateTimeScalar} from "./DateTime"
+import {JSONScalar} from "./JSON"
+
+
+export const customScalars = {
+    BigInt: BigIntScalar,
+    Bytes: BytesScalar,
+    DateTime: DateTimeScalar,
+    JSON: JSONScalar,
+}

package/src/gql/schema.ts

@@ -20,7 +20,7 @@ import {
 } from "graphql"
 import {Index, Model, Prop, PropType} from "../model"
 import {validateModel} from "../model.tools"
-import {scalars_list} from "../scalars"
+import {customScalars} from "./scalars"
 
 
 const baseSchema = buildASTSchema(parse(`
@@ -31,7 +31,8 @@ const baseSchema = buildASTSchema(parse(`
     directive @fulltext(query: String!) on FIELD_DEFINITION
     directive @variant on OBJECT # legacy
     directive @jsonField on OBJECT # legacy
-    ${scalars_list.map(name => 'scalar ' + name).join('\n')}
+    scalar ID
+    ${Object.keys(customScalars).map(name => 'scalar ' + name).join('\n')}
 `))
 
 

package/src/orderBy.ts

@@ -50,8 +50,10 @@ function buildOrderByMapping(model: Model, typeName: string, depth: number): Ope
         switch(propType.kind) {
             case 'scalar':
             case 'enum':
-                m.set(key + '_ASC', {[key]: 'ASC'})
-                m.set(key + '_DESC', {[key]: 'DESC'})
+                if (propType.name != 'JSON') {
+                    m.set(key + '_ASC', {[key]: 'ASC'})
+                    m.set(key + '_DESC', {[key]: 'DESC'})
+                }
                 break
             case 'object':
             case 'union':

package/src/queryBuilder.ts

@@ -1,11 +1,11 @@
 import {toSnakeCase} from "@subsquid/util"
 import assert from "assert"
 import {Database} from "./db"
+import type {Dialect} from "./dialect"
 import type {Entity, JsonObject, Model} from "./model"
 import {getEntity, getFtsQuery, getObject, getUnionProps} from "./model.tools"
 import {OpenCrudOrderByValue, OrderBy, parseOrderBy} from "./orderBy"
 import type {FtsRequestedFields, RequestedFields} from "./requestedFields"
-import {fromJsonCast, fromJsonToOutputCast, toOutputArrayCast, toOutputCast} from "./scalars"
 import {ensureArray, toColumn, toFkColumn, toInt, toTable, unsupportedCase} from "./util"
 import {hasConditions, parseWhereField, WhereOp, whereOpToSqlOperator} from "./where"
 
@@ -24,6 +24,7 @@ export class QueryBuilder {
 
     constructor(
         private model: Model,
+        private dialect: Dialect,
         private db: Database
     ) {}
 
@@ -43,6 +44,7 @@ export class QueryBuilder {
 
         let cursor = new Cursor(
             this.model,
+            this.dialect,
             this.ident.bind(this),
             this.aliases,
             join,
@@ -75,7 +77,7 @@ export class QueryBuilder {
                 break
             case 'list-subquery':
                 if (columns.size()) {
-                    out += `SELECT json_build_array(${columns.render()}) `
+                    out += `SELECT json_build_array(${columns.render()}) AS row `
                 }
                 break
             default:
@@ -177,7 +179,7 @@ export class QueryBuilder {
                     case 'scalar':
                     case 'enum':
                     case 'list':
-                        req.index = columns.add(cursor.transport(fieldName))
+                        req.index = columns.add(cursor.output(fieldName))
                         break
                     case 'object':
                         req.index = columns.add(cursor.field(fieldName) + ' IS NULL')
@@ -189,7 +191,7 @@ export class QueryBuilder {
                         break
                     case 'union':
                         let cu = cursor.child(fieldName)
-                        req.index = columns.add(cu.transport('isTypeOf'))
+                        req.index = columns.add(cu.output('isTypeOf'))
                         this.populateColumns(
                             columns,
                             cu,
@@ -199,7 +201,7 @@ export class QueryBuilder {
                     case 'fk':
                     case 'lookup': {
                         let cu = cursor.child(fieldName)
-                        req.index = columns.add(cu.transport('id'))
+                        req.index = columns.add(cu.output('id'))
                         this.populateColumns(
                             columns,
                             cu,
@@ -209,11 +211,11 @@ export class QueryBuilder {
                     }
                     case 'list-lookup':
                         req.index = columns.add(
-                            'array(' + this.select(field.propType.entity, req.args, req.children, {
+                            '(SELECT jsonb_agg(row) FROM (' + this.select(field.propType.entity, req.args, req.children, {
                                 kind: 'list-subquery',
                                 field: field.propType.field,
                                 parent: cursor.native('id')
-                            }) + ')'
+                            }) + ') as rows)'
                         )
                         break
                     default:
@@ -329,18 +331,29 @@ export class QueryBuilder {
                         break
                     }
                     case 'startsWith':
-                        exps.push(`starts_with(${lhs}, ${this.param(arg)})`)
+                        if (this.dialect == 'cockroach') {
+                            let p = this.param(arg) + '::text'
+                            exps.push(`${lhs} >= ${p}`)
+                            exps.push(`left(${lhs}, length(${p})) = ${p}`)
+                        } else {
+                            exps.push(`starts_with(${lhs}, ${this.param(arg)})`)
+                        }
                         break
                     case 'not_startsWith':
-                        exps.push(`NOT starts_with(${lhs}, ${this.param(arg)})`)
+                        if (this.dialect == 'cockroach') {
+                            let p = this.param(arg) + '::text'
+                            exps.push(`(${lhs} < ${p} OR left(${lhs}, length(${p})) != ${p})`)
+                        } else {
+                            exps.push(`NOT starts_with(${lhs}, ${this.param(arg)})`)
+                        }
                         break
                     case 'endsWith': {
-                        let param = this.param(arg)
+                        let param = this.param(arg) + '::text'
                         exps.push(`right(${lhs}, length(${param})) = ${param}`)
                         break
                     }
                     case 'not_endsWith': {
-                        let param = this.param(arg)
+                        let param = this.param(arg) + '::text'
                         exps.push(`right(${lhs}, length(${param})) != ${param}`)
                         break
                     }
@@ -350,6 +363,18 @@ export class QueryBuilder {
                     case 'not_contains':
                         exps.push(`position(${this.param(arg)} in ${lhs}) = 0`)
                         break
+                    case 'containsInsensitive':
+                        exps.push(`position(lower(${this.param(arg)}) in lower(${lhs})) > 0`)
+                        break
+                    case 'not_containsInsensitive':
+                        exps.push(`position(lower(${this.param(arg)}) in lower(${lhs})) = 0`)
+                        break
+                    case 'jsonContains':
+                        exps.push(`${lhs} @> ${this.param(arg)}`)
+                        break
+                    case 'jsonHasKey':
+                        exps.push(`${lhs} ? ${this.param(arg)}`)
+                        break
                     default: {
                         exps.push(`${lhs} ${whereOpToSqlOperator(op)} ${this.param(arg)}`)
                     }
@@ -446,9 +471,15 @@ export class QueryBuilder {
                         }
                         break
                     }
-                    case 'list-lookup':
-                        rec[req.alias] = this.toResult(row[req.index], req.children)
+                    case 'list-lookup': {
+                        let rows = row[req.index]
+                        if (rows == null) {
+                            rec[req.alias] = []
+                        } else {
+                            rec[req.alias] = this.toResult(row[req.index], req.children)
+                        }
                         break
+                    }
                     default:
                         throw unsupportedCase((f as any).propType.kind)
                 }
@@ -578,11 +609,12 @@ interface ListSubquery {
  * A pointer to an entity or nested json object within SQL query.
  *
  * It has convenience methods for building various SQL expressions
- * related to individual properties of an entity or an object it points to.
+ * related to individual properties of an entity or of an object it points to.
  */
 class Cursor {
     constructor(
         private model: Model,
+        private dialect: Dialect,
         private ident: (name: string) => string,
         private aliases: AliasSet,
         private join: JoinSet,
@@ -592,15 +624,45 @@ class Cursor {
         private prefix: string
     ) {}
 
-    transport(propName: string): string {
+    output(propName: string): string {
         let prop = this.object.properties[propName]
         switch(prop.type.kind) {
             case 'scalar':
+                if (this.object.kind == 'object') {
+                    switch(prop.type.name) {
+                        case 'Int':
+                            return `(${this.prefix}->'${propName}')::integer`
+                        case 'Float':
+                            return `(${this.prefix}->'${propName}')::numeric`
+                        case 'Boolean':
+                            return `(${this.prefix}->>'${propName}')::bool`
+                        case 'JSON':
+                            return `${this.prefix}->'${propName}'`
+                        default:
+                            return `${this.prefix}->>'${propName}'`
+                    }
+                } else {
+                    let exp = this.column(propName)
+                    switch(prop.type.name) {
+                        case 'BigInt':
+                            return `(${exp})::text`
+                        case 'Bytes':
+                            return `'0x' || encode(${exp}, 'hex')`
+                        case 'DateTime':
+                            if (this.dialect == 'cockroach') {
+                                return `experimental_strftime((${exp}) at time zone 'UTC', '%Y-%m-%dT%H:%M:%S.%fZ')`
+                            } else {
+                                return `to_char((${exp}) at time zone 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`
+                            }
+                        default:
+                            return exp
+                    }
+                }
             case 'enum':
                 if (this.object.kind == 'object') {
-                    return fromJsonToOutputCast(prop.type.name, this.prefix, propName)
+                    return `${this.prefix}->>'${propName}'`
                 } else {
-                    return toOutputCast(prop.type.name, this.column(propName))
+                    return this.column(propName)
                 }
             case 'list':
                 let itemType = prop.type.item.type
@@ -608,7 +670,21 @@ class Cursor {
                     // this is json
                     return this.field(propName)
                 } else {
-                    return toOutputArrayCast(itemType.name, this.column(propName))
+                    let exp = this.column(propName)
+                    switch(itemType.name) {
+                        case 'BigInt':
+                            return `(${exp})::text[]`
+                        case 'Bytes':
+                            return `array(select '0x' || encode(i, 'hex') from unnest(${exp}) as i)`
+                        case 'DateTime':
+                            if (this.dialect == 'cockroach') {
+                                return `array(select experimental_strftime(i at time zone 'UTC', '%Y-%m-%dT%H:%M:%S.%fZ') from unnest(${exp}) as i)`
+                            } else {
+                                return `array(select to_char(i at time zone 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"') from unnest(${exp}) as i)`
+                            }
+                        default:
+                            return exp
+                    }
                 }
             default:
                 throw unsupportedCase(prop.type.kind)
@@ -624,7 +700,24 @@ class Cursor {
         }
         assert(prop.type.kind == 'scalar' || prop.type.kind == 'enum')
         if (this.object.kind == 'object') {
-            return fromJsonCast(prop.type.name, this.prefix, propName)
+            let js = `${this.prefix}->'${propName}'`
+            let str = `${this.prefix}->>'${propName}'`
+            switch(prop.type.name) {
+                case 'Int':
+                    return `(${js})::integer`
+                case 'Float':
+                    return `(${js})::numeric`
+                case 'Boolean':
+                    return `(${str})::bool`
+                case 'BigInt':
+                    return `(${str})::numeric`
+                case 'Bytes':
+                    return `decode(substr(${str}, 3), 'hex')`
+                case 'DateTime':
+                    return `(${str})::timestamptz`
+                default:
+                    return str
+            }
         } else {
             return this.column(propName)
         }
@@ -676,6 +769,7 @@ class Cursor {
 
         return new Cursor(
             this.model,
+            this.dialect,
             this.ident,
             this.aliases,
             this.join,
@@ -702,7 +796,7 @@ class Cursor {
     fk(propName: string): string {
         return this.object.kind == 'entity'
             ? this.ident(this.alias) + '.' + this.ident(toFkColumn(propName))
-            : fromJsonCast('ID', this.prefix, propName)
+            : `${this.prefix}->>'${propName}'`
     }
 
     tsv(queryName: string): string {