@fugood/bricks-project 2.24.0-beta.36 → 2.24.0-beta.37

package/compile/index.ts

@@ -1,4 +1,6 @@
 /* eslint-disable no-underscore-dangle -- Uses __typename, __actionName, etc. for type system */
+import camelCase from 'lodash/camelCase'
+import upperFirst from 'lodash/upperFirst'
 import snakeCase from 'lodash/snakeCase'
 import omit from 'lodash/omit'
 import { parse as parseAST } from 'acorn'
@@ -110,14 +112,20 @@ const compileScriptCalculationCode = (code = '') => {
   }
 }
 
+const getTemplateName = (key: string) =>
+  upperFirst(camelCase(key.replace(/^(BRICK|GENERATOR)_/, '')))
+
 const compileEventActionValue = (templateKey, eventKey, value, errorReference) => {
-  const tmplEventProperties = templateEventPropsMap[templateKey]
+  const tmplEventProperties = templateEventPropsMap[getTemplateName(templateKey)]
   const props = tmplEventProperties?.[eventKey]
   if (!props) return compileProperty(value, errorReference)
-  if (props.includes(value)) return value
-  if (typeof value === 'string' && value?.startsWith(templateKey)) {
+  if (typeof value === 'string' && value in props) {
+    const expectedType = props[value]
+    if (expectedType) return value
+  }
+  if (typeof value === 'string' && /^(BRICK|GENERATOR)_/.test(value)) {
     console.warn(
-      `[Warning] Value start with template key but there is no event property: ${value} ${errorReference}`,
+      `[Warning] Event property "${value}" is not compatible with event "${eventKey}" of ${templateKey} ${errorReference}`,
     )
   }
   return compileProperty(value, errorReference)
@@ -188,7 +196,7 @@ const compileEvents = (
       if (!handlerKey) throw new Error(`Invalid handler: ${handler} ${errorReference}`)
 
       const parameterList: Array<object> = []
-      if (Object.hasOwn(action, 'params')) {
+      if (Object.prototype.hasOwnProperty.call(action, 'params')) {
         const actionDef = action as ActionWithParams
         ;(actionDef.params || []).forEach(({ input, value, mapping }) => {
           const param = {
@@ -201,7 +209,7 @@ const compileEvents = (
           if (mapping) param[camelCase ? 'resultDataMapping' : 'result_data_mapping'] = true
           parameterList.push(param)
         })
-      } else if (Object.hasOwn(action, 'dataParams')) {
+      } else if (Object.prototype.hasOwnProperty.call(action, 'dataParams')) {
         const actionDef = action as ActionWithDataParams
         ;(actionDef.dataParams || []).forEach(({ input, value, mapping }) => {
           if (!input) return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.24.0-beta.36",
+  "version": "2.24.0-beta.37",
   "main": "index.ts",
   "scripts": {
     "typecheck": "tsc --noEmit",
@@ -24,5 +24,5 @@
   "peerDependencies": {
     "oxfmt": "^0.36.0"
   },
-  "gitHead": "1146a2d19b4f6efca4055e6c788f5ad50658cc40"
+  "gitHead": "5b91fb31b3ef42efe74e15f8c2e04973905b6cba"
 }

package/types/bricks/Camera.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Take picture on the Camera */
 export type BrickCameraActionTakePicture = ActionWithParams & {
@@ -154,19 +155,23 @@ Default property:
   }
   events?: BrickBasicEvents & {
     /* Event of the Camera state change */
-    stateChange?: Array<EventAction>
+    stateChange?: Array<EventAction<string & keyof TemplateEventPropsMap['Camera']['stateChange']>>
     /* Event of the Camera record start */
     recordStart?: Array<EventAction>
     /* Event of the Camera record end */
     recordEnd?: Array<EventAction>
     /* Event of the Camera barcode read */
-    barcodeRead?: Array<EventAction>
+    barcodeRead?: Array<EventAction<string & keyof TemplateEventPropsMap['Camera']['barcodeRead']>>
     /* Event of the Camera picture taken */
-    pictureTaken?: Array<EventAction>
+    pictureTaken?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Camera']['pictureTaken']>
+    >
     /* Event of the Camera record finished */
-    recordFinish?: Array<EventAction>
+    recordFinish?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Camera']['recordFinish']>
+    >
     /* Event of the Camera mount error */
-    mountError?: Array<EventAction>
+    mountError?: Array<EventAction<string & keyof TemplateEventPropsMap['Camera']['mountError']>>
   }
   outlets?: {
     /* Camera device and format information */

package/types/bricks/Chart.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Data highlight */
 export type BrickChartActionDataHighlight = ActionWithParams & {
@@ -335,9 +336,11 @@ Default property:
     /* Event of chart render */
     onRender?: Array<EventAction>
     /* Event of data point on press */
-    onPress?: Array<EventAction>
+    onPress?: Array<EventAction<string & keyof TemplateEventPropsMap['Chart']['onPress']>>
     /* Event of legend select changed */
-    onLegendSelectChanged?: Array<EventAction>
+    onLegendSelectChanged?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Chart']['onLegendSelectChanged']>
+    >
   }
   animation?: AnimationBasicEvents & {
     onRender?: Animation

package/types/bricks/GenerativeMedia.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface GenerativeMediaDef {
   /*
@@ -194,21 +195,33 @@ Default property:
     /* Event of the brick blur (Use TV Device with controller) */
     generativeMediaOnBlur?: Array<EventAction>
     /* Event when media generation succeeds */
-    onSuccess?: Array<EventAction>
+    onSuccess?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['GenerativeMedia']['onSuccess']>
+    >
     /* Event when media generation fails */
-    onError?: Array<EventAction>
+    onError?: Array<EventAction<string & keyof TemplateEventPropsMap['GenerativeMedia']['onError']>>
     /* Event when media prompt request starts */
-    promptStart?: Array<EventAction>
+    promptStart?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['GenerativeMedia']['promptStart']>
+    >
     /* Event when media prompt request succeeds */
-    promptSuccess?: Array<EventAction>
+    promptSuccess?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['GenerativeMedia']['promptSuccess']>
+    >
     /* Event when media prompt request fails */
-    promptError?: Array<EventAction>
+    promptError?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['GenerativeMedia']['promptError']>
+    >
     /* Event when media loading starts */
     loadStart?: Array<EventAction>
     /* Event when media loading succeeds */
-    loadSuccess?: Array<EventAction>
+    loadSuccess?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['GenerativeMedia']['loadSuccess']>
+    >
     /* Event when media loading fails */
-    loadError?: Array<EventAction>
+    loadError?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['GenerativeMedia']['loadError']>
+    >
   }
   outlets?: {
     /* Brick is pressing */

package/types/bricks/Icon.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickIconDef {
   /*

package/types/bricks/Image.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickImageDef {
   /*
@@ -70,7 +71,7 @@ Default property:
     /* Event of the image on load */
     onLoad?: Array<EventAction>
     /* Event of the image on error */
-    onError?: Array<EventAction>
+    onError?: Array<EventAction<string & keyof TemplateEventPropsMap['Image']['onError']>>
   }
   outlets?: {
     /* Brick is pressing */

package/types/bricks/Items.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* prev page */
 export type BrickItemsActionPrevPage = Action & {
@@ -400,17 +401,27 @@ Default property:
     | DataLink
   events?: BrickBasicEventsForItem & {
     /* Event on page render finished */
-    onPageRender?: Array<EventActionForItem>
+    onPageRender?: Array<
+      EventActionForItem<string & keyof TemplateEventPropsMap['Items']['onPageRender']>
+    >
     /* Event on page change. */
-    onPageChange?: Array<EventActionForItem>
+    onPageChange?: Array<
+      EventActionForItem<string & keyof TemplateEventPropsMap['Items']['onPageChange']>
+    >
     /* Event on page index out of bound. */
-    onPageOutOfBound?: Array<EventActionForItem>
+    onPageOutOfBound?: Array<
+      EventActionForItem<string & keyof TemplateEventPropsMap['Items']['onPageOutOfBound']>
+    >
     /* Event on into `detail` mode */
-    onIntoDetailMode?: Array<EventActionForItem>
+    onIntoDetailMode?: Array<
+      EventActionForItem<string & keyof TemplateEventPropsMap['Items']['onIntoDetailMode']>
+    >
     /* Event on into `list` mode. */
-    onIntoListMode?: Array<EventActionForItem>
+    onIntoListMode?: Array<
+      EventActionForItem<string & keyof TemplateEventPropsMap['Items']['onIntoListMode']>
+    >
     /* Event on render error */
-    onError?: Array<EventActionForItem>
+    onError?: Array<EventActionForItem<string & keyof TemplateEventPropsMap['Items']['onError']>>
   }
   outlets?: {
     /* Catched error message */

package/types/bricks/Lottie.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Play animation */
 export type BrickLottieActionPlay = ActionWithParams & {
@@ -115,9 +116,13 @@ Default property:
     /* Event of the brick blur (Use TV Device with controller) */
     onBlur?: Array<EventAction>
     /* Event of the animation finished */
-    onAnimationFinish?: Array<EventAction>
+    onAnimationFinish?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Lottie']['onAnimationFinish']>
+    >
     /* Event of the uri on load failed */
-    onAnimationFailure?: Array<EventAction>
+    onAnimationFailure?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Lottie']['onAnimationFailure']>
+    >
     /* Event of the animation on loop */
     onAnimationLoop?: Array<EventAction>
   }

package/types/bricks/Maps.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Zoom in the map */
 export type BrickMapsActionZoomIn = Action & {
@@ -206,11 +207,15 @@ Default property:
     /* Event of the brick blur (Use TV Device with controller) */
     onBlur?: Array<EventAction>
     /* Event when a marker is pressed */
-    onMarkerPress?: Array<EventAction>
+    onMarkerPress?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Maps']['onMarkerPress']>
+    >
     /* Event when the map is pressed */
-    onMapPress?: Array<EventAction>
+    onMapPress?: Array<EventAction<string & keyof TemplateEventPropsMap['Maps']['onMapPress']>>
     /* Event when the map region changes */
-    onRegionChange?: Array<EventAction>
+    onRegionChange?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Maps']['onRegionChange']>
+    >
     /* Event when the map is ready */
     onReady?: Array<EventAction>
   }

package/types/bricks/QrCode.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickQrcodeDef {
   /*

package/types/bricks/Rect.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickRectDef {
   /*

package/types/bricks/RichText.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickRichTextDef {
   /*

package/types/bricks/Rive.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Play animation */
 export type BrickRiveActionPlay = ActionWithParams & {
@@ -162,21 +163,27 @@ Default property:
   }
   events?: BrickBasicEvents & {
     /* Event of animation play */
-    onPlay?: Array<EventAction>
+    onPlay?: Array<EventAction<string & keyof TemplateEventPropsMap['Rive']['onPlay']>>
     /* Event of animation pause */
-    onPause?: Array<EventAction>
+    onPause?: Array<EventAction<string & keyof TemplateEventPropsMap['Rive']['onPause']>>
     /* Event of animation stop */
-    onStop?: Array<EventAction>
+    onStop?: Array<EventAction<string & keyof TemplateEventPropsMap['Rive']['onStop']>>
     /* Event of animation loop end */
-    onLoopEnd?: Array<EventAction>
+    onLoopEnd?: Array<EventAction<string & keyof TemplateEventPropsMap['Rive']['onLoopEnd']>>
     /* Event of state changed */
-    onStateChanged?: Array<EventAction>
+    onStateChanged?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Rive']['onStateChanged']>
+    >
     /* Event of error */
-    onError?: Array<EventAction>
+    onError?: Array<EventAction<string & keyof TemplateEventPropsMap['Rive']['onError']>>
     /* Event of Rive general event received */
-    onRiveGeneralEvent?: Array<EventAction>
+    onRiveGeneralEvent?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Rive']['onRiveGeneralEvent']>
+    >
     /* Event of Rive open-url event received */
-    onRiveOpenUrlEvent?: Array<EventAction>
+    onRiveOpenUrlEvent?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Rive']['onRiveOpenUrlEvent']>
+    >
   }
   animation?: AnimationBasicEvents & {
     onPlay?: Animation

package/types/bricks/Slideshow.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Jump to a specific index in the slideshow */
 export type BrickSlideshowActionJumpToIndex = ActionWithParams & {
@@ -149,17 +150,23 @@ Default property:
   }
   events?: BrickBasicEvents & {
     /* Event of the next slideshow on change start */
-    changeStart?: Array<EventAction>
+    changeStart?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Slideshow']['changeStart']>
+    >
     /* Event of the next slideshow on change end */
-    changeEnd?: Array<EventAction>
+    changeEnd?: Array<EventAction<string & keyof TemplateEventPropsMap['Slideshow']['changeEnd']>>
     /* Event on paths change */
-    contentChange?: Array<EventAction>
+    contentChange?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Slideshow']['contentChange']>
+    >
     /* Event on plays of paths are end */
-    roundEnd?: Array<EventAction>
+    roundEnd?: Array<EventAction<string & keyof TemplateEventPropsMap['Slideshow']['roundEnd']>>
     /* Event of the slideshow on load */
     mediaOnLoad?: Array<EventAction>
     /* Event of the slideshow media loading error */
-    mediaOnError?: Array<EventAction>
+    mediaOnError?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Slideshow']['mediaOnError']>
+    >
   }
   animation?: AnimationBasicEvents & {
     changeStart?: Animation

package/types/bricks/Svg.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickSvgDef {
   /*

package/types/bricks/Text.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickTextDef {
   /*

package/types/bricks/TextInput.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Focus TextInput */
 export type BrickTextInputActionFocus = Action & {
@@ -175,15 +176,17 @@ Default property:
     /* Event of the TextInput is empty */
     onEmpty?: Array<EventAction>
     /* Event of the TextInput value change */
-    onChange?: Array<EventAction>
+    onChange?: Array<EventAction<string & keyof TemplateEventPropsMap['TextInput']['onChange']>>
     /* Event of the TextInput submit */
-    onSubmit?: Array<EventAction>
+    onSubmit?: Array<EventAction<string & keyof TemplateEventPropsMap['TextInput']['onSubmit']>>
     /* Event of the TextInput match regex (check every value change) */
-    onMatch?: Array<EventAction>
+    onMatch?: Array<EventAction<string & keyof TemplateEventPropsMap['TextInput']['onMatch']>>
     /* Event of the TextInput not match regex (check every value change) */
-    onNotMatch?: Array<EventAction>
+    onNotMatch?: Array<EventAction<string & keyof TemplateEventPropsMap['TextInput']['onNotMatch']>>
     /* Event of the TextInput not match regex (check every submit) */
-    onResultNotMatch?: Array<EventAction>
+    onResultNotMatch?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['TextInput']['onResultNotMatch']>
+    >
     /* Event of the TextInput reach max length or match regex */
     onFullFill?: Array<EventAction>
   }

package/types/bricks/Video.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Play the video */
 export type BrickVideoActionPlay = Action & {
@@ -120,7 +121,7 @@ Default property:
     /* Event of the brick blur (Use TV Device with controller) */
     onBlur?: Array<EventAction>
     /* Event of the next video on change start */
-    nextVideo?: Array<EventAction>
+    nextVideo?: Array<EventAction<string & keyof TemplateEventPropsMap['Video']['nextVideo']>>
     /* Event on plays of path are totally end */
     roundEnd?: Array<EventAction>
     /* Event on video load */
@@ -128,7 +129,7 @@ Default property:
     /* Event of the video playing error */
     onError?: Array<EventAction>
     /* Event of the video progress interval */
-    onProgress?: Array<EventAction>
+    onProgress?: Array<EventAction<string & keyof TemplateEventPropsMap['Video']['onProgress']>>
   }
   outlets?: {
     /* Brick is pressing */

package/types/bricks/VideoStreaming.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickVideoStreamingDef {
   /*

package/types/bricks/WebRtcStream.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 interface BrickWebRTCStreamDef {
   /*

package/types/bricks/WebView.ts

@@ -15,6 +15,7 @@ import type {
   EventProperty,
 } from '../common'
 import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Run Javascript on the WebView */
 export type BrickWebViewActionInjectJavascript = ActionWithParams & {
@@ -125,11 +126,11 @@ Default property:
   }
   events?: BrickBasicEvents & {
     /* Event of the WebView on load */
-    onLoad?: Array<EventAction>
+    onLoad?: Array<EventAction<string & keyof TemplateEventPropsMap['Webview']['onLoad']>>
     /* Event when the WebView load fails */
-    onError?: Array<EventAction>
+    onError?: Array<EventAction<string & keyof TemplateEventPropsMap['Webview']['onError']>>
     /* Event of the webview on message by `window.ReactNativeWebView.postMessage` on you're injected javascript code */
-    onMessage?: Array<EventAction>
+    onMessage?: Array<EventAction<string & keyof TemplateEventPropsMap['Webview']['onMessage']>>
   }
   outlets?: {
     /* The result of the query selector action */

package/types/common.ts

@@ -47,34 +47,36 @@ export type Action = {
   name?: string
 }
 
-// Find correct key in bricks-project/utils/event-props for EventAction
+// For standalone action types where specific event properties are not known
 export type EventProperty = string
 
-export type ActionWithParams = Action & {
+export type ActionWithParams<EP extends string = string> = Action & {
   params?: Array<{
     input: string
-    value?: any | EventProperty
+    value?: any | EP
     mapping?: string
   }>
 }
 
-export type ActionWithDataParams = Action & {
+export type ActionWithDataParams<EP extends string = string> = Action & {
   dataParams?: Array<{
     input: () => Data
-    value?: any | EventProperty
+    value?: any | EP
     mapping?: string
   }>
 }
 
 export type ItemBrickID = string
 
-export type EventAction = {
+// EP carries available event property keys for this event context
+// Use: EventAction<string & keyof TemplateEventPropsMap['Name']['event']>
+export type EventAction<EP extends string = string> = {
   handler: 'system' | (() => Brick | Generator) | SubspaceID | ItemBrickID
-  action: ActionWithParams | ActionWithDataParams
+  action: ActionWithParams<EP> | ActionWithDataParams<EP>
   waitAsync?: boolean
 }
 
-export type EventActionForItem = {
+export type EventActionForItem<EP extends string = string> = {
   handler:
     | 'system'
     | (() => Brick | Generator | { brickId: string; templateKey: string })

package/types/generators/AlarmClock.ts

@@ -13,6 +13,7 @@ import type {
   Action,
   EventProperty,
 } from '../common'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Start the alarm clock */
 export type GeneratorAlarmClockActionStart = Action & {
@@ -64,13 +65,15 @@ Default property:
   }
   events?: {
     /* Event for cron rule is not invalid */
-    onRuleInvalid?: Array<EventAction>
+    onRuleInvalid?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['AlarmClock']['onRuleInvalid']>
+    >
     /* Event for alarm clock start */
-    onStart?: Array<EventAction>
+    onStart?: Array<EventAction<string & keyof TemplateEventPropsMap['AlarmClock']['onStart']>>
     /* Event for alarm clock trig */
-    onTrig?: Array<EventAction>
+    onTrig?: Array<EventAction<string & keyof TemplateEventPropsMap['AlarmClock']['onTrig']>>
     /* Event for alarm clock stop */
-    onEnd?: Array<EventAction>
+    onEnd?: Array<EventAction<string & keyof TemplateEventPropsMap['AlarmClock']['onEnd']>>
   }
   outlets?: {
     /* Current time of each alarm clock trig */

package/types/generators/Assistant.ts

@@ -13,6 +13,7 @@ import type {
   Action,
   EventProperty,
 } from '../common'
+import type { TemplateEventPropsMap } from '../../utils/event-props'
 
 /* Add a message to the assistant */
 export type GeneratorAssistantActionAddMessage = ActionWithParams & {
@@ -513,17 +514,19 @@ Default property:
   }
   events?: {
     /* Error event */
-    onError?: Array<EventAction>
+    onError?: Array<EventAction<string & keyof TemplateEventPropsMap['Assistant']['onError']>>
     /* Log event */
-    onLogs?: Array<EventAction>
+    onLogs?: Array<EventAction<string & keyof TemplateEventPropsMap['Assistant']['onLogs']>>
     /* Messages update event */
-    onMessagesUpdate?: Array<EventAction>
+    onMessagesUpdate?: Array<
+      EventAction<string & keyof TemplateEventPropsMap['Assistant']['onMessagesUpdate']>
+    >
     /* Heatup finished event */
     onHeatupFinished?: Array<EventAction>
     /* Generating event (triggered when assistant starts generating response) */
     onGenerating?: Array<EventAction>
     /* Finished event (triggered when assistant finishes generating response) */
-    onFinished?: Array<EventAction>
+    onFinished?: Array<EventAction<string & keyof TemplateEventPropsMap['Assistant']['onFinished']>>
   }
   outlets?: {
     /* Whether the assistant is heating up */