@makehq/forman-schema 1.16.0 → 1.18.0

package/README.md

@@ -291,11 +291,53 @@ const result = await validateFormanWithDomains(
 - object → collection
 - array → array
 
+## Field type resolution
+
+Field types resolve through three steps, so schemas authored with loose casing or common synonyms
+still convert:
+
+1. **Exact match** against `FORMAN_TYPE_MAP`.
+2. **Case-insensitive match** — `fileName`, `Boolean`, `URL`, `Select` resolve to their canonical
+   lowercase types. The index is derived from the map itself, so new entries get this for free.
+3. **Aliases** — `string→text`, `bool→boolean`, `datetime→date`, `float→number`,
+   `upload→filestorage`. Only unambiguous, information-preserving synonyms are aliased.
+
+A `type:kind` suffix (`account:google`, `device:apn`) resolves on its base type and keeps the kind,
+which drives the `api://` store expansion.
+
+### Unconvertible fields
+
+A field whose type is **missing or unresolvable** is degraded to a permissive typeless schema (the
+same shape `any` produces) instead of aborting the conversion, and its dot-notation path is reported
+on `toJSONSchemaAdvanced`'s `skippedPaths.unconvertible`:
+
+```js
+const { schema, skippedPaths } = toJSONSchemaAdvanced({
+    name: 'wrapper',
+    type: 'collection',
+    spec: [
+        { name: 'good', type: 'text' },
+        { name: 'odd', type: 'somethingNew' },
+    ],
+});
+// schema.properties → { good: { type: 'string' }, odd: {} }
+// skippedPaths      → { unconvertible: ['wrapper.odd (unknown type: somethingNew)'] }
+```
+
+This is deliberate: the throw was fatal at any depth, so a single unrecognized leaf field destroyed
+the whole schema and left consumers with nothing. Types requiring a guess about intent (`tags`,
+`category`, `object`) are degraded rather than aliased — a degraded field is honest, a wrongly
+aliased one is a lie the consumer will act on.
+
+Pass `{ strictFieldTypes: true }` to restore fail-fast throwing.
+
 ## Error Handling
 
 ### SchemaConversionError
 
-`SchemaConversionError` is thrown when schema conversion fails. It includes a message and optionally the field that caused the error.
+`SchemaConversionError` is thrown when schema conversion fails, and for unresolvable field types
+only when `strictFieldTypes: true` is set. It carries a message and the `field` that caused the
+error.
 
 ## Testing
 

package/dist/index.cjs

@@ -20,6 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  SchemaConversionError: () => SchemaConversionError,
+  resolveFormanFieldType: () => resolveFormanFieldType,
   toFormanSchema: () => toFormanSchema,
   toJSONSchema: () => toJSONSchema,
   toJSONSchemaAdvanced: () => toJSONSchemaAdvanced,
@@ -56,6 +58,9 @@ function noEmpty(text) {
 function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isBooleanBranchNested(nested) {
+  return isObject(nested) && !("store" in nested) && ("true" in nested || "false" in nested);
+}
 function isOptionGroup(value) {
   return "options" in value && Array.isArray(value.options);
 }
@@ -543,11 +548,13 @@ var SchemaConversionError = class extends Error {
   constructor(message, field) {
     super(message);
     this.name = "SchemaConversionError";
+    this.field = field;
   }
 };
 var FORMAN_TYPE_MAP = {
   account: "number",
   hook: "number",
+  device: "number",
   keychain: "number",
   datastore: "number",
   aiagent: "string",
@@ -591,14 +598,29 @@ var FORMAN_TYPE_MAP = {
   uuid: "string",
   any: void 0
 };
-function validateFormanField(field) {
-  if (!field.type) {
-    throw new SchemaConversionError("Field type is required", field);
-  }
-  const normalizedType = field.type.includes(":") ? field.type.split(":")[0] : field.type;
-  if (!Object.keys(FORMAN_TYPE_MAP).includes(normalizedType)) {
-    throw new SchemaConversionError(`Unknown field type: ${field.type}`, field);
-  }
+var FORMAN_TYPE_LOOKUP = new Map(
+  Object.keys(FORMAN_TYPE_MAP).map((key) => [key.toLowerCase(), key])
+);
+var FORMAN_TYPE_ALIASES = {
+  // Forman's plain-string primitive is `text`; there is no `string` type.
+  string: "text",
+  bool: "boolean",
+  // Forman's `date` already carries time (see `time` on FormanSchemaField, default true).
+  datetime: "date",
+  // JSON Schema has no float; `number` is the only target.
+  float: "number",
+  // `upload` is the validator's existing name for the same array-shaped type.
+  upload: "filestorage"
+};
+function resolveFormanFieldType(rawType) {
+  if (!rawType) return void 0;
+  const base = rawType.includes(":") ? rawType.split(":")[0] : rawType;
+  const lower = base.toLowerCase();
+  return FORMAN_TYPE_LOOKUP.get(lower) ?? FORMAN_TYPE_ALIASES[lower];
+}
+function canonicalTypeWithKind(rawType, canonicalType) {
+  const separatorIndex = rawType.indexOf(":");
+  return separatorIndex === -1 ? canonicalType : `${canonicalType}${rawType.slice(separatorIndex)}`;
 }
 function appendQueryString(path, domain, tail) {
   if (path.startsWith("api://")) return path;
@@ -616,6 +638,7 @@ function createDefaultContext(options) {
     roots: {},
     definitions: {},
     excludeAdvancedFields: options?.excludeAdvancedFields ?? false,
+    strictFieldTypes: options?.strictFieldTypes ?? false,
     skippedPaths: {},
     addConditionalFields: () => {
       throw new SchemaConversionError("Cannot serialize nested fields without parent field.");
@@ -627,8 +650,19 @@ var compositeHandlers = {
   udttype: { expand: udttypeExpand, extractInner: udttypeExtractInner, wrapRef: udttypeWrapRef }
 };
 function toJSONSchemaInternal(field, context) {
-  validateFormanField(field);
-  const normalizedField = normalizeFormanFieldType(field);
+  const canonicalType = resolveFormanFieldType(field.type);
+  if (!canonicalType) {
+    if (context.strictFieldTypes) {
+      throw new SchemaConversionError(
+        field.type ? `Unknown field type: ${field.type}` : "Field type is required",
+        field
+      );
+    }
+    return degradeUnconvertibleField(field, context);
+  }
+  const normalizedField = normalizeFormanFieldType(
+    canonicalType === field.type ? field : { ...field, type: canonicalTypeWithKind(field.type, canonicalType) }
+  );
   const handler = compositeHandlers[normalizedField.type];
   if (handler) {
     const type = normalizedField.type;
@@ -1043,6 +1077,16 @@ function handleJsonType(field, result) {
   });
   return result;
 }
+function degradeUnconvertibleField(field, context) {
+  const path = field.name ? [...context.path, field.name].join(".") : context.path.join(".");
+  const reason = field.type ? `unknown type: ${field.type}` : "missing type";
+  (context.skippedPaths.unconvertible ||= []).push(`${path} (${reason})`);
+  return {
+    type: FORMAN_TYPE_MAP["any"],
+    title: noEmpty(field.label),
+    description: noEmpty(field.help)
+  };
+}
 function handlePrimitiveType(field, result, context) {
   if (field.default !== "" && field.default != null) {
     result.default = field.default;
@@ -1083,7 +1127,7 @@ function processRpcDirective(field, result, context) {
   return result;
 }
 function extractNestedAndDomain(field) {
-  const nested = isObject(field.options) ? isObject(field.options.nested) ? field.options.nested.store : field.options.nested : isObject(field.nested) ? field.nested.store : field.nested;
+  const nested = isObject(field.options) ? isObject(field.options.nested) ? field.options.nested.store : field.options.nested : isBooleanBranchNested(field.nested) ? void 0 : isObject(field.nested) ? field.nested.store : field.nested;
   const domain = isObject(field.options) ? isObject(field.options.nested) && field.options.nested.domain ? field.options.nested.domain : void 0 : isObject(field.nested) && field.nested.domain ? field.nested.domain : void 0;
   return { nested, domain };
 }
@@ -1352,6 +1396,13 @@ async function validateFormanWithDomainsInternal(domains, options) {
   };
 }
 async function validateFormanValue(value, field, context) {
+  if (context.registerOnly) {
+    return {
+      valid: true,
+      errors: [],
+      warnings: []
+    };
+  }
   if (isVisualType(field.type)) {
     return {
       valid: true,
@@ -1359,8 +1410,21 @@ async function validateFormanValue(value, field, context) {
       warnings: []
     };
   }
+  if (!field.type) {
+    return {
+      valid: false,
+      errors: [
+        {
+          domain: context.domain,
+          path: context.path.join("."),
+          message: "Field type is required."
+        }
+      ],
+      warnings: []
+    };
+  }
   const normalizedField = normalizeFormanFieldType(field);
-  if (normalizedField.required && (value == null || value === "")) {
+  if (normalizedField.required && !context.suppressRequired && (value == null || value === "")) {
     return {
       valid: false,
       errors: [
@@ -1530,7 +1594,7 @@ async function handleCollectionType2(value, field, context) {
               continue;
             }
             if (context2.strict && !seen.has(subField2.name)) seen.add(subField2.name);
-            if (path.length === 0) {
+            if (path.length === 0 && !context2.registerOnly) {
               context2.roots[context2.domain].schemaFields.push(clampFieldForSchema(subField2));
             }
             const result2 = await validateFormanValue(value[subField2.name], subField2, {
@@ -2123,7 +2187,7 @@ async function handlePrimitiveType2(value, field, context) {
   }
   const nested = extractNestedFromField(field);
   if (nested) {
-    const result = await handleNestedFields(nested, value, field, context);
+    const result = FORMAN_TYPE_MAP2[field.type] === "boolean" ? await handleBooleanNestedFields(nested, value, field, context) : await handleNestedFields(nested, value, field, context);
     errors.push(...result.errors);
     warnings.push(...result.warnings);
   }
@@ -2133,6 +2197,19 @@ async function handlePrimitiveType2(value, field, context) {
     warnings
   };
 }
+async function handleBooleanNestedFields(nested, value, field, context) {
+  if (isBooleanBranchNested(nested)) {
+    const active2 = value === false ? nested.false : nested.true;
+    const inactive = value === false ? nested.true : nested.false;
+    const result = active2 ? await handleNestedFields(active2, value, field, context) : { valid: true, errors: [], warnings: [] };
+    if (context.strict && inactive) {
+      await handleNestedFields(inactive, value, field, { ...context, registerOnly: true });
+    }
+    return result;
+  }
+  const active = field.reversedNested === true ? value === false : value === true;
+  return handleNestedFields(nested, value, field, active ? context : { ...context, suppressRequired: true });
+}
 
 // src/json.ts
 var JSON_PRIMITIVE_TYPE_MAP = {
@@ -2304,6 +2381,9 @@ function toJSONSchemaAdvanced(field, options) {
   if (context.skippedPaths.advanced?.length) {
     skippedPaths.advanced = context.skippedPaths.advanced;
   }
+  if (context.skippedPaths.unconvertible?.length) {
+    skippedPaths.unconvertible = context.skippedPaths.unconvertible;
+  }
   return {
     schema,
     ...Object.keys(skippedPaths).length > 0 ? { skippedPaths } : {}
@@ -2323,6 +2403,8 @@ function validateForman(values, schema, options, restoreExtras) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  SchemaConversionError,
+  resolveFormanFieldType,
   toFormanSchema,
   toJSONSchema,
   toJSONSchemaAdvanced,

package/dist/index.d.cts

@@ -47,8 +47,8 @@ type FormanSchemaField = {
     advanced?: boolean;
     /** Human readable label for the field */
     label?: string;
-    /** Nested fields */
-    nested?: FormanSchemaNested;
+    nested?: FormanSchemaNested | FormanSchemaBooleanNested;
+    reversedNested?: boolean;
     /** Validation rules */
     validate?: FormanSchemaValidation;
     /** Whether the field is disabled (`false` by default) */
@@ -186,6 +186,10 @@ type FormanSchemaExtendedNested = {
     /** Domain for the nested fields */
     domain?: string;
 };
+type FormanSchemaBooleanNested = {
+    true?: (FormanSchemaField | string)[] | string;
+    false?: (FormanSchemaField | string)[] | string;
+};
 /**
  * Validation result
  */
@@ -240,6 +244,14 @@ type FormanJsonSchemaOptions = {
      * `toJSONSchemaAdvanced`'s `skippedPaths.advanced` so the caller can re-request them.
      */
     excludeAdvancedFields?: boolean;
+    /**
+     * Throw a `SchemaConversionError` when a field's type cannot be resolved, instead of degrading
+     * it to a permissive typeless schema. Defaults to `false` — by default, unresolvable fields are
+     * degraded and their dot-notation paths reported on `toJSONSchemaAdvanced`'s
+     * `skippedPaths.unconvertible`, so one unrecognized field can no longer abort the whole
+     * conversion. Set `true` only when a caller genuinely wants fail-fast behaviour.
+     */
+    strictFieldTypes?: boolean;
 };
 /**
  * Result of converting a Forman Schema to JSON Schema
@@ -251,6 +263,12 @@ type FormanJsonSchemaResult = {
     skippedPaths?: {
         /** Dot-notation paths of advanced fields that were skipped. Present only when at least one advanced field was skipped. */
         advanced?: string[];
+        /**
+         * Dot-notation paths of fields whose type could not be resolved and were therefore degraded
+         * to a permissive typeless schema. Each entry is suffixed with the reason —
+         * `(unknown type: X)` or `(missing type)`. Present only when at least one field was degraded.
+         */
+        unconvertible?: string[];
     };
 };
 /**
@@ -294,6 +312,26 @@ type FormanValidationOptions = {
  */
 declare function toFormanSchema(field: JSONSchema7): FormanSchemaField;
 
+/**
+ * Error thrown when schema conversion fails
+ */
+declare class SchemaConversionError extends Error {
+    /** Field that caused the error */
+    readonly field?: FormanSchemaField | JSONSchema7;
+    /**
+     * @param message The error message
+     * @param field The field that caused the error
+     */
+    constructor(message: string, field?: FormanSchemaField | JSONSchema7);
+}
+/**
+ * Resolves a raw Forman field type to a canonical `FORMAN_TYPE_MAP` key, handling `type:kind`
+ * prefixes, casing and known aliases.
+ * @param rawType The raw field type from the Forman schema
+ * @returns The canonical type key, or `undefined` when the type is missing or unresolvable
+ */
+declare function resolveFormanFieldType(rawType: string | undefined): string | undefined;
+
 /**
  * Converts a Forman Schema field to its JSON Schema equivalent and reports the paths of any
  * fields that were skipped during conversion.
@@ -311,6 +349,13 @@ declare function toFormanSchema(field: JSONSchema7): FormanSchemaField;
  * `definitions[type]`; advanced fields inside a composite template are recorded with the
  * path of the FIRST usage only. See the comment near `compositeHandlers` in `src/forman.ts`.
  *
+ * **Unresolvable field types** are tolerated by default. A field whose type is missing, or is not a
+ * known type (after case-insensitive and alias resolution), is degraded to a permissive typeless
+ * schema rather than aborting the whole conversion, and its dot-notation path is reported on
+ * `skippedPaths.unconvertible` with the reason. This matters because the throw was fatal at any
+ * depth: a single unrecognized leaf field destroyed the entire schema, leaving consumers with
+ * nothing. Pass `{ strictFieldTypes: true }` to restore fail-fast throwing.
+ *
  * If you don't need `skippedPaths`, use {@link toJSONSchema} which returns just the schema.
  *
  * @param field The Forman Schema field to convert
@@ -326,6 +371,9 @@ declare function toJSONSchemaAdvanced(field: FormanSchemaField, options?: Forman
  * fields were dropped (e.g. to render a "show advanced" toggle), use {@link toJSONSchemaAdvanced}
  * which returns `{ schema, skippedPaths? }`.
  *
+ * Fields with an unresolvable type are degraded to a permissive schema rather than throwing; use
+ * {@link toJSONSchemaAdvanced} to see which, or `{ strictFieldTypes: true }` to throw instead.
+ *
  * @param field The Forman Schema field to convert
  * @param options Conversion options
  * @returns The equivalent JSON Schema
@@ -358,4 +406,4 @@ declare function validateFormanWithDomains(domains: Record<string, {
  */
 declare function validateForman(values: Record<string, unknown>, schema: FormanSchemaField[], options?: FormanValidationOptions, restoreExtras?: Record<string, Record<string, unknown>>): Promise<FormanValidationResult>;
 
-export { type FormanExternalValidationResult, type FormanJsonSchemaOptions, type FormanJsonSchemaResult, type FormanSchemaDirectoryOption, type FormanSchemaExtendedNested, type FormanSchemaExtendedOptions, type FormanSchemaField, type FormanSchemaFieldType, type FormanSchemaNested, type FormanSchemaOption, type FormanSchemaOptionGroup, type FormanSchemaPathExtendedOptions, type FormanSchemaRPCButton, type FormanSchemaValue, type FormanValidationOptions, type FormanValidationResult, toFormanSchema, toJSONSchema, toJSONSchemaAdvanced, validateForman, validateFormanWithDomains };
+export { type FormanExternalValidationResult, type FormanJsonSchemaOptions, type FormanJsonSchemaResult, type FormanSchemaBooleanNested, type FormanSchemaDirectoryOption, type FormanSchemaExtendedNested, type FormanSchemaExtendedOptions, type FormanSchemaField, type FormanSchemaFieldType, type FormanSchemaNested, type FormanSchemaOption, type FormanSchemaOptionGroup, type FormanSchemaPathExtendedOptions, type FormanSchemaRPCButton, type FormanSchemaValue, type FormanValidationOptions, type FormanValidationResult, SchemaConversionError, resolveFormanFieldType, toFormanSchema, toJSONSchema, toJSONSchemaAdvanced, validateForman, validateFormanWithDomains };

package/dist/index.d.ts

@@ -47,8 +47,8 @@ type FormanSchemaField = {
     advanced?: boolean;
     /** Human readable label for the field */
     label?: string;
-    /** Nested fields */
-    nested?: FormanSchemaNested;
+    nested?: FormanSchemaNested | FormanSchemaBooleanNested;
+    reversedNested?: boolean;
     /** Validation rules */
     validate?: FormanSchemaValidation;
     /** Whether the field is disabled (`false` by default) */
@@ -186,6 +186,10 @@ type FormanSchemaExtendedNested = {
     /** Domain for the nested fields */
     domain?: string;
 };
+type FormanSchemaBooleanNested = {
+    true?: (FormanSchemaField | string)[] | string;
+    false?: (FormanSchemaField | string)[] | string;
+};
 /**
  * Validation result
  */
@@ -240,6 +244,14 @@ type FormanJsonSchemaOptions = {
      * `toJSONSchemaAdvanced`'s `skippedPaths.advanced` so the caller can re-request them.
      */
     excludeAdvancedFields?: boolean;
+    /**
+     * Throw a `SchemaConversionError` when a field's type cannot be resolved, instead of degrading
+     * it to a permissive typeless schema. Defaults to `false` — by default, unresolvable fields are
+     * degraded and their dot-notation paths reported on `toJSONSchemaAdvanced`'s
+     * `skippedPaths.unconvertible`, so one unrecognized field can no longer abort the whole
+     * conversion. Set `true` only when a caller genuinely wants fail-fast behaviour.
+     */
+    strictFieldTypes?: boolean;
 };
 /**
  * Result of converting a Forman Schema to JSON Schema
@@ -251,6 +263,12 @@ type FormanJsonSchemaResult = {
     skippedPaths?: {
         /** Dot-notation paths of advanced fields that were skipped. Present only when at least one advanced field was skipped. */
         advanced?: string[];
+        /**
+         * Dot-notation paths of fields whose type could not be resolved and were therefore degraded
+         * to a permissive typeless schema. Each entry is suffixed with the reason —
+         * `(unknown type: X)` or `(missing type)`. Present only when at least one field was degraded.
+         */
+        unconvertible?: string[];
     };
 };
 /**
@@ -294,6 +312,26 @@ type FormanValidationOptions = {
  */
 declare function toFormanSchema(field: JSONSchema7): FormanSchemaField;
 
+/**
+ * Error thrown when schema conversion fails
+ */
+declare class SchemaConversionError extends Error {
+    /** Field that caused the error */
+    readonly field?: FormanSchemaField | JSONSchema7;
+    /**
+     * @param message The error message
+     * @param field The field that caused the error
+     */
+    constructor(message: string, field?: FormanSchemaField | JSONSchema7);
+}
+/**
+ * Resolves a raw Forman field type to a canonical `FORMAN_TYPE_MAP` key, handling `type:kind`
+ * prefixes, casing and known aliases.
+ * @param rawType The raw field type from the Forman schema
+ * @returns The canonical type key, or `undefined` when the type is missing or unresolvable
+ */
+declare function resolveFormanFieldType(rawType: string | undefined): string | undefined;
+
 /**
  * Converts a Forman Schema field to its JSON Schema equivalent and reports the paths of any
  * fields that were skipped during conversion.
@@ -311,6 +349,13 @@ declare function toFormanSchema(field: JSONSchema7): FormanSchemaField;
  * `definitions[type]`; advanced fields inside a composite template are recorded with the
  * path of the FIRST usage only. See the comment near `compositeHandlers` in `src/forman.ts`.
  *
+ * **Unresolvable field types** are tolerated by default. A field whose type is missing, or is not a
+ * known type (after case-insensitive and alias resolution), is degraded to a permissive typeless
+ * schema rather than aborting the whole conversion, and its dot-notation path is reported on
+ * `skippedPaths.unconvertible` with the reason. This matters because the throw was fatal at any
+ * depth: a single unrecognized leaf field destroyed the entire schema, leaving consumers with
+ * nothing. Pass `{ strictFieldTypes: true }` to restore fail-fast throwing.
+ *
  * If you don't need `skippedPaths`, use {@link toJSONSchema} which returns just the schema.
  *
  * @param field The Forman Schema field to convert
@@ -326,6 +371,9 @@ declare function toJSONSchemaAdvanced(field: FormanSchemaField, options?: Forman
  * fields were dropped (e.g. to render a "show advanced" toggle), use {@link toJSONSchemaAdvanced}
  * which returns `{ schema, skippedPaths? }`.
  *
+ * Fields with an unresolvable type are degraded to a permissive schema rather than throwing; use
+ * {@link toJSONSchemaAdvanced} to see which, or `{ strictFieldTypes: true }` to throw instead.
+ *
  * @param field The Forman Schema field to convert
  * @param options Conversion options
  * @returns The equivalent JSON Schema
@@ -358,4 +406,4 @@ declare function validateFormanWithDomains(domains: Record<string, {
  */
 declare function validateForman(values: Record<string, unknown>, schema: FormanSchemaField[], options?: FormanValidationOptions, restoreExtras?: Record<string, Record<string, unknown>>): Promise<FormanValidationResult>;
 
-export { type FormanExternalValidationResult, type FormanJsonSchemaOptions, type FormanJsonSchemaResult, type FormanSchemaDirectoryOption, type FormanSchemaExtendedNested, type FormanSchemaExtendedOptions, type FormanSchemaField, type FormanSchemaFieldType, type FormanSchemaNested, type FormanSchemaOption, type FormanSchemaOptionGroup, type FormanSchemaPathExtendedOptions, type FormanSchemaRPCButton, type FormanSchemaValue, type FormanValidationOptions, type FormanValidationResult, toFormanSchema, toJSONSchema, toJSONSchemaAdvanced, validateForman, validateFormanWithDomains };
+export { type FormanExternalValidationResult, type FormanJsonSchemaOptions, type FormanJsonSchemaResult, type FormanSchemaBooleanNested, type FormanSchemaDirectoryOption, type FormanSchemaExtendedNested, type FormanSchemaExtendedOptions, type FormanSchemaField, type FormanSchemaFieldType, type FormanSchemaNested, type FormanSchemaOption, type FormanSchemaOptionGroup, type FormanSchemaPathExtendedOptions, type FormanSchemaRPCButton, type FormanSchemaValue, type FormanValidationOptions, type FormanValidationResult, SchemaConversionError, resolveFormanFieldType, toFormanSchema, toJSONSchema, toJSONSchemaAdvanced, validateForman, validateFormanWithDomains };

package/dist/index.js

@@ -26,6 +26,9 @@ function noEmpty(text) {
 function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isBooleanBranchNested(nested) {
+  return isObject(nested) && !("store" in nested) && ("true" in nested || "false" in nested);
+}
 function isOptionGroup(value) {
   return "options" in value && Array.isArray(value.options);
 }
@@ -513,11 +516,13 @@ var SchemaConversionError = class extends Error {
   constructor(message, field) {
     super(message);
     this.name = "SchemaConversionError";
+    this.field = field;
   }
 };
 var FORMAN_TYPE_MAP = {
   account: "number",
   hook: "number",
+  device: "number",
   keychain: "number",
   datastore: "number",
   aiagent: "string",
@@ -561,14 +566,29 @@ var FORMAN_TYPE_MAP = {
   uuid: "string",
   any: void 0
 };
-function validateFormanField(field) {
-  if (!field.type) {
-    throw new SchemaConversionError("Field type is required", field);
-  }
-  const normalizedType = field.type.includes(":") ? field.type.split(":")[0] : field.type;
-  if (!Object.keys(FORMAN_TYPE_MAP).includes(normalizedType)) {
-    throw new SchemaConversionError(`Unknown field type: ${field.type}`, field);
-  }
+var FORMAN_TYPE_LOOKUP = new Map(
+  Object.keys(FORMAN_TYPE_MAP).map((key) => [key.toLowerCase(), key])
+);
+var FORMAN_TYPE_ALIASES = {
+  // Forman's plain-string primitive is `text`; there is no `string` type.
+  string: "text",
+  bool: "boolean",
+  // Forman's `date` already carries time (see `time` on FormanSchemaField, default true).
+  datetime: "date",
+  // JSON Schema has no float; `number` is the only target.
+  float: "number",
+  // `upload` is the validator's existing name for the same array-shaped type.
+  upload: "filestorage"
+};
+function resolveFormanFieldType(rawType) {
+  if (!rawType) return void 0;
+  const base = rawType.includes(":") ? rawType.split(":")[0] : rawType;
+  const lower = base.toLowerCase();
+  return FORMAN_TYPE_LOOKUP.get(lower) ?? FORMAN_TYPE_ALIASES[lower];
+}
+function canonicalTypeWithKind(rawType, canonicalType) {
+  const separatorIndex = rawType.indexOf(":");
+  return separatorIndex === -1 ? canonicalType : `${canonicalType}${rawType.slice(separatorIndex)}`;
 }
 function appendQueryString(path, domain, tail) {
   if (path.startsWith("api://")) return path;
@@ -586,6 +606,7 @@ function createDefaultContext(options) {
     roots: {},
     definitions: {},
     excludeAdvancedFields: options?.excludeAdvancedFields ?? false,
+    strictFieldTypes: options?.strictFieldTypes ?? false,
     skippedPaths: {},
     addConditionalFields: () => {
       throw new SchemaConversionError("Cannot serialize nested fields without parent field.");
@@ -597,8 +618,19 @@ var compositeHandlers = {
   udttype: { expand: udttypeExpand, extractInner: udttypeExtractInner, wrapRef: udttypeWrapRef }
 };
 function toJSONSchemaInternal(field, context) {
-  validateFormanField(field);
-  const normalizedField = normalizeFormanFieldType(field);
+  const canonicalType = resolveFormanFieldType(field.type);
+  if (!canonicalType) {
+    if (context.strictFieldTypes) {
+      throw new SchemaConversionError(
+        field.type ? `Unknown field type: ${field.type}` : "Field type is required",
+        field
+      );
+    }
+    return degradeUnconvertibleField(field, context);
+  }
+  const normalizedField = normalizeFormanFieldType(
+    canonicalType === field.type ? field : { ...field, type: canonicalTypeWithKind(field.type, canonicalType) }
+  );
   const handler = compositeHandlers[normalizedField.type];
   if (handler) {
     const type = normalizedField.type;
@@ -1013,6 +1045,16 @@ function handleJsonType(field, result) {
   });
   return result;
 }
+function degradeUnconvertibleField(field, context) {
+  const path = field.name ? [...context.path, field.name].join(".") : context.path.join(".");
+  const reason = field.type ? `unknown type: ${field.type}` : "missing type";
+  (context.skippedPaths.unconvertible ||= []).push(`${path} (${reason})`);
+  return {
+    type: FORMAN_TYPE_MAP["any"],
+    title: noEmpty(field.label),
+    description: noEmpty(field.help)
+  };
+}
 function handlePrimitiveType(field, result, context) {
   if (field.default !== "" && field.default != null) {
     result.default = field.default;
@@ -1053,7 +1095,7 @@ function processRpcDirective(field, result, context) {
   return result;
 }
 function extractNestedAndDomain(field) {
-  const nested = isObject(field.options) ? isObject(field.options.nested) ? field.options.nested.store : field.options.nested : isObject(field.nested) ? field.nested.store : field.nested;
+  const nested = isObject(field.options) ? isObject(field.options.nested) ? field.options.nested.store : field.options.nested : isBooleanBranchNested(field.nested) ? void 0 : isObject(field.nested) ? field.nested.store : field.nested;
   const domain = isObject(field.options) ? isObject(field.options.nested) && field.options.nested.domain ? field.options.nested.domain : void 0 : isObject(field.nested) && field.nested.domain ? field.nested.domain : void 0;
   return { nested, domain };
 }
@@ -1322,6 +1364,13 @@ async function validateFormanWithDomainsInternal(domains, options) {
   };
 }
 async function validateFormanValue(value, field, context) {
+  if (context.registerOnly) {
+    return {
+      valid: true,
+      errors: [],
+      warnings: []
+    };
+  }
   if (isVisualType(field.type)) {
     return {
       valid: true,
@@ -1329,8 +1378,21 @@ async function validateFormanValue(value, field, context) {
       warnings: []
     };
   }
+  if (!field.type) {
+    return {
+      valid: false,
+      errors: [
+        {
+          domain: context.domain,
+          path: context.path.join("."),
+          message: "Field type is required."
+        }
+      ],
+      warnings: []
+    };
+  }
   const normalizedField = normalizeFormanFieldType(field);
-  if (normalizedField.required && (value == null || value === "")) {
+  if (normalizedField.required && !context.suppressRequired && (value == null || value === "")) {
     return {
       valid: false,
       errors: [
@@ -1500,7 +1562,7 @@ async function handleCollectionType2(value, field, context) {
               continue;
             }
             if (context2.strict && !seen.has(subField2.name)) seen.add(subField2.name);
-            if (path.length === 0) {
+            if (path.length === 0 && !context2.registerOnly) {
               context2.roots[context2.domain].schemaFields.push(clampFieldForSchema(subField2));
             }
             const result2 = await validateFormanValue(value[subField2.name], subField2, {
@@ -2093,7 +2155,7 @@ async function handlePrimitiveType2(value, field, context) {
   }
   const nested = extractNestedFromField(field);
   if (nested) {
-    const result = await handleNestedFields(nested, value, field, context);
+    const result = FORMAN_TYPE_MAP2[field.type] === "boolean" ? await handleBooleanNestedFields(nested, value, field, context) : await handleNestedFields(nested, value, field, context);
     errors.push(...result.errors);
     warnings.push(...result.warnings);
   }
@@ -2103,6 +2165,19 @@ async function handlePrimitiveType2(value, field, context) {
     warnings
   };
 }
+async function handleBooleanNestedFields(nested, value, field, context) {
+  if (isBooleanBranchNested(nested)) {
+    const active2 = value === false ? nested.false : nested.true;
+    const inactive = value === false ? nested.true : nested.false;
+    const result = active2 ? await handleNestedFields(active2, value, field, context) : { valid: true, errors: [], warnings: [] };
+    if (context.strict && inactive) {
+      await handleNestedFields(inactive, value, field, { ...context, registerOnly: true });
+    }
+    return result;
+  }
+  const active = field.reversedNested === true ? value === false : value === true;
+  return handleNestedFields(nested, value, field, active ? context : { ...context, suppressRequired: true });
+}
 
 // src/json.ts
 var JSON_PRIMITIVE_TYPE_MAP = {
@@ -2274,6 +2349,9 @@ function toJSONSchemaAdvanced(field, options) {
   if (context.skippedPaths.advanced?.length) {
     skippedPaths.advanced = context.skippedPaths.advanced;
   }
+  if (context.skippedPaths.unconvertible?.length) {
+    skippedPaths.unconvertible = context.skippedPaths.unconvertible;
+  }
   return {
     schema,
     ...Object.keys(skippedPaths).length > 0 ? { skippedPaths } : {}
@@ -2292,6 +2370,8 @@ function validateForman(values, schema, options, restoreExtras) {
   );
 }
 export {
+  SchemaConversionError,
+  resolveFormanFieldType,
   toFormanSchema,
   toJSONSchema,
   toJSONSchemaAdvanced,

package/package.json

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