@fugood/bricks-ctor 2.25.0-beta.49 → 2.25.0-beta.50

package/compile/__tests__/index.test.js

@@ -171,6 +171,40 @@ describe('compile animations', () => {
   })
 })
 
+describe('compile event handlers', () => {
+  const BRICK_ID = 'BRICK_00000000-0000-0000-0000-000000000002'
+
+  test('preserves item-brick string handler casing and normalizes only system', async () => {
+    // A mixed-case ItemBrickID handler — must survive compile verbatim because the
+    // runtime resolves handlers case-sensitively (mapEventMapHandlersWithNewId).
+    const itemHandlerId = 'itemBrickHandlerId'
+    const app = makeApp()
+    app.rootSubspace.bricks = [
+      {
+        __typename: 'Brick',
+        id: BRICK_ID,
+        templateKey: 'BRICK_VIEW',
+        property: {},
+        events: {
+          onPress: [
+            { handler: itemHandlerId, action: { __actionName: 'SCROLL_TO_INDEX' } },
+            { handler: 'system', action: { __actionName: 'NAVIGATE' } },
+          ],
+        },
+      },
+    ]
+
+    const config = await compile(app)
+    const eventMap = config.subspace_map[SUBSPACE_ID].brick_map[BRICK_ID].event_map
+    const events = eventMap.BRICK_VIEW_ON_PRESS
+
+    // ItemBrickID handler kept verbatim (was wrongly uppercased to ITEMBRICKHANDLERID).
+    expect(events[0].handler).toBe(itemHandlerId)
+    // The literal 'system' handler still normalizes to SYSTEM.
+    expect(events[1].handler).toBe('SYSTEM')
+  })
+})
+
 describe('compile data remote update', () => {
   test.each([
     [undefined, { bank_type: 'none' }],
@@ -200,6 +234,39 @@ describe('compile data remote update', () => {
   })
 })
 
+describe('compile asset preload normalization', () => {
+  const makeAssetData = (id, kindType) => ({
+    __typename: 'Data',
+    id,
+    type: 'string',
+    kind: {
+      type: kindType,
+      preload: { type: 'url', hashType: 'sha256', hash: 'abc123' },
+    },
+  })
+
+  test('rive-file-uri normalizes preload like lottie-file-uri (hash re-keyed by hashType)', async () => {
+    const RIVE_ID = 'PROPERTY_BANK_DATA_NODE_00000000-0000-0000-0000-0000000000a1'
+    const LOTTIE_ID = 'PROPERTY_BANK_DATA_NODE_00000000-0000-0000-0000-0000000000a2'
+    const config = await compile(
+      makeApp(
+        [],
+        [makeAssetData(RIVE_ID, 'rive-file-uri'), makeAssetData(LOTTIE_ID, 'lottie-file-uri')],
+      ),
+    )
+
+    const rive = config.subspace_map[SUBSPACE_ID].property_bank_map[RIVE_ID]
+    const lottie = config.subspace_map[SUBSPACE_ID].property_bank_map[LOTTIE_ID]
+
+    // Rive must get the same normalized preload as every sibling asset kind: the hash
+    // re-keyed under its hashType (the runtime reads preload[hashType]), not left raw under
+    // `hash`. Regression: rive was missing from preloadTypes, so it fell to the raw else
+    // branch and the runtime preload[hashType] lookup missed.
+    expect(rive.preload).toEqual({ type: 'url', hashType: 'sha256', sha256: 'abc123' })
+    expect(rive.preload).toEqual(lottie.preload)
+  })
+})
+
 describe('compile config-change audit log', () => {
   const readAudit = async (projectDir) =>
     (await readFile(path.join(projectDir, '.bricks/edits.jsonl'), 'utf8'))
@@ -263,3 +330,36 @@ describe('compile config-change audit log', () => {
     }
   })
 })
+
+describe('compile linked-module subspace', () => {
+  const LINKED_SUBSPACE_ID = 'SUBSPACE_00000000-0000-0000-0000-000000000002'
+  const makeLinkedApp = () => {
+    const app = makeApp()
+    app.subspaces = [
+      app.rootSubspace,
+      {
+        __typename: 'Subspace',
+        id: LINKED_SUBSPACE_ID,
+        title: 'Linked Module',
+        layout: { width: 96, height: 54 },
+        module: { link: true, id: 'MODULE_00000000-0000-0000-0000-000000000001', version: 1 },
+      },
+    ]
+    return app
+  }
+
+  test('uses a deterministic placeholder canvas id stable across recompiles', async () => {
+    // Regression: the placeholder canvas id came from makeId('canvas'), whose count-fallback
+    // branch uses a never-reset process-global counter, so recompiling identical source produced
+    // a different id and broke compile's byte-stable-output contract (phantom config-change ops).
+    const first = await compile(makeLinkedApp())
+    const second = await compile(makeLinkedApp())
+
+    const firstKeys = Object.keys(first.subspace_map[LINKED_SUBSPACE_ID].canvas_map)
+    const secondKeys = Object.keys(second.subspace_map[LINKED_SUBSPACE_ID].canvas_map)
+    expect(firstKeys).toHaveLength(1)
+    expect(secondKeys).toEqual(firstKeys)
+    expect(first.subspace_map[LINKED_SUBSPACE_ID].root_canvas_id).toBe(firstKeys[0])
+    expect(second.subspace_map[LINKED_SUBSPACE_ID].root_canvas_id).toBe(firstKeys[0])
+  })
+})

package/compile/index.ts

@@ -6,7 +6,7 @@ import omit from 'lodash/omit'
 import { parse as parseAST } from 'acorn'
 import type { ExportNamedDeclaration, FunctionDeclaration } from 'acorn'
 import escodegen from 'escodegen'
-import { makeId } from '../utils/id'
+import { makeSeededId } from '../utils/id'
 import { generateCalulationMap } from './util'
 import { templateActionNameMap } from './action-name-map'
 import { templateEventPropsMap } from '../utils/event-props'
@@ -185,10 +185,17 @@ const compileEvents = (
 
       let handlerKey
       let handlerTemplateKey
-      if (handler === 'system' || typeof handler === 'string') {
-        if (handler.startsWith('SUBSPACE_')) handlerKey = handler
-        else handlerKey = handler.toUpperCase()
-        if (handlerKey === 'SYSTEM') handlerTemplateKey = 'SYSTEM'
+      if (typeof handler === 'string') {
+        // Only the literal 'system' handler is normalized to the SYSTEM template key.
+        // SubspaceID (SUBSPACE_*) and ItemBrickID handlers are kept verbatim: the runtime
+        // resolves them case-sensitively (see mapEventMapHandlersWithNewId), so uppercasing
+        // a mixed-case ItemBrickID would break handler-to-item event wiring.
+        if (handler === 'system') {
+          handlerKey = 'SYSTEM'
+          handlerTemplateKey = 'SYSTEM'
+        } else {
+          handlerKey = handler
+        }
       } else if (typeof handler === 'function') {
         let instance = handler()
         if (instance?.id) {
@@ -486,6 +493,7 @@ const preloadTypes = [
   'media-resource-audio',
   'media-resource-file',
   'lottie-file-uri',
+  'rive-file-uri',
   'ggml-model-asset',
   'gguf-model-asset',
   'binary-asset',
@@ -755,7 +763,14 @@ export const compile = async (app: Application) => {
       // validation (root_canvas_id is required before the conditional
       // schema fix is published).
       if (subspace.module?.link) {
-        const placeholderCanvasId = makeId('canvas')
+        // Seed the placeholder id from the (stable) subspace id. `makeId('canvas')` would take
+        // the count-fallback branch (a process-global counter that is never reset), so the
+        // placeholder id depended on how many prior count-fallback ids had been minted — making
+        // it differ between recompiles and breaking compile's byte-stable-output contract
+        // (phantom config-change ops). `makeSeededId` keeps no global state, so identical source
+        // recompiles to an identical id. (`makeId('canvas', alias)` would instead throw
+        // "Duplicate makeId alias" on the second compile in a long-lived process.)
+        const placeholderCanvasId = makeSeededId('canvas', `${subspaceId}:module-placeholder`)
         subspaceMap[subspaceId] = {
           title: subspace.title,
           description: subspace.description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-ctor",
-  "version": "2.25.0-beta.49",
+  "version": "2.25.0-beta.50",
   "main": "index.ts",
   "scripts": {
     "typecheck": "tsc --noEmit",
@@ -11,7 +11,7 @@
     "@babel/parser": "7.28.5",
     "@babel/traverse": "7.28.5",
     "@babel/types": "7.28.5",
-    "@fugood/bricks-cli": "^2.25.0-beta.49",
+    "@fugood/bricks-cli": "^2.25.0-beta.50",
     "@huggingface/gguf": "^0.3.2",
     "@iarna/toml": "^3.0.0",
     "@modelcontextprotocol/sdk": "^1.15.0",
@@ -29,5 +29,5 @@
   "peerDependencies": {
     "oxfmt": "^0.36.0"
   },
-  "gitHead": "e7da261fd97feda0ee059ff04070f0068cad9d29"
+  "gitHead": "3614445cd0166e40634f69c6238299bb63f4f597"
 }

package/tools/mcp-tools/__tests__/entry-editing.test.js

@@ -229,6 +229,36 @@ describe('ctor MCP entry-editing tools', () => {
     expect(gitignore).toContain('.bricks/edits.jsonl')
   })
 
+  test('edit_entry removes the correct elements when unsetting multiple array indices', async () => {
+    // Regression: unset paths were applied in input order, but unsetPathValue
+    // splices arrays in place — removing items[1] shifts items[2] down, so the
+    // second unset hit the wrong element (or no-op'd). Both requested elements
+    // must be removed regardless of order.
+    projectDir = await writeFixtureProject()
+    const target = { file: 'subspaces/subspace-0/bricks.ts', entry: 'bButton', verify: false }
+
+    const built = await __test__.editEntry(projectDir, {
+      ...target,
+      set: {
+        'property.list[0]': 'ITEM_A',
+        'property.list[1]': 'ITEM_B',
+        'property.list[2]': 'ITEM_C',
+      },
+    })
+    expect(built.outcome).toBe('ok')
+
+    const unset = await __test__.editEntry(projectDir, {
+      ...target,
+      unset: ['property.list[1]', 'property.list[2]'],
+    })
+    expect(unset.outcome).toBe('ok')
+
+    const source = await readProjectFile(projectDir, 'subspaces/subspace-0/bricks.ts')
+    expect(source).toContain('ITEM_A')
+    expect(source).not.toContain('ITEM_B') // items[1] removed
+    expect(source).not.toContain('ITEM_C') // items[2] removed (survived before the fix)
+  })
+
   test('edit_events adds a typed system event action', async () => {
     projectDir = await writeFixtureProject()
 

package/tools/mcp-tools/entry-editing.ts

@@ -924,7 +924,20 @@ const editEntry = async (projectDir: string, input: any) =>
     for (const [pathValue, value] of Object.entries(input.set || {})) {
       await setPathValue(targetObject, pathValue, value, ctx)
     }
-    for (const pathValue of input.unset || []) {
+    // Apply unset paths highest array-index first: unsetPathValue splices arrays
+    // in place, so removing a lower index would shift the higher indices down and
+    // a later unset would then hit the wrong element (or no-op). Sorting descending
+    // by the numeric indices in each path keeps same-array removals correct;
+    // object-key and distinct-array removals are order-independent.
+    const orderedUnset = [...(input.unset || [])].sort((a: string, b: string) => {
+      const ka = parsePath(a).map((token) => ('index' in token ? token.index : -1))
+      const kb = parsePath(b).map((token) => ('index' in token ? token.index : -1))
+      for (let i = 0; i < Math.min(ka.length, kb.length); i += 1) {
+        if (ka[i] !== kb[i]) return kb[i] - ka[i]
+      }
+      return kb.length - ka.length
+    })
+    for (const pathValue of orderedUnset) {
       unsetPathValue(targetObject, pathValue)
     }