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

package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeOperation.js

@@ -1,8 +1,10 @@
-'use strict';
-const { ObjectionToKnexConvertingOperation } = require('../ObjectionToKnexConvertingOperation');
-const { isObject, asSingle } = require('../../../utils/objectUtils');
-const { isKnexQueryBuilder } = require('../../../utils/knexUtils');
-class WhereInCompositeOperation extends ObjectionToKnexConvertingOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WhereInCompositeOperation = void 0;
+const ObjectionToKnexConvertingOperation_1 = require("../ObjectionToKnexConvertingOperation");
+const objectUtils_1 = require("../../../utils/objectUtils");
+const knexUtils_1 = require("../../../utils/knexUtils");
+class WhereInCompositeOperation extends ObjectionToKnexConvertingOperation_1.ObjectionToKnexConvertingOperation {
     constructor(name, opt) {
         super(name, opt);
         this.prefix = this.opt.prefix || null;
@@ -22,6 +24,7 @@ class WhereInCompositeOperation extends ObjectionToKnexConvertingOperation {
         return clone;
     }
 }
+exports.WhereInCompositeOperation = WhereInCompositeOperation;
 function buildWhereInArgs(knex, columns, values) {
     if (isCompositeKey(columns)) {
         return buildCompositeArgs(knex, columns, values);
@@ -54,7 +57,7 @@ function buildCompositeSubqueryArgs(knex, columns, subquery) {
         .map((col) => {
         // On older versions of knex, raw doesn't work
         // with `??`. We use `?` for those.
-        if (isObject(col)) {
+        if ((0, objectUtils_1.isObject)(col)) {
             return '?';
         }
         else {
@@ -68,10 +71,10 @@ function buildNonCompositeArgs(columns, values) {
     if (Array.isArray(values)) {
         values = pickNonNull(values, []);
     }
-    else if (!isKnexQueryBuilder(values)) {
+    else if (!(0, knexUtils_1.isKnexQueryBuilder)(values)) {
         values = [values];
     }
-    return [asSingle(columns), values];
+    return [(0, objectUtils_1.asSingle)(columns), values];
 }
 function pickNonNull(values, output) {
     for (let i = 0, l = values.length; i < l; ++i) {
@@ -85,6 +88,3 @@ function pickNonNull(values, output) {
     }
     return output;
 }
-module.exports = {
-    WhereInCompositeOperation,
-};

package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeSqliteOperation.js

@@ -1,8 +1,10 @@
-'use strict';
-const { ObjectionToKnexConvertingOperation } = require('../ObjectionToKnexConvertingOperation');
-const { isKnexQueryBuilder } = require('../../../utils/knexUtils');
-const { asSingle } = require('../../../utils/objectUtils');
-class WhereInCompositeSqliteOperation extends ObjectionToKnexConvertingOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WhereInCompositeSqliteOperation = void 0;
+const ObjectionToKnexConvertingOperation_1 = require("../ObjectionToKnexConvertingOperation");
+const knexUtils_1 = require("../../../utils/knexUtils");
+const objectUtils_1 = require("../../../utils/objectUtils");
+class WhereInCompositeSqliteOperation extends ObjectionToKnexConvertingOperation_1.ObjectionToKnexConvertingOperation {
     constructor(name, opt) {
         super(name, opt);
         this.prefix = this.opt.prefix || null;
@@ -32,6 +34,7 @@ class WhereInCompositeSqliteOperation extends ObjectionToKnexConvertingOperation
         return clone;
     }
 }
+exports.WhereInCompositeSqliteOperation = WhereInCompositeSqliteOperation;
 function buildWhereArgs(columns, values) {
     if (isCompositeKey(columns)) {
         return buildCompositeArgs(columns, values);
@@ -70,12 +73,12 @@ function buildNonCompositeArgs(columns, values) {
     if (Array.isArray(values)) {
         values = pickNonNull(values, []);
     }
-    else if (!isKnexQueryBuilder(values)) {
+    else if (!(0, knexUtils_1.isKnexQueryBuilder)(values)) {
         values = [values];
     }
     return {
         method: 'whereIn',
-        args: [asSingle(columns), values],
+        args: [(0, objectUtils_1.asSingle)(columns), values],
     };
 }
 function pickNonNull(values, output) {
@@ -90,6 +93,3 @@ function pickNonNull(values, output) {
     }
     return output;
 }
-module.exports = {
-    WhereInCompositeSqliteOperation,
-};

package/lib/relations/RelationDeleteOperation.js

@@ -5,7 +5,6 @@ const DeleteOperation_1 = require("../queryBuilder/operations/DeleteOperation");
 const RelationFindOperation_1 = require("./RelationFindOperation");
 class RelationDeleteOperation extends DeleteOperation_1.DeleteOperation {
     constructor(name, opt) {
-        // @ts-expect-error The JavaScript QueryBuilderOperation's `name` is inferred as null.
         super(name, opt);
         this.relation = opt.relation;
         this.owner = opt.owner;
@@ -14,7 +13,6 @@ class RelationDeleteOperation extends DeleteOperation_1.DeleteOperation {
         super.onBuild(builder);
         this.relation.findQuery(builder, this.owner);
     }
-    // @ts-expect-error The JavaScript base class's toFindOperation() is inferred to return null.
     toFindOperation() {
         return new RelationFindOperation_1.RelationFindOperation('find', {
             relation: this.relation,

package/lib/relations/RelationFindOperation.js

@@ -4,7 +4,6 @@ exports.RelationFindOperation = void 0;
 const FindOperation_1 = require("../queryBuilder/operations/FindOperation");
 class RelationFindOperation extends FindOperation_1.FindOperation {
     constructor(name, opt) {
-        // @ts-expect-error The JavaScript QueryBuilderOperation's `name` is inferred as null.
         super(name, opt);
         this.relation = opt.relation;
         this.owner = opt.owner;

package/lib/relations/RelationUpdateOperation.js

@@ -13,7 +13,6 @@ class RelationUpdateOperation extends UpdateOperation_1.UpdateOperation {
         super.onBuild(builder);
         this.relation.findQuery(builder, this.owner);
     }
-    // @ts-expect-error The JavaScript base class's toFindOperation() is inferred to return null.
     toFindOperation() {
         return new RelationFindOperation_1.RelationFindOperation('find', {
             relation: this.relation,

package/lib/relations/manyToMany/delete/ManyToManyDeleteOperationBase.js

@@ -4,7 +4,6 @@ exports.ManyToManyDeleteOperationBase = void 0;
 const DeleteOperation_1 = require("../../../queryBuilder/operations/DeleteOperation");
 class ManyToManyDeleteOperationBase extends DeleteOperation_1.DeleteOperation {
     constructor(name, opt) {
-        // @ts-expect-error The JavaScript QueryBuilderOperation's `name` is inferred as null.
         super(name, opt);
         this.relation = opt.relation;
         this.owner = opt.owner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abedmurrar/objection",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.3",
   "description": "An SQL-friendly ORM for Node.js. A fork of objection.js with strict TypeScript types and MySQL support.",
   "main": "lib/objection.js",
   "type": "commonjs",