@abedmurrar/objection 4.0.0-alpha.0 → 4.0.0-beta.1

package/lib/queryBuilder/operations/DelegateOperation.js

@@ -1,141 +1,101 @@
 'use strict';
-
 const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-
 // Operation that simply delegates all calls to the operation passed
 // to to the constructor in `opt.delegate`.
 class DelegateOperation extends QueryBuilderOperation {
-  constructor(name, opt) {
-    super(name, opt);
-
-    this.delegate = opt.delegate;
-  }
-
-  get modelOptions() {
-    return this.delegate.modelOptions;
-  }
-
-  is(OperationClass) {
-    return super.is(OperationClass) || this.delegate.is(OperationClass);
-  }
-
-  onAdd(builder, args) {
-    return this.delegate.onAdd(builder, args);
-  }
-
-  onBefore1(builder, result) {
-    return this.delegate.onBefore1(builder, result);
-  }
-
-  hasOnBefore1() {
-    return this.onBefore1 !== DelegateOperation.prototype.onBefore1 || this.delegate.hasOnBefore1();
-  }
-
-  onBefore2(builder, result) {
-    return this.delegate.onBefore2(builder, result);
-  }
-
-  hasOnBefore2() {
-    return this.onBefore2 !== DelegateOperation.prototype.onBefore2 || this.delegate.hasOnBefore2();
-  }
-
-  onBefore3(builder, result) {
-    return this.delegate.onBefore3(builder, result);
-  }
-
-  hasOnBefore3() {
-    return this.onBefore3 !== DelegateOperation.prototype.onBefore3 || this.delegate.hasOnBefore3();
-  }
-
-  onBuild(builder) {
-    return this.delegate.onBuild(builder);
-  }
-
-  hasOnBuild() {
-    return this.onBuild !== DelegateOperation.prototype.onBuild || this.delegate.hasOnBuild();
-  }
-
-  onBuildKnex(knexBuilder, builder) {
-    return this.delegate.onBuildKnex(knexBuilder, builder);
-  }
-
-  hasOnBuildKnex() {
-    return (
-      this.onBuildKnex !== DelegateOperation.prototype.onBuildKnex || this.delegate.hasOnBuildKnex()
-    );
-  }
-
-  onRawResult(builder, result) {
-    return this.delegate.onRawResult(builder, result);
-  }
-
-  hasOnRawResult() {
-    return (
-      this.onRawResult !== DelegateOperation.prototype.onRawResult || this.delegate.hasOnRawResult()
-    );
-  }
-
-  onAfter1(builder, result) {
-    return this.delegate.onAfter1(builder, result);
-  }
-
-  hasOnAfter1() {
-    return this.onAfter1 !== DelegateOperation.prototype.onAfter1 || this.delegate.hasOnAfter1();
-  }
-
-  onAfter2(builder, result) {
-    return this.delegate.onAfter2(builder, result);
-  }
-
-  hasOnAfter2() {
-    return this.onAfter2 !== DelegateOperation.prototype.onAfter2 || this.delegate.hasOnAfter2();
-  }
-
-  onAfter3(builder, result) {
-    return this.delegate.onAfter3(builder, result);
-  }
-
-  hasOnAfter3() {
-    return this.onAfter3 !== DelegateOperation.prototype.onAfter3 || this.delegate.hasOnAfter3();
-  }
-
-  queryExecutor(builder) {
-    return this.delegate.queryExecutor(builder);
-  }
-
-  hasQueryExecutor() {
-    return (
-      this.queryExecutor !== DelegateOperation.prototype.queryExecutor ||
-      this.delegate.hasQueryExecutor()
-    );
-  }
-
-  onError(builder, error) {
-    return this.delegate.onError(builder, error);
-  }
-
-  hasOnError() {
-    return this.onError !== DelegateOperation.prototype.onError || this.delegate.hasOnError();
-  }
-
-  toFindOperation(builder) {
-    return this.delegate.toFindOperation(builder);
-  }
-
-  hasToFindOperation() {
-    return (
-      this.hasToFindOperation !== DelegateOperation.prototype.hasToFindOperation ||
-      this.delegate.hasToFindOperation()
-    );
-  }
-
-  clone() {
-    const clone = super.clone();
-    clone.delegate = this.delegate && this.delegate.clone();
-    return clone;
-  }
+    constructor(name, opt) {
+        super(name, opt);
+        this.delegate = opt.delegate;
+    }
+    get modelOptions() {
+        return this.delegate.modelOptions;
+    }
+    is(OperationClass) {
+        return super.is(OperationClass) || this.delegate.is(OperationClass);
+    }
+    onAdd(builder, args) {
+        return this.delegate.onAdd(builder, args);
+    }
+    onBefore1(builder, result) {
+        return this.delegate.onBefore1(builder, result);
+    }
+    hasOnBefore1() {
+        return this.onBefore1 !== DelegateOperation.prototype.onBefore1 || this.delegate.hasOnBefore1();
+    }
+    onBefore2(builder, result) {
+        return this.delegate.onBefore2(builder, result);
+    }
+    hasOnBefore2() {
+        return this.onBefore2 !== DelegateOperation.prototype.onBefore2 || this.delegate.hasOnBefore2();
+    }
+    onBefore3(builder, result) {
+        return this.delegate.onBefore3(builder, result);
+    }
+    hasOnBefore3() {
+        return this.onBefore3 !== DelegateOperation.prototype.onBefore3 || this.delegate.hasOnBefore3();
+    }
+    onBuild(builder) {
+        return this.delegate.onBuild(builder);
+    }
+    hasOnBuild() {
+        return this.onBuild !== DelegateOperation.prototype.onBuild || this.delegate.hasOnBuild();
+    }
+    onBuildKnex(knexBuilder, builder) {
+        return this.delegate.onBuildKnex(knexBuilder, builder);
+    }
+    hasOnBuildKnex() {
+        return (this.onBuildKnex !== DelegateOperation.prototype.onBuildKnex || this.delegate.hasOnBuildKnex());
+    }
+    onRawResult(builder, result) {
+        return this.delegate.onRawResult(builder, result);
+    }
+    hasOnRawResult() {
+        return (this.onRawResult !== DelegateOperation.prototype.onRawResult || this.delegate.hasOnRawResult());
+    }
+    onAfter1(builder, result) {
+        return this.delegate.onAfter1(builder, result);
+    }
+    hasOnAfter1() {
+        return this.onAfter1 !== DelegateOperation.prototype.onAfter1 || this.delegate.hasOnAfter1();
+    }
+    onAfter2(builder, result) {
+        return this.delegate.onAfter2(builder, result);
+    }
+    hasOnAfter2() {
+        return this.onAfter2 !== DelegateOperation.prototype.onAfter2 || this.delegate.hasOnAfter2();
+    }
+    onAfter3(builder, result) {
+        return this.delegate.onAfter3(builder, result);
+    }
+    hasOnAfter3() {
+        return this.onAfter3 !== DelegateOperation.prototype.onAfter3 || this.delegate.hasOnAfter3();
+    }
+    queryExecutor(builder) {
+        return this.delegate.queryExecutor(builder);
+    }
+    hasQueryExecutor() {
+        return (this.queryExecutor !== DelegateOperation.prototype.queryExecutor ||
+            this.delegate.hasQueryExecutor());
+    }
+    onError(builder, error) {
+        return this.delegate.onError(builder, error);
+    }
+    hasOnError() {
+        return this.onError !== DelegateOperation.prototype.onError || this.delegate.hasOnError();
+    }
+    toFindOperation(builder) {
+        return this.delegate.toFindOperation(builder);
+    }
+    hasToFindOperation() {
+        return (this.hasToFindOperation !== DelegateOperation.prototype.hasToFindOperation ||
+            this.delegate.hasToFindOperation());
+    }
+    clone() {
+        const clone = super.clone();
+        clone.delegate = this.delegate && this.delegate.clone();
+        return clone;
+    }
 }
-
 module.exports = {
-  DelegateOperation,
+    DelegateOperation,
 };

package/lib/queryBuilder/operations/DeleteOperation.js

@@ -1,51 +1,47 @@
 'use strict';
-
 const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-const { StaticHookArguments } = require('../StaticHookArguments');
-
+const { StaticHookArguments, hasStaticHook } = require('../StaticHookArguments');
 class DeleteOperation extends QueryBuilderOperation {
-  async onBefore2(builder, result) {
-    await callBeforeDelete(builder);
-    return result;
-  }
-
-  onBuildKnex(knexBuilder) {
-    return knexBuilder.delete();
-  }
-
-  onAfter2(builder, result) {
-    return callAfterDelete(builder, result);
-  }
-
-  toFindOperation() {
-    return null;
-  }
+    async onBefore2(builder, result) {
+        await callBeforeDelete(builder);
+        return result;
+    }
+    onBuildKnex(knexBuilder) {
+        return knexBuilder.delete();
+    }
+    onAfter2(builder, result) {
+        return callAfterDelete(builder, result);
+    }
+    toFindOperation() {
+        return null;
+    }
 }
-
 function callBeforeDelete(builder) {
-  return callStaticBeforeDelete(builder);
+    return callStaticBeforeDelete(builder);
 }
-
 function callStaticBeforeDelete(builder) {
-  const args = StaticHookArguments.create({ builder });
-  return builder.modelClass().beforeDelete(args);
+    if (!hasStaticHook(builder.modelClass(), 'beforeDelete')) {
+        return undefined;
+    }
+    const args = StaticHookArguments.create({ builder });
+    return builder.modelClass().beforeDelete(args);
 }
-
 function callAfterDelete(builder, result) {
-  return callStaticAfterDelete(builder, result);
+    return callStaticAfterDelete(builder, result);
 }
-
 async function callStaticAfterDelete(builder, result) {
-  const args = StaticHookArguments.create({ builder, result });
-  const maybeResult = await builder.modelClass().afterDelete(args);
-
-  if (maybeResult === undefined) {
-    return result;
-  } else {
-    return maybeResult;
-  }
+    if (!hasStaticHook(builder.modelClass(), 'afterDelete')) {
+        return result;
+    }
+    const args = StaticHookArguments.create({ builder, result });
+    const maybeResult = await builder.modelClass().afterDelete(args);
+    if (maybeResult === undefined) {
+        return result;
+    }
+    else {
+        return maybeResult;
+    }
 }
-
 module.exports = {
-  DeleteOperation,
+    DeleteOperation,
 };

package/lib/queryBuilder/operations/FindByIdOperation.js

@@ -1,37 +1,29 @@
 'use strict';
-
 const { QueryBuilderOperation } = require('./QueryBuilderOperation');
 const { assertIdNotUndefined } = require('../../utils/assert');
-
 class FindByIdOperation extends QueryBuilderOperation {
-  constructor(name, opt) {
-    super(name, opt);
-    this.id = this.opt.id;
-  }
-
-  onAdd(builder, args) {
-    if (this.id === null || this.id === undefined) {
-      this.id = args[0];
+    constructor(name, opt) {
+        super(name, opt);
+        this.id = this.opt.id;
     }
-
-    return super.onAdd(builder, args);
-  }
-
-  onBuild(builder) {
-    if (!builder.internalOptions().skipUndefined) {
-      assertIdNotUndefined(this.id, `undefined was passed to ${this.name}`);
+    onAdd(builder, args) {
+        if (this.id === null || this.id === undefined) {
+            this.id = args[0];
+        }
+        return super.onAdd(builder, args);
+    }
+    onBuild(builder) {
+        if (!builder.internalOptions().skipUndefined) {
+            assertIdNotUndefined(this.id, `undefined was passed to ${this.name}`);
+        }
+        builder.whereComposite(builder.fullIdColumn(), this.id);
+    }
+    clone() {
+        const clone = super.clone();
+        clone.id = this.id;
+        return clone;
     }
-
-    builder.whereComposite(builder.fullIdColumn(), this.id);
-  }
-
-  clone() {
-    const clone = super.clone();
-    clone.id = this.id;
-    return clone;
-  }
 }
-
 module.exports = {
-  FindByIdOperation,
+    FindByIdOperation,
 };

package/lib/queryBuilder/operations/FindByIdsOperation.js

@@ -1,29 +1,23 @@
 'use strict';
-
 const { QueryBuilderOperation } = require('./QueryBuilderOperation');
-
 class FindByIdsOperation extends QueryBuilderOperation {
-  constructor(name, opt) {
-    super(name, opt);
-    this.ids = null;
-  }
-
-  onAdd(builder, args) {
-    this.ids = args[0];
-    return super.onAdd(builder, args);
-  }
-
-  onBuild(builder) {
-    builder.whereInComposite(builder.fullIdColumn(), this.ids);
-  }
-
-  clone() {
-    const clone = super.clone();
-    clone.ids = this.ids;
-    return clone;
-  }
+    constructor(name, opt) {
+        super(name, opt);
+        this.ids = null;
+    }
+    onAdd(builder, args) {
+        this.ids = args[0];
+        return super.onAdd(builder, args);
+    }
+    onBuild(builder) {
+        builder.whereInComposite(builder.fullIdColumn(), this.ids);
+    }
+    clone() {
+        const clone = super.clone();
+        clone.ids = this.ids;
+        return clone;
+    }
 }
-
 module.exports = {
-  FindByIdsOperation,
+    FindByIdsOperation,
 };