feat: support 4-digit semver with j

Author: mrnagydavid

packages/nodejs-lib/src/validation/ajv/j.validations.test.ts

@@ -1255,6 +1255,41 @@ describe('string', () => {
     })
   })
 
+  describe('semVer4', () => {
+    test('should accept string with valid 4-part semver', () => {
+      const testCases = ['0.0.0.0', '1.2.3.4', '10.20.30.40']
+      const schema = j.string().semVer4()
+
+      testCases.forEach(semver => {
+        const [err] = schema.getValidationResult(semver)
+        expect(err, semver).toBeNull()
+      })
+    })
+
+    test('should reject string with invalid 4-part semver', () => {
+      const invalidCases: any[] = [
+        '', // empty
+        '1.2.3', // missing part
+        '1.2', // missing part
+        '1', // missing part
+        '1.2.3.4.5', // extra part
+        '1.2.3.', // trailing dot
+        '^1.2.3.4', // still not
+        'abcd', // text
+        0,
+        true,
+        [],
+        {},
+      ]
+      const schema = j.string().semVer4()
+
+      invalidCases.forEach(semver => {
+        const [err] = schema.getValidationResult(semver)
+        expect(err, String(semver)).not.toBeNull()
+      })
+    })
+  })
+
   describe('languageTag', () => {
     test('should accept string with valid languageTag', () => {
       const testCases = ['hu-HU', 'en-US', 'se-SE', 'se']

packages/nodejs-lib/src/validation/ajv/jSchema.ts

@@ -36,6 +36,7 @@ import {
   IPV4_REGEX,
   IPV6_REGEX,
   LANGUAGE_TAG_REGEX,
+  SEMVER4_REGEX,
   SEMVER_REGEX,
   SLUG_REGEX,
   URL_REGEX,
@@ -831,10 +832,22 @@ export class JString<
     return this.regex(SLUG_REGEX, { msg: 'is not a valid slug format' })
   }
 
+  /**
+   * Validates the 3-part semver format: `major.minor.patch`, e.g `1.2.3`.
+   */
   semVer(): this {
     return this.regex(SEMVER_REGEX, { msg: 'is not a valid semver format' })
   }
 
+  /**
+   * Validates the 4-part version format: `major.minor.patch.build`, e.g `1.2.3.4`.
+   *
+   * Not a semver by the spec, but is used by e.g .NET and some mobile app versions.
+   */
+  semVer4(): this {
+    return this.regex(SEMVER4_REGEX, { msg: 'is not a valid 4-part semver format' })
+  }
+
   languageTag(): this {
     return this.regex(LANGUAGE_TAG_REGEX, { msg: 'is not a valid language format' })
   }

packages/nodejs-lib/src/validation/regexes.ts

@@ -23,6 +23,8 @@ export const IPV6_REGEX =
 export const LANGUAGE_TAG_REGEX = /^[a-z]{2}(-[A-Z]{2})?$/
 export const MAC_ADDRESS_REGEX = /^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/
 export const SEMVER_REGEX = /^[0-9]+\.[0-9]+\.[0-9]+$/
+// 4-part version (major.minor.patch.build)
+export const SEMVER4_REGEX = /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/
 export const SLUG_REGEX = /^[a-z0-9-]+$/
 // URL regex based on `ajv-formats`, but without flags for JSON Schema compatibility.
 // Uses [a-zA-Z] instead of [a-z] with i flag. Simplified to not require unicode flag.