Remzona54/it-tools
1
0
Fork 0
mirror of https://github.com/CorentinTh/it-tools.git synced 2026-10-21 21:31:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(regex-tester): skip non-participating optional groups instead of failing

Browse source
This commit is contained in:
a0666660 2026-10-01 21:09:09 +08:00
parent 9a1d8b10c3
commit 38d4c2d0ef
2 changed files with 33 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

127
src/tools/regex-tester/regex-tester.service.test.ts
View file

@ -1,106 +1,33 @@
import { describe, expect, it } from 'vitest';
import { matchRegex } from './regex-tester.service';
const regexesData = [
{
regex: '',
text: '',
flags: '',
result: [],
},
{
regex: '.*',
text: '',
flags: '',
result: [],
},
{
regex: '',
text: 'aaa',
flags: '',
result: [],
},
{
regex: 'a',
text: 'baaa',
flags: '',
result: [
{
captures: [],
groups: [],
index: 1,
value: 'a',
},
],
},
{
regex: '(.)(?<g>r)',
text: 'azertyr',
flags: 'g',
result: [
{
captures: [
{
end: 3,
name: '1',
start: 2,
value: 'e',
},
{
end: 4,
name: '2',
start: 3,
value: 'r',
},
],
groups: [
{
end: 4,
name: 'g',
start: 3,
value: 'r',
},
],
index: 2,
value: 'er',
},
{
captures: [
{
end: 6,
name: '1',
start: 5,
value: 'y',
},
{
end: 7,
name: '2',
start: 6,
value: 'r',
},
],
groups: [
{
end: 7,
name: 'g',
start: 6,
value: 'r',
},
],
index: 5,
value: 'yr',
},
],
},
];
describe('regex-tester: matchRegex', () => {
it('finds matches with capture groups and indices', () => {
const results = matchRegex('\\s(\\w+):', 'a b: c d:', 'dg');
expect(results).toHaveLength(2);
expect(results[0]?.value).toBe(' b:');
expect(results[0]?.captures[0]?.value).toBe('b');
});
describe('regex-tester', () => {
for (const reg of regexesData) {
const { regex, text, flags, result: expected_result } = reg;
it(`Should matchRegex("${regex}","${text}","${flags}") return correct result`, async () => {
const result = matchRegex(regex, text, `${flags}d`);
it('keeps matching when an optional group does not participate (#1388)', () => {
const regex = '\\s([^\\s\\[]+)(?:\\[(\\d+)\\])?:\\s';
const text = 'Nov 11 21:03:26 abc2 def.sh[1]: \nNov 11 21:03:26 abc2 def.sh: ';
const results = matchRegex(regex, text, 'dg');
expect(results).toHaveLength(2);
// first line: both groups participate
expect(results[0]?.captures.map(capture => capture.value)).toEqual(['def.sh', '1']);
// second line: the optional digits group did not participate
expect(results[1]?.captures.map(capture => capture.value)).toEqual(['def.sh']);
});
expect(result).to.deep.equal(expected_result);
});
}
it('keeps matching named groups that do not participate', () => {
const results = matchRegex('(?<word>\\w+)?x(?<tail>\\d+)', 'x123', 'dg');
expect(results).toHaveLength(1);
expect(results[0]?.groups.map(group => group.name)).toEqual(['tail']);
});
it('stops at the first zero-length match to avoid infinite loops', () => {
const results = matchRegex('a*', 'bbb', 'dg');
expect(results).toHaveLength(0);
});
});

7
src/tools/regex-tester/regex-tester.service.ts
View file

@ -30,7 +30,9 @@ export function matchRegex(regex: string, text: string, flags: string) {
const indices = match.indices;
const captures: Array<GroupCapture> = [];
Object.entries(match).forEach(([captureName, captureValue]) => {
if (captureName !== '0' && captureName.match(/\d+/)) {
// optional groups may not participate: both the captured value and its
// indices entry are then undefined, and must be skipped (#1388)
if (captureName !== '0' && /^\d+$/.test(captureName) && captureValue !== undefined && indices[Number(captureName)]) {
captures.push({
name: captureName,
value: captureValue,
@ -41,6 +43,9 @@ export function matchRegex(regex: string, text: string, flags: string) {
});
const groups: Array<GroupCapture> = [];
Object.entries(match.groups || {}).forEach(([groupName, groupValue]) => {
if (groupValue === undefined || !indices.groups[groupName]) {
return;
}
groups.push({
name: groupName,
value: groupValue,