@abedmurrar/objection 4.0.0-beta.1 → 4.0.0-beta.11

package/lib/model/graph/ModelGraph.js

@@ -1,5 +1,9 @@
-'use strict';
-const { ModelGraphBuilder } = require('./ModelGraphBuilder');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelGraph = void 0;
+const ModelGraphBuilder_1 = require("./ModelGraphBuilder");
+// The marker of the lazily calculated maps that haven't been calculated yet.
+// The type is a brand so that it isn't confused with the maps.
 const NOT_CALCULATED = {};
 class ModelGraph {
     constructor(nodes, edges) {
@@ -10,7 +14,7 @@ class ModelGraph {
         this._nodesByIdPathKeys = NOT_CALCULATED;
     }
     static create(rootModelClass, roots) {
-        const builder = ModelGraphBuilder.buildGraph(rootModelClass, roots);
+        const builder = ModelGraphBuilder_1.ModelGraphBuilder.buildGraph(rootModelClass, roots);
         return new ModelGraph(builder.nodes, builder.edges);
     }
     static createEmpty() {
@@ -35,9 +39,10 @@ class ModelGraph {
         if (this._nodesByIdPathKeys === NOT_CALCULATED) {
             this._nodesByIdPathKeys = createNodesByIdPathKeysMap(this.nodes);
         }
-        return this._nodesByIdPathKeys.get(node.idPathKey) || null;
+        return (this._nodesByIdPathKeys.get(node.idPathKey) || null);
     }
 }
+exports.ModelGraph = ModelGraph;
 function createNodesByObjectsMap(nodes) {
     const nodesByObjects = new Map();
     for (const node of nodes) {
@@ -55,6 +60,3 @@ function createNodesByIdPathKeysMap(nodes) {
     }
     return nodesByIdPathKeys;
 }
-module.exports = {
-    ModelGraph,
-};

package/lib/model/graph/ModelGraphBuilder.js

@@ -1,8 +1,12 @@
-'use strict';
-const { isObject, isString, asArray, asSingle } = require('../../utils/objectUtils');
-const { ValidationErrorType } = require('../../model/ValidationError');
-const { ModelGraphNode } = require('./ModelGraphNode');
-const { ModelGraphEdge } = require('./ModelGraphEdge');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelGraphBuilder = void 0;
+exports.createNotModelError = createNotModelError;
+exports.forEachPropertyReference = forEachPropertyReference;
+const objectUtils_1 = require("../../utils/objectUtils");
+const ValidationError_1 = require("../../model/ValidationError");
+const ModelGraphNode_1 = require("./ModelGraphNode");
+const ModelGraphEdge_1 = require("./ModelGraphEdge");
 class ModelGraphBuilder {
     constructor() {
         this.nodes = [];
@@ -18,7 +22,7 @@ class ModelGraphBuilder {
             if (Array.isArray(roots)) {
                 this._buildNodes(rootModelClass, roots);
             }
-            else if (isObject(roots)) {
+            else if ((0, objectUtils_1.isObject)(roots)) {
                 this._buildNode(rootModelClass, roots);
             }
             else {
@@ -28,20 +32,20 @@ class ModelGraphBuilder {
         this._buildReferences();
     }
     _buildNodes(modelClass, objs, parentNode = null, relation = null) {
-        objs = asArray(objs);
+        objs = (0, objectUtils_1.asArray)(objs);
         objs.forEach((obj, index) => {
             this._buildNode(modelClass, obj, parentNode, relation, index);
         });
     }
     _buildNode(modelClass, obj, parentNode = null, relation = null, index = null) {
-        obj = asSingle(obj);
-        if (!isObject(obj) || !obj.$isObjectionModel) {
+        obj = (0, objectUtils_1.asSingle)(obj);
+        if (!(0, objectUtils_1.isObject)(obj) || !obj.$isObjectionModel) {
             throw createNotModelError(modelClass, obj);
         }
-        const node = new ModelGraphNode(modelClass, obj);
+        const node = new ModelGraphNode_1.ModelGraphNode(modelClass, obj);
         this.nodes.push(node);
         if (parentNode) {
-            const edge = new ModelGraphEdge(ModelGraphEdge.Type.Relation, parentNode, node, relation, index);
+            const edge = new ModelGraphEdge_1.ModelGraphEdge(ModelGraphEdge_1.ModelGraphEdge.Type.Relation, parentNode, node, relation, index);
             node.parentEdge = edge;
             this._addEdge(parentNode, node, edge);
         }
@@ -88,8 +92,8 @@ class ModelGraphBuilder {
             if (!refNode) {
                 throw createReferenceNotFoundError(ref);
             }
-            const edge = new ModelGraphEdge(ModelGraphEdge.Type.Reference, node, refNode);
-            edge.refType = ModelGraphEdge.ReferenceType.Object;
+            const edge = new ModelGraphEdge_1.ModelGraphEdge(ModelGraphEdge_1.ModelGraphEdge.Type.Reference, node, refNode);
+            edge.refType = ModelGraphEdge_1.ModelGraphEdge.ReferenceType.Object;
             this._addEdge(node, refNode, edge);
         }
     }
@@ -100,8 +104,8 @@ class ModelGraphBuilder {
                 if (!refNode) {
                     throw createReferenceNotFoundError(ref);
                 }
-                const edge = new ModelGraphEdge(ModelGraphEdge.Type.Reference, node, refNode);
-                edge.refType = ModelGraphEdge.ReferenceType.Property;
+                const edge = new ModelGraphEdge_1.ModelGraphEdge(ModelGraphEdge_1.ModelGraphEdge.Type.Reference, node, refNode);
+                edge.refType = ModelGraphEdge_1.ModelGraphEdge.ReferenceType.Property;
                 edge.refMatch = refMatch;
                 edge.refOwnerDataPath = path.slice();
                 edge.refRelatedDataPath = refPath;
@@ -113,12 +117,13 @@ class ModelGraphBuilder {
         this.edges.push(edge);
         ownerNode.edges.push(edge);
         relatedNode.edges.push(edge);
-        if (edge.type === ModelGraphEdge.Type.Reference) {
+        if (edge.type === ModelGraphEdge_1.ModelGraphEdge.Type.Reference) {
             ownerNode.refEdges.push(edge);
             relatedNode.refEdges.push(edge);
         }
     }
 }
+exports.ModelGraphBuilder = ModelGraphBuilder;
 function forEachPropertyReference(obj, callback) {
     const modelClass = obj.constructor;
     const relationNames = modelClass.getRelationNames();
@@ -138,10 +143,10 @@ function visitStrings(value, path, visit) {
     if (Array.isArray(value)) {
         visitStringsInArray(value, path, visit);
     }
-    else if (isObject(value) && !Buffer.isBuffer(value)) {
+    else if ((0, objectUtils_1.isObject)(value) && !Buffer.isBuffer(value)) {
         visitStringsInObject(value, path, visit);
     }
-    else if (isString(value)) {
+    else if ((0, objectUtils_1.isString)(value)) {
         visit(value, path);
     }
 }
@@ -177,12 +182,7 @@ function createReferenceNotFoundError(ref) {
 }
 function createNotModelError(modelClass, value) {
     throw modelClass.createValidationError({
-        type: ValidationErrorType.InvalidGraph,
+        type: ValidationError_1.ValidationErrorType.InvalidGraph,
         message: `expected value "${value}" to be an instance of ${modelClass.name}`,
     });
 }
-module.exports = {
-    ModelGraphBuilder,
-    createNotModelError,
-    forEachPropertyReference,
-};

package/lib/model/graph/ModelGraphEdge.js

@@ -1,4 +1,6 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelGraphEdge = void 0;
 const Type = {
     Relation: 'Relation',
     Reference: 'Reference',
@@ -35,6 +37,4 @@ class ModelGraphEdge {
         return node === this.relatedNode;
     }
 }
-module.exports = {
-    ModelGraphEdge,
-};
+exports.ModelGraphEdge = ModelGraphEdge;

package/lib/model/graph/ModelGraphNode.js

@@ -1,6 +1,10 @@
-'use strict';
-const { ModelGraphEdge } = require('./ModelGraphEdge');
-const { isNumber } = require('../../utils/objectUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelGraphNode = void 0;
+const ModelGraphEdge_1 = require("./ModelGraphEdge");
+const objectUtils_1 = require("../../utils/objectUtils");
+// The marker of the lazily calculated properties that haven't been calculated
+// yet. The type is a brand so that it isn't confused with the calculated values.
 const NOT_CALCULATED = {};
 class ModelGraphNode {
     constructor(modelClass, obj) {
@@ -99,7 +103,7 @@ class ModelGraphNode {
      */
     get referencedNode() {
         for (const edge of this.refEdges) {
-            if (edge.refType === ModelGraphEdge.ReferenceType.Object && edge.isOwnerNode(this)) {
+            if (edge.refType === ModelGraphEdge_1.ModelGraphEdge.ReferenceType.Object && edge.isOwnerNode(this)) {
                 return edge.relatedNode;
             }
         }
@@ -111,7 +115,7 @@ class ModelGraphNode {
     get referencingNodes() {
         const nodes = [];
         for (const edge of this.refEdges) {
-            if (edge.refType === ModelGraphEdge.ReferenceType.Object && edge.isRelatedNode(this)) {
+            if (edge.refType === ModelGraphEdge_1.ModelGraphEdge.ReferenceType.Object && edge.isRelatedNode(this)) {
                 nodes.push(edge.ownerNode);
             }
         }
@@ -131,7 +135,7 @@ class ModelGraphNode {
     }
     _collectDescendantRelationNodes(nodes) {
         for (const edge of this.edges) {
-            if (edge.type === ModelGraphEdge.Type.Relation && edge.isOwnerNode(this)) {
+            if (edge.type === ModelGraphEdge_1.ModelGraphEdge.Type.Relation && edge.isOwnerNode(this)) {
                 nodes.push(edge.relatedNode);
                 edge.relatedNode._collectDescendantRelationNodes(nodes);
             }
@@ -157,12 +161,16 @@ class ModelGraphNode {
             return [...this.parentNode.dataPath, this.relationName];
         }
         else {
-            return [...this.parentNode.dataPath, this.relationName, this.indexInRelation];
+            return [
+                ...this.parentNode.dataPath,
+                this.relationName,
+                this.indexInRelation,
+            ];
         }
     }
     _createDataPathKey() {
         const dataPathKey = this.dataPath.reduce((key, it) => {
-            if (isNumber(it)) {
+            if ((0, objectUtils_1.isNumber)(it)) {
                 return `${key}[${it}]`;
             }
             else {
@@ -196,6 +204,4 @@ class ModelGraphNode {
         }
     }
 }
-module.exports = {
-    ModelGraphNode,
-};
+exports.ModelGraphNode = ModelGraphNode;

package/lib/model/inheritModel.js

@@ -1,4 +1,6 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inheritModel = inheritModel;
 const cache = new Map();
 function inheritModel(modelClass) {
     let inherit = cache.get(modelClass.name);
@@ -14,6 +16,3 @@ function createClassInheritor(className) {
     return class ${className} extends BaseClass {}
   `);
 }
-module.exports = {
-    inheritModel,
-};

package/lib/model/modelBindKnex.js

@@ -1,11 +1,13 @@
-'use strict';
-const { inheritModel } = require('./inheritModel');
-const { staticHiddenProps } = require('./modelUtils');
-const { defineNonEnumerableProperty } = require('./modelUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bindKnex = bindKnex;
+const inheritModel_1 = require("./inheritModel");
+const modelUtils_1 = require("./modelUtils");
+const modelUtils_2 = require("./modelUtils");
 function bindKnex(modelClass, knex) {
     let BoundModelClass = getBoundModelFromCache(modelClass, knex);
     if (BoundModelClass === null) {
-        BoundModelClass = inheritModel(modelClass);
+        BoundModelClass = (0, inheritModel_1.inheritModel)(modelClass);
         BoundModelClass = copyHiddenProperties(modelClass, BoundModelClass);
         BoundModelClass.knex(knex);
         BoundModelClass = putBoundModelToCache(modelClass, BoundModelClass, knex);
@@ -25,7 +27,7 @@ function getCache(knex) {
     return knex.$$objection.boundModels;
 }
 function createCache(knex) {
-    defineNonEnumerableProperty(knex, '$$objection', {
+    (0, modelUtils_2.defineNonEnumerableProperty)(knex, '$$objection', {
         boundModels: new Map(),
     });
 }
@@ -37,10 +39,10 @@ function copyHiddenProperties(modelClass, BoundModelClass) {
     if (!Object.hasOwn(modelClass, '$$validator')) {
         modelClass.getValidator();
     }
-    for (const prop of staticHiddenProps) {
+    for (const prop of modelUtils_1.staticHiddenProps) {
         // $$relations and $$relationArray are handled in separately.
         if (Object.hasOwn(modelClass, prop) && prop !== '$$relations' && prop !== '$$relationArray') {
-            defineNonEnumerableProperty(BoundModelClass, prop, modelClass[prop]);
+            (0, modelUtils_2.defineNonEnumerableProperty)(BoundModelClass, prop, modelClass[prop]);
         }
     }
     return BoundModelClass;
@@ -60,10 +62,7 @@ function bindRelations(modelClass, BoundModelClass, knex) {
         boundRelations[relation.name] = boundRelation;
         boundRelationArray.push(boundRelation);
     }
-    defineNonEnumerableProperty(BoundModelClass, '$$relations', boundRelations);
-    defineNonEnumerableProperty(BoundModelClass, '$$relationArray', boundRelationArray);
+    (0, modelUtils_2.defineNonEnumerableProperty)(BoundModelClass, '$$relations', boundRelations);
+    (0, modelUtils_2.defineNonEnumerableProperty)(BoundModelClass, '$$relationArray', boundRelationArray);
     return BoundModelClass;
 }
-module.exports = {
-    bindKnex,
-};

package/lib/model/modelClone.js

@@ -1,8 +1,10 @@
-'use strict';
-const { isObject, cloneDeep } = require('../utils/objectUtils');
-const { hiddenProps } = require('./modelUtils');
-const { defineNonEnumerableProperty } = require('./modelUtils');
-const { isInternalProp } = require('../utils/internalPropUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clone = clone;
+const objectUtils_1 = require("../utils/objectUtils");
+const modelUtils_1 = require("./modelUtils");
+const modelUtils_2 = require("./modelUtils");
+const internalPropUtils_1 = require("../utils/internalPropUtils");
 function clone(model, shallow, stripInternal) {
     let clone = null;
     const omitFromJson = model.$omitFromJson();
@@ -28,7 +30,7 @@ function cloneSimple(model) {
     for (let i = 0, l = keys.length; i < l; ++i) {
         const key = keys[i];
         const value = model[key];
-        if (isObject(value)) {
+        if ((0, objectUtils_1.isObject)(value)) {
             clone[key] = cloneObject(value);
         }
         else {
@@ -49,10 +51,10 @@ function cloneWithOpt(model, shallow, stripInternal) {
             delete clone[key];
             continue;
         }
-        if (stripInternal && isInternalProp(key)) {
+        if (stripInternal && (0, internalPropUtils_1.isInternalProp)(key)) {
             continue;
         }
-        if (isObject(value)) {
+        if ((0, objectUtils_1.isObject)(value)) {
             clone[key] = cloneObject(value);
         }
         else {
@@ -72,14 +74,14 @@ function cloneObject(value) {
         return Buffer.from(value);
     }
     else {
-        return cloneDeep(value);
+        return (0, objectUtils_1.cloneDeep)(value);
     }
 }
 function cloneArray(value) {
     const ret = new Array(value.length);
     for (let i = 0, l = ret.length; i < l; ++i) {
         const item = value[i];
-        if (isObject(item)) {
+        if ((0, objectUtils_1.isObject)(item)) {
             ret[i] = cloneObject(item);
         }
         else {
@@ -89,14 +91,11 @@ function cloneArray(value) {
     return ret;
 }
 function copyHiddenProps(model, clone) {
-    for (let i = 0, l = hiddenProps.length; i < l; ++i) {
-        const prop = hiddenProps[i];
+    for (let i = 0, l = modelUtils_1.hiddenProps.length; i < l; ++i) {
+        const prop = modelUtils_1.hiddenProps[i];
         if (Object.hasOwn(model, prop)) {
-            defineNonEnumerableProperty(clone, prop, model[prop]);
+            (0, modelUtils_2.defineNonEnumerableProperty)(clone, prop, model[prop]);
         }
     }
     return clone;
 }
-module.exports = {
-    clone,
-};

package/lib/model/modelColPropMap.js

@@ -1,12 +1,15 @@
-'use strict';
-const { difference } = require('../utils/objectUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.columnNameToPropertyName = columnNameToPropertyName;
+exports.propertyNameToColumnName = propertyNameToColumnName;
+const objectUtils_1 = require("../utils/objectUtils");
 function columnNameToPropertyName(modelClass, columnName) {
     const model = new modelClass();
     const addedProps = Object.keys(model.$parseDatabaseJson({}));
     const row = {};
     row[columnName] = null;
     const props = Object.keys(model.$parseDatabaseJson(row));
-    const propertyName = difference(props, addedProps)[0];
+    const propertyName = (0, objectUtils_1.difference)(props, addedProps)[0];
     return propertyName || columnName;
 }
 function propertyNameToColumnName(modelClass, propertyName) {
@@ -15,10 +18,6 @@ function propertyNameToColumnName(modelClass, propertyName) {
     const obj = {};
     obj[propertyName] = null;
     const cols = Object.keys(model.$formatDatabaseJson(obj));
-    const columnName = difference(cols, addedCols)[0];
+    const columnName = (0, objectUtils_1.difference)(cols, addedCols)[0];
     return columnName || propertyName;
 }
-module.exports = {
-    columnNameToPropertyName,
-    propertyNameToColumnName,
-};

package/lib/model/modelConcurrency.js

@@ -1,5 +1,8 @@
-'use strict';
-const { isMsSql } = require('../utils/knexUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setDefaultGetConcurrency = setDefaultGetConcurrency;
+exports.getReadConcurrency = getReadConcurrency;
+const knexUtils_1 = require("../utils/knexUtils");
 const DEFAULT_CONCURRENCY = 4;
 let defaultGetConcurrency = null;
 // Called by Model.js with Model.getConcurrency.
@@ -16,9 +19,5 @@ function getReadConcurrency(modelClass, knex) {
         return modelClass.getConcurrency(knex);
     }
     // The mssql driver can't run concurrent queries.
-    return knex && isMsSql(knex) ? 1 : DEFAULT_CONCURRENCY;
+    return knex && (0, knexUtils_1.isMsSql)(knex) ? 1 : DEFAULT_CONCURRENCY;
 }
-module.exports = {
-    setDefaultGetConcurrency,
-    getReadConcurrency,
-};

package/lib/model/modelId.js

@@ -1,4 +1,7 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSetId = getSetId;
+exports.hasId = hasId;
 function getSetId(model, maybeId) {
     if (maybeId !== undefined) {
         return setId(model, maybeId);
@@ -51,7 +54,3 @@ function getId(model) {
         return model[idProp];
     }
 }
-module.exports = {
-    getSetId,
-    hasId,
-};

package/lib/model/modelJsonAttributes.js

@@ -1,5 +1,9 @@
-'use strict';
-const { asArray, isObject, flatten, isString } = require('../utils/objectUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseJsonAttributes = parseJsonAttributes;
+exports.formatJsonAttributes = formatJsonAttributes;
+exports.getJsonAttributes = getJsonAttributes;
+const objectUtils_1 = require("../utils/objectUtils");
 function parseJsonAttributes(json, modelClass) {
     const jsonAttr = modelClass.getJsonAttributes();
     if (jsonAttr.length) {
@@ -8,7 +12,7 @@ function parseJsonAttributes(json, modelClass) {
         for (let i = 0, l = jsonAttr.length; i < l; ++i) {
             const attr = jsonAttr[i];
             const value = json[attr];
-            if (isString(value)) {
+            if ((0, objectUtils_1.isString)(value)) {
                 const parsed = tryParseJson(value);
                 // tryParseJson returns undefined if parsing failed.
                 if (parsed !== undefined) {
@@ -43,12 +47,12 @@ function getJsonAttributes(modelClass) {
         const props = modelClass.getJsonSchema().properties || {};
         for (const propName of Object.keys(props)) {
             const prop = props[propName];
-            let types = asArray(prop.type).filter((it) => !!it);
+            let types = (0, objectUtils_1.asArray)(prop.type).filter((it) => !!it);
             if (types.length === 0 && Array.isArray(prop.anyOf)) {
-                types = flatten(prop.anyOf.map((it) => it.type));
+                types = (0, objectUtils_1.flatten)(prop.anyOf.map((it) => it.type));
             }
             if (types.length === 0 && Array.isArray(prop.oneOf)) {
-                types = flatten(prop.oneOf.map((it) => it.type));
+                types = (0, objectUtils_1.flatten)(prop.oneOf.map((it) => it.type));
             }
             if (types.indexOf('object') !== -1 || types.indexOf('array') !== -1) {
                 jsonAttributes.push(propName);
@@ -65,8 +69,3 @@ function tryParseJson(maybeJsonStr) {
         return undefined;
     }
 }
-module.exports = {
-    parseJsonAttributes,
-    formatJsonAttributes,
-    getJsonAttributes,
-};

package/lib/model/modelParseRelations.js

@@ -1,5 +1,7 @@
-'use strict';
-const { isObject } = require('../utils/objectUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseRelationsIntoModelInstances = parseRelationsIntoModelInstances;
+const objectUtils_1 = require("../utils/objectUtils");
 function parseRelationsIntoModelInstances(model, json, options = {}) {
     const relationNames = model.constructor.getRelationNames();
     if (!options.cache && !hasRelation(json, relationNames)) {
@@ -61,7 +63,7 @@ function parseRelationArray(json, relation, options) {
     }
 }
 function parseRelationObject(json, relation, options) {
-    if (isObject(json)) {
+    if ((0, objectUtils_1.isObject)(json)) {
         const modelClass = relation.relatedModelClass;
         let model = options.cache.get(json);
         if (model === undefined) {
@@ -78,6 +80,3 @@ function parseRelationObject(json, relation, options) {
         return json;
     }
 }
-module.exports = {
-    parseRelationsIntoModelInstances,
-};

package/lib/model/modelQueryProps.js

@@ -1,7 +1,10 @@
-'use strict';
-const { isObject, isFunction } = require('../utils/objectUtils');
-const { defineNonEnumerableProperty } = require('./modelUtils');
-const { isKnexRaw, isKnexQueryBuilder } = require('../utils/knexUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitQueryProps = splitQueryProps;
+exports.mergeQueryProps = mergeQueryProps;
+const objectUtils_1 = require("../utils/objectUtils");
+const modelUtils_1 = require("./modelUtils");
+const knexUtils_1 = require("../utils/knexUtils");
 const QUERY_PROPS_PROPERTY = '$$queryProps';
 // Removes query properties from `json` and stores them into a hidden property
 // inside `model` so that they can be later merged back to `json`.
@@ -20,7 +23,7 @@ function splitQueryProps(model, json) {
                 modelProps[key] = value;
             }
         }
-        defineNonEnumerableProperty(model, QUERY_PROPS_PROPERTY, queryProps);
+        (0, modelUtils_1.defineNonEnumerableProperty)(model, QUERY_PROPS_PROPERTY, queryProps);
         return modelProps;
     }
     else {
@@ -36,11 +39,11 @@ function hasQueryProps(json, keys) {
     return false;
 }
 function isQueryProp(value) {
-    if (!isObject(value)) {
+    if (!(0, objectUtils_1.isObject)(value)) {
         return false;
     }
-    return (isKnexQueryBuilder(value) ||
-        isKnexRaw(value) ||
+    return ((0, knexUtils_1.isKnexQueryBuilder)(value) ||
+        (0, knexUtils_1.isKnexRaw)(value) ||
         isKnexRawConvertable(value) ||
         value.isObjectionQueryBuilderBase);
 }
@@ -108,9 +111,5 @@ function buildKnexRawConvertable(convertable, builder) {
     return convertable.toKnexRaw(builder);
 }
 function isKnexRawConvertable(queryProp) {
-    return isFunction(queryProp.toKnexRaw);
+    return (0, objectUtils_1.isFunction)(queryProp.toKnexRaw);
 }
-module.exports = {
-    splitQueryProps,
-    mergeQueryProps,
-};

package/lib/model/modelSet.js

@@ -1,8 +1,14 @@
-'use strict';
-const { isInternalProp } = require('../utils/internalPropUtils');
-const { splitQueryProps } = require('./modelQueryProps');
-const { isFunction, isString, isPlainObject } = require('../utils/objectUtils');
-const { parseRelationsIntoModelInstances } = require('./modelParseRelations');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setFast = setFast;
+exports.setJson = setJson;
+exports.setDatabaseJson = setDatabaseJson;
+exports.setRelated = setRelated;
+exports.appendRelated = appendRelated;
+const internalPropUtils_1 = require("../utils/internalPropUtils");
+const modelQueryProps_1 = require("./modelQueryProps");
+const objectUtils_1 = require("../utils/objectUtils");
+const modelParseRelations_1 = require("./modelParseRelations");
 function setJson(model, json, options) {
     json = json || {};
     options = options || {};
@@ -15,13 +21,13 @@ function setJson(model, json, options) {
         // json can contain "query properties" like `raw` instances, query builders etc.
         // We take them out of `json` and store them to a hidden property $$queryProps
         // in the model instance for later use.
-        json = splitQueryProps(model, json);
+        json = (0, modelQueryProps_1.splitQueryProps)(model, json);
     }
     json = model.$parseJson(json, options);
     json = model.$validate(json, options);
     model.$set(json);
     if (!options.skipParseRelations) {
-        parseRelationsIntoModelInstances(model, json, options);
+        (0, modelParseRelations_1.parseRelationsIntoModelInstances)(model, json, options);
     }
     return model;
 }
@@ -46,9 +52,9 @@ function setFast(model, obj) {
         for (let i = 0, l = keys.length; i < l; ++i) {
             const key = keys[i];
             const value = obj[key];
-            if ((value !== undefined || isPlainObject(obj)) &&
-                !isInternalProp(key) &&
-                !isFunction(value) &&
+            if ((value !== undefined || (0, objectUtils_1.isPlainObject)(obj)) &&
+                !(0, internalPropUtils_1.isInternalProp)(key) &&
+                !(0, objectUtils_1.isFunction)(value) &&
                 !readOnlyAttr.includes(key)) {
                 model[key] = value;
             }
@@ -100,17 +106,10 @@ function appendRelated(model, relation, models) {
     return model;
 }
 function ensureRelation(model, relation) {
-    if (isString(relation)) {
+    if ((0, objectUtils_1.isString)(relation)) {
         return model.constructor.getRelation(relation);
     }
     else {
         return relation;
     }
 }
-module.exports = {
-    setFast,
-    setJson,
-    setDatabaseJson,
-    setRelated,
-    appendRelated,
-};