@balena/odata-to-abstract-sql 8.0.2 → 9.0.0

package/out/odata-to-abstract-sql.d.ts

@@ -1,5 +1,5 @@
 import memoize from 'memoizee';
-import type { AbstractSqlQuery, AbstractSqlModel, AbstractSqlTable, DurationNode, SelectNode, FromNode, WhereNode, OrderByNode, LimitNode, OffsetNode, NumberTypeNodes, FieldsNode, ValuesNode, ReferencedFieldNode, AliasNode, BooleanTypeNodes, SelectQueryNode, BindNode, AbstractSqlField, TableNode, Definition as ModernDefinition, ResourceNode, UnionQueryNode, FromTypeNodes, FieldNode, CountNode, AddNode, InsertQueryNode, DeleteQueryNode, UpdateQueryNode, DurationTypeNodes, SubtractNode, MultiplyNode, DivideNode, NullNode, TextTypeNodes, AnyTypeNodes, StrictDateTypeNodes, JoinTypeNodes } from '@balena/abstract-sql-compiler';
+import type { AbstractSqlQuery, AbstractSqlModel, AbstractSqlTable, DurationNode, SelectNode, FromNode, WhereNode, OrderByNode, LimitNode, OffsetNode, NumberTypeNodes, FieldsNode, ValuesNode, ReferencedFieldNode, AliasNode, BooleanTypeNodes, SelectQueryNode, BindNode, TableNode, Definition as ModernDefinition, ResourceNode, UnionQueryNode, FromTypeNodes, FieldNode, CountNode, AddNode, InsertQueryNode, DeleteQueryNode, UpdateQueryNode, DurationTypeNodes, SubtractNode, MultiplyNode, DivideNode, NullNode, TextTypeNodes, AnyTypeNodes, StrictDateTypeNodes, JoinTypeNodes } from '@balena/abstract-sql-compiler';
 import type { ODataBinds, ODataQuery, SupportedMethod, ExpandPropertyPath, ResourceOptions, OrderByOption, OrderByPropertyPath, FilterOption, BindReference, PropertyPath, MethodCall } from '@balena/odata-parser';
 export type { ODataBinds, ODataQuery, SupportedMethod };
 type InternalSupportedMethod = Exclude<SupportedMethod, 'MERGE'> | 'PUT-INSERT';
@@ -90,7 +90,7 @@ export declare class OData2AbstractSQL {
     ResolveRelationship(resource: string | Resource, relationship: string): any;
     AddCountField(path: any, query: Query): void;
     AddSelectFields(path: any, query: Query, resource: Resource): void;
-    AliasSelectField(resource: Resource, fieldName: string, computed?: AbstractSqlQuery, alias?: string): ReferencedFieldNode | AliasNode<ReferencedFieldNode> | AliasNode<AbstractSqlQuery>;
+    AliasSelectField(resource: Resource, fieldName: string): ReferencedFieldNode | AliasNode<ReferencedFieldNode>;
     ReferencedField(resource: Resource, resourceField: string): ReferencedFieldNode;
     BooleanMatch(match: true | false | [string, ...any[]], optional: true): BooleanTypeNodes | undefined;
     BooleanMatch(match: true | false | [string, ...any[]]): BooleanTypeNodes;
@@ -136,6 +136,5 @@ export declare class OData2AbstractSQL {
     Synonym(sqlName: string): string;
     getTableReference(resource: Resource, extraBindVars: ODataBinds, bindVarsLength: number, bypassDefinition?: boolean, tableAlias?: string, isModifyOperation?: boolean): FromTypeNodes;
     rewriteDefinition(definition: Definition, extraBindVars: ODataBinds, bindVarsLength: number): ModernDefinition;
-    rewriteComputed(computed: NonNullable<AbstractSqlField['computed']>, tableName: string, tableAlias?: string): AbstractSqlQuery;
-    rewriteResourceAsTable(abstractSql: AbstractSqlQuery): void;
+    rewriteResourceAsTable(abstractSql: AnyTypeNodes): void;
 }

package/out/odata-to-abstract-sql.js

@@ -1,13 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OData2AbstractSQL = exports.isBindReference = exports.rewriteBinds = exports.odataNameToSqlName = exports.sqlNameToODataName = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const memoizee_1 = __importDefault(require("memoizee"));
-const string_hash_1 = __importDefault(require("string-hash"));
-const abstract_sql_compiler_1 = require("@balena/abstract-sql-compiler");
+import _ from 'lodash';
+import memoize from 'memoizee';
+import stringHash from 'string-hash';
+import { isAliasNode, isFromNode, isSelectNode, isSelectQueryNode, isTableNode, } from '@balena/abstract-sql-compiler';
 class KeySyntaxError extends SyntaxError {
 }
 const convertToModernDefinition = (definition) => {
@@ -48,14 +42,14 @@ const containsQueryOption = (opts) => {
 const addNestedFieldSelect = (selectNode, fromNode, fieldName, fieldNameAlias) => {
     let aliasName;
     let tableOrSubqueryNode;
-    if ((0, abstract_sql_compiler_1.isAliasNode)(fromNode)) {
+    if (isAliasNode(fromNode)) {
         tableOrSubqueryNode = fromNode[1];
         aliasName = fromNode[2];
     }
     else {
         tableOrSubqueryNode = fromNode;
     }
-    if ((0, abstract_sql_compiler_1.isTableNode)(tableOrSubqueryNode)) {
+    if (isTableNode(tableOrSubqueryNode)) {
         selectNode.push([
             'Alias',
             ['ReferencedField', aliasName ?? tableOrSubqueryNode[1], fieldName],
@@ -63,17 +57,17 @@ const addNestedFieldSelect = (selectNode, fromNode, fieldName, fieldNameAlias) =
         ]);
         return;
     }
-    if (!(0, abstract_sql_compiler_1.isSelectQueryNode)(tableOrSubqueryNode)) {
+    if (!isSelectQueryNode(tableOrSubqueryNode)) {
         throw new Error(`Adding a nested field select to a subquery containing a ${tableOrSubqueryNode[0]} is not supported`);
     }
     if (aliasName == null) {
         throw new Error('Found unaliased SelectQueryNode');
     }
-    const nestedSelectNode = tableOrSubqueryNode.find(abstract_sql_compiler_1.isSelectNode);
+    const nestedSelectNode = tableOrSubqueryNode.find(isSelectNode);
     if (nestedSelectNode == null) {
         throw new Error(`Cannot find SelectNode in subquery`);
     }
-    const nestedFromNode = tableOrSubqueryNode.find(abstract_sql_compiler_1.isFromNode);
+    const nestedFromNode = tableOrSubqueryNode.find(isFromNode);
     if (nestedFromNode == null) {
         throw new Error(`Cannot find FromNode in subquery`);
     }
@@ -128,8 +122,8 @@ class Query {
         return [queryType, ...compiled, ...this.extras];
     }
 }
-exports.sqlNameToODataName = (0, memoizee_1.default)((sqlName) => sqlName.replace(/-/g, '__').replace(/ /g, '_'), { primitive: true });
-exports.odataNameToSqlName = (0, memoizee_1.default)((odataName) => odataName.replace(/__/g, '-').replace(/_/g, ' '), { primitive: true });
+export const sqlNameToODataName = memoize((sqlName) => sqlName.replace(/-/g, '__').replace(/ /g, '_'), { primitive: true });
+export const odataNameToSqlName = memoize((odataName) => odataName.replace(/__/g, '-').replace(/_/g, ' '), { primitive: true });
 const modifyAbstractSql = (match, abstractSql, fn) => {
     if (Array.isArray(abstractSql)) {
         if (abstractSql[0] === match) {
@@ -142,7 +136,7 @@ const modifyAbstractSql = (match, abstractSql, fn) => {
         }
     }
 };
-const rewriteBinds = (definition, existingBinds, inc = 0) => {
+export const rewriteBinds = (definition, existingBinds, inc = 0) => {
     const { binds } = definition;
     if (binds == null || binds.length === 0) {
         return;
@@ -155,17 +149,14 @@ const rewriteBinds = (definition, existingBinds, inc = 0) => {
     });
     existingBinds.push(...binds);
 };
-exports.rewriteBinds = rewriteBinds;
-const isBindReference = (maybeBind) => {
+export const isBindReference = (maybeBind) => {
     return (maybeBind != null &&
         typeof maybeBind === 'object' &&
         'bind' in maybeBind &&
         (typeof maybeBind.bind === 'string' || typeof maybeBind.bind === 'number'));
 };
-exports.isBindReference = isBindReference;
 const isDynamicResource = (resource) => {
-    return (resource.definition != null ||
-        resource.fields.some((f) => f.computed != null));
+    return resource.definition != null;
 };
 const addBodyKey = (resourceName, fieldName, bind, bodyKeys, extraBodyVars) => {
     const qualifiedIDField = resourceName + '.' + fieldName;
@@ -174,7 +165,7 @@ const addBodyKey = (resourceName, fieldName, bind, bodyKeys, extraBodyVars) => {
         extraBodyVars[qualifiedIDField] = bind;
     }
 };
-class OData2AbstractSQL {
+export class OData2AbstractSQL {
     clientModel;
     methods;
     extraBodyVars = {};
@@ -188,25 +179,25 @@ class OData2AbstractSQL {
         this.methods = methods;
         const MAX_ALIAS_LENGTH = 63;
         const shortAliases = generateShortAliases(clientModel);
-        this.checkAlias = (0, memoizee_1.default)((alias) => {
+        this.checkAlias = memoize((alias) => {
             let aliasLength = alias.length;
             if (minimizeAliases === false && aliasLength <= MAX_ALIAS_LENGTH) {
                 return alias;
             }
-            alias = (0, lodash_1.default)(alias.toLowerCase())
+            alias = _(alias.toLowerCase())
                 .split('.')
                 .map((part) => {
                 if (minimizeAliases === false && aliasLength <= MAX_ALIAS_LENGTH) {
                     return part;
                 }
                 aliasLength -= part.length;
-                const shortAlias = (0, lodash_1.default)(part)
+                const shortAlias = _(part)
                     .split('-')
                     .map((part2) => {
-                    part2 = (0, lodash_1.default)(part2)
+                    part2 = _(part2)
                         .split(' ')
                         .map((part3) => {
-                        part3 = (0, lodash_1.default)(part3)
+                        part3 = _(part3)
                             .split('$')
                             .map((part4) => shortAliases[part4] ?? part4)
                             .join('$');
@@ -226,7 +217,7 @@ class OData2AbstractSQL {
             if (aliasLength <= MAX_ALIAS_LENGTH) {
                 return alias;
             }
-            const hashStr = (0, string_hash_1.default)(alias).toString(36) + '$';
+            const hashStr = stringHash(alias).toString(36) + '$';
             return (hashStr +
                 alias.slice(hashStr.length + alias.length - MAX_ALIAS_LENGTH));
         }, {
@@ -243,7 +234,7 @@ class OData2AbstractSQL {
             this.reset();
             this.bindVarsLength = bindVarsLength;
             let tree;
-            if (lodash_1.default.isEmpty(path)) {
+            if (_.isEmpty(path)) {
                 tree = ['$serviceroot'];
             }
             else if (['$metadata', '$serviceroot'].includes(path.resource)) {
@@ -337,7 +328,7 @@ class OData2AbstractSQL {
                 throw new Error('Cannot navigate links');
             }
             if (path.link.key != null) {
-                if ((0, exports.isBindReference)(path.link.key)) {
+                if (isBindReference(path.link.key)) {
                     query.where.push([
                         comparison.eq,
                         referencedField,
@@ -374,9 +365,7 @@ class OData2AbstractSQL {
                         'SelectQuery',
                         [
                             'Select',
-                            (resource.modifyFields ?? resource.fields)
-                                .filter((field) => field.computed == null)
-                                .map((field) => {
+                            (resource.modifyFields ?? resource.fields).map((field) => {
                                 const alias = field.fieldName;
                                 const bindVar = bindVars?.find((v) => v[0] === alias);
                                 const value = bindVar?.[1] ?? ['Null'];
@@ -411,19 +400,19 @@ class OData2AbstractSQL {
                         throw new Error('Only SelectQuery or Table definitions supported for inserts');
                     }
                     const tableName = unionResource.modifyName ?? unionResource.name;
-                    const isTableBeingModified = (part) => (0, abstract_sql_compiler_1.isTableNode)(part) && part[1] === tableName;
+                    const isTableBeingModified = (part) => isTableNode(part) && part[1] === tableName;
                     if (isTableBeingModified(definition.abstractSql)) {
                         definition.abstractSql = bindVarSelectQuery;
                     }
                     else {
                         let found = false;
                         const replaceInsertTableNodeWithBinds = (part) => {
-                            if ((0, abstract_sql_compiler_1.isFromNode)(part)) {
+                            if (isFromNode(part)) {
                                 if (isTableBeingModified(part[1])) {
                                     found = true;
                                     return ['From', ['Alias', bindVarSelectQuery, tableName]];
                                 }
-                                else if ((0, abstract_sql_compiler_1.isAliasNode)(part[1])) {
+                                else if (isAliasNode(part[1])) {
                                     const [, aliasedNode, alias] = part[1];
                                     if (isTableBeingModified(aliasedNode)) {
                                         found = true;
@@ -497,7 +486,7 @@ class OData2AbstractSQL {
         const { key } = path;
         if (key != null) {
             if (method === 'PUT' || method === 'PUT-INSERT' || method === 'POST') {
-                if ((0, exports.isBindReference)(key)) {
+                if (isBindReference(key)) {
                     addBodyKey(resource.resourceName, resource.idField, key, bodyKeys, this.extraBodyVars);
                 }
                 else {
@@ -510,7 +499,7 @@ class OData2AbstractSQL {
         }
     }
     BaseKey(resource, key, followedForeignKey) {
-        if ((0, exports.isBindReference)(key)) {
+        if (isBindReference(key)) {
             if (followedForeignKey != null) {
                 throw new KeySyntaxError('Using a key bind after a navigation expression is not supported.');
             }
@@ -523,7 +512,7 @@ class OData2AbstractSQL {
             return [comparison.eq, referencedField, bind];
         }
         const fieldNames = Object.keys(key);
-        const sqlFieldNames = fieldNames.map(exports.odataNameToSqlName);
+        const sqlFieldNames = fieldNames.map(odataNameToSqlName);
         if (followedForeignKey != null) {
             if (sqlFieldNames.includes(followedForeignKey)) {
                 throw new SyntaxError(`Specified already navigated field as part of key: ${followedForeignKey}`);
@@ -544,7 +533,7 @@ class OData2AbstractSQL {
                 return (((index.type === 'UNIQUE' && index.predicate == null) ||
                     index.type === 'PRIMARY KEY') &&
                     sqlFieldNames.length === index.fields.length &&
-                    lodash_1.default.isEqual(index.fields.slice().sort(), sqlFieldNames));
+                    _.isEqual(index.fields.slice().sort(), sqlFieldNames));
             })) {
             throw new KeySyntaxError('Specified fields for path key that are not directly unique');
         }
@@ -559,7 +548,7 @@ class OData2AbstractSQL {
         return ['And', ...namedKeys];
     }
     Bind(bind, optional = false) {
-        if ((0, exports.isBindReference)(bind)) {
+        if (isBindReference(bind)) {
             return ['Bind', bind.bind];
         }
         if (optional) {
@@ -613,7 +602,7 @@ class OData2AbstractSQL {
             resource = this.clientModel.tables[relationshipMapping[1][0]];
         }
         else {
-            let sqlName = (0, exports.odataNameToSqlName)(resourceName);
+            let sqlName = odataNameToSqlName(resourceName);
             sqlName = this.Synonym(sqlName);
             resource = this.clientModel.tables[sqlName];
         }
@@ -624,7 +613,7 @@ class OData2AbstractSQL {
         if (parentResource) {
             let resourceAlias2;
             if (resourceName.includes('__') && !resource.name.includes('-')) {
-                const verb = (0, exports.odataNameToSqlName)(resourceName).split('-')[0];
+                const verb = odataNameToSqlName(resourceName).split('-')[0];
                 resourceAlias2 = verb + '-' + resource.name;
             }
             else {
@@ -663,7 +652,7 @@ class OData2AbstractSQL {
                 ? resource.modifyFields
                 : resource.fields;
             for (const { fieldName } of fields) {
-                resourceMappings[(0, exports.sqlNameToODataName)(fieldName)] = [
+                resourceMappings[sqlNameToODataName(fieldName)] = [
                     tableAlias,
                     fieldName,
                 ];
@@ -688,12 +677,12 @@ class OData2AbstractSQL {
         if (!resourceRelations) {
             throw new SyntaxError(`Could not resolve relationship for '${resourceName}'`);
         }
-        const relationshipPath = (0, lodash_1.default)(relationship)
+        const relationshipPath = _(relationship)
             .split('__')
-            .map(exports.odataNameToSqlName)
+            .map(odataNameToSqlName)
             .flatMap((sqlName) => this.Synonym(sqlName).split('-'))
             .value();
-        const relationshipMapping = lodash_1.default.get(resourceRelations, relationshipPath);
+        const relationshipMapping = _.get(resourceRelations, relationshipPath);
         if (!relationshipMapping?.$) {
             throw new SyntaxError(`Could not resolve relationship mapping from '${resourceName}' to '${relationshipPath}'`);
         }
@@ -710,31 +699,24 @@ class OData2AbstractSQL {
             this.AddJoins(query, resource, path.options.$select.properties);
             odataFieldNames = path.options.$select.properties.map((prop) => {
                 const field = this.Property(prop);
-                const sqlName = (0, exports.odataNameToSqlName)(field.name);
-                const resourceField = field.resource.fields.find(({ fieldName }) => fieldName === sqlName);
-                return [field.resource, field.name, resourceField?.computed];
+                return [field.resource, field.name];
             });
         }
         else {
             odataFieldNames = resource.fields.map((field) => [
                 resource,
-                (0, exports.sqlNameToODataName)(field.fieldName),
-                field.computed,
+                sqlNameToODataName(field.fieldName),
             ]);
         }
-        const fields = lodash_1.default.differenceWith(odataFieldNames, query.select, (a, b) => a[1] === lodash_1.default.last(b)).map((args) => this.AliasSelectField(...args));
+        const fields = _.differenceWith(odataFieldNames, query.select, (a, b) => a[1] === _.last(b)).map((args) => this.AliasSelectField(...args));
         query.select = query.select.concat(fields);
     }
-    AliasSelectField(resource, fieldName, computed, alias = fieldName) {
-        if (computed) {
-            computed = this.rewriteComputed(computed, resource.name, resource.tableAlias);
-            return ['Alias', computed, alias];
-        }
+    AliasSelectField(resource, fieldName) {
         const referencedField = this.ReferencedField(resource, fieldName);
-        if (referencedField[2] === alias) {
+        if (referencedField[2] === fieldName) {
             return referencedField;
         }
-        return ['Alias', referencedField, alias];
+        return ['Alias', referencedField, fieldName];
     }
     ReferencedField(resource, resourceField) {
         const mapping = this.ResourceMapping(resource);
@@ -780,7 +762,7 @@ class OData2AbstractSQL {
                         case 'and':
                         case 'or':
                             return [
-                                lodash_1.default.capitalize(type),
+                                _.capitalize(type),
                                 ...rest.map((v) => this.BooleanMatch(v)),
                             ];
                         case 'not': {
@@ -817,7 +799,7 @@ class OData2AbstractSQL {
                             throw new SyntaxError(`Boolean does not support ${type}`);
                     }
                 }
-                else if ((0, exports.isBindReference)(match)) {
+                else if (isBindReference(match)) {
                     return this.Bind(match);
                 }
                 else {
@@ -842,7 +824,7 @@ class OData2AbstractSQL {
             throw new SyntaxError('Unexpected function name');
         }
         const args = properties.args.map((v) => this.Operand(v));
-        return [sqlName ?? lodash_1.default.capitalize(name), ...args];
+        return [sqlName ?? _.capitalize(name), ...args];
     }
     Operand(match) {
         for (const matcher of [
@@ -1021,7 +1003,7 @@ class OData2AbstractSQL {
                     throw new SyntaxError(`${method} is not a number function`);
             }
         }
-        else if ((0, exports.isBindReference)(match)) {
+        else if (isBindReference(match)) {
             return this.Bind(match);
         }
         else if (optional) {
@@ -1072,7 +1054,7 @@ class OData2AbstractSQL {
         }
     }
     DateMatch(match, optional = false) {
-        if (lodash_1.default.isDate(match)) {
+        if (_.isDate(match)) {
             return ['Date', match];
         }
         else if (Array.isArray(match) && match[0] === 'call') {
@@ -1105,11 +1087,11 @@ class OData2AbstractSQL {
         if (match == null || typeof match !== 'object') {
             return;
         }
-        const duration = (0, lodash_1.default)(match)
+        const duration = _(match)
             .pick('negative', 'day', 'hour', 'minute', 'second')
-            .omitBy(lodash_1.default.isNil)
+            .omitBy(_.isNil)
             .value();
-        if ((0, lodash_1.default)(duration).omit('negative').isEmpty()) {
+        if (_(duration).omit('negative').isEmpty()) {
             return;
         }
         return ['Duration', duration];
@@ -1243,14 +1225,14 @@ class OData2AbstractSQL {
         }
         const existingJoin = query.joins.find((join) => {
             const existingFrom = join[1];
-            return (((0, abstract_sql_compiler_1.isTableNode)(existingFrom) &&
+            return ((isTableNode(existingFrom) &&
                 existingFrom[1] === navigation.resource.tableAlias) ||
-                ((0, abstract_sql_compiler_1.isAliasNode)(existingFrom) &&
+                (isAliasNode(existingFrom) &&
                     existingFrom[2] === navigation.resource.tableAlias));
         });
         if (existingJoin != null) {
             const existingJoinPredicate = existingJoin[2]?.[1];
-            if (!lodash_1.default.isEqual(navigation.where, existingJoinPredicate)) {
+            if (!_.isEqual(navigation.where, existingJoinPredicate)) {
                 throw new KeySyntaxError(`Adding JOINs on the same resource with different ON clauses is not supported. Found ${navigation.resource.tableAlias}`);
             }
             throw new SyntaxError(`Could not navigate resources '${resource.name}' and '${extraResource}'`);
@@ -1260,8 +1242,8 @@ class OData2AbstractSQL {
     }
     AddNavigation(query, resource, extraResource) {
         const navigation = this.NavigateResources(resource, extraResource);
-        if (!query.from.some((from) => ((0, abstract_sql_compiler_1.isTableNode)(from) && from[1] === navigation.resource.tableAlias) ||
-            ((0, abstract_sql_compiler_1.isAliasNode)(from) && from[2] === navigation.resource.tableAlias))) {
+        if (!query.from.some((from) => (isTableNode(from) && from[1] === navigation.resource.tableAlias) ||
+            (isAliasNode(from) && from[2] === navigation.resource.tableAlias))) {
             query.fromResource(this, navigation.resource);
             query.where.push(navigation.where);
             return navigation.resource;
@@ -1280,7 +1262,7 @@ class OData2AbstractSQL {
         this.defaultResource = undefined;
     }
     Synonym(sqlName) {
-        return (0, lodash_1.default)(sqlName)
+        return _(sqlName)
             .split('-')
             .map((namePart) => {
             const synonym = this.clientModel.synonyms[namePart];
@@ -1296,10 +1278,10 @@ class OData2AbstractSQL {
             if (tableAlias == null) {
                 return tableRef;
             }
-            if ((0, abstract_sql_compiler_1.isTableNode)(tableRef) && tableRef[1] === tableAlias) {
+            if (isTableNode(tableRef) && tableRef[1] === tableAlias) {
                 return tableRef;
             }
-            else if ((0, abstract_sql_compiler_1.isAliasNode)(tableRef)) {
+            else if (isAliasNode(tableRef)) {
                 if (tableRef[2] === tableAlias) {
                     return tableRef;
                 }
@@ -1309,27 +1291,9 @@ class OData2AbstractSQL {
                 return ['Alias', tableRef, tableAlias];
             }
         };
-        if (bypassDefinition !== true) {
-            if (resource.definition) {
-                const definition = this.rewriteDefinition(resource.definition, extraBindVars, bindVarsLength);
-                return maybeAlias(definition.abstractSql);
-            }
-            const computedFields = resource.fields.filter((f) => f.computed != null);
-            if (computedFields.length > 0) {
-                const computedFieldQuery = new Query();
-                computedFieldQuery.select = [
-                    ['Field', '*'],
-                    ...computedFields.map((field) => this.AliasSelectField(resource, (0, exports.sqlNameToODataName)(field.fieldName), field.computed, field.fieldName)),
-                ];
-                computedFieldQuery.fromResource(this, {
-                    tableAlias: resource.name,
-                    ...resource,
-                }, {
-                    extraBindVars,
-                    bindVarsLength,
-                }, true);
-                return maybeAlias(computedFieldQuery.compile('SelectQuery'));
-            }
+        if (bypassDefinition !== true && resource.definition != null) {
+            const definition = this.rewriteDefinition(resource.definition, extraBindVars, bindVarsLength);
+            return maybeAlias(definition.abstractSql);
         }
         return maybeAlias([
             'Table',
@@ -1339,23 +1303,11 @@ class OData2AbstractSQL {
         ]);
     }
     rewriteDefinition(definition, extraBindVars, bindVarsLength) {
-        const rewrittenDefinition = lodash_1.default.cloneDeep(convertToModernDefinition(definition));
-        (0, exports.rewriteBinds)(rewrittenDefinition, extraBindVars, bindVarsLength);
+        const rewrittenDefinition = _.cloneDeep(convertToModernDefinition(definition));
+        rewriteBinds(rewrittenDefinition, extraBindVars, bindVarsLength);
         this.rewriteResourceAsTable(rewrittenDefinition.abstractSql);
         return rewrittenDefinition;
     }
-    rewriteComputed(computed, tableName, tableAlias) {
-        const rewrittenComputed = lodash_1.default.cloneDeep(computed);
-        this.rewriteResourceAsTable(rewrittenComputed);
-        if (tableAlias != null && tableAlias !== tableName) {
-            modifyAbstractSql('ReferencedField', rewrittenComputed, (referencedField) => {
-                if (referencedField[1] === tableName) {
-                    referencedField[1] = tableAlias;
-                }
-            });
-        }
-        return rewrittenComputed;
-    }
     rewriteResourceAsTable(abstractSql) {
         modifyAbstractSql('Resource', abstractSql, (resource) => {
             const resourceName = resource[1];
@@ -1368,7 +1320,6 @@ class OData2AbstractSQL {
         });
     }
 }
-exports.OData2AbstractSQL = OData2AbstractSQL;
 const addAliases = (shortAliases, lowerCaseAliasParts) => {
     const trie = {};
     const buildTrie = (aliasPart) => {
@@ -1396,7 +1347,7 @@ const addAliases = (shortAliases, lowerCaseAliasParts) => {
         if (node.$suffix != null) {
             shortAliases[str + node.$suffix] = str;
         }
-        lodash_1.default.forEach(node, (value, key) => {
+        _.forEach(node, (value, key) => {
             if (key === '$suffix') {
                 return;
             }
@@ -1418,17 +1369,17 @@ const getRelationships = (relationships, nestedRelationships = []) => {
 };
 const generateShortAliases = (clientModel) => {
     const shortAliases = {};
-    const aliasParts = (0, lodash_1.default)(getRelationships(clientModel.relationships))
+    const aliasParts = _(getRelationships(clientModel.relationships))
         .union(Object.keys(clientModel.synonyms))
         .reject((key) => key === '$')
         .map((alias) => alias.toLowerCase())
         .value();
-    let origAliasParts = (0, lodash_1.default)(aliasParts)
+    let origAliasParts = _(aliasParts)
         .flatMap((aliasPart) => aliasPart.split(/-| |\$/))
         .uniq()
         .value();
     addAliases(shortAliases, origAliasParts);
-    origAliasParts = (0, lodash_1.default)(aliasParts)
+    origAliasParts = _(aliasParts)
         .flatMap((aliasPart) => aliasPart.split(/-| /))
         .filter((aliasPart) => aliasPart.includes('$'))
         .flatMap((aliasPart) => {
@@ -1441,7 +1392,7 @@ const generateShortAliases = (clientModel) => {
         .uniq()
         .value();
     addAliases(shortAliases, origAliasParts);
-    origAliasParts = (0, lodash_1.default)(aliasParts)
+    origAliasParts = _(aliasParts)
         .flatMap((aliasPart) => aliasPart.split('-'))
         .filter((aliasPart) => aliasPart.includes(' '))
         .flatMap((aliasPart) => [
@@ -1454,7 +1405,7 @@ const generateShortAliases = (clientModel) => {
         .uniq()
         .value();
     addAliases(shortAliases, origAliasParts);
-    origAliasParts = (0, lodash_1.default)(aliasParts)
+    origAliasParts = _(aliasParts)
         .filter((aliasPart) => aliasPart.includes('-'))
         .flatMap((aliasPart) => [
         aliasPart,