@fugood/bricks-project 2.23.0-beta.45 → 2.23.0-beta.49

package/compile/action-name-map.ts

@@ -310,6 +310,24 @@ export const templateActionNameMap = {
     },
   },
 
+  BRICK_MAPS: {
+    BRICK_MAPS_PAN: {
+      panDirection: 'BRICK_MAPS_PAN_DIRECTION',
+    },
+    BRICK_MAPS_NAVIGATE_TO: {
+      targetLatitude: 'BRICK_MAPS_TARGET_LATITUDE',
+      targetLongitude: 'BRICK_MAPS_TARGET_LONGITUDE',
+      targetZoom: 'BRICK_MAPS_TARGET_ZOOM',
+    },
+    BRICK_MAPS_FOCUS_MARKER: {
+      markerId: 'BRICK_MAPS_MARKER_ID',
+    },
+    BRICK_MAPS_FIT_TO_MARKERS: {
+      edgePadding: 'BRICK_MAPS_EDGE_PADDING',
+      animated: 'BRICK_MAPS_ANIMATED',
+    },
+  },
+
   GENERATOR_FILE: {
     GENERATOR_FILE_READ_CONTENT: {
       encoding: 'ENCODING',

package/compile/util.ts

@@ -3,6 +3,7 @@ import { makeId } from '../utils/id'
 type ScriptConfig = {
   inputs: Record<string, string>
   enable_async: boolean
+  trigger_mode?: 'auto' | 'manual'
   disabled_triggers: Record<string, boolean>
   output: string | null
   outputs: Record<string, string[]>
@@ -13,6 +14,8 @@ type ScriptConfig = {
 const errorMsg = 'Not allow duplicate set property id between inputs / outputs / output / error.'
 
 export const validateConfig = (config: ScriptConfig) => {
+  // Skip input/output overlap validation in manual mode (allows same data node in both)
+  if (config.trigger_mode === 'manual') return
   if (config.error && config.inputs[config.error]) {
     throw new Error(`${errorMsg}. key: error`)
   }
@@ -87,7 +90,8 @@ export const generateCalulationMap = (config: ScriptConfig, opts?: { snapshotMod
             {
               id: key,
               port: 'value',
-              disable_trigger_command: config.disabled_triggers?.[key] ? true : undefined,
+              disable_trigger_command:
+                config.trigger_mode === 'manual' || config.disabled_triggers?.[key] || undefined,
             },
           ],
         },
@@ -152,6 +156,8 @@ export const generateCalulationMap = (config: ScriptConfig, opts?: { snapshotMod
         points: {},
       }
       pbList.forEach((pb, pbIndex) => {
+        // Check if this data node already exists (it might be used as both input and output)
+        const existingNode = acc.map[pb] || inputs.map[pb]
         acc.map[pb] = {
           type: 'data-node',
           properties: {},
@@ -164,7 +170,8 @@ export const generateCalulationMap = (config: ScriptConfig, opts?: { snapshotMod
             ],
           },
           out: {
-            value: null,
+            // Preserve existing out.value if node is also used as input
+            value: existingNode?.out?.value ?? null,
           },
         }
         acc.editorInfo[pb] = {
@@ -292,7 +299,8 @@ export const generateCalulationMap = (config: ScriptConfig, opts?: { snapshotMod
             ],
           },
           out: {
-            value: null,
+            // Preserve existing out.value if node is also used as input
+            value: inputs.map[config.error]?.out?.value ?? null,
           },
         },
       }),
@@ -309,7 +317,8 @@ export const generateCalulationMap = (config: ScriptConfig, opts?: { snapshotMod
             ],
           },
           out: {
-            value: null,
+            // Preserve existing out.value if node is also used as input
+            value: inputs.map[config.output]?.out?.value ?? null,
           },
         },
       }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.23.0-beta.45",
+  "version": "2.23.0-beta.49",
   "main": "index.ts",
   "scripts": {
     "build": "bun scripts/build.js"
@@ -14,5 +14,5 @@
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "fa67a0c333ca6e372e7b7b01035d8e871b216b9f"
+  "gitHead": "d879268aee7397545296e9c1ca1f369af32dfee5"
 }

package/types/bricks/Camera.ts

@@ -107,8 +107,8 @@ Default property:
 }
   */
   property?: BrickBasicProperty & {
-    /* Camera type (Ignore it if you are using external camera) */
-    type?: 'back' | 'front' | DataLink
+    /* Camera type */
+    type?: 'back' | 'front' | 'external' | DataLink
     /* Enable or disable camera */
     isActive?: boolean | DataLink
     /* Camera zoom */

package/types/bricks/Maps.ts

@@ -0,0 +1,254 @@
+/* Auto generated by build script */
+import type { SwitchCondInnerStateCurrentCanvas, SwitchCondData, SwitchDef } from '../switch'
+import type { Data, DataLink } from '../data'
+import type { Animation, AnimationBasicEvents } from '../animation'
+import type {
+  Brick,
+  EventAction,
+  EventActionForItem,
+  ActionWithDataParams,
+  ActionWithParams,
+  Action,
+  EventProperty,
+} from '../common'
+import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
+
+/* Zoom in the map */
+export type BrickMapsActionZoomIn = Action & {
+  __actionName: 'BRICK_MAPS_ZOOM_IN'
+}
+
+/* Zoom out the map */
+export type BrickMapsActionZoomOut = Action & {
+  __actionName: 'BRICK_MAPS_ZOOM_OUT'
+}
+
+/* Pan the map in a direction */
+export type BrickMapsActionPan = ActionWithParams & {
+  __actionName: 'BRICK_MAPS_PAN'
+  params?: Array<{
+    input: 'panDirection'
+    value?: 'up' | 'down' | 'left' | 'right' | DataLink | EventProperty
+    mapping?: string
+  }>
+}
+
+/* Navigate to a specific location */
+export type BrickMapsActionNavigateTo = ActionWithParams & {
+  __actionName: 'BRICK_MAPS_NAVIGATE_TO'
+  params?: Array<
+    | {
+        input: 'targetLatitude'
+        value?: number | DataLink | EventProperty
+        mapping?: string
+      }
+    | {
+        input: 'targetLongitude'
+        value?: number | DataLink | EventProperty
+        mapping?: string
+      }
+    | {
+        input: 'targetZoom'
+        value?: number | DataLink | EventProperty
+        mapping?: string
+      }
+  >
+}
+
+/* Focus on a marker by ID */
+export type BrickMapsActionFocusMarker = ActionWithParams & {
+  __actionName: 'BRICK_MAPS_FOCUS_MARKER'
+  params?: Array<{
+    input: 'markerId'
+    value?: string | DataLink | EventProperty
+    mapping?: string
+  }>
+}
+
+/* Reset map to initial position */
+export type BrickMapsActionReset = Action & {
+  __actionName: 'BRICK_MAPS_RESET'
+}
+
+/* Fit map to show all markers */
+export type BrickMapsActionFitToMarkers = ActionWithParams & {
+  __actionName: 'BRICK_MAPS_FIT_TO_MARKERS'
+  params?: Array<
+    | {
+        input: 'edgePadding'
+        value?: number | DataLink | EventProperty
+        mapping?: string
+      }
+    | {
+        input: 'animated'
+        value?: boolean | DataLink | EventProperty
+        mapping?: string
+      }
+  >
+}
+
+interface BrickMapsDef {
+  /*
+Default property:
+{
+  "provider": "google",
+  "apiKey": "",
+  "initialLatitude": 25.033,
+  "initialLongitude": 121.5654,
+  "initialZoom": 10,
+  "mapType": "standard",
+  "mapTheme": "standard",
+  "showUserLocation": false,
+  "showCompass": true,
+  "showZoomControls": true,
+  "scrollEnabled": true,
+  "zoomEnabled": true,
+  "rotateEnabled": true,
+  "markers": [],
+  "customMapStyle": [],
+  "showTraffic": false,
+  "showBuildings": false,
+  "showIndoors": true,
+  "minZoomLevel": 1,
+  "maxZoomLevel": 20,
+  "followUserLocation": false,
+  "showPath": false,
+  "pathStrokeColor": "#4285F4",
+  "pathStrokeWidth": 3
+}
+  */
+  property?: BrickBasicProperty & {
+    /* Map provider (iOS/tvOS only - Android and Web always use Google Maps) */
+    provider?: 'google' | 'apple' | DataLink
+    /* Google Maps API Key (Web only) */
+    apiKey?: string | DataLink
+    /* Initial latitude */
+    initialLatitude?: number | DataLink
+    /* Initial longitude */
+    initialLongitude?: number | DataLink
+    /* Initial zoom level (1-20) */
+    initialZoom?: number | DataLink
+    /* Map type */
+    mapType?: 'standard' | 'satellite' | 'hybrid' | 'terrain' | DataLink
+    /* Map theme preset */
+    mapTheme?: 'standard' | 'dark' | 'night' | 'retro' | 'silver' | 'aubergine' | DataLink
+    /* Show user location button */
+    showUserLocation?: boolean | DataLink
+    /* Show compass */
+    showCompass?: boolean | DataLink
+    /* Show zoom controls */
+    showZoomControls?: boolean | DataLink
+    /* Enable scrolling */
+    scrollEnabled?: boolean | DataLink
+    /* Enable zooming */
+    zoomEnabled?: boolean | DataLink
+    /* Enable rotating */
+    rotateEnabled?: boolean | DataLink
+    /* Map markers data */
+    markers?:
+      | Array<
+          | DataLink
+          | {
+              id?: string | DataLink
+              latitude?: number | DataLink
+              longitude?: number | DataLink
+              title?: string | DataLink
+              description?: string | DataLink
+              color?: string | DataLink
+              icon?: string | DataLink
+            }
+        >
+      | DataLink
+    /* Custom map style (array of Google Maps style objects) */
+    customMapStyle?:
+      | Array<
+          | DataLink
+          | {
+              featureType?: string | DataLink
+              elementType?: string | DataLink
+              stylers?: Array<{} | DataLink> | DataLink
+            }
+        >
+      | DataLink
+    /* Show traffic layer */
+    showTraffic?: boolean | DataLink
+    /* Show buildings in 3D */
+    showBuildings?: boolean | DataLink
+    /* Show indoor maps */
+    showIndoors?: boolean | DataLink
+    /* Minimum zoom level */
+    minZoomLevel?: number | DataLink
+    /* Maximum zoom level */
+    maxZoomLevel?: number | DataLink
+    /* Follow user location */
+    followUserLocation?: boolean | DataLink
+    /* Show path between markers */
+    showPath?: boolean | DataLink
+    /* Path stroke color */
+    pathStrokeColor?: string | DataLink
+    /* Path stroke width */
+    pathStrokeWidth?: number | DataLink
+  }
+  events?: BrickBasicEvents & {
+    /* Event of the brick press */
+    onPress?: Array<EventAction>
+    /* Event of the brick press in */
+    onPressIn?: Array<EventAction>
+    /* Event of the brick press out */
+    onPressOut?: Array<EventAction>
+    /* Event of the brick long press */
+    onLongPress?: Array<EventAction>
+    /* Event of the brick focus (Use TV Device with controller) */
+    onFocus?: Array<EventAction>
+    /* Event of the brick blur (Use TV Device with controller) */
+    onBlur?: Array<EventAction>
+    /* Event when a marker is pressed */
+    onMarkerPress?: Array<EventAction>
+    /* Event when the map is pressed */
+    onMapPress?: Array<EventAction>
+    /* Event when the map region changes */
+    onRegionChange?: Array<EventAction>
+    /* Event when the map is ready */
+    onReady?: Array<EventAction>
+  }
+  outlets?: {
+    /* Brick is pressing */
+    brickPressing?: () => Data
+    /* Brick is focusing (Use TV Device with controller) */
+    brickFocusing?: () => Data
+  }
+  animation?: AnimationBasicEvents & {
+    onPress?: Animation
+    onPressIn?: Animation
+    onPressOut?: Animation
+    onLongPress?: Animation
+    onFocus?: Animation
+    onBlur?: Animation
+    onMarkerPress?: Animation
+    onMapPress?: Animation
+    onRegionChange?: Animation
+    onReady?: Animation
+  }
+}
+
+/* Maps brick ([Tutorial](https://intercom.help/bricks-dag-inc/articles/maps)) */
+export type BrickMaps = Brick &
+  BrickMapsDef & {
+    templateKey: 'BRICK_MAPS'
+    switches: Array<
+      SwitchDef &
+        BrickMapsDef & {
+          conds?: Array<{
+            method: '==' | '!=' | '>' | '<' | '>=' | '<='
+            cond:
+              | SwitchCondInnerStateCurrentCanvas
+              | SwitchCondData
+              | {
+                  __typename: 'SwitchCondInnerStateOutlet'
+                  outlet: 'brickPressing' | 'brickFocusing'
+                  value: any
+                }
+          }>
+        }
+    >
+  }

package/types/bricks/index.ts

@@ -18,3 +18,4 @@ export * from './WebView'
 export * from './Camera'
 export * from './WebRtcStream'
 export * from './GenerativeMedia'
+export * from './Maps'