@fugood/bricks-project 2.24.0-beta.28 → 2.24.0-beta.30

package/compile/index.ts

@@ -91,6 +91,25 @@ const compileProperty = (property, errorReference: string, result = {}) => {
   return property
 }
 
+const compileScriptCalculationCode = (code = '') => {
+  try {
+    const program = parseAST(code, { sourceType: 'module', ecmaVersion: 2020 })
+    // export function main() { ... }
+    const declarationBody = (
+      (program.body[0] as ExportNamedDeclaration).declaration as FunctionDeclaration
+    )?.body
+    return escodegen.generate(declarationBody, {
+      format: {
+        indent: { style: '  ' },
+        semicolons: false,
+      },
+      comment: true,
+    })
+  } catch {
+    return code || ''
+  }
+}
+
 const compileEventActionValue = (templateKey, eventKey, value, errorReference) => {
   const tmplEventProperties = templateEventPropsMap[templateKey]
   const props = tmplEventProperties?.[eventKey]
@@ -524,6 +543,8 @@ export const compile = async (app: Application) => {
         title: subspace.title,
         description: subspace.description,
         hide_short_ref: subspace.hideShortRef,
+        unused: subspace.unused,
+        portal: subspace.portal,
         _expanded: subspace.unexpanded
           ? {
               brick: !subspace.unexpanded.brick,
@@ -1105,25 +1126,10 @@ export const compile = async (app: Application) => {
             const scriptCalc = dataCalc as DataCalculationScript
             calc.type = 'script'
 
-            let code: string
-            try {
-              const program = parseAST(scriptCalc.code, { sourceType: 'module', ecmaVersion: 2020 })
-              // export function main() { ... }
-              const declarationBody = (
-                (program.body[0] as ExportNamedDeclaration).declaration as FunctionDeclaration
-              )?.body
-              code = escodegen.generate(declarationBody, {
-                format: {
-                  indent: { style: '  ' },
-                  semicolons: false,
-                },
-                comment: true,
-              })
-            } catch {
-              code = scriptCalc.code || ''
-            }
+            const code = compileScriptCalculationCode(scriptCalc.code)
             calc.script_config = {
-              note: scriptCalc.note,
+              title: scriptCalc.title ?? '',
+              note: scriptCalc.note ?? '',
               code,
               enable_async: scriptCalc.enableAsync,
               trigger_mode: scriptCalc.triggerMode,
@@ -1151,7 +1157,7 @@ export const compile = async (app: Application) => {
                     'PROPERTY_BANK_DATA_NODE',
                     `(data calc: ${dataCalcId}, script output, subspace: ${subspaceId})`,
                   )
-                : undefined,
+                : null,
               outputs: scriptCalc.outputs.reduce((acc, output) => {
                 if (!acc[output.key]) acc[output.key] = []
                 const outputId = assertEntryId(
@@ -1168,7 +1174,7 @@ export const compile = async (app: Application) => {
                     'PROPERTY_BANK_DATA_NODE',
                     `(data calc: ${dataCalcId}, script error output, subspace: ${subspaceId})`,
                   )
-                : undefined,
+                : null,
             }
 
             Object.assign(

package/compile/util.ts

@@ -1,6 +1,8 @@
 import { makeId } from '../utils/id'
 
 type ScriptConfig = {
+  title?: string
+  note?: string
   inputs: Record<string, string>
   enable_async: boolean
   trigger_mode?: 'auto' | 'manual'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.24.0-beta.28",
+  "version": "2.24.0-beta.30",
   "main": "index.ts",
   "scripts": {
     "typecheck": "tsc --noEmit",
@@ -24,5 +24,5 @@
   "peerDependencies": {
     "oxfmt": "^0.36.0"
   },
-  "gitHead": "74a2b1e994a5a745cf9a030b6c79ce6a210c0f52"
+  "gitHead": "6474b26f34cfe28cc399208005384ee39cbb3b5a"
 }

package/types/subspace.ts

@@ -10,6 +10,8 @@ export type Subspace = {
   title: string
   description?: string
   hideShortRef?: boolean
+  unused?: boolean
+  portal?: 'top' | 'left' | 'bottom' | 'right'
   // Unexpanded information in Editor
   unexpanded?: {
     data?: boolean