Remove viewChange event bus

Author: thetarnav

packages/debugger/src/dependency/index.ts

@@ -1,4 +1,4 @@
-import {type EmitterEmit, type Listen} from '@solid-primitives/event-bus'
+import {type EmitterEmit} from '@solid-primitives/event-bus'
 import {throttle} from '@solid-primitives/scheduled'
 import {defer} from '@solid-primitives/utils'
 import {type Accessor, createEffect, createMemo} from 'solid-js'
@@ -17,7 +17,6 @@ export function createDependencyGraph(props: {
     emit: EmitterEmit<Debugger.OutputChannels>
     enabled: Accessor<boolean>
     inspectedState: Accessor<Debugger.InspectedState>
-    listenToViewChange: Listen<DevtoolsMainView>
     onNodeUpdate: (nodeId: NodeID) => void
 }) {
     let clearListeners: VoidFunction | null = null
@@ -76,7 +75,9 @@ export function createDependencyGraph(props: {
         }),
     )
 
-    props.listenToViewChange(() => {
-        inspectDGraph()
-    })
+    return {
+        onViewChange(_: DevtoolsMainView) {
+            inspectDGraph()
+        }
+    }
 }

packages/debugger/src/main/index.ts

@@ -1,4 +1,4 @@
-import {createEventBus, createGlobalEmitter, type GlobalEmitter} from '@solid-primitives/event-bus'
+import {createGlobalEmitter, type GlobalEmitter} from '@solid-primitives/event-bus'
 import {createStaticStore} from '@solid-primitives/static-store'
 import {defer} from '@solid-primitives/utils'
 import * as s from 'solid-js'
@@ -69,33 +69,25 @@ const [modules, toggleModules] = createStaticStore({
 })
 
 // The debugger can be enabled by devtools or by the locator
-const debuggerEnabled = s.createMemo(() => modules.debugger || modules.locatorKeyPressSignal())
-const dgraphEnabled = s.createMemo(() => modules.dgraph && debuggerEnabled())
+const debuggerEnabled = s.createMemo(
+    () => modules.debugger || modules.locatorKeyPressSignal()
+)
+const dgraphEnabled = s.createMemo(
+    () => modules.dgraph && debuggerEnabled()
+)
 // locator is enabled if debugger is enabled, and user pressed the key to activate it, or the plugin activated it
 const locatorEnabled = s.createMemo(
     () => (modules.locatorKeyPressSignal() || modules.locator) && debuggerEnabled(),
 )
 
-s.createEffect(
-    defer(debuggerEnabled, enabled => {
-        hub.output.emit('DebuggerEnabled', enabled)
-    }),
-)
+s.createEffect(defer(debuggerEnabled, enabled => {
+    hub.output.emit('DebuggerEnabled', enabled)
+}))
 
 //
 // Current Open VIEW (currently not used)
 //
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 let currentView: DevtoolsMainView = DEFAULT_MAIN_VIEW
-const viewChange = createEventBus<DevtoolsMainView>()
-
-function setView(view: DevtoolsMainView) {
-    s.batch(() => {
-        // setStructureEnabled(view === DevtoolsMainView.Structure)
-        // setDgraphEnabled(view === DevtoolsMainView.Dgraph)
-        viewChange.emit((currentView = view))
-    })
-}
 
 //
 // Enabled Modules
@@ -194,7 +186,6 @@ const structure = createStructure({
     },
     onNodeUpdate: pushNodeUpdate,
     enabled: debuggerEnabled,
-    listenToViewChange: viewChange.listen,
 })
 
 //
@@ -210,10 +201,9 @@ const inspector = createInspector({
 //
 // Dependency Graph
 //
-createDependencyGraph({
+const dgraph = createDependencyGraph({
     emit: hub.output.emit,
     enabled: dgraphEnabled,
-    listenToViewChange: viewChange.listen,
     onNodeUpdate: pushNodeUpdate,
     inspectedState,
 })
@@ -272,7 +262,9 @@ hub.input.listen(e => {
         structure.setTreeWalkerMode(e.details)
         break
     case 'ViewChange':
-        setView(e.details)
+        currentView = e.details
+        structure.onViewChange(currentView)
+        dgraph.onViewChange(currentView)
         break
     case 'ToggleModule':
         toggleModule(e.details)

packages/debugger/src/structure/index.ts

@@ -1,4 +1,3 @@
-import {type Listen} from '@solid-primitives/event-bus'
 import {throttle} from '@solid-primitives/scheduled'
 import * as registry from '../main/component-registry.ts'
 import {DEFAULT_WALKER_MODE, DevtoolsMainView, NodeType, TreeWalkerMode} from '../main/constants.ts'
@@ -49,7 +48,6 @@ export function createStructure(props: {
     onStructureUpdate: (updates: StructureUpdates) => void
     onNodeUpdate: (nodeId: NodeID) => void
     enabled: () => boolean
-    listenToViewChange: Listen<DevtoolsMainView>
 }) {
     let treeWalkerMode: TreeWalkerMode = DEFAULT_WALKER_MODE
 
@@ -125,13 +123,6 @@ export function createStructure(props: {
         flushRootUpdateQueue()
     })
 
-    props.listenToViewChange(view => {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (view === DevtoolsMainView.Structure) {
-            updateAllRoots()
-        }
-    })
-
     function updateAllRoots(): void {
         shouldUpdateAllRoots = true
         flushRootUpdateQueue()
@@ -156,5 +147,11 @@ export function createStructure(props: {
         getClosestIncludedOwner(owner: Solid.Owner) {
             return getClosestIncludedOwner(owner, treeWalkerMode)
         },
+        onViewChange(view: DevtoolsMainView) {
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            if (view === DevtoolsMainView.Structure) {
+                updateAllRoots()
+            }
+        },
     }
 }