Skip to content

Commit e719d34

Browse files
committed
fix(utils): [findRequires] array item extraction
Signed-off-by: Lexus Drumgold <unicornware@flexdevelopment.llc>
1 parent e12e977 commit e719d34

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

src/utils/__snapshots__/find-requires.snap

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ exports[`unit:utils/findRequires > should return RequireStatement object array 1
7474
"start": 147,
7575
"syntax": "require",
7676
},
77+
{
78+
"code": "require(\\"./arr\\")",
79+
"end": 214,
80+
"imports": [],
81+
"kind": "require",
82+
"specifier": "./arr",
83+
"specifier_kind": "relative",
84+
"specifier_syntax": "static",
85+
"start": 198,
86+
"syntax": "require",
87+
},
7788
{
7889
"code": "const {
7990
default: myDefault,
@@ -86,7 +97,7 @@ exports[`unit:utils/findRequires > should return RequireStatement object array 1
8697
squareThree,
8798
squareTwo
8899
} = require('./lib')",
89-
"end": 327,
100+
"end": 358,
90101
"imports": [
91102
"default: myDefault",
92103
"addFive",
@@ -102,7 +113,7 @@ exports[`unit:utils/findRequires > should return RequireStatement object array 1
102113
"specifier": "./lib",
103114
"specifier_kind": "relative",
104115
"specifier_syntax": "static",
105-
"start": 185,
116+
"start": 216,
106117
"syntax": "require",
107118
},
108119
]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ describe('unit:utils/findRequires', () => {
1515
const mod = require('lib');
1616
require(id)
1717
require('#src/utils/resolve-aliases')
18+
const arr = [require("./arr")]
1819
const {
1920
default: myDefault,
2021
addFive,
@@ -32,7 +33,7 @@ describe('unit:utils/findRequires', () => {
3233
const results = testSubject(code)
3334

3435
// Expect
35-
expect(results).to.be.an('array').of.length(7)
36+
expect(results).to.be.an('array').of.length(8)
3637
expect(results).toMatchSnapshot()
3738
})
3839

src/utils/find-requires.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const findRequires = (code: string = ''): RequireStatement[] => {
3333
* @const {RegExp} REQUIRE_REGEX
3434
*/
3535
const REQUIRE_REGEX: RegExp =
36-
/(?<=^|[\s;])\b(?:(?: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]+?["']?)\)(?=;?\n?))(?<!(?:\/\/|\*).*)/gu
36+
/(?<=^|[\s;[])\b(?:(?: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]+?["']?)\)(?=;?\n?))(?<!(?:\/\/|\*).*)/gu
3737

3838
return [...code.matchAll(REQUIRE_REGEX)].map(match => {
3939
const { 0: code = '', index: start = 0, groups = {} } = match

0 commit comments

Comments
 (0)