@subsquid/openreader 0.2.0 → 0.3.3

package/dist/test/where.test.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const setup_1 = require("./util/setup");
+describe('AND, OR on entity filters', function () {
+    (0, setup_1.useDatabase)([
+        `create table item (id text primary key, a int, b int)`,
+        `insert into item (id, a, b) values ('1', 1, 1)`,
+        `insert into item (id, a, b) values ('2', 2, 2)`,
+        `insert into item (id, a, b) values ('3', 3, 2)`,
+        `insert into item (id, a, b) values ('4', 4, 4)`,
+        `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 }
+            }
+        `, {
+            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: [{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('{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('{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('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' }
+            ]
+        });
+    });
+});
+//# sourceMappingURL=where.test.js.map

package/dist/test/where.test.js.map

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

package/dist/tools.d.ts

@@ -1,2 +1,3 @@
 import type { Model } from "./model";
 export declare function loadModel(schemaFile: string): Model;
+//# sourceMappingURL=tools.d.ts.map

package/dist/tools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAGlC,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,KAAK,CAwBnD"}

package/dist/util.d.ts

@@ -1,8 +1,3 @@
-import { pluralize } from "inflected";
-export { pluralize };
-export declare function snakeCase(name: string): string;
-export declare function lowerCaseFirst(s: string): string;
-export declare function upperCaseFirst(s: string): string;
 export declare function toQueryListField(entityName: string): string;
 export declare function toColumn(gqlFieldName: string): string;
 export declare function toFkColumn(gqlFieldName: string): string;
@@ -10,11 +5,4 @@ export declare function toTable(entityName: string): string;
 export declare function ensureArray<T>(item: T | T[]): T[];
 export declare function unsupportedCase(value: string): Error;
 export declare function toInt(val: number | string): number;
-export declare class Output {
-    private out;
-    private indent;
-    line(s?: string): void;
-    block(start: string, cb: () => void): void;
-    lazy(gen: () => string[]): void;
-    toString(): string;
-}
+//# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE3D;AAGD,wBAAgB,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAErD;AAGD,wBAAgB,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEvD;AAGD,wBAAgB,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAElD;AAGD,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,CAEjD;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAEpD;AAGD,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAIlD"}

package/dist/util.js

@@ -3,46 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Output = exports.toInt = exports.unsupportedCase = exports.ensureArray = exports.toTable = exports.toFkColumn = exports.toColumn = exports.toQueryListField = exports.upperCaseFirst = exports.lowerCaseFirst = exports.snakeCase = exports.pluralize = void 0;
+exports.toInt = exports.unsupportedCase = exports.ensureArray = exports.toTable = exports.toFkColumn = exports.toColumn = exports.toQueryListField = void 0;
+const util_1 = require("@subsquid/util");
 const assert_1 = __importDefault(require("assert"));
-const inflected_1 = require("inflected");
-Object.defineProperty(exports, "pluralize", { enumerable: true, get: function () { return inflected_1.pluralize; } });
-function snakeCase(name) {
-    return (0, inflected_1.underscore)(name);
-}
-exports.snakeCase = snakeCase;
-function lowerCaseFirst(s) {
-    if (s) {
-        return s[0].toLowerCase() + s.slice(1);
-    }
-    else {
-        return s;
-    }
-}
-exports.lowerCaseFirst = lowerCaseFirst;
-function upperCaseFirst(s) {
-    if (s) {
-        return s[0].toUpperCase() + s.slice(1);
-    }
-    else {
-        return s;
-    }
-}
-exports.upperCaseFirst = upperCaseFirst;
 function toQueryListField(entityName) {
-    return (0, inflected_1.pluralize)(lowerCaseFirst(entityName));
+    return (0, util_1.toPlural)((0, util_1.toCamelCase)(entityName));
 }
 exports.toQueryListField = toQueryListField;
 function toColumn(gqlFieldName) {
-    return snakeCase(gqlFieldName);
+    return (0, util_1.toSnakeCase)(gqlFieldName);
 }
 exports.toColumn = toColumn;
 function toFkColumn(gqlFieldName) {
-    return snakeCase(gqlFieldName) + '_id';
+    return (0, util_1.toSnakeCase)(gqlFieldName) + '_id';
 }
 exports.toFkColumn = toFkColumn;
 function toTable(entityName) {
-    return snakeCase(entityName);
+    return (0, util_1.toSnakeCase)(entityName);
 }
 exports.toTable = toTable;
 function ensureArray(item) {
@@ -59,54 +36,4 @@ function toInt(val) {
     return i;
 }
 exports.toInt = toInt;
-class Output {
-    constructor() {
-        this.out = [];
-        this.indent = '';
-    }
-    line(s) {
-        if (s) {
-            this.out.push(this.indent + s);
-        }
-        else {
-            this.out.push('');
-        }
-    }
-    block(start, cb) {
-        this.line(start + ' {');
-        this.indent += '  ';
-        try {
-            cb();
-        }
-        finally {
-            this.indent = this.indent.slice(0, this.indent.length - 2);
-        }
-        this.line('}');
-    }
-    lazy(gen) {
-        this.out.push({ indent: this.indent, gen });
-    }
-    toString() {
-        let out = '';
-        for (let i = 0; i < this.out.length; i++) {
-            let line = this.out[i];
-            if (typeof line == 'string') {
-                out += line + '\n';
-            }
-            else {
-                let lazy = line;
-                lazy.gen().forEach(s => {
-                    if (s) {
-                        out += lazy.indent + s + '\n';
-                    }
-                    else {
-                        out += '\n';
-                    }
-                });
-            }
-        }
-        return out;
-    }
-}
-exports.Output = Output;
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAiE;AACjE,oDAA2B;AAG3B,SAAgB,gBAAgB,CAAC,UAAkB;IAC/C,OAAO,IAAA,eAAQ,EAAC,IAAA,kBAAW,EAAC,UAAU,CAAC,CAAC,CAAA;AAC5C,CAAC;AAFD,4CAEC;AAGD,SAAgB,QAAQ,CAAC,YAAoB;IACzC,OAAO,IAAA,kBAAW,EAAC,YAAY,CAAC,CAAA;AACpC,CAAC;AAFD,4BAEC;AAGD,SAAgB,UAAU,CAAC,YAAoB;IAC3C,OAAO,IAAA,kBAAW,EAAC,YAAY,CAAC,GAAG,KAAK,CAAA;AAC5C,CAAC;AAFD,gCAEC;AAGD,SAAgB,OAAO,CAAC,UAAkB;IACtC,OAAO,IAAA,kBAAW,EAAC,UAAU,CAAC,CAAA;AAClC,CAAC;AAFD,0BAEC;AAGD,SAAgB,WAAW,CAAI,IAAa;IACxC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAC9C,CAAC;AAFD,kCAEC;AAGD,SAAgB,eAAe,CAAC,KAAa;IACzC,OAAO,IAAI,KAAK,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAA;AAClD,CAAC;AAFD,0CAEC;AAGD,SAAgB,KAAK,CAAC,GAAoB;IACtC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAa,CAAC,CAAA;IAC/B,IAAA,gBAAM,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAChC,OAAO,CAAC,CAAA;AACZ,CAAC;AAJD,sBAIC"}

package/dist/where.d.ts

@@ -6,3 +6,4 @@ export declare function parseWhereField(field: string): {
 };
 export declare function hasConditions(where?: any): where is any;
 export declare function whereOpToSqlOperator(op: WhereOp): string;
+//# sourceMappingURL=where.d.ts.map

package/dist/where.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../src/where.ts"],"names":[],"mappings":"AACA,oBAAY,OAAO,GACf,GAAG,GAAG,cAAc;AACpB,IAAI,GAAG,QAAQ,GACf,IAAI,GACJ,KAAK,GACL,IAAI,GACJ,KAAK,GACL,IAAI,GAAG,QAAQ,GACf,UAAU,GAAG,cAAc,GAC3B,YAAY,GAAG,gBAAgB,GAC/B,UAAU,GAAG,cAAc,GAC3B,aAAa,GACb,aAAa,GACb,cAAc,GACd,MAAM,GACN,OAAO,GACP,MAAM,CAAA;AAmCV,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG;IAAC,EAAE,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,CAQ3E;AAGD,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,GAAG,GAAG,KAAK,IAAI,GAAG,CAsBvD;AAGD,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,CAqBxD"}

package/package.json

@@ -1,44 +1,50 @@
 {
   "name": "@subsquid/openreader",
-  "version": "0.2.0",
-  "description": "GraphQL server for Hydra",
+  "version": "0.3.3",
+  "description": "GraphQL server for squid framework",
   "keywords": [
     "graphql",
     "opencrud"
   ],
-  "license": "MIT",
-  "repository": "git@github.com:subsquid/openreader.git",
+  "license": "GPL-3.0-or-later",
+  "repository": "git@github.com:subsquid/squid.git",
   "publishConfig": {
     "access": "public"
   },
   "bin": {
-    "openreader": "./dist/main.js"
+    "openreader": "./bin/main.js"
   },
   "files": [
+    "bin",
     "dist",
-    "!dist/test"
+    "src"
   ],
   "dependencies": {
     "@graphql-tools/merge": "^8",
     "@graphql-tools/utils": "^8",
     "@subsquid/graphiql-console": "^0.2.0",
-    "apollo-server-core": "^3.3.0",
-    "apollo-server-express": "^3.3.0",
-    "express": "^4.17.1",
-    "graphql": "^15.5.2",
+    "@subsquid/util": "^0.0.3",
+    "apollo-server-core": "^3.5.0",
+    "apollo-server-express": "^3.5.0",
+    "express": "^4.17.2",
+    "graphql": "^15.8.0",
     "graphql-parse-resolve-info": "^4.12.0",
-    "inflected": "^2.1.0",
     "pg": "^8.7.1"
   },
   "devDependencies": {
-    "@types/inflected": "^1.1.29",
+    "@types/express": "^4.17.13",
     "@types/mocha": "^9.0.0",
-    "@types/node-fetch": "^2.5.12",
-    "@types/pg": "^8.6.1",
+    "@types/node": "^16.11.17",
+    "@types/pg": "^8.6.3",
     "dotenv": "^10.0.0",
-    "expect": "^27.2.1",
-    "mocha": "^9.1.1",
-    "node-fetch": "^2.6.3",
-    "typescript": "^4.4.2"
-  }
-}
+    "expect": "^27.4.6",
+    "gql-test-client": "^0.0.0",
+    "mocha": "^9.1.3",
+    "typescript": "~4.5.4"
+  },
+  "scripts": {
+    "build": "rm -rf dist && tsc",
+    "test": "make up && sleep 1 && make test && 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"
+}

package/src/db.ts

@@ -0,0 +1,83 @@
+import type {ClientBase, Pool, PoolClient, PoolConfig} from "pg"
+
+
+export interface Database {
+    query(sql: string, parameters?: any[]): Promise<any[][]>
+    escapeIdentifier(name: string): string
+}
+
+
+/**
+ * This is an interface OpenReader uses to interact with underling database.
+ */
+export interface Transaction {
+    get(): Promise<Database>
+}
+
+
+export class PgDatabase implements Database {
+    constructor(private client: ClientBase) {}
+
+    query(sql: string, parameters?: any[]): Promise<any[]> {
+        return this.client.query({text: sql, rowMode: 'array'}, parameters).then(result => result.rows)
+    }
+
+    escapeIdentifier(name: string): string {
+        return this.client.escapeIdentifier(name)
+    }
+}
+
+
+export class PoolTransaction implements Transaction {
+    private tx: Promise<{client: PoolClient, db: Database}> | undefined
+    private closed = false
+
+    constructor(private pool: Pool) {}
+
+    async get(): Promise<Database> {
+        if (this.closed) {
+            throw new Error('Too late to request transaction')
+        }
+        this.tx = this.tx || this.startTransaction()
+        let {db} = await this.tx
+        return db
+    }
+
+    private async startTransaction(): Promise<{client: PoolClient, db: Database}> {
+        let client = await this.pool.connect()
+        try {
+            await client.query('START TRANSACTION ISOLATION LEVEL SERIALIZABLE READ ONLY')
+            return {
+                client,
+                db: new PgDatabase(client)
+            }
+        } catch(e: any) {
+            client.release()
+            throw e
+        }
+    }
+
+    close(): Promise<void> {
+        this.closed = true
+        return this.tx?.then(async ({client}) => {
+            try {
+                await client.query('COMMIT')
+            } catch(e: any) {
+                // ignore
+            } finally {
+                client.release()
+            }
+        }) || Promise.resolve()
+    }
+}
+
+
+export function createPoolConfig(): PoolConfig {
+    return {
+        host: process.env.DB_HOST || 'localhost',
+        port: process.env.DB_PORT ? parseInt(process.env.DB_PORT) : 5432,
+        database: process.env.DB_NAME || 'postgres',
+        user: process.env.DB_USER || 'postgres',
+        password: process.env.DB_PASS || 'postgres'
+    }
+}