@fugood/bricks-project 2.21.0-beta.14.test2 → 2.21.0-beta.14.test3

package/api/index.ts

@@ -1 +1 @@
-export * from './application'
+export * from './instance'

package/api/{application.ts → instance.ts}

@@ -48,6 +48,30 @@ export const deployApp = async (appId: string, config: {}, lastCommitId: string)
   return true
 }
 
+export const deployModule = async (modId: string, config: {}, lastCommitId: string) => {
+  const { errors } = await doGQL(
+    `mutation BRICKS_PROJECT_updateModule($id: ID!, $config: JSON) {
+      updateModule(
+        id: $id
+        config: $config
+        validateConfig: true
+      ) {
+        _id
+        name
+      }
+    }`,
+    {
+      id: modId,
+      config: {
+        ...config,
+        bricks_project_last_commit_id: lastCommitId,
+      },
+    },
+  )
+  if (errors) throw new Error(errors[0].message)
+  return true
+}
+
 export const pullApp = async (appId: string) => {
   const { data, errors } = await doGQL(
     `query BRICKS_PROJECT_application($id: ID!) {
@@ -63,3 +87,19 @@ export const pullApp = async (appId: string) => {
   if (errors) throw new Error(errors[0].message)
   return data.application
 }
+
+export const pullModule = async (modId: string) => {
+  const { data, errors } = await doGQL(
+    `query BRICKS_PROJECT_module($id: ID!) {
+      module(id: $id) {
+        _id
+        name
+        description
+        config
+      }
+    }`,
+    { id: modId },
+  )
+  if (errors) throw new Error(errors[0].message)
+  return data.module
+}

package/compile/index.ts

@@ -20,6 +20,7 @@ import {
   Brick,
   Generator,
   Canvas,
+  Subspace,
 } from '../types'
 import { generateCalulationMap } from './util'
 
@@ -184,6 +185,47 @@ const compileFrame = (frame: Canvas['items'][number]['frame']) => ({
   render_out_of_viewport: frame.renderOutOfViewport,
 })
 
+const compileKind = (kind: Data['kind']) => {
+  const { type, ...rest } = kind || {}
+  if (!type) return {}
+  return { kind: type, ...rest }
+}
+
+const compileRemoteUpdate = (remoteUpdate: Data['remoteUpdate']) => {
+  if (!remoteUpdate) return {}
+  if (remoteUpdate.type === 'auto') return { enable_remote_update: true }
+  return {
+    enable_remote_update: true,
+    ...(remoteUpdate.type === 'device-specific' ? { use_remote_id_prefix: true } : {}),
+    ...(remoteUpdate.type === 'global-data' ? { global_remote_update_prop: remoteUpdate.id } : {}),
+  }
+}
+
+const compileModule = (subspace: Subspace) => {
+  if (!subspace.module) return {}
+  return {
+    module: {
+      link: true,
+      id: subspace.module.id,
+      version: subspace.module.version,
+    },
+    selected_requirements: subspace.module.selectedRequirements?.reduce((acc, requirement) => {
+      acc[requirement.subspace] = {
+        id: requirement.id,
+        version: requirement.version,
+      }
+      return acc
+    }, {}),
+    requirements: subspace.module.requirements?.reduce((acc, requirement) => {
+      acc[requirement.subspace] = {
+        id: requirement.id,
+        version: requirement.version,
+      }
+      return acc
+    }, {}),
+  }
+}
+
 export const compile = (app: Application) => {
   const config = {
     title: app.name,
@@ -196,6 +238,11 @@ export const compile = (app: Application) => {
           height: subspace.layout?.height,
           resize_mode: subspace.layout?.resizeMode,
         },
+        local_sync: subspace.localSyncChangeCanvas
+          ? {
+              change_canvas: subspace.localSyncChangeCanvas,
+            }
+          : undefined,
         animation_map: subspace.animations.reduce((map, animation) => {
           if (animation.__typename === 'Animation') {
             const animationDef = animation as AnimationDef
@@ -324,6 +371,11 @@ export const compile = (app: Application) => {
             template_key: generator.templateKey,
             title: generator.title,
             description: generator.description,
+            local_sync: generator.localSyncRunMode
+              ? {
+                  run_mode: generator.localSyncRunMode,
+                }
+              : undefined,
             property: compileProperty(generator.property || {}),
             event_map: compileEvents(generator.templateKey, generator.events || {}),
             outlet: compileOutlets(generator.templateKey, generator.outlets || {}),
@@ -349,10 +401,19 @@ export const compile = (app: Application) => {
           map[data.id] = {
             title: data.title,
             description: data.description,
+            linked: data.metadata?.linked,
+            linkedFrom: data.metadata?.linkedFrom,
+            local_sync: data.localSyncUpdateMode
+              ? {
+                  update_mode: data.localSyncUpdateMode,
+                }
+              : undefined,
             persist_data: data.persistData,
+            ...compileRemoteUpdate(data.remoteUpdate),
             routing: data.routing,
             schema: data.schema,
             type: data.type,
+            ...compileKind(data.kind),
             value: data.value,
             event_map: compileEvents('PROPERTY_BANK', data.events || {}),
           }
@@ -369,14 +430,27 @@ export const compile = (app: Application) => {
 
             const generateInputPorts = (inputs, outputs) =>
               inputs.reduce((acc, port) => {
-                if (!port.source().id) return acc
+                if (!acc[port.key]) acc[port.key] = null
 
-                const firstOutput = outputs[0]
-                let disableTriggerCommandIn = firstOutput?.target().id
+                let sourceId
+                let sourceNode = port.source()
+                if (sourceNode?.__typename === 'DataCalculationData')
+                  sourceId = (sourceNode as DataCalculationData).data().id
+                if (sourceNode?.__typename === 'DataCommand') sourceId = sourceNode.id
 
+                if (!sourceId) return acc
                 if (!acc[port.key]) acc[port.key] = []
+
+                const firstOutput = outputs[0]
+                let disableTriggerCommandIn
+                let firstOutputTargetNode = firstOutput?.target()
+                if (!port.trigger && firstOutputTargetNode?.__typename === 'DataCalculationData')
+                  disableTriggerCommandIn = (firstOutputTargetNode as DataCalculationData).data().id
+                if (!port.trigger && firstOutputTargetNode?.__typename === 'DataCommand')
+                  disableTriggerCommandIn = firstOutputTargetNode.id
+
                 acc[port.key].push({
-                  id: port.source().id,
+                  id: sourceId,
                   port: port.sourceKey,
                   disable_trigger_command_in: disableTriggerCommandIn,
                 })
@@ -385,18 +459,26 @@ export const compile = (app: Application) => {
 
             const generateOutputPorts = (outputs) =>
               outputs.reduce((acc, port) => {
-                if (!port.target().id) return acc
+                if (!acc[port.key]) acc[port.key] = null
 
+                let targetId
+                let targetNode = port.target()
+                if (targetNode?.__typename === 'DataCalculationData')
+                  targetId = (targetNode as DataCalculationData).data().id
+                if (targetNode?.__typename === 'DataCommand') targetId = targetNode.id
+
+                if (!targetId) return acc
                 if (!acc[port.key]) acc[port.key] = []
+
                 acc[port.key].push({
-                  id: port.target().id,
+                  id: targetId,
                   port: port.targetKey,
                 })
                 return acc
               }, {})
 
             const getNodeId = (node) => {
-              if (node.__typename === 'DataCalculationData') return node.data.id
+              if (node.__typename === 'DataCalculationData') return node.data().id
               if (node.__typename === 'DataCommand') return node.id
               throw new Error(`Invalid node: ${JSON.stringify(node)}`)
             }
@@ -463,15 +545,20 @@ export const compile = (app: Application) => {
             const scriptCalc = dataCalc as DataCalculationScript
             calc.type = 'script'
 
-            const program = parseAST(scriptCalc.code, { sourceType: 'module', ecmaVersion: 2020 })
-            // export function main() { ... }
-            const declarationBody = (
-              (program.body[0] as ExportNamedDeclaration).declaration as FunctionDeclaration
-            )?.body
-
+            let code: string
+            try {
+              const program = parseAST(scriptCalc.code, { sourceType: 'module', ecmaVersion: 2020 })
+              // export function main() { ... }
+              const declarationBody = (
+                (program.body[0] as ExportNamedDeclaration).declaration as FunctionDeclaration
+              )?.body
+              code = escodegen.generate(declarationBody)
+            } catch (e) {
+              code = scriptCalc.code || ''
+            }
             calc.script_config = {
               note: scriptCalc.note,
-              code: escodegen.generate(declarationBody),
+              code,
               enable_async: scriptCalc.enableAsync,
               inputs: scriptCalc.inputs.reduce((acc, input) => {
                 acc[input.data().id] = input.key
@@ -502,12 +589,18 @@ export const compile = (app: Application) => {
         }, {}),
         action_map: subspace.actions || {},
         event_map: compileEvents('', subspace.events || {}),
+        routing: subspace.dataRouting.reduce((acc, data) => {
+          acc[data.id] = { enabled_routing: true }
+          return acc
+        }, {}),
+        ...compileModule(subspace),
       }
       return subspaceMap
     }, {}),
     root_subspace_id: app.rootSubspace.id,
     fonts: app.fonts,
     ...compileApplicationSettings(app.settings),
+    test_map: app.metadata?.TEMP_test_map || {},
   }
   return config
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.21.0-beta.14.test2",
+  "version": "2.21.0-beta.14.test3",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"

package/types/common.ts

@@ -113,4 +113,7 @@ export type Application = {
   rootSubspace: Subspace
   fonts?: ApplicationFont[]
   settings?: ApplicationSettings
-}
+  metadata?: {
+    [key: string]: any
+  }
+}

package/types/data-calc.ts

@@ -950,6 +950,7 @@ export type DataCommandObjectMapKeys = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_key'
         source: (() => DataCalculationData | DataCommand) | any
         sourceKey: string
@@ -958,6 +959,7 @@ export type DataCommandObjectMapKeys = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -997,6 +999,7 @@ export type DataCommandObjectMapValues = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_key'
         source: (() => DataCalculationData | DataCommand) | any
         sourceKey: string
@@ -1005,6 +1008,7 @@ export type DataCommandObjectMapValues = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1220,6 +1224,7 @@ export type DataCommandCollectionCount = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_group'
         source: (() => DataCalculationData | DataCommand) | string
         sourceKey: string
@@ -1228,6 +1233,7 @@ export type DataCommandCollectionCount = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1334,6 +1340,7 @@ export type DataCommandCollectionEvery = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_valid'
         source: (() => DataCalculationData | DataCommand) | boolean
         sourceKey: string
@@ -1342,6 +1349,7 @@ export type DataCommandCollectionEvery = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1425,6 +1433,7 @@ export type DataCommandCollectionFilter = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_valid'
         source: (() => DataCalculationData | DataCommand) | boolean
         sourceKey: string
@@ -1433,6 +1442,7 @@ export type DataCommandCollectionFilter = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1472,6 +1482,7 @@ export type DataCommandCollectionFind = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_valid'
         source: (() => DataCalculationData | DataCommand) | boolean
         sourceKey: string
@@ -1487,6 +1498,7 @@ export type DataCommandCollectionFind = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1526,6 +1538,7 @@ export type DataCommandCollectionFindKey = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_valid'
         source: (() => DataCalculationData | DataCommand) | boolean
         sourceKey: string
@@ -1541,6 +1554,7 @@ export type DataCommandCollectionFindKey = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1631,6 +1645,7 @@ export type DataCommandCollectionGroupBy = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_group'
         source: (() => DataCalculationData | DataCommand) | string
         sourceKey: string
@@ -1639,6 +1654,7 @@ export type DataCommandCollectionGroupBy = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1715,6 +1731,7 @@ export type DataCommandCollectionIntersection = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_value'
         source: (() => DataCalculationData | DataCommand) | any
         sourceKey: string
@@ -1723,6 +1740,7 @@ export type DataCommandCollectionIntersection = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1762,6 +1780,7 @@ export type DataCommandCollectionKeyBy = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_key'
         source: (() => DataCalculationData | DataCommand) | string
         sourceKey: string
@@ -1770,6 +1789,7 @@ export type DataCommandCollectionKeyBy = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1830,6 +1850,7 @@ export type DataCommandCollectionMap = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_value'
         source: (() => DataCalculationData | DataCommand) | any
         sourceKey: string
@@ -1838,6 +1859,7 @@ export type DataCommandCollectionMap = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -1957,6 +1979,7 @@ export type DataCommandCollectionReduce = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result'
         source: (() => DataCalculationData | DataCommand) | any
         sourceKey: string
@@ -1965,6 +1988,7 @@ export type DataCommandCollectionReduce = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -2134,6 +2158,7 @@ export type DataCommandCollectionSome = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_valid'
         source: (() => DataCalculationData | DataCommand) | boolean
         sourceKey: string
@@ -2142,6 +2167,7 @@ export type DataCommandCollectionSome = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -2181,6 +2207,7 @@ export type DataCommandCollectionSort = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_value'
         source: (() => DataCalculationData | DataCommand) | any
         sourceKey: string
@@ -2189,6 +2216,7 @@ export type DataCommandCollectionSort = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -2265,6 +2293,7 @@ export type DataCommandCollectionUnion = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Iteratee Callback Input: true
         key: 'iteratee_result_value'
         source: (() => DataCalculationData | DataCommand) | any
         sourceKey: string
@@ -2273,6 +2302,7 @@ export type DataCommandCollectionUnion = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Iteratee Callback: true
         key: 'iteratee_input'
         // target type: object
         target: () => DataCalculationData | DataCommand
@@ -3467,6 +3497,7 @@ export type DataCommandStringReplace = DataCommand & {
       }
     | {
         // Default value: undefined
+        // Invocation Callback Input: true
         key: 'invocation_result'
         source: (() => DataCalculationData | DataCommand) | string
         sourceKey: string
@@ -3489,6 +3520,7 @@ export type DataCommandStringReplace = DataCommand & {
   >
   outputs?: Array<
     | {
+        // Invocation Callback: true
         key: 'invocation_input'
         // target type: object
         target: () => DataCalculationData | DataCommand

package/types/data.ts

@@ -1,4 +1,4 @@
-import { EventAction } from './common'
+import { SubspaceID, EventAction, LocalSyncStrategy } from './common'
 
 interface DataDef {
   events?: {
@@ -15,15 +15,55 @@ interface DataDef {
 
 export type Data<T = any> = DataDef & {
   __typename: 'Data'
-  type: 'string' | 'number' | 'bool' | 'array' | 'object' | 'any'
   id: string
   title: string
   description?: string
+  metadata?: {
+    linked?: Array<SubspaceID>
+    linkedFrom?: SubspaceID
+    [key: string]: any
+  }
+  remoteUpdate?: { type: 'auto' | 'device-specific' } | { type: 'global-data'; id: string }
   // Determine how the property is changed via another subspaces.
   routing?: 'default' | 'read-only'
   // Persist data, so that the data will be keep after refresh.
   persistData?: boolean
-  schema: object
+  localSyncUpdateMode?: LocalSyncStrategy
+  type: 'string' | 'number' | 'bool' | 'array' | 'object' | 'any'
+  schema?: object
+  kind?:
+    | {
+        type: 'id'
+        idType?: 'brick' | 'generator' | 'canvas' | 'animation'
+      }
+    | {
+        type: 'auto-generated-item-id'
+        idType?: 'canvas'
+      }
+    | {
+        type: 'unit'
+        unit?: 'ms' | 'grid' | 'px'
+        max?: number
+        min?: number
+        step?: number
+      }
+    | {
+        type:
+          | 'color'
+          | 'datetime'
+          | 'graphql'
+          | 'rich-text-content'
+          | 'sandbox-script'
+          | 'llm-prompt'
+          | 'media-resource-image'
+          | 'media-resource-video'
+          | 'media-resource-audio'
+          | 'media-resource-file'
+          | 'lottie-file-uri'
+          | 'ggml-model-asset'
+          | 'gguf-model-asset'
+          | 'binary-asset'
+      }
   value: T
 }
 

package/types/subspace.ts

@@ -1,4 +1,4 @@
-import { Brick, Generator, LocalSyncStrategy, EventAction } from './common'
+import { Brick, Generator, LocalSyncStrategy, EventAction, SubspaceID } from './common'
 import { Animation } from './animation'
 import { Canvas } from './canvas'
 import { Data } from './data'
@@ -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> }
 }
-