@fugood/bricks-project 2.21.0-beta.14.test1 → 2.21.0-beta.14.test11

package/tools/pull.ts

@@ -0,0 +1,51 @@
+import { $ } from 'bun'
+import { format } from 'prettier'
+import { pullApplicationProject, pullModuleProject } from '../api'
+
+const cwd = process.cwd()
+
+const unstagedChanges = await $`cd ${cwd} && git diff --name-only --diff-filter=ACMR`.text()
+if (unstagedChanges)
+  throw new Error('Unstaged changes found, please commit or stash your changes before deploying')
+
+const app = await Bun.file(`${cwd}/application.json`).json()
+const stage = app.stage || 'production'
+const { files, lastCommitId } =
+  app.type === 'module'
+    ? await pullModuleProject(stage, app.id)
+    : await pullApplicationProject(stage, app.id)
+
+const found = (await $`cd ${cwd} && git rev-list -1 ${lastCommitId}`.nothrow().text())
+  .trim()
+  .match(/^[a-f0-9]{40}$/)
+
+const commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
+
+if (commitId === lastCommitId) throw new Error('Commit not changed')
+
+const branchName = 'BRICKS_PROJECT_try-pull-application'
+
+await $`cd ${cwd} && git branch -D ${branchName}`.nothrow()
+
+let useMain = false
+if (found) {
+  await $`cd ${cwd} && git checkout -b ${branchName} ${lastCommitId}`.nothrow()
+} else {
+  await $`cd ${cwd} && git checkout -b ${branchName}`
+  useMain = true
+}
+
+await Promise.all(
+  files.map(async (file) =>
+    Bun.write(
+      `${cwd}/${file.name}`,
+      file.formatable ? await format(file.input, { parser: 'typescript' }) : file.input,
+    ),
+  ),
+)
+
+await $`cd ${cwd} && git add .`
+await $`cd ${cwd} && git commit -m 'Apply ${app.name} file changes'`
+if (!useMain) {
+  await $`cd ${cwd} && git merge main`
+}

package/types/bricks.ts

@@ -1,7 +1,7 @@
-import { SwitchCondInnerStateCurrentCanvas, SwitchCondData, SwitchDef } from './switch'
-import { Data, DataLink } from './data'
-import { Animation, AnimationBasicEvents } from './animation'
-import { Brick, EventAction, ActionWithDataParams, ActionWithParams, Action } from './common'
+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'
 
 interface BrickBasicProperty {
   /* The brick opacity (0 ~ 1) */
@@ -304,17 +304,17 @@ export type BrickTextInputActionSelectText = ActionWithParams & {
     | {
         input: 'regex'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'start'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'end'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -325,7 +325,7 @@ export type BrickTextInputActionSetText = ActionWithParams & {
   params?: Array<{
     input: 'text'
     value?: string | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -335,7 +335,7 @@ export type BrickTextInputActionAppendText = ActionWithParams & {
   params?: Array<{
     input: 'text'
     value?: string | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -1233,17 +1233,17 @@ export type BrickSlideshowActionJumpToIndex = ActionWithParams & {
     | {
         input: 'index'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'reset'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'shuffle'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1425,27 +1425,27 @@ export type BrickChartActionDataHighlight = ActionWithParams & {
     | {
         input: 'seriesName'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'name'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1457,27 +1457,27 @@ export type BrickChartActionDataDownplay = ActionWithParams & {
     | {
         input: 'seriesName'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'name'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1489,27 +1489,27 @@ export type BrickChartActionDataSelect = ActionWithParams & {
     | {
         input: 'seriesName'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'name'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1521,27 +1521,27 @@ export type BrickChartActionDataUnselect = ActionWithParams & {
     | {
         input: 'seriesName'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'name'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1553,27 +1553,27 @@ export type BrickChartActionDataToggleSelect = ActionWithParams & {
     | {
         input: 'seriesName'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'seriesIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'name'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1584,7 +1584,7 @@ export type BrickChartActionLegendSelect = ActionWithParams & {
   params?: Array<{
     input: 'name'
     value?: string | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -1594,7 +1594,7 @@ export type BrickChartActionLegendUnselect = ActionWithParams & {
   params?: Array<{
     input: 'name'
     value?: string | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -1620,17 +1620,17 @@ export type BrickChartActionTooltipShow = ActionWithParams & {
     | {
         input: 'seriesIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'name'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1642,17 +1642,17 @@ export type BrickChartActionTooltipHide = ActionWithParams & {
     | {
         input: 'seriesIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'name'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1833,7 +1833,7 @@ export type BrickItemsActionJumpPage = ActionWithParams & {
   params?: Array<{
     input: 'pageIndex'
     value?: number | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -1843,7 +1843,7 @@ export type BrickItemsActionOpenDetail = ActionWithParams & {
   params?: Array<{
     input: 'detailIndex'
     value?: number | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -1859,37 +1859,37 @@ export type BrickItemsActionDynamicAnimation = ActionWithParams & {
     | {
         input: 'mode'
         value?: 'list' | 'detail' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'brickId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'index'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'animationId'
         value?: string | DataLink | (() => Animation)
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'animationType'
         value?: 'once' | 'loop' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'animationResetInitialValue'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1901,22 +1901,22 @@ export type BrickItemsActionDynamicAnimationReset = ActionWithParams & {
     | {
         input: 'mode'
         value?: 'list' | 'detail' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'brickId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'index'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -1928,22 +1928,22 @@ export type BrickItemsActionDynamicAnimationStop = ActionWithParams & {
     | {
         input: 'mode'
         value?: 'list' | 'detail' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'brickId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'dataId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'index'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -2068,6 +2068,14 @@ Default property:
                   y?: number | DataLink
                   width?: number | DataLink
                   height?: number | DataLink
+                  standbyMode?: 'custom' | 'top' | 'bottom' | 'left' | 'right' | DataLink
+                  standbyFrame?: DataLink | {}
+                  standbyOpacity?: number | DataLink
+                  standbyDelay?: number | DataLink
+                  standbyDelayRandom?: number | DataLink
+                  standbyEasing?: string | DataLink
+                  showingDelay?: number | DataLink
+                  renderOutOfViewport?: boolean | DataLink
                 }
             show?: string | DataLink
             pressToOpenDetail?: boolean | DataLink
@@ -2080,6 +2088,7 @@ Default property:
         | DataLink
         | {
             title?: string | DataLink
+            description?: string | DataLink
             brickId?: string | DataLink
             brickIdPrefix?: string | DataLink
             templateKey?: string | DataLink
@@ -2096,6 +2105,14 @@ Default property:
                   y?: number | DataLink
                   width?: number | DataLink
                   height?: number | DataLink
+                  standbyMode?: 'custom' | 'top' | 'bottom' | 'left' | 'right' | DataLink
+                  standbyFrame?: DataLink | {}
+                  standbyOpacity?: number | DataLink
+                  standbyDelay?: number | DataLink
+                  standbyDelayRandom?: number | DataLink
+                  standbyEasing?: string | DataLink
+                  showingDelay?: number | DataLink
+                  renderOutOfViewport?: boolean | DataLink
                 }
             show?: string | DataLink
             pressToBackList?: boolean | DataLink
@@ -2376,7 +2393,7 @@ export type BrickWebViewActionInjectJavascript = ActionWithParams & {
   params?: Array<{
     input: 'javascriptCode'
     value?: string | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -2525,22 +2542,22 @@ export type BrickCameraActionTakePicture = ActionWithParams & {
     | {
         input: 'width'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'quality'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'base64'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'mirrorImage'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -2552,27 +2569,27 @@ export type BrickCameraActionRecord = ActionWithParams & {
     | {
         input: 'quality'
         value?: '4:3' | '288p' | '480p' | '720p' | '1080p' | '2160p' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'mirrorVideo'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'videoBitrate'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'maxDuration'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'maxFileSize'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -2822,7 +2839,7 @@ export type Brick3DViewerActionAnimationPlay = ActionWithParams & {
   params?: Array<{
     input: 'objectIndex'
     value?: number | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -2832,7 +2849,7 @@ export type Brick3DViewerActionAnimationPause = ActionWithParams & {
   params?: Array<{
     input: 'objectIndex'
     value?: number | DataLink
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -2843,12 +2860,12 @@ export type Brick3DViewerActionAnimationGoto = ActionWithParams & {
     | {
         input: 'objectIndex'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'animationProgress'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }

package/types/canvas.ts

@@ -1,7 +1,7 @@
-import { Easing } from './animation'
-import { Data, DataLink } from './data'
-import { SwitchCondInnerStateCurrentCanvas, SwitchCondData, SwitchDef } from './switch'
-import { Brick, SubspaceID, EventAction } from './common'
+import type { Easing } from './animation'
+import type { Data, DataLink } from './data'
+import type { SwitchCondInnerStateCurrentCanvas, SwitchCondData, SwitchDef } from './switch'
+import type { Brick, SubspaceID, EventAction } from './common'
 
 type StandbyEasing = {
   method: Easing

package/types/common.ts

@@ -1,6 +1,6 @@
-import { SwitchDef } from './switch'
-import { Data } from './data'
-import { Subspace } from './subspace'
+import type { SwitchDef } from './switch'
+import type { Data } from './data'
+import type { Subspace } from './subspace'
 
 export interface Brick {
   __typename: 'Brick'
@@ -12,7 +12,7 @@ export interface Brick {
   events: {}
   outlets?: {}
   animation?: {}
-  switches: Array<SwitchDef>
+  switches?: Array<SwitchDef>
 }
 
 export enum LocalSyncStrategy {
@@ -30,7 +30,7 @@ export interface Generator {
   property?: {}
   events: {}
   outlets?: {}
-  switches: Array<SwitchDef>
+  switches?: Array<SwitchDef>
 }
 
 export type SubspaceID = string
@@ -46,7 +46,7 @@ export type ActionWithParams = Action & {
   params?: Array<{
     input: string
     value?: any
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -54,7 +54,7 @@ export type ActionWithDataParams = Action & {
   dataParams?: Array<{
     input: () => Data
     value?: any
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -103,7 +103,7 @@ export type ApplicationSettings = {
       borderBottomLeftRadius?: number
       borderBottomRightRadius?: number
     }
-  },
+  }
 }
 
 export type Application = {
@@ -113,4 +113,7 @@ export type Application = {
   rootSubspace: Subspace
   fonts?: ApplicationFont[]
   settings?: ApplicationSettings
-}
+  metadata?: {
+    [key: string]: any
+  }
+}