correct type flattening

Author: ButteryCrumpet

src/cloud/components/Automations/actions/ActionConfigurationInput.tsx

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react'
 import FormSelect from '../../../../design/components/molecules/Form/atoms/FormSelect'
 import FormRowItem from '../../../../design/components/molecules/Form/templates/FormRowItem'
 import { pickBy } from 'ramda'
-import { BoostAST, BoostPrimitives } from '../../../lib/automations'
+import { BoostAST, BoostPrimitives, BoostType } from '../../../lib/automations'
 import { LiteralNode, RefNode } from '../../../lib/automations/ast'
 import { StdPrimitives } from '../../../lib/automations/types'
 
@@ -18,7 +18,7 @@ interface ActionConfigurationInputProps {
     onChange: ActionConfigurationInputProps['onChange'],
     value: Extract<BoostAST, { type: 'literal' }> | null
   ) => React.ReactNode
-  eventDataOptions: Record<string, string>
+  eventDataOptions: Record<string, BoostType>
   type: BoostPrimitives | StdPrimitives
   defaultValue: any
 }
@@ -48,7 +48,10 @@ const ActionConfigurationInput = ({
 
   const options = useMemo(() => {
     return Object.keys(
-      pickBy((val) => dataType == null || val === dataType, eventDataOptions)
+      pickBy(
+        (val) => val.type === 'primitive' && val.def === dataType,
+        eventDataOptions
+      )
     ).map((key) => ({ label: key, value: key }))
   }, [eventDataOptions, dataType])
 

src/cloud/components/Automations/actions/CreateDocActionConfigurator.tsx

@@ -10,7 +10,7 @@ import {
   RecordNode,
   StructNode,
 } from '../../../lib/automations/ast'
-import { flattenObj } from '../../../lib/utils/object'
+import { flattenType } from '../../../lib/automations/types'
 import { ActionConfiguratorProps } from './'
 import ActionConfigurationInput from './ActionConfigurationInput'
 import FolderSelect from './FolderSelect'
@@ -22,7 +22,12 @@ const CreateDocActionConfigurator = ({
   eventType,
 }: ActionConfiguratorProps) => {
   const eventDataOptions = useMemo(() => {
-    return flattenObj(eventType as any)
+    return Object.fromEntries(
+      Array.from(flattenType(eventType)).map(([path, type]) => [
+        path.join('.'),
+        type,
+      ])
+    )
   }, [eventType])
 
   const constructorTree = useMemo(() => {

src/cloud/components/Automations/actions/PropertySelect.tsx

@@ -96,7 +96,7 @@ const PropertySelect = ({
                                 data,
                               }
                         )
-                      ) as SupportedType['val']
+                      )
                     )
                   }
                 }}

src/cloud/components/Automations/actions/UpdateDocActionConfigurator.tsx

@@ -11,7 +11,7 @@ import {
   RecordNode,
   StructNode,
 } from '../../../lib/automations/ast'
-import { flattenObj } from '../../../lib/utils/object'
+import { flattenType } from '../../../lib/automations/types'
 import { ActionConfiguratorProps } from './'
 import ActionConfigurationInput from './ActionConfigurationInput'
 import PropertySelect, {
@@ -25,7 +25,12 @@ const UpdateDocActionConfigurator = ({
   eventType,
 }: ActionConfiguratorProps) => {
   const eventDataOptions = useMemo(() => {
-    return flattenObj(eventType as any)
+    return Object.fromEntries(
+      Array.from(flattenType(eventType)).map(([path, type]) => [
+        path.join('.'),
+        type,
+      ])
+    )
   }, [eventType])
 
   const [propQueryNodes, contentNodes] = useMemo(() => {

src/cloud/lib/automations/types.ts

@@ -48,3 +48,38 @@ export function Optional<T extends TypeDef<any, any>>(def: T) {
 export function Reference<U extends string>(def: U) {
   return { type: 'reference' as const, def: def as U }
 }
+
+export function* flattenType<P extends string, U extends string | never>(
+  typeDef: TypeDef<P, U>,
+  internalRepr = false
+): Generator<[string[], TypeDef<P, U>]> {
+  yield [[], typeDef]
+
+  const additionalKey = internalRepr ? ['def'] : []
+  switch (typeDef.type) {
+    case 'struct': {
+      for (const [key, val] of Object.entries(typeDef.def)) {
+        for (const [path, nestedType] of flattenType(val, internalRepr)) {
+          yield [additionalKey.concat([key]).concat(path), nestedType]
+        }
+      }
+      break
+    }
+    case 'record':
+    case 'array': {
+      for (const [path, nestedType] of flattenType(typeDef.def, internalRepr)) {
+        yield [(internalRepr ? additionalKey : ['0']).concat(path), nestedType]
+      }
+      break
+    }
+    case 'optional': {
+      for (const [path, nestedType] of flattenType(typeDef.def, internalRepr)) {
+        yield [
+          additionalKey.concat(path),
+          nestedType.type === 'optional' ? nestedType : Optional(nestedType),
+        ]
+      }
+      break
+    }
+  }
+}