Allow ffversion without pre-release part

FACT-Finder · Oct 15, 2020 · 39e94a3 · 39e94a3
1 parent 8f8b747
commit 39e94a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/snage/src/note/convert.test.ts b/packages/snage/src/note/convert.test.ts
@@ -48,11 +48,12 @@ describe('decode', () => {
     });
     test('ffversion', () => {
         const field: Field = {name: 'version', type: 'ffversion'};
-        expect(extractLeft(decodeValue(field, '1.1.0'))).toMatchInlineSnapshot(`
+        expect(extractLeft(decodeValue(field, '1.1'))).toMatchInlineSnapshot(`
             Array [
-              "invalid value \\"1.1.0\\", expected ffversion(marketing.major.minor-patch)",
+              "invalid value \\"1.1\\", expected ffversion(marketing.major.minor[-patch])",
             ]
         `);
+        expect(extractRight(decodeValue(field, '1.1.0'))).toMatchInlineSnapshot(`"1.1.0"`);
         expect(extractRight(decodeValue(field, '1.1.0-53'))).toMatchInlineSnapshot(`"1.1.0-53"`);
     });
     test('string', () => {

diff --git a/packages/snage/src/note/convert.ts b/packages/snage/src/note/convert.ts
@@ -137,7 +137,7 @@ const dateType = new t.Type<LocalDate, string, unknown>(
 );
 
 const ffversionType = new t.Type<string, string, unknown>(
-    'ffversion(marketing.major.minor-patch)',
+    'ffversion(marketing.major.minor[-patch])',
     (u): u is string => typeof u === 'string',
     (u, c) =>
         E.either.chain(t.string.validate(u, c), (s) =>

diff --git a/packages/snage/src/util/util.ts b/packages/snage/src/util/util.ts
@@ -2,4 +2,4 @@ export const expectNever = (value: never): never => {
     throw new Error('expected never but got ' + value);
 };
 export const ffVersionRegex = /(\d+)\.?(\d+)?\.?(\d+)?-?(\d+|SNAPSHOT)?/;
-export const requiredFFVersionRegex = /(\d+)\.(\d+)\.(\d+)-(\d+|SNAPSHOT)/;
+export const requiredFFVersionRegex = /(\d+)\.(\d+)\.(\d+)-?(\d+|SNAPSHOT)?/;