Updated to latest versions and updated style

.eslintrc

@@ -2,7 +2,7 @@
     "parser": "@typescript-eslint/parser",
     "extends": [
         "plugin:@typescript-eslint/recommended",
-        "prettier/@typescript-eslint",
+        "prettier",
         "plugin:prettier/recommended"
     ],
     "parserOptions": {

package.json

@@ -31,21 +31,20 @@
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
   "devDependencies": {
-    "@types/faker": "^4.1.7",
-    "@types/jest": "^24.0.23",
-    "@typescript-eslint/eslint-plugin": "^2.7.0",
-    "@typescript-eslint/parser": "^2.7.0",
-    "coveralls": "^3.0.8",
-    "eslint": "^6.6.0",
-    "eslint-config-prettier": "^6.5.0",
-    "eslint-plugin-prettier": "^3.1.1",
-    "faker": "^4.1.0",
-    "husky": "^3.0.9",
-    "jest": "^24.9.0",
-    "prettier": "^1.19.1",
-    "rimraf": "^3.0.0",
-    "ts-jest": "^24.1.0",
-    "typescript": "^3.7.2"
+    "@faker-js/faker": "^7.5.0",
+    "@types/jest": "^29.1.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
+    "coveralls": "^3.1.1",
+    "eslint": "^8.24.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^8.0.1",
+    "jest": "^29.1.1",
+    "prettier": "^2.7.1",
+    "rimraf": "^3.0.2",
+    "ts-jest": "^29.0.2",
+    "typescript": "^4.8.4"
   },
   "keywords": [
     "typescript",
@@ -54,4 +53,4 @@
     "type-safety",
     "null-check"
   ]
-}
+}

src/empty.ts

@@ -1,4 +1,5 @@
-import { Optionable, NoElementError, Factory, Mapper, Predicate, Func } from ".";
+import { Optionable, NoElementError } from ".";
+import type { Factory, Func, Mapper, Predicate } from ".";
 import { empty, ofNullable } from "./factories";
 
 export default class Empty<T> implements Optionable<T> {
@@ -10,7 +11,7 @@ export default class Empty<T> implements Optionable<T> {
   }
 
   private isFunction(f: T | Factory<T>): f is Factory<T> {
-    return (f as Function).call !== undefined;
+    return typeof f === "function";
   }
 
   public orElse(supplier: T | Factory<T>): T {

src/factories.ts

@@ -1,12 +1,12 @@
-import { Optionable } from ".";
+import type { Optionable } from ".";
 import { Present } from "./present";
 import Empty from "./empty";
 
 export function of<T>(value: T): Optionable<T> {
   if (value === null || value === undefined) {
     throw new Error("value is null");
   }
-  return new Present(value);
+  return new Present<T>(value);
 }
 
 export function ofNullable<T>(value: T): Optionable<T> {

src/present.ts

@@ -1,4 +1,5 @@
-import { Optionable, Mapper, Factory, Predicate, Func } from ".";
+import { Optionable } from ".";
+import type { Factory, Func, Mapper, Predicate } from ".";
 import { ofNullable, of, empty } from "./factories";
 
 export class Present<T> implements Optionable<T> {

tests/empty.spec.ts

@@ -1,4 +1,4 @@
-import * as faker from "faker";
+import { faker } from "@faker-js/faker";
 import { empty, NoElementError, of } from "../src";
 
 describe("Empty Optionable", () => {
@@ -73,6 +73,7 @@ describe("Empty Optionable", () => {
 
   it("should call runnable with ifPresent", () => {
     const mock = jest.fn();
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
     option.ifPresentOrElse(() => {}, mock);
     expect(mock).toHaveBeenCalled();
   });

tests/present.spec.ts

@@ -1,4 +1,4 @@
-import * as faker from "faker";
+import { faker } from "@faker-js/faker";
 import { of, empty } from "../src";
 
 describe("Present Optionable", () => {
@@ -70,6 +70,7 @@ describe("Present Optionable", () => {
 
   it("should call consumer with ifPresent", () => {
     const mock = jest.fn();
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
     option.ifPresentOrElse(mock, () => {});
     expect(mock).toHaveBeenCalledWith(str);
   });