Add tests for extensionHandle-based event routing

Co-authored-by: Claude Code <claude-code@anthropic.com>

Author: isaacroldan

packages/app/src/cli/services/dev/app-events/app-event-watcher.test.ts

@@ -25,9 +25,9 @@ vi.mock('../../../models/app/loader.js')
 vi.mock('./app-watcher-esbuild.js')
 
 // Extensions 1 and 1B simulate extensions defined in the same directory (same toml)
-const extension1 = await testUIExtension({type: 'ui_extension', directory: '/extensions/ui_extension_1', uid: 'uid1'})
-const extension1B = await testUIExtension({type: 'ui_extension', directory: '/extensions/ui_extension_1', uid: 'uid1B'})
-const extension2 = await testUIExtension({type: 'ui_extension', directory: '/extensions/ui_extension_2', uid: 'uid2'})
+const extension1 = await testUIExtension({type: 'ui_extension', handle: 'h1', directory: '/extensions/ui_extension_1', uid: 'uid1'})
+const extension1B = await testUIExtension({type: 'ui_extension', handle: 'h2', directory: '/extensions/ui_extension_1', uid: 'uid1B'})
+const extension2 = await testUIExtension({type: 'ui_extension', handle: 'h3', directory: '/extensions/ui_extension_2', uid: 'uid2'})
 const flowExtension = await testFlowActionExtension('/extensions/flow_action')
 const posExtension = await testAppConfigExtensions()
 const appAccessExtension = await testAppAccessConfigExtension()
@@ -36,12 +36,14 @@ const webhookExtension = await testSingleWebhookSubscriptionExtension()
 // Simulate updated extensions
 const extension1Updated = await testUIExtension({
   type: 'ui_extension',
+  handle: 'h1',
   name: 'updated_name1',
   directory: '/extensions/ui_extension_1',
   uid: 'uid1',
 })
 const extension1BUpdated = await testUIExtension({
   type: 'ui_extension',
+  handle: 'h2',
   name: 'updated_name1B',
   directory: '/extensions/ui_extension_1',
   uid: 'uid1B',
@@ -212,6 +214,32 @@ const testCases: TestCase[] = [
       {type: EventType.Updated, extension: extension1B, buildResult: {status: 'ok', uid: 'uid1B'}},
     ],
   },
+  {
+    name: 'file_updated with extensionHandle targets only the specified extension',
+    fileWatchEvent: {
+      type: 'file_updated',
+      path: '/extensions/ui_extension_1/src/file.js',
+      extensionPath: '/extensions/ui_extension_1',
+      extensionHandle: 'h1',
+      startTime: [0, 0],
+    },
+    initialExtensions: [extension1, extension1B, extension2, posExtension],
+    finalExtensions: [extension1, extension1B, extension2, posExtension],
+    extensionEvents: [{type: EventType.Updated, extension: extension1, buildResult: {status: 'ok', uid: 'uid1'}}],
+  },
+  {
+    name: 'file_created with extensionHandle targets only the specified extension',
+    fileWatchEvent: {
+      type: 'file_created',
+      path: '/extensions/ui_extension_1/src/new-file.js',
+      extensionPath: '/extensions/ui_extension_1',
+      extensionHandle: 'h2',
+      startTime: [0, 0],
+    },
+    initialExtensions: [extension1, extension1B, extension2, posExtension],
+    finalExtensions: [extension1, extension1B, extension2, posExtension],
+    extensionEvents: [{type: EventType.Updated, extension: extension1B, buildResult: {status: 'ok', uid: 'uid1B'}}],
+  },
   {
     name: 'app config updated with multiple extensions affected',
     fileWatchEvent: {

packages/app/src/cli/services/dev/app-events/file-watcher.test.ts

@@ -77,6 +77,7 @@ interface TestCaseSingleEvent {
   path: string
   expectedEvent?: Omit<WatcherEvent, 'startTime'> & {startTime?: WatcherEvent['startTime']}
   expectedEventCount?: number
+  expectedHandles?: string[]
 }
 
 /**
@@ -104,8 +105,10 @@ const singleEventTestCases: TestCaseSingleEvent[] = [
       type: 'file_updated',
       path: '/extensions/ui_extension_1/index.js',
       extensionPath: '/extensions/ui_extension_1',
+      extensionHandle: 'h1',
     },
     expectedEventCount: 2,
+    expectedHandles: ['h1', 'h2'],
   },
   {
     name: 'change in toml',
@@ -115,8 +118,10 @@ const singleEventTestCases: TestCaseSingleEvent[] = [
       type: 'extensions_config_updated',
       path: '/extensions/ui_extension_1/shopify.ui.extension.toml',
       extensionPath: '/extensions/ui_extension_1',
+      extensionHandle: 'h1',
     },
     expectedEventCount: 2,
+    expectedHandles: ['h1', 'h2'],
   },
   {
     name: 'change in app config',
@@ -136,8 +141,10 @@ const singleEventTestCases: TestCaseSingleEvent[] = [
       type: 'file_created',
       path: '/extensions/ui_extension_1/new-file.js',
       extensionPath: '/extensions/ui_extension_1',
+      extensionHandle: 'h1',
     },
     expectedEventCount: 2,
+    expectedHandles: ['h1', 'h2'],
   },
   {
     name: 'delete a file',
@@ -284,7 +291,7 @@ describe('file-watcher events', () => {
 
   test.each(singleEventTestCases)(
     'The event $name returns the expected WatcherEvent',
-    async ({fileSystemEvent, path, expectedEvent, expectedEventCount}) => {
+    async ({fileSystemEvent, path, expectedEvent, expectedEventCount, expectedHandles}) => {
       // Given
       let eventHandler: any
 
@@ -382,6 +389,14 @@ describe('file-watcher events', () => {
             expect(actualEvent.extensionPath).toBe(normalizePath(expectedEvent.extensionPath))
             expect(Array.isArray(actualEvent.startTime)).toBe(true)
             expect(actualEvent.startTime).toHaveLength(2)
+
+            // Verify extensionHandle is set correctly on file-level events
+            if (expectedHandles) {
+              const actualHandles = actualEvents.map((e: WatcherEvent) => e.extensionHandle).sort()
+              expect(actualHandles).toEqual(expectedHandles.sort())
+            } else if (expectedEvent.extensionHandle) {
+              expect(actualEvent.extensionHandle).toBe(expectedEvent.extensionHandle)
+            }
           },
           {timeout: 1000, interval: 50},
         )