From 5b470d3c1fa7b5159f6c1b1f2a42422d56f1e698 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Sun, 3 Apr 2022 21:49:36 +0300
Subject: [PATCH] fix(maven): Allow whitespaces after comma in ranges (#14922)
---
lib/modules/versioning/maven/compare.spec.ts | 20 +++++++++++++-------
lib/modules/versioning/maven/compare.ts | 2 +-
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/lib/modules/versioning/maven/compare.spec.ts b/lib/modules/versioning/maven/compare.spec.ts
index 770f3916fc..55b0af3d2b 100644
--- a/lib/modules/versioning/maven/compare.spec.ts
+++ b/lib/modules/versioning/maven/compare.spec.ts
@@ -255,12 +255,16 @@ describe('modules/versioning/maven/compare', () => {
});
test.each`
- input | leftType | leftValue | leftBracket | rightType | rightValue | rightBracket
- ${'[1.0]'} | ${'INCLUDING_POINT'} | ${'1.0'} | ${'['} | ${'INCLUDING_POINT'} | ${'1.0'} | ${']'}
- ${'(,1.0]'} | ${'EXCLUDING_POINT'} | ${null} | ${'('} | ${'INCLUDING_POINT'} | ${'1.0'} | ${']'}
- ${'[1.2,1.3]'} | ${'INCLUDING_POINT'} | ${'1.2'} | ${'['} | ${'INCLUDING_POINT'} | ${'1.3'} | ${']'}
- ${'[1.0,2.0)'} | ${'INCLUDING_POINT'} | ${'1.0'} | ${'['} | ${'EXCLUDING_POINT'} | ${'2.0'} | ${')'}
- ${'[1.5,)'} | ${'INCLUDING_POINT'} | ${'1.5'} | ${'['} | ${'EXCLUDING_POINT'} | ${null} | ${')'}
+ input | leftType | leftValue | leftBracket | rightType | rightValue | rightBracket
+ ${'[1.0]'} | ${'INCLUDING_POINT'} | ${'1.0'} | ${'['} | ${'INCLUDING_POINT'} | ${'1.0'} | ${']'}
+ ${'(,1.0]'} | ${'EXCLUDING_POINT'} | ${null} | ${'('} | ${'INCLUDING_POINT'} | ${'1.0'} | ${']'}
+ ${'(, 1.0]'} | ${'EXCLUDING_POINT'} | ${null} | ${'('} | ${'INCLUDING_POINT'} | ${'1.0'} | ${']'}
+ ${'[1.2,1.3]'} | ${'INCLUDING_POINT'} | ${'1.2'} | ${'['} | ${'INCLUDING_POINT'} | ${'1.3'} | ${']'}
+ ${'[1.2, 1.3]'} | ${'INCLUDING_POINT'} | ${'1.2'} | ${'['} | ${'INCLUDING_POINT'} | ${'1.3'} | ${']'}
+ ${'[1.0,2.0)'} | ${'INCLUDING_POINT'} | ${'1.0'} | ${'['} | ${'EXCLUDING_POINT'} | ${'2.0'} | ${')'}
+ ${'[1.0,2.0)'} | ${'INCLUDING_POINT'} | ${'1.0'} | ${'['} | ${'EXCLUDING_POINT'} | ${'2.0'} | ${')'}
+ ${'[1.5,)'} | ${'INCLUDING_POINT'} | ${'1.5'} | ${'['} | ${'EXCLUDING_POINT'} | ${null} | ${')'}
+ ${'[1.5, )'} | ${'INCLUDING_POINT'} | ${'1.5'} | ${'['} | ${'EXCLUDING_POINT'} | ${null} | ${')'}
`(
'parseRange("$input")',
({
@@ -283,7 +287,9 @@ describe('modules/versioning/maven/compare', () => {
},
];
expect(parseRange(input)).toEqual(parseResult);
- expect(rangeToStr(parseResult as never)).toEqual(input);
+ expect(rangeToStr(parseResult as never)).toEqual(
+ input.replace(/\s*/g, '')
+ );
}
);
diff --git a/lib/modules/versioning/maven/compare.ts b/lib/modules/versioning/maven/compare.ts
index 1bee84063b..b5d54ed21f 100644
--- a/lib/modules/versioning/maven/compare.ts
+++ b/lib/modules/versioning/maven/compare.ts
@@ -313,7 +313,7 @@ function parseRange(rangeStr: string): Range[] | null {
};
}
- const commaSplit = rangeStr.split(',');
+ const commaSplit = rangeStr.split(/\s*,\s*/);
let ranges: Range[] | null = [];
let interval = emptyInterval();
--
GitLab