@open-mercato/ui 0.6.5-develop.4498.1.55dc06a57c → 0.6.5-develop.4534.1.b459babe6d

package/dist/backend/CrudForm.js

@@ -170,6 +170,41 @@ function readByDotPath(source, path) {
   }
   return current;
 }
+const PROTO_POLLUTING_KEYS = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
+function isProtoPollutingKey(key) {
+  return PROTO_POLLUTING_KEYS.has(key);
+}
+function writeByDotPath(target, path, value) {
+  const segments = path.split(".").filter(Boolean);
+  if (segments.length === 0) return;
+  if (segments.some(isProtoPollutingKey)) return;
+  let current = target;
+  for (let index = 0; index < segments.length - 1; index++) {
+    const segment = segments[index];
+    const existing = current[segment];
+    const isSafeObject = !!existing && typeof existing === "object" && !Array.isArray(existing) && (Object.getPrototypeOf(existing) === Object.prototype || Object.getPrototypeOf(existing) === null);
+    if (!isSafeObject) {
+      const created = /* @__PURE__ */ Object.create(null);
+      current[segment] = created;
+      current = created;
+    } else {
+      current = existing;
+    }
+  }
+  const finalSegment = segments[segments.length - 1];
+  if (isProtoPollutingKey(finalSegment)) return;
+  current[finalSegment] = value;
+}
+function collapseDotPathFields(source, dotPathFieldIds) {
+  if (!dotPathFieldIds.size) return source;
+  let result = null;
+  for (const fieldId of dotPathFieldIds) {
+    if (!Object.prototype.hasOwnProperty.call(source, fieldId)) continue;
+    if (!result) result = { ...source };
+    writeByDotPath(result, fieldId, source[fieldId]);
+  }
+  return result ?? source;
+}
 function readInitialCustomFieldValue(source, key) {
   if (!source || !key) return void 0;
   const candidates = [`cf_${key}`, `cf:${key}`, key];
@@ -1257,6 +1292,19 @@ function CrudForm({
   const fieldById = React.useMemo(() => {
     return new globalThis.Map(allFields.map((f) => [f.id, f]));
   }, [allFields]);
+  const dotPathBaseFieldIds = React.useMemo(() => {
+    const ids = /* @__PURE__ */ new Set();
+    const cfFieldIds = new Set(cfFields.map((field) => field.id));
+    for (const field of allFields) {
+      const fieldId = field.id;
+      if (!fieldId.includes(".")) continue;
+      if (injectedFieldIdSet.has(fieldId)) continue;
+      if (fieldId.startsWith("cf_") || fieldId.startsWith("cf:")) continue;
+      if (cfFieldIds.has(fieldId)) continue;
+      ids.add(fieldId);
+    }
+    return ids;
+  }, [allFields, injectedFieldIdSet, cfFields]);
   const validateFieldOnBlur = React.useCallback(async (fieldId, sourceValues) => {
     if (formReadOnly) return;
     const field = fieldById.get(fieldId);
@@ -1307,7 +1355,7 @@ function CrudForm({
       for (const injectedId of injectedFieldIdSet) {
         delete coreValues[injectedId];
       }
-      const result = schema.safeParse(coreValues);
+      const result = schema.safeParse(collapseDotPathFields(coreValues, dotPathBaseFieldIds));
       if (!result.success) {
         const schemaFieldErrors = {};
         result.error.issues.forEach((issue) => {
@@ -1336,6 +1384,7 @@ function CrudForm({
   }, [
     cfDefinitions,
     customEntity,
+    dotPathBaseFieldIds,
     fieldById,
     formReadOnly,
     hiddenBaseFieldIds,
@@ -1670,7 +1719,8 @@ function CrudForm({
     const snapshot = JSON.stringify({
       initialValues,
       injectedFieldIds: injectedFieldDefinitions.map((definition) => definition.id),
-      customFieldMappings: cfDefinitions.map((definition) => definition.key)
+      customFieldMappings: cfDefinitions.map((definition) => definition.key),
+      dotPathBaseFieldIds: Array.from(dotPathBaseFieldIds)
     });
     if (appliedInitialValuesSnapshotRef.current === snapshot) return;
     appliedInitialValuesSnapshotRef.current = snapshot;
@@ -1695,6 +1745,14 @@ function CrudForm({
           merged[targetId] = extracted;
         }
       }
+      for (const fieldId of dotPathBaseFieldIds) {
+        if (merged[fieldId] !== void 0) continue;
+        const extracted = readByDotPath(initialRecord, fieldId);
+        if (extracted !== void 0) {
+          ;
+          merged[fieldId] = extracted;
+        }
+      }
       mergedValues = merged;
       return mergedValues;
     });
@@ -1725,6 +1783,7 @@ function CrudForm({
   }, [
     cfDefinitions,
     customEntity,
+    dotPathBaseFieldIds,
     extendedInjectionEventsEnabled,
     initialValues,
     injectedFieldDefinitions,
@@ -1881,7 +1940,7 @@ function CrudForm({
       }
       let parsedValues;
       if (schema) {
-        const res = schema.safeParse(coreValues);
+        const res = schema.safeParse(collapseDotPathFields(coreValues, dotPathBaseFieldIds));
         if (!res.success) {
           const fieldErrors = {};
           res.error.issues.forEach((issue) => {
@@ -1911,7 +1970,7 @@ function CrudForm({
             for (const injectedId of injectedFieldIdSet) {
               delete projectedCoreValues[injectedId];
             }
-            coreSubmitValues = schema ? schema.parse(projectedCoreValues) : projectedCoreValues;
+            coreSubmitValues = schema ? schema.parse(collapseDotPathFields(projectedCoreValues, dotPathBaseFieldIds)) : projectedCoreValues;
             if (result.applyToForm) {
               setValues(result.data);
             }