Skip to content

Commit e14cf7d

Browse files
committed
Merge branch 'master' of https://github.com/oslabs-beta/reactime into addingtest
2 parents 39ff5e6 + f00e38b commit e14cf7d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/backend/__tests__/helpers.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe('AST Unit Tests', () => {
7171
expect(getHooksNames(elementType)).toEqual(['testCount', 'setTestCount']);
7272
});
7373

74-
it('Should output the right number of properties when taking in multiple function definitions', () => {
74+
it('Should output the right number of properties when given multiple hooks', () => {
7575
const elementType = `function SingleUseFakeComponent() {
7676
const [testCount, setTestCount] = useState(0);
7777
const [biscuitCount, setBiscuitCount] = useState(0);

src/backend/helpers.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ export const getHooksNames = (elementType: string): Array<string> => {
9191
// * Works for useState hooks
9292
if (hook.id.type === 'ArrayPattern') {
9393
hook.id.elements.forEach((hook) => {
94+
statements.push(`_useWildcard${tsCount}`);
9495
statements.push(hook.name);
95-
// * Unshift a wildcard name to achieve similar functionality as before
96-
statements.unshift(`_useWildcard${tsCount}`);
9796
tsCount += 1;
9897
});
9998
} else {
@@ -111,7 +110,7 @@ export const getHooksNames = (elementType: string): Array<string> => {
111110
}
112111
});
113112
statements.forEach((el, i) => {
114-
if (el.match(/_use/)) hooksNames[el] = statements[i + 2];
113+
if (el.match(/_use/)) hooksNames[el] = statements[i + 1];
115114
});
116115
});
117116
}

0 commit comments

Comments
 (0)