fix(notion-api-zod-schema): rollupSchema allow type number

alanlu-dev · May 12, 2024 · 63dff6e · 63dff6e
1 parent 93bd3c2
commit 63dff6e
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 55 deletions.
diff --git a/.changeset/khaki-emus-smoke.md b/.changeset/khaki-emus-smoke.md
@@ -0,0 +1,5 @@
+---
+"@alanlu-dev/notion-api-zod-schema": patch
+---
+
+fix(notion-api-zod-schema): rollupSchema allow type number
diff --git a/packages/notion-api-zod-schema/src/NotionDatabaseSchema.ts b/packages/notion-api-zod-schema/src/NotionDatabaseSchema.ts
@@ -195,63 +195,71 @@ export const NotionDatabaseRelationSchema = NotionDatabaseCellSchema.merge(Notio
 export type NotionDatabaseRelationType = z.infer<typeof NotionDatabaseRelationSchema>
 
 // rollup
+const rollupFunctionEnum = z.enum([
+  'average',
+  'checked',
+  'count_per_group',
+  'count',
+  'count_values',
+  'date_range',
+  'earliest_date',
+  'empty',
+  'latest_date',
+  'max',
+  'median',
+  'min',
+  'not_empty',
+  'percent_checked',
+  'percent_empty',
+  'percent_not_empty',
+  'percent_per_group',
+  'percent_unchecked',
+  'range',
+  'unchecked',
+  'unique',
+  'show_original',
+  'show_unique',
+  'sum',
+])
 export const NotionDatabaseRollupSchema = NotionDatabaseCellSchema.extend({
   type: z.literal('rollup'),
-  rollup: z.object({
-    type: z.literal('array'),
-    array: z.array(
-      z
-        .discriminatedUnion('type', [
-          NotionTitleSchema,
-          NotionRichTextSchema,
-          NotionNumberSchema,
-          NotionSelectSchema,
-          NotionMultiSelectSchema,
-          NotionStatusSchema,
-          NotionDateSchema,
-          NotionPeopleSchema,
-          NotionFilesSchema,
-          NotionCheckboxSchema,
-          NotionUrlSchema,
-          NotionEmailSchema,
-          NotionPhoneNumberSchema,
-          NotionCreatedTimeSchema,
-          NotionCreatedBySchema,
-          NotionLastEditedTimeSchema,
-          NotionLastEditedBySchema,
-          NotionUniqueIdSchema,
-          NotionFormulaSchema,
-          NotionRelationSchema,
-        ])
-        .optional(),
-    ),
-    function: z.enum([
-      'average',
-      'checked',
-      'count_per_group',
-      'count',
-      'count_values',
-      'date_range',
-      'earliest_date',
-      'empty',
-      'latest_date',
-      'max',
-      'median',
-      'min',
-      'not_empty',
-      'percent_checked',
-      'percent_empty',
-      'percent_not_empty',
-      'percent_per_group',
-      'percent_unchecked',
-      'range',
-      'unchecked',
-      'unique',
-      'show_original',
-      'show_unique',
-      'sum',
-    ]),
-  }),
+  rollup: z.discriminatedUnion('type', [
+    z.object({
+      type: z.literal('array'),
+      array: z.array(
+        z
+          .discriminatedUnion('type', [
+            NotionTitleSchema,
+            NotionRichTextSchema,
+            NotionNumberSchema,
+            NotionSelectSchema,
+            NotionMultiSelectSchema,
+            NotionStatusSchema,
+            NotionDateSchema,
+            NotionPeopleSchema,
+            NotionFilesSchema,
+            NotionCheckboxSchema,
+            NotionUrlSchema,
+            NotionEmailSchema,
+            NotionPhoneNumberSchema,
+            NotionCreatedTimeSchema,
+            NotionCreatedBySchema,
+            NotionLastEditedTimeSchema,
+            NotionLastEditedBySchema,
+            NotionUniqueIdSchema,
+            NotionFormulaSchema,
+            NotionRelationSchema,
+          ])
+          .optional(),
+      ),
+      function: rollupFunctionEnum,
+    }),
+    z.object({
+      type: z.literal('number'),
+      number: z.number(),
+      function: rollupFunctionEnum,
+    }),
+  ]),
 })
 export type NotionDatabaseRollupType = z.infer<typeof NotionDatabaseRollupSchema>