@fugood/bricks-project 2.21.0-beta.14.test7 → 2.21.0-beta.14.test8

package/compile/index.ts

@@ -1,7 +1,10 @@
 import _ from 'lodash'
-import { parse as parseAST, ExportNamedDeclaration, FunctionDeclaration } from 'acorn'
+import { parse as parseAST } from 'acorn'
+import type { ExportNamedDeclaration, FunctionDeclaration } from 'acorn'
 import escodegen from 'escodegen'
-import {
+import { generateCalulationMap } from './util'
+import { templateActionNameMap } from './action-name-map'
+import type {
   Application,
   Data,
   Animation,
@@ -23,8 +26,6 @@ import {
   Canvas,
   Subspace,
 } from '../types'
-import { generateCalulationMap } from './util'
-import { templateActionNameMap } from './action-name-map'
 
 const compileProperty = (property, result = {}) => {
   if (Array.isArray(property)) {
@@ -295,17 +296,23 @@ export const compile = (app: Application) => {
               eventMap: compileEvents(itemBrick.templateKey, itemBrick.eventMap || {}, {
                 camelCase: true,
               }),
-              stateGroup: itemBrick.stateGroup.map((stateGroup) => ({
-                ...stateGroup,
-                animation: compileAnimations(itemBrick.templateKey, stateGroup.animation || {}),
-                commented: stateGroup.disabled,
-                conds: compileSwitchConds(itemBrick.templateKey, stateGroup.conds || []),
-                property: compileProperty(stateGroup.property),
-                outlet: compileOutlets(itemBrick.templateKey, stateGroup.outlets || {}),
-                eventMap: compileEvents(itemBrick.templateKey, stateGroup.eventMap || {}, {
-                  camelCase: true,
-                }),
-              })),
+              stateGroup: itemBrick.stateGroup.reduce((acc, stateGroup) => {
+                acc[stateGroup.id] = {
+                  title: stateGroup.title,
+                  description: stateGroup.description,
+                  override: stateGroup.override,
+                  break: stateGroup.break,
+                  commented: stateGroup.disabled,
+                  conds: compileSwitchConds(itemBrick.templateKey, stateGroup.conds || []),
+                  property: compileProperty(stateGroup.property),
+                  animation: compileAnimations(itemBrick.templateKey, stateGroup.animation || {}),
+                  outlet: compileOutlets(itemBrick.templateKey, stateGroup.outlets || {}),
+                  eventMap: compileEvents(itemBrick.templateKey, stateGroup.eventMap || {}, {
+                    camelCase: true,
+                  }),
+                }
+                return acc
+              }, {}),
             })
             if (Array.isArray(brickItems.brickList)) {
               const brickList = (brickItems.brickList || []).map(buildList)
@@ -592,7 +599,7 @@ export const compile = (app: Application) => {
           map[dataCalc.id] = calc
           return map
         }, {}),
-        action_map: subspace.actions || {},
+        action_map: subspace.actions || undefined,
         event_map: compileEvents('', subspace.events || {}),
         routing: subspace.dataRouting.reduce((acc, data) => {
           acc[data.id] = { enabled_routing: true }

package/package.json

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

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) */

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'

package/types/subspace.ts

@@ -1,8 +1,8 @@
-import { Brick, Generator, LocalSyncStrategy, EventAction, SubspaceID } 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'

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