@fugood/bricks-project 2.21.0 → 2.22.0-beta.1

package/compile/action-name-map.ts

@@ -62,6 +62,26 @@ export const templateActionNameMap = {
       height: 'TAKE_SCREENSHOT_HEIGHT',
       saveProperty: 'TAKE_SCREENSHOT_SAVE_PROPERTY',
     },
+    STORAGE_SET: {
+      storageType: 'STORAGE_TYPE',
+      storageScope: 'STORAGE_SCOPE',
+      storageKey: 'STORAGE_KEY',
+      storageValue: 'STORAGE_VALUE',
+    },
+    STORAGE_RETRIEVE: {
+      storageType: 'STORAGE_TYPE',
+      storageScope: 'STORAGE_SCOPE',
+      storageKey: 'STORAGE_KEY',
+      result: 'STORAGE_RETRIEVE_RESULT',
+      defaultValue: 'STORAGE_RETRIEVE_DEFAULT_VALUE',
+      skipIfNotFound: 'STORAGE_RETRIEVE_SKIP_IF_NOT_FOUND',
+    },
+    STORAGE_DELETE: {
+      storageType: 'STORAGE_TYPE',
+      storageScope: 'STORAGE_SCOPE',
+      storageKey: 'STORAGE_KEY',
+      all: 'STORAGE_DELETE_ALL',
+    },
     CHANNEL_SUBSCRIBE: {
       key: 'CHANNEL_SUBSCRIBE_KEY',
       type: 'CHANNEL_SUBSCRIBE_TYPE',

package/compile/index.ts

@@ -4,6 +4,7 @@ import type { ExportNamedDeclaration, FunctionDeclaration } from 'acorn'
 import escodegen from 'escodegen'
 import { generateCalulationMap } from './util'
 import { templateActionNameMap } from './action-name-map'
+import { templateEventPropsMap } from '../utils/event-props'
 import type {
   Application,
   Data,
@@ -52,6 +53,17 @@ const compileProperty = (property, errorReference: string, result = {}) => {
   return property
 }
 
+const compileEventActionValue = (templateKey, eventKey, value, errorReference) => {
+  const tmplEventProperties = templateEventPropsMap[templateKey]
+  const props = tmplEventProperties?.[eventKey]
+  if (!props) return compileProperty(value, errorReference)
+  if (props.includes(value)) return value
+  if (value?.startsWith(templateKey)) {
+    console.warn(`[Warning] Value start with template key but there is no event property: ${value} ${errorReference}`)
+  }
+  return compileProperty(value, errorReference)
+}
+
 const convertOutletKey = (templateKey: string, key: string) => {
   return `${templateKey}_${_.snakeCase(key).toUpperCase()}`
 }
@@ -128,7 +140,7 @@ const compileEvents = (
               ? compileActionParam(handlerTemplateKey, action.__actionName, input)
               : input,
             [camelCase ? 'resultFromSender' : 'result_from_sender']:
-              mapping || compileProperty(value, errorReference),
+              mapping || compileEventActionValue(handlerTemplateKey, key, value, errorReference),
           }
           if (mapping) param[camelCase ? 'resultDataMapping' : 'result_data_mapping'] = true
           parameterList.push(param)
@@ -140,7 +152,7 @@ const compileEvents = (
           const param = {
             [camelCase ? 'inputToReceiver' : 'input_to_receiver']: input().id,
             [camelCase ? 'resultFromSender' : 'result_from_sender']:
-              mapping || compileProperty(value, errorReference),
+              mapping || compileEventActionValue(handlerTemplateKey, key, value, errorReference),
           }
           if (mapping) param[camelCase ? 'resultDataMapping' : 'result_data_mapping'] = true
           parameterList.push(param)

package/index.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.21.0",
+  "version": "2.22.0-beta.1",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
@@ -13,5 +13,5 @@
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "7198652cb0d8217f36d88a755542300321dd2d74"
+  "gitHead": "c55f6effe15a6c481e6fc1147f8bff0c747169ef"
 }

package/tools/preview-main.mjs

@@ -1,6 +1,6 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { app, BrowserWindow } from 'electron'
-import { readFile } from 'fs/promises'
+import { readFile, writeFile } from 'fs/promises'
 import { watchFile } from 'fs'
 import { parseArgs } from 'util'
 
@@ -8,6 +8,7 @@ const { values } = parseArgs({
   args: process.argv,
   options: {
     'clear-cache': { type: 'boolean' },
+    'take-screenshot': { type: 'string' },
   },
   strict: true,
   allowPositionals: true,
@@ -15,6 +16,21 @@ const { values } = parseArgs({
 
 const cwd = process.cwd()
 
+let takeScreenshotConfig = null
+try {
+  if (values['take-screenshot']) {
+    takeScreenshotConfig = JSON.parse(values['take-screenshot'])
+    if (!takeScreenshotConfig.path) takeScreenshotConfig.path = `${cwd}/screenshot.png`
+    if (!takeScreenshotConfig.width) takeScreenshotConfig.width = 1280
+    if (!takeScreenshotConfig.height) takeScreenshotConfig.height = 768
+    if (!takeScreenshotConfig.delay) takeScreenshotConfig.delay = 1000
+  }
+} catch (e) {
+  console.error('Invalid take-screenshot config', e)
+  // eslint-disable-next-line unicorn/no-process-exit
+  process.exit(1)
+}
+
 let config = JSON.parse(await readFile(`${cwd}/.bricks/build/application-config.json`))
 
 const stage = process.env.BRICKS_STAGE || 'production'
@@ -42,6 +58,20 @@ app.on('ready', () => {
     mainWindow.webContents.executeJavaScript(
       `window.postMessage(JSON.stringify(${JSON.stringify(payload)}))`,
     )
+    if (takeScreenshotConfig) {
+      const { delay, width, height, path, closeAfter } = takeScreenshotConfig
+      setTimeout(() => {
+        console.log('Taking screenshot')
+        mainWindow.webContents.capturePage({ width, height }).then((image) => {
+          console.log('Writing screenshot to', path)
+          writeFile(path, image.toPNG())
+          if (closeAfter) {
+            console.log('Closing app')
+            app.quit()
+          }
+        })
+      }, delay)
+    }
   }
 
   mainWindow.webContents.once('dom-ready', sendConfig)

package/tools/preview.ts

@@ -6,12 +6,13 @@ import { debounce } from 'lodash'
 const { values } = parseArgs({
   args: Bun.argv,
   options: {
-    'skip-typecheck': {
-      type: 'boolean',
-    },
-    'clear-cache': {
-      type: 'boolean',
-    },
+    'skip-typecheck': { type: 'boolean' },
+    'clear-cache': { type: 'boolean' },
+    'screenshot-delay': { type: 'string' },
+    'screenshot-width': { type: 'string' },
+    'screenshot-height': { type: 'string' },
+    'screenshot-path': { type: 'string' },
+    'screenshot-close-after': { type: 'boolean' },
   },
   strict: true,
   allowPositionals: true,
@@ -37,11 +38,22 @@ const watcher = watch(`${cwd}/subspaces`, { recursive: true }, async (event, fil
 
 const app = await Bun.file(`${cwd}/application.json`).json()
 
-
-if (values['clear-cache']) {
-  await $`BRICKS_STAGE=${app.stage || 'production'} bunx --bun electron ${__dirname}/preview-main.mjs --clear-cache`
-} else {
-  await $`BRICKS_STAGE=${app.stage || 'production'} bunx --bun electron ${__dirname}/preview-main.mjs`
+let args: string[] = []
+if (values['clear-cache']) args.push('--clear-cache')
+
+if (values['screenshot-delay'] || values['screenshot-close-after']) {
+  args.push(`--take-screenshot`)
+  args.push(
+    JSON.stringify({
+      delay: Number(values['take-screenshot-delay']) || 1000,
+      width: Number(values['screenshot-width']) || 1920,
+      height: Number(values['screenshot-height']) || 1080,
+      path: values['screenshot-path'] || `${cwd}/screenshot.png`,
+      closeAfter: values['take-screenshot-close-after'] ?? true,
+    }),
+  )
 }
 
+await $`BRICKS_STAGE=${app.stage || 'production'} bunx --bun electron ${__dirname}/preview-main.mjs ${args}`
+
 watcher.close()