@makehq/forman-schema 1.4.1 → 1.6.0

package/README.md

@@ -185,6 +185,7 @@ const result = await validateFormanWithDomains(
 - email → string
 - file → string
 - filename → string
+- filter → array
 - folder → string
 - hidden → string
 - hook → number

package/dist/index.cjs

@@ -29,6 +29,22 @@ module.exports = __toCommonJS(index_exports);
 
 // src/utils.ts
 var FORMAN_VISUAL_TYPES = ["banner", "markdown", "html", "separator"];
+function isVisualType(type) {
+  return FORMAN_VISUAL_TYPES.includes(type);
+}
+var FORMAN_REFERENCE_TYPES = [
+  "account",
+  "hook",
+  "device",
+  "keychain",
+  "datastore",
+  "aiagent",
+  "udt",
+  "scenario"
+];
+function isReferenceType(type) {
+  return FORMAN_REFERENCE_TYPES.includes(type);
+}
 function noEmpty(text) {
   return text?.trim() || void 0;
 }
@@ -51,8 +67,10 @@ var API_ENDPOINTS = {
   aiagent: "api://ai-agents/v1/agents",
   datastore: "api://data-stores",
   hook: "api://hooks/{{kind}}",
+  device: "api://devices",
   keychain: "api://keys/{{kind}}",
-  udt: "api://data-structures"
+  udt: "api://data-structures",
+  scenario: "api://scenario-list"
 };
 function normalizeFormanFieldType(field) {
   const [type, kind] = field.type.split(":");
@@ -71,6 +89,130 @@ function normalizeFormanFieldType(field) {
     }
   };
 }
+function buildRestoreStructure(items) {
+  const result = {};
+  for (const item of items) {
+    const { domain, path, state } = item;
+    if (!result[domain]) {
+      result[domain] = {};
+    }
+    let current = result[domain];
+    for (const [index, key] of path.entries()) {
+      const nextKey = path[index + 1];
+      const isLastElement = index === path.length - 1;
+      const nextIsNumber = typeof nextKey === "number";
+      if (Array.isArray(current)) {
+        if (typeof key !== "number") {
+          throw new Error("Invalid path");
+        }
+        if (!current[key]) {
+          current[key] = {};
+        }
+        if (nextIsNumber) {
+          if (!current[key].value) {
+            current[key].value = {
+              mode: "chose",
+              items: []
+            };
+          }
+          if (!current[key].value.items) {
+            current[key].value.items = [];
+          }
+          current = current[key].value.items;
+        } else if (isLastElement) {
+          Object.assign(current[key], state);
+        } else {
+          current = current[key];
+        }
+      } else {
+        if (typeof key !== "string") {
+          throw new Error("Invalid path");
+        }
+        if (!current[key]) {
+          current[key] = {};
+        }
+        if (isLastElement) {
+          Object.assign(current[key], state);
+        } else {
+          if (nextIsNumber) {
+            if (!current[key].items) {
+              current[key].items = [];
+              current[key].mode = "chose";
+            }
+            current = current[key].items;
+          } else {
+            if (!current[key].nested) {
+              current[key].nested = {};
+            }
+            current = current[key].nested;
+          }
+        }
+      }
+    }
+  }
+  return result;
+}
+var IML_FILTER_ENTRY_TYPES = ["null", "boolean", "number", "string"];
+var IML_UNARY_FILTER_OPERATORS = ["exist", "notexist"];
+var IML_BINARY_FILTER_OPERATORS = [
+  "text:equal",
+  "text:equal:ci",
+  "text:notequal",
+  "text:notequal:ci",
+  "text:contain",
+  "text:contain:ci",
+  "text:notcontain",
+  "text:notcontain:ci",
+  "text:startwith",
+  "text:startwith:ci",
+  "text:notstartwith",
+  "text:notstartwith:ci",
+  "text:endwith",
+  "text:endwith:ci",
+  "text:notendwith",
+  "text:notendwith:ci",
+  "text:pattern",
+  "text:pattern:ci",
+  "text:notpattern",
+  "text:notpattern:ci",
+  "number:equal",
+  "number:notequal",
+  "number:greater",
+  "number:less",
+  "number:greaterorequal",
+  "number:lessorequal",
+  "date:equal",
+  "date:notequal",
+  "date:greater",
+  "date:less",
+  "date:greaterorequal",
+  "date:lessorequal",
+  "time:equal",
+  "time:notequal",
+  "time:greater",
+  "time:less",
+  "time:greaterorequal",
+  "time:lessorequal",
+  "semver:equal",
+  "semver:notequal",
+  "semver:greater",
+  "semver:less",
+  "semver:greaterorequal",
+  "semver:lessorequal",
+  "array:contain",
+  "array:contain:ci",
+  "array:notcontain",
+  "array:notcontain:ci",
+  "array:equal",
+  "array:notequal",
+  "array:greater",
+  "array:less",
+  "array:greaterorequal",
+  "array:lessorequal",
+  "boolean:equal",
+  "boolean:notequal"
+];
+var IML_FILTER_OPERATORS = [...IML_UNARY_FILTER_OPERATORS, ...IML_BINARY_FILTER_OPERATORS];
 
 // src/forman.ts
 var SchemaConversionError = class extends Error {
@@ -106,6 +248,7 @@ var FORMAN_TYPE_MAP = {
   email: "string",
   filename: "string",
   file: "string",
+  filter: "array",
   folder: "string",
   hidden: void 0,
   integer: "number",
@@ -172,6 +315,8 @@ function toJSONSchemaInternal(field, context = createDefaultContext()) {
     case "file":
     case "folder":
       return handleSelectType(normalizedField, result, context);
+    case "filter":
+      return handleFilterType(normalizedField, result, context);
     default:
       return handlePrimitiveType(normalizedField, result);
   }
@@ -182,7 +327,7 @@ function handleCollectionType(field, result, context) {
     required: []
   });
   function addField(subField, tail) {
-    if (FORMAN_VISUAL_TYPES.includes(subField.type)) {
+    if (isVisualType(subField.type)) {
       return;
     }
     if (!subField.name) return;
@@ -248,6 +393,41 @@ function handleArrayType(field, result, context) {
   }
   return result;
 }
+function handleFilterType(field, result, context) {
+  const filterItems = {
+    oneOf: [
+      {
+        type: "object",
+        properties: {
+          a: { type: IML_FILTER_ENTRY_TYPES },
+          o: { enum: IML_UNARY_FILTER_OPERATORS }
+        },
+        required: ["a", "o"]
+      },
+      {
+        type: "object",
+        properties: {
+          a: { type: IML_FILTER_ENTRY_TYPES },
+          b: { type: IML_FILTER_ENTRY_TYPES },
+          o: { enum: IML_BINARY_FILTER_OPERATORS }
+        },
+        required: ["a", "b", "o"]
+      }
+    ]
+  };
+  const logic = field.logic ?? "default";
+  result.items = ["and", "or"].includes(logic) ? filterItems : {
+    type: "array",
+    items: filterItems
+  };
+  Object.defineProperty(result, "x-filter", {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: logic
+  });
+  return result;
+}
 function handleSelectType(field, result, context) {
   const optionsOrGroups = isObject(field.options) ? field.options.store : field.options;
   const nested = isObject(field.options) ? isObject(field.options.nested) ? field.options.nested.store : field.options.nested : void 0;
@@ -404,6 +584,7 @@ var FORMAN_TYPE_MAP2 = {
   email: "string",
   filename: "string",
   file: "string",
+  filter: "array",
   folder: "string",
   hidden: void 0,
   integer: "number",
@@ -427,6 +608,7 @@ async function validateFormanWithDomainsInternal(domains, options) {
     (acc, domain) => {
       acc[domain] = {
         seenFields: /* @__PURE__ */ new Set(),
+        fieldStates: [],
         validateFields: (fields, context) => {
           return validateFormanValue(
             domains[domain].values,
@@ -484,11 +666,14 @@ async function validateFormanWithDomainsInternal(domains, options) {
   }
   return {
     valid: errors.length === 0,
-    errors
+    errors,
+    states: errors.length === 0 && options?.states ? buildRestoreStructure(
+      Object.keys(domains).map((domain) => roots[domain].fieldStates.map((state) => ({ domain, ...state }))).flat()
+    ) : void 0
   };
 }
 async function validateFormanValue(value, field, context) {
-  if (FORMAN_VISUAL_TYPES.includes(field.type)) {
+  if (isVisualType(field.type)) {
     return {
       valid: true,
       errors: []
@@ -528,6 +713,24 @@ async function validateFormanValue(value, field, context) {
       ]
     };
   }
+  if (containsIMLExpression(value)) {
+    if (normalizedField.mappable === false) {
+      return {
+        valid: false,
+        errors: [
+          {
+            domain: context.domain,
+            path: context.path.join("."),
+            message: "Value contains prohibited IML expression."
+          }
+        ]
+      };
+    }
+    return {
+      valid: true,
+      errors: []
+    };
+  }
   switch (normalizedField.type) {
     case "collection":
       return handleCollectionType2(value, normalizedField, context);
@@ -536,13 +739,17 @@ async function validateFormanValue(value, field, context) {
     case "select":
     case "account":
     case "hook":
+    case "device":
     case "keychain":
     case "datastore":
     case "aiagent":
     case "udt":
+    case "scenario":
     case "file":
     case "folder":
       return handleSelectType2(value, normalizedField, context);
+    case "filter":
+      return handleFilterType2(value, normalizedField, context);
     default:
       return handlePrimitiveType2(value, normalizedField, context);
   }
@@ -579,7 +786,7 @@ async function handleCollectionType2(value, field, context) {
           };
         }
       }
-      if (FORMAN_VISUAL_TYPES.includes(subField.type)) {
+      if (isVisualType(subField.type)) {
         continue;
       }
       if (!subField.name) {
@@ -596,7 +803,7 @@ async function handleCollectionType2(value, field, context) {
         path: [...path, subField.name],
         validateNestedFields: async (fields, context2) => {
           for (const subField2 of fields) {
-            if (FORMAN_VISUAL_TYPES.includes(subField2.type)) {
+            if (isVisualType(subField2.type)) {
               continue;
             }
             if (!subField2.name) {
@@ -643,7 +850,7 @@ async function handleArrayType2(value, field, context) {
       const result = await validateFormanValue(
         item,
         Array.isArray(field.spec) ? { name: index.toString(), type: "collection", spec: field.spec } : Object.assign({}, field.spec, { name: index.toString() }),
-        { ...context, path: [...context.path, index.toString()] }
+        { ...context, path: [...context.path, index] }
       );
       errors.push(...result.errors);
     }
@@ -669,6 +876,42 @@ async function handleArrayType2(value, field, context) {
     errors
   };
 }
+async function handleFilterType2(value, field, context) {
+  const filterEntry = {
+    type: "collection",
+    spec: [
+      {
+        name: "a",
+        type: "any",
+        required: true
+      },
+      {
+        name: "b",
+        type: "any"
+      },
+      {
+        name: "o",
+        type: "text",
+        validate: {
+          enum: IML_FILTER_OPERATORS
+        }
+      }
+    ]
+  };
+  const inlineSchema = ["and", "or"].includes(field.logic ?? "default") ? {
+    name: field.name,
+    type: "array",
+    spec: filterEntry
+  } : {
+    name: field.name,
+    type: "array",
+    spec: {
+      type: "array",
+      spec: filterEntry
+    }
+  };
+  return handleArrayType2(value, inlineSchema, context);
+}
 async function handleSelectType2(value, field, context) {
   const errors = [];
   let optionsOrGroups = isObject(field.options) ? field.options.store : field.options;
@@ -747,6 +990,15 @@ async function handleSelectType2(value, field, context) {
         ]
       };
     }
+    if (item.label) {
+      context.roots[context.domain].fieldStates.push({
+        path: context.path,
+        state: {
+          mode: isReferenceType(field.type) ? void 0 : "chose",
+          label: item.label
+        }
+      });
+    }
     if (item.nested) nested = item.nested;
   }
   if (nested) {
@@ -815,18 +1067,6 @@ async function handleNestedFields(nested, value, field, context) {
 }
 async function handlePrimitiveType2(value, field, context) {
   const errors = [];
-  if (containsIMLExpression(value)) {
-    return {
-      valid: true,
-      errors
-    };
-  }
-  if (errors.length > 0) {
-    return {
-      valid: false,
-      errors
-    };
-  }
   if (field.validate) {
     if (typeof value === "string") {
       if (field.validate.pattern && !new RegExp(
@@ -916,6 +1156,15 @@ function toFormanSchema(field) {
         spec
       };
     case "array":
+      const filterLogic = Object.getOwnPropertyDescriptor(field, "x-filter");
+      if (filterLogic) {
+        return {
+          type: "filter",
+          label: noEmpty(field.title),
+          help: noEmpty(field.description),
+          logic: filterLogic.value === "default" ? void 0 : filterLogic.value
+        };
+      }
       const items = field.items && isObject(field.items) ? field.items : void 0;
       const formanSchema = {
         type: "array",

package/dist/index.d.cts

@@ -3,7 +3,7 @@ import { JSONSchema7 } from 'json-schema';
 /**
  * Valid Forman Schema field types
  */
-type FormanSchemaFieldType = 'aiagent' | 'account' | 'hook' | 'keychain' | 'datastore' | 'udt' | 'array' | 'collection' | 'text' | 'number' | 'boolean' | 'date' | 'json' | 'buffer' | 'cert' | 'color' | 'email' | 'filename' | 'file' | 'folder' | 'hidden' | 'integer' | 'uinteger' | 'path' | 'pkey' | 'port' | 'select' | 'time' | 'timestamp' | 'timezone' | 'url' | 'uuid' | `account:${string}` | `hook:${string}` | `keychain:${string}` | 'banner' | 'markdown' | 'html' | 'separator' | string;
+type FormanSchemaFieldType = 'aiagent' | 'account' | 'hook' | 'device' | 'keychain' | 'datastore' | 'udt' | 'scenario' | 'array' | 'collection' | 'text' | 'number' | 'boolean' | 'date' | 'json' | 'buffer' | 'cert' | 'color' | 'email' | 'filename' | 'file' | 'filter' | 'folder' | 'hidden' | 'integer' | 'uinteger' | 'path' | 'pkey' | 'port' | 'select' | 'time' | 'timestamp' | 'timezone' | 'url' | 'uuid' | `account:${string}` | `hook:${string}` | `keychain:${string}` | 'banner' | 'markdown' | 'html' | 'separator' | string;
 /**
  * Validation configuration for Forman Schema fields
  */
@@ -79,6 +79,8 @@ type FormanSchemaField = {
     sort?: string;
     /** Adds an extra button to the field which opens an extra form. When the form is submitted, a specified RPC is called and the result is set as a new value of the parameter. */
     rpc?: FormanSchemaRPCButton;
+    /** Definition of boolean logic to apply (filter only) */
+    logic?: 'and' | 'or' | 'reverse';
 } & Record<`x-${string}`, unknown>;
 /**
  * RPC button allows for dynamic value retrieval from an external source
@@ -163,10 +165,21 @@ type FormanValidationResult = {
         /** Error message */
         message: string;
     }[];
+    /** States of fields grouped by domain */
+    states?: Record<string, FormanSchemaFieldState>;
+};
+type FormanSchemaFieldState = {
+    mode?: 'chose' | 'edit';
+    label?: string;
+    data?: Record<string, unknown>;
+    nested?: Record<string, FormanSchemaFieldState>;
+    items?: Record<string, FormanSchemaFieldState>[];
 };
 type FormanValidationOptions = {
     /** Unknown fields are not allowed when strict is true */
     strict?: boolean;
+    /** Whether to generate states for fields */
+    states?: boolean;
     /** Remote resource resolver */
     resolveRemote?(path: string, data: Record<string, unknown>): Promise<unknown>;
 };

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { JSONSchema7 } from 'json-schema';
 /**
  * Valid Forman Schema field types
  */
-type FormanSchemaFieldType = 'aiagent' | 'account' | 'hook' | 'keychain' | 'datastore' | 'udt' | 'array' | 'collection' | 'text' | 'number' | 'boolean' | 'date' | 'json' | 'buffer' | 'cert' | 'color' | 'email' | 'filename' | 'file' | 'folder' | 'hidden' | 'integer' | 'uinteger' | 'path' | 'pkey' | 'port' | 'select' | 'time' | 'timestamp' | 'timezone' | 'url' | 'uuid' | `account:${string}` | `hook:${string}` | `keychain:${string}` | 'banner' | 'markdown' | 'html' | 'separator' | string;
+type FormanSchemaFieldType = 'aiagent' | 'account' | 'hook' | 'device' | 'keychain' | 'datastore' | 'udt' | 'scenario' | 'array' | 'collection' | 'text' | 'number' | 'boolean' | 'date' | 'json' | 'buffer' | 'cert' | 'color' | 'email' | 'filename' | 'file' | 'filter' | 'folder' | 'hidden' | 'integer' | 'uinteger' | 'path' | 'pkey' | 'port' | 'select' | 'time' | 'timestamp' | 'timezone' | 'url' | 'uuid' | `account:${string}` | `hook:${string}` | `keychain:${string}` | 'banner' | 'markdown' | 'html' | 'separator' | string;
 /**
  * Validation configuration for Forman Schema fields
  */
@@ -79,6 +79,8 @@ type FormanSchemaField = {
     sort?: string;
     /** Adds an extra button to the field which opens an extra form. When the form is submitted, a specified RPC is called and the result is set as a new value of the parameter. */
     rpc?: FormanSchemaRPCButton;
+    /** Definition of boolean logic to apply (filter only) */
+    logic?: 'and' | 'or' | 'reverse';
 } & Record<`x-${string}`, unknown>;
 /**
  * RPC button allows for dynamic value retrieval from an external source
@@ -163,10 +165,21 @@ type FormanValidationResult = {
         /** Error message */
         message: string;
     }[];
+    /** States of fields grouped by domain */
+    states?: Record<string, FormanSchemaFieldState>;
+};
+type FormanSchemaFieldState = {
+    mode?: 'chose' | 'edit';
+    label?: string;
+    data?: Record<string, unknown>;
+    nested?: Record<string, FormanSchemaFieldState>;
+    items?: Record<string, FormanSchemaFieldState>[];
 };
 type FormanValidationOptions = {
     /** Unknown fields are not allowed when strict is true */
     strict?: boolean;
+    /** Whether to generate states for fields */
+    states?: boolean;
     /** Remote resource resolver */
     resolveRemote?(path: string, data: Record<string, unknown>): Promise<unknown>;
 };

package/dist/index.js

@@ -1,5 +1,21 @@
 // src/utils.ts
 var FORMAN_VISUAL_TYPES = ["banner", "markdown", "html", "separator"];
+function isVisualType(type) {
+  return FORMAN_VISUAL_TYPES.includes(type);
+}
+var FORMAN_REFERENCE_TYPES = [
+  "account",
+  "hook",
+  "device",
+  "keychain",
+  "datastore",
+  "aiagent",
+  "udt",
+  "scenario"
+];
+function isReferenceType(type) {
+  return FORMAN_REFERENCE_TYPES.includes(type);
+}
 function noEmpty(text) {
   return text?.trim() || void 0;
 }
@@ -22,8 +38,10 @@ var API_ENDPOINTS = {
   aiagent: "api://ai-agents/v1/agents",
   datastore: "api://data-stores",
   hook: "api://hooks/{{kind}}",
+  device: "api://devices",
   keychain: "api://keys/{{kind}}",
-  udt: "api://data-structures"
+  udt: "api://data-structures",
+  scenario: "api://scenario-list"
 };
 function normalizeFormanFieldType(field) {
   const [type, kind] = field.type.split(":");
@@ -42,6 +60,130 @@ function normalizeFormanFieldType(field) {
     }
   };
 }
+function buildRestoreStructure(items) {
+  const result = {};
+  for (const item of items) {
+    const { domain, path, state } = item;
+    if (!result[domain]) {
+      result[domain] = {};
+    }
+    let current = result[domain];
+    for (const [index, key] of path.entries()) {
+      const nextKey = path[index + 1];
+      const isLastElement = index === path.length - 1;
+      const nextIsNumber = typeof nextKey === "number";
+      if (Array.isArray(current)) {
+        if (typeof key !== "number") {
+          throw new Error("Invalid path");
+        }
+        if (!current[key]) {
+          current[key] = {};
+        }
+        if (nextIsNumber) {
+          if (!current[key].value) {
+            current[key].value = {
+              mode: "chose",
+              items: []
+            };
+          }
+          if (!current[key].value.items) {
+            current[key].value.items = [];
+          }
+          current = current[key].value.items;
+        } else if (isLastElement) {
+          Object.assign(current[key], state);
+        } else {
+          current = current[key];
+        }
+      } else {
+        if (typeof key !== "string") {
+          throw new Error("Invalid path");
+        }
+        if (!current[key]) {
+          current[key] = {};
+        }
+        if (isLastElement) {
+          Object.assign(current[key], state);
+        } else {
+          if (nextIsNumber) {
+            if (!current[key].items) {
+              current[key].items = [];
+              current[key].mode = "chose";
+            }
+            current = current[key].items;
+          } else {
+            if (!current[key].nested) {
+              current[key].nested = {};
+            }
+            current = current[key].nested;
+          }
+        }
+      }
+    }
+  }
+  return result;
+}
+var IML_FILTER_ENTRY_TYPES = ["null", "boolean", "number", "string"];
+var IML_UNARY_FILTER_OPERATORS = ["exist", "notexist"];
+var IML_BINARY_FILTER_OPERATORS = [
+  "text:equal",
+  "text:equal:ci",
+  "text:notequal",
+  "text:notequal:ci",
+  "text:contain",
+  "text:contain:ci",
+  "text:notcontain",
+  "text:notcontain:ci",
+  "text:startwith",
+  "text:startwith:ci",
+  "text:notstartwith",
+  "text:notstartwith:ci",
+  "text:endwith",
+  "text:endwith:ci",
+  "text:notendwith",
+  "text:notendwith:ci",
+  "text:pattern",
+  "text:pattern:ci",
+  "text:notpattern",
+  "text:notpattern:ci",
+  "number:equal",
+  "number:notequal",
+  "number:greater",
+  "number:less",
+  "number:greaterorequal",
+  "number:lessorequal",
+  "date:equal",
+  "date:notequal",
+  "date:greater",
+  "date:less",
+  "date:greaterorequal",
+  "date:lessorequal",
+  "time:equal",
+  "time:notequal",
+  "time:greater",
+  "time:less",
+  "time:greaterorequal",
+  "time:lessorequal",
+  "semver:equal",
+  "semver:notequal",
+  "semver:greater",
+  "semver:less",
+  "semver:greaterorequal",
+  "semver:lessorequal",
+  "array:contain",
+  "array:contain:ci",
+  "array:notcontain",
+  "array:notcontain:ci",
+  "array:equal",
+  "array:notequal",
+  "array:greater",
+  "array:less",
+  "array:greaterorequal",
+  "array:lessorequal",
+  "boolean:equal",
+  "boolean:notequal"
+];
+var IML_FILTER_OPERATORS = [...IML_UNARY_FILTER_OPERATORS, ...IML_BINARY_FILTER_OPERATORS];
 
 // src/forman.ts
 var SchemaConversionError = class extends Error {
@@ -77,6 +219,7 @@ var FORMAN_TYPE_MAP = {
   email: "string",
   filename: "string",
   file: "string",
+  filter: "array",
   folder: "string",
   hidden: void 0,
   integer: "number",
@@ -143,6 +286,8 @@ function toJSONSchemaInternal(field, context = createDefaultContext()) {
     case "file":
     case "folder":
       return handleSelectType(normalizedField, result, context);
+    case "filter":
+      return handleFilterType(normalizedField, result, context);
     default:
       return handlePrimitiveType(normalizedField, result);
   }
@@ -153,7 +298,7 @@ function handleCollectionType(field, result, context) {
     required: []
   });
   function addField(subField, tail) {
-    if (FORMAN_VISUAL_TYPES.includes(subField.type)) {
+    if (isVisualType(subField.type)) {
       return;
     }
     if (!subField.name) return;
@@ -219,6 +364,41 @@ function handleArrayType(field, result, context) {
   }
   return result;
 }
+function handleFilterType(field, result, context) {
+  const filterItems = {
+    oneOf: [
+      {
+        type: "object",
+        properties: {
+          a: { type: IML_FILTER_ENTRY_TYPES },
+          o: { enum: IML_UNARY_FILTER_OPERATORS }
+        },
+        required: ["a", "o"]
+      },
+      {
+        type: "object",
+        properties: {
+          a: { type: IML_FILTER_ENTRY_TYPES },
+          b: { type: IML_FILTER_ENTRY_TYPES },
+          o: { enum: IML_BINARY_FILTER_OPERATORS }
+        },
+        required: ["a", "b", "o"]
+      }
+    ]
+  };
+  const logic = field.logic ?? "default";
+  result.items = ["and", "or"].includes(logic) ? filterItems : {
+    type: "array",
+    items: filterItems
+  };
+  Object.defineProperty(result, "x-filter", {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: logic
+  });
+  return result;
+}
 function handleSelectType(field, result, context) {
   const optionsOrGroups = isObject(field.options) ? field.options.store : field.options;
   const nested = isObject(field.options) ? isObject(field.options.nested) ? field.options.nested.store : field.options.nested : void 0;
@@ -375,6 +555,7 @@ var FORMAN_TYPE_MAP2 = {
   email: "string",
   filename: "string",
   file: "string",
+  filter: "array",
   folder: "string",
   hidden: void 0,
   integer: "number",
@@ -398,6 +579,7 @@ async function validateFormanWithDomainsInternal(domains, options) {
     (acc, domain) => {
       acc[domain] = {
         seenFields: /* @__PURE__ */ new Set(),
+        fieldStates: [],
         validateFields: (fields, context) => {
           return validateFormanValue(
             domains[domain].values,
@@ -455,11 +637,14 @@ async function validateFormanWithDomainsInternal(domains, options) {
   }
   return {
     valid: errors.length === 0,
-    errors
+    errors,
+    states: errors.length === 0 && options?.states ? buildRestoreStructure(
+      Object.keys(domains).map((domain) => roots[domain].fieldStates.map((state) => ({ domain, ...state }))).flat()
+    ) : void 0
   };
 }
 async function validateFormanValue(value, field, context) {
-  if (FORMAN_VISUAL_TYPES.includes(field.type)) {
+  if (isVisualType(field.type)) {
     return {
       valid: true,
       errors: []
@@ -499,6 +684,24 @@ async function validateFormanValue(value, field, context) {
       ]
     };
   }
+  if (containsIMLExpression(value)) {
+    if (normalizedField.mappable === false) {
+      return {
+        valid: false,
+        errors: [
+          {
+            domain: context.domain,
+            path: context.path.join("."),
+            message: "Value contains prohibited IML expression."
+          }
+        ]
+      };
+    }
+    return {
+      valid: true,
+      errors: []
+    };
+  }
   switch (normalizedField.type) {
     case "collection":
       return handleCollectionType2(value, normalizedField, context);
@@ -507,13 +710,17 @@ async function validateFormanValue(value, field, context) {
     case "select":
     case "account":
     case "hook":
+    case "device":
     case "keychain":
     case "datastore":
     case "aiagent":
     case "udt":
+    case "scenario":
     case "file":
     case "folder":
       return handleSelectType2(value, normalizedField, context);
+    case "filter":
+      return handleFilterType2(value, normalizedField, context);
     default:
       return handlePrimitiveType2(value, normalizedField, context);
   }
@@ -550,7 +757,7 @@ async function handleCollectionType2(value, field, context) {
           };
         }
       }
-      if (FORMAN_VISUAL_TYPES.includes(subField.type)) {
+      if (isVisualType(subField.type)) {
         continue;
       }
       if (!subField.name) {
@@ -567,7 +774,7 @@ async function handleCollectionType2(value, field, context) {
         path: [...path, subField.name],
         validateNestedFields: async (fields, context2) => {
           for (const subField2 of fields) {
-            if (FORMAN_VISUAL_TYPES.includes(subField2.type)) {
+            if (isVisualType(subField2.type)) {
               continue;
             }
             if (!subField2.name) {
@@ -614,7 +821,7 @@ async function handleArrayType2(value, field, context) {
       const result = await validateFormanValue(
         item,
         Array.isArray(field.spec) ? { name: index.toString(), type: "collection", spec: field.spec } : Object.assign({}, field.spec, { name: index.toString() }),
-        { ...context, path: [...context.path, index.toString()] }
+        { ...context, path: [...context.path, index] }
       );
       errors.push(...result.errors);
     }
@@ -640,6 +847,42 @@ async function handleArrayType2(value, field, context) {
     errors
   };
 }
+async function handleFilterType2(value, field, context) {
+  const filterEntry = {
+    type: "collection",
+    spec: [
+      {
+        name: "a",
+        type: "any",
+        required: true
+      },
+      {
+        name: "b",
+        type: "any"
+      },
+      {
+        name: "o",
+        type: "text",
+        validate: {
+          enum: IML_FILTER_OPERATORS
+        }
+      }
+    ]
+  };
+  const inlineSchema = ["and", "or"].includes(field.logic ?? "default") ? {
+    name: field.name,
+    type: "array",
+    spec: filterEntry
+  } : {
+    name: field.name,
+    type: "array",
+    spec: {
+      type: "array",
+      spec: filterEntry
+    }
+  };
+  return handleArrayType2(value, inlineSchema, context);
+}
 async function handleSelectType2(value, field, context) {
   const errors = [];
   let optionsOrGroups = isObject(field.options) ? field.options.store : field.options;
@@ -718,6 +961,15 @@ async function handleSelectType2(value, field, context) {
         ]
       };
     }
+    if (item.label) {
+      context.roots[context.domain].fieldStates.push({
+        path: context.path,
+        state: {
+          mode: isReferenceType(field.type) ? void 0 : "chose",
+          label: item.label
+        }
+      });
+    }
     if (item.nested) nested = item.nested;
   }
   if (nested) {
@@ -786,18 +1038,6 @@ async function handleNestedFields(nested, value, field, context) {
 }
 async function handlePrimitiveType2(value, field, context) {
   const errors = [];
-  if (containsIMLExpression(value)) {
-    return {
-      valid: true,
-      errors
-    };
-  }
-  if (errors.length > 0) {
-    return {
-      valid: false,
-      errors
-    };
-  }
   if (field.validate) {
     if (typeof value === "string") {
       if (field.validate.pattern && !new RegExp(
@@ -887,6 +1127,15 @@ function toFormanSchema(field) {
         spec
       };
     case "array":
+      const filterLogic = Object.getOwnPropertyDescriptor(field, "x-filter");
+      if (filterLogic) {
+        return {
+          type: "filter",
+          label: noEmpty(field.title),
+          help: noEmpty(field.description),
+          logic: filterLogic.value === "default" ? void 0 : filterLogic.value
+        };
+      }
       const items = field.items && isObject(field.items) ? field.items : void 0;
       const formanSchema = {
         type: "array",

package/package.json

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