-
Notifications
You must be signed in to change notification settings - Fork 0
feat: parser result modifier #9
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.
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
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
da6b182
feat: add resultModifier flow on `Parser` blueprint
codeismyid 1ff38c5
feat: implement resultModifier logic on `defaultParser`
codeismyid d9593ea
test: add resultModifier test case
codeismyid 63b08f1
fix: inefficient regex from codeql scan
codeismyid 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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,69 @@ | ||
| import { Parser } from 'src/blueprints/Parser'; | ||
| import { type ParseResult, Parser } from 'src/blueprints/Parser'; | ||
|
|
||
| const KEYS = [ | ||
| 'file', | ||
| 'line', | ||
| 'column', | ||
| 'errorCode', | ||
| 'message', | ||
| 'source', | ||
| 'sourceClean' | ||
| ] as const; | ||
|
|
||
| /** | ||
| * Default `Parser` instance. | ||
| */ | ||
| export const defaultParser = new Parser( | ||
| /^(?:(?:(.*?)[:(](\d+)[:,](\d+)[)]? ?[:-] ?)|(?:error ?))(?:error ?)?(TS\d+)?(?:(?:: )|(?: - )|(?: ))(.*(?:\r?\n {2,}.*)*)(?:(?:\r?\n){2,}(\d+\s+(.*)\r?\n\s+~+))?$/gm, | ||
| [ | ||
| 'file', | ||
| 'line', | ||
| 'column', | ||
| 'errorCode', | ||
| 'message', | ||
| 'source', | ||
| 'sourceClean' | ||
| ] as const, | ||
| /^(?:(?:(.*?)[:(](\d+)[:,](\d+)[)]? ?[:-] ?)|(?:error ?))(?:error ?)?(TS\d+)?(?:(?:: )|(?: - )|(?: ))(.*(?:\r?\n {2,}.*)*)(?:(?:\r?\n){2,}((?:\d+\s+.*\r?\n\s+~+(?:\r?\n)?)*))?$/gm, | ||
| KEYS, | ||
| (input) => { | ||
| // biome-ignore lint/suspicious/noControlCharactersInRegex: needed for removing colored text | ||
| return input.replaceAll(/\x1b\[[0-9;]*m/g, ''); | ||
| }, | ||
| (result) => { | ||
| result._match = result._match.trimEnd(); | ||
|
|
||
| if (result.source) { | ||
| result.source = result.source.trim(); | ||
|
|
||
| const matches = Array.from( | ||
| result.source.trim().matchAll(/^(?:\d+)(\s.*)$/gm) | ||
| ); | ||
|
|
||
| let minIndent: number; | ||
|
|
||
| const codeLines = matches.reduce<string[]>((acc, curr) => { | ||
| if (curr?.[1]) { | ||
| const indentLength = (curr[1].match(/^(\s+).*$/)?.[1] || '').length; | ||
| if (minIndent === undefined) { | ||
| minIndent = indentLength; | ||
| } else { | ||
| minIndent = indentLength < minIndent ? indentLength : minIndent; | ||
| } | ||
| acc.push(curr[1]); | ||
| } | ||
| return acc; | ||
| }, []); | ||
|
|
||
| if (codeLines.length > 0) { | ||
| result.sourceClean = codeLines.reduce((acc, curr, currIndex) => { | ||
| let res = acc; | ||
| res += curr.slice(minIndent); | ||
|
|
||
| if (currIndex !== codeLines.length - 1) { | ||
| res += '\n'; | ||
| } | ||
|
|
||
| return res; | ||
| }, ''); | ||
| } | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
| ); | ||
|
|
||
| /** | ||
| * Default `Parser` result type. | ||
| */ | ||
| export type DefaultParserResult = ParseResult<typeof KEYS>; | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.