@naturalcycles/nodejs-lib 15.50.0 → 15.51.0

package/dist/validation/ajv/getAjv.js

@@ -220,23 +220,42 @@ export function createAjv(opt) {
     ajv.addKeyword({
         keyword: 'email',
         type: 'string',
-        modifying: false,
+        modifying: true,
         errors: true,
         schemaType: 'object',
         validate: function validate(opt, data, _schema, ctx) {
             const { checkTLD } = opt;
-            if (!checkTLD)
-                return true;
-            const tld = _substringAfterLast(data, '.');
-            if (validTLDs.has(tld))
-                return true;
-            validate.errors = [
-                {
-                    instancePath: ctx?.instancePath ?? '',
-                    message: `has an invalid TLD`,
-                },
-            ];
-            return false;
+            const cleanData = data.trim();
+            // from `ajv-formats`
+            const EMAIL_REGEX = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
+            const result = cleanData.match(EMAIL_REGEX);
+            if (!result) {
+                ;
+                validate.errors = [
+                    {
+                        instancePath: ctx?.instancePath ?? '',
+                        message: `is not a valid email address`,
+                    },
+                ];
+                return false;
+            }
+            if (checkTLD) {
+                const tld = _substringAfterLast(cleanData, '.');
+                if (!validTLDs.has(tld)) {
+                    ;
+                    validate.errors = [
+                        {
+                            instancePath: ctx?.instancePath ?? '',
+                            message: `has an invalid TLD`,
+                        },
+                    ];
+                    return false;
+                }
+            }
+            if (ctx?.parentData && ctx.parentDataProperty) {
+                ctx.parentData[ctx.parentDataProperty] = cleanData;
+            }
+            return true;
         },
     });
     ajv.addKeyword({

package/dist/validation/ajv/jsonSchemaBuilder.d.ts

@@ -97,7 +97,6 @@ export declare class JsonSchemaStringBuilder<IN extends string = string, OUT = I
     url(): this;
     ipv4(): this;
     ipv6(): this;
-    id(): this;
     slug(): this;
     semVer(): this;
     languageTag(): this;
@@ -110,6 +109,7 @@ export declare class JsonSchemaStringBuilder<IN extends string = string, OUT = I
      * because this call effectively starts a new schema chain as an `enum` validation.
      */
     ianaTimezone(): JsonSchemaEnumBuilder<string | IANATimezone, IANATimezone, false>;
+    base64Url(): this;
 }
 export interface JsonSchemaStringEmailOptions {
     checkTLD: boolean;

package/dist/validation/ajv/jsonSchemaBuilder.js

@@ -5,6 +5,7 @@ import { _uniq } from '@naturalcycles/js-lib/array';
 import { _assert } from '@naturalcycles/js-lib/error';
 import { _deepCopy, _sortObject } from '@naturalcycles/js-lib/object';
 import { _objectAssign, JWT_REGEX, } from '@naturalcycles/js-lib/types';
+import { BASE64URL_REGEX, COUNTRY_CODE_REGEX, CURRENCY_REGEX, IPV4_REGEX, IPV6_REGEX, LANGUAGE_TAG_REGEX, SEMVER_REGEX, SLUG_REGEX, } from '../regexes.js';
 import { TIMEZONES } from '../timezones.js';
 import { isEveryItemNumber, isEveryItemString, JSON_SCHEMA_ORDER, mergeJsonSchemaObjects, } from './jsonSchemaBuilder.util.js';
 export const j = {
@@ -217,9 +218,7 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
     email(opt) {
         const defaultOptions = { checkTLD: true };
         _objectAssign(this.schema, { email: { ...defaultOptions, ...opt } });
-        // from `ajv-formats`
-        const regex = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
-        return this.regex(regex, { msg: 'is not a valid email address' }).trim().toLowerCase();
+        return this.trim().toLowerCase();
     }
     trim() {
         _objectAssign(this.schema, { transform: { ...this.schema.transform, trim: true } });
@@ -267,39 +266,25 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
         return this.regex(regex, { msg: 'is not a valid URL format' });
     }
     ipv4() {
-        // from `ajv-formats`
-        const regex = /^(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/;
-        return this.regex(regex, { msg: 'is not a valid IPv4 format' });
+        return this.regex(IPV4_REGEX, { msg: 'is not a valid IPv4 format' });
     }
     ipv6() {
-        // from `ajv-formats`
-        const regex = /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i;
-        return this.regex(regex, { msg: 'is not a valid IPv6 format' });
-    }
-    id() {
-        const regex = /^[a-z0-9_]{6,64}$/;
-        return this.regex(regex, { msg: 'is not a valid ID format' });
+        return this.regex(IPV6_REGEX, { msg: 'is not a valid IPv6 format' });
     }
     slug() {
-        const regex = /^[a-z0-9-]+$/;
-        return this.regex(regex, { msg: 'is not a valid slug format' });
+        return this.regex(SLUG_REGEX, { msg: 'is not a valid slug format' });
     }
     semVer() {
-        const regex = /^[0-9]+\.[0-9]+\.[0-9]+$/;
-        return this.regex(regex, { msg: 'is not a valid semver format' });
+        return this.regex(SEMVER_REGEX, { msg: 'is not a valid semver format' });
     }
     languageTag() {
-        // IETF language tag (https://en.wikipedia.org/wiki/IETF_language_tag)
-        const regex = /^[a-z]{2}(-[A-Z]{2})?$/;
-        return this.regex(regex, { msg: 'is not a valid language format' });
+        return this.regex(LANGUAGE_TAG_REGEX, { msg: 'is not a valid language format' });
     }
     countryCode() {
-        const regex = /^[A-Z]{2}$/;
-        return this.regex(regex, { msg: 'is not a valid country code format' });
+        return this.regex(COUNTRY_CODE_REGEX, { msg: 'is not a valid country code format' });
     }
     currency() {
-        const regex = /^[A-Z]{3}$/;
-        return this.regex(regex, { msg: 'is not a valid currency format' });
+        return this.regex(CURRENCY_REGEX, { msg: 'is not a valid currency format' });
     }
     /**
      * Validates that the input is a valid IANATimzone value.
@@ -311,6 +296,11 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
         // UTC is added to assist unit-testing, which uses UTC by default (not technically a valid Iana timezone identifier)
         return j.enum(TIMEZONES, { msg: 'is an invalid IANA timezone' }).branded();
     }
+    base64Url() {
+        return this.regex(BASE64URL_REGEX, {
+            msg: 'contains characters not allowed in Base64 URL characterset',
+        });
+    }
 }
 export class JsonSchemaIsoDateBuilder extends JsonSchemaAnyBuilder {
     constructor() {

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -1,4 +1,4 @@
-import type { AnyObject, BaseDBEntity, IANATimezone, IsoDate, IsoDateTime, NumberEnum, StringEnum, StringMap, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
+import { type AnyObject, type BaseDBEntity, type IANATimezone, type IsoDate, type IsoDateTime, type NumberEnum, type StringEnum, type StringMap, type UnixTimestamp, type UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 import type { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi';
 import type { NumberSchema } from './number.extensions.js';
 import type { StringSchema } from './string.extensions.js';
@@ -41,13 +41,9 @@ export declare function objectSchema<T extends AnyObject>(schema: {
 export declare function stringMapSchema<T>(key: AnySchema, value: AnySchema<T>): ObjectSchema<StringMap<T>>;
 export declare function oneOfSchema<T = any>(...schemas: AnySchema[]): AlternativesSchema<T>;
 export declare const anySchema: AnySchema<any>;
-export declare const BASE62_REGEX: RegExp;
-export declare const BASE64_REGEX: RegExp;
-export declare const BASE64URL_REGEX: RegExp;
 export declare const base62Schema: StringSchema<string>;
 export declare const base64Schema: StringSchema<string>;
 export declare const base64UrlSchema: StringSchema<string>;
-export declare const JWT_REGEX: RegExp;
 export declare const jwtSchema: StringSchema<string>;
 /**
  * [a-zA-Z0-9_]*
@@ -57,10 +53,6 @@ export declare const idSchema: StringSchema<string>;
 export declare const idBase62Schema: StringSchema<string>;
 export declare const idBase64Schema: StringSchema<string>;
 export declare const idBase64UrlSchema: StringSchema<string>;
-/**
- * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
- */
-export declare const SLUG_REGEX: RegExp;
 /**
  * "Slug" - a valid URL, filename, etc.
  */
@@ -89,7 +81,6 @@ export declare const emailSchema: StringSchema<string>;
 /**
  * Pattern is simplified for our use, it's not a canonical SemVer.
  */
-export declare const SEM_VER_REGEX: RegExp;
 export declare const semVerSchema: StringSchema<string>;
 export declare const userAgentSchema: StringSchema<string>;
 export declare const utcOffsetSchema: NumberSchema<number>;

package/dist/validation/joi/joi.shared.schemas.js

@@ -1,4 +1,6 @@
 import { _numberEnumKeys, _numberEnumValues, _stringEnumKeys, _stringEnumValues, } from '@naturalcycles/js-lib';
+import { JWT_REGEX, } from '@naturalcycles/js-lib/types';
+import { BASE62_REGEX, BASE64_REGEX, BASE64URL_REGEX, ID_REGEX, MAC_ADDRESS_REGEX, SEMVER_REGEX, SLUG_REGEX, } from '../regexes.js';
 import { Joi } from './joi.extensions.js';
 export const booleanSchema = Joi.boolean();
 export const booleanDefaultToFalseSchema = Joi.boolean().default(false);
@@ -52,27 +54,19 @@ export function oneOfSchema(...schemas) {
     return Joi.alternatives(schemas);
 }
 export const anySchema = Joi.any();
-export const BASE62_REGEX = /^[a-zA-Z0-9]+$/;
-export const BASE64_REGEX = /^[a-zA-Z0-9+/]+={0,2}$/;
-export const BASE64URL_REGEX = /^[a-zA-Z0-9_-]+$/;
 export const base62Schema = stringSchema.regex(BASE62_REGEX);
 export const base64Schema = stringSchema.regex(BASE64_REGEX);
 export const base64UrlSchema = stringSchema.regex(BASE64URL_REGEX);
-export const JWT_REGEX = /^[\w-]+\.[\w-]+\.[\w-]+$/;
 export const jwtSchema = stringSchema.regex(JWT_REGEX);
 // 1g498efj5sder3324zer
 /**
  * [a-zA-Z0-9_]*
  * 6-64 length
  */
-export const idSchema = stringSchema.regex(/^[a-zA-Z0-9_]{6,64}$/);
+export const idSchema = stringSchema.regex(ID_REGEX);
 export const idBase62Schema = base62Schema.min(8).max(64);
 export const idBase64Schema = base64Schema.min(8).max(64);
 export const idBase64UrlSchema = base64UrlSchema.min(8).max(64);
-/**
- * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
- */
-export const SLUG_REGEX = /^[a-z0-9-]*$/;
 /**
  * "Slug" - a valid URL, filename, etc.
  */
@@ -116,8 +110,7 @@ export const emailSchema = stringSchema.email().lowercase();
 /**
  * Pattern is simplified for our use, it's not a canonical SemVer.
  */
-export const SEM_VER_REGEX = /^[0-9]+\.[0-9]+\.[0-9]+$/;
-export const semVerSchema = stringSchema.regex(SEM_VER_REGEX);
+export const semVerSchema = stringSchema.regex(SEMVER_REGEX);
 // todo: .error(() => 'should be SemVer')
 export const userAgentSchema = stringSchema
     .min(5) // I've seen UA of `Android` (7 characters)
@@ -138,5 +131,5 @@ export const baseDBEntitySchema = objectSchema({
     created: unixTimestamp2000Schema.optional(),
     updated: unixTimestamp2000Schema.optional(),
 });
-export const macAddressSchema = stringSchema.regex(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/);
+export const macAddressSchema = stringSchema.regex(MAC_ADDRESS_REGEX);
 export const uuidSchema = stringSchema.uuid();

package/dist/validation/regexes.d.ts

@@ -0,0 +1,19 @@
+export declare const BASE62_REGEX: RegExp;
+export declare const BASE64_REGEX: RegExp;
+export declare const BASE64URL_REGEX: RegExp;
+export declare const COUNTRY_CODE_REGEX: RegExp;
+export declare const CURRENCY_REGEX: RegExp;
+/**
+ * @deprecated
+ * Avoid using blanket regex for a concept so ambiguous as "ID".
+ * We should always define what kind of an ID we talk about: MongoDB ID, Base64 ID etc.
+ *
+ * We keep this regex here, because JOI shared schemas has been exporting this check.
+ */
+export declare const ID_REGEX: RegExp;
+export declare const IPV4_REGEX: RegExp;
+export declare const IPV6_REGEX: RegExp;
+export declare const LANGUAGE_TAG_REGEX: RegExp;
+export declare const MAC_ADDRESS_REGEX: RegExp;
+export declare const SEMVER_REGEX: RegExp;
+export declare const SLUG_REGEX: RegExp;

package/dist/validation/regexes.js

@@ -0,0 +1,23 @@
+export const BASE62_REGEX = /^[a-zA-Z0-9]+$/;
+export const BASE64_REGEX = /^[a-zA-Z0-9+/]+={0,2}$/;
+export const BASE64URL_REGEX = /^[a-zA-Z0-9_-]+$/;
+export const COUNTRY_CODE_REGEX = /^[A-Z]{2}$/;
+export const CURRENCY_REGEX = /^[A-Z]{3}$/;
+/**
+ * @deprecated
+ * Avoid using blanket regex for a concept so ambiguous as "ID".
+ * We should always define what kind of an ID we talk about: MongoDB ID, Base64 ID etc.
+ *
+ * We keep this regex here, because JOI shared schemas has been exporting this check.
+ */
+export const ID_REGEX = /^[a-zA-Z0-9_]{6,64}$/;
+export const IPV4_REGEX = 
+// from `ajv-formats`
+/^(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/;
+// from `ajv-formats`
+export const IPV6_REGEX = /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i;
+// IETF language tag (https://en.wikipedia.org/wiki/IETF_language_tag)
+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]+$/;
+export const SLUG_REGEX = /^[a-z0-9-]+$/;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.50.0",
+  "version": "15.51.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",

package/src/validation/ajv/ajvSchema.ts

@@ -73,7 +73,7 @@ export class AjvSchema<IN = unknown, OUT = IN> {
     let jsonSchema: JsonSchema<IN, OUT>
 
     if (AjvSchema.isJsonSchemaBuilder(schema)) {
-      jsonSchema = schema.build()
+      jsonSchema = (schema as JsonSchemaTerminal<IN, OUT, any>).build()
       AjvSchema.requireValidJsonSchema(jsonSchema)
     } else {
       jsonSchema = schema

package/src/validation/ajv/getAjv.ts

@@ -244,22 +244,46 @@ export function createAjv(opt?: Options): Ajv {
   ajv.addKeyword({
     keyword: 'email',
     type: 'string',
-    modifying: false,
+    modifying: true,
     errors: true,
     schemaType: 'object',
     validate: function validate(opt: JsonSchemaStringEmailOptions, data: string, _schema, ctx) {
       const { checkTLD } = opt
-      if (!checkTLD) return true
+      const cleanData = data.trim()
 
-      const tld = _substringAfterLast(data, '.')
-      if (validTLDs.has(tld)) return true
-      ;(validate as any).errors = [
-        {
-          instancePath: ctx?.instancePath ?? '',
-          message: `has an invalid TLD`,
-        },
-      ]
-      return false
+      // from `ajv-formats`
+      const EMAIL_REGEX =
+        /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i
+      const result = cleanData.match(EMAIL_REGEX)
+
+      if (!result) {
+        ;(validate as any).errors = [
+          {
+            instancePath: ctx?.instancePath ?? '',
+            message: `is not a valid email address`,
+          },
+        ]
+        return false
+      }
+
+      if (checkTLD) {
+        const tld = _substringAfterLast(cleanData, '.')
+        if (!validTLDs.has(tld)) {
+          ;(validate as any).errors = [
+            {
+              instancePath: ctx?.instancePath ?? '',
+              message: `has an invalid TLD`,
+            },
+          ]
+          return false
+        }
+      }
+
+      if (ctx?.parentData && ctx.parentDataProperty) {
+        ctx.parentData[ctx.parentDataProperty] = cleanData
+      }
+
+      return true
     },
   })
 

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -26,6 +26,16 @@ import {
   type UnixTimestamp,
   type UnixTimestampMillis,
 } from '@naturalcycles/js-lib/types'
+import {
+  BASE64URL_REGEX,
+  COUNTRY_CODE_REGEX,
+  CURRENCY_REGEX,
+  IPV4_REGEX,
+  IPV6_REGEX,
+  LANGUAGE_TAG_REGEX,
+  SEMVER_REGEX,
+  SLUG_REGEX,
+} from '../regexes.js'
 import { TIMEZONES } from '../timezones.js'
 import {
   isEveryItemNumber,
@@ -302,11 +312,7 @@ export class JsonSchemaStringBuilder<
   email(opt?: Partial<JsonSchemaStringEmailOptions>): this {
     const defaultOptions: JsonSchemaStringEmailOptions = { checkTLD: true }
     _objectAssign(this.schema, { email: { ...defaultOptions, ...opt } })
-
-    // from `ajv-formats`
-    const regex =
-      /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i
-    return this.regex(regex, { msg: 'is not a valid email address' }).trim().toLowerCase()
+    return this.trim().toLowerCase()
   }
 
   trim(): this {
@@ -365,48 +371,31 @@ export class JsonSchemaStringBuilder<
   }
 
   ipv4(): this {
-    // from `ajv-formats`
-    const regex =
-      /^(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/
-    return this.regex(regex, { msg: 'is not a valid IPv4 format' })
+    return this.regex(IPV4_REGEX, { msg: 'is not a valid IPv4 format' })
   }
 
   ipv6(): this {
-    // from `ajv-formats`
-    const regex =
-      /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i
-    return this.regex(regex, { msg: 'is not a valid IPv6 format' })
-  }
-
-  id(): this {
-    const regex = /^[a-z0-9_]{6,64}$/
-    return this.regex(regex, { msg: 'is not a valid ID format' })
+    return this.regex(IPV6_REGEX, { msg: 'is not a valid IPv6 format' })
   }
 
   slug(): this {
-    const regex = /^[a-z0-9-]+$/
-    return this.regex(regex, { msg: 'is not a valid slug format' })
+    return this.regex(SLUG_REGEX, { msg: 'is not a valid slug format' })
   }
 
   semVer(): this {
-    const regex = /^[0-9]+\.[0-9]+\.[0-9]+$/
-    return this.regex(regex, { msg: 'is not a valid semver format' })
+    return this.regex(SEMVER_REGEX, { msg: 'is not a valid semver format' })
   }
 
   languageTag(): this {
-    // IETF language tag (https://en.wikipedia.org/wiki/IETF_language_tag)
-    const regex = /^[a-z]{2}(-[A-Z]{2})?$/
-    return this.regex(regex, { msg: 'is not a valid language format' })
+    return this.regex(LANGUAGE_TAG_REGEX, { msg: 'is not a valid language format' })
   }
 
   countryCode(): this {
-    const regex = /^[A-Z]{2}$/
-    return this.regex(regex, { msg: 'is not a valid country code format' })
+    return this.regex(COUNTRY_CODE_REGEX, { msg: 'is not a valid country code format' })
   }
 
   currency(): this {
-    const regex = /^[A-Z]{3}$/
-    return this.regex(regex, { msg: 'is not a valid currency format' })
+    return this.regex(CURRENCY_REGEX, { msg: 'is not a valid currency format' })
   }
 
   /**
@@ -419,6 +408,12 @@ export class JsonSchemaStringBuilder<
     // UTC is added to assist unit-testing, which uses UTC by default (not technically a valid Iana timezone identifier)
     return j.enum(TIMEZONES, { msg: 'is an invalid IANA timezone' }).branded<IANATimezone>()
   }
+
+  base64Url(): this {
+    return this.regex(BASE64URL_REGEX, {
+      msg: 'contains characters not allowed in Base64 URL characterset',
+    })
+  }
 }
 
 export interface JsonSchemaStringEmailOptions {

package/src/validation/joi/joi.shared.schemas.ts

@@ -4,19 +4,29 @@ import {
   _stringEnumKeys,
   _stringEnumValues,
 } from '@naturalcycles/js-lib'
-import type {
-  AnyObject,
-  BaseDBEntity,
-  IANATimezone,
-  IsoDate,
-  IsoDateTime,
-  NumberEnum,
-  StringEnum,
-  StringMap,
-  UnixTimestamp,
-  UnixTimestampMillis,
+import {
+  type AnyObject,
+  type BaseDBEntity,
+  type IANATimezone,
+  type IsoDate,
+  type IsoDateTime,
+  JWT_REGEX,
+  type NumberEnum,
+  type StringEnum,
+  type StringMap,
+  type UnixTimestamp,
+  type UnixTimestampMillis,
 } from '@naturalcycles/js-lib/types'
 import type { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi'
+import {
+  BASE62_REGEX,
+  BASE64_REGEX,
+  BASE64URL_REGEX,
+  ID_REGEX,
+  MAC_ADDRESS_REGEX,
+  SEMVER_REGEX,
+  SLUG_REGEX,
+} from '../regexes.js'
 import { Joi } from './joi.extensions.js'
 import type { NumberSchema } from './number.extensions.js'
 import type { StringSchema } from './string.extensions.js'
@@ -100,15 +110,10 @@ export function oneOfSchema<T = any>(...schemas: AnySchema[]): AlternativesSchem
 }
 
 export const anySchema = Joi.any()
-
-export const BASE62_REGEX = /^[a-zA-Z0-9]+$/
-export const BASE64_REGEX = /^[a-zA-Z0-9+/]+={0,2}$/
-export const BASE64URL_REGEX = /^[a-zA-Z0-9_-]+$/
 export const base62Schema = stringSchema.regex(BASE62_REGEX)
 export const base64Schema = stringSchema.regex(BASE64_REGEX)
 export const base64UrlSchema = stringSchema.regex(BASE64URL_REGEX)
 
-export const JWT_REGEX = /^[\w-]+\.[\w-]+\.[\w-]+$/
 export const jwtSchema = stringSchema.regex(JWT_REGEX)
 
 // 1g498efj5sder3324zer
@@ -116,17 +121,12 @@ export const jwtSchema = stringSchema.regex(JWT_REGEX)
  * [a-zA-Z0-9_]*
  * 6-64 length
  */
-export const idSchema = stringSchema.regex(/^[a-zA-Z0-9_]{6,64}$/)
+export const idSchema = stringSchema.regex(ID_REGEX)
 
 export const idBase62Schema = base62Schema.min(8).max(64)
 export const idBase64Schema = base64Schema.min(8).max(64)
 export const idBase64UrlSchema = base64UrlSchema.min(8).max(64)
 
-/**
- * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
- */
-export const SLUG_REGEX = /^[a-z0-9-]*$/
-
 /**
  * "Slug" - a valid URL, filename, etc.
  */
@@ -175,8 +175,7 @@ export const emailSchema = stringSchema.email().lowercase()
 /**
  * Pattern is simplified for our use, it's not a canonical SemVer.
  */
-export const SEM_VER_REGEX = /^[0-9]+\.[0-9]+\.[0-9]+$/
-export const semVerSchema = stringSchema.regex(SEM_VER_REGEX)
+export const semVerSchema = stringSchema.regex(SEMVER_REGEX)
 // todo: .error(() => 'should be SemVer')
 
 export const userAgentSchema = stringSchema
@@ -203,6 +202,6 @@ export const baseDBEntitySchema: ObjectSchema<BaseDBEntity> = objectSchema<BaseD
   updated: unixTimestamp2000Schema.optional(),
 })
 
-export const macAddressSchema = stringSchema.regex(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/)
+export const macAddressSchema = stringSchema.regex(MAC_ADDRESS_REGEX)
 
 export const uuidSchema = stringSchema.uuid()

package/src/validation/regexes.ts

@@ -0,0 +1,24 @@
+export const BASE62_REGEX = /^[a-zA-Z0-9]+$/
+export const BASE64_REGEX = /^[a-zA-Z0-9+/]+={0,2}$/
+export const BASE64URL_REGEX = /^[a-zA-Z0-9_-]+$/
+export const COUNTRY_CODE_REGEX = /^[A-Z]{2}$/
+export const CURRENCY_REGEX = /^[A-Z]{3}$/
+/**
+ * @deprecated
+ * Avoid using blanket regex for a concept so ambiguous as "ID".
+ * We should always define what kind of an ID we talk about: MongoDB ID, Base64 ID etc.
+ *
+ * We keep this regex here, because JOI shared schemas has been exporting this check.
+ */
+export const ID_REGEX = /^[a-zA-Z0-9_]{6,64}$/
+export const IPV4_REGEX =
+  // from `ajv-formats`
+  /^(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/
+// from `ajv-formats`
+export const IPV6_REGEX =
+  /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i
+// IETF language tag (https://en.wikipedia.org/wiki/IETF_language_tag)
+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]+$/
+export const SLUG_REGEX = /^[a-z0-9-]+$/