@makehq/forman-schema 1.6.0 → 1.7.1

package/dist/index.cjs

@@ -67,7 +67,7 @@ var API_ENDPOINTS = {
   aiagent: "api://ai-agents/v1/agents",
   datastore: "api://data-stores",
   hook: "api://hooks/{{kind}}",
-  device: "api://devices",
+  device: "api://devices/{{kind}}",
   keychain: "api://keys/{{kind}}",
   udt: "api://data-structures",
   scenario: "api://scenario-list"
@@ -238,6 +238,7 @@ var FORMAN_TYPE_MAP = {
   collection: "object",
   dynamicCollection: "object",
   text: "string",
+  editor: "string",
   number: "number",
   boolean: "boolean",
   date: "string",
@@ -309,6 +310,7 @@ function toJSONSchemaInternal(field, context = createDefaultContext()) {
     case "select":
     case "account":
     case "hook":
+    case "device":
     case "keychain":
     case "datastore":
     case "aiagent":
@@ -327,6 +329,12 @@ function handleCollectionType(field, result, context) {
     required: []
   });
   function addField(subField, tail) {
+    if (typeof subField === "string") {
+      const value = { $ref: appendQueryString(subField, context.domain, tail || context.tail) };
+      result.allOf ||= [];
+      result.allOf.push(value);
+      return;
+    }
     if (isVisualType(subField.type)) {
       return;
     }
@@ -499,9 +507,7 @@ function handleSelectType(field, result, context) {
     }
   }
   if (nested && domain && domain !== context.domain) {
-    if (typeof nested === "string" || nestedContainsStrings) {
-      throw new SchemaConversionError("Dynamic nested fields with domain change are not supported.");
-    }
+    const normalizedNested = typeof nested === "string" ? [nested] : nested;
     let root = context.roots[domain];
     if (!root) {
       const buffer = [];
@@ -512,7 +518,7 @@ function handleSelectType(field, result, context) {
         }
       };
     }
-    root.addFields(nested, [...context.tail, field.name]);
+    root.addFields(normalizedNested, [...context.tail, field.name]);
   } else if (nested) {
     Object.defineProperty(result, "x-nested", {
       configurable: true,
@@ -567,6 +573,7 @@ function handlePrimitiveType(field, result) {
 var FORMAN_TYPE_MAP2 = {
   account: "number",
   hook: "number",
+  device: "number",
   keychain: "number",
   datastore: "number",
   aiagent: "string",

package/dist/index.d.cts

@@ -3,7 +3,7 @@ import { JSONSchema7 } from 'json-schema';
 /**
  * Valid Forman Schema field types
  */
-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;
+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}` | `device:${string}` | 'banner' | 'markdown' | 'html' | 'separator' | string;
 /**
  * Validation configuration for Forman Schema fields
  */
@@ -146,7 +146,7 @@ type FormanSchemaNested = (FormanSchemaField | string)[] | string | FormanSchema
  */
 type FormanSchemaExtendedNested = {
     /** Store for the nested fields */
-    store: FormanSchemaField[] | string;
+    store: (FormanSchemaField | string)[] | string;
     /** Domain for the nested fields */
     domain?: string;
 };

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { JSONSchema7 } from 'json-schema';
 /**
  * Valid Forman Schema field types
  */
-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;
+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}` | `device:${string}` | 'banner' | 'markdown' | 'html' | 'separator' | string;
 /**
  * Validation configuration for Forman Schema fields
  */
@@ -146,7 +146,7 @@ type FormanSchemaNested = (FormanSchemaField | string)[] | string | FormanSchema
  */
 type FormanSchemaExtendedNested = {
     /** Store for the nested fields */
-    store: FormanSchemaField[] | string;
+    store: (FormanSchemaField | string)[] | string;
     /** Domain for the nested fields */
     domain?: string;
 };

package/dist/index.js

@@ -38,7 +38,7 @@ var API_ENDPOINTS = {
   aiagent: "api://ai-agents/v1/agents",
   datastore: "api://data-stores",
   hook: "api://hooks/{{kind}}",
-  device: "api://devices",
+  device: "api://devices/{{kind}}",
   keychain: "api://keys/{{kind}}",
   udt: "api://data-structures",
   scenario: "api://scenario-list"
@@ -209,6 +209,7 @@ var FORMAN_TYPE_MAP = {
   collection: "object",
   dynamicCollection: "object",
   text: "string",
+  editor: "string",
   number: "number",
   boolean: "boolean",
   date: "string",
@@ -280,6 +281,7 @@ function toJSONSchemaInternal(field, context = createDefaultContext()) {
     case "select":
     case "account":
     case "hook":
+    case "device":
     case "keychain":
     case "datastore":
     case "aiagent":
@@ -298,6 +300,12 @@ function handleCollectionType(field, result, context) {
     required: []
   });
   function addField(subField, tail) {
+    if (typeof subField === "string") {
+      const value = { $ref: appendQueryString(subField, context.domain, tail || context.tail) };
+      result.allOf ||= [];
+      result.allOf.push(value);
+      return;
+    }
     if (isVisualType(subField.type)) {
       return;
     }
@@ -470,9 +478,7 @@ function handleSelectType(field, result, context) {
     }
   }
   if (nested && domain && domain !== context.domain) {
-    if (typeof nested === "string" || nestedContainsStrings) {
-      throw new SchemaConversionError("Dynamic nested fields with domain change are not supported.");
-    }
+    const normalizedNested = typeof nested === "string" ? [nested] : nested;
     let root = context.roots[domain];
     if (!root) {
       const buffer = [];
@@ -483,7 +489,7 @@ function handleSelectType(field, result, context) {
         }
       };
     }
-    root.addFields(nested, [...context.tail, field.name]);
+    root.addFields(normalizedNested, [...context.tail, field.name]);
   } else if (nested) {
     Object.defineProperty(result, "x-nested", {
       configurable: true,
@@ -538,6 +544,7 @@ function handlePrimitiveType(field, result) {
 var FORMAN_TYPE_MAP2 = {
   account: "number",
   hook: "number",
+  device: "number",
   keychain: "number",
   datastore: "number",
   aiagent: "string",

package/package.json

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