@fugood/bricks-project 2.21.0-beta.25 → 2.21.0-beta.27

package/compile/action-name-map.ts

@@ -60,6 +60,22 @@ export const templateActionNameMap = {
       height: 'TAKE_SCREENSHOT_HEIGHT',
       saveProperty: 'TAKE_SCREENSHOT_SAVE_PROPERTY',
     },
+    CHANNEL_SUBSCRIBE: {
+      key: 'CHANNEL_SUBSCRIBE_KEY',
+      type: 'CHANNEL_SUBSCRIBE_TYPE',
+      livetime: 'CHANNEL_SUBSCRIBE_LIVETIME',
+      dataResult: 'CHANNEL_SUBSCRIBE_DATA_RESULT',
+      progressResult: 'CHANNEL_SUBSCRIBE_PROGRESS_RESULT',
+      errorResult: 'CHANNEL_SUBSCRIBE_ERROR_RESULT',
+    },
+    CHANNEL_UNSUBSCRIBE: {
+      keyMatch: 'CHANNEL_UNSUBSCRIBE_KEY_MATCH',
+    },
+    CHANNEL_PUBLISH: {
+      keyMatch: 'CHANNEL_PUBLISH_KEY_MATCH',
+      payloadType: 'CHANNEL_PUBLISH_PAYLOAD_TYPE',
+      payload: 'CHANNEL_PUBLISH_PAYLOAD',
+    },
     USE_SHARE_APPLICATION: {
       applicationId: 'APPLICATION_ID',
       releaseVersion: 'RELEASE_VERSION',
@@ -192,6 +208,27 @@ export const templateActionNameMap = {
     },
   },
 
+  BRICK_RIVE: {
+    BRICK_RIVE_PLAY: {
+      animationName: 'BRICK_RIVE_ANIMATION_NAME',
+      loop: 'BRICK_RIVE_LOOP',
+      direction: 'BRICK_RIVE_DIRECTION',
+      isStateMachine: 'BRICK_RIVE_IS_STATE_MACHINE',
+    },
+    BRICK_RIVE_FIRE_STATE: {
+      stateMachineName: 'BRICK_RIVE_STATE_MACHINE_NAME',
+      inputName: 'BRICK_RIVE_INPUT_NAME',
+    },
+    BRICK_RIVE_SET_INPUT_STATE: {
+      stateMachineName: 'BRICK_RIVE_STATE_MACHINE_NAME',
+      inputName: 'BRICK_RIVE_INPUT_NAME',
+      value: 'BRICK_RIVE_VALUE',
+    },
+    BRICK_RIVE_SET_TEXT_RUN_VALUE: {
+      textRunName: 'BRICK_RIVE_TEXT_RUN_NAME',
+      value: 'BRICK_RIVE_VALUE',
+    },
+  },
   BRICK_WEBVIEW: {
     BRICK_WEBVIEW_INJECT_JAVASCRIPT: {
       javascriptCode: 'BRICK_WEBVIEW_JAVASCRIPT_CODE',
@@ -496,6 +533,11 @@ export const templateActionNameMap = {
       topP: 'GENERATOR_LLM_TOP_P',
       xtcThreshold: 'GENERATOR_LLM_XTC_THRESHOLD',
       xtcProbability: 'GENERATOR_LLM_XTC_PROBABILITY',
+      dryMultiplier: 'GENERATOR_LLM_DRY_MULTIPLIER',
+      dryBase: 'GENERATOR_LLM_DRY_BASE',
+      dryAllowedLength: 'GENERATOR_LLM_DRY_ALLOWED_LENGTH',
+      dryPenaltyLastN: 'GENERATOR_LLM_DRY_PENALTY_LAST_N',
+      drySequenceBreakers: 'GENERATOR_LLM_DRY_SEQUENCE_BREAKERS',
       mirostat: 'GENERATOR_LLM_MIROSTAT',
       mirostatTau: 'GENERATOR_LLM_MIROSTAT_TAU',
       mirostatEta: 'GENERATOR_LLM_MIROSTAT_ETA',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.21.0-beta.25",
+  "version": "2.21.0-beta.27",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
@@ -13,5 +13,5 @@
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "ab6c290fc51b20eb046cb31b9f37ac98de2de3b7"
+  "gitHead": "85b6bb3416b693de316511738097112f89e764e7"
 }

package/tools/preview-main.mjs

@@ -2,6 +2,16 @@
 import { app, BrowserWindow } from 'electron'
 import { readFile } from 'fs/promises'
 import { watchFile } from 'fs'
+import { parseArgs } from 'util'
+
+const { values } = parseArgs({
+  args: process.argv,
+  options: {
+    'clear-cache': { type: 'boolean' },
+  },
+  strict: true,
+  allowPositionals: true,
+})
 
 const cwd = process.cwd()
 
@@ -36,6 +46,11 @@ app.on('ready', () => {
 
   mainWindow.webContents.once('dom-ready', sendConfig)
 
+  if (values['clear-cache']) {
+    console.log('Clearing cache')
+    mainWindow.webContents.session.clearCache()
+  }
+
   mainWindow.on('close', () => app.quit())
 
   watchFile(

package/tools/preview.ts

@@ -9,6 +9,9 @@ const { values } = parseArgs({
     'skip-typecheck': {
       type: 'boolean',
     },
+    'clear-cache': {
+      type: 'boolean',
+    },
   },
   strict: true,
   allowPositionals: true,
@@ -34,5 +37,11 @@ const watcher = watch(`${cwd}/subspaces`, { recursive: true }, async (event, fil
 
 const app = await Bun.file(`${cwd}/application.json`).json()
 
-await $`BRICKS_STAGE=${app.stage || 'production'} bunx electron ${__dirname}/preview-main.mjs`
+
+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`
+}
+
 watcher.close()

package/types/bricks.ts

@@ -772,7 +772,8 @@ interface BrickSvgDef {
 Default property:
 {
   "source": "",
-  "uri": ""
+  "uri": "",
+  "renderMode": "general"
 }
   */
   property?: BrickBasicProperty & {
@@ -792,6 +793,8 @@ Default property:
             }
         >
       | DataLink
+    /* The render mode */
+    renderMode?: 'general' | 'legacy' | DataLink
   }
   events?: BrickBasicEvents & {
     /* Event of the brick press */
@@ -2486,6 +2489,314 @@ export type BrickLottie = Brick &
     >
   }
 
+/* Play animation */
+export type BrickRiveActionPlay = ActionWithParams & {
+  __actionName: 'BRICK_RIVE_PLAY'
+  params?: Array<
+    | {
+        input: 'animationName'
+        value?: string | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'loop'
+        value?: 'auto' | 'oneShot' | 'loop' | 'pingPong' | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'direction'
+        value?: 'auto' | 'backwards' | 'forwards' | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'isStateMachine'
+        value?: boolean | DataLink
+        mapping?: string
+      }
+  >
+}
+
+/* Pause animation */
+export type BrickRiveActionPause = Action & {
+  __actionName: 'BRICK_RIVE_PAUSE'
+}
+
+/* Stop animation */
+export type BrickRiveActionStop = Action & {
+  __actionName: 'BRICK_RIVE_STOP'
+}
+
+/* Reset animation */
+export type BrickRiveActionReset = Action & {
+  __actionName: 'BRICK_RIVE_RESET'
+}
+
+/* Fire state */
+export type BrickRiveActionFireState = ActionWithParams & {
+  __actionName: 'BRICK_RIVE_FIRE_STATE'
+  params?: Array<
+    | {
+        input: 'stateMachineName'
+        value?: string | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'inputName'
+        value?: string | DataLink
+        mapping?: string
+      }
+  >
+}
+
+/* Set input state */
+export type BrickRiveActionSetInputState = ActionWithParams & {
+  __actionName: 'BRICK_RIVE_SET_INPUT_STATE'
+  params?: Array<
+    | {
+        input: 'stateMachineName'
+        value?: string | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'inputName'
+        value?: string | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'value'
+        value?: any
+        mapping?: string
+      }
+  >
+}
+
+/* Set text run value. Text Run name need to defined as unique name in Rive file. (Ref: https://rive.app/community/doc/text/docn2E6y1lXo) */
+export type BrickRiveActionSetTextRunValue = ActionWithParams & {
+  __actionName: 'BRICK_RIVE_SET_TEXT_RUN_VALUE'
+  params?: Array<
+    | {
+        input: 'textRunName'
+        value?: string | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'value'
+        value?: any
+        mapping?: string
+      }
+  >
+}
+
+interface BrickRiveDef {
+  /*
+Default property:
+{
+  "autoplay": true,
+  "alignment": "center",
+  "fit": "contain"
+}
+  */
+  property?: BrickBasicProperty & {
+    /* Rive file url */
+    url?: string | DataLink
+    /* The checksum of `url` */
+    md5?: string | DataLink
+    /* Autoplay the animation */
+    autoplay?: boolean | DataLink
+    /* Alignment of the animation */
+    alignment?:
+      | 'topLeft'
+      | 'topCenter'
+      | 'topRight'
+      | 'centerLeft'
+      | 'center'
+      | 'centerRight'
+      | 'bottomLeft'
+      | 'bottomCenter'
+      | 'bottomRight'
+      | DataLink
+    /* Fit mode of the animation */
+    fit?:
+      | 'cover'
+      | 'contain'
+      | 'fill'
+      | 'fitWidth'
+      | 'fitHeight'
+      | 'none'
+      | 'scaleDown'
+      | 'layout'
+      | DataLink
+    /* Artboard name */
+    artboardName?: string | DataLink
+    /* Animation name */
+    animationName?: string | DataLink
+    /* State machine name */
+    stateMachineName?: string | DataLink
+  }
+  events?: BrickBasicEvents & {
+    /* Event of animation play */
+    onPlay?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          animationName: {
+            type: 'string'
+            path: string
+          }
+          isStateMachine: {
+            type: 'bool'
+            path: string
+          }
+        }
+      }
+    >
+    /* Event of animation pause */
+    onPause?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          animationName: {
+            type: 'string'
+            path: string
+          }
+          isStateMachine: {
+            type: 'bool'
+            path: string
+          }
+        }
+      }
+    >
+    /* Event of animation stop */
+    onStop?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          animationName: {
+            type: 'string'
+            path: string
+          }
+          isStateMachine: {
+            type: 'bool'
+            path: string
+          }
+        }
+      }
+    >
+    /* Event of animation loop end */
+    onLoopEnd?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          animationName: {
+            type: 'string'
+            path: string
+          }
+          isStateMachine: {
+            type: 'bool'
+            path: string
+          }
+        }
+      }
+    >
+    /* Event of state changed */
+    onStateChanged?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          stateMachineName: {
+            type: 'string'
+            path: string
+          }
+          stateName: {
+            type: 'string'
+            path: string
+          }
+        }
+      }
+    >
+    /* Event of error */
+    onError?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          error: {
+            type: 'string'
+            path: string
+          }
+        }
+      }
+    >
+    /* Event of Rive general event received */
+    onRiveGeneralEvent?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          eventName: {
+            type: 'string'
+            path: string
+          }
+          eventDelay: {
+            type: 'number'
+            path: string
+          }
+          eventProperties: {
+            type: 'object'
+            path: string
+          }
+        }
+      }
+    >
+    /* Event of Rive open-url event received */
+    onRiveOpenUrlEvent?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          eventName: {
+            type: 'string'
+            path: string
+          }
+          eventDelay: {
+            type: 'number'
+            path: string
+          }
+          eventUrl: {
+            type: 'string'
+            path: string
+          }
+          eventTarget: {
+            type: 'string'
+            path: string
+          }
+        }
+      }
+    >
+  }
+  animation?: AnimationBasicEvents & {
+    onPlay?: Animation
+    onPause?: Animation
+    onStop?: Animation
+    onLoopEnd?: Animation
+    onStateChanged?: Animation
+    onError?: Animation
+    onRiveGeneralEvent?: Animation
+    onRiveOpenUrlEvent?: Animation
+  }
+}
+
+/* Rive file component */
+export type BrickRive = Brick &
+  BrickRiveDef & {
+    templateKey: 'BRICK_RIVE'
+    switches: Array<
+      SwitchDef &
+        BrickRiveDef & {
+          conds?: Array<{
+            method: '==' | '!=' | '>' | '<' | '>=' | '<='
+            cond:
+              | SwitchCondInnerStateCurrentCanvas
+              | SwitchCondData
+              | {
+                  __typename: 'SwitchCondInnerStateOutlet'
+                  outlet: ''
+                  value: any
+                }
+          }>
+        }
+    >
+  }
+
 /* Run Javascript on the WebView */
 export type BrickWebViewActionInjectJavascript = ActionWithParams & {
   __actionName: 'BRICK_WEBVIEW_INJECT_JAVASCRIPT'

package/types/generators.ts

@@ -41,9 +41,35 @@ Default property:
   }
   events?: {
     /* Event for each tick start */
-    ticking?: Array<EventAction>
+    ticking?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          countdown: {
+            type: 'number'
+            path: string
+          }
+          value: {
+            type: 'any'
+            path: string
+          }
+        }
+      }
+    >
     /* Event for tick completed */
-    completed?: Array<EventAction>
+    completed?: Array<
+      EventAction & {
+        eventPropertyMapping?: {
+          countdown: {
+            type: 'number'
+            path: string
+          }
+          value: {
+            type: 'any'
+            path: string
+          }
+        }
+      }
+    >
   }
   outlets?: {
     /* Result of each countdown change */
@@ -6122,6 +6148,31 @@ export type GeneratorLLMActionCompletion = ActionWithParams & {
         value?: number | DataLink
         mapping?: string
       }
+    | {
+        input: 'dryMultiplier'
+        value?: number | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'dryBase'
+        value?: number | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'dryAllowedLength'
+        value?: number | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'dryPenaltyLastN'
+        value?: number | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'drySequenceBreakers'
+        value?: Array<any> | DataLink
+        mapping?: string
+      }
     | {
         input: 'mirostat'
         value?: number | DataLink
@@ -6261,6 +6312,15 @@ Default property:
   "completionTopK": 40,
   "completionTopP": 0.5,
   "completionMinP": 0.05,
+  "completionDryMultiplier": 0,
+  "completionDryBase": 1.75,
+  "completionDryAllowedLength": 2,
+  "completionDrySequenceBreakers": [
+    "\n",
+    ":",
+    "\"",
+    "*"
+  ],
   "completionMirostat": 0,
   "completionMirostatTau": 5,
   "completionMirostatEta": 0.1,
@@ -6367,6 +6427,16 @@ Default property:
     completionXtcThreshold?: number | DataLink
     /* Sets the chance for token removal (checked once on sampler start) */
     completionXtcProbability?: number | DataLink
+    /* Set the DRY (Don't Repeat Yourself) repetition penalty multiplier. Default: `0.0`, which is disabled. */
+    completionDryMultiplier?: number | DataLink
+    /* Set the DRY repetition penalty base value. Default: `1.75` */
+    completionDryBase?: number | DataLink
+    /* Tokens that extend repetition beyond this receive exponentially increasing penalty: multiplier * base ^ (length of repeating sequence before token - allowed length). Default: `2` */
+    completionDryAllowedLength?: number | DataLink
+    /* How many tokens to scan for repetitions. Default: `-1`, where `0` is disabled and `-1` is context size. */
+    completionDryPenaltyLastN?: number | DataLink
+    /* Specify an array of sequence breakers for DRY sampling. Only a JSON array of strings is accepted. Default: `['\n', ':', '"', '*']` */
+    completionDrySequenceBreakers?: Array<string | DataLink> | DataLink
     /* Use Mirostat sampling. Top K, Nucleus, Tail Free and Locally Typical samplers are ignored if used. */
     completionMirostat?: number | DataLink
     /* Mirostat target entropy, parameter tau */

package/types/system.ts

@@ -279,6 +279,75 @@ export type SystemActionTakeScreenshot = ActionWithParams & {
   >
 }
 
+/* Subscribe to a channel for data update */
+export type SystemActionChannelSubscribe = ActionWithParams & {
+  __actionName: 'CHANNEL_SUBSCRIBE'
+  params?: Array<
+    | {
+        input: 'key'
+        value?: string | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'type'
+        value?: 'on' | 'once' | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'livetime'
+        value?: number | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'dataResult'
+        value?: string | DataLink | (() => Data)
+        mapping?: string
+      }
+    | {
+        input: 'progressResult'
+        value?: string | DataLink | (() => Data)
+        mapping?: string
+      }
+    | {
+        input: 'errorResult'
+        value?: string | DataLink | (() => Data)
+        mapping?: string
+      }
+  >
+}
+
+/* Unsubscribe from a channel */
+export type SystemActionChannelUnsubscribe = ActionWithParams & {
+  __actionName: 'CHANNEL_UNSUBSCRIBE'
+  params?: Array<{
+    input: 'keyMatch'
+    value?: string | DataLink
+    mapping?: string
+  }>
+}
+
+/* Publish data to a channel */
+export type SystemActionChannelPublish = ActionWithParams & {
+  __actionName: 'CHANNEL_PUBLISH'
+  params?: Array<
+    | {
+        input: 'keyMatch'
+        value?: string | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'payloadType'
+        value?: 'result' | 'progress' | 'error' | DataLink
+        mapping?: string
+      }
+    | {
+        input: 'payload'
+        value?: string | DataLink
+        mapping?: string
+      }
+  >
+}
+
 /* [Internal] Use a shared application */
 export type SystemActionUseShareApplication = ActionWithParams & {
   __actionName: 'USE_SHARE_APPLICATION'