fix: enums in stackbit connector

kickstartDS · Oct 10, 2024 · 6e6a378 · 6e6a378
1 parent 6e19a56
commit 6e6a378
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/common/changes/@kickstartds/jsonschema2stackbit/main_2024-10-10-14-59.json b/common/changes/@kickstartds/jsonschema2stackbit/main_2024-10-10-14-59.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@kickstartds/jsonschema2stackbit",
+      "comment": "resolve wrong enums",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@kickstartds/jsonschema2stackbit"
+}
diff --git a/tools/jsonschema2stackbit/src/index.ts b/tools/jsonschema2stackbit/src/index.ts
@@ -4,7 +4,6 @@ import {
   toPascalCase,
   getSchemaReducer,
   IProcessInterface,
-  safeEnumKey,
   IReducerResult,
   IProcessFnResult,
   IConvertParams,
@@ -49,6 +48,10 @@ function isObjectModel(field: unknown): field is ObjectModel {
   return typeof field === 'object' && field !== null && 'type' in field && field.type === 'object';
 }
 
+function safeEnumKey(string: string): string {
+  return string;
+}
+
 /**
  * @param jsonSchemas - An individual schema or an array of schemas, provided
  * either as Javascript objects or as JSON text.
@@ -511,6 +514,7 @@ function processEnum({
   title,
   description,
   subSchema,
+  parentSchema,
   options
 }: IProcessInterface<Field>): IProcessFnResult<Field, ObjectModel, PageModel, DataModel> {
   const field: FieldEnum = {
@@ -531,7 +535,7 @@ function processEnum({
     field.options = options;
   }
 
-  field.required = subSchema.required?.includes(name) || false;
+  field.required = parentSchema?.required?.includes(name) || false;
 
   return { field };
 }