Merge branch 'master' of github.com:glipecki/optional-ts

jest.config.js

@@ -13,7 +13,7 @@ module.exports = {
     ],
     globals: {
         'ts-jest': {
-            tsConfigFile: 'tsconfig.spec.json'
+            tsConfig: 'src/tsconfig.spec.json'
         }
     }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glipecki/optional",
-  "version": "0.11.0",
+  "version": "0.14.0",
   "description": "Optional implementation for TypeScript projects",
   "repository": "git@github.com:glipecki/optional.ts.git",
   "author": "Grzegorz Lipecki <grzegorz.lipecki@gmail.com>",
@@ -27,17 +27,17 @@
     "release": "yarn build && yarn publish --minor --non-interactive --access public && git push && git push --tags"
   },
   "devDependencies": {
-    "@types/jest": "23.3.0",
-    "concurrently": "4.0.0",
-    "copyfiles": "2.0.0",
-    "coveralls": "3.0.2",
-    "jest": "23.4.1",
-    "rimraf": "2.6.2",
-    "rollup": "0.64.0",
-    "rollup-plugin-cleanup": "^3.0.0",
-    "ts-jest": "23.0.1",
-    "tslint": "5.10.0",
-    "typedoc": "0.12.0",
-    "typescript": "3.0.0-dev.20180712"
+    "@types/jest": "24.0.9",
+    "concurrently": "4.1.0",
+    "copyfiles": "2.1.0",
+    "coveralls": "3.0.3",
+    "jest": "24.1.0",
+    "rimraf": "2.6.3",
+    "rollup": "1.3.3",
+    "rollup-plugin-cleanup": "^3.1.1",
+    "ts-jest": "24.0.1",
+    "tslint": "5.13.0",
+    "typedoc": "0.15.0",
+    "typescript": "3.3.3333"
   }
 }

src/optional/optional.spec.ts

@@ -172,7 +172,7 @@ describe('Optional.ifPresent', () => {
 
     it('should not call callback if value not present', () => {
         Optional.of(null).ifPresent(v => {
-            throw new Error('should not call callback!')
+            throw new Error('should not call callback!');
         });
     });
 

src/optional/optional.ts

@@ -64,6 +64,7 @@ export class Optional<T> {
         if (this.isPresent()) {
             return mapper(this.value);
         } else {
+            // FIXME: return empty()
             return null;
         }
     }