npm - @makehq/forman-schema - Versions diffs - 1.3.4 → 1.4.0 - Mend

@makehq/forman-schema 1.3.4 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.cjs CHANGED Viewed

@@ -247,6 +247,7 @@ function handleArrayType(field, result, context) {
 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;
+  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;
   if (typeof optionsOrGroups === "string") {
     Object.defineProperty(result, "x-fetch", {
@@ -268,12 +269,33 @@ function handleSelectType(field, result, context) {
     })) {
       result.oneOf = (options || []).map((option) => {
         const localNested = (isObject(option.nested) ? option.nested.store : option.nested) || nested;
+        const localNestedContainsStrings = Array.isArray(localNested) && localNested.some((item) => typeof item === "string");
         const localDomain = (isObject(option.nested) && option.nested.domain ? option.nested.domain : domain) || context.domain;
         if (localNested) {
           context.addConditionalFields(
             field.name,
             option.value,
-            typeof localNested === "string" ? appendQueryString(localNested, localDomain, [...context.tail, field.name]) : toJSONSchemaInternal(
+            typeof localNested === "string" ? appendQueryString(localNested, localDomain, [...context.tail, field.name]) : localNestedContainsStrings ? {
+              type: "object",
+              allOf: localNested.map(
+                (item) => typeof item === "string" ? {
+                  $ref: appendQueryString(item, localDomain, [
+                    ...context.tail,
+                    field.name
+                  ])
+                } : toJSONSchemaInternal(
+                  {
+                    type: "collection",
+                    spec: [item]
+                  },
+                  {
+                    ...context,
+                    domain: localDomain,
+                    tail: [...context.tail, field.name]
+                  }
+                )
+              )
+            } : toJSONSchemaInternal(
               { type: "collection", spec: localNested },
               {
                 ...context,
@@ -293,7 +315,7 @@ function handleSelectType(field, result, context) {
     }
   }
   if (nested && domain && domain !== context.domain) {
-    if (typeof nested === "string") {
+    if (typeof nested === "string" || nestedContainsStrings) {
       throw new SchemaConversionError("Dynamic nested fields with domain change are not supported.");
     }
     let root = context.roots[domain];
@@ -312,7 +334,19 @@ function handleSelectType(field, result, context) {
       configurable: true,
       enumerable: true,
       writable: true,
-      value: typeof nested === "string" ? { $ref: appendQueryString(nested, context.domain, [...context.tail, field.name]) } : toJSONSchemaInternal(
+      value: typeof nested === "string" ? { $ref: appendQueryString(nested, context.domain, [...context.tail, field.name]) } : nestedContainsStrings ? {
+        type: "object",
+        allOf: nested.map(
+          (item) => typeof item === "string" ? { $ref: appendQueryString(item, context.domain, [...context.tail, field.name]) } : toJSONSchemaInternal(
+            { type: "collection", spec: [item] },
+            {
+              ...context,
+              domain: domain || context.domain,
+              tail: [...context.tail, field.name]
+            }
+          )
+        )
+      } : toJSONSchemaInternal(
         { type: "collection", spec: nested },
         {
           ...context,
@@ -729,21 +763,32 @@ async function handleNestedFields(nested, value, field, context) {
     tail: field.name ? [...context.tail, { name: field.name, value }] : context.tail
   };
   if (typeof store === "string") {
-    try {
-      store = await context.resolveRemote(store, context);
-    } catch (error) {
-      return {
-        valid: false,
-        errors: [
-          ...errors,
-          {
-            domain: context.domain,
-            path: context.path.join("."),
-            message: `Failed to resolve remote resource ${store}: ${error}`
-          }
-        ]
-      };
+    store = [store];
+  }
+  if (Array.isArray(store) && store.some((item) => typeof item === "string")) {
+    const resolvedStore = [];
+    for (const item of store) {
+      if (typeof item === "string") {
+        try {
+          resolvedStore.push(...await context.resolveRemote(item, context));
+        } catch (error) {
+          return {
+            valid: false,
+            errors: [
+              ...errors,
+              {
+                domain: context.domain,
+                path: context.path.join("."),
+                message: `Failed to resolve remote resource ${item}: ${error}`
+              }
+            ]
+          };
+        }
+      } else {
+        resolvedStore.push(item);
+      }
     }
+    store = resolvedStore;
   }
   if (store && domain && domain !== context.domain) {
     if (!context.roots[domain]) {

package/dist/index.d.cts CHANGED Viewed

@@ -138,7 +138,7 @@ type FormanSchemaExtendedOptions = {
 /**
  * Nested fields
  */
-type FormanSchemaNested = FormanSchemaField[] | string | FormanSchemaExtendedNested;
+type FormanSchemaNested = (FormanSchemaField | string)[] | string | FormanSchemaExtendedNested;
 /**
  * Extended nested fields
  */

package/dist/index.d.ts CHANGED Viewed

@@ -138,7 +138,7 @@ type FormanSchemaExtendedOptions = {
 /**
  * Nested fields
  */
-type FormanSchemaNested = FormanSchemaField[] | string | FormanSchemaExtendedNested;
+type FormanSchemaNested = (FormanSchemaField | string)[] | string | FormanSchemaExtendedNested;
 /**
  * Extended nested fields
  */

package/dist/index.js CHANGED Viewed

@@ -218,6 +218,7 @@ function handleArrayType(field, result, context) {
 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;
+  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;
   if (typeof optionsOrGroups === "string") {
     Object.defineProperty(result, "x-fetch", {
@@ -239,12 +240,33 @@ function handleSelectType(field, result, context) {
     })) {
       result.oneOf = (options || []).map((option) => {
         const localNested = (isObject(option.nested) ? option.nested.store : option.nested) || nested;
+        const localNestedContainsStrings = Array.isArray(localNested) && localNested.some((item) => typeof item === "string");
         const localDomain = (isObject(option.nested) && option.nested.domain ? option.nested.domain : domain) || context.domain;
         if (localNested) {
           context.addConditionalFields(
             field.name,
             option.value,
-            typeof localNested === "string" ? appendQueryString(localNested, localDomain, [...context.tail, field.name]) : toJSONSchemaInternal(
+            typeof localNested === "string" ? appendQueryString(localNested, localDomain, [...context.tail, field.name]) : localNestedContainsStrings ? {
+              type: "object",
+              allOf: localNested.map(
+                (item) => typeof item === "string" ? {
+                  $ref: appendQueryString(item, localDomain, [
+                    ...context.tail,
+                    field.name
+                  ])
+                } : toJSONSchemaInternal(
+                  {
+                    type: "collection",
+                    spec: [item]
+                  },
+                  {
+                    ...context,
+                    domain: localDomain,
+                    tail: [...context.tail, field.name]
+                  }
+                )
+              )
+            } : toJSONSchemaInternal(
               { type: "collection", spec: localNested },
               {
                 ...context,
@@ -264,7 +286,7 @@ function handleSelectType(field, result, context) {
     }
   }
   if (nested && domain && domain !== context.domain) {
-    if (typeof nested === "string") {
+    if (typeof nested === "string" || nestedContainsStrings) {
       throw new SchemaConversionError("Dynamic nested fields with domain change are not supported.");
     }
     let root = context.roots[domain];
@@ -283,7 +305,19 @@ function handleSelectType(field, result, context) {
       configurable: true,
       enumerable: true,
       writable: true,
-      value: typeof nested === "string" ? { $ref: appendQueryString(nested, context.domain, [...context.tail, field.name]) } : toJSONSchemaInternal(
+      value: typeof nested === "string" ? { $ref: appendQueryString(nested, context.domain, [...context.tail, field.name]) } : nestedContainsStrings ? {
+        type: "object",
+        allOf: nested.map(
+          (item) => typeof item === "string" ? { $ref: appendQueryString(item, context.domain, [...context.tail, field.name]) } : toJSONSchemaInternal(
+            { type: "collection", spec: [item] },
+            {
+              ...context,
+              domain: domain || context.domain,
+              tail: [...context.tail, field.name]
+            }
+          )
+        )
+      } : toJSONSchemaInternal(
         { type: "collection", spec: nested },
         {
           ...context,
@@ -700,21 +734,32 @@ async function handleNestedFields(nested, value, field, context) {
     tail: field.name ? [...context.tail, { name: field.name, value }] : context.tail
   };
   if (typeof store === "string") {
-    try {
-      store = await context.resolveRemote(store, context);
-    } catch (error) {
-      return {
-        valid: false,
-        errors: [
-          ...errors,
-          {
-            domain: context.domain,
-            path: context.path.join("."),
-            message: `Failed to resolve remote resource ${store}: ${error}`
-          }
-        ]
-      };
+    store = [store];
+  }
+  if (Array.isArray(store) && store.some((item) => typeof item === "string")) {
+    const resolvedStore = [];
+    for (const item of store) {
+      if (typeof item === "string") {
+        try {
+          resolvedStore.push(...await context.resolveRemote(item, context));
+        } catch (error) {
+          return {
+            valid: false,
+            errors: [
+              ...errors,
+              {
+                domain: context.domain,
+                path: context.path.join("."),
+                message: `Failed to resolve remote resource ${item}: ${error}`
+              }
+            ]
+          };
+        }
+      } else {
+        resolvedStore.push(item);
+      }
     }
+    store = resolvedStore;
   }
   if (store && domain && domain !== context.domain) {
     if (!context.roots[domain]) {

package/package.json CHANGED Viewed

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