@subsquid/openreader 0.6.0 → 1.0.0

package/dist/where.js

@@ -24,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.6.0",
+  "version": "1.0.0",
   "description": "GraphQL server for squid framework",
   "keywords": [
     "graphql",
@@ -23,28 +23,31 @@
     "@graphql-tools/merge": "^8",
     "@graphql-tools/utils": "^8",
     "@subsquid/graphiql-console": "^0.2.0",
-    "@subsquid/util": "^0.0.5",
+    "@subsquid/util-internal": "^0.0.0",
+    "@subsquid/util-internal-code-printer": "^0.0.0",
+    "@subsquid/util-naming": "^0.0.0",
+    "@subsquid/util-internal-hex": "^0.0.0",
     "apollo-server-core": "^3.6.2",
     "apollo-server-express": "^3.6.2",
-    "express": "^4.17.2",
+    "express": "^4.18.1",
     "graphql": "^15.8.0",
     "graphql-parse-resolve-info": "^4.12.0",
     "pg": "^8.7.3"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/mocha": "^9.1.0",
+    "@types/mocha": "^9.1.1",
     "@types/node": "^16.11.22",
-    "@types/pg": "^8.6.4",
+    "@types/pg": "8.6.4",
     "dotenv": "^10.0.0",
-    "expect": "^27.4.6",
+    "expect": "^27.5.1",
     "gql-test-client": "^0.0.0",
-    "mocha": "^9.2.0",
+    "mocha": "^9.2.2",
     "typescript": "~4.5.5"
   },
   "scripts": {
     "build": "rm -rf dist && tsc",
-    "test": "make up && sleep 1 && make test test-cockroach && make down || (make down && exit 1)"
+    "test": "make up && sleep 2 && 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/gql/opencrud.ts

@@ -1,4 +1,5 @@
-import {Output, toCamelCase, toPlural} from "@subsquid/util"
+import {Output} from "@subsquid/util-internal-code-printer"
+import {toCamelCase, toPlural} from "@subsquid/util-naming"
 import assert from "assert"
 import {DocumentNode, parse, print} from "graphql"
 import type {Dialect} from "../dialect"
@@ -264,6 +265,11 @@ export function generateOpenCrudQueries(model: Model, dialect: Dialect): 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) {

package/src/gql/scalars/Bytes.ts

@@ -1,4 +1,4 @@
-import {decodeHex, isHex} from "@subsquid/util"
+import {decodeHex, isHex} from "@subsquid/util-internal-hex"
 import {GraphQLScalarType} from "graphql"
 import {invalidFormat} from "../../util"
 

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

@@ -1,10 +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
+    DateTime: DateTimeScalar,
+    JSON: JSONScalar,
 }

package/src/gql/schema.ts

@@ -1,4 +1,4 @@
-import {assertNotNull, unexpectedCase} from "@subsquid/util"
+import {assertNotNull, unexpectedCase} from "@subsquid/util-internal"
 import assert from "assert"
 import {
     buildASTSchema,

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,4 +1,4 @@
-import {toSnakeCase} from "@subsquid/util"
+import {toSnakeCase} from "@subsquid/util-naming"
 import assert from "assert"
 import {Database} from "./db"
 import type {Dialect} from "./dialect"
@@ -369,6 +369,12 @@ export class QueryBuilder {
                     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)}`)
                     }
@@ -465,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)
                 }
@@ -624,6 +636,8 @@ class Cursor {
                             return `(${this.prefix}->'${propName}')::numeric`
                         case 'Boolean':
                             return `(${this.prefix}->>'${propName}')::bool`
+                        case 'JSON':
+                            return `${this.prefix}->'${propName}'`
                         default:
                             return `${this.prefix}->>'${propName}'`
                     }

package/src/requestedFields.ts

@@ -1,4 +1,4 @@
-import {toPlural} from "@subsquid/util"
+import {toPlural} from "@subsquid/util-naming"
 import {UserInputError} from "apollo-server-core"
 import assert from "assert"
 import {GraphQLResolveInfo, GraphQLSchema} from "graphql"

package/src/resolver.ts

@@ -1,5 +1,5 @@
 import type {IFieldResolver, IResolvers} from "@graphql-tools/utils"
-import {toCamelCase} from "@subsquid/util"
+import {toCamelCase} from "@subsquid/util-naming"
 import {UserInputError} from "apollo-server-core"
 import assert from "assert"
 import type {GraphQLResolveInfo} from "graphql"

package/src/test/regressions.test.ts

@@ -0,0 +1,39 @@
+import {useDatabase, useServer} from "./setup"
+
+describe('regressions', function () {
+    describe('empty lookup lists', function () {
+        useDatabase([
+            `create table "order" (id text primary key)`,
+            `create table item (id text primary key, order_id text)`,
+            `insert into "order" (id) values ('1')`
+        ])
+
+        const client = useServer(`
+            type Order @entity {
+                id: ID!
+                items: [Item!]! @derivedFrom(field: "order")
+            }
+            
+            type Item @entity {
+                id: ID!
+                order: Order
+            }
+        `)
+
+        it('should return empty array for empty lookup list', async function () {
+            return client.test(`
+                query {
+                    orders {
+                        id
+                        items { id }
+                    }
+                }
+            `, {
+                orders: [{
+                    id: '1',
+                    items: []
+                }]
+            })
+        })
+    })
+})

package/src/test/scalars.test.ts

@@ -2,7 +2,7 @@ import {useDatabase, useServer} from "./setup"
 
 describe('scalars', function() {
     useDatabase([
-        `create table scalar (id text primary key, "boolean" bool, "bigint" numeric, "string" text, enum text, date_time timestamptz, "bytes" bytea, deep jsonb)`,
+        `create table scalar (id text primary key, "boolean" bool, "bigint" numeric, "string" text, enum text, date_time timestamptz, "bytes" bytea, "json" jsonb, deep jsonb)`,
         `insert into scalar (id, "boolean") values ('1', true)`,
         `insert into scalar (id, "boolean", deep) values ('2', false, '{"boolean": true}'::jsonb)`,
         `insert into scalar (id, "bigint", deep) values ('3', 1000000000000000000000000000000000000, '{"bigint": "1000000000000000000000000000000000000"}'::jsonb)`,
@@ -21,6 +21,8 @@ describe('scalars', function() {
         `insert into scalar (id, "enum") values ('15', 'A')`,
         `insert into scalar (id, "enum") values ('16', 'B')`,
         `insert into scalar (id, "enum") values ('17', 'C')`,
+        `insert into scalar (id, "json") values ('18', '{"key1": "value1"}'::jsonb)`,
+        `insert into scalar (id, "json") values ('19', '{"key2": "value2"}'::jsonb)`,
     ])
 
     const client = useServer(`
@@ -32,6 +34,7 @@ describe('scalars', function() {
             bigint: BigInt
             dateTime: DateTime
             bytes: Bytes
+            json: JSON,
             deep: DeepScalar
         }
         
@@ -316,4 +319,37 @@ describe('scalars', function() {
             })
         })
     })
+
+    describe('JSON', function () {
+        it('outputs correctly', function() {
+            return client.test(`
+                query {
+                    scalars(where: {id_in: ["18"]}, orderBy: id_ASC) {
+                        id
+                        json
+                    }
+                }
+            `, {
+                scalars: [
+                    {id: '18', json: {'key1': 'value1'}},
+                ]
+            })
+        })
+
+        it('supports where conditions', function () {
+            return client.test(`
+                query {
+                    eq: scalars(where: {json_eq: {key1: "value1"}}) { id }
+                    jsonHasKey: scalars(where: {json_jsonHasKey: "key1"}) { id }
+                    jsonContains: scalars(where: {json_jsonContains: {key2: "value2"}}) { id }
+                    missingKey: scalars(where: {json_jsonHasKey: {foo: 1}}) { id }
+                }
+            `, {
+                eq: [{id: '18'}],
+                jsonHasKey: [{id: '18'}],
+                jsonContains: [{id: '19'}],
+                missingKey: []
+            })
+        })
+    })
 })

package/src/test/setup.ts

@@ -1,4 +1,4 @@
-import {assertNotNull} from "@subsquid/util"
+import {assertNotNull} from "@subsquid/util-internal"
 import {Client} from "gql-test-client"
 import {parse} from "graphql"
 import {Client as PgClient, ClientBase, Pool} from "pg"

package/src/test/typed-json.test.ts

@@ -3,7 +3,7 @@ import {useDatabase, useServer} from "./setup"
 describe('typed json fields', function () {
     useDatabase([
         `create table entity (id text primary key, a jsonb)`,
-        `insert into entity (id, a) values ('1', '{"a": "a", "b": {"b": "b", "e": "1"}}'::jsonb)`,
+        `insert into entity (id, a) values ('1', '{"a": "a", "b": {"b": "b", "e": "1"}, "c": [1, 2, 3]}'::jsonb)`,
         `insert into entity (id, a) values ('2', '{"a": "A", "b": {"b": "B", "e": "1"}}'::jsonb)`,
         `insert into entity (id, a) values ('3', '{}'::jsonb)`,
         `insert into entity (id) values ('4')`,
@@ -17,6 +17,7 @@ describe('typed json fields', function () {
         type A {
             a: String
             b: B
+            c: JSON
         }
         
         type B {
@@ -44,6 +45,20 @@ describe('typed json fields', function () {
         })
     })
 
+    it('nested JSON scalar', function () {
+        return client.test(`
+            query {
+                entities(where: {id_eq: "1"}) {
+                    a { c }
+                }
+            }
+        `, {
+            entities: [{
+                a: {c: [1, 2, 3]}
+            }]
+        })
+    })
+
     it('can fetch deep entities', function () {
         return client.test(`
             query {

package/src/tools.ts

@@ -2,6 +2,7 @@ import {mergeTypeDefs} from "@graphql-tools/merge"
 import * as fs from "fs"
 import * as path from "path"
 import {parse, Source} from "graphql"
+import process from "process"
 import {buildModel, buildSchema} from "./gql/schema"
 import type {Model} from "./model"
 
@@ -31,3 +32,17 @@ export function loadModel(schemaFile: string): Model {
     let schema = buildSchema(doc)
     return buildModel(schema)
 }
+
+
+export function resolveGraphqlSchema(projectDir?: string): string {
+    let dir = projectDir || process.cwd()
+    let loc = path.resolve(dir, 'schema.graphql')
+    if (fs.existsSync(loc)) return loc
+    loc = path.resolve(dir, 'schema')
+    let stat = fs.statSync(loc, {throwIfNoEntry: false})
+    if (stat?.isDirectory()) {
+        let hasGraphql = fs.readdirSync(loc).some(item => item.endsWith('.graphql') || item.endsWith('.gql'))
+        if (hasGraphql) return loc
+    }
+    throw new Error(`Failed to locate schema.graphql at ${dir}`)
+}

package/src/util.ts

@@ -1,4 +1,4 @@
-import {toCamelCase, toPlural, toSnakeCase} from "@subsquid/util"
+import {toCamelCase, toPlural, toSnakeCase} from "@subsquid/util-naming"
 import assert from "assert"
 
 

package/src/where.ts

@@ -17,7 +17,9 @@ export type WhereOp =
     'containsNone' |
     'some' |
     'every' |
-    'none'
+    'none' |
+    'jsonContains' |
+    'jsonHasKey'
 
 
 const ENDINGS = [
@@ -43,7 +45,9 @@ const ENDINGS = [
     'containsNone',
     'some',
     'every',
-    'none'
+    'none',
+    'jsonContains',
+    'jsonHasKey',
 ].sort((a, b) => b.length - a.length).map(e => '_' + e)