using native matchAll string function

Alognas2 · Nov 25, 2020 · 7bfed3f · 7bfed3f
1 parent 9c7e6b0
commit 7bfed3f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/packages/foam-core/package.json b/packages/foam-core/package.json
@@ -21,7 +21,6 @@
     "@types/lodash": "^4.14.157",
     "@types/micromatch": "^4.0.1",
     "@types/picomatch": "^2.2.1",
-    "@types/string.prototype.matchall": "^4.0.0",
     "husky": "^4.2.5",
     "tsdx": "^0.13.2",
     "tslib": "^2.0.0",
@@ -37,7 +36,6 @@
     "remark-frontmatter": "^2.0.0",
     "remark-parse": "^8.0.2",
     "remark-wiki-link": "^0.0.4",
-    "string.prototype.matchall": "^4.0.2",
     "title-case": "^3.0.2",
     "unified": "^9.0.0",
     "unist-util-visit": "^2.0.2",

diff --git a/packages/foam-core/src/utils/hashtags.ts b/packages/foam-core/src/utils/hashtags.ts
@@ -1,13 +1,12 @@
 import { isSome, isNumeric } from './core';
-import matchAll from 'string.prototype.matchall';
 
 const HASHTAG_REGEX = /(^|[ ])#([\w_-]+\b)/gm;
 const WORD_REGEX = /(^|[ ])([\w_-]+\b)/gm;
 
 export const extractHashtags = (text: string): Set<string> => {
   return isSome(text)
     ? new Set(
-        Array.from(matchAll(text, HASHTAG_REGEX))
+        Array.from([...text.matchAll(HASHTAG_REGEX)])
           .map(m => m[2].trim())
           .filter(tag => !isNumeric(tag))
       )
@@ -17,6 +16,6 @@ export const extractHashtags = (text: string): Set<string> => {
 export const extractTagsFromProp = (prop: string | string[]): Set<string> => {
   const text = Array.isArray(prop) ? prop.join(' ') : prop;
   return isSome(text)
-    ? new Set(Array.from(matchAll(text, WORD_REGEX)).map(m => m[2].trim()))
+    ? new Set(Array.from(text.matchAll(WORD_REGEX)).map(m => m[2].trim()))
     : new Set();
 };
diff --git a/packages/foam-core/tsconfig.json b/packages/foam-core/tsconfig.json
@@ -20,7 +20,7 @@
     "sourceMap": true,
     "strict": true,
     "lib": [
-      "ES2019"
+      "ES2019", "es2020.string"
     ]
   },
   "include": [

diff --git a/yarn.lock b/yarn.lock
@@ -2842,11 +2842,6 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
-"@types/string.prototype.matchall@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/string.prototype.matchall/-/string.prototype.matchall-4.0.0.tgz#cd00ed3b223d02c8bf978d2866f54fd0e68026cd"
-  integrity sha512-PAspRKHfv4D2TDX4PPHzJ/IxI29ahUyQsTIyFl2/keG+C+mk0Gx3ksYNYRC1AWMmtbbjDeC/LTKOtkEB3ETJOA==
-
 "@types/unist@^2.0.0", "@types/unist@^2.0.2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"