Fix bug where we cant resolve custom types (#6016)

* chore(schema): optimize(readability) document dependency check * fix(schema): map tyhe schemaType type, and not the schematype fixes a bug where we cant map custom defined string fields etc
sanity-io · Mar 18, 2024 · 217a47d · 217a47d
1 parent dcd5537
commit 217a47d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/packages/@sanity/schema/src/sanity/extractSchema.ts b/packages/@sanity/schema/src/sanity/extractSchema.ts
@@ -171,8 +171,8 @@ export function extractSchema(
     }
 
     // map some known types
-    if (typesMap.has(schemaType.name)) {
-      return typesMap.get(schemaType.name)
+    if (schemaType.type && typesMap.has(schemaType.type.name)) {
+      return typesMap.get(schemaType.type.name)
     }
 
     // Cross dataset references are not supported
@@ -457,18 +457,20 @@ function sortByDependencies(compiledSchema: SchemaDef): string[] {
 
     if ('fields' in schemaType) {
       for (const field of gatherFields(schemaType)) {
+        const last = lastType(field.type)
+        if (last.name === 'document') {
+          dependencies.add(last)
+          continue
+        }
+
         let schemaTypeName: string | undefined
         if (schemaType.type.type) {
           schemaTypeName = field.type.type.name
         } else if ('jsonType' in schemaType.type) {
           schemaTypeName = field.type.jsonType
         }
 
-        if (
-          schemaTypeName === 'document' ||
-          schemaTypeName === 'object' ||
-          schemaTypeName === 'block'
-        ) {
+        if (schemaTypeName === 'object' || schemaTypeName === 'block') {
           if (isReferenceType(field.type)) {
             field.type.to.forEach((ref) => dependencies.add(ref.type))
           } else {
@@ -493,6 +495,7 @@ function sortByDependencies(compiledSchema: SchemaDef): string[] {
 
     walkDependencies(schemaType, dependencies)
     dependencyMap.set(schemaType, dependencies)
+    seen.clear() // Clear the seen set for the next type
   })
 
   // Sorts the types by their dependencies

diff --git a/packages/@sanity/schema/test/extractSchema/__snapshots__/extractSchema.test.ts.snap b/packages/@sanity/schema/test/extractSchema/__snapshots__/extractSchema.test.ts.snap
@@ -222,6 +222,13 @@ Array [
       "type": "object",
     },
   },
+  Object {
+    "name": "someTextType",
+    "type": "type",
+    "value": Object {
+      "type": "string",
+    },
+  },
   Object {
     "attributes": Object {
       "_createdAt": Object {
@@ -4268,6 +4275,14 @@ Array [
           "type": "inline",
         },
       },
+      "someTextType": Object {
+        "optional": true,
+        "type": "objectAttribute",
+        "value": Object {
+          "name": "someTextType",
+          "type": "inline",
+        },
+      },
       "title": Object {
         "optional": true,
         "type": "objectAttribute",

diff --git a/packages/@sanity/schema/test/extractSchema/extractSchema.test.ts b/packages/@sanity/schema/test/extractSchema/extractSchema.test.ts
@@ -89,6 +89,11 @@ describe('Extract schema test', () => {
               name: 'manuscript',
               type: 'manuscript',
             },
+            {
+              title: 'Some text',
+              name: 'someTextType',
+              type: 'someTextType',
+            },
             {
               title: 'customStringType',
               name: 'customStringType',
@@ -225,6 +230,10 @@ describe('Extract schema test', () => {
             },
           ],
         },
+        defineType({
+          name: 'someTextType',
+          type: 'text',
+        }),
       ],
     })
 
@@ -235,6 +244,7 @@ describe('Extract schema test', () => {
       'sanity.imageDimensions',
       'geopoint',
       'slug',
+      'someTextType',
       'sanity.fileAsset',
       'code',
       'customStringType',
@@ -269,6 +279,7 @@ describe('Extract schema test', () => {
       'number',
       'someInlinedObject',
       'manuscript',
+      'someTextType',
       'customStringType',
       'blocks',
       'other',