@beseif-solutions/prow-core 0.2.2 → 0.2.4

package/dist/minified-utils/fields.js

@@ -56,7 +56,11 @@ const defaultSchema = (type) => joi_1.default.when(`as_array`, {
     then: joi_1.default.array().items(type),
     otherwise: type,
 });
-const anySchema = () => joi_1.default.alternatives(joi_1.default.string(), joi_1.default.bool(), joi_1.default.number(), joi_1.default.array().items(joi_1.default.link(`/`)), joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.link(`/`)));
+const anySchema = () => {
+    const randId = Math.random().toString(36).substring(2, 15);
+    return joi_1.default.alternatives(joi_1.default.string(), joi_1.default.bool(), joi_1.default.number(), joi_1.default.array().items(joi_1.default.link(`#${randId}`)), joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.link(`#${randId}`)))
+        .id(randId);
+};
 const anyInputFieldSchema = () => joi_1.default.object({
     default: defaultSchema(anySchema()),
 })
@@ -422,6 +426,9 @@ const recursive_schema = async (field, data, options) => {
             if (options.alter) {
                 delete newField.altered_by;
             }
+            if (typeof newField.show === `boolean` && !newField.show) {
+                return;
+            }
         }
         const alteredField = lodash_1.default.cloneDeep(newField);
         if (newField.type === `file`) {
@@ -467,11 +474,7 @@ const recursive_schema = async (field, data, options) => {
         if (!calculatedSchema) {
             throw new Error(`Could not resolve schema for field ${newField.key}`);
         }
-        if (typeof newField.show === `boolean` && !newField.show) {
-            lodash_1.default.unset(data, relativeKey);
-            return;
-        }
-        else if (newField.disabled) {
+        if (newField.disabled) {
             lodash_1.default.unset(data, relativeKey);
         }
         return { schema: calculatedSchema, field: field.type === `file` ? alteredField : newField };
@@ -503,11 +506,17 @@ const validate_internal = async (fields, data, options) => {
             if (error) {
                 extended = {
                     valid: false,
-                    errors: error.details.map((d) => ({
+                    errors: error.details ? error.details.map((d) => ({
                         type: d.type,
                         path: convertPath([field.key, ...d.path]),
                         message: d.message,
-                    })),
+                    })) : [
+                        {
+                            type: `unknown`,
+                            path: field.key,
+                            message: error.message,
+                        },
+                    ],
                     original: value,
                     value: null,
                 };

package/package.json

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

package/src/minified-utils/fields.ts

@@ -242,13 +242,17 @@ const defaultSchema = (type: Joi.Schema) =>
     otherwise: type,
   });
 
-const anySchema = () =>
-  Joi.alternatives(
+const anySchema = () => {
+  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+  const randId = Math.random().toString(36).substring(2, 15);
+  return Joi.alternatives(
     Joi.string(),
     Joi.bool(),
     Joi.number(),
-    Joi.array().items(Joi.link(`/`)),
-    Joi.object().pattern(Joi.string(), Joi.link(`/`)));
+    Joi.array().items(Joi.link(`#${randId}`)),
+    Joi.object().pattern(Joi.string(), Joi.link(`#${randId}`)))
+    .id(randId);
+};
 
 const anyInputFieldSchema = () =>
   Joi.object({
@@ -625,6 +629,8 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
       // remove altered_by only if it's not an array -> array alterations must be kept for front-end rendering
       if (options.alter) { delete newField.altered_by; }
+
+      if (typeof newField.show === `boolean` && !newField.show) { return; }
     }
 
     const alteredField: Field = _.cloneDeep(newField);
@@ -676,14 +682,8 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
     if (!calculatedSchema) { throw new Error(`Could not resolve schema for field ${newField.key}`); }
 
-    if (typeof newField.show === `boolean` && !newField.show) {
-      // if the field is hidden, we don't need to validate it
-      _.unset(data, relativeKey);
-      return;
-    } else if (newField.disabled) {
-      // TODO: check this
-      _.unset(data, relativeKey);
-    }
+    // if disabled schema validation is done but the value is not set
+    if (newField.disabled) { _.unset(data, relativeKey); }
 
     return { schema: calculatedSchema, field: field.type === `file` ? alteredField : newField };
   } catch (e) { throw e; }
@@ -714,11 +714,17 @@ const validate_internal = async (fields: Field[], data: Record<string, any>, opt
       if (error) {
         extended = {
           valid: false,
-          errors: error.details.map((d) => ({
+          errors: error.details ? error.details.map((d) => ({
             type: d.type,
             path: convertPath([field.key, ...d.path]),
             message: d.message,
-          })),
+          })) : [
+            {
+              type: `unknown`,
+              path: field.key,
+              message: error.message,
+            },
+          ],
           original: value,
           value: null,
         };