@fugood/bricks-project 2.23.0-beta.25 → 2.23.0-beta.26

package/compile/index.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-underscore-dangle -- Uses __typename, __actionName, etc. for type system */
 import _ from 'lodash'
 import { parse as parseAST } from 'acorn'
 import type { ExportNamedDeclaration, FunctionDeclaration } from 'acorn'
@@ -12,7 +13,6 @@ import type {
   Animation,
   AnimationDef,
   AnimationComposeDef,
-  EventAction,
   ActionWithDataParams,
   ActionWithParams,
   BrickItems,
@@ -24,10 +24,8 @@ import type {
   DataCalculationData,
   DataCommand,
   Brick,
-  Generator,
   Canvas,
   Subspace,
-  EventActionForItem,
 } from '../types'
 
 const compileProperty = (property, errorReference: string, result = {}) => {
@@ -66,25 +64,22 @@ const compileEventActionValue = (templateKey, eventKey, value, errorReference) =
   return compileProperty(value, errorReference)
 }
 
-const convertOutletKey = (templateKey: string, key: string) => {
-  return `${templateKey}_${_.snakeCase(key).toUpperCase()}`
-}
+const convertOutletKey = (templateKey: string, key: string) =>
+  `${templateKey}_${_.snakeCase(key).toUpperCase()}`
 
 const compileOutlets = (
   templateKey: string,
   outlets: { [key: string]: () => Data },
   errorReference: string,
-) => {
-  return Object.entries(outlets).reduce((acc, [key, data]) => {
+) =>
+  Object.entries(outlets).reduce((acc, [key, data]) => {
     if (!data()?.id) throw new Error(`Invalid data reference ${errorReference}`)
     acc[convertOutletKey(templateKey, key)] = data().id
     return acc
   }, {})
-}
 
-const convertEventKey = (templateKey: string, key: string) => {
-  return `${templateKey ? `${templateKey}_` : ''}${_.snakeCase(key).toUpperCase()}`
-}
+const convertEventKey = (templateKey: string, key: string) =>
+  `${templateKey ? `${templateKey}_` : ''}${_.snakeCase(key).toUpperCase()}`
 
 const basicAnimationEvents = ['show', 'standby', 'breatheStart']
 
@@ -92,14 +87,13 @@ const compileAnimations = (
   templateKey: string,
   animations: { [key: string]: Animation },
   errorReference: string,
-) => {
-  return Object.entries(animations).reduce((acc, [key, animation]) => {
+) =>
+  Object.entries(animations).reduce((acc, [key, animation]) => {
     if (!animation?.id) throw new Error(`Invalid animation reference ${errorReference}`)
     acc[convertEventKey(basicAnimationEvents.includes(key) ? 'BRICK' : templateKey, key)] =
       `ANIMATION#${animation.id}`
     return acc
   }, {})
-}
 
 const compileActionParam = (templateKey: string, actionName: string, paramName: string) =>
   templateActionNameMap[templateKey]?.[actionName]?.[paramName] || paramName
@@ -190,7 +184,7 @@ const compileSwitchConds = (templateKey, conds, errorReference) =>
       result.key = cond.data().id
       result.value = cond.value
     } else if (item.cond.__typename === 'SwitchCondInnerStateOutlet') {
-      const cond = item.cond
+      const { cond } = item
       result.type = 'inner_state'
       result.key = convertOutletKey(templateKey, cond.outlet)
       result.value = cond.value
@@ -205,35 +199,33 @@ const compileSwitchConds = (templateKey, conds, errorReference) =>
     return result
   })
 
-const compileApplicationSettings = (settings: Application['settings']) => {
-  return {
-    internet_reachability_url: settings?.internetReachabilityUrl,
-    enable_data_lock: settings?.enableDataLock,
-    show_deprecated_features: settings?.showDeprecatedFeatures,
-    enable_unstable_bricks: settings?.enableUnstableFeatures,
-    runtime_cache_options: settings?.runtimeCacheOptions
-      ? {
-          disabled: settings.runtimeCacheOptions.disabled,
-          behavior: settings.runtimeCacheOptions.behavior,
-          retry_attempt_for_failure: settings.runtimeCacheOptions.retryAttemptForFailure,
-        }
-      : undefined,
-    tv_options: settings?.tvOptions
-      ? {
-          disabled_selectable: settings.tvOptions.disabledSelectable,
-          selectable_color: settings.tvOptions.selectableColor,
-          selectable_border: settings.tvOptions.selectableBorder,
-        }
-      : undefined,
-    ai: settings?.ai
-      ? {
-          use_anthropic_api_key_system_data: settings.ai.useAnthropicApiKeySystemData,
-          use_openai_api_key_system_data: settings.ai.useOpenAiApiKeySystemData,
-          use_gemini_api_key_system_data: settings.ai.useGeminiApiKeySystemData,
-        }
-      : undefined,
-  }
-}
+const compileApplicationSettings = (settings: Application['settings']) => ({
+  internet_reachability_url: settings?.internetReachabilityUrl,
+  enable_data_lock: settings?.enableDataLock,
+  show_deprecated_features: settings?.showDeprecatedFeatures,
+  enable_unstable_bricks: settings?.enableUnstableFeatures,
+  runtime_cache_options: settings?.runtimeCacheOptions
+    ? {
+        disabled: settings.runtimeCacheOptions.disabled,
+        behavior: settings.runtimeCacheOptions.behavior,
+        retry_attempt_for_failure: settings.runtimeCacheOptions.retryAttemptForFailure,
+      }
+    : undefined,
+  tv_options: settings?.tvOptions
+    ? {
+        disabled_selectable: settings.tvOptions.disabledSelectable,
+        selectable_color: settings.tvOptions.selectableColor,
+        selectable_border: settings.tvOptions.selectableBorder,
+      }
+    : undefined,
+  ai: settings?.ai
+    ? {
+        use_anthropic_api_key_system_data: settings.ai.useAnthropicApiKeySystemData,
+        use_openai_api_key_system_data: settings.ai.useOpenAiApiKeySystemData,
+        use_gemini_api_key_system_data: settings.ai.useGeminiApiKeySystemData,
+      }
+    : undefined,
+})
 
 const animationTypeMap = {
   AnimationTimingConfig: 'timing',
@@ -338,7 +330,7 @@ export const compile = async (app: Application) => {
               brick: !subspace.unexpanded.brick,
               generator: !subspace.unexpanded.generator,
               canvas: subspace.unexpanded.canvas?.reduce((acc, canvas) => {
-                acc[canvas.id] = canvas?.id ? false : true
+                acc[canvas.id] = !canvas?.id
                 return acc
               }, {}),
               property_bank: !subspace.unexpanded.data,
@@ -377,12 +369,12 @@ export const compile = async (app: Application) => {
               animationRunType: animationDef.runType,
               compose_type: animationDef.composeType,
               item_list: animationDef.items.map((item, index) => {
-                const animation = item()
-                if (!animation?.id)
+                const innerAnimation = item()
+                if (!innerAnimation?.id)
                   throw new Error(
-                    `Invalid animation index: ${index} (animation: ${animation.id}, subspace ${subspace.id})`,
+                    `Invalid animation index: ${index} (animation: ${innerAnimation.id}, subspace ${subspace.id})`,
                   )
-                return { animation_id: animation.id }
+                return { animation_id: innerAnimation.id }
               }),
             }
           }
@@ -461,7 +453,7 @@ export const compile = async (app: Application) => {
               property.brickList = brickList
             } else {
               // Not supported Data for brickList
-              throw new Error('Not supported Data for brickList directly')
+              throw new TypeError('Not supported Data for brickList directly')
             }
             if (Array.isArray(brickItems.brickDetails)) {
               const brickDetails = (brickItems.brickDetails || []).map((item, index) =>
@@ -470,7 +462,7 @@ export const compile = async (app: Application) => {
               property.brickDetails = brickDetails
             } else {
               // Not supported Data for brickList
-              throw new Error('Not supported Data for brickList directly')
+              throw new TypeError('Not supported Data for brickList directly')
             }
           }
           map[brick.id] = {
@@ -694,7 +686,7 @@ export const compile = async (app: Application) => {
                 if (!acc[port.key]) acc[port.key] = null
 
                 let sourceId
-                let sourceNode = port.source()
+                const sourceNode = port.source()
                 if (sourceNode?.__typename === 'DataCalculationData')
                   sourceId = (sourceNode as DataCalculationData).data().id
                 if (sourceNode?.__typename === 'DataCommand') sourceId = sourceNode.id
@@ -715,7 +707,7 @@ export const compile = async (app: Application) => {
                 if (!acc[port.key]) acc[port.key] = null
 
                 let targetId
-                let targetNode = port.target()
+                const targetNode = port.target()
                 if (targetNode?.__typename === 'DataCalculationData')
                   targetId = (targetNode as DataCalculationData).data().id
                 if (targetNode?.__typename === 'DataCommand') targetId = targetNode.id
@@ -770,9 +762,9 @@ export const compile = async (app: Application) => {
                   type: `command-node-${type}`,
                   properties: {
                     command: commandNode.__commandName,
-                    args: args.reduce((acc, input) => {
-                      acc[input.key] = input.source
-                      return acc
+                    args: args.reduce((argsAcc, input) => {
+                      argsAcc[input.key] = input.source
+                      return argsAcc
                     }, {}),
                   },
                   in: generateInputPorts(inputs),
@@ -784,12 +776,12 @@ export const compile = async (app: Application) => {
             calc.editor_info = mapCalc.editorInfo.reduce((acc, editorInfo) => {
               acc[getNodeId(editorInfo.node)] = {
                 position: editorInfo.position,
-                points: editorInfo.points.reduce((acc, point) => {
+                points: editorInfo.points.reduce((pointsAcc, point) => {
                   const sourceId = getNodeId(point.source)
                   const targetId = getNodeId(point.target)
                   const key = `${sourceId}-${point.sourceOutputKey}-${targetId}-${point.targetInputKey}`
-                  acc[key] = point.positions
-                  return acc
+                  pointsAcc[key] = point.positions
+                  return pointsAcc
                 }, {}),
               }
               return acc

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.23.0-beta.25",
+  "version": "2.23.0-beta.26",
   "main": "index.ts",
   "scripts": {
-    "build": "node scripts/build.js"
+    "build": "bun scripts/build.js"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.15.0",
     "@types/escodegen": "^0.0.10",
     "@types/lodash": "^4.17.12",
     "acorn": "^8.13.0",
-    "escodegen": "^2.1.0",
+    "escodegen": "2.1.0",
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "89d05d356e4deae1c06afd6db781e2b83c547991"
+  "gitHead": "a3c7e7c4b3775d92d4f152e4d7dd032b526b05d1"
 }

package/tools/mcp-server.ts

@@ -8,7 +8,7 @@ const server = new McpServer({
   version: '1.0.0',
 })
 
-const dirname = import.meta.dirname
+const { dirname } = import.meta
 const projectDir = String(dirname).split('/node_modules/')[0]
 
 server.tool('compile', {}, async () => {
@@ -16,7 +16,7 @@ server.tool('compile', {}, async () => {
   try {
     log = await $`bun compile`.cwd(projectDir).text()
   } catch (err) {
-    log = err.stdout.toString() + '\n' + err.stderr.toString()
+    log = `${err.stdout.toString()}\n${err.stderr.toString()}`
   }
   return {
     content: [{ type: 'text', text: log || 'Compiled successfully' }],
@@ -61,7 +61,7 @@ server.tool(
       ]
       log = await $`bunx --bun electron ${dirname}/preview-main.mjs ${args}`.cwd(projectDir).text()
     } catch (err) {
-      log = err.stdout.toString() + '\n' + err.stderr.toString()
+      log = `${err.stdout.toString()}\n${err.stderr.toString()}`
       error = true
     }
     let screenshotBase64: any = null

package/tools/postinstall.ts

@@ -17,13 +17,10 @@ const skipCopyProject = process.argv.includes('--skip-copy-project')
 if (skipCopyProject) {
   console.log('Skipping copy of files to project/')
 } else {
-
   const libFiles = ['types', 'utils', 'index.ts']
-  
+
   await $`mkdir -p ${cwd}/project`
-  for (const file of libFiles) {
-    await $`cp -r ${__dirname}/../${file} ${cwd}/project`
-  }
+  await Promise.all(libFiles.map((file) => $`cp -r ${__dirname}/../${file} ${cwd}/project`))
   console.log('Copied files to project/')
 }
 

package/tools/preview.ts

@@ -25,7 +25,7 @@ const cwd = process.cwd()
 
 const app = await Bun.file(`${cwd}/application.json`).json()
 
-let args: string[] = []
+const args: string[] = []
 if (values['clear-cache']) args.push('--clear-cache')
 
 let needWatcher = true

package/tools/pull.ts

@@ -24,7 +24,7 @@ let useMain = false
 if (isGitRepo) {
   const found = (await $`cd ${cwd} && git rev-list -1 ${lastCommitId}`.nothrow().text())
     .trim()
-    .match(/^[a-f0-9]{40}$/)
+    .match(/^[\da-f]{40}$/)
 
   const commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
 

package/utils/id.ts

@@ -4,7 +4,9 @@ let count = 0
 
 // Used for snapshot mode
 const countUUID = () => {
-  return `00000000-0000-0000-0000-${(count++).toString().padStart(12, '0')}`
+  const current = count
+  count += 1
+  return `00000000-0000-0000-0000-${current.toString().padStart(12, '0')}`
 }
 
 // Make a random id if not want to use fixed id