@makehq/forman-schema 1.9.2 → 1.9.4

package/dist/index.cjs

@@ -873,7 +873,7 @@ function handleSelectOrPathType(field, result, context) {
       value: appendQueryString(optionsOrGroups, context.domain, context.tail)
     });
   } else {
-    const options = optionsOrGroups?.flatMap((optionOrGroup) => {
+    let options = optionsOrGroups?.flatMap((optionOrGroup) => {
       if (isOptionGroup(optionOrGroup)) {
         return optionOrGroup.options.map((option) => ({
           ...option,
@@ -882,6 +882,17 @@ function handleSelectOrPathType(field, result, context) {
       }
       return optionOrGroup;
     });
+    if (field.type === "select" && !field.required && isObject(field.options)) {
+      const placeholder = field.options.placeholder;
+      if (isObject(placeholder) && placeholder.nested) {
+        (options ||= []).push({
+          value: null,
+          label: placeholder.label,
+          nested: placeholder.nested
+        });
+        result.type = [result.type, "null"];
+      }
+    }
     if (options?.some((option) => {
       if (isOptionGroup(option)) return option.options.some((option2) => option2.label || option2.nested);
       return option.label || option.nested;
@@ -1032,6 +1043,16 @@ function processNestedDirective(field, nested, domain, result, context) {
 }
 
 // src/validator.ts
+function hasPlaceholderNested(field) {
+  if (!isObject(field.options)) return false;
+  const placeholder = field.options.placeholder;
+  return isObject(placeholder) && placeholder.nested != null;
+}
+function extractNestedFromField(field) {
+  if (field.nested) return field.nested;
+  if (isObject(field.options) && field.options.nested) return field.options.nested;
+  return void 0;
+}
 var FORMAN_TYPE_MAP2 = {
   account: "number",
   hook: "number",
@@ -1187,6 +1208,9 @@ async function validateFormanValue(value, field, context) {
     };
   }
   if (value == null) {
+    if (normalizedField.type === "select" && hasPlaceholderNested(normalizedField)) {
+      return handleSelectType(value, normalizedField, context);
+    }
     return {
       valid: true,
       errors: []
@@ -1226,6 +1250,10 @@ async function validateFormanValue(value, field, context) {
         state: { mode: "edit" }
       });
     }
+    const nested = extractNestedFromField(normalizedField);
+    if (nested) {
+      return handleNestedFields(nested, value, normalizedField, context);
+    }
     return {
       valid: true,
       errors: []
@@ -1583,7 +1611,7 @@ async function handlePathType(value, field, context) {
 async function handleSelectType(value, field, context) {
   const errors = [];
   let optionsOrGroups = isObject(field.options) ? field.options.store : field.options;
-  let nested = field.nested ? field.nested : isObject(field.options) ? field.options.nested : void 0;
+  let nested = extractNestedFromField(field);
   if (typeof optionsOrGroups === "string") {
     try {
       const resolved = await context.resolveRemote(optionsOrGroups, context);
@@ -1659,6 +1687,18 @@ async function handleSelectType(value, field, context) {
         });
       }
     }
+  } else if (value == null && hasPlaceholderNested(field)) {
+    const placeholder = field.options.placeholder;
+    if (placeholder.label) {
+      context.roots[context.domain].fieldStates.push({
+        path: context.path,
+        state: {
+          mode: "chose",
+          label: placeholder.label
+        }
+      });
+    }
+    if (placeholder.nested) nested = placeholder.nested;
   } else {
     const item = findValueInSelectOptions(field, value, optionsOrGroups);
     if (!item) {
@@ -1805,8 +1845,9 @@ async function handlePrimitiveType2(value, field, context) {
       }
     }
   }
-  if (field.nested) {
-    const result = await handleNestedFields(field.nested, value, field, context);
+  const nested = extractNestedFromField(field);
+  if (nested) {
+    const result = await handleNestedFields(nested, value, field, context);
     errors.push(...result.errors);
   }
   return {

package/dist/index.js

@@ -844,7 +844,7 @@ function handleSelectOrPathType(field, result, context) {
       value: appendQueryString(optionsOrGroups, context.domain, context.tail)
     });
   } else {
-    const options = optionsOrGroups?.flatMap((optionOrGroup) => {
+    let options = optionsOrGroups?.flatMap((optionOrGroup) => {
       if (isOptionGroup(optionOrGroup)) {
         return optionOrGroup.options.map((option) => ({
           ...option,
@@ -853,6 +853,17 @@ function handleSelectOrPathType(field, result, context) {
       }
       return optionOrGroup;
     });
+    if (field.type === "select" && !field.required && isObject(field.options)) {
+      const placeholder = field.options.placeholder;
+      if (isObject(placeholder) && placeholder.nested) {
+        (options ||= []).push({
+          value: null,
+          label: placeholder.label,
+          nested: placeholder.nested
+        });
+        result.type = [result.type, "null"];
+      }
+    }
     if (options?.some((option) => {
       if (isOptionGroup(option)) return option.options.some((option2) => option2.label || option2.nested);
       return option.label || option.nested;
@@ -1003,6 +1014,16 @@ function processNestedDirective(field, nested, domain, result, context) {
 }
 
 // src/validator.ts
+function hasPlaceholderNested(field) {
+  if (!isObject(field.options)) return false;
+  const placeholder = field.options.placeholder;
+  return isObject(placeholder) && placeholder.nested != null;
+}
+function extractNestedFromField(field) {
+  if (field.nested) return field.nested;
+  if (isObject(field.options) && field.options.nested) return field.options.nested;
+  return void 0;
+}
 var FORMAN_TYPE_MAP2 = {
   account: "number",
   hook: "number",
@@ -1158,6 +1179,9 @@ async function validateFormanValue(value, field, context) {
     };
   }
   if (value == null) {
+    if (normalizedField.type === "select" && hasPlaceholderNested(normalizedField)) {
+      return handleSelectType(value, normalizedField, context);
+    }
     return {
       valid: true,
       errors: []
@@ -1197,6 +1221,10 @@ async function validateFormanValue(value, field, context) {
         state: { mode: "edit" }
       });
     }
+    const nested = extractNestedFromField(normalizedField);
+    if (nested) {
+      return handleNestedFields(nested, value, normalizedField, context);
+    }
     return {
       valid: true,
       errors: []
@@ -1554,7 +1582,7 @@ async function handlePathType(value, field, context) {
 async function handleSelectType(value, field, context) {
   const errors = [];
   let optionsOrGroups = isObject(field.options) ? field.options.store : field.options;
-  let nested = field.nested ? field.nested : isObject(field.options) ? field.options.nested : void 0;
+  let nested = extractNestedFromField(field);
   if (typeof optionsOrGroups === "string") {
     try {
       const resolved = await context.resolveRemote(optionsOrGroups, context);
@@ -1630,6 +1658,18 @@ async function handleSelectType(value, field, context) {
         });
       }
     }
+  } else if (value == null && hasPlaceholderNested(field)) {
+    const placeholder = field.options.placeholder;
+    if (placeholder.label) {
+      context.roots[context.domain].fieldStates.push({
+        path: context.path,
+        state: {
+          mode: "chose",
+          label: placeholder.label
+        }
+      });
+    }
+    if (placeholder.nested) nested = placeholder.nested;
   } else {
     const item = findValueInSelectOptions(field, value, optionsOrGroups);
     if (!item) {
@@ -1776,8 +1816,9 @@ async function handlePrimitiveType2(value, field, context) {
       }
     }
   }
-  if (field.nested) {
-    const result = await handleNestedFields(field.nested, value, field, context);
+  const nested = extractNestedFromField(field);
+  if (nested) {
+    const result = await handleNestedFields(nested, value, field, context);
     errors.push(...result.errors);
   }
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@makehq/forman-schema",
-    "version": "1.9.2",
+    "version": "1.9.4",
     "description": "Forman Schema Tools",
     "license": "MIT",
     "author": "Make",