diff --git a/README.md b/README.md index 70361d06fb..552711681a 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,16 @@ ![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg) Mono-repository for thi.ng TypeScript/ES6 projects, a collection of largely -data transformation oriented packages with either none or only internal runtime -dependencies. +data / transformation oriented packages. + +All packages are: + +- distributed as ES6 modules with bundled TypeScript typings & changelogs +- highly modular with largely only a single exported function / class per file +- provide re-exports of all their publics (`src/index.ts`) +- have either none or only @thi.ng internal runtime dependencies (see graph below) +- declare public interfaces, enums & types in an `src/api.ts` file (larger packages only) +- licensed under Apache Software License 2.0 ## Projects @@ -41,9 +49,9 @@ lerna bootstrap lerna exec yarn build --sort ``` -### Testing +## Testing -(not all packages have tests yet) +(TODO not all packages have tests yet) ``` lerna exec yarn test diff --git a/assets/deps.png b/assets/deps.png index 0c47cd32a7..921a5e0bf3 100644 Binary files a/assets/deps.png and b/assets/deps.png differ diff --git a/package.json b/package.json index ef87b74756..66e9e24b05 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "tslint": "^5.9.1" }, "scripts": { - "depgraph": "scripts/depgraph && git add assets/deps.png && git commit -m 'docs(all) update dep graph' && git push" + "depgraph": "scripts/depgraph && git add assets/deps.png && git commit -m 'docs: update dep graph' && git push", + "pub": "lerna publish && yarn depgraph" } } \ No newline at end of file diff --git a/packages/atom/CHANGELOG.md b/packages/atom/CHANGELOG.md index a4a0bf35f2..922ffd0398 100644 --- a/packages/atom/CHANGELOG.md +++ b/packages/atom/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.1.2](https://github.com/thi-ng/umbrella/compare/@thi.ng/atom@0.1.1...@thi.ng/atom@0.1.2) (2018-01-29) + + + + +**Note:** Version bump only for package @thi.ng/atom + ## [0.1.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/atom@0.1.0...@thi.ng/atom@0.1.1) (2018-01-29) diff --git a/packages/atom/LICENSE b/packages/atom/LICENSE new file mode 100644 index 0000000000..8dada3edaf --- /dev/null +++ b/packages/atom/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/atom/package.json b/packages/atom/package.json index 7590d679da..7836bcf6b6 100644 --- a/packages/atom/package.json +++ b/packages/atom/package.json @@ -1,6 +1,6 @@ { "name": "@thi.ng/atom", - "version": "0.1.1", + "version": "0.1.2", "description": "Mutable wrapper for a immutable values", "main": "./index.js", "typings": "./index.d.ts", diff --git a/packages/rstream-csp/CHANGELOG.md b/packages/rstream-csp/CHANGELOG.md index 5ba57c3c16..f4fb1ff0bc 100644 --- a/packages/rstream-csp/CHANGELOG.md +++ b/packages/rstream-csp/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.1.4](https://github.com/thi-ng/umbrella/compare/@thi.ng/rstream-csp@0.1.3...@thi.ng/rstream-csp@0.1.4) (2018-01-29) + + + + +**Note:** Version bump only for package @thi.ng/rstream-csp + ## [0.1.3](https://github.com/thi-ng/umbrella/compare/@thi.ng/rstream-csp@0.1.2...@thi.ng/rstream-csp@0.1.3) (2018-01-29) diff --git a/packages/rstream-csp/LICENSE b/packages/rstream-csp/LICENSE new file mode 100644 index 0000000000..8dada3edaf --- /dev/null +++ b/packages/rstream-csp/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/rstream-csp/package.json b/packages/rstream-csp/package.json index d4ee73c943..f913336748 100644 --- a/packages/rstream-csp/package.json +++ b/packages/rstream-csp/package.json @@ -1,6 +1,6 @@ { "name": "@thi.ng/rstream-csp", - "version": "0.1.3", + "version": "0.1.4", "description": "TODO", "main": "./index.js", "typings": "./index.d.ts", @@ -24,7 +24,7 @@ }, "dependencies": { "@thi.ng/api": "^1.4.0", - "@thi.ng/rstream": "^0.7.1" + "@thi.ng/rstream": "^0.7.2" }, "keywords": [ "bridge", diff --git a/packages/rstream-log/CHANGELOG.md b/packages/rstream-log/CHANGELOG.md index e092a7b4ab..4c302e41eb 100644 --- a/packages/rstream-log/CHANGELOG.md +++ b/packages/rstream-log/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.5.5](https://github.com/thi-ng/umbrella/compare/@thi.ng/rstream-log@0.5.4...@thi.ng/rstream-log@0.5.5) (2018-01-29) + + + + +**Note:** Version bump only for package @thi.ng/rstream-log + ## [0.5.4](https://github.com/thi-ng/umbrella/compare/@thi.ng/rstream-log@0.5.3...@thi.ng/rstream-log@0.5.4) (2018-01-29) diff --git a/packages/rstream-log/package.json b/packages/rstream-log/package.json index fb93b12c41..dd8b1a4509 100644 --- a/packages/rstream-log/package.json +++ b/packages/rstream-log/package.json @@ -1,6 +1,6 @@ { "name": "@thi.ng/rstream-log", - "version": "0.5.4", + "version": "0.5.5", "description": "TODO", "main": "./index.js", "typings": "./index.d.ts", @@ -23,7 +23,7 @@ "webpack": "^3.10.0" }, "dependencies": { - "@thi.ng/rstream": "^0.7.1", + "@thi.ng/rstream": "^0.7.2", "@thi.ng/transducers": "^1.0.2" }, "keywords": [ diff --git a/packages/rstream/CHANGELOG.md b/packages/rstream/CHANGELOG.md index 7013862f9c..fc289e8904 100644 --- a/packages/rstream/CHANGELOG.md +++ b/packages/rstream/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.7.2](https://github.com/thi-ng/umbrella/compare/@thi.ng/rstream@0.7.1...@thi.ng/rstream@0.7.2) (2018-01-29) + + +### Bug Fixes + +* **rstream:** fix [#1](https://github.com/thi-ng/umbrella/issues/1) update fromPromise(), add test ([822b297](https://github.com/thi-ng/umbrella/commit/822b297)) + + + + ## [0.7.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/rstream@0.7.0...@thi.ng/rstream@0.7.1) (2018-01-29) diff --git a/packages/rstream/package.json b/packages/rstream/package.json index 19da9c17d7..c463bcc8b7 100644 --- a/packages/rstream/package.json +++ b/packages/rstream/package.json @@ -1,6 +1,6 @@ { "name": "@thi.ng/rstream", - "version": "0.7.1", + "version": "0.7.2", "description": "Reactive multi-tap streams & transformation pipeline constructs", "main": "./index.js", "typings": "./index.d.ts", @@ -24,7 +24,7 @@ }, "dependencies": { "@thi.ng/api": "^1.4.0", - "@thi.ng/atom": "^0.1.1", + "@thi.ng/atom": "^0.1.2", "@thi.ng/transducers": "^1.0.2" }, "keywords": [ diff --git a/packages/rstream/src/from/promise.ts b/packages/rstream/src/from/promise.ts index 01fdcc54fc..5d7098fcae 100644 --- a/packages/rstream/src/from/promise.ts +++ b/packages/rstream/src/from/promise.ts @@ -9,13 +9,26 @@ import { Stream } from "../stream"; * @param src */ export function fromPromise(src: Promise) { - let canceled = false; + let canceled = false, + isError = false, + err: any = {}; + src.catch( + (e) => { + err = e; + isError = true; + } + ); return new Stream((stream) => { src.then( (x) => { if (!canceled && stream.getState() < State.DONE) { - stream.next(x); - stream.done(); + if (isError) { + stream.error(err); + err = null; + } else { + stream.next(x); + stream.done(); + } } }, (e) => stream.error(e) diff --git a/packages/rstream/test/from-promise.ts b/packages/rstream/test/from-promise.ts index 66acb4e4dd..2470c36b9e 100644 --- a/packages/rstream/test/from-promise.ts +++ b/packages/rstream/test/from-promise.ts @@ -13,7 +13,7 @@ describe("fromPromise()", () => { called = true; }, done() { - assert(called, "not called"); + assert(called, "not called next()"); done(); } }); @@ -22,64 +22,50 @@ describe("fromPromise()", () => { it("rejects to sub", (done) => { let src = rs.fromPromise(Promise.reject(23)), called = false, - calledDone = false, sub = src.subscribe({ + next(_) { + assert.fail("called next()"); + }, + done() { + assert.fail("called done()"); + }, error(x) { assert.equal(x, 23); assert.equal(src.getState(), rs.State.ERROR); assert.equal(sub.getState(), rs.State.ERROR); called = true; - }, - done() { - calledDone = true; } }); setTimeout(() => { assert(called, "not called"); - assert(!calledDone, "called done"); done(); - }, 10); + }, 1); }); it("passes error to sub", (done) => { let src = rs.fromPromise(new Promise(() => { throw new Error("foo"); })), called = false, - calledDone = false, sub = src.subscribe({ + next(_) { + assert.fail("called next()"); + }, + done() { + assert.fail("called done()"); + }, error(x) { assert.equal(x.message, "foo"); assert.equal(src.getState(), rs.State.ERROR); assert.equal(sub.getState(), rs.State.ERROR); called = true; - }, - done() { - calledDone = true; } }); setTimeout(() => { assert(called, "not called"); - assert(!calledDone, "called done"); - done(); - }, 10); - }); - - it("goes into ERROR state", (done) => { - let src = rs.fromPromise(new Promise(() => { throw new Error("foo"); })), - calledDone = false, - sub = src.subscribe({ - done() { - calledDone = true; - } - }); - setTimeout(() => { - assert.equal(src.getState(), rs.State.ERROR, "src not ERROR"); - assert.equal(sub.getState(), rs.State.ERROR, "sub not ERROR"); - assert(!calledDone, "called done"); assert.throws(() => src.next(Promise.resolve()), "no next() allowed"); src.done(); assert.equal(src.getState(), rs.State.ERROR, "src not ERROR"); done(); - }, 0); + }, 10); }); it("resolves via Resolver", (done) => { @@ -97,5 +83,4 @@ describe("fromPromise()", () => { } }); }); - }); diff --git a/scripts/make-module b/scripts/make-module index 54792657ce..1c277d6b68 100755 --- a/scripts/make-module +++ b/scripts/make-module @@ -11,6 +11,8 @@ echo "creating /src & /test folders..." mkdir -p $MODULE/src $MODULE/test touch $MODULE/src/index.ts +cp packages/api/LICENSE $MODULE/ + echo "writing test skeleton..." cat << EOF > $MODULE/test/index.ts import * as assert from "assert";