Skip to content

feat: add Typescript function regex support #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
a2937 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: add Typescript function regex support #563

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7abfb66
feat: add Typescript function support
a2937 Feb 5, 2026
82d1952
potentially better regex?
a2937 Feb 6, 2026
bbe984c
remove log
a2937 Feb 6, 2026
b74c4c4
more tests
a2937 Feb 8, 2026
8e436c9
separate function
a2937 Feb 9, 2026
15d1ba5
fix function use
a2937 Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/helpers/lib/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,17 @@ export function functionRegex(

const normalFunctionName = funcName ? "\\s" + escapeRegExp(funcName) : "";
const arrowFunctionName = funcName
? `(let|const|var)?\\s?${escapeRegExp(funcName)}\\s*=\\s*`
? `(let|const|var)?\\s?${escapeRegExp(funcName)}\\s*.*=\\s*`
: "";
const body = "[^}]*";

const funcREHead = `function\\s*${normalFunctionName}\\s*\\(\\s*${params}\\s*\\)\\s*\\{`;
const funcREHead = `function\\s*${normalFunctionName}\\s*\\(\\s*${params}\\s*\\)\\s*[\\w\\W]*\\{`;
const funcREBody = `${body}\\}`;
const funcRegEx = includeBody
? `${funcREHead}${funcREBody}`
: `${funcREHead}`;

const arrowFuncREHead = `${arrowFunctionName}\\(?\\s*${params}\\s*\\)?\\s*=>\\s*\\{?`;
const arrowFuncREHead = `${arrowFunctionName}\\(?\\s*${params}\\s*\\)?\\s*[\\w\\W]*=>\\s*\\{?`;
const arrowFuncREBody = `${body}\\}?`;
const arrowFuncRegEx = includeBody
? `${arrowFuncREHead}${arrowFuncREBody}`
Expand All @@ -268,7 +268,7 @@ export function functionRegex(
const anonymousFunctionName = funcName
? `(let|const|var)?\\s?${escapeRegExp(funcName)}\\s*=\\s*function\\s*`
: "";
const anonymousFuncREHead = `${anonymousFunctionName}\\(\\s*${params}\\s*\\)\\s*\\{`;
const anonymousFuncREHead = `${anonymousFunctionName}\\(\\s*${params}\\s*\\)\\s*[\\w\\W]*\\{`;
const anonymousFuncRegEx = includeBody
? `${anonymousFuncREHead}${funcREBody}`
: `${anonymousFuncREHead}`;
Expand Down
11 changes: 11 additions & 0 deletions packages/tests/curriculum-helper.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,17 @@ describe("functionRegex", () => {
expect(regEx.test("function myFunc(arg1, arg3){}")).toBe(false);
});

it("matches a named function that uses Typescript types", () => {
const funcName = "myFunc";
const regEx = functionRegex(funcName, [
"arg1\\s*:\\s*string",
"arg2\\s*:\\s*string",
]);
expect(
regEx.test("function myFunc(arg1 : string, arg2 : string) : string{}"),
).toBe(true);
});

it("matches arrow functions", () => {
const funcName = "myFunc";
const regEx = functionRegex(funcName, ["arg1", "arg2"]);
Expand Down