@subsquid/openreader 0.0.0 → 0.3.1

package/dist/model.tools.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFtsQuery = exports.getEntity = exports.propTypeEquals = exports.validateUnionTypes = exports.validateNames = exports.validateModel = exports.buildUnionProps = exports.getUnionProps = void 0;
+exports.getFtsQuery = exports.getObject = exports.getEntity = exports.propTypeEquals = exports.validateLookups = exports.validateUnionTypes = exports.validateNames = exports.validateModel = exports.buildUnionProps = exports.getUnionProps = void 0;
 const assert_1 = __importDefault(require("assert"));
 const UNION_MAPS = new WeakMap();
 function getUnionProps(model, unionName) {
@@ -35,8 +35,10 @@ function buildUnionProps(model, unionName) {
 }
 exports.buildUnionProps = buildUnionProps;
 function validateModel(model) {
+    // TODO: check all invariants we assume
     validateNames(model);
     validateUnionTypes(model);
+    validateLookups(model);
 }
 exports.validateModel = validateModel;
 const TYPE_NAME_REGEX = /^[A-Z][a-zA-Z0-9]*$/;
@@ -90,6 +92,44 @@ function validateUnionTypes(model) {
     }
 }
 exports.validateUnionTypes = validateUnionTypes;
+function validateLookups(model) {
+    for (let name in model) {
+        let item = model[name];
+        switch (item.kind) {
+            case 'object':
+            case 'interface':
+                for (let key in item.properties) {
+                    let prop = item.properties[key];
+                    if (prop.type.kind == 'lookup' || prop.type.kind == 'list-lookup') {
+                        throw invalidProperty(name, key, `lookups are only supported on entity types`);
+                    }
+                }
+                break;
+            case 'entity':
+                for (let key in item.properties) {
+                    let prop = item.properties[key];
+                    if (prop.type.kind == 'lookup' && !prop.nullable) {
+                        throw invalidProperty(name, key, 'one-to-one lookups must be nullable');
+                    }
+                    if (prop.type.kind == 'lookup' || prop.type.kind == 'list-lookup') {
+                        let lookupEntity = getEntity(model, prop.type.entity);
+                        let lookupProperty = lookupEntity.properties[prop.type.field];
+                        if (lookupProperty?.type.kind != 'fk' || lookupProperty.type.foreignEntity != name) {
+                            throw invalidProperty(name, key, `${prop.type.entity}.${prop.type.field} is not a foreign key pointing to ${name}`);
+                        }
+                        if (prop.type.kind == 'lookup' && !lookupProperty.unique) {
+                            throw invalidProperty(name, key, `${prop.type.entity}.${prop.type.field} is not @unique`);
+                        }
+                    }
+                }
+                break;
+        }
+    }
+}
+exports.validateLookups = validateLookups;
+function invalidProperty(item, key, msg) {
+    return new Error(`Invalid property ${item}.${key}: ${msg}`);
+}
 function propTypeEquals(a, b) {
     if (a.kind != b.kind)
         return false;
@@ -98,7 +138,8 @@ function propTypeEquals(a, b) {
     switch (a.kind) {
         case 'fk':
             return a.foreignEntity == b.foreignEntity;
-        case 'list-relation':
+        case 'lookup':
+        case 'list-lookup':
             return a.entity == b.entity && a.field == b.field;
         default:
             return a.name == b.name;
@@ -107,13 +148,19 @@ function propTypeEquals(a, b) {
 exports.propTypeEquals = propTypeEquals;
 function getEntity(model, name) {
     let entity = model[name];
-    (0, assert_1.default)(entity.kind == 'entity');
+    (0, assert_1.default)(entity.kind == 'entity', `${name} expected to be an entity`);
     return entity;
 }
 exports.getEntity = getEntity;
+function getObject(model, name) {
+    let object = model[name];
+    (0, assert_1.default)(object.kind == 'object', `${name} expected to be an object`);
+    return object;
+}
+exports.getObject = getObject;
 function getFtsQuery(model, name) {
     let query = model[name];
-    (0, assert_1.default)(query.kind == 'fts');
+    (0, assert_1.default)(query.kind == 'fts', `${name} expected to be FTS query`);
     return query;
 }
 exports.getFtsQuery = getFtsQuery;

package/dist/model.tools.js.map

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

package/dist/orderBy.js

@@ -46,6 +46,11 @@ function buildOrderByMapping(model, typeName, depth) {
                     m.set(key + '_' + name, { [key]: spec });
                 }
                 break;
+            case 'lookup':
+                for (let [name, spec] of buildOrderByMapping(model, propType.entity, depth - 1)) {
+                    m.set(key + '_' + name, { [key]: spec });
+                }
+                break;
         }
     }
     return m;

package/dist/orderBy.js.map

@@ -1 +1 @@
-{"version":3,"file":"orderBy.js","sourceRoot":"","sources":["../src/orderBy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orderBy.js","sourceRoot":"","sources":["../src/orderBy.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAE3B,+CAA2C;AAuB3C,MAAM,aAAa,GAAG,IAAI,OAAO,EAAmD,CAAA;AAGpF,SAAgB,iBAAiB,CAAC,KAAY,EAAE,UAAkB;IAC9D,IAAI,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACpC,IAAI,KAAK,IAAI,IAAI,EAAE;QACf,KAAK,GAAG,EAAE,CAAA;QACV,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;KAClC;IACD,IAAI,KAAK,CAAC,UAAU,CAAC;QAAE,OAAO,KAAK,CAAC,UAAU,CAAC,CAAA;IAC/C,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAA;AACxE,CAAC;AARD,8CAQC;AAGD,SAAS,mBAAmB,CAAC,KAAY,EAAE,QAAgB,EAAE,KAAa;IACtE,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,IAAI,GAAG,EAAE,CAAA;IAChC,IAAI,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC5B,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,EAAE;QACxB,MAAM,GAAG,IAAA,2BAAa,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;KAC1C;IACD,IAAA,gBAAM,EAAC,MAAM,CAAC,IAAI,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAA;IAC1D,IAAI,CAAC,GAAG,IAAI,GAAG,EAAmB,CAAA;IAClC,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE;QAC/B,IAAI,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;QAC1C,QAAO,QAAQ,CAAC,IAAI,EAAE;YAClB,KAAK,QAAQ,CAAC;YACd,KAAK,MAAM;gBACP,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,EAAE,EAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAC,CAAC,CAAA;gBACnC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,OAAO,EAAE,EAAC,CAAC,GAAG,CAAC,EAAE,MAAM,EAAC,CAAC,CAAA;gBACrC,MAAK;YACT,KAAK,QAAQ,CAAC;YACd,KAAK,OAAO;gBACR,KAAK,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE;oBAC3E,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,EAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAC,CAAC,CAAA;iBACzC;gBACD,MAAK;YACT,KAAK,IAAI;gBACL,KAAK,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE;oBACpF,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,EAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAC,CAAC,CAAA;iBACzC;gBACD,MAAK;YACT,KAAK,QAAQ;gBACT,KAAK,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE;oBAC7E,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,EAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAC,CAAC,CAAA;iBACzC;gBACD,MAAK;SACZ;KACJ;IACD,OAAO,CAAC,CAAA;AACZ,CAAC;AAGD,SAAgB,YAAY,CAAC,KAAY,EAAE,UAAkB,EAAE,KAA6B;IACxF,IAAI,OAAO,GAAG,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;IAClD,OAAO,YAAY,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACd,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC7B,IAAA,gBAAM,EAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACf,CAAC,CAAC,CACL,CAAA;AACL,CAAC;AATD,oCASC;AAGD,SAAgB,YAAY,CAAC,IAAe;IACxC,IAAI,MAAM,GAAY,EAAE,CAAA;IACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAChB,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YAClB,IAAI,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;YACzB,IAAI,OAAO,IAAI,IAAI,EAAG;gBAClB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;aAC1B;iBAAM,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;gBACnC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;gBAClB,IAAA,gBAAM,EAAC,OAAO,EAAE,IAAI,QAAQ,CAAC,CAAA;gBAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;aAC5C;SACJ;IACL,CAAC,CAAC,CAAA;IACF,OAAO,MAAM,CAAA;AACjB,CAAC;AAfD,oCAeC"}

package/dist/queryBuilder.d.ts

@@ -1,6 +1,7 @@
+import { Database } from "./db";
+import type { Model } from "./model";
 import { OpenCrudOrderByValue } from "./orderBy";
 import type { FtsRequestedFields, RequestedFields } from "./requestedFields";
-import type { ResolverContext } from "./resolver";
 export interface ListArgs {
     offset?: number;
     limit?: number;
@@ -8,11 +9,11 @@ export interface ListArgs {
     where?: any;
 }
 export declare class QueryBuilder {
-    params: any[];
-    private aliases;
-    private db;
     private model;
-    constructor(ctx: ResolverContext);
+    private db;
+    private params;
+    private aliases;
+    constructor(model: Model, db: Database);
     private param;
     private ident;
     select(entityName: string, args: ListArgs, fields?: RequestedFields, variant?: SelectVariant): string;

package/dist/queryBuilder.js

@@ -4,18 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryBuilder = void 0;
+const util_1 = require("@subsquid/util");
 const assert_1 = __importDefault(require("assert"));
 const model_tools_1 = require("./model.tools");
 const orderBy_1 = require("./orderBy");
 const scalars_1 = require("./scalars");
-const util_1 = require("./util");
+const util_2 = require("./util");
 const where_1 = require("./where");
 class QueryBuilder {
-    constructor(ctx) {
+    constructor(model, db) {
+        this.model = model;
+        this.db = db;
         this.params = [];
         this.aliases = new AliasSet();
-        this.db = ctx.db;
-        this.model = ctx.model;
     }
     param(value) {
         return '$' + this.params.push(value);
@@ -25,10 +26,10 @@ class QueryBuilder {
     }
     select(entityName, args, fields, variant) {
         let entity = (0, model_tools_1.getEntity)(this.model, entityName);
-        let table = (0, util_1.toTable)(entityName);
+        let table = (0, util_2.toTable)(entityName);
         let alias = this.aliases.add(table);
-        let join = new FkJoinSet(this.aliases);
-        let cursor = new Cursor(this.model, this.ident.bind(this), this.aliases, join, entity, alias, '');
+        let join = new JoinSet(this.aliases);
+        let cursor = new Cursor(this.model, this.ident.bind(this), this.aliases, join, entityName, entity, alias, '');
         let whereExps = [];
         let orderByExps = [];
         let columns = new ColumnSet();
@@ -68,14 +69,16 @@ class QueryBuilder {
         if (variant?.kind == 'fts') {
             whereExps.push(`phraseto_tsquery('english', ${variant.textParam}) @@ ${cursor.tsv(variant.queryName)}`);
         }
-        let orderByInput = args.orderBy && (0, util_1.ensureArray)(args.orderBy);
+        let orderByInput = args.orderBy && (0, util_2.ensureArray)(args.orderBy);
         if (orderByInput?.length) {
             let orderBy = (0, orderBy_1.parseOrderBy)(this.model, entityName, orderByInput);
             this.populateOrderBy(orderByExps, cursor, orderBy);
         }
-        if (join.isNotEmpty()) {
-            out += join.render(name => this.ident(name));
-        }
+        join.forEach(j => {
+            let table = this.ident(j.table);
+            let alias = this.ident(j.alias);
+            out += `\nLEFT OUTER JOIN ${table} ${alias} ON ${alias}.${j.column} = ${j.rhs}`;
+        });
         if (whereExps.length) {
             out += '\nWHERE ' + whereExps.join(' AND ');
         }
@@ -106,11 +109,12 @@ class QueryBuilder {
                 case 'object':
                 case 'union':
                 case 'fk':
+                case 'lookup':
                     (0, assert_1.default)(typeof spec == 'object');
                     this.populateOrderBy(exps, cursor.child(key), spec);
                     break;
                 default:
-                    throw (0, util_1.unsupportedCase)(propType.kind);
+                    throw (0, util_2.unsupportedCase)(propType.kind);
             }
         }
     }
@@ -134,13 +138,14 @@ class QueryBuilder {
                         req.index = columns.add(cu.transport('isTypeOf'));
                         this.populateColumns(columns, cu, req.children);
                         break;
-                    case 'fk': {
+                    case 'fk':
+                    case 'lookup': {
                         let cu = cursor.child(fieldName);
                         req.index = columns.add(cu.transport('id'));
                         this.populateColumns(columns, cu, req.children);
                         break;
                     }
-                    case 'list-relation':
+                    case 'list-lookup':
                         req.index = columns.add('array(' + this.select(field.propType.entity, req.args, req.children, {
                             kind: 'list-subquery',
                             field: field.propType.field,
@@ -148,7 +153,7 @@ class QueryBuilder {
                         }) + ')');
                         break;
                     default:
-                        throw (0, util_1.unsupportedCase)(field.propType.kind);
+                        throw (0, util_2.unsupportedCase)(field.propType.kind);
                 }
             }
         }
@@ -163,7 +168,7 @@ class QueryBuilder {
                 case 'every':
                     if ((0, where_1.hasConditions)(opArg)) {
                         let rel = cursor.object.properties[f.field].type;
-                        (0, assert_1.default)(rel.kind == 'list-relation');
+                        (0, assert_1.default)(rel.kind == 'list-lookup');
                         let conditionedFrom = this.select(rel.entity, { where: opArg }, undefined, { kind: 'list-subquery', parent: cursor.native('id'), field: rel.field });
                         let allFrom = this.select(rel.entity, {}, undefined, { kind: 'list-subquery', parent: cursor.native('id'), field: rel.field });
                         exps.push(`(SELECT count(*) ${conditionedFrom}) = (SELECT count(*) ${allFrom})`);
@@ -172,7 +177,7 @@ class QueryBuilder {
                 case 'some':
                 case 'none':
                     let rel = cursor.object.properties[f.field].type;
-                    (0, assert_1.default)(rel.kind == 'list-relation');
+                    (0, assert_1.default)(rel.kind == 'list-lookup');
                     let q = '(SELECT true ' + this.select(rel.entity, { where: opArg }, undefined, { kind: 'list-subquery', parent: cursor.native('id'), field: rel.field }) + ' LIMIT 1)';
                     if (f.op == 'some') {
                         exps.push(q);
@@ -190,7 +195,7 @@ class QueryBuilder {
         }
         if (AND) {
             // We are getting objects here, although we have array in schema
-            (0, util_1.ensureArray)(AND).forEach((andWhere) => {
+            (0, util_2.ensureArray)(AND).forEach((andWhere) => {
                 if ((0, where_1.hasConditions)(andWhere)) {
                     exps.push(this.generateWhere(cursor, andWhere));
                 }
@@ -202,7 +207,7 @@ class QueryBuilder {
                 ors.push('(' + exps.join(' AND ') + ')');
             }
             // We are getting objects here, although we have array in schema
-            (0, util_1.ensureArray)(OR).forEach((orWhere) => {
+            (0, util_2.ensureArray)(OR).forEach((orWhere) => {
                 if ((0, where_1.hasConditions)(orWhere)) {
                     ors.push('(' + this.generateWhere(cursor, orWhere) + ')');
                 }
@@ -219,7 +224,6 @@ class QueryBuilder {
             case 'scalar':
             case 'enum': {
                 let lhs = cursor.native(field);
-                let typeName = propType.name;
                 switch (op) {
                     case 'in':
                     case 'not_in': {
@@ -227,7 +231,7 @@ class QueryBuilder {
                         // 1. use array parameter and do: WHERE col IN (SELECT * FROM unnest($array_param))
                         // 2. use arg list
                         // Let's try second option first.
-                        let list = (0, util_1.ensureArray)(arg).map(a => (0, scalars_1.fromTransportCast)(typeName, this.param(a)));
+                        let list = (0, util_2.ensureArray)(arg).map(a => this.param(a));
                         let param = `(${list.join(', ')})`;
                         exps.push(`${lhs} ${(0, where_1.whereOpToSqlOperator)(op)} ${param}`);
                         break;
@@ -255,8 +259,7 @@ class QueryBuilder {
                         exps.push(`position(${this.param(arg)} in ${lhs}) = 0`);
                         break;
                     default: {
-                        let param = (0, scalars_1.fromTransportCast)(propType.name, this.param(arg));
-                        exps.push(`${lhs} ${(0, where_1.whereOpToSqlOperator)(op)} ${param}`);
+                        exps.push(`${lhs} ${(0, where_1.whereOpToSqlOperator)(op)} ${this.param(arg)}`);
                     }
                 }
                 break;
@@ -264,7 +267,7 @@ class QueryBuilder {
             case 'list': {
                 let item = propType.item.type;
                 (0, assert_1.default)(item.kind == 'scalar' || item.kind == 'enum');
-                let param = (0, scalars_1.fromTransportArrayCast)(item.name, this.param(arg));
+                let param = this.param(arg);
                 let lhs = cursor.native(field);
                 switch (op) {
                     case 'containsAll':
@@ -277,7 +280,7 @@ class QueryBuilder {
                         exps.push(`NOT (${lhs} && ${param})`);
                         break;
                     default:
-                        throw (0, util_1.unsupportedCase)(op);
+                        throw (0, util_2.unsupportedCase)(op);
                 }
                 break;
             }
@@ -291,7 +294,8 @@ class QueryBuilder {
                 }
                 break;
             }
-            case 'fk': {
+            case 'fk':
+            case 'lookup': {
                 (0, assert_1.default)(op == '-');
                 if ((0, where_1.hasConditions)(arg)) {
                     exps.push(this.generateWhere(cursor.child(field), arg));
@@ -299,7 +303,7 @@ class QueryBuilder {
                 break;
             }
             default:
-                throw (0, util_1.unsupportedCase)(propType.kind);
+                throw (0, util_2.unsupportedCase)(propType.kind);
         }
     }
     toResult(rows, fields) {
@@ -339,18 +343,19 @@ class QueryBuilder {
                         }
                         break;
                     }
-                    case 'fk': {
+                    case 'fk':
+                    case 'lookup': {
                         let id = row[req.index];
                         if (id != null) {
                             rec[req.alias] = this.mapRow(row, req.children);
                         }
                         break;
                     }
-                    case 'list-relation':
+                    case 'list-lookup':
                         rec[req.alias] = this.toResult(row[req.index], req.children);
                         break;
                     default:
-                        throw (0, util_1.unsupportedCase)(f.propType.kind);
+                        throw (0, util_2.unsupportedCase)(f.propType.kind);
                 }
             }
         }
@@ -358,22 +363,21 @@ class QueryBuilder {
     }
     async executeSelect(entityName, args, fields$) {
         let sql = this.select(entityName, args, fields$);
-        let result = await this.query(sql);
-        return this.toResult(result.rows, fields$);
+        let rows = await this.query(sql);
+        return this.toResult(rows, fields$);
     }
     async executeSelectCount(entityName, where) {
         let sql = `SELECT count(*) ${this.select(entityName, { where })}`;
-        let result = await this.query(sql);
-        return (0, util_1.toInt)(result.rows[0][0]);
+        let rows = await this.query(sql);
+        return (0, util_2.toInt)(rows[0][0]);
     }
     async executeListCount(entityName, args) {
         let sql = `SELECT count(*) FROM (SELECT true ${this.select(entityName, args)}) AS ${this.aliases.add('list')}`;
-        let result = await this.query(sql);
-        return (0, util_1.toInt)(result.rows[0][0]);
+        let rows = await this.query(sql);
+        return (0, util_2.toInt)(rows[0][0]);
     }
     query(sql) {
-        // console.log('\n' + sql)
-        return this.db.query({ text: sql, rowMode: 'array' }, this.params);
+        return this.db.query(sql, this.params);
     }
     fulltextSearchSelect(queryName, args, $fields) {
         let query = (0, model_tools_1.getFtsQuery)(this.model, queryName);
@@ -433,17 +437,24 @@ class QueryBuilder {
     }
     async executeFulltextSearch(queryName, args, $fields) {
         let sql = this.fulltextSearchSelect(queryName, args, $fields);
-        let result = await this.query(sql);
-        return this.toFulltextSearchResult(result.rows, $fields);
+        let rows = await this.query(sql);
+        return this.toFulltextSearchResult(rows, $fields);
     }
 }
 exports.QueryBuilder = QueryBuilder;
+/**
+ * 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.
+ */
 class Cursor {
-    constructor(model, ident, aliases, join, object, alias, prefix) {
+    constructor(model, ident, aliases, join, name, object, alias, prefix) {
         this.model = model;
         this.ident = ident;
         this.aliases = aliases;
         this.join = join;
+        this.name = name;
         this.object = object;
         this.alias = alias;
         this.prefix = prefix;
@@ -454,10 +465,10 @@ class Cursor {
             case 'scalar':
             case 'enum':
                 if (this.object.kind == 'object') {
-                    return (0, scalars_1.fromJsonToTransportCast)(prop.type.name, this.prefix, propName);
+                    return (0, scalars_1.fromJsonToOutputCast)(prop.type.name, this.prefix, propName);
                 }
                 else {
-                    return (0, scalars_1.toTransportCast)(prop.type.name, this.column(propName));
+                    return (0, scalars_1.toOutputCast)(prop.type.name, this.column(propName));
                 }
             case 'list':
                 let itemType = prop.type.item.type;
@@ -466,10 +477,10 @@ class Cursor {
                     return this.field(propName);
                 }
                 else {
-                    return (0, scalars_1.toTransportArrayCast)(itemType.name, this.column(propName));
+                    return (0, scalars_1.toOutputArrayCast)(itemType.name, this.column(propName));
                 }
             default:
-                throw (0, util_1.unsupportedCase)(prop.type.kind);
+                throw (0, util_2.unsupportedCase)(prop.type.kind);
         }
     }
     native(propName) {
@@ -488,30 +499,40 @@ class Cursor {
         }
     }
     child(propName) {
+        let name;
         let object;
         let alias;
         let prefix;
         let prop = this.object.properties[propName];
         switch (prop.type.kind) {
             case 'object':
-                object = this.model[prop.type.name];
+                name = prop.type.name;
+                object = (0, model_tools_1.getObject)(this.model, name);
                 alias = this.alias;
                 prefix = this.field(propName);
                 break;
             case 'union':
-                object = (0, model_tools_1.getUnionProps)(this.model, prop.type.name);
+                name = prop.type.name;
+                object = (0, model_tools_1.getUnionProps)(this.model, name);
                 alias = this.alias;
                 prefix = this.field(propName);
                 break;
             case 'fk':
-                object = this.model[prop.type.foreignEntity];
-                alias = this.join.add((0, util_1.toTable)(prop.type.foreignEntity), this.fk(propName));
+                name = prop.type.foreignEntity;
+                object = (0, model_tools_1.getEntity)(this.model, name);
+                alias = this.join.add((0, util_2.toTable)(name), '"id"', this.fk(propName));
+                prefix = '';
+                break;
+            case 'lookup':
+                name = prop.type.entity;
+                object = (0, model_tools_1.getEntity)(this.model, name);
+                alias = this.join.add((0, util_2.toTable)(name), this.ident((0, util_2.toFkColumn)(prop.type.field)), this.field('id'));
                 prefix = '';
                 break;
             default:
-                throw (0, util_1.unsupportedCase)(prop.type.kind);
+                throw (0, util_2.unsupportedCase)(prop.type.kind);
         }
-        return new Cursor(this.model, this.ident, this.aliases, this.join, object, alias, prefix);
+        return new Cursor(this.model, this.ident, this.aliases, this.join, name, object, alias, prefix);
     }
     field(name) {
         if (this.object.kind == 'entity') {
@@ -523,20 +544,23 @@ class Cursor {
     }
     column(name) {
         (0, assert_1.default)(this.object.kind == 'entity');
-        return this.ident(this.alias) + '.' + this.ident((0, util_1.toColumn)(name));
+        return this.ident(this.alias) + '.' + this.ident((0, util_2.toColumn)(name));
     }
     fk(propName) {
         return this.object.kind == 'entity'
-            ? this.ident(this.alias) + '.' + this.ident((0, util_1.toFkColumn)(propName))
+            ? this.ident(this.alias) + '.' + this.ident((0, util_2.toFkColumn)(propName))
             : (0, scalars_1.fromJsonCast)('ID', this.prefix, propName);
     }
     tsv(queryName) {
         (0, assert_1.default)(this.object.kind == 'entity');
-        return this.ident(this.alias) + '.' + this.ident((0, util_1.snakeCase)(queryName) + '_tsv');
+        return this.ident(this.alias) + '.' + this.ident((0, util_1.toSnakeCase)(queryName) + '_tsv');
     }
     doc(queryName) {
         (0, assert_1.default)(this.object.kind == 'entity');
-        return this.ident(this.alias) + '.' + this.ident((0, util_1.snakeCase)(queryName) + '_doc');
+        let query = (0, model_tools_1.getFtsQuery)(this.model, queryName);
+        let src = query.sources.find(src => src.entity == this.name);
+        (0, assert_1.default)(src != null);
+        return src.fields.map(f => `coalesce(${this.field(f)}, '')`).join(` || E'\\n\\n' || `);
     }
 }
 class ColumnSet {
@@ -558,34 +582,27 @@ class ColumnSet {
         return this.columns.size;
     }
 }
-class FkJoinSet {
+class JoinSet {
     constructor(aliases) {
         this.aliases = aliases;
         this.joins = new Map();
     }
-    add(table, on) {
-        let key = table + '  ' + on;
+    add(table, column, rhs) {
+        let key = `${table} ${column} ${rhs}`;
         let e = this.joins.get(key);
         if (!e) {
             e = {
                 table,
                 alias: this.aliases.add(table),
-                on
+                column,
+                rhs
             };
             this.joins.set(key, e);
         }
         return e.alias;
     }
-    isNotEmpty() {
-        return this.joins.size > 0;
-    }
-    render(escapeIdentifier) {
-        let e = escapeIdentifier;
-        let out = '';
-        this.joins.forEach(join => {
-            out += `\nLEFT OUTER JOIN ${e(join.table)} ${e(join.alias)} ON ${e(join.alias)}."id" = ${join.on}`;
-        });
-        return out;
+    forEach(cb) {
+        this.joins.forEach(join => cb(join));
     }
 }
 class AliasSet {