objection 3.0.0-alpha.2 → 3.0.0-alpha.6

package/README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/Vincit/objection.js.svg?branch=master)](https://travis-ci.org/Vincit/objection.js) [![Coverage Status](https://coveralls.io/repos/github/Vincit/objection.js/badge.svg?branch=master&service=github)](https://coveralls.io/github/Vincit/objection.js?branch=master) [![Join the chat at https://gitter.im/Vincit/objection.js](https://badges.gitter.im/Vincit/objection.js.svg)](https://gitter.im/Vincit/objection.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Tests](https://github.com/Vincit/objection.js/actions/workflows/test.yml/badge.svg)](https://github.com/Vincit/objection.js)
+[![Join the chat at https://gitter.im/Vincit/objection.js](https://badges.gitter.im/Vincit/objection.js.svg)](https://gitter.im/Vincit/objection.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # [Objection.js](https://vincit.github.io/objection.js)
 

package/lib/relations/RelationOwner.js

@@ -71,9 +71,11 @@ class RelationOwner {
       if (values) {
         builder.whereInComposite(relatedRefs, values);
       } else {
+        builder.where(false);
         builder.resolve([]);
       }
     } else {
+      builder.where(false);
       builder.resolve([]);
     }
 

package/lib/utils/objectUtils.js

@@ -189,7 +189,6 @@ function once(func) {
 
 function flatten(arrays) {
   const out = [];
-  let outIdx = 0;
 
   for (let i = 0, l = arrays.length; i < l; ++i) {
     const value = arrays[i];
@@ -225,6 +224,11 @@ function set(obj, path, value) {
 
   for (let i = 0, l = path.length - 1; i < l; ++i) {
     const key = path[i];
+
+    if (!isSafeKey(key)) {
+      return inputObj;
+    }
+
     let child = obj[key];
 
     if (!isObject(child)) {
@@ -243,7 +247,11 @@ function set(obj, path, value) {
   }
 
   if (path.length > 0 && isObject(obj)) {
-    obj[path[path.length - 1]] = value;
+    const key = path[path.length - 1];
+
+    if (isSafeKey(key)) {
+      obj[key] = value;
+    }
   }
 
   return inputObj;
@@ -253,7 +261,11 @@ function zipObject(keys, values) {
   const out = {};
 
   for (let i = 0, l = keys.length; i < l; ++i) {
-    out[keys[i]] = values[i];
+    const key = keys[i];
+
+    if (isSafeKey(key)) {
+      out[key] = values[i];
+    }
   }
 
   return out;
@@ -357,6 +369,10 @@ function compareStrict(val1, val2) {
   return val1 === val2;
 }
 
+function isSafeKey(key) {
+  return isNumber(key) || (isString(key) && key !== '__proto__');
+}
+
 module.exports = {
   isEmpty,
   isString,

package/package.json

@@ -1,16 +1,12 @@
 {
   "name": "objection",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.6",
   "description": "An SQL-friendly ORM for Node.js",
   "main": "lib/objection.js",
   "license": "MIT",
   "scripts": {
     "test": "npm run eslint && mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --exclude \"tests/unit/relations/files/**\"",
-    "test-travis": "nyc mocha --slow 100 --timeout 60000 --reporter spec --recursive tests --exclude \"tests/unit/relations/files/**\" && npm run test-typings",
     "test-fast": "mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --bail --exclude \"tests/unit/relations/files/**\"",
-    "test-opt": "mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --bail --trace_opt --trace_deopt --exclude \"tests/unit/relations/files/**\"",
-    "test-debug": "mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --inspect-brk --exclude \"tests/unit/relations/files/**\"",
-    "test-sqlite": "cross-env DATABASES=sqlite3 mocha --slow 10 --timeout 15000 --reporter spec --recursive tests --exclude \"tests/unit/relations/files/**\"",
     "test-typings": "tsc",
     "coveralls": "cat ./testCoverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
     "perf": "mocha --slow 60000 --timeout 60000 --reporter spec --recursive perf",
@@ -85,7 +81,7 @@
     "pg": "^8.6.0",
     "prettier": "2.3.2",
     "sqlite3": "^5.0.2",
-    "typescript": "^4.3.5",
+    "typescript": "^4.4.4",
     "vuepress": "1.8.2"
   },
   "nyc": {

package/typings/objection/index.d.ts

@@ -306,6 +306,11 @@ declare namespace Objection {
    */
   type SingleQueryBuilder<T extends { SingleQueryBuilderType: any }> = T['SingleQueryBuilderType'];
 
+  /**
+   * Gets the single or undefined item query builder type for a query builder.
+   */
+  type MaybeSingleQueryBuilder<QB extends AnyQueryBuilder> = QB['MaybeSingleQueryBuilderType'];
+
   /**
    * Gets the multi-item query builder type for a query builder.
    */
@@ -566,7 +571,7 @@ declare namespace Objection {
 
   interface FirstMethod {
     <QB extends AnyQueryBuilder>(this: QB): QB extends ArrayQueryBuilder<QB>
-      ? SingleQueryBuilder<QB>
+      ? MaybeSingleQueryBuilder<QB>
       : QB;
   }
 
@@ -589,10 +594,6 @@ declare namespace Objection {
     (arg: T): QB;
   }
 
-  interface OptionalOneArgMethod<T, QB extends AnyQueryBuilder> {
-    (arg?: T): QB;
-  }
-
   interface StringReturningMethod {
     (): string;
   }
@@ -798,7 +799,13 @@ declare namespace Objection {
     [key: string]: any;
   }
 
-  export class QueryBuilder<M extends Model, R = M[]> extends Promise<R> {
+  export interface CatchablePromiseLike<R> extends PromiseLike<R> {
+    catch<FR = never>(
+      onrejected?: ((reason: any) => FR | PromiseLike<FR>) | undefined | null
+    ): Promise<R | FR>;
+  }
+
+  export class QueryBuilder<M extends Model, R = M[]> implements CatchablePromiseLike<R> {
     static forClass: ForClassMethod;
 
     select: SelectMethod<this>;
@@ -969,9 +976,9 @@ declare namespace Objection {
     groupBy: GroupByMethod<this>;
     groupByRaw: RawInterface<this>;
 
-    findById(id: MaybeCompositeId): SingleQueryBuilder<this>;
+    findById(id: MaybeCompositeId): MaybeSingleQueryBuilder<this>;
     findByIds(ids: MaybeCompositeId[]): this;
-    findOne: WhereMethod<SingleQueryBuilder<this>>;
+    findOne: WhereMethod<MaybeSingleQueryBuilder<this>>;
 
     execute(): Promise<R>;
     castTo<MC extends Model>(modelClass: ModelConstructor<MC>): QueryBuilderType<MC>;
@@ -1047,7 +1054,10 @@ declare namespace Objection {
     // Deprecated
     allowUpsert: AllowGraphMethod<this>;
 
-    throwIfNotFound: OptionalOneArgMethod<object, this>;
+    throwIfNotFound: (
+      arg?: any
+    ) => R extends Model | undefined ? SingleQueryBuilder<QueryBuilder<M, M>> : this;
+
     returning: ReturningMethod;
     forUpdate: IdentityMethod<this>;
     forShare: IdentityMethod<this>;
@@ -1156,10 +1166,22 @@ declare namespace Objection {
 
     ArrayQueryBuilderType: QueryBuilder<M, M[]>;
     SingleQueryBuilderType: QueryBuilder<M, M>;
+    MaybeSingleQueryBuilderType: QueryBuilder<M, M | undefined>;
     NumberQueryBuilderType: QueryBuilder<M, number>;
     PageQueryBuilderType: QueryBuilder<M, Page<M>>;
+
+    then<R1 = R, R2 = never>(
+      onfulfilled?: ((value: R) => R1 | PromiseLike<R1>) | undefined | null,
+      onrejected?: ((reason: any) => R2 | PromiseLike<R2>) | undefined | null
+    ): Promise<R1 | R2>;
+
+    catch<FR = never>(
+      onrejected?: ((reason: any) => FR | PromiseLike<FR>) | undefined | null
+    ): Promise<R | FR>;
   }
 
+  type X<T> = Promise<T>;
+
   interface FetchGraphOptions {
     transaction?: TransactionOrKnex;
     skipFetched?: boolean;