@naturalcycles/nodejs-lib 15.50.0 → 15.50.1

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.js

@@ -217,9 +217,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 } });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.50.0",
+  "version": "15.50.1",
   "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

@@ -302,11 +302,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 {