typeorm-extensions 2.2.0-rc.0 → 2.2.0-rc.1

package/dist/extensions/get-many-with-totals.extension.js

@@ -130,10 +130,11 @@ async function readWithTotals(builder, paginationFilter, options, read) {
  */
 async function bothOrFirstError(first, second) {
     const [a, b] = await Promise.all([settle(first), settle(second)]);
-    if (!a.fulfilled) {
+    // `=== false`: without strictNullChecks `!fulfilled` doesn't narrow the union
+    if (a.fulfilled === false) {
         throw a.reason;
     }
-    if (!b.fulfilled) {
+    if (b.fulfilled === false) {
         throw b.reason;
     }
     return [a.value, b.value];

package/dist/types/modules/typed-root.types.d.ts

@@ -8,6 +8,10 @@ declare class TypedRootMark<Root> {
  * with an optional symbol method that only types carry. Entities loaded with it are plain entities.
  */
 export type WithTypedRoot<Entity, Root extends ObjectLiteral> = Entity & TypedRootMark<Root>;
-/** The root of a builder's typed callbacks: the one set with `typed<Root>()`, or else its entity. */
-export type TypedRoot<Entity> = Entity extends TypedRootMark<infer Root> ? Root extends ObjectLiteral ? Root : Entity : Entity;
+/**
+ * The root of a builder's typed callbacks: the one set with `typed<Root>()`, or else its entity. The key check
+ * comes first: without `strictNullChecks` an entity with an index signature (`ObjectLiteral`) matches the
+ * optional mark too, and its root would be inferred as `unknown`.
+ */
+export type TypedRoot<Entity> = typeof typedRoot extends keyof Entity ? Entity extends TypedRootMark<infer Root> ? Root extends ObjectLiteral ? Root : Entity : Entity : Entity;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeorm-extensions",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "description": "typeorm commonly used extensions",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "tsc -p .",
     "lint": "eslint . --ext .ts",
-    "test:types": "tsc -p test/types"
+    "test:types": "tsc -p test/types && tsc -p test/types/tsconfig.loose.json"
   },
   "keywords": [
     "typeorm",