fix: fix allowed types typing (#343)

* fix: fix allowed types typing * fix: added number as allowed input and fixed other types * fix: make the optionid optional because of wrapper * fix: expand PrefabComponentOptionCategory
bettyblocks · Sep 7, 2022 · c9ad080 · c9ad080
1 parent 217f3e8
commit c9ad080
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -141,6 +141,12 @@ export type PrefabComponentOptionCategory = {
   label: string;
   extended?: boolean;
   members: string[];
+  condition?: {
+    type: string;
+    option: string;
+    comparator: string;
+    value: string | boolean | number;
+  };
 };
 
 export type PrefabComponentOption = PrefabComponentOptionBase &

diff --git a/src/validations/prefab/componentOption.ts b/src/validations/prefab/componentOption.ts
@@ -34,7 +34,7 @@ const optionConfigurationSchemaBase = {
   allowedInput: Joi.array().items(
     Joi.object({
       name: Joi.string().allow(''),
-      value: Joi.any(),
+      value: Joi.alternatives().try(Joi.boolean(), Joi.string(), Joi.number()),
     }),
   ),
   allowedTypes: Joi.array().items(Joi.string()),

diff --git a/src/validations/prefab/linkedOption.ts b/src/validations/prefab/linkedOption.ts
@@ -4,12 +4,19 @@ import { COMPARATORS, CONDITION_TYPE, CONFIGURATION_AS } from '../constants';
 const linkedOptionValueSchema = Joi.object({
   ref: Joi.object({
     componentId: Joi.string().required(),
-    optionId: Joi.string().required(),
+    optionId: Joi.string().optional(),
   }),
 });
 
 export const linkedOptionConfigurationSchema = Joi.object({
   as: Joi.string().valid(...CONFIGURATION_AS),
+  dataType: Joi.string(),
+  allowedInput: Joi.array().items(
+    Joi.object({
+      name: Joi.string(),
+      value: Joi.alternatives().try(Joi.boolean(), Joi.string(), Joi.number()),
+    }),
+  ),
   condition: Joi.object({
     type: Joi.string().valid(...CONDITION_TYPE),
     option: Joi.string(),