wip

coltorapps · Nov 2, 2023 · 0aa4797 · 0aa4797
1 parent dd59eaf
commit 0aa4797
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 31 deletions.
diff --git a/packages/basebuilder/src/builder-store.ts b/packages/basebuilder/src/builder-store.ts
@@ -241,17 +241,22 @@ async function validateEntityAttribute<TBuilder extends Builder>(
       id: entityId,
     };
 
-    await attribute.validate(attributeValue, {
-      schema,
-      entity: serializedEntity,
-    });
-
-    await (builder.entitiesExtensions as EntitiesExtensions)[
-      entity.type
-    ]?.attributes?.[attributeName]?.validate?.(attributeValue, {
-      schema,
-      entity: serializedEntity,
-    });
+    const extensionValidator = (
+      builder.entitiesExtensions as EntitiesExtensions
+    )[entity.type]?.attributes?.[attributeName]?.validate;
+
+    if (extensionValidator) {
+      await extensionValidator?.(attributeValue, {
+        validate: attribute.validate,
+        schema,
+        entity: serializedEntity,
+      });
+    } else {
+      await attribute.validate(attributeValue, {
+        schema,
+        entity: serializedEntity,
+      });
+    }
 
     delete entityAttributesErrors?.[
       attributeName as keyof EntityAttributesErrors<TBuilder>

diff --git a/packages/basebuilder/src/builder.ts b/packages/basebuilder/src/builder.ts
@@ -16,14 +16,16 @@ export type EntitiesExtensions<
         { name: K }
       >["attributes"][number]["name"]]?: {
         validate?: (
-          value: AttributesValues<
-            Extract<TEntities[number], { name: K }>["attributes"]
-          >[K2],
+          value: unknown,
           context: {
             schema: Schema<Builder<TEntities>>;
             entity: SchemaEntityWithId<
               Builder<[Extract<TEntities[number], { name: K }>]>
             >;
+            validate: Extract<
+              Extract<TEntities[number], { name: K }>["attributes"][number],
+              { name: K2 }
+            >["validate"];
           },
         ) =>
           | AttributesValues<

diff --git a/packages/basebuilder/src/schema.ts b/packages/basebuilder/src/schema.ts
@@ -313,24 +313,22 @@ async function validateEntityAttributes(
     try {
       let attributeValue = entity.attributes[attribute.name];
 
-      attributeValue = await attribute.validate(attributeValue, {
-        schema: schema,
-        entity: {
-          ...entity,
-          id: entity.id,
-        },
-      });
-
-      attributeValue =
-        (await (builder.entitiesExtensions as EntitiesExtensions)[
-          entity.type
-        ]?.attributes?.[attribute.name]?.validate?.(attributeValue, {
+      const extensionValidator = (
+        builder.entitiesExtensions as EntitiesExtensions
+      )[entity.type]?.attributes?.[attribute.name]?.validate;
+
+      if (extensionValidator) {
+        attributeValue = await extensionValidator(attributeValue, {
+          validate: attribute.validate,
           schema,
-          entity: {
-            ...entity,
-            id: entity.id,
-          },
-        })) ?? attributeValue;
+          entity,
+        });
+      } else {
+        attributeValue = await attribute.validate(attributeValue, {
+          schema: schema,
+          entity,
+        });
+      }
 
       newAttributes[attribute.name] = attributeValue;
     } catch (error) {