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

package/compile/index.ts

@@ -19,6 +19,7 @@ import {
   DataCommand,
   Brick,
   Generator,
+  Canvas,
 } from '../types'
 import { generateCalulationMap } from './util'
 
@@ -26,7 +27,8 @@ const compileProperty = (property, result = {}) => {
   if (Array.isArray(property)) {
     return property.map((p) => compileProperty(p, result))
   }
-  if (property?.__typename === 'DataLink' && property.data?.()) return `PROPERTY_BANK#${property.data().id}`
+  if (property?.__typename === 'DataLink' && property.data?.())
+    return `PROPERTY_BANK#${property.data().id}`
   if (typeof property === 'function') return property()?.id // defined type instance getter
   if (typeof property === 'object') {
     return Object.entries(property).reduce((acc, [key, value]) => {
@@ -167,6 +169,21 @@ const animationTypeMap = {
   AnimationDecayConfig: 'decay',
 }
 
+const compileFrame = (frame: Canvas['items'][number]['frame']) => ({
+  x: frame.x,
+  y: frame.y,
+  width: frame.width,
+  height: frame.height,
+  standby_mode: frame.standbyMode,
+  standby_frame: frame.standbyFrame,
+  standby_opacity: frame.standbyOpacity,
+  standby_delay: frame.standbyDelay,
+  standby_delay_random: frame.standbyDelayRandom,
+  standby_easing: frame.standbyEasing,
+  showing_delay: frame.showingDelay,
+  render_out_of_viewport: frame.renderOutOfViewport,
+})
+
 export const compile = (app: Application) => {
   const config = {
     title: app.name,
@@ -212,6 +229,7 @@ export const compile = (app: Application) => {
               brickIdPrefix: itemBrick.brickIdPrefix,
               templateKey: itemBrick.templateKey,
               property: compileProperty(itemBrick.property),
+              propertyMapping: itemBrick.propertyMapping,
               animation: compileAnimations(itemBrick.templateKey, itemBrick.animation || {}),
               outlet: compileOutlets(itemBrick.templateKey, itemBrick.outlets || {}),
               eventMap: compileEvents(itemBrick.templateKey, itemBrick.eventMap || {}, {
@@ -291,7 +309,13 @@ export const compile = (app: Application) => {
               }
               return acc
             }, {}),
-            item_list: [], // TODO
+            item_list: canvas.items.map((item) => ({
+              type: typeof item.item === 'function' ? 'brick' : 'subspace',
+              ...(typeof item.item === 'function'
+                ? { brick_id: (item.item as () => Brick)()?.id }
+                : { subspace_id: item.item }),
+              frame: compileFrame(item.frame),
+            })),
           }
           return map
         }, {}),
@@ -396,8 +420,8 @@ export const compile = (app: Application) => {
                 const args = commandNode.inputs.filter(
                   (input) =>
                     typeof input.source !== 'function' ||
-                    input.source()?.__typename !== 'DataCalculationData' &&
-                    input.source()?.__typename !== 'DataCommand',
+                    (input.source()?.__typename !== 'DataCalculationData' &&
+                      input.source()?.__typename !== 'DataCommand'),
                 )
                 const inputs = commandNode.inputs.filter(
                   (input) =>
@@ -446,6 +470,7 @@ export const compile = (app: Application) => {
             )?.body
 
             calc.script_config = {
+              note: scriptCalc.note,
               code: escodegen.generate(declarationBody),
               enable_async: scriptCalc.enableAsync,
               inputs: scriptCalc.inputs.reduce((acc, input) => {
@@ -465,9 +490,12 @@ export const compile = (app: Application) => {
               error: scriptCalc.error?.().id,
             }
 
-            Object.assign(calc, generateCalulationMap(calc.script_config, {
-              snapshotMode: process.env.BRICKS_SNAPSHOT_MODE === '1',
-            }))
+            Object.assign(
+              calc,
+              generateCalulationMap(calc.script_config, {
+                snapshotMode: process.env.BRICKS_SNAPSHOT_MODE === '1',
+              }),
+            )
           }
           map[dataCalc.id] = calc
           return map

package/package.json

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

package/types/data-calc.ts

@@ -68,6 +68,7 @@ export type DataCalculationMap = DataCalculation & {
 
 export type DataCalculationScript = DataCalculation & {
   __typename: 'DataCalculationScript'
+  note?: string
   enableAsync: boolean
   code: string
   inputs: Array<{