[form] Pass object schema to the AdditionalPropertyKeyValidator

Author: x0k

packages/form/src/form/context/context.ts

@@ -43,7 +43,7 @@ export interface FormContext {
   IconOrTranslation: Component<{ data: IconOrTranslationData }>;
   /** @deprecated use `IconOrTranslation` instead */
   iconOrTranslation: Snippet<[IconOrTranslationData]>;
-  validateAdditionalPropertyKey(config: Config, key: string): boolean;
+  validateAdditionalPropertyKey(config: Config, key: string, fieldConfig: Config): boolean;
   validation: Mutation<
     [event: SubmitEvent],
     {

packages/form/src/form/create-form.svelte.ts

@@ -340,14 +340,17 @@ export function createForm3<
   const additionalPropertyKeyValidator = $derived.by(() => {
     const validator = options.additionalPropertyKeyValidator;
     return validator
-      ? (config: Config, key: string) => {
-          const instanceId = config.idSchema.$id;
-          const messages = validator.validateAdditionalPropertyKey(key, config);
+      ? (config: Config, key: string, fieldConfig: Config) => {
+          const instanceId = fieldConfig.idSchema.$id;
+          const messages = validator.validateAdditionalPropertyKey(
+            key,
+            config.schema
+          );
           errors.set(
             instanceId,
             messages.map((message) => ({
               instanceId,
-              propertyTitle: config.title,
+              propertyTitle: fieldConfig.title,
               message,
               error: ADDITIONAL_PROPERTY_KEY_ERROR as E,
             }))

packages/form/src/form/fields/object/context.ts

@@ -1,12 +1,14 @@
 import { getContext, setContext } from "svelte";
 
+import type { Config } from '../../config.js';
+
 export interface ObjectContext {
   /** @deprecated */
   newKeySeparator: string;
   /** @deprecated */
   validate: () => void;
   addProperty(): void
-  renameProperty(oldProp: string, newProp: string): void
+  renameProperty(oldProp: string, newProp: string, config: Config): void
   removeProperty(prop: string): void
 }
 

packages/form/src/form/fields/object/object-field.svelte

@@ -72,12 +72,12 @@
       delete value[prop];
       validate();
     },
-    renameProperty(oldProp, newProp) {
+    renameProperty(oldProp, newProp, fieldConfig) {
       if (value === undefined) {
         return;
       }
       const newKey = generateNewKey(newProp, newKeySeparator, value);
-      if (!ctx.validateAdditionalPropertyKey(config, newKey)) {
+      if (!ctx.validateAdditionalPropertyKey(config, newKey, fieldConfig)) {
         return;
       }
       value[newKey] = value[oldProp];

packages/form/src/form/fields/object/object-key-input.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { proxy } from "@/lib/svelte.svelte";
-  import { type SchemaObjectValue, type SchemaValue } from "@/core/index.js";
+  import type { SchemaValue } from "@/core/index.js";
 
   import type { Config } from "../../config.js";
   import type { UiSchema } from "../../ui-schema.js";
@@ -57,7 +57,7 @@
         if (!key.value || key.value === property) {
           return;
         }
-        objCtx.renameProperty(property, key.value)
+        objCtx.renameProperty(property, key.value, config);
       },
     })
   );

packages/form/src/form/validator.ts

@@ -71,7 +71,7 @@ export interface AdditionalPropertyKeyValidator {
   /**
    * Additional property key validation
    */
-  validateAdditionalPropertyKey: (key: string, config: Config) => string[];
+  validateAdditionalPropertyKey: (key: string, schema: Schema) => string[];
 }
 
 export const VALIDATION_PROCESS_ERROR = Symbol("validation-process-error");