refactor: refactored some code

Author: Nejc

.all-contributorsrc

@@ -10,8 +10,8 @@
   "contributors": [
     {
       "login": "nejcm",
-      "name": "Nejc Mursic",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/1865210?v=3",
+      "name": "Nejc Muršič",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1865210?v=4",
       "profile": "https://nejcmursic.com",
       "contributions": [
         "code",

.eslintrc

@@ -57,6 +57,7 @@
     "no-eq-null": "off",
     "react/jsx-indent": "off",
     "jsx-a11y/label-has-for": "off",
-    "jsx-a11y/label-has-associated-control": "off"
+    "jsx-a11y/label-has-associated-control": "off",
+    "@typescript-eslint/no-non-null-assertion": "off"
   }
 }

.github/workflows/node.js.yml

@@ -1,4 +1,4 @@
-name: CI
+name: CI/CD
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [master, beta, next, develop]
 
 jobs:
-  test:
+  test-deploy:
     name: Running tests...
     runs-on: ubuntu-latest
 

.travis.yml

@@ -19,7 +19,7 @@ branches:
 jobs:
   include:
     - stage: deploy
-      if: branch = master
+      if: branch = master AND type != pull_request
       node_js: lts/*
       env:
         - PRODUCTION=production

README.md

@@ -18,7 +18,9 @@ ones refactored to improve code quality.
 ![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)
 
 [![JavaScript Style Guide][style-guide-badge]][style-guide]
-[![All Contributors][all-contributors-badge]](#contributors)
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg)](#contributors)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![PRs Welcome][prs-badge]][prs] [![Code of Conduct][coc-badge]][coc]
 
 [![Watch on GitHub][github-watch-badge]][github-watch]
@@ -100,20 +102,9 @@ filing an issue on GitHub.
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
-
 <table>
   <tr>
-    <td align="center">
-      <a href="https://github.com/nejcm">
-        <img src="https://avatars3.githubusercontent.com/u/1865210?v=3" width="100px" alt="Nejc"/>
-        <br />
-        <sub><b>Nejc Muršič</b></sub>
-      </a>
-      <br />
-      <a href="https://github.com/nejcm/js-algorithms/commits?author=nejcm" title="Code">💻</a> 
-      <a href="https://github.com/nejcm/js-algorithms/commits?author=nejcm" title="Documentation">📖</a> 
-      <a href="#infra" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/nejcm/js-algorithms/commits?author=nejcm" title="Tests">⚠️</a>
-    </td>
+    <td align="center"><a href="https://github.com/nejcm"><img src="https://avatars3.githubusercontent.com/u/1865210?v=4" width="100px" alt="Nejc"/><br /><sub><b>Nejc Muršič</b></sub></a><br /><a href="https://github.com/nejcm/js-algorithms/commits?author=nejcm" title="Code">💻</a> <a href="https://github.com/nejcm/js-algorithms/commits?author=nejcm" title="Documentation">📖</a> <a href="#infra" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/nejcm/js-algorithms/commits?author=nejcm" title="Tests">⚠️</a></td>
   </tr>
 </table>
 
@@ -138,7 +129,6 @@ Reach out to us at one of the following places:
 
 <!-- prettier-ignore-start -->
 
-[all-contributors-badge]: https://img.shields.io/badge/all_contributors-1-orange.svg
 [all-contributors]: https://github.com/all-contributors/all-contributors
 [bugs]: https://github.com/nejcm/js-algorithms/issues?q=is%3Aissue+is%3Aopen+label%3Abug+sort%3Acreated-desc
 [build-badge]: https://img.shields.io/travis/com/nejcm/js-algorithms.svg

src/algorithms/cryptography/polynomial-hash/index.ts

@@ -8,27 +8,27 @@ export interface PolynomialHash {
   roll: (prevHash: number, prevWindow: string, newWindow: string) => number;
 }
 
+// get char number value
+function char2Number(char: string): number {
+  let code = char.codePointAt(0) as number;
+  const surrogate = char.codePointAt(1);
+  // surrogate pair
+  if (surrogate !== undefined) {
+    const surrogateShift = 2 ** 16;
+    code += surrogate * surrogateShift;
+  }
+  return code;
+}
+
 const PolynomialHash = ({
   base = 37,
   modulus = 101,
 }: PolynomialHashProps = {}): PolynomialHash => {
-  // get char number value
-  const charToNumber = (char: string): number => {
-    let code = char.codePointAt(0) as number;
-    const surrogate = char.codePointAt(1);
-    // surrogate pair
-    if (surrogate !== undefined) {
-      const surrogateShift = 2 ** 16;
-      code += surrogate * surrogateShift;
-    }
-    return code;
-  };
-
   return {
     // calculate hash for a string
     hash: (window: string) => {
       // all character codes
-      const codes = Array.from(window).map((char) => charToNumber(char));
+      const codes = Array.from(window).map((char) => char2Number(char));
 
       let hash = 0;
       // calculate hash
@@ -43,8 +43,8 @@ const PolynomialHash = ({
     roll(prevHash: number, prevWindow: string, newWindow: string): number {
       let hash = prevHash;
 
-      const prevValue = charToNumber(prevWindow[0]);
-      const newValue = charToNumber(newWindow[newWindow.length - 1]);
+      const prevValue = char2Number(prevWindow[0]);
+      const newValue = char2Number(newWindow[newWindow.length - 1]);
 
       let multiplier = 1;
       for (let i = 1; i < prevWindow.length; i += 1) {

src/algorithms/pattern/Algorithm.ts

@@ -1,6 +1,8 @@
+import {CompareType} from '../../helpers/comparator';
+
 export interface Options {
-  visitingCallback?: (val: string) => void;
-  compareFunction?: (val1: string, val2: string) => boolean;
+  visitingCallback?: (val?: CompareType) => void;
+  compareFunction?: (val1: CompareType, val2: CompareType) => boolean;
   [key: string]: unknown;
 }
 

src/algorithms/pattern/boyer-moore/index.ts

@@ -1,43 +1,32 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable @typescript-eslint/no-unused-vars */
+import {max} from '../../../helpers';
 import algorithm, {Algorithm, AlgorithmProps, Options} from '../Algorithm';
 
-export interface boyerMooreOptions extends Options {
-  chars?: number;
+export interface BoyerMooreOptions extends Options {
+  chars: number;
 }
 
-const boyerMoore = (options?: boyerMooreOptions): Algorithm => {
-  const algoOptions: Options & {chars: number} = {
+const boyerMoore = (options?: Partial<BoyerMooreOptions>): Algorithm => {
+  const algoOptions: BoyerMooreOptions = {
     chars: 256,
     ...options,
   };
 
-  const max = (a: number, b: number): number => (a > b ? a : b);
-
   const buildBadCharHeuristic = (seek: string, m: number): number[] => {
     const badChar = [];
     // initialize all occurrences as -1
-    // Array(algoOptions.chars).fill(-1);
     for (let i = 0; i < algoOptions.chars; i++) badChar.push(-1);
     // fill the actual value of last occurrence of a character
     for (let i = 0; i < m; i++) badChar[seek.charCodeAt(i)] = i;
-
     return badChar;
   };
 
   const search = (text: string, seek: string): number | null => {
-    if (!text || !seek) {
-      return -1;
-    }
-
+    if (!text || !seek) return -1;
     const n = text.length;
     const m = seek.length;
-    if (n === 0 || m === 0 || m > n) {
-      return -1;
-    }
+    if (n === 0 || m === 0 || m > n) return -1;
 
     const badChar = buildBadCharHeuristic(seek, m);
-
     let s = 0;
     while (s <= n - m) {
       let j = m - 1;
@@ -50,7 +39,6 @@ const boyerMoore = (options?: boyerMooreOptions): Algorithm => {
         s += max(1, j - badChar[text.charCodeAt(s + j)]);
       }
     }
-
     return -1;
   };
 

src/algorithms/pattern/knuth-morris-pratt/index.ts

@@ -1,4 +1,3 @@
-import {run} from '../../../helpers';
 import {equalThan} from '../../../helpers/comparator';
 import algorithm, {Algorithm, AlgorithmProps, Options} from '../Algorithm';
 
@@ -26,27 +25,20 @@ const knuthMorrisPratt = (options?: Options): Algorithm => {
         prefixIndex = table[prefixIndex - 1];
       }
     }
-
     return table;
   };
 
   const search = (text: string, seek: string): number | null => {
-    if (!text || !seek) {
-      return -1;
-    }
-
+    if (!text || !seek) return -1;
     const n = text.length;
     const m = seek.length;
-    if (n === 0 || m === 0 || m > n) {
-      return -1;
-    }
+    if (n === 0 || m === 0 || m > n) return -1;
 
     let textIndex = 0;
     let seekIndex = 0;
     const patternTable = buildPatternTable(seek);
-
     while (textIndex < n) {
-      if (run(algoOptions.compareFunction, [text[textIndex], seek[seekIndex]])) {
+      if (algoOptions.compareFunction!(text[textIndex], seek[seekIndex])) {
         if (seekIndex === m - 1) {
           // match found
           return textIndex - m + 1;
@@ -61,7 +53,6 @@ const knuthMorrisPratt = (options?: Options): Algorithm => {
         textIndex++;
       }
     }
-
     return -1;
   };
 

src/algorithms/pattern/naive/index.ts

@@ -1,4 +1,3 @@
-import {run} from '../../../helpers';
 import {equalThan} from '../../../helpers/comparator';
 import algorithm, {Algorithm, AlgorithmProps, Options} from '../Algorithm';
 
@@ -9,23 +8,16 @@ const naiveAlgorithm = (options?: Options): Algorithm => {
   };
 
   const search = (text: string, seek: string): number | null => {
-    if (!text || !seek) {
-      return -1;
-    }
+    if (!text || !seek) return -1;
     const n = text.length;
     const m = seek.length;
-    if (n === 0 || m === 0 || m > n) {
-      return -1;
-    }
+    if (n === 0 || m === 0 || m > n) return -1;
 
     for (let i = 0; i <= n - m; i++) {
       let j;
       for (j = 0; j < m; j++) {
-        if (!run(algoOptions.compareFunction, [text[i + j], seek[j]])) {
-          break;
-        }
+        if (!algoOptions.compareFunction!(text[i + j], seek[j])) break;
       }
-
       if (j === m) {
         // match found
         return i;