@abedmurrar/objection 4.0.0-beta.0 → 4.0.0-beta.2

package/lib/relations/manyToMany/find/ManyToManyFindOperation.js

@@ -1,12 +1,14 @@
-'use strict';
-const { RelationFindOperation } = require('../../RelationFindOperation');
-const { getTempColumn } = require('../../../utils/tmpColumnUtils');
-class ManyToManyFindOperation extends RelationFindOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyFindOperation = void 0;
+const RelationFindOperation_1 = require("../../RelationFindOperation");
+const tmpColumnUtils_1 = require("../../../utils/tmpColumnUtils");
+class ManyToManyFindOperation extends RelationFindOperation_1.RelationFindOperation {
     constructor(name, opt) {
         super(name, opt);
         this.ownerJoinColumnAlias = new Array(this.relation.joinTableOwnerProp.size);
         for (let i = 0, l = this.ownerJoinColumnAlias.length; i < l; ++i) {
-            this.ownerJoinColumnAlias[i] = getTempColumn(i);
+            this.ownerJoinColumnAlias[i] = (0, tmpColumnUtils_1.getTempColumn)(i);
         }
     }
     onBuild(builder) {
@@ -77,6 +79,4 @@ class ManyToManyFindOperation extends RelationFindOperation {
         super.selectMissingJoinColumns(builder);
     }
 }
-module.exports = {
-    ManyToManyFindOperation,
-};
+exports.ManyToManyFindOperation = ManyToManyFindOperation;

package/lib/relations/manyToMany/insert/ManyToManyInsertOperation.js

@@ -1,7 +1,9 @@
-'use strict';
-const { RelationInsertOperation } = require('../../RelationInsertOperation');
-const { ManyToManyRelateOperation } = require('../relate/ManyToManyRelateOperation');
-class ManyToManyInsertOperation extends RelationInsertOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyInsertOperation = void 0;
+const RelationInsertOperation_1 = require("../../RelationInsertOperation");
+const ManyToManyRelateOperation_1 = require("../relate/ManyToManyRelateOperation");
+class ManyToManyInsertOperation extends RelationInsertOperation_1.RelationInsertOperation {
     onAdd(builder, args) {
         const retVal = super.onAdd(builder, args);
         // Omit extra properties so that we don't try to insert
@@ -13,7 +15,7 @@ class ManyToManyInsertOperation extends RelationInsertOperation {
     }
     async onAfter1(builder, ret) {
         const inserted = await super.onAfter1(builder, ret);
-        const relateOp = new ManyToManyRelateOperation('relate', {
+        const relateOp = new ManyToManyRelateOperation_1.ManyToManyRelateOperation('relate', {
             dontCopyReturning: true,
             dontCopyOnConflict: true,
             relation: this.relation,
@@ -35,6 +37,4 @@ class ManyToManyInsertOperation extends RelationInsertOperation {
         return inserted;
     }
 }
-module.exports = {
-    ManyToManyInsertOperation,
-};
+exports.ManyToManyInsertOperation = ManyToManyInsertOperation;

package/lib/relations/manyToMany/relate/ManyToManyRelateOperation.js

@@ -1,11 +1,14 @@
-'use strict';
-const { isPostgres } = require('../../../utils/knexUtils');
-const { normalizeIds } = require('../../../utils/normalizeIds');
-const { RelateOperation } = require('../../../queryBuilder/operations/RelateOperation');
-class ManyToManyRelateOperation extends RelateOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyRelateOperation = void 0;
+const knexUtils_1 = require("../../../utils/knexUtils");
+const normalizeIds_1 = require("../../../utils/normalizeIds");
+const RelateOperation_1 = require("../../../queryBuilder/operations/RelateOperation");
+class ManyToManyRelateOperation extends RelateOperation_1.RelateOperation {
     onAdd(builder, args) {
         this.input = args[0];
-        this.ids = normalizeIds(args[0], this.relation.relatedProp);
+        // Without `arrayOutput`, these are id objects.
+        this.ids = (0, normalizeIds_1.normalizeIds)(args[0], this.relation.relatedProp);
         assertOwnerIsSingleItem(builder, this.owner, this.relation);
         return true;
     }
@@ -38,12 +41,13 @@ class ManyToManyRelateOperation extends RelateOperation {
         });
     }
 }
+exports.ManyToManyRelateOperation = ManyToManyRelateOperation;
 function assertOwnerIsSingleItem(builder, owner, relation) {
     const { isModels, isIdentifiers, isQueryBuilder } = owner;
     const { ownerProp } = relation;
     const singleModel = isModels && owner.modelArray.length === 1;
     const singleId = isIdentifiers && owner.getNormalizedIdentifiers(ownerProp).length === 1;
-    if (isPostgres(builder.unsafeKnex())) {
+    if ((0, knexUtils_1.isPostgres)(builder.unsafeKnex())) {
         if (!isModels && !isIdentifiers && !isQueryBuilder) {
             throw new Error('Parent must be a list of identifiers or a list of models when relating a ManyToManyRelation');
         }
@@ -59,6 +63,3 @@ function assertOwnerIsSingleItem(builder, owner, relation) {
         }
     }
 }
-module.exports = {
-    ManyToManyRelateOperation,
-};

package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateOperation.js

@@ -1,11 +1,11 @@
-'use strict';
-const { ManyToManyUnrelateOperationBase } = require('./ManyToManyUnrelateOperationBase');
-const { ManyToManyModifyMixin } = require('../ManyToManyModifyMixin');
-class ManyToManyUnrelateOperation extends ManyToManyModifyMixin(ManyToManyUnrelateOperationBase) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyUnrelateOperation = void 0;
+const ManyToManyUnrelateOperationBase_1 = require("./ManyToManyUnrelateOperationBase");
+const ManyToManyModifyMixin_1 = require("../ManyToManyModifyMixin");
+class ManyToManyUnrelateOperation extends (0, ManyToManyModifyMixin_1.ManyToManyModifyMixin)(ManyToManyUnrelateOperationBase_1.ManyToManyUnrelateOperationBase) {
     get modifyMainQuery() {
         return false;
     }
 }
-module.exports = {
-    ManyToManyUnrelateOperation,
-};
+exports.ManyToManyUnrelateOperation = ManyToManyUnrelateOperation;

package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateOperationBase.js

@@ -1,14 +1,16 @@
-'use strict';
-const { withWhereScope } = require('../../../queryBuilder/whereScopes');
-const { UnrelateOperation } = require('../../../queryBuilder/operations/UnrelateOperation');
-class ManyToManyUnrelateOperationBase extends UnrelateOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyUnrelateOperationBase = void 0;
+const whereScopes_1 = require("../../../queryBuilder/whereScopes");
+const UnrelateOperation_1 = require("../../../queryBuilder/operations/UnrelateOperation");
+class ManyToManyUnrelateOperationBase extends UnrelateOperation_1.UnrelateOperation {
     queryExecutor(builder) {
         const unrelateQuery = this.relation
             .getJoinModelClass(builder.knex())
             .query()
             .childQueryOf(builder)
             .delete();
-        withWhereScope(unrelateQuery, () => {
+        (0, whereScopes_1.withWhereScope)(unrelateQuery, () => {
             this.applyModifyFilterForJoinTable(unrelateQuery);
         });
         return unrelateQuery.modify(this.relation.joinTableModify);
@@ -22,6 +24,4 @@ class ManyToManyUnrelateOperationBase extends UnrelateOperation {
         throw new Error('not implemented');
     }
 }
-module.exports = {
-    ManyToManyUnrelateOperationBase,
-};
+exports.ManyToManyUnrelateOperationBase = ManyToManyUnrelateOperationBase;

package/lib/relations/manyToMany/unrelate/ManyToManyUnrelateSqliteOperation.js

@@ -1,11 +1,11 @@
-'use strict';
-const { ManyToManyUnrelateOperationBase } = require('./ManyToManyUnrelateOperationBase');
-const { ManyToManySqliteModifyMixin } = require('../ManyToManySqliteModifyMixin');
-class ManyToManyUnrelateSqliteOperation extends ManyToManySqliteModifyMixin(ManyToManyUnrelateOperationBase) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyUnrelateSqliteOperation = void 0;
+const ManyToManyUnrelateOperationBase_1 = require("./ManyToManyUnrelateOperationBase");
+const ManyToManySqliteModifyMixin_1 = require("../ManyToManySqliteModifyMixin");
+class ManyToManyUnrelateSqliteOperation extends (0, ManyToManySqliteModifyMixin_1.ManyToManySqliteModifyMixin)(ManyToManyUnrelateOperationBase_1.ManyToManyUnrelateOperationBase) {
     get modifyMainQuery() {
         return false;
     }
 }
-module.exports = {
-    ManyToManyUnrelateSqliteOperation,
-};
+exports.ManyToManyUnrelateSqliteOperation = ManyToManyUnrelateSqliteOperation;

package/lib/relations/manyToMany/update/ManyToManyUpdateOperation.js

@@ -1,8 +1,8 @@
-'use strict';
-const { ManyToManyUpdateOperationBase } = require('./ManyToManyUpdateOperationBase');
-const { ManyToManyModifyMixin } = require('../ManyToManyModifyMixin');
-class ManyToManyUpdateOperation extends ManyToManyModifyMixin(ManyToManyUpdateOperationBase) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyUpdateOperation = void 0;
+const ManyToManyUpdateOperationBase_1 = require("./ManyToManyUpdateOperationBase");
+const ManyToManyModifyMixin_1 = require("../ManyToManyModifyMixin");
+class ManyToManyUpdateOperation extends (0, ManyToManyModifyMixin_1.ManyToManyModifyMixin)(ManyToManyUpdateOperationBase_1.ManyToManyUpdateOperationBase) {
 }
-module.exports = {
-    ManyToManyUpdateOperation,
-};
+exports.ManyToManyUpdateOperation = ManyToManyUpdateOperation;

package/lib/relations/manyToMany/update/ManyToManyUpdateOperationBase.js

@@ -1,7 +1,9 @@
-'use strict';
-const { withWhereScope } = require('../../../queryBuilder/whereScopes');
-const { UpdateOperation } = require('../../../queryBuilder/operations/UpdateOperation');
-class ManyToManyUpdateOperationBase extends UpdateOperation {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyUpdateOperationBase = void 0;
+const whereScopes_1 = require("../../../queryBuilder/whereScopes");
+const UpdateOperation_1 = require("../../../queryBuilder/operations/UpdateOperation");
+class ManyToManyUpdateOperationBase extends UpdateOperation_1.UpdateOperation {
     constructor(name, opt) {
         super(name, opt);
         this.relation = opt.relation;
@@ -34,7 +36,7 @@ class ManyToManyUpdateOperationBase extends UpdateOperation {
                 .query()
                 .childQueryOf(builder)
                 .patch(this.joinTablePatch);
-            withWhereScope(joinTableUpdateQuery, () => {
+            (0, whereScopes_1.withWhereScope)(joinTableUpdateQuery, () => {
                 this.applyModifyFilterForJoinTable(joinTableUpdateQuery);
             });
             await joinTableUpdateQuery.modify(this.relation.joinTableModify);
@@ -60,6 +62,4 @@ class ManyToManyUpdateOperationBase extends UpdateOperation {
         return clone;
     }
 }
-module.exports = {
-    ManyToManyUpdateOperationBase,
-};
+exports.ManyToManyUpdateOperationBase = ManyToManyUpdateOperationBase;

package/lib/relations/manyToMany/update/ManyToManyUpdateSqliteOperation.js

@@ -1,8 +1,8 @@
-'use strict';
-const { ManyToManyUpdateOperationBase } = require('./ManyToManyUpdateOperationBase');
-const { ManyToManySqliteModifyMixin } = require('../ManyToManySqliteModifyMixin');
-class ManyToManyUpdateSqliteOperation extends ManyToManySqliteModifyMixin(ManyToManyUpdateOperationBase) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyUpdateSqliteOperation = void 0;
+const ManyToManyUpdateOperationBase_1 = require("./ManyToManyUpdateOperationBase");
+const ManyToManySqliteModifyMixin_1 = require("../ManyToManySqliteModifyMixin");
+class ManyToManyUpdateSqliteOperation extends (0, ManyToManySqliteModifyMixin_1.ManyToManySqliteModifyMixin)(ManyToManyUpdateOperationBase_1.ManyToManyUpdateOperationBase) {
 }
-module.exports = {
-    ManyToManyUpdateSqliteOperation,
-};
+exports.ManyToManyUpdateSqliteOperation = ManyToManyUpdateSqliteOperation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abedmurrar/objection",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0-beta.2",
   "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",