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

package/compile/index.ts

@@ -7,6 +7,7 @@ import { templateActionNameMap } from './action-name-map'
 import type {
   Application,
   Data,
+  DataAssetKind,
   Animation,
   AnimationDef,
   AnimationComposeDef,
@@ -203,9 +204,37 @@ const compileFrame = (frame: Canvas['items'][number]['frame']) => ({
   render_out_of_viewport: frame.renderOutOfViewport,
 })
 
+const preloadTypes = [
+  'media-resource-image',
+  'media-resource-video',
+  'media-resource-audio',
+  'media-resource-file',
+  'lottie-file-uri',
+  'ggml-model-asset',
+  'gguf-model-asset',
+  'binary-asset',
+]
+
 const compileKind = (kind: Data['kind']) => {
   const { type, ...rest } = kind || {}
   if (!type) return {}
+  if (preloadTypes.includes(type)) {
+    const { preload, metadata } = kind as DataAssetKind
+    const result: any = { kind: type, ...rest }
+    if (preload) {
+      result.preload = {
+        type: preload.type,
+        hashType: preload.hashType,
+      }
+      if (preload.hashType) result.preload[preload.hashType] = preload.hash
+    }
+    // Handle metadata
+    if (type === 'gguf-model-asset') {
+      result._hfRepoInfo = metadata?.hfRepoInfo
+    }
+    return result
+  }
+
   return { kind: type, ...rest }
 }
 
@@ -244,13 +273,26 @@ const compileModule = (subspace: Subspace) => {
   }
 }
 
-export const compile = (app: Application) => {
+export const compile = async (app: Application) => {
+  await new Promise((resolve) => setImmediate(resolve, 0))
   const config = {
     title: app.name,
     subspace_map: app.subspaces.reduce((subspaceMap, subspace) => {
       subspaceMap[subspace.id] = {
         title: subspace.title,
         description: subspace.description,
+        _expanded: subspace.unexpanded
+          ? {
+              brick: !subspace.unexpanded.brick,
+              generator: !subspace.unexpanded.generator,
+              canvas: subspace.unexpanded.canvas?.reduce((acc, canvas) => {
+                acc[canvas.id] = canvas?.id ? false : true
+                return acc
+              }, {}),
+              property_bank: !subspace.unexpanded.data,
+              property_bank_calc: !subspace.unexpanded.dataCalculation,
+            }
+          : undefined,
         layout: {
           width: subspace.layout?.width,
           height: subspace.layout?.height,
@@ -293,6 +335,7 @@ export const compile = (app: Application) => {
               brickId: itemBrick.brickId,
               brickIdPrefix: itemBrick.brickIdPrefix,
               templateKey: itemBrick.templateKey,
+              frame: itemBrick.frame,
               property: compileProperty(itemBrick.property),
               propertyMapping: itemBrick.propertyMapping,
               animation: compileAnimations(itemBrick.templateKey, itemBrick.animation || {}),
@@ -386,6 +429,7 @@ export const compile = (app: Application) => {
                 ? { brick_id: (item.item as () => Brick)()?.id }
                 : { subspace_id: item.item }),
               frame: compileFrame(item.frame),
+              hidden: item.hidden,
             })),
           }
           return map
@@ -568,7 +612,13 @@ export const compile = (app: Application) => {
               const declarationBody = (
                 (program.body[0] as ExportNamedDeclaration).declaration as FunctionDeclaration
               )?.body
-              code = escodegen.generate(declarationBody)
+              code = escodegen.generate(declarationBody, {
+                format: {
+                  indent: { style: '  ' },
+                  semicolons: false,
+                },
+                comment: true,
+              })
             } catch (e) {
               code = scriptCalc.code || ''
             }

package/index.ts

@@ -2,4 +2,4 @@ export type * from './types'
 
 export { makeId } from './utils/id'
 export { generateDataCalculationMapEditorInfo } from './utils/calc'
-export { linkData, useSystemData } from './utils/data'
+export { linkData, useSystemData, createCanvasIdRef } from './utils/data'

package/package.json

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

package/tools/preview-main.mjs

@@ -20,6 +20,7 @@ if (!previewUrl) throw new Error(`Invalid BRICKS_STAGE: ${stage}`)
 
 app.on('ready', () => {
   const mainWindow = new BrowserWindow({ width: 1280, height: 768 })
+  mainWindow.setBackgroundColor('#333')
   mainWindow.loadURL(previewUrl)
 
   const sendConfig = () => {
@@ -35,6 +36,8 @@ app.on('ready', () => {
 
   mainWindow.webContents.once('dom-ready', sendConfig)
 
+  mainWindow.on('close', () => app.quit())
+
   watchFile(
     `${cwd}/.bricks/build/application-config.json`,
     {

package/tools/preview.ts

@@ -27,7 +27,7 @@ const compileDebounced = debounce(compile, 500)
 
 const cwd = process.cwd()
 
-watch(`${cwd}/subspaces`, { recursive: true }, async (event, filename) => {
+const watcher = watch(`${cwd}/subspaces`, { recursive: true }, async (event, filename) => {
   console.log(`Detected ${event} in ${filename}`)
   compileDebounced()
 })
@@ -35,3 +35,4 @@ watch(`${cwd}/subspaces`, { recursive: true }, async (event, filename) => {
 const app = await Bun.file(`${cwd}/application.json`).json()
 
 await $`BRICKS_STAGE=${app.stage || 'production'} bunx electron ${__dirname}/preview-main.mjs`
+watcher.close()

package/types/bricks.ts

@@ -2052,6 +2052,7 @@ Default property:
         | {
             title?: string | DataLink
             description?: string | DataLink
+            hidden?: boolean | DataLink
             brickId?: string | DataLink
             brickIdPrefix?: string | DataLink
             templateKey?: string | DataLink
@@ -2068,6 +2069,14 @@ Default property:
                   y?: number | DataLink
                   width?: number | DataLink
                   height?: number | DataLink
+                  standbyMode?: 'custom' | 'top' | 'bottom' | 'left' | 'right' | DataLink
+                  standbyFrame?: DataLink | {}
+                  standbyOpacity?: number | DataLink
+                  standbyDelay?: number | DataLink
+                  standbyDelayRandom?: number | DataLink
+                  standbyEasing?: string | DataLink
+                  showingDelay?: number | DataLink
+                  renderOutOfViewport?: boolean | DataLink
                 }
             show?: string | DataLink
             pressToOpenDetail?: boolean | DataLink
@@ -2081,6 +2090,7 @@ Default property:
         | {
             title?: string | DataLink
             description?: string | DataLink
+            hidden?: boolean | DataLink
             brickId?: string | DataLink
             brickIdPrefix?: string | DataLink
             templateKey?: string | DataLink
@@ -2097,6 +2107,14 @@ Default property:
                   y?: number | DataLink
                   width?: number | DataLink
                   height?: number | DataLink
+                  standbyMode?: 'custom' | 'top' | 'bottom' | 'left' | 'right' | DataLink
+                  standbyFrame?: DataLink | {}
+                  standbyOpacity?: number | DataLink
+                  standbyDelay?: number | DataLink
+                  standbyDelayRandom?: number | DataLink
+                  standbyEasing?: string | DataLink
+                  showingDelay?: number | DataLink
+                  renderOutOfViewport?: boolean | DataLink
                 }
             show?: string | DataLink
             pressToBackList?: boolean | DataLink

package/types/canvas.ts

@@ -74,5 +74,6 @@ export type Canvas = CanvasDef & {
       showingDelay?: number
       renderOutOfViewport?: boolean
     }
+    hidden?: boolean // Hide in Editor
   }>
 }

package/types/data.ts

@@ -47,6 +47,7 @@ export type Data<T = any> = DataDef & {
         min?: number
         step?: number
       }
+    | DataAssetKind
     | {
         type:
           | 'color'
@@ -55,18 +56,28 @@ export type Data<T = any> = DataDef & {
           | '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
 }
 
+export type DataAssetKind = {
+  type:
+    | 'media-resource-image'
+    | 'media-resource-video'
+    | 'media-resource-audio'
+    | 'media-resource-file'
+    | 'lottie-file-uri'
+    | 'ggml-model-asset'
+    | 'gguf-model-asset'
+    | 'binary-asset'
+  preload?: {
+    type: 'url'
+    hashType: 'md5' | 'sha256'
+    hash: string
+  }
+  metadata?: { [key: string]: any }
+}
+
 export type DataLink = {
   __typename: 'DataLink'
   data: () => Data

package/types/subspace.ts

@@ -9,7 +9,14 @@ export type Subspace = {
   id: string
   title: string
   description?: string
-  localSyncChangeCanvas?: LocalSyncStrategy
+  // Unexpanded in Editor
+  unexpanded?: {
+    data?: boolean
+    dataCalculation?: boolean
+    brick?: boolean
+    generator?: boolean
+    canvas?: Array<Canvas>
+  }
   module?: {
     id: string
     version: string
@@ -25,6 +32,7 @@ export type Subspace = {
       version: string
     }>
   }
+  localSyncChangeCanvas?: LocalSyncStrategy
   layout: {
     width: number
     height: number

package/utils/data.ts

@@ -1,10 +1,36 @@
-import type { DataLink, Data } from '../types'
+import type { DataLink, Data, Canvas } from '../types'
+import { makeId } from './id'
 
 export const linkData: (dataGetter: () => Data) => DataLink = (dataGetter) => ({
   __typename: 'DataLink',
   data: dataGetter,
 })
 
+const idOpts = {
+  snapshotMode: process.env.BRICKS_SNAPSHOT_MODE === '1',
+}
+
+export const createCanvasIdRef: (canvasGetter: () => Canvas) => Data<string> = (canvasGetter) => {
+  const data: Data<string> = {
+    __typename: 'Data',
+    id: makeId('data', idOpts),
+    type: 'string',
+    routing: 'read-only',
+    kind: {
+      type: 'auto-generated-item-id',
+      idType: 'canvas',
+    },
+    title: '',
+    value: '',
+  }
+  setImmediate(() => {
+    const canvas = canvasGetter()
+    data.title = `Canvas ID: ${canvas.title}`
+    data.value = canvas.id
+  })
+  return data
+}
+
 type SystemDataName =
   | 'isLocalSyncMainDevice'
   | 'currentCanvasId'