@fugood/bricks-project 2.21.0-beta.14.test9 → 2.21.0-beta.16-1

package/api/instance.ts

@@ -64,7 +64,7 @@ export const deployApp = async (
   stage: Stage,
   appId: string,
   config: Config,
-  lastCommitId: string,
+  lastCommitId?: string,
 ) => {
   const app = await pullApp(stage, appId)
   if (app.config?.bricks_project_last_commit_id === lastCommitId)
@@ -135,7 +135,7 @@ export const deployModule = async (
   stage: Stage,
   modId: string,
   config: Config,
-  lastCommitId: string,
+  lastCommitId?: string,
 ) => {
   const mod = await pullModule(stage, modId)
   if (mod.config?.bricks_project_last_commit_id === lastCommitId)

package/compile/index.ts

@@ -7,6 +7,7 @@ import { templateActionNameMap } from './action-name-map'
 import type {
   Application,
   Data,
+  DataAssetKind,
   Animation,
   AnimationDef,
   AnimationComposeDef,
@@ -98,23 +99,27 @@ const compileEvents = (
       if (Object.hasOwn(action, 'params')) {
         const actionDef = action as ActionWithParams
         ;(actionDef.params || []).forEach(({ input, value, mapping }) => {
-          parameterList.push({
+          const param = {
             [camelCase ? 'inputToReceiver' : 'input_to_receiver']: handlerTemplateKey
               ? compileActionParam(handlerTemplateKey, action.__actionName, input)
               : input,
-            [camelCase ? 'resultFromSender' : 'result_from_sender']: compileProperty(value),
-            [camelCase ? 'resultDataMapping' : 'result_data_mapping']: mapping,
-          })
+            [camelCase ? 'resultFromSender' : 'result_from_sender']:
+              mapping || compileProperty(value),
+          }
+          if (mapping) param[camelCase ? 'resultDataMapping' : 'result_data_mapping'] = true
+          parameterList.push(param)
         })
       } else if (Object.hasOwn(action, 'dataParams')) {
         const actionDef = action as ActionWithDataParams
         ;(actionDef.dataParams || []).forEach(({ input, value, mapping }) => {
           if (!input) return
-          parameterList.push({
+          const param = {
             [camelCase ? 'inputToReceiver' : 'input_to_receiver']: input().id,
-            [camelCase ? 'resultFromSender' : 'result_from_sender']: compileProperty(value),
-            [camelCase ? 'resultDataMapping' : 'result_data_mapping']: mapping,
-          })
+            [camelCase ? 'resultFromSender' : 'result_from_sender']:
+              mapping || compileProperty(value),
+          }
+          if (mapping) param[camelCase ? 'resultDataMapping' : 'result_data_mapping'] = true
+          parameterList.push(param)
         })
       }
       return {
@@ -199,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 }
 }
 
@@ -240,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,
@@ -289,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 || {}),
@@ -382,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
@@ -564,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.test9",
+  "version": "2.21.0-beta.16-1",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
@@ -12,6 +12,5 @@
     "escodegen": "^2.1.0",
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
-  },
-  "devDependencies": {}
+  }
 }

package/tools/deploy.ts

@@ -3,10 +3,21 @@ import { deployApp, deployModule } from '../api'
 
 const cwd = process.cwd()
 
-const unstagedChanges = await $`cd ${cwd} && git diff --name-only --diff-filter=ACMR`.text()
-if (unstagedChanges) throw new Error('Unstaged changes found, please commit or stash your changes before deploying')
+const { exitCode } = await $`cd ${cwd} && git status`.nothrow()
+const isGitRepo = exitCode === 0
+
+let commitId = ''
+if (isGitRepo) {
+  const unstagedChanges = await $`cd ${cwd} && git diff --name-only --diff-filter=ACMR`.text()
+  if (unstagedChanges)
+    throw new Error('Unstaged changes found, please commit or stash your changes before deploying')
+
+  commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
+} else {
+  const confirmContinue = prompt('No git repository found, continue? (y/n)')
+  if (confirmContinue !== 'y') throw new Error('Deployment cancelled')
+}
 
-const commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
 const app = await Bun.file(`${cwd}/application.json`).json()
 const stage = app.stage || 'production'
 const config = await Bun.file(`${cwd}/.bricks/build/application-config.json`).json()

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/tools/pull.ts

@@ -15,24 +15,34 @@ const { files, lastCommitId } =
     ? await pullModuleProject(stage, app.id)
     : await pullApplicationProject(stage, app.id)
 
-const found = (await $`cd ${cwd} && git rev-list -1 ${lastCommitId}`.nothrow().text())
-  .trim()
-  .match(/^[a-f0-9]{40}$/)
+const { exitCode } = await $`cd ${cwd} && git status`.nothrow()
+const isGitRepo = exitCode === 0
 
-const commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
+let useMain = false
+if (isGitRepo) {
+  const found = (await $`cd ${cwd} && git rev-list -1 ${lastCommitId}`.nothrow().text())
+    .trim()
+    .match(/^[a-f0-9]{40}$/)
 
-if (commitId === lastCommitId) throw new Error('Commit not changed')
+  const commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
 
-const branchName = 'BRICKS_PROJECT_try-pull-application'
+  if (commitId === lastCommitId) throw new Error('Commit not changed')
 
-await $`cd ${cwd} && git branch -D ${branchName}`.nothrow()
+  const branchName = 'BRICKS_PROJECT_try-pull-application'
 
-let useMain = false
-if (found) {
-  await $`cd ${cwd} && git checkout -b ${branchName} ${lastCommitId}`.nothrow()
+  await $`cd ${cwd} && git branch -D ${branchName}`.nothrow()
+
+  if (found) {
+    await $`cd ${cwd} && git checkout -b ${branchName} ${lastCommitId}`.nothrow()
+  } else {
+    await $`cd ${cwd} && git checkout -b ${branchName}`
+    useMain = true
+  }
 } else {
-  await $`cd ${cwd} && git checkout -b ${branchName}`
-  useMain = true
+  const confirmContinue = prompt(
+    'No git repository found, so it will not be safe to pull, continue? (y/n)',
+  )
+  if (confirmContinue !== 'y') throw new Error('Pull cancelled')
 }
 
 await Promise.all(
@@ -44,8 +54,10 @@ await Promise.all(
   ),
 )
 
-await $`cd ${cwd} && git add .`
-await $`cd ${cwd} && git commit -m 'Apply ${app.name} file changes'`
-if (!useMain) {
-  await $`cd ${cwd} && git merge main`
+if (isGitRepo) {
+  await $`cd ${cwd} && git add .`
+  await $`cd ${cwd} && git commit -m 'Apply ${app.name} file changes'`
+  if (!useMain) {
+    await $`cd ${cwd} && git merge main`
+  }
 }