@makehq/forman-schema 1.7.1 → 1.8.1

package/dist/index.cjs

@@ -89,6 +89,15 @@ function normalizeFormanFieldType(field) {
     }
   };
 }
+function findValueInSelectOptions(field, value, optionsAndGroups) {
+  if (!optionsAndGroups) return void 0;
+  if (field.grouped) {
+    const found2 = optionsAndGroups.flatMap((group) => "options" in group ? group.options : []).find((option) => option.value === value);
+    if (found2) return found2;
+  }
+  const found = optionsAndGroups.find((option) => "value" in option && option.value === value);
+  return found;
+}
 function buildRestoreStructure(items) {
   const result = {};
   for (const item of items) {
@@ -316,11 +325,11 @@ function toJSONSchemaInternal(field, context = createDefaultContext()) {
     case "aiagent":
     case "file":
     case "folder":
-      return handleSelectType(normalizedField, result, context);
+      return handleSelectOrPathType(normalizedField, result, context);
     case "filter":
       return handleFilterType(normalizedField, result, context);
     default:
-      return handlePrimitiveType(normalizedField, result);
+      return handlePrimitiveType(normalizedField, result, context);
   }
 }
 function handleCollectionType(field, result, context) {
@@ -436,8 +445,22 @@ function handleFilterType(field, result, context) {
   });
   return result;
 }
-function handleSelectType(field, result, context) {
+function handleSelectOrPathType(field, result, context) {
   const optionsOrGroups = isObject(field.options) ? field.options.store : field.options;
+  if (["file", "folder"].includes(field.type)) {
+    const optionsWrapper = isObject(field.options) ? field.options : void 0;
+    Object.defineProperty(result, "x-path", {
+      configurable: true,
+      enumerable: true,
+      writable: true,
+      value: {
+        type: field.type,
+        showRoot: optionsWrapper?.showRoot ?? true,
+        singleLevel: optionsWrapper?.singleLevel ?? false,
+        ownName: field.name
+      }
+    });
+  }
   const nested = isObject(field.options) ? isObject(field.options.nested) ? field.options.nested.store : field.options.nested : void 0;
   const nestedContainsStrings = Array.isArray(nested) && nested.some((item) => typeof item === "string");
   const domain = isObject(field.options) ? isObject(field.options.nested) && field.options.nested.domain ? field.options.nested.domain : void 0 : void 0;
@@ -449,12 +472,15 @@ function handleSelectType(field, result, context) {
       value: appendQueryString(optionsOrGroups, context.domain, context.tail)
     });
   } else {
-    const options = optionsOrGroups?.some(isOptionGroup) ? optionsOrGroups.flatMap(
-      (group) => group.options.map((option) => ({
-        ...option,
-        label: `${group.label}: ${option.label || option.value}`
-      }))
-    ) : optionsOrGroups || [];
+    const options = optionsOrGroups?.flatMap((optionOrGroup) => {
+      if (isOptionGroup(optionOrGroup)) {
+        return optionOrGroup.options.map((option) => ({
+          ...option,
+          label: `${optionOrGroup.label}: ${option.label || option.value}`
+        }));
+      }
+      return optionOrGroup;
+    });
     if (options?.some((option) => {
       if (isOptionGroup(option)) return option.options.some((option2) => option2.label || option2.nested);
       return option.label || option.nested;
@@ -546,9 +572,10 @@ function handleSelectType(field, result, context) {
       )
     });
   }
+  if (field.rpc) result = processRpcDirective(field, result, context);
   return result;
 }
-function handlePrimitiveType(field, result) {
+function handlePrimitiveType(field, result, context) {
   if (field.default !== "" && field.default != null) {
     result.default = field.default;
   }
@@ -566,6 +593,21 @@ function handlePrimitiveType(field, result) {
       result.enum = field.validate.enum;
     }
   }
+  if (field.rpc) result = processRpcDirective(field, result, context);
+  return result;
+}
+function processRpcDirective(field, result, context) {
+  if (!field.rpc) return result;
+  Object.defineProperty(result, "x-search", {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: {
+      url: appendQueryString(field.rpc.url, context.domain, context.tail),
+      label: field.rpc.label,
+      inputSchema: typeof field.rpc.parameters === "string" ? { $ref: field.rpc.parameters } : toJSONSchemaInternal({ type: "collection", spec: field.rpc.parameters }, context)
+    }
+  });
   return result;
 }
 
@@ -654,7 +696,7 @@ async function validateFormanWithDomainsInternal(domains, options) {
         validateNestedFields: () => {
           throw new Error("Cannot validate nested fields without parent field.");
         },
-        resolveRemote: async (path, context) => {
+        resolveRemote: async (path, context, localData) => {
           if (!options?.resolveRemote) {
             throw new Error("Remote resource not supported when resolver is not provided.");
           }
@@ -665,7 +707,10 @@ async function validateFormanWithDomainsInternal(domains, options) {
             },
             {}
           );
-          return await options.resolveRemote(path, data);
+          return await options.resolveRemote(path, {
+            ...data,
+            ...localData
+          });
         }
       }
     );
@@ -752,9 +797,10 @@ async function validateFormanValue(value, field, context) {
     case "aiagent":
     case "udt":
     case "scenario":
+      return handleSelectType(value, normalizedField, context);
     case "file":
     case "folder":
-      return handleSelectType2(value, normalizedField, context);
+      return handlePathType(value, normalizedField, context);
     case "filter":
       return handleFilterType2(value, normalizedField, context);
     default:
@@ -919,7 +965,152 @@ async function handleFilterType2(value, field, context) {
   };
   return handleArrayType2(value, inlineSchema, context);
 }
-async function handleSelectType2(value, field, context) {
+async function handlePathType(value, field, context) {
+  const errors = [];
+  if (typeof value !== "string") {
+    return {
+      valid: false,
+      errors: [
+        ...errors,
+        {
+          domain: context.domain,
+          path: context.path.join("."),
+          message: `Expected type 'string' for path, got type '${typeof value}'.`
+        }
+      ]
+    };
+  }
+  let showRoot = true;
+  let ids = false;
+  let singleLevel = false;
+  let options;
+  if (isObject(field.options)) {
+    if (field.options.showRoot !== void 0) showRoot = field.options.showRoot;
+    if (field.options.ids !== void 0) ids = field.options.ids;
+    if (field.options.singleLevel !== void 0) singleLevel = field.options.singleLevel;
+    options = field.options.store;
+  } else {
+    options = field.options;
+  }
+  if (singleLevel && (!showRoot && value.includes("/") || showRoot && value.lastIndexOf("/") > 0)) {
+    return {
+      valid: false,
+      errors: [
+        ...errors,
+        {
+          domain: context.domain,
+          path: context.path.join("."),
+          message: `Single level path cannot contain slashes.`
+        }
+      ]
+    };
+  }
+  let nested = field.nested ? field.nested : isObject(field.options) ? field.options.nested : void 0;
+  const levels = value.split("/");
+  if (levels[0] !== "") levels.unshift("");
+  if (showRoot && value === "/" && field.type === "folder") {
+    return {
+      valid: true,
+      errors: []
+    };
+  }
+  if (levels.length < 2) {
+    return {
+      valid: false,
+      errors: [
+        ...errors,
+        {
+          domain: context.domain,
+          path: context.path.join("."),
+          message: `Invalid path "${value}" encountered.`
+        }
+      ]
+    };
+  }
+  const selectedPath = [];
+  let levelOptions = [];
+  for (let levelIndex = 0; levelIndex < levels.length - 1; ++levelIndex) {
+    const isLastLevel = levelIndex === levels.length - 2;
+    const levelSelectedValue = levels[levelIndex + 1];
+    const selectedPathValue = selectedPath.map(({ value: value2 }) => value2).join("/");
+    if (!levelSelectedValue) {
+      return {
+        valid: false,
+        errors: [
+          ...errors,
+          {
+            domain: context.domain,
+            path: context.path.join("."),
+            message: `Invalid selected value of "${value}" encountered.`
+          }
+        ]
+      };
+    }
+    if (typeof options === "string") {
+      try {
+        levelOptions = await context.resolveRemote(options, context, {
+          [field.name]: (showRoot && !selectedPathValue.startsWith("/") ? "/" : "") + selectedPathValue
+        });
+      } catch (error) {
+        return {
+          valid: false,
+          errors: [
+            ...errors,
+            {
+              domain: context.domain,
+              path: context.path.join("."),
+              message: `Failed to resolve remote resource ${options}: ${error}`
+            }
+          ]
+        };
+      }
+    } else if (isLastLevel) {
+      levelOptions = options;
+    }
+    const selectableOptions = levelOptions.flatMap((candidate) => {
+      if (isLastLevel && (field.type === "file" && !candidate.file || field.type === "folder" && candidate.file)) {
+        return [];
+      }
+      if (!isLastLevel && candidate.file) {
+        return [];
+      }
+      return candidate;
+    });
+    const selectedOption = selectableOptions.find((candidate) => candidate.value === levelSelectedValue);
+    if (!selectedOption) {
+      return {
+        valid: false,
+        errors: [
+          ...errors,
+          {
+            domain: context.domain,
+            path: context.path.join("."),
+            message: `Path '${levelSelectedValue}' not found in options.`
+          }
+        ]
+      };
+    }
+    selectedPath.push(selectedOption);
+  }
+  if (ids) {
+    context.roots[context.domain].fieldStates.push({
+      path: context.path,
+      state: {
+        mode: "chose",
+        path: selectedPath.map(({ label, value: value2 }) => label ?? value2)
+      }
+    });
+  }
+  if (nested) {
+    const result = await handleNestedFields(nested, value, field, context);
+    errors.push(...result.errors);
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+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;
@@ -955,9 +1146,11 @@ async function handleSelectType2(value, field, context) {
       };
     }
     for (const singleValue of value) {
-      const found = field.grouped ? optionsOrGroups.some(
-        (group) => group.options.some((option) => option.value === singleValue)
-      ) : optionsOrGroups.some((option) => option.value === singleValue);
+      const found = findValueInSelectOptions(
+        field,
+        singleValue,
+        optionsOrGroups
+      );
       if (!found) {
         errors.push({
           domain: context.domain,
@@ -983,7 +1176,7 @@ async function handleSelectType2(value, field, context) {
       }
     }
   } else {
-    const item = field.grouped ? optionsOrGroups.find((group) => group.options.some((option) => option.value === value))?.options.find((option) => option.value === value) : optionsOrGroups.find((option) => option.value === value);
+    const item = findValueInSelectOptions(field, value, optionsOrGroups);
     if (!item) {
       return {
         valid: false,
@@ -1191,6 +1384,19 @@ function toFormanSchema(field) {
       }
       return formanSchema;
     case "string":
+      const pathInfo = Object.getOwnPropertyDescriptor(field, "x-path");
+      if (pathInfo) {
+        return {
+          type: pathInfo.value.type,
+          label: noEmpty(field.title),
+          help: noEmpty(field.description),
+          options: {
+            store: Object.getOwnPropertyDescriptor(field, "x-fetch")?.value,
+            showRoot: pathInfo.value.showRoot,
+            singleLevel: pathInfo.value.singleLevel
+          }
+        };
+      }
       if (field.enum) {
         return {
           type: "select",
@@ -1206,7 +1412,7 @@ function toFormanSchema(field) {
           options: field.oneOf.filter((value) => value).map((value) => ({ value: value.const }))
         };
       }
-      const textField = {
+      let textField = {
         type: "text",
         label: noEmpty(field.title),
         help: noEmpty(field.description),
@@ -1217,9 +1423,12 @@ function toFormanSchema(field) {
         if (field.pattern) textField.validate.pattern = field.pattern;
         if (field.enum) textField.validate.enum = field.enum;
       }
+      if ("x-search" in field) {
+        textField = handleSearchDirective(textField, field["x-search"]);
+      }
       return textField;
     default:
-      const primitiveField = {
+      let primitiveField = {
         type: JSON_PRIMITIVE_TYPE_MAP[field.type] || "any",
         label: noEmpty(field.title),
         help: noEmpty(field.description),
@@ -1230,9 +1439,20 @@ function toFormanSchema(field) {
         if (field.minimum !== void 0) primitiveField.validate.min = field.minimum;
         if (field.maximum !== void 0) primitiveField.validate.max = field.maximum;
       }
+      if ("x-search" in field) {
+        primitiveField = handleSearchDirective(primitiveField, field["x-search"]);
+      }
       return primitiveField;
   }
 }
+function handleSearchDirective(formanField, directive) {
+  formanField.rpc = {
+    url: directive.url,
+    label: directive.label,
+    parameters: typeof directive.inputSchema.$ref === "string" ? directive.inputSchema.$ref : toFormanSchema(directive.inputSchema).spec
+  };
+  return formanField;
+}
 
 // src/index.ts
 function toJSONSchema(field) {

package/dist/index.d.cts

@@ -35,8 +35,8 @@ type FormanSchemaField = {
     required?: boolean;
     /** Default value for the field */
     default?: FormanSchemaValue;
-    /** Available options for select type fields */
-    options?: FormanSchemaOption[] | FormanSchemaOptionGroup[] | FormanSchemaExtendedOptions | string;
+    /** Available options for fields which support them */
+    options?: (FormanSchemaOption | FormanSchemaOptionGroup)[] | FormanSchemaDirectoryOption[] | FormanSchemaPathExtendedOptions | FormanSchemaExtendedOptions | string;
     /** Help text or description for the field */
     help?: string;
     /** Sub-fields specification for collection or array types */
@@ -87,16 +87,42 @@ type FormanSchemaField = {
  */
 type FormanSchemaRPCButton = {
     /** RPC button label */
-    label: string;
+    label?: string;
     /** RPC button URL */
     url: string;
     /** RPC button parameters */
-    parameters: FormanSchemaField[];
+    parameters: FormanSchemaField[] | string;
 };
 /**
  * Valid Forman Schema values
  */
 type FormanSchemaValue = string | number | boolean | null;
+/**
+ * Extended options for file and folder path selector fields
+ */
+type FormanSchemaPathExtendedOptions = {
+    /** Store for the options */
+    store: FormanSchemaDirectoryOption[] | string;
+    /** Nested fields for every option */
+    nested?: FormanSchemaNested;
+    /** When set to true, all paths start with '/' */
+    showRoot?: boolean;
+    /** Used when the directory entries have labels available, and these are different from their actual IDs */
+    ids?: boolean;
+    /** When set to true, only the entries from the root level are shown, without their children */
+    singleLevel?: boolean;
+};
+/**
+ * Directory entry option for file and folder path selectors
+ */
+type FormanSchemaDirectoryOption = {
+    /** Option value */
+    value: FormanSchemaValue;
+    /** Option label */
+    label?: string;
+    /** Set to true when the entry is a file in combined select mode */
+    file?: boolean;
+};
 /**
  * Option for a select field
  */
@@ -171,6 +197,7 @@ type FormanValidationResult = {
 type FormanSchemaFieldState = {
     mode?: 'chose' | 'edit';
     label?: string;
+    path?: Array<string>;
     data?: Record<string, unknown>;
     nested?: Record<string, FormanSchemaFieldState>;
     items?: Record<string, FormanSchemaFieldState>[];
@@ -216,4 +243,4 @@ declare function validateFormanWithDomains(domains: Record<string, {
  */
 declare function validateForman(values: Record<string, unknown>, schema: FormanSchemaField[], options?: FormanValidationOptions): Promise<FormanValidationResult>;
 
-export { type FormanSchemaExtendedNested, type FormanSchemaExtendedOptions, type FormanSchemaField, type FormanSchemaFieldType, type FormanSchemaNested, type FormanSchemaOption, type FormanSchemaOptionGroup, type FormanSchemaRPCButton, type FormanSchemaValue, toFormanSchema, toJSONSchema, validateForman, validateFormanWithDomains };
+export { type FormanSchemaDirectoryOption, type FormanSchemaExtendedNested, type FormanSchemaExtendedOptions, type FormanSchemaField, type FormanSchemaFieldType, type FormanSchemaNested, type FormanSchemaOption, type FormanSchemaOptionGroup, type FormanSchemaPathExtendedOptions, type FormanSchemaRPCButton, type FormanSchemaValue, toFormanSchema, toJSONSchema, validateForman, validateFormanWithDomains };

package/dist/index.d.ts

@@ -35,8 +35,8 @@ type FormanSchemaField = {
     required?: boolean;
     /** Default value for the field */
     default?: FormanSchemaValue;
-    /** Available options for select type fields */
-    options?: FormanSchemaOption[] | FormanSchemaOptionGroup[] | FormanSchemaExtendedOptions | string;
+    /** Available options for fields which support them */
+    options?: (FormanSchemaOption | FormanSchemaOptionGroup)[] | FormanSchemaDirectoryOption[] | FormanSchemaPathExtendedOptions | FormanSchemaExtendedOptions | string;
     /** Help text or description for the field */
     help?: string;
     /** Sub-fields specification for collection or array types */
@@ -87,16 +87,42 @@ type FormanSchemaField = {
  */
 type FormanSchemaRPCButton = {
     /** RPC button label */
-    label: string;
+    label?: string;
     /** RPC button URL */
     url: string;
     /** RPC button parameters */
-    parameters: FormanSchemaField[];
+    parameters: FormanSchemaField[] | string;
 };
 /**
  * Valid Forman Schema values
  */
 type FormanSchemaValue = string | number | boolean | null;
+/**
+ * Extended options for file and folder path selector fields
+ */
+type FormanSchemaPathExtendedOptions = {
+    /** Store for the options */
+    store: FormanSchemaDirectoryOption[] | string;
+    /** Nested fields for every option */
+    nested?: FormanSchemaNested;
+    /** When set to true, all paths start with '/' */
+    showRoot?: boolean;
+    /** Used when the directory entries have labels available, and these are different from their actual IDs */
+    ids?: boolean;
+    /** When set to true, only the entries from the root level are shown, without their children */
+    singleLevel?: boolean;
+};
+/**
+ * Directory entry option for file and folder path selectors
+ */
+type FormanSchemaDirectoryOption = {
+    /** Option value */
+    value: FormanSchemaValue;
+    /** Option label */
+    label?: string;
+    /** Set to true when the entry is a file in combined select mode */
+    file?: boolean;
+};
 /**
  * Option for a select field
  */
@@ -171,6 +197,7 @@ type FormanValidationResult = {
 type FormanSchemaFieldState = {
     mode?: 'chose' | 'edit';
     label?: string;
+    path?: Array<string>;
     data?: Record<string, unknown>;
     nested?: Record<string, FormanSchemaFieldState>;
     items?: Record<string, FormanSchemaFieldState>[];
@@ -216,4 +243,4 @@ declare function validateFormanWithDomains(domains: Record<string, {
  */
 declare function validateForman(values: Record<string, unknown>, schema: FormanSchemaField[], options?: FormanValidationOptions): Promise<FormanValidationResult>;
 
-export { type FormanSchemaExtendedNested, type FormanSchemaExtendedOptions, type FormanSchemaField, type FormanSchemaFieldType, type FormanSchemaNested, type FormanSchemaOption, type FormanSchemaOptionGroup, type FormanSchemaRPCButton, type FormanSchemaValue, toFormanSchema, toJSONSchema, validateForman, validateFormanWithDomains };
+export { type FormanSchemaDirectoryOption, type FormanSchemaExtendedNested, type FormanSchemaExtendedOptions, type FormanSchemaField, type FormanSchemaFieldType, type FormanSchemaNested, type FormanSchemaOption, type FormanSchemaOptionGroup, type FormanSchemaPathExtendedOptions, type FormanSchemaRPCButton, type FormanSchemaValue, toFormanSchema, toJSONSchema, validateForman, validateFormanWithDomains };

package/dist/index.js

@@ -60,6 +60,15 @@ function normalizeFormanFieldType(field) {
     }
   };
 }
+function findValueInSelectOptions(field, value, optionsAndGroups) {
+  if (!optionsAndGroups) return void 0;
+  if (field.grouped) {
+    const found2 = optionsAndGroups.flatMap((group) => "options" in group ? group.options : []).find((option) => option.value === value);
+    if (found2) return found2;
+  }
+  const found = optionsAndGroups.find((option) => "value" in option && option.value === value);
+  return found;
+}
 function buildRestoreStructure(items) {
   const result = {};
   for (const item of items) {
@@ -287,11 +296,11 @@ function toJSONSchemaInternal(field, context = createDefaultContext()) {
     case "aiagent":
     case "file":
     case "folder":
-      return handleSelectType(normalizedField, result, context);
+      return handleSelectOrPathType(normalizedField, result, context);
     case "filter":
       return handleFilterType(normalizedField, result, context);
     default:
-      return handlePrimitiveType(normalizedField, result);
+      return handlePrimitiveType(normalizedField, result, context);
   }
 }
 function handleCollectionType(field, result, context) {
@@ -407,8 +416,22 @@ function handleFilterType(field, result, context) {
   });
   return result;
 }
-function handleSelectType(field, result, context) {
+function handleSelectOrPathType(field, result, context) {
   const optionsOrGroups = isObject(field.options) ? field.options.store : field.options;
+  if (["file", "folder"].includes(field.type)) {
+    const optionsWrapper = isObject(field.options) ? field.options : void 0;
+    Object.defineProperty(result, "x-path", {
+      configurable: true,
+      enumerable: true,
+      writable: true,
+      value: {
+        type: field.type,
+        showRoot: optionsWrapper?.showRoot ?? true,
+        singleLevel: optionsWrapper?.singleLevel ?? false,
+        ownName: field.name
+      }
+    });
+  }
   const nested = isObject(field.options) ? isObject(field.options.nested) ? field.options.nested.store : field.options.nested : void 0;
   const nestedContainsStrings = Array.isArray(nested) && nested.some((item) => typeof item === "string");
   const domain = isObject(field.options) ? isObject(field.options.nested) && field.options.nested.domain ? field.options.nested.domain : void 0 : void 0;
@@ -420,12 +443,15 @@ function handleSelectType(field, result, context) {
       value: appendQueryString(optionsOrGroups, context.domain, context.tail)
     });
   } else {
-    const options = optionsOrGroups?.some(isOptionGroup) ? optionsOrGroups.flatMap(
-      (group) => group.options.map((option) => ({
-        ...option,
-        label: `${group.label}: ${option.label || option.value}`
-      }))
-    ) : optionsOrGroups || [];
+    const options = optionsOrGroups?.flatMap((optionOrGroup) => {
+      if (isOptionGroup(optionOrGroup)) {
+        return optionOrGroup.options.map((option) => ({
+          ...option,
+          label: `${optionOrGroup.label}: ${option.label || option.value}`
+        }));
+      }
+      return optionOrGroup;
+    });
     if (options?.some((option) => {
       if (isOptionGroup(option)) return option.options.some((option2) => option2.label || option2.nested);
       return option.label || option.nested;
@@ -517,9 +543,10 @@ function handleSelectType(field, result, context) {
       )
     });
   }
+  if (field.rpc) result = processRpcDirective(field, result, context);
   return result;
 }
-function handlePrimitiveType(field, result) {
+function handlePrimitiveType(field, result, context) {
   if (field.default !== "" && field.default != null) {
     result.default = field.default;
   }
@@ -537,6 +564,21 @@ function handlePrimitiveType(field, result) {
       result.enum = field.validate.enum;
     }
   }
+  if (field.rpc) result = processRpcDirective(field, result, context);
+  return result;
+}
+function processRpcDirective(field, result, context) {
+  if (!field.rpc) return result;
+  Object.defineProperty(result, "x-search", {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: {
+      url: appendQueryString(field.rpc.url, context.domain, context.tail),
+      label: field.rpc.label,
+      inputSchema: typeof field.rpc.parameters === "string" ? { $ref: field.rpc.parameters } : toJSONSchemaInternal({ type: "collection", spec: field.rpc.parameters }, context)
+    }
+  });
   return result;
 }
 
@@ -625,7 +667,7 @@ async function validateFormanWithDomainsInternal(domains, options) {
         validateNestedFields: () => {
           throw new Error("Cannot validate nested fields without parent field.");
         },
-        resolveRemote: async (path, context) => {
+        resolveRemote: async (path, context, localData) => {
           if (!options?.resolveRemote) {
             throw new Error("Remote resource not supported when resolver is not provided.");
           }
@@ -636,7 +678,10 @@ async function validateFormanWithDomainsInternal(domains, options) {
             },
             {}
           );
-          return await options.resolveRemote(path, data);
+          return await options.resolveRemote(path, {
+            ...data,
+            ...localData
+          });
         }
       }
     );
@@ -723,9 +768,10 @@ async function validateFormanValue(value, field, context) {
     case "aiagent":
     case "udt":
     case "scenario":
+      return handleSelectType(value, normalizedField, context);
     case "file":
     case "folder":
-      return handleSelectType2(value, normalizedField, context);
+      return handlePathType(value, normalizedField, context);
     case "filter":
       return handleFilterType2(value, normalizedField, context);
     default:
@@ -890,7 +936,152 @@ async function handleFilterType2(value, field, context) {
   };
   return handleArrayType2(value, inlineSchema, context);
 }
-async function handleSelectType2(value, field, context) {
+async function handlePathType(value, field, context) {
+  const errors = [];
+  if (typeof value !== "string") {
+    return {
+      valid: false,
+      errors: [
+        ...errors,
+        {
+          domain: context.domain,
+          path: context.path.join("."),
+          message: `Expected type 'string' for path, got type '${typeof value}'.`
+        }
+      ]
+    };
+  }
+  let showRoot = true;
+  let ids = false;
+  let singleLevel = false;
+  let options;
+  if (isObject(field.options)) {
+    if (field.options.showRoot !== void 0) showRoot = field.options.showRoot;
+    if (field.options.ids !== void 0) ids = field.options.ids;
+    if (field.options.singleLevel !== void 0) singleLevel = field.options.singleLevel;
+    options = field.options.store;
+  } else {
+    options = field.options;
+  }
+  if (singleLevel && (!showRoot && value.includes("/") || showRoot && value.lastIndexOf("/") > 0)) {
+    return {
+      valid: false,
+      errors: [
+        ...errors,
+        {
+          domain: context.domain,
+          path: context.path.join("."),
+          message: `Single level path cannot contain slashes.`
+        }
+      ]
+    };
+  }
+  let nested = field.nested ? field.nested : isObject(field.options) ? field.options.nested : void 0;
+  const levels = value.split("/");
+  if (levels[0] !== "") levels.unshift("");
+  if (showRoot && value === "/" && field.type === "folder") {
+    return {
+      valid: true,
+      errors: []
+    };
+  }
+  if (levels.length < 2) {
+    return {
+      valid: false,
+      errors: [
+        ...errors,
+        {
+          domain: context.domain,
+          path: context.path.join("."),
+          message: `Invalid path "${value}" encountered.`
+        }
+      ]
+    };
+  }
+  const selectedPath = [];
+  let levelOptions = [];
+  for (let levelIndex = 0; levelIndex < levels.length - 1; ++levelIndex) {
+    const isLastLevel = levelIndex === levels.length - 2;
+    const levelSelectedValue = levels[levelIndex + 1];
+    const selectedPathValue = selectedPath.map(({ value: value2 }) => value2).join("/");
+    if (!levelSelectedValue) {
+      return {
+        valid: false,
+        errors: [
+          ...errors,
+          {
+            domain: context.domain,
+            path: context.path.join("."),
+            message: `Invalid selected value of "${value}" encountered.`
+          }
+        ]
+      };
+    }
+    if (typeof options === "string") {
+      try {
+        levelOptions = await context.resolveRemote(options, context, {
+          [field.name]: (showRoot && !selectedPathValue.startsWith("/") ? "/" : "") + selectedPathValue
+        });
+      } catch (error) {
+        return {
+          valid: false,
+          errors: [
+            ...errors,
+            {
+              domain: context.domain,
+              path: context.path.join("."),
+              message: `Failed to resolve remote resource ${options}: ${error}`
+            }
+          ]
+        };
+      }
+    } else if (isLastLevel) {
+      levelOptions = options;
+    }
+    const selectableOptions = levelOptions.flatMap((candidate) => {
+      if (isLastLevel && (field.type === "file" && !candidate.file || field.type === "folder" && candidate.file)) {
+        return [];
+      }
+      if (!isLastLevel && candidate.file) {
+        return [];
+      }
+      return candidate;
+    });
+    const selectedOption = selectableOptions.find((candidate) => candidate.value === levelSelectedValue);
+    if (!selectedOption) {
+      return {
+        valid: false,
+        errors: [
+          ...errors,
+          {
+            domain: context.domain,
+            path: context.path.join("."),
+            message: `Path '${levelSelectedValue}' not found in options.`
+          }
+        ]
+      };
+    }
+    selectedPath.push(selectedOption);
+  }
+  if (ids) {
+    context.roots[context.domain].fieldStates.push({
+      path: context.path,
+      state: {
+        mode: "chose",
+        path: selectedPath.map(({ label, value: value2 }) => label ?? value2)
+      }
+    });
+  }
+  if (nested) {
+    const result = await handleNestedFields(nested, value, field, context);
+    errors.push(...result.errors);
+  }
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+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;
@@ -926,9 +1117,11 @@ async function handleSelectType2(value, field, context) {
       };
     }
     for (const singleValue of value) {
-      const found = field.grouped ? optionsOrGroups.some(
-        (group) => group.options.some((option) => option.value === singleValue)
-      ) : optionsOrGroups.some((option) => option.value === singleValue);
+      const found = findValueInSelectOptions(
+        field,
+        singleValue,
+        optionsOrGroups
+      );
       if (!found) {
         errors.push({
           domain: context.domain,
@@ -954,7 +1147,7 @@ async function handleSelectType2(value, field, context) {
       }
     }
   } else {
-    const item = field.grouped ? optionsOrGroups.find((group) => group.options.some((option) => option.value === value))?.options.find((option) => option.value === value) : optionsOrGroups.find((option) => option.value === value);
+    const item = findValueInSelectOptions(field, value, optionsOrGroups);
     if (!item) {
       return {
         valid: false,
@@ -1162,6 +1355,19 @@ function toFormanSchema(field) {
       }
       return formanSchema;
     case "string":
+      const pathInfo = Object.getOwnPropertyDescriptor(field, "x-path");
+      if (pathInfo) {
+        return {
+          type: pathInfo.value.type,
+          label: noEmpty(field.title),
+          help: noEmpty(field.description),
+          options: {
+            store: Object.getOwnPropertyDescriptor(field, "x-fetch")?.value,
+            showRoot: pathInfo.value.showRoot,
+            singleLevel: pathInfo.value.singleLevel
+          }
+        };
+      }
       if (field.enum) {
         return {
           type: "select",
@@ -1177,7 +1383,7 @@ function toFormanSchema(field) {
           options: field.oneOf.filter((value) => value).map((value) => ({ value: value.const }))
         };
       }
-      const textField = {
+      let textField = {
         type: "text",
         label: noEmpty(field.title),
         help: noEmpty(field.description),
@@ -1188,9 +1394,12 @@ function toFormanSchema(field) {
         if (field.pattern) textField.validate.pattern = field.pattern;
         if (field.enum) textField.validate.enum = field.enum;
       }
+      if ("x-search" in field) {
+        textField = handleSearchDirective(textField, field["x-search"]);
+      }
       return textField;
     default:
-      const primitiveField = {
+      let primitiveField = {
         type: JSON_PRIMITIVE_TYPE_MAP[field.type] || "any",
         label: noEmpty(field.title),
         help: noEmpty(field.description),
@@ -1201,9 +1410,20 @@ function toFormanSchema(field) {
         if (field.minimum !== void 0) primitiveField.validate.min = field.minimum;
         if (field.maximum !== void 0) primitiveField.validate.max = field.maximum;
       }
+      if ("x-search" in field) {
+        primitiveField = handleSearchDirective(primitiveField, field["x-search"]);
+      }
       return primitiveField;
   }
 }
+function handleSearchDirective(formanField, directive) {
+  formanField.rpc = {
+    url: directive.url,
+    label: directive.label,
+    parameters: typeof directive.inputSchema.$ref === "string" ? directive.inputSchema.$ref : toFormanSchema(directive.inputSchema).spec
+  };
+  return formanField;
+}
 
 // src/index.ts
 function toJSONSchema(field) {

package/package.json

@@ -1,10 +1,13 @@
 {
     "name": "@makehq/forman-schema",
-    "version": "1.7.1",
+    "version": "1.8.1",
     "description": "Forman Schema Tools",
     "license": "MIT",
     "author": "Make",
-    "repository": "github:integromat/forman-schema",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/integromat/make-forman-schema.git"
+    },
     "homepage": "https://www.make.com",
     "type": "module",
     "main": "./dist/index.js",