Merge branch 'develop' into feature/program-testing

Author: frawa

.circleci/config.yml

@@ -0,0 +1,45 @@
+version: 2
+
+defaults: &defaults
+  working_directory: ~/repo
+  docker:
+    - image: circleci/node:erbium
+
+jobs:
+  build:
+    <<: *defaults
+
+    steps:
+      - checkout
+      - run: ./build.sh
+      - persist_to_workspace:
+          root: ~/repo
+          paths: .
+
+  deploy:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/repo
+      - run:
+          name: Authenticate with registry
+          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
+      - run: ./deploy.sh
+
+workflows:
+  version: 2
+  build-deploy:
+    jobs:
+      - build:
+          filters:
+            tags:
+              only: /\d+\.\d+\.\d+/
+      - deploy:
+          requires:
+            - build
+          filters:
+            tags:
+              only: /\d+\.\d+\.\d+/
+            branches:
+              ignore: /.*/
+

.travis.yml

@@ -1,5 +1,30 @@
 # Changelog
 
+## v1.5.2 (14/12/2020)
+*No changelog for this release.*
+
+---
+
+## v1.5.1 (14/12/2020)
+
+#### closed
+
+- [**closed**] fix mapObject, create new object for every call [#51](https://github.com/vankeisb/react-tea-cup/pull/51)
+
+#### dependencies
+
+- [**dependencies**] Bump ini from 1.3.5 to 1.3.8 [#52](https://github.com/vankeisb/react-tea-cup/pull/52)
+
+---
+
+## v1.5.0 (11/12/2020)
+
+#### closed
+
+- [**closed**] document events [#47](https://github.com/vankeisb/react-tea-cup/pull/47)
+
+---
+
 ## v1.4.0 (01/12/2020)
 
 #### closed

CHANGELOG.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/vankeisb/react-tea-cup.svg?branch=develop)](https://travis-ci.org/vankeisb/react-tea-cup) ![](https://img.shields.io/github/tag/vankeisb/react-tea-cup.svg?label=latest&style=flat)
-
 Want some TEA in your React ?
 
 `react-tea-cup` is a very thin library that helps following The Elm Architecture, in React.

README.md

@@ -1,6 +1,6 @@
 {
   "name": "tea-cup-core",
-  "version": "1.4.0",
+  "version": "1.5.2",
   "description": "react-tea-cup core classes and utilities (Maybe etc)",
   "author": "Rémi Van Keisbelck <remi@rvkb.com>",
   "license": "MIT",

core/package.json

@@ -243,6 +243,31 @@ describe('mapObject', () => {
     const value = { foo: 'a foo', toto: true }
     expect(Decode.mapObject<MyType2>(decoder).decodeValue(value)).toEqual(ok(expected));
   })
+
+  it('decode array of mapObject', () => {
+    type MyItem = { gnu: number; foo: string };
+
+    const MyItemDecoder: Decoder<MyItem> = Decode.mapObject(
+      Decode.mapRequiredFields({
+        gnu: Decode.num,
+        foo: Decode.str,
+      }),
+    );
+
+    const payload: MyItem[] = [
+      {
+        gnu: 1,
+        foo: 'a',
+      },
+      {
+        gnu: 2,
+        foo: 'b',
+      },
+    ];
+
+    const r = Decode.array(MyItemDecoder).decodeValue(payload);
+    expect(r).toEqual(ok(payload));
+  });
 })
 
 describe('mapArray', () => {

core/src/TeaCup/Decode.test.ts

@@ -450,14 +450,16 @@ export class Decode {
    */
   static mapObject<T>(dobject: DecoderObject<T>): Decoder<T> {
     const keys = Object.keys(dobject) as Array<keyof typeof dobject>
-    const partialDecoder: Decoder<Partial<T>> = keys.reduce((dacc, key) => Decode.andThen(object => {
-      const propertyDecoder = getProperty(dobject, key);
-      return Decode.map(property => {
-        object[key] = property;
-        return object;
-      }, propertyDecoder);
-    }, dacc), Decode.succeed({} as Partial<T>))
-    return Decode.map(v => v as T, partialDecoder);
+    return new Decoder((value: any) =>
+      keys.reduce((acc, key) => {
+        const propertyDecoder = getProperty(dobject, key);
+        const v = propertyDecoder.decodeValue(value);
+        return v.andThen(v => acc.map(acc => {
+          acc[key] = v;
+          return acc;
+        }))
+      }, ok<string, T>({} as T))
+    );
   }
 
   /**

core/src/TeaCup/Decode.ts

@@ -1,17 +1,21 @@
 {
     "name": "tea-cup-parent",
     "private": true,
-    "workspaces": ["core", "tea-cup", "samples"],
+    "workspaces": [
+        "core",
+        "tea-cup",
+        "samples"
+    ],
     "devDependencies": {
+        "github-release-notes": "0.17.2",
         "jest": "24.9.0",
         "prettier": "2.0.5",
         "rimraf": "^2.6.3",
         "ts-jest": "24.0.2",
-        "typescript": "~3.8.3",
-        "github-release-notes": "0.17.2"
+        "typescript": "~3.9.7"
     },
     "scripts": {
         "release:gh": "gren release",
         "release:changelog": "gren changelog --tags all --generate --override"
     }
-}
+}

package.json

@@ -11,7 +11,7 @@
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
     "react-scripts": "3.4.3",
-    "react-tea-cup": "1.4.0"
+    "react-tea-cup": "1.5.2"
   },
   "scripts": {
     "start": "react-scripts start",