feature(stackbit): improve integration

kickstartDS · Jul 10, 2024 · 525aba5 · 525aba5
1 parent a18248b
commit 525aba5
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 3 deletions.
diff --git a/common/changes/@kickstartds/jsonschema-utils/main_2024-07-10-12-45.json b/common/changes/@kickstartds/jsonschema-utils/main_2024-07-10-12-45.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@kickstartds/jsonschema-utils",
+      "comment": "handle nested allOfs",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@kickstartds/jsonschema-utils"
+}
diff --git a/common/changes/@kickstartds/jsonschema2stackbit/main_2024-07-10-12-45.json b/common/changes/@kickstartds/jsonschema2stackbit/main_2024-07-10-12-45.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@kickstartds/jsonschema2stackbit",
+      "comment": "extract more tab groups",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@kickstartds/jsonschema2stackbit"
+}
diff --git a/tools/jsonschema-utils/src/helpers.ts b/tools/jsonschema-utils/src/helpers.ts
@@ -252,7 +252,9 @@ export function reduceSchemaAllOf(
 
   const reducedSchema = allOfs.reduce((finalSchema: JSONSchema.Interface, allOf: JSONSchema.Interface) => {
     const mergeSchemaAllOf = (allOf: JSONSchema.Interface): JSONSchema.Interface => {
-      if (allOf.$ref !== undefined) {
+      if (allOf.allOf) {
+        return deepMerge(reduceSchemaAllOf(allOf, ajv, replaceExamples), finalSchema, replaceExamples);
+      } else if (allOf.$ref !== undefined) {
         const reffedSchema = structuredClone(
           ajv.getSchema(
             allOf.$ref.includes('#/definitions/') && !allOf.$ref.includes('http')

diff --git a/tools/jsonschema2stackbit/src/index.ts b/tools/jsonschema2stackbit/src/index.ts
@@ -93,8 +93,8 @@ export function convert({
           schema.fields.length > 0 &&
           Array.isArray(parent)
         ) {
-          for (const field of schema.fields.reverse()) {
-            parent.unshift({
+          for (const field of schema.fields) {
+            parent.splice(parent.indexOf(schema), 0, {
               ...field,
               name: `${value.name}__${field.name}`,
               group: field.group && field.group === 'content' ? undefined : field.group || value.name
@@ -171,6 +171,38 @@ function reduceFields(fields: Field[], subSchema: JSONSchema.Interface): [Field[
           label: schemaField['x-cms-group-title'] || toPascalCase(groupName),
           icon: schemaField['x-cms-group-icon'] || 'circle-question'
         };
+
+        if (
+          field.group.startsWith('INLINE__') &&
+          field.type === 'object' &&
+          field.fields &&
+          field.fields.length > 0
+        ) {
+          for (const subField of field.fields) {
+            if (!subField.group) continue;
+            const groupName = subField.group.startsWith('INLINE__')
+              ? subField.group.replace('INLINE__', '')
+              : subField.group;
+
+            if (subField.group !== 'content') {
+              const schemaSubField = schemaField.properties && schemaField.properties[subField.name];
+
+              fieldGroups[subField.group] ||= {
+                name: groupName,
+                label:
+                  (schemaSubField &&
+                    isCmsAnnotatedSchema(schemaSubField) &&
+                    schemaSubField['x-cms-group-title']) ||
+                  toPascalCase(groupName),
+                icon:
+                  (schemaSubField &&
+                    isCmsAnnotatedSchema(schemaSubField) &&
+                    schemaSubField['x-cms-group-icon']) ||
+                  'circle-question'
+              };
+            }
+          }
+        }
       }
     }
     fields.push(field);