Merge pull request #16 from bromne/develop

v2.0.0

Author: bromne

README.md

@@ -33,7 +33,7 @@ npm install --save typescript-optional
 
 ```ts
 // import Optional type from this module
-import Optional from 'typescript-optional';
+import { Optional } from "typescript-optional";
 ```
 
 ### creating `Optional<T>` objects

src/optional.spec.ts

@@ -85,21 +85,21 @@ describe("Optional", () => {
 
     describe("#isPresent", () => {
         it("should return true if it is present", () => {
-            assert.strictEqual(sutPresent.isPresent, true);
+            assert.strictEqual(sutPresent.isPresent(), true);
         });
 
         it("should return false if it is not present", () => {
-            assert.strictEqual(sutEmpty.isPresent, false);
+            assert.strictEqual(sutEmpty.isPresent(), false);
         });
     });
 
     describe("#isEmpty", () => {
         it("should return false if it is present", () => {
-            assert.strictEqual(sutPresent.isEmpty, false);
+            assert.strictEqual(sutPresent.isEmpty(), false);
         });
 
         it("should return true if it is not present", () => {
-            assert.strictEqual(sutEmpty.isEmpty, true);
+            assert.strictEqual(sutEmpty.isEmpty(), true);
         });
     });
 

src/optional.ts

@@ -18,20 +18,20 @@ import { Cases, Option } from "./types";
  */
 export abstract class Optional<T> {
     /**
-     * Represents whether this is present or not.
+     * Returns whether this is present or not.
      * 
      * If a payload is present, be `true` , otherwise be `false`.
      */
-    abstract get isPresent(): boolean;
+    abstract isPresent(): boolean;
 
     /**
-     * Represents whether this is empty or not.
+     * Returns whether this is empty or not.
      * 
      * If this is empty, be `true`, otherwise  be `false`.
-     * This method is negation of `Optional.isPresent`.
+     * This method is negation of `Optional#isPresent`.
      */
-    get isEmpty(): boolean {
-        return !this.isPresent;
+    isEmpty(): boolean {
+        return !this.isPresent();
     }
 
     /**
@@ -219,7 +219,7 @@ export abstract class Optional<T> {
 class PresentOptional<T> extends Optional<T> {
     payload: T;
 
-    get isPresent(): boolean {
+    isPresent(): boolean {
         return true;
     }
 
@@ -291,7 +291,7 @@ class PresentOptional<T> extends Optional<T> {
 }
 
 class EmptyOptional<T> extends Optional<T> {
-    get isPresent(): boolean {
+    isPresent(): boolean {
         return false;
     }