fix(utils): [findRequires] parameter extraction

Signed-off-by: Lexus Drumgold <[email protected]>

Author: unicornware

src/utils/__snapshots__/find-requires.snap

@@ -85,26 +85,59 @@ exports[`unit:utils/findRequires > should return RequireStatement object array 1
     "start": 198,
     "syntax": "require",
   },
+  {
+    "code": "require(\\"./config\\")",
+    "end": 258,
+    "imports": [],
+    "kind": "require",
+    "specifier": "./config",
+    "specifier_kind": "relative",
+    "specifier_syntax": "static",
+    "start": 239,
+    "syntax": "require",
+  },
+  {
+    "code": "require(\\"./defaults\\")",
+    "end": 314,
+    "imports": [],
+    "kind": "require",
+    "specifier": "./defaults",
+    "specifier_kind": "relative",
+    "specifier_syntax": "static",
+    "start": 293,
+    "syntax": "require",
+  },
+  {
+    "code": "require(\\"./conf\\")",
+    "end": 332,
+    "imports": [],
+    "kind": "require",
+    "specifier": "./conf",
+    "specifier_kind": "relative",
+    "specifier_syntax": "static",
+    "start": 315,
+    "syntax": "require",
+  },
   {
     "code": "require(\\"./data\\")",
-    "end": 256,
+    "end": 374,
     "imports": [],
     "kind": "require",
     "specifier": "./data",
     "specifier_kind": "relative",
     "specifier_syntax": "static",
-    "start": 239,
+    "start": 357,
     "syntax": "require",
   },
   {
     "code": "require(\\"./parser-options\\")",
-    "end": 310,
+    "end": 428,
     "imports": [],
     "kind": "require",
     "specifier": "./parser-options",
     "specifier_kind": "relative",
     "specifier_syntax": "static",
-    "start": 283,
+    "start": 401,
     "syntax": "require",
   },
   {
@@ -119,7 +152,7 @@ exports[`unit:utils/findRequires > should return RequireStatement object array 1
 	squareThree,
 	squareTwo
 } = require('./lib')",
-    "end": 454,
+    "end": 572,
     "imports": [
       "default: myDefault",
       "addFive",
@@ -135,7 +168,7 @@ exports[`unit:utils/findRequires > should return RequireStatement object array 1
     "specifier": "./lib",
     "specifier_kind": "relative",
     "specifier_syntax": "static",
-    "start": 312,
+    "start": 430,
     "syntax": "require",
   },
 ]

src/utils/__tests__/find-requires.spec.ts

@@ -16,6 +16,8 @@ describe('unit:utils/findRequires', () => {
       require(id)
       require('#src/utils/resolve-aliases')
       const arr = [require("./arr")]
+      const config = __toESM(require("./config"), 1)
+      const config_extend = __toESM(require("./defaults"),require("./conf"))
       const data = { config: require("./data") }
       const options = {parser:require("./parser-options")}
       const {
@@ -35,7 +37,7 @@ describe('unit:utils/findRequires', () => {
     const results = testSubject(code)
 
     // Expect
-    expect(results).to.be.an('array').of.length(10)
+    expect(results).to.be.an('array').of.length(13)
     expect(results).toMatchSnapshot()
   })
 

src/utils/find-requires.ts

@@ -33,7 +33,7 @@ const findRequires = (code: string = ''): RequireStatement[] => {
    * @const {RegExp} REQUIRE_REGEX
    */
   const REQUIRE_REGEX: RegExp =
-    /(?<=^|[\s:;[])\b(?:(?:const\s*|let\s*|var\s*)?(?:(?<=(?:const\s*|let\s*|var\s*))(?<imports>(?:[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*)|(?:[\w\t\n\r "$'*,./:{}-]+?)))?\s*=?\s*(?<kind>require)\((?<specifier>["']?[\S\t\n\r]+?["']?)\))(?<!(?:\/\/|\*).*)/gu
+    /(?<=^|[\s,:;([])\b(?:(?:const\s*|let\s*|var\s*)?(?:(?<=(?:const\s*|let\s*|var\s*))(?<imports>(?:[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*)|(?:[\w\t\n\r "$'*,./:{}-]+?)))?\s*=?\s*(?<kind>require)\((?<specifier>["']?[\S\t\n\r]+?["']?)\))(?<!(?:\/\/|\*).*)/gu
 
   return [...code.matchAll(REQUIRE_REGEX)].map(match => {
     const { 0: code = '', index: start = 0, groups = {} } = match