Change code style and formatting of inspector module to procedural

thetarnav · thetarnav · commit d6bffa2e773f · 2025-06-20T19:10:18.000+02:00
diff --git a/packages/debugger/src/inspector/index.ts b/packages/debugger/src/inspector/index.ts
@@ -28,16 +28,16 @@ export function createInspector(props: {
 
     let lastDetails: Mapped.OwnerDetails | undefined
     let inspectedOwner: Solid.Owner | null
-    let valueMap = new inspector.ValueNodeMap()
-    const propsMap: inspector.ObservedPropsMap = new WeakMap()
+    let valueMap = inspector.value_node_map_make()
+    const propsMap: inspector.Observed_Props_Map = new WeakMap()
     /** compare props object with the previous one to see whats changed */
     let checkProxyProps: (() => InspectorUpdateMap['propKeys'] | null) | null
 
     /*
      For the extension for inspecting values through `inspect()`
     */
     function getValue(id: ValueItemID): unknown {
-        return valueMap.get(id)?.getValue?.()
+        return inspector.value_node_map_get(valueMap, id)?.get_value?.()
     }
     window[GLOBAL_GET_VALUE] = getValue
 
@@ -55,16 +55,16 @@ export function createInspector(props: {
 
                 // Value Nodes (signals, props, and owner value)
                 for (const [id, toggleChange] of valueUpdates) {
-                    const node = valueMap.get(id)
-                    if (!node || !node.getValue) continue
+                    const node = inspector.value_node_map_get(valueMap, id)
+                    if (!node || !node.get_value) continue
                     // TODO shouldn't the previous stores be unsubscribed here? after update, they might no longer be here
-                    const selected = node.isSelected()
+                    const selected = inspector.value_node_is_selected(node)
                     const encoded = encodeValue(
-                        node.getValue(),
+                        node.get_value(),
                         selected,
                         setup.eli,
                         selected &&
-                            (storeNode => node.addStoreObserver(store.observeStoreNode(storeNode))),
+                            (storeNode => inspector.value_node_add_store_observer(node, store.observeStoreNode(storeNode))),
                     )
                     batchedUpdates.push([
                         toggleChange === null ? 'value' : 'inspectToggle',
@@ -153,25 +153,25 @@ export function createInspector(props: {
     function inspectOwnerId(id: NodeID | null): void {
 
         const owner = id && getObjectById(id, ObjectType.Owner)
-        if (inspectedOwner) inspector.clearOwnerObservers(inspectedOwner, propsMap)
+        if (inspectedOwner) inspector.clear_owner_observers(inspectedOwner, propsMap)
         inspectedOwner = owner
 
-        valueMap.reset()
+        inspector.value_node_map_reset(valueMap)
         clearUpdates()
 
         if (owner) {
-            const result = inspector.collectOwnerDetails(owner, {
-                onValueUpdate:     pushValueUpdate,
-                onPropStateChange: pushPropState,
-                observedPropsMap:  propsMap,
+            const result = inspector.collect_owner_details(owner, {
+                on_value_update:     pushValueUpdate,
+                on_prop_state_change: pushPropState,
+                props_map:  propsMap,
                 eli:               setup.eli,
             })
 
             props.emit(msg('InspectedNodeDetails', result.details))
 
-            valueMap        = result.valueMap
+            valueMap        = result.value_map
             lastDetails     = result.details
-            checkProxyProps = result.checkProxyProps || null
+            checkProxyProps = result.check_proxy_props || null
         } else {
             lastDetails     = undefined
             checkProxyProps = null
@@ -210,17 +210,17 @@ export function createInspector(props: {
     return {
         getLastDetails: () => lastDetails,
         toggleValueNode({id, selected}: ToggleInspectedValueData): void {
-            const node = valueMap.get(id)
+            const node = inspector.value_node_map_get(valueMap, id)
             if (!node) return warn('Could not find value node:', id)
-            node.setSelected(selected)
+            inspector.value_node_set_selected(node, selected)
             pushInspectToggle(id, selected)
         },
         consoleLogValue(value_id: ValueItemID): void {
             // eslint-disable-next-line no-console
             console.log(getValue(value_id))
         },
         preObserveComponent(component: Solid.Component): void {
-            inspector.preObserveComponentProps(component, propsMap)
+            inspector.pre_observe_component_props(component, propsMap)
         }
     }
 }
diff --git a/packages/debugger/src/inspector/inspector.test.tsx b/packages/debugger/src/inspector/inspector.test.tsx
@@ -5,11 +5,11 @@ import * as test from 'vitest'
 import {getObjectById, getSdtId, ObjectType} from '../main/id.ts'
 import setup from '../main/setup.ts'
 import {dom_element_interface, type Mapped, NodeType, PropGetterState, type Solid, ValueType} from '../types.ts'
-import {collectOwnerDetails} from './inspector.ts'
+import {collect_owner_details, value_node_map_get} from './inspector.ts'
 
 const eli = dom_element_interface
 
-test.describe('collectOwnerDetails', () => {
+test.describe('collect_owner_details', () => {
     test.it('collects focused owner details', () => {
         s.createRoot(dispose => {
             const [source] = s.createSignal(0, {name: 'source'})
@@ -20,9 +20,9 @@ test.describe('collectOwnerDetails', () => {
             s.createComputed(() => {
 
                 const focused = s.createMemo(() => {
-                    
+
                     memo = setup.solid.getOwner()!
-                    
+
                     source()
 
                     s.DEV!.registerGraph({
@@ -43,10 +43,10 @@ test.describe('collectOwnerDetails', () => {
             const [customValue, signalB] = memo.sourceMap as [Solid.SourceMapValue, Solid.Signal]
             const [innerMemo] = memo.owned as [Solid.Memo, Solid.Computation]
 
-            const {details, valueMap} = collectOwnerDetails(memo, {
-                observedPropsMap:  new WeakMap(),
-                onPropStateChange: () => {/**/},
-                onValueUpdate:     () => {/**/},
+            const {details, value_map} = collect_owner_details(memo, {
+                props_map:  new WeakMap(),
+                on_prop_state_change: () => {/**/},
+                on_value_update:     () => {/**/},
                 eli:               eli,
             })
 
@@ -77,9 +77,9 @@ test.describe('collectOwnerDetails', () => {
                 ],
             } satisfies Mapped.OwnerDetails)
 
-            test.expect(valueMap.get(`signal:${getSdtId(customValue, ObjectType.CustomValue)}`)).toBeTruthy()
-            test.expect(valueMap.get(`signal:${getSdtId(signalB, ObjectType.Signal)}`)).toBeTruthy()
-            test.expect(valueMap.get(`signal:${getSdtId(innerMemo, ObjectType.Owner)}`)).toBeTruthy()
+            test.expect(value_node_map_get(value_map, `signal:${getSdtId(customValue, ObjectType.CustomValue)}`)).toBeTruthy()
+            test.expect(value_node_map_get(value_map, `signal:${getSdtId(signalB, ObjectType.Signal)}`)).toBeTruthy()
+            test.expect(value_node_map_get(value_map, `signal:${getSdtId(innerMemo, ObjectType.Owner)}`)).toBeTruthy()
 
             test.expect(getObjectById('#3', ObjectType.Element)).toBe(div)
 
@@ -107,10 +107,10 @@ test.describe('collectOwnerDetails', () => {
                 </TestComponent>
             ))
 
-            const {details} = collectOwnerDetails(owner, {
-                observedPropsMap:  new WeakMap(),
-                onPropStateChange: () => {/**/},
-                onValueUpdate:     () => {/**/},
+            const {details} = collect_owner_details(owner, {
+                props_map:  new WeakMap(),
+                on_prop_state_change: () => {/**/},
+                on_value_update:     () => {/**/},
                 eli:               eli,
             })
 
@@ -164,10 +164,10 @@ test.describe('collectOwnerDetails', () => {
                 return (el_ref = <Button {...props()} /> as any)
             })
 
-            const {details} = collectOwnerDetails(owner, {
-                observedPropsMap:  new WeakMap(),
-                onPropStateChange: () => {/**/},
-                onValueUpdate:     () => {/**/},
+            const {details} = collect_owner_details(owner, {
+                props_map:  new WeakMap(),
+                on_prop_state_change: () => {/**/},
+                on_value_update:     () => {/**/},
                 eli:               eli,
             })
 
@@ -207,10 +207,10 @@ test.describe('collectOwnerDetails', () => {
             })
 
             const onValueUpdate = test.vi.fn()
-            collectOwnerDetails(owner, {
-                observedPropsMap:  new WeakMap(),
-                onPropStateChange: () => {/**/},
-                onValueUpdate:     onValueUpdate,
+            collect_owner_details(owner, {
+                props_map:  new WeakMap(),
+                on_prop_state_change: () => {/**/},
+                on_value_update:     onValueUpdate,
                 eli:               eli,
             })
 
@@ -240,10 +240,10 @@ test.describe('collectOwnerDetails', () => {
             const [count1, count2] = owner.sourceMap as [Solid.Signal, Solid.Signal]
 
             const onValueUpdate = test.vi.fn()
-            collectOwnerDetails(owner, {
-                observedPropsMap:  new WeakMap(),
-                onPropStateChange: () => {/**/},
-                onValueUpdate:     onValueUpdate,
+            collect_owner_details(owner, {
+                props_map:  new WeakMap(),
+                on_prop_state_change: () => {/**/},
+                on_value_update:     onValueUpdate,
                 eli:               eli,
             })
 
diff --git a/packages/debugger/src/inspector/inspector.ts b/packages/debugger/src/inspector/inspector.ts
