@beseif-solutions/prow-core 0.2.3 → 0.2.5

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()),
 })
@@ -341,11 +345,10 @@ const getSimpleFieldSchema = (field) => {
     }
     return getGeneralSchema(field, typeSchema);
 };
-const getArrayFieldSchema = (field, items) => {
+const getGeneralArraySchema = (field, schema) => {
     if (!field.as_array) {
         throw new Error(`as_array required for array schema generator`);
     }
-    let schema = joi_1.default.array().ordered(...items);
     if (field.array_length) {
         schema = schema.length(field.array_length);
     }
@@ -357,6 +360,20 @@ const getArrayFieldSchema = (field, items) => {
     }
     return getGeneralSchema(field, schema);
 };
+const getItemsArrayFieldSchema = (field, alternatives) => {
+    if (!field.as_array) {
+        throw new Error(`as_array required for array schema generator`);
+    }
+    const schema = joi_1.default.array().items(...alternatives);
+    return getGeneralArraySchema(field, schema);
+};
+const getOrderedArrayFieldSchema = (field, items) => {
+    if (!field.as_array) {
+        throw new Error(`as_array required for array schema generator`);
+    }
+    const schema = joi_1.default.array().ordered(...items);
+    return getGeneralArraySchema(field, schema);
+};
 const getObjectFieldSchema = (field, items) => {
     if (field.type !== `dict`) {
         throw new Error(`type must be dict for object schema generator`);
@@ -439,17 +456,24 @@ const recursive_schema = async (field, data, options) => {
         const resolved = context_1.default.resolve(newField, value, options.context);
         lodash_1.default.set(data, relativeKey, resolved);
         let calculatedSchema;
-        if (newField.as_array && resolved) {
-            const itemSchemas = [];
-            if (lodash_1.default.isArray(resolved)) {
-                for (let i = 0; i < (resolved || []).length; i++) {
-                    const { schema: itemSchema } = await recursive_schema(lodash_1.default.omit(newField, [`as_array`, `array_min`, `array_max`, `array_length`]), data, { alter: false, relative: `${relativeKey}[${i}]`, array: true, context: options.context });
-                    if (itemSchema) {
-                        itemSchemas.push(itemSchema);
+        if (newField.as_array) {
+            const noArrayField = lodash_1.default.omit(newField, [`as_array`, `array_min`, `array_max`, `array_length`]);
+            if (resolved) {
+                const itemSchemas = [];
+                if (lodash_1.default.isArray(resolved)) {
+                    for (let i = 0; i < (resolved || []).length; i++) {
+                        const { schema: itemSchema } = await recursive_schema(noArrayField, data, { alter: false, relative: `${relativeKey}[${i}]`, array: true, context: options.context });
+                        if (itemSchema) {
+                            itemSchemas.push(itemSchema);
+                        }
                     }
                 }
+                calculatedSchema = getOrderedArrayFieldSchema(newField, itemSchemas);
+            }
+            else {
+                const genericItemSchema = getSimpleFieldSchema(noArrayField);
+                calculatedSchema = getItemsArrayFieldSchema(newField, [genericItemSchema]);
             }
-            calculatedSchema = getArrayFieldSchema(newField, itemSchemas);
         }
         else if (newField.type === `dict` && newField.items) {
             const items = [];
@@ -502,11 +526,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.3",
+  "version": "0.2.5",
   "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({
@@ -544,11 +548,9 @@ const getSimpleFieldSchema = (field: Field) => {
   return getGeneralSchema(field, typeSchema);
 };
 
-const getArrayFieldSchema = (field: Field, items: Joi.Schema[]) => {
+const getGeneralArraySchema = (field: Field, schema: Joi.ArraySchema) => {
   if (!field.as_array) { throw new Error(`as_array required for array schema generator`); }
 
-  let schema = Joi.array().ordered(...items);
-
   if (field.array_length) { schema = schema.length(field.array_length); }
   if (field.array_min) { schema = schema.min(field.array_min); }
   if (field.array_max) { schema = schema.max(field.array_max); }
@@ -556,6 +558,20 @@ const getArrayFieldSchema = (field: Field, items: Joi.Schema[]) => {
   return getGeneralSchema(field, schema);
 };
 
+const getItemsArrayFieldSchema = (field: Field, alternatives: Joi.Schema[]) => {
+  if (!field.as_array) { throw new Error(`as_array required for array schema generator`); }
+
+  const schema = Joi.array().items(...alternatives);
+  return getGeneralArraySchema(field, schema);
+};
+
+const getOrderedArrayFieldSchema = (field: Field, items: Joi.Schema[]) => {
+  if (!field.as_array) { throw new Error(`as_array required for array schema generator`); }
+
+  const schema = Joi.array().ordered(...items);
+  return getGeneralArraySchema(field, schema);
+};
+
 const getObjectFieldSchema = (field: Field, items: { key: string, schema: Joi.Schema }[]) => {
   if (field.type !== `dict`) { throw new Error(`type must be dict for object schema generator`); }
   if (!field.items) { throw new Error(`items required for object schema generator`); }
@@ -648,18 +664,23 @@ const recursive_schema = async (field: Field, data: Record<string, any>, options
 
     // get schema for field with data
     let calculatedSchema: Joi.Schema;
-    if (newField.as_array && resolved) {
-      const itemSchemas: Joi.Schema[] = [];
-      if (_.isArray(resolved)) {
-        for (let i = 0; i < (resolved || []).length; i++) {
-          const { schema: itemSchema } = await recursive_schema(
-            _.omit(newField, [`as_array`, `array_min`, `array_max`, `array_length`]) as Field,
-            data, { alter: false, relative: `${relativeKey}[${i}]`, array: true, context: options.context });
-          if (itemSchema) { itemSchemas.push(itemSchema); }
+    if (newField.as_array) {
+      const noArrayField = _.omit(newField, [`as_array`, `array_min`, `array_max`, `array_length`]) as Field;
+
+      if (resolved) {
+        const itemSchemas: Joi.Schema[] = [];
+        if (_.isArray(resolved)) {
+          for (let i = 0; i < (resolved || []).length; i++) {
+            const { schema: itemSchema } = await recursive_schema(noArrayField, data, { alter: false, relative: `${relativeKey}[${i}]`, array: true, context: options.context });
+            if (itemSchema) { itemSchemas.push(itemSchema); }
+          }
         }
-      }
 
-      calculatedSchema = getArrayFieldSchema(newField, itemSchemas);
+        calculatedSchema = getOrderedArrayFieldSchema(newField, itemSchemas);
+      } else {
+        const genericItemSchema = getSimpleFieldSchema(noArrayField);
+        calculatedSchema = getItemsArrayFieldSchema(newField, [genericItemSchema]);
+      }
     } else if (newField.type === `dict` && newField.items) {
       const items: { key: string, schema: Joi.Schema, field: Field }[] = [];
 
@@ -710,11 +731,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,
         };