@makehq/forman-schema 1.9.5 → 1.9.6

package/dist/index.cjs

@@ -1150,6 +1150,7 @@ async function validateFormanWithDomainsInternal(domains, options) {
         path: [],
         tail: [],
         strict: options?.strict === true,
+        domainAliases: options?.domainAliases ?? {},
         validateNestedFields: () => {
           throw new Error("Cannot validate nested fields without parent field.");
         },
@@ -1192,6 +1193,18 @@ async function validateFormanWithDomainsInternal(domains, options) {
       }
     }
   }
+  if (options?.strict) {
+    for (const domain of Object.keys(domains)) {
+      if (!domains[domain]) continue;
+      const root = roots[domain];
+      for (const key of Object.keys(domains[domain].values)) {
+        if (!root.seenFields.has(key)) {
+          root.seenFields.add(key);
+          errors.push({ domain, path: "", message: `Unknown field '${key}'.` });
+        }
+      }
+    }
+  }
   return {
     valid: errors.length === 0,
     errors,
@@ -1374,7 +1387,7 @@ async function handleCollectionType2(value, field, context) {
       errors.push(...result.errors);
     }
   }
-  if (context.strict) {
+  if (context.strict && context.path.length > 0) {
     for (const key of Object.keys(value)) {
       if (!seen.has(key)) {
         seen.add(key);
@@ -1788,15 +1801,16 @@ async function handleNestedFields(nested, value, field, context) {
     }
     store = resolvedStore;
   }
-  if (store && domain && domain !== context.domain) {
-    if (!context.roots[domain]) {
+  const resolvedDomain = domain ? context.domainAliases[domain] ?? domain : domain;
+  if (store && resolvedDomain && resolvedDomain !== context.domain) {
+    if (!context.roots[resolvedDomain]) {
       errors.push({
         domain: context.domain,
         path: context.path.join("."),
-        message: `Unable to process nested fields: Domain '${domain}' not found.`
+        message: resolvedDomain !== domain ? `Unable to process nested fields: Resolved domain '${resolvedDomain}' (from alias '${domain}') not found.` : `Unable to process nested fields: Domain '${domain}' not found.`
       });
     } else {
-      const result = await context.roots[domain].validateFields(store, context);
+      const result = await context.roots[resolvedDomain].validateFields(store, context);
       errors.push(...result.errors);
     }
   } else if (store) {

package/dist/index.d.cts

@@ -216,6 +216,8 @@ type FormanValidationOptions = {
     states?: boolean;
     /** Remote resource resolver */
     resolveRemote?(path: string, data: Record<string, unknown>): Promise<unknown>;
+    /** Maps domain names used in nested.domain to actual domain keys passed to validateFormanWithDomains */
+    domainAliases?: Record<string, string>;
 };
 
 /**

package/dist/index.d.ts

@@ -216,6 +216,8 @@ type FormanValidationOptions = {
     states?: boolean;
     /** Remote resource resolver */
     resolveRemote?(path: string, data: Record<string, unknown>): Promise<unknown>;
+    /** Maps domain names used in nested.domain to actual domain keys passed to validateFormanWithDomains */
+    domainAliases?: Record<string, string>;
 };
 
 /**

package/dist/index.js

@@ -1121,6 +1121,7 @@ async function validateFormanWithDomainsInternal(domains, options) {
         path: [],
         tail: [],
         strict: options?.strict === true,
+        domainAliases: options?.domainAliases ?? {},
         validateNestedFields: () => {
           throw new Error("Cannot validate nested fields without parent field.");
         },
@@ -1163,6 +1164,18 @@ async function validateFormanWithDomainsInternal(domains, options) {
       }
     }
   }
+  if (options?.strict) {
+    for (const domain of Object.keys(domains)) {
+      if (!domains[domain]) continue;
+      const root = roots[domain];
+      for (const key of Object.keys(domains[domain].values)) {
+        if (!root.seenFields.has(key)) {
+          root.seenFields.add(key);
+          errors.push({ domain, path: "", message: `Unknown field '${key}'.` });
+        }
+      }
+    }
+  }
   return {
     valid: errors.length === 0,
     errors,
@@ -1345,7 +1358,7 @@ async function handleCollectionType2(value, field, context) {
       errors.push(...result.errors);
     }
   }
-  if (context.strict) {
+  if (context.strict && context.path.length > 0) {
     for (const key of Object.keys(value)) {
       if (!seen.has(key)) {
         seen.add(key);
@@ -1759,15 +1772,16 @@ async function handleNestedFields(nested, value, field, context) {
     }
     store = resolvedStore;
   }
-  if (store && domain && domain !== context.domain) {
-    if (!context.roots[domain]) {
+  const resolvedDomain = domain ? context.domainAliases[domain] ?? domain : domain;
+  if (store && resolvedDomain && resolvedDomain !== context.domain) {
+    if (!context.roots[resolvedDomain]) {
       errors.push({
         domain: context.domain,
         path: context.path.join("."),
-        message: `Unable to process nested fields: Domain '${domain}' not found.`
+        message: resolvedDomain !== domain ? `Unable to process nested fields: Resolved domain '${resolvedDomain}' (from alias '${domain}') not found.` : `Unable to process nested fields: Domain '${domain}' not found.`
       });
     } else {
-      const result = await context.roots[domain].validateFields(store, context);
+      const result = await context.roots[resolvedDomain].validateFields(store, context);
       errors.push(...result.errors);
     }
   } else if (store) {

package/package.json

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