Skip to content

fix: Ensure that getShortType regex wildcard is non-greedy #135

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

Merged
merged 2 commits into from
Aug 7, 2024
Merged

fix: Ensure that getShortType regex wildcard is non-greedy #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97719b3
fix: test that illustrates the bug I've encountered and fails
collink Aug 1, 2024
4241657
fix: ensure that getShortType regex isn't greedy
collink Aug 1, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/common.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export function extractPropertiesFromObjectParam(param: ParameterDeclaration) {
* TODO: Replace with a more robust solution.
*/
export function getShortType(type: string) {
return type.replaceAll(/import\(".*"\)\./g, "");
return type.replaceAll(/import\(".*?"\)\./g, "");
}

export function getClassesFromService(node: SourceFile) {
Expand Down
9 changes: 9 additions & 0 deletions tests/common.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ describe("common", () => {
const result = getShortType(type);
expect(result).toBe("MyType");
});

test("json", () => {
const type =
'{ import1?: import("/path/to/import1").Import1; import2: import("/path/to/import2").Import2; import3: import("/path/to/import3").Import3; }';
const result = getShortType(type);
expect(result).toBe(
"{ import1?: Import1; import2: Import2; import3: Import3; }",
);
});
});

test("formatOptions - converts string boolean to boolean (false)", () => {
Expand Down