Merge pull request #43 from RobertFischer/next

Release
RobertFischer · Dec 11, 2020 · 0ca2c27 · 0ca2c27
2 parents c5332ec + 1dbfdba
commit 0ca2c27
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/dist/docs.tar.xz b/dist/docs.tar.xz
diff --git a/index.ts b/index.ts
@@ -12,6 +12,8 @@
  * @packageDocumentation
  */
 
+/// <amd-module name="FunPromises" />
+
 export * from "./src/types";
 export * from "./src/deferral";
 export * from "./src/fun-promise";

diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
 	"browser": "dist/browser/index.js",
 	"reactNative": "dist/react-native/index.js",
 	"source": "index.ts",
+	"types": "dist/esnext/index.d.ts",
 	"repository": "git@github.com:RobertFischer/fun-promises.git",
 	"author": "Robert Fischer",
 	"license": "Unlicense",

diff --git a/src/types.ts b/src/types.ts
@@ -7,6 +7,8 @@
  * @packageDocumentation
  */
 
+/// <reference lib="es2020.promise" />
+
 /**
  * Provides the type of elements within an `Iterable`, which may be wrapped in one or more promises.
  * The element type is also unwrapped any promises.
@@ -85,4 +87,5 @@ export class Rejection implements PromiseRejectedResult {
 /**
  * Equivalent to a `PromiseSettledResult`, but specific to our classes.
  */
-export type Settlement<T> = Fulfillment<T> | Rejection;
+export type Settlement<T> = PromiseSettledResult<T> &
+	(Fulfillment<T> | Rejection);
diff --git a/yarn.lock b/yarn.lock
@@ -1600,9 +1600,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@26.x":
-  version "26.0.18"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.18.tgz#3c5f9228e9ac15bd42f903f1acf2ad6ea5ed73d9"
-  integrity sha512-scDPs+mELZgsFetTgBSsIxKGrlitn9t/d2ecP+S1QSIGD+31fkMBEftLfOAX5k3tU06/0PjreJIQ+gWEbbHqpw==
+  version "26.0.19"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790"
+  integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"