@beseif-solutions/prow-core 0.4.4 → 0.4.5

package/dist/minified-utils/fields.js

@@ -58,13 +58,14 @@ const defaultSchema = (type) => joi_1.default.when(`as_array`, {
     then: joi_1.default.array().items(type),
     otherwise: type,
 });
-const anySchema = () => {
+const anySchema = (nullish = true) => {
     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}`)))
+    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}`)), ...nullish ? [joi_1.default.valid(null, ``)] : [])
         .id(randId);
 };
 const anyInputFieldSchema = () => joi_1.default.object({
     default: defaultSchema(anySchema()),
+    allow_nullish: joi_1.default.bool().default(true),
 })
     .concat(joi_1.default.object({
     format: joi_1.default.string().valid(`select`),
@@ -248,10 +249,7 @@ const getSimpleFieldSchema = (field) => {
     let typeSchema;
     switch (field.type) {
         case `any`:
-            typeSchema = anySchema();
-            if (field.allow_nullish) {
-                typeSchema = typeSchema.allow(null, ``, 0);
-            }
+            typeSchema = anySchema(field.allow_nullish);
             break;
         case `boolean`:
             typeSchema = joi_1.default.bool();

package/package.json

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

package/src/minified-utils/fields.ts

@@ -249,7 +249,7 @@ const defaultSchema = (type: Joi.Schema) =>
     otherwise: type,
   });
 
-const anySchema = () => {
+const anySchema = (nullish = true) => {
   // eslint-disable-next-line @typescript-eslint/no-magic-numbers
   const randId = Math.random().toString(36).substring(2, 15);
   return Joi.alternatives(
@@ -257,13 +257,16 @@ const anySchema = () => {
     Joi.bool(),
     Joi.number(),
     Joi.array().items(Joi.link(`#${randId}`)),
-    Joi.object().pattern(Joi.string(), Joi.link(`#${randId}`)))
+    Joi.object().pattern(Joi.string(), Joi.link(`#${randId}`)),
+    ...nullish ? [Joi.valid(null, ``)] : [],
+  )
     .id(randId);
 };
 
 const anyInputFieldSchema = () =>
   Joi.object({
     default: defaultSchema(anySchema()),
+    allow_nullish: Joi.bool().default(true),
   })
     .concat(Joi.object({
       format: Joi.string().valid(`select`),
@@ -474,9 +477,7 @@ const getSimpleFieldSchema = (field: Field) => {
   let typeSchema: Joi.Schema;
   switch (field.type) {
     case `any`:
-      typeSchema = anySchema();
-      // allow null values for any type
-      if (field.allow_nullish) { typeSchema = typeSchema.allow(null, ``, 0); }
+      typeSchema = anySchema(field.allow_nullish);
       break;
     case `boolean`:
       typeSchema = Joi.bool();