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

package/types/subspace.ts

@@ -1,8 +1,8 @@
-import { Brick, Generator, LocalSyncStrategy, EventAction } from './common'
-import { Animation } from './animation'
-import { Canvas } from './canvas'
-import { Data } from './data'
-import { DataCalculation } from './data-calc'
+import type { Brick, Generator, LocalSyncStrategy, EventAction, SubspaceID } from './common'
+import type { Animation } from './animation'
+import type { Canvas } from './canvas'
+import type { Data } from './data'
+import type { DataCalculation } from './data-calc'
 
 export type Subspace = {
   __typename: 'Subspace'
@@ -10,6 +10,21 @@ export type Subspace = {
   title: string
   description?: string
   localSyncChangeCanvas?: LocalSyncStrategy
+  module?: {
+    id: string
+    version: string
+    selectedRequirements?: Array<{
+      subspace: SubspaceID
+      id: string
+      version: string
+    }>
+    // Module only
+    requirements?: Array<{
+      subspace: SubspaceID
+      id: string
+      version: string
+    }>
+  }
   layout: {
     width: number
     height: number
@@ -21,6 +36,7 @@ export type Subspace = {
   bricks: Array<Brick>
   generators: Array<Generator>
   data: Array<Data>
+  dataRouting: Array<Data>
   dataCalculation: Array<DataCalculation>
   actions?: {
     [key: string]: {
@@ -30,4 +46,3 @@ export type Subspace = {
   }
   events?: { [key: string]: Array<EventAction> }
 }
-

package/types/switch.ts

@@ -1,5 +1,5 @@
-import { Canvas } from './canvas'
-import { Data } from './data'
+import type { Canvas } from './canvas'
+import type { Data } from './data'
 export type SwitchCondInnerStateCurrentCanvas = {
   __typename: 'SwitchCondInnerStateCurrentCanvas'
   value: () => Canvas
@@ -36,10 +36,13 @@ export interface SwitchDef {
   animation?: {}
   conds?: Array<{
     method: '==' | '!=' | '>' | '<' | '>=' | '<='
-    cond: SwitchCondInnerStateCurrentCanvas | SwitchCondData | {
-      __typename: 'SwitchCondInnerStateOutlet'
-      outlet: string
-      value: any
-    }
+    cond:
+      | SwitchCondInnerStateCurrentCanvas
+      | SwitchCondData
+      | {
+          __typename: 'SwitchCondInnerStateOutlet'
+          outlet: string
+          value: any
+        }
   }>
 }

package/types/system.ts

@@ -1,6 +1,7 @@
-import { Action, ActionWithDataParams, ActionWithParams, Brick, Generator } from './common'
-import { Canvas } from './canvas'
-import { Data, DataLink } from './data'
+import type { Action, ActionWithDataParams, ActionWithParams, Brick, Generator } from './common'
+import type { Animation } from './animation'
+import type { Canvas } from './canvas'
+import type { Data, DataLink } from './data'
 
 /* Change Data value */
 export type SystemActionPropertyBank = ActionWithDataParams & {
@@ -14,27 +15,27 @@ export type SystemActionPropertyBankExpression = ActionWithParams & {
     | {
         input: 'expression'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'variables'
         value?: {} | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'result'
         value?: string | DataLink | (() => Data)
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'resultAssignPath'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'errorResult'
         value?: string | DataLink | (() => Data)
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -51,27 +52,27 @@ export type SystemActionDynamicBrick = ActionWithParams & {
     | {
         input: 'addList'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'preferAfterItemId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'reset'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'removeItemId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'removeItems'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -88,22 +89,22 @@ export type SystemActionDynamicAnimation = ActionWithParams & {
     | {
         input: 'brickId'
         value?: string | DataLink | (() => Brick)
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'animationId'
         value?: string | DataLink | (() => Animation)
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'runType'
         value?: 'once' | 'loop' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'resetInitialValue'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -114,7 +115,7 @@ export type SystemActionDynamicAnimationReset = ActionWithParams & {
   params?: Array<{
     input: 'dynamicAnimationBrickId'
     value?: string | DataLink | (() => Brick)
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -124,7 +125,7 @@ export type SystemActionDynamicAnimationStop = ActionWithParams & {
   params?: Array<{
     input: 'dynamicAnimationBrickId'
     value?: string | DataLink | (() => Brick)
-    mapping?: boolean
+    mapping?: string
   }>
 }
 
@@ -135,12 +136,12 @@ export type SystemActionChangeCanvas = ActionWithParams & {
     | {
         input: 'canvasId'
         value?: string | DataLink | (() => Canvas)
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'canvasTitleLike'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -157,17 +158,17 @@ export type SystemActionMessage = ActionWithParams & {
           | 'SYSTEM_MESSAGE_TYPE_WARNING'
           | 'SYSTEM_MESSAGE_TYPE_ERROR'
           | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'title'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'message'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -179,37 +180,37 @@ export type SystemActionAlert = ActionWithParams & {
     | {
         input: 'id'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'type'
         value?: 'info' | 'success' | 'warning' | 'error' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'title'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'message'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'selections'
         value?: {} | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'selectionResult'
         value?: string | DataLink | (() => Data)
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'timeout'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -221,12 +222,12 @@ export type SystemActionPopupReset = ActionWithParams & {
     | {
         input: 'popupClearType'
         value?: 'all' | 'alert' | 'generator' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'popupId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -238,32 +239,32 @@ export type SystemActionTakeScreenshot = ActionWithParams & {
     | {
         input: 'currentSubspace'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'format'
         value?: 'jpg' | 'png' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'quality'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'width'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'height'
         value?: number | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'saveProperty'
         value?: string | DataLink | (() => Data)
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -275,32 +276,32 @@ export type SystemActionUseShareApplication = ActionWithParams & {
     | {
         input: 'applicationId'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'releaseVersion'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'useType'
         value?: 'run' | 'use-after-bind' | 'cancel-use' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'viewportPresetNameLike'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'viewportPresetDeviceTarget'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'enableLocalSync'
         value?: boolean | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -322,17 +323,17 @@ export type SystemActionOpenUrl = ActionWithParams & {
     | {
         input: 'url'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'behavior'
         value?: 'in-app' | 'new-window' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'inAppTintColor'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -344,37 +345,37 @@ export type SystemActionOpenFile = ActionWithParams & {
     | {
         input: 'pickType'
         value?: 'file' | 'multiple' | 'directory' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'fileType'
         value?: any
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'copyTo'
         value?: 'cache' | 'document' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'mode'
         value?: 'import' | 'open' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'saveProperty'
         value?: string | DataLink | (() => Data)
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'saveDetailProperty'
         value?: string | DataLink | (() => Data)
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'errorSaveProperty'
         value?: string | DataLink | (() => Data)
-        mapping?: boolean
+        mapping?: string
       }
   >
 }
@@ -386,12 +387,12 @@ export type SystemActionThrowException = ActionWithParams & {
     | {
         input: 'behavior'
         value?: 'application' | 'application-render' | 'native' | DataLink
-        mapping?: boolean
+        mapping?: string
       }
     | {
         input: 'exceptionMessage'
         value?: string | DataLink
-        mapping?: boolean
+        mapping?: string
       }
   >
 }

package/utils/calc.ts

@@ -0,0 +1,118 @@
+import type { DataCalculationMap, DataCalculationData, DataCommand } from '../types/data-calc'
+
+const GRID = {
+  WIDTH: 300, // Distance between columns
+  HEIGHT: 150, // Distance between rows
+  PADDING: 15, // Edge padding
+  COLUMNS: 4, // Max columns in grid
+  ROWS: 3, // Max rows in grid
+}
+
+// TODO: Improve the algorithm to minimize crossing lines
+
+// If we are too lazy to describe nodes in the editing interface,
+// we can let it generate it automatically
+export const generateDataCalculationMapEditorInfo = (
+  nodes: Array<DataCalculationData | DataCommand>,
+) => {
+  const editorInfo: DataCalculationMap['editorInfo'] = []
+
+  // Track node relationships
+  const inputCounts = new Map<DataCalculationData | DataCommand, number>()
+  const outputCounts = new Map<DataCalculationData | DataCommand, number>()
+  const connectedTo = new Map<
+    DataCalculationData | DataCommand,
+    Set<DataCalculationData | DataCommand>
+  >()
+
+  // Analyze node connections
+  nodes.forEach((node) => {
+    // Count and track inputs
+    if ('inputs' in node) {
+      const inputs = node.inputs
+        .filter((input) => input !== null)
+        .map((input) => (Array.isArray(input) ? input.length : 1))
+        .reduce((sum, count) => sum + count, 0)
+      inputCounts.set(node, inputs)
+
+      // Track connections
+      node.inputs.forEach((input) => {
+        if (Array.isArray(input)) {
+          input.forEach((conn) => {
+            if (!connectedTo.has(node)) {
+              connectedTo.set(node, new Set())
+            }
+            const sourceNode = nodes.find((n) => 'id' in n && n.id === conn.id)
+            if (sourceNode) {
+              connectedTo.get(node)!.add(sourceNode)
+            }
+          })
+        }
+      })
+    } else {
+      inputCounts.set(node, 0)
+    }
+
+    // Count outputs
+    if ('outputs' in node) {
+      const outputs = node.outputs
+        .filter((output) => output !== null)
+        .map((output) => (Array.isArray(output) ? output.length : 1))
+        .reduce((sum, count) => sum + count, 0)
+      outputCounts.set(node, outputs)
+    } else {
+      outputCounts.set(node, 0)
+    }
+  })
+
+  // Calculate layers
+  const layers: Array<Array<DataCalculationData | DataCommand>> = [[], [], [], []]
+
+  nodes.forEach((node) => {
+    const inputs = inputCounts.get(node) || 0
+    const outputs = outputCounts.get(node) || 0
+    const connections = connectedTo.get(node)?.size || 0
+
+    if (inputs === 0) {
+      // Input nodes (leftmost)
+      layers[0].push(node)
+    } else if (outputs === 0) {
+      // Output nodes (rightmost)
+      layers[3].push(node)
+    } else if (connections > 1) {
+      // Nodes with multiple connections (middle-right)
+      layers[2].push(node)
+    } else {
+      // Processing nodes (middle-left)
+      layers[1].push(node)
+    }
+  })
+
+  // Position nodes in each layer
+  layers.forEach((layerNodes, layerIndex) => {
+    // Sort nodes by their connections to try to minimize crossing lines
+    layerNodes.sort((a, b) => {
+      const aConns = connectedTo.get(a)?.size || 0
+      const bConns = connectedTo.get(b)?.size || 0
+      return bConns - aConns
+    })
+
+    // Position nodes in the layer
+    layerNodes.forEach((node, nodeIndex) => {
+      // Distribute nodes evenly within their layer
+      const row = nodeIndex % GRID.ROWS
+      const offset = Math.floor(nodeIndex / GRID.ROWS) * (GRID.HEIGHT / 2)
+
+      editorInfo.push({
+        node,
+        position: {
+          x: GRID.PADDING + layerIndex * GRID.WIDTH,
+          y: GRID.PADDING + row * GRID.HEIGHT + offset,
+        },
+        points: [],
+      })
+    })
+  })
+
+  return editorInfo
+}