fix(regex): [static] allow spaces after semicolons

- https://regex101.com/r/wlYQUN/31 Signed-off-by: Lexus Drumgold <unicornware@flexdevelopment.llc>
flex-development · Mar 2, 2023 · c23a1c5 · c23a1c5
1 parent 1a5db78
commit c23a1c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/__tests__/ts/v4/tsconfig.json b/__tests__/ts/v4/tsconfig.json
@@ -30,7 +30,8 @@
     "outDir": "../../../dist",
     "paths": {
       "#src": ["src/index"],
-      "#src/*": ["src/*"]
+      "#src/*": ["src/*"],
+      "#tests/*": ["__tests__/*"]
     },
     "preserveConstEnums": true,
     "preserveSymlinks": false,

diff --git a/src/import-static.ts b/src/import-static.ts
@@ -112,6 +112,6 @@
  * @const {RegExp} STATIC_IMPORT_REGEX
  */
 const STATIC_IMPORT_REGEX: RegExp =
-  /(?<=^|[\n;]|\n[\t ]+)import\s*(?<type>type(?=\s+))?(?:[\s"']*(?<imports>[\w\t\n\r "$'*,/{}-]+?)\s+from\s*)?["']\s*(?<specifier>(?:(?<='\s*)[^']*[^\s'](?=\s*'))|(?:(?<="\s*)[^"]*[^\s"](?=\s*")))\s*["'](?:\s+assert\s+(?<assertion>{[\w\t\n\r "':]+?}))?(?=[\s;]*)/g
+  /(?<=^|[\n;](?:[\t ]*(?:\w+ )?)?)import\s*(?<type>type(?=\s+))?(?:[\s"']*(?<imports>[\w\t\n\r "$'*,/{}-]+?)\s+from\s*)?["']\s*(?<specifier>(?:(?<='\s*)[^']*[^\s'](?=\s*'))|(?:(?<="\s*)[^"]*[^\s"](?=\s*")))\s*["'](?:\s+assert\s+(?<assertion>{[\w\t\n\r "':]+?}))?(?=[\s;]*)/g
 
 export default STATIC_IMPORT_REGEX