@beseif-solutions/prow-core 1.0.3 → 1.0.5

package/dist/minified-utils/validation.js

@@ -457,7 +457,14 @@ const recursive_schema = async (field, data, options) => {
             : newField.key;
         const value = lodash_1.default.get(data, relativeKey, newField.default);
         const resolved = context_1.default.resolve(newField, value, options.context);
-        lodash_1.default.set(data, relativeKey, resolved);
+        if (!options.no_undefined || typeof resolved !== `undefined`) {
+            if (newField.type === `any` && typeof resolved === `undefined`) {
+                lodash_1.default.set(data, relativeKey, null);
+            }
+            else {
+                lodash_1.default.set(data, relativeKey, resolved);
+            }
+        }
         if (typeof resolved === `undefined` && options.array) {
             return { schema: null, field: null };
         }
@@ -483,7 +490,7 @@ const recursive_schema = async (field, data, options) => {
                 if (noArrayField.type === `dict` && noArrayField.items) {
                     const items = [];
                     for (const item of noArrayField.items) {
-                        const recursive = await recursive_schema(item, data, { alter: options.alter && true, relative: `${relativeKey}[0]`, context: options.context });
+                        const recursive = await recursive_schema(item, data, { alter: options.alter && true, relative: `${relativeKey}[0]`, context: options.context, no_undefined: true });
                         if (recursive) {
                             items.push({ key: item.key, schema: recursive.schema, field: recursive.field });
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beseif-solutions/prow-core",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Prow core functionalities and classes",
   "main": "dist/index.js",
   "scripts": {

package/src/minified-utils/validation.ts

@@ -478,7 +478,7 @@ export const alter = (field: Field, relative: string, data: Record<string, any>)
   return cloned;
 };
 
-const recursive_schema = async (field: Field, data: Record<string, any>, options: { alter: boolean, relative?: string, array?: boolean, context: Record<string, any> }): Promise<{ schema: Joi.Schema, field: Field }> => {
+const recursive_schema = async (field: Field, data: Record<string, any>, options: { alter: boolean, context: Record<string, any>, relative?: string, array?: boolean, no_undefined?: boolean }): Promise<{ schema: Joi.Schema, field: Field }> => {
   try {
     let newField: Field = _.cloneDeep(field);
 
@@ -507,7 +507,14 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
     // resolve value with context (even if it's not valid)
     const resolved = context.resolve(newField, value, options.context);
-    _.set(data, relativeKey, resolved);
+    if (!options.no_undefined || typeof resolved !== `undefined`) {
+      if (newField.type === `any` && typeof resolved === `undefined`) {
+        // any field - allow_nullish
+        _.set(data, relativeKey, null);
+      } else {
+        _.set(data, relativeKey, resolved);
+      }
+    }
 
     // omit undefined for array mappings
     if (typeof resolved === `undefined` && options.array) { return { schema: null, field: null }; }
@@ -537,7 +544,7 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
           const items: { key: string, schema: Joi.Schema, field: Field }[] = [];
 
           for (const item of noArrayField.items) {
-            const recursive = await recursive_schema(item, data, { alter: options.alter && true, relative: `${relativeKey}[0]`, context: options.context });
+            const recursive = await recursive_schema(item, data, { alter: options.alter && true, relative: `${relativeKey}[0]`, context: options.context, no_undefined: true });
             if (recursive) { items.push({ key: item.key, schema: recursive.schema, field: recursive.field }); }
           }