@fugood/bricks-project 2.21.0-beta.17 → 2.21.0-beta.18

package/compile/index.ts

@@ -26,6 +26,7 @@ import type {
   Generator,
   Canvas,
   Subspace,
+  EventActionForItem,
 } from '../types'
 
 const compileProperty = (property, errorReference: string, result = {}) => {
@@ -91,7 +92,7 @@ const compileActionParam = (templateKey: string, actionName: string, paramName:
 
 const compileEvents = (
   templateKey: string,
-  eventMap: { [key: string]: Array<EventAction> },
+  eventMap: { [key: string]: Array<any> },
   options = { camelCase: false, errorReference: '' },
 ) => {
   const { camelCase, errorReference } = options
@@ -106,8 +107,14 @@ const compileEvents = (
         else handlerKey = handler.toUpperCase()
         if (handlerKey === 'SYSTEM') handlerTemplateKey = 'SYSTEM'
       } else if (typeof handler === 'function') {
-        const instance = handler() as Brick | Generator
-        handlerKey = instance?.id
+        let instance = handler()
+        if (instance?.id) {
+          instance = instance as { id: string }
+          handlerKey = instance?.id
+        } else if (instance?.brickId) {
+          instance = instance as { brickId: string; templateKey: string }
+          handlerKey = instance.brickId
+        }
         handlerTemplateKey = instance?.templateKey
       }
       if (!handlerKey) throw new Error(`Invalid handler: ${handler} ${errorReference}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.21.0-beta.17",
+  "version": "2.21.0-beta.18",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
@@ -13,5 +13,5 @@
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "fdf1004ac8e6cde8d103bae1f8d4e9d995787d88"
+  "gitHead": "5affdfe765bab2d2844658feb9d505d6a8911bab"
 }

package/tools/pull.ts

@@ -47,11 +47,23 @@ if (isGitRepo) {
   if (confirmContinue !== 'y') throw new Error('Pull cancelled')
 }
 
+const prettierConfig = await Bun.file(`${cwd}/.prettierrc`)
+  .json()
+  .catch(() => ({
+    trailingComma: 'all',
+    tabWidth: 2,
+    semi: false,
+    singleQuote: true,
+    printWidth: 100,
+  }))
+
 await Promise.all(
   files.map(async (file) =>
     Bun.write(
       `${cwd}/${file.name}`,
-      file.formatable ? await format(file.input, { parser: 'typescript' }) : file.input,
+      file.formatable
+        ? await format(file.input, { parser: 'typescript', ...prettierConfig })
+        : file.input,
     ),
   ),
 )

package/types/bricks.ts

@@ -1,7 +1,14 @@
 import type { SwitchCondInnerStateCurrentCanvas, SwitchCondData, SwitchDef } from './switch'
 import type { Data, DataLink } from './data'
 import type { Animation, AnimationBasicEvents } from './animation'
-import type { Brick, EventAction, ActionWithDataParams, ActionWithParams, Action } from './common'
+import type {
+  Brick,
+  EventAction,
+  EventActionForItem,
+  ActionWithDataParams,
+  ActionWithParams,
+  Action,
+} from './common'
 
 interface BrickBasicProperty {
   /* The brick opacity (0 ~ 1) */
@@ -62,6 +69,12 @@ interface BrickBasicEvents {
   standby?: Array<EventAction>
 }
 
+interface BrickBasicEventsForItem {
+  showStart?: Array<EventActionForItem>
+  switchUpdate?: Array<EventActionForItem>
+  standby?: Array<EventActionForItem>
+}
+
 interface BrickRectDef {
   /*
 Default property:
@@ -2127,10 +2140,10 @@ Default property:
           }
       >
     | DataLink
-  events?: BrickBasicEvents & {
+  events?: BrickBasicEventsForItem & {
     /* Event on page render finished */
     onPageRender?: Array<
-      EventAction & {
+      EventActionForItem & {
         eventPropertyMapping?: {
           pageIndex: {
             type: 'number'
@@ -2145,7 +2158,7 @@ Default property:
     >
     /* Event on page change. */
     onPageChange?: Array<
-      EventAction & {
+      EventActionForItem & {
         eventPropertyMapping?: {
           pageIndex: {
             type: 'number'
@@ -2160,7 +2173,7 @@ Default property:
     >
     /* Event on page index out of bound. */
     onPageOutOfBound?: Array<
-      EventAction & {
+      EventActionForItem & {
         eventPropertyMapping?: {
           pageIndex: {
             type: 'number'
@@ -2175,7 +2188,7 @@ Default property:
     >
     /* Event on into `detail` mode */
     onIntoDetailMode?: Array<
-      EventAction & {
+      EventActionForItem & {
         eventPropertyMapping?: {
           pageIndex: {
             type: 'number'
@@ -2194,7 +2207,7 @@ Default property:
     >
     /* Event on into `list` mode. */
     onIntoListMode?: Array<
-      EventAction & {
+      EventActionForItem & {
         eventPropertyMapping?: {
           pageIndex: {
             type: 'number'
@@ -2209,7 +2222,7 @@ Default property:
     >
     /* Event on render error */
     onError?: Array<
-      EventAction & {
+      EventActionForItem & {
         eventPropertyMapping?: {
           errorMessage: {
             type: 'string'

package/types/common.ts

@@ -68,6 +68,18 @@ export type EventAction = {
   eventPropertyMapping?: object
 }
 
+export type EventActionForItem = {
+  handler:
+    | 'system'
+    | (() => Brick | Generator | { brickId: string; templateKey: string })
+    | SubspaceID
+    | ItemBrickID
+  action: Action
+  waitAsync?: boolean
+  // Event Property Definition mapping to params (use path to replace)
+  eventPropertyMapping?: object
+}
+
 export type ApplicationFont = {
   name: string
   url: string