sygnal 4.2.0 → 4.3.0

package/src/component.js

@@ -42,13 +42,27 @@ function wrapDOMSource(domSource) {
 }
 
 
-export const ABORT = '~#~#~ABORT~#~#~'
+export const ABORT = Symbol('ABORT')
+
+
+function normalizeCalculatedEntry(field, entry) {
+  if (typeof entry === 'function') {
+    return { fn: entry, deps: null }
+  }
+  if (Array.isArray(entry) && entry.length === 2
+      && Array.isArray(entry[0]) && typeof entry[1] === 'function') {
+    return { fn: entry[1], deps: entry[0] }
+  }
+  throw new Error(
+    `Invalid calculated field '${field}': expected a function or [depsArray, function]`
+  )
+}
 
 export default function component (opts) {
   const { name, sources, isolateOpts, stateSourceName='STATE' } = opts
 
   if (sources && !isObj(sources)) {
-    throw new Error('Sources must be a Cycle.js sources object:', name)
+    throw new Error(`[${name}] Sources must be a Cycle.js sources object`)
   }
 
   let fixedIsolateOpts
@@ -128,7 +142,9 @@ class Component {
   // sinks
 
   constructor({ name='NO NAME', sources, intent, model, hmrActions, context, response, view, peers={}, components={}, initialState, calculated, storeCalculatedInState=true, DOMSourceName='DOM', stateSourceName='STATE', requestSourceName='HTTP', debug=false }) {
-    if (!sources || !isObj(sources)) throw new Error('Missing or invalid sources')
+    if (!sources || !isObj(sources)) throw new Error(`[${name}] Missing or invalid sources`)
+
+    this._componentNumber = COMPONENT_COUNT++
 
     this.name       = name
     this.sources    = sources
@@ -149,6 +165,123 @@ class Component {
     this.sourceNames       = Object.keys(sources)
     this._debug            = debug
 
+    // Warn if calculated fields shadow base state keys
+    if (this.calculated && this.initialState
+        && isObj(this.calculated) && isObj(this.initialState)) {
+      for (const key of Object.keys(this.calculated)) {
+        if (key in this.initialState) {
+          console.warn(
+            `[${name}] Calculated field '${key}' shadows a key in initialState. ` +
+            `The initialState value will be overwritten on every state update.`
+          )
+        }
+      }
+    }
+
+    // Normalize calculated entries, build dependency graph, topological sort
+    if (this.calculated && isObj(this.calculated)) {
+      const calcEntries = Object.entries(this.calculated)
+
+      // Normalize all entries to { fn, deps } shape
+      this._calculatedNormalized = {}
+      for (const [field, entry] of calcEntries) {
+        this._calculatedNormalized[field] = normalizeCalculatedEntry(field, entry)
+      }
+
+      this._calculatedFieldNames = new Set(Object.keys(this._calculatedNormalized))
+
+      // Warn on deps referencing nonexistent keys
+      for (const [field, { deps }] of Object.entries(this._calculatedNormalized)) {
+        if (deps !== null) {
+          for (const dep of deps) {
+            if (!this._calculatedFieldNames.has(dep)
+                && this.initialState && !(dep in this.initialState)) {
+              console.warn(
+                `[${name}] Calculated field '${field}' declares dependency '${dep}' ` +
+                `which is not in initialState or calculated fields`
+              )
+            }
+          }
+        }
+      }
+
+      // Build adjacency: for each field, which other calculated fields must run first?
+      const calcDeps = {}
+      for (const [field, { deps }] of Object.entries(this._calculatedNormalized)) {
+        if (deps === null) {
+          calcDeps[field] = []
+        } else {
+          calcDeps[field] = deps.filter(d => this._calculatedFieldNames.has(d))
+        }
+      }
+
+      // Kahn's algorithm for topological sort
+      const inDegree = {}
+      const reverseGraph = {}
+      for (const field of this._calculatedFieldNames) {
+        inDegree[field] = 0
+        reverseGraph[field] = []
+      }
+      for (const [field, depList] of Object.entries(calcDeps)) {
+        inDegree[field] = depList.length
+        for (const dep of depList) {
+          reverseGraph[dep].push(field)
+        }
+      }
+
+      const queue = []
+      for (const [field, degree] of Object.entries(inDegree)) {
+        if (degree === 0) queue.push(field)
+      }
+
+      const sorted = []
+      while (queue.length > 0) {
+        const current = queue.shift()
+        sorted.push(current)
+        for (const dependent of reverseGraph[current]) {
+          inDegree[dependent]--
+          if (inDegree[dependent] === 0) queue.push(dependent)
+        }
+      }
+
+      if (sorted.length !== this._calculatedFieldNames.size) {
+        // Cycle detected — build error message with cycle path
+        const inCycle = [...this._calculatedFieldNames].filter(f => !sorted.includes(f))
+        const visited = new Set()
+        const path = []
+        const traceCycle = (node) => {
+          if (visited.has(node)) { path.push(node); return true }
+          visited.add(node)
+          path.push(node)
+          for (const dep of calcDeps[node]) {
+            if (inCycle.includes(dep) && traceCycle(dep)) return true
+          }
+          path.pop()
+          visited.delete(node)
+          return false
+        }
+        traceCycle(inCycle[0])
+        const start = path[path.length - 1]
+        const cycle = path.slice(path.indexOf(start))
+        throw new Error(`Circular calculated dependency: ${cycle.join(' \u2192 ')}`)
+      }
+
+      this._calculatedOrder = sorted.map(f => [f, this._calculatedNormalized[f]])
+
+      // Initialize per-field memoization caches for fields with declared deps
+      this._calculatedFieldCache = {}
+      for (const [field, { deps }] of this._calculatedOrder) {
+        if (deps !== null) {
+          this._calculatedFieldCache[field] = { lastDepValues: undefined, lastResult: undefined }
+        }
+      }
+    } else {
+      this._calculatedOrder = null
+      this._calculatedNormalized = null
+      this._calculatedFieldNames = null
+      this._calculatedFieldCache = null
+    }
+
     this.isSubComponent = this.sourceNames.includes('props$')
 
     const state$ = sources[stateSourceName] && sources[stateSourceName].stream
@@ -157,6 +290,9 @@ class Component {
       this.currentState = initialState || {}
       this.sources[stateSourceName] = new StateSource(state$.map(val => {
         this.currentState = val
+        if (typeof window !== 'undefined' && window.__SYGNAL_DEVTOOLS__?.connected) {
+          window.__SYGNAL_DEVTOOLS__.onStateChanged(this._componentNumber, this.name, val)
+        }
         return val
       }))
     }
@@ -192,10 +328,8 @@ class Component {
       }
     }
 
-    const componentNumber = COMPONENT_COUNT++
-
     this.addCalculated = this.createMemoizedAddCalculated()
-    this.log = makeLog(`${componentNumber} | ${name}`)
+    this.log = makeLog(`${this._componentNumber} | ${name}`)
 
     this.initChildSources$()
     this.initIntent$()
@@ -210,9 +344,20 @@ class Component {
     this.initVdom$()
     this.initSinks()
 
-    this.sinks.__index = componentNumber
+    this.sinks.__index = this._componentNumber
 
     this.log(`Instantiated`, true)
+
+    // Hook 1: Register with DevTools
+    if (typeof window !== 'undefined' && window.__SYGNAL_DEVTOOLS__) {
+      window.__SYGNAL_DEVTOOLS__.onComponentCreated(this._componentNumber, name, this)
+
+      // Hook 1b: Register parent-child relationship
+      const parentNum = sources?.__parentComponentNumber
+      if (typeof parentNum === 'number') {
+        window.__SYGNAL_DEVTOOLS__.onSubComponentRegistered(parentNum, this._componentNumber)
+      }
+    }
   }
 
   get debug() {
@@ -224,13 +369,13 @@ class Component {
       return
     }
     if (typeof this.intent != 'function') {
-      throw new Error('Intent must be a function')
+      throw new Error(`[${this.name}] Intent must be a function`)
     }
 
     this.intent$ = this.intent(this.sources)
 
     if (!(this.intent$ instanceof Stream) && (!isObj(this.intent$))) {
-      throw new Error('Intent must return either an action$ stream or map of event streams')
+      throw new Error(`[${this.name}] Intent must return either an action$ stream or map of event streams`)
     }
   }
 
@@ -243,10 +388,10 @@ class Component {
       this.hmrActions = [this.hmrActions]
     }
     if (!Array.isArray(this.hmrActions)) {
-      throw new Error(`[${ this.name }] hmrActions must be the name of an action or an array of names of actions to run when a component is hot-reloaded`)
+      throw new Error(`[${this.name}] hmrActions must be the name of an action or an array of names of actions to run when a component is hot-reloaded`)
     }
     if (this.hmrActions.some(action => typeof action !== 'string')) {
-      throw new Error(`[${ this.name }] hmrActions must be the name of an action or an array of names of actions to run when a component is hot-reloaded`)
+      throw new Error(`[${this.name}] hmrActions must be the name of an action or an array of names of actions to run when a component is hot-reloaded`)
     }
     this.hmrAction$ = xs.fromArray(this.hmrActions.map(action => ({ type: action })))
   }
@@ -285,7 +430,15 @@ class Component {
     const hydrate$ = initialApiData.map(data => ({ type: HYDRATE_ACTION, data }))
 
     this.action$   = xs.merge(wrapped$, hydrate$)
-      .compose(this.log(({ type }) => `<${ type }> Action triggered`))
+      .compose(this.log(({ type }) => `<${type}> Action triggered`))
+      .map(action => {
+        if (typeof window !== 'undefined' && window.__SYGNAL_DEVTOOLS__?.connected) {
+          window.__SYGNAL_DEVTOOLS__.onActionDispatched(
+            this._componentNumber, this.name, action.type, action.data
+          )
+        }
+        return action
+      })
   }
 
   initState() {
@@ -297,7 +450,7 @@ class Component {
       } else if (isObj(this.model[INITIALIZE_ACTION])) {
         Object.keys(this.model[INITIALIZE_ACTION]).forEach(name => {
           if (name !== this.stateSourceName) {
-            console.warn(`${ INITIALIZE_ACTION } can only be used with the ${ this.stateSourceName } source... disregarding ${ name }`)
+            console.warn(`${INITIALIZE_ACTION} can only be used with the ${this.stateSourceName} source... disregarding ${name}`)
             delete this.model[INITIALIZE_ACTION][name]
           }
         })
@@ -332,7 +485,7 @@ class Component {
           } else if (valueType === 'function') {
             _value = value(state)
           } else {
-            console.error(`[${ this.name }] Invalid context entry '${ name }': must be the name of a state property or a function returning a value to use`)
+            console.error(`[${this.name}] Invalid context entry '${name}': must be the name of a state property or a function returning a value to use`)
             return acc
           }
           acc[name] = _value
@@ -340,11 +493,14 @@ class Component {
         }, {})
         const newContext = { ..._parent, ...values }
         this.currentContext = newContext
+        if (typeof window !== 'undefined' && window.__SYGNAL_DEVTOOLS__?.connected) {
+          window.__SYGNAL_DEVTOOLS__.onContextChanged(this._componentNumber, this.name, newContext)
+        }
         return newContext
       })
       .compose(dropRepeats(objIsEqual))
       .startWith({})
-    this.context$.subscribe({ next: _ => _ })
+    this.context$.subscribe({ next: _ => _, error: err => console.error(`[${this.name}] Error in context stream:`, err) })
   }
 
   initModel$() {
@@ -360,7 +516,7 @@ class Component {
     const effectiveInitialState = (typeof hmrState !== 'undefined') ? hmrState : this.initialState
     const initial  = { type: INITIALIZE_ACTION, data: effectiveInitialState }
     if (this.isSubComponent && this.initialState) {
-      console.warn(`[${ this.name }] Initial state provided to sub-component. This will overwrite any state provided by the parent component.`)
+      console.warn(`[${this.name}] Initial state provided to sub-component. This will overwrite any state provided by the parent component.`)
     }
     const hasInitialState = (typeof effectiveInitialState !== 'undefined')
     const shouldInjectInitialState = hasInitialState && (ENVIRONMENT?.__SYGNAL_HMR_UPDATING !== true || typeof hmrState !== 'undefined')
@@ -381,7 +537,7 @@ class Component {
       }
 
       if (!isObj(sinks)) {
-        throw new Error(`Entry for each action must be an object: ${ this.name } ${ action }`)
+        throw new Error(`[${this.name}] Entry for each action must be an object: ${action}`)
       }
 
       const sinkEntries = Object.entries(sinks)
@@ -398,12 +554,12 @@ class Component {
         const wrapped$ = on$
           .compose(this.log(data => {
             if (isStateSink) {
-              return `<${ action }> State reducer added`
+              return `<${action}> State reducer added`
             } else if (isParentSink) {
-              return `<${ action }> Data sent to parent component: ${ JSON.stringify(data.value).replaceAll('"', '') }`
+              return `<${action}> Data sent to parent component: ${JSON.stringify(data.value).replaceAll('"', '')}`
             } else {
               const extra = data && (data.type || data.command || data.name || data.key || (Array.isArray(data) && 'Array') || data)
-              return `<${ action }> Data sent to [${ sink }]: ${ JSON.stringify(extra).replaceAll('"', '') }`
+              return `<${action}> Data sent to [${sink}]: ${JSON.stringify(extra).replaceAll('"', '')}`
             }
           }))
 
@@ -481,7 +637,7 @@ class Component {
 
       }
     })
-    subComponentSink$.subscribe({ next: _ => _ })
+    subComponentSink$.subscribe({ next: _ => _, error: err => console.error(`[${this.name}] Error in sub-component sink stream:`, err) })
     this.subComponentSink$ = subComponentSink$.filter(sinks => Object.keys(sinks).length > 0)
   }
 
@@ -544,13 +700,13 @@ class Component {
       if (typeof reducer === 'function') {
         returnStream$ = filtered$.map(action => {
           const next = (type, data, delay=10) => {
-            if (typeof delay !== 'number') throw new Error(`[${ this.name } ] Invalid delay value provided to next() function in model action '${ name }'. Must be a number in ms.`)
+            if (typeof delay !== 'number') throw new Error(`[${this.name}] Invalid delay value provided to next() function in model action '${name}'. Must be a number in ms.`)
             // put the "next" action request at the end of the event loop so the "current" action completes first
             setTimeout(() => {
               // push the "next" action request into the action$ stream
               rootAction$.shamefullySendNext({ type, data })
             }, delay)
-            this.log(`<${ name }> Triggered a next() action: <${ type }> ${ delay }ms delay`, true)
+            this.log(`<${name}> Triggered a next() action: <${type}> ${delay}ms delay`, true)
           }
 
           const props = { ...this.currentProps, children: this.currentChildren, context: this.currentContext }
@@ -562,7 +718,7 @@ class Component {
               const enhancedState = this.addCalculated(_state)
               props.state = enhancedState
               const newState = reducer(enhancedState, data, next, props)
-              if (newState == ABORT) return _state
+              if (newState === ABORT) return _state
               return this.cleanupCalculated(newState)
             }
           } else {
@@ -571,13 +727,13 @@ class Component {
             const reduced = reducer(enhancedState, data, next, props)
             const type = typeof reduced
             if (isObj(reduced) || ['string', 'number', 'boolean', 'function'].includes(type)) return reduced
-            if (type == 'undefined') {
-              console.warn(`'undefined' value sent to ${ name }`)
+            if (type === 'undefined') {
+              console.warn(`[${this.name}] 'undefined' value sent to ${name}`)
               return reduced
             }
-            throw new Error(`Invalid reducer type for ${ name } ${ type }`)
+            throw new Error(`[${this.name}] Invalid reducer type for action '${name}': ${type}`)
           }
-        }).filter(result => result != ABORT)
+        }).filter(result => result !== ABORT)
       } else if (reducer === undefined || reducer === true) {
         returnStream$ = filtered$.map(({data}) => data)
       } else {
@@ -598,7 +754,7 @@ class Component {
       if (state === lastState) {
         return lastResult
       }
-      if (!isObj(this.calculated)) throw new Error(`'calculated' parameter must be an object mapping calculated state field named to functions`)
+      if (!isObj(this.calculated)) throw new Error(`[${this.name}] 'calculated' parameter must be an object mapping calculated state field names to functions`)
 
       const calculated = this.getCalculatedValues(state)
       if (!calculated) {
@@ -617,19 +773,55 @@ class Component {
   }
 
   getCalculatedValues(state) {
-    const entries = Object.entries(this.calculated || {})
-    if (entries.length === 0) {
+    if (!this._calculatedOrder || this._calculatedOrder.length === 0) {
       return
     }
-    return entries.reduce((acc, [field, fn]) => {
-      if (typeof fn !== 'function') throw new Error(`Missing or invalid calculator function for calculated field '${ field }`)
-      try {
-        acc[field] = fn(state)
-      } catch(e) {
-        console.warn(`Calculated field '${ field }' threw an error during calculation: ${ e.message }`)
+
+    const mergedState = { ...state }
+    const computedSoFar = {}
+
+    for (const [field, { fn, deps }] of this._calculatedOrder) {
+      if (deps !== null && this._calculatedFieldCache) {
+        const cache = this._calculatedFieldCache[field]
+        const currentDepValues = deps.map(d => mergedState[d])
+
+        if (cache.lastDepValues !== undefined) {
+          let unchanged = true
+          for (let i = 0; i < currentDepValues.length; i++) {
+            if (currentDepValues[i] !== cache.lastDepValues[i]) {
+              unchanged = false
+              break
+            }
+          }
+          if (unchanged) {
+            computedSoFar[field] = cache.lastResult
+            mergedState[field] = cache.lastResult
+            continue
+          }
+        }
+
+        try {
+          const result = fn(mergedState)
+          cache.lastDepValues = currentDepValues
+          cache.lastResult = result
+          computedSoFar[field] = result
+          mergedState[field] = result
+        } catch (e) {
+          console.warn(`Calculated field '${field}' threw an error during calculation: ${e.message}`)
+        }
+      } else {
+        // No deps declared — always recompute
+        try {
+          const result = fn(mergedState)
+          computedSoFar[field] = result
+          mergedState[field] = result
+        } catch (e) {
+          console.warn(`Calculated field '${field}' threw an error during calculation: ${e.message}`)
+        }
       }
-      return acc
-    }, {})
+    }
+
+    return computedSoFar
   }
 
   cleanupCalculated(incomingState) {
@@ -777,7 +969,7 @@ class Component {
       this.newChildSources(childSources)
 
 
-      if (newInstanceCount > 0) this.log(`New sub components instantiated: ${ newInstanceCount }`, true)
+      if (newInstanceCount > 0) this.log(`New sub components instantiated: ${newInstanceCount}`, true)
 
       return newComponents
     }, {})
@@ -843,7 +1035,7 @@ class Component {
     } else if (this.components[collectionOf]) {
       factory = this.components[collectionOf]
     } else {
-      throw new Error(`[${this.name}] Invalid 'of' propery in collection: ${ collectionOf }`)
+      throw new Error(`[${this.name}] Invalid 'of' property in collection: ${collectionOf}`)
     }
 
     const fieldLense = {
@@ -851,7 +1043,7 @@ class Component {
         if (!Array.isArray(state[stateField])) return []
         const items = state[stateField]
         const filtered = typeof arrayOperators.filter === 'function' ? items.filter(arrayOperators.filter) : items
-        const sorted = typeof arrayOperators.sort ? filtered.sort(arrayOperators.sort) : filtered
+        const sorted = typeof arrayOperators.sort === 'function' ? filtered.sort(arrayOperators.sort) : filtered
         const mapped = sorted.map((item, index) => {
           return (isObj(item)) ? { ...item, [idField]: item[idField] || index } : { value: item, [idField]: index }
         })
@@ -860,7 +1052,7 @@ class Component {
       },
       set: (oldState, newState) => {
         if (this.calculated && stateField in this.calculated) {
-          console.warn(`Collection sub-component of ${ this.name } attempted to update state on a calculated field '${ stateField }': Update ignored`)
+          console.warn(`Collection sub-component of ${this.name} attempted to update state on a calculated field '${stateField}': Update ignored`)
           return oldState
         }
         const updated = []
@@ -889,17 +1081,17 @@ class Component {
     } else if (typeof stateField === 'string') {
       if (isObj(this.currentState)) {
         if(!(this.currentState && stateField in this.currentState) && !(this.calculated && stateField in this.calculated)) {
-          console.error(`Collection component in ${ this.name } is attempting to use non-existent state property '${ stateField }': To fix this error, specify a valid array property on the state.  Attempting to use parent component state.`)
+          console.error(`Collection component in ${this.name} is attempting to use non-existent state property '${stateField}': To fix this error, specify a valid array property on the state.  Attempting to use parent component state.`)
           lense = undefined
         } else if (!Array.isArray(this.currentState[stateField])) {
-          console.warn(`State property '${ stateField }' in collection comopnent of ${ this.name } is not an array: No components will be instantiated in the collection.`)
+          console.warn(`[${this.name}] State property '${stateField}' in collection component is not an array: No components will be instantiated in the collection.`)
           lense = fieldLense
         } else {
           lense = fieldLense
         }
       } else {
         if (!Array.isArray(this.currentState[stateField])) {
-          console.warn(`State property '${ stateField }' in collection component of ${ this.name } is not an array: No components will be instantiated in the collection.`)
+          console.warn(`[${this.name}] State property '${stateField}' in collection component is not an array: No components will be instantiated in the collection.`)
           lense = fieldLense
         } else {
           lense = fieldLense
@@ -907,14 +1099,14 @@ class Component {
       }
     } else if (isObj(stateField)) {
       if (typeof stateField.get !== 'function') {
-        console.error(`Collection component in ${ this.name } has an invalid 'from' field: Expecting 'undefined', a string indicating an array property in the state, or an object with 'get' and 'set' functions for retrieving and setting child state from the current state. Attempting to use parent component state.`)
+        console.error(`Collection component in ${this.name} has an invalid 'from' field: Expecting 'undefined', a string indicating an array property in the state, or an object with 'get' and 'set' functions for retrieving and setting child state from the current state. Attempting to use parent component state.`)
         lense = undefined
       } else {
         lense = {
           get: (state) => {
             const newState = stateField.get(state)
             if (!Array.isArray(newState)) {
-              console.warn(`State getter function in collection component of ${ this.name } did not return an array: No components will be instantiated in the collection. Returned value:`, newState)
+              console.warn(`State getter function in collection component of ${this.name} did not return an array: No components will be instantiated in the collection. Returned value:`, newState)
               return []
             }
             return newState
@@ -923,14 +1115,14 @@ class Component {
         }
       }
     } else {
-      console.error(`Collection component in ${ this.name } has an invalid 'from' field: Expecting 'undefined', a string indicating an array property in the state, or an object with 'get' and 'set' functions for retrieving and setting child state from the current state. Attempting to use parent component state.`)
+      console.error(`Collection component in ${this.name} has an invalid 'from' field: Expecting 'undefined', a string indicating an array property in the state, or an object with 'get' and 'set' functions for retrieving and setting child state from the current state. Attempting to use parent component state.`)
       lense = undefined
     }
 
-    const sources = { ...this.sources, [this.stateSourceName]: stateSource, props$, children$, __parentContext$: this.context$, PARENT: null }
+    const sources = { ...this.sources, [this.stateSourceName]: stateSource, props$, children$, __parentContext$: this.context$, PARENT: null, __parentComponentNumber: this._componentNumber }
     const sink$   = collection(factory, lense, { container: null })(sources)
     if (!isObj(sink$)) {
-      throw new Error('Invalid sinks returned from component factory of collection element')
+      throw new Error(`[${this.name}] Invalid sinks returned from component factory of collection element`)
     }
     return sink$
   }
@@ -952,7 +1144,7 @@ class Component {
       get: state => state[stateField],
       set: (oldState, newState) => {
         if (this.calculated && stateField in this.calculated) {
-          console.warn(`Switchable sub-component of ${ this.name } attempted to update state on a calculated field '${ stateField }': Update ignored`)
+          console.warn(`Switchable sub-component of ${this.name} attempted to update state on a calculated field '${stateField}': Update ignored`)
           return oldState
         }
         if (!isObj(newState) || Array.isArray(newState)) return { ...oldState, [stateField]: newState }
@@ -971,13 +1163,13 @@ class Component {
       lense = fieldLense
     } else if (isObj(stateField)) {
       if (typeof stateField.get !== 'function') {
-        console.error(`Switchable component in ${ this.name } has an invalid 'state' field: Expecting 'undefined', a string indicating an array property in the state, or an object with 'get' and 'set' functions for retrieving and setting sub-component state from the current state. Attempting to use parent component state.`)
+        console.error(`Switchable component in ${this.name} has an invalid 'state' field: Expecting 'undefined', a string indicating an array property in the state, or an object with 'get' and 'set' functions for retrieving and setting sub-component state from the current state. Attempting to use parent component state.`)
         lense = baseLense
       } else {
         lense = { get: stateField.get, set: stateField.set }
       }
     } else {
-      console.error(`Invalid state provided to switchable sub-component of ${ this.name }: Expecting string, object, or undefined, but found ${ typeof stateField }. Attempting to use parent component state.`)
+      console.error(`Invalid state provided to switchable sub-component of ${this.name}: Expecting string, object, or undefined, but found ${typeof stateField}. Attempting to use parent component state.`)
       lense = baseLense
     }
 
@@ -993,12 +1185,12 @@ class Component {
         switchableComponents[key] = component(options)
       }
     })
-    const sources = { ...this.sources, [this.stateSourceName]: stateSource, props$, children$, __parentContext$: this.context$ }
+    const sources = { ...this.sources, [this.stateSourceName]: stateSource, props$, children$, __parentContext$: this.context$, __parentComponentNumber: this._componentNumber }
 
     const sink$ = isolate(switchable(switchableComponents, props$.map(props => props.current)), { [this.stateSourceName]: lense })(sources)
 
     if (!isObj(sink$)) {
-      throw new Error('Invalid sinks returned from component factory of switchable element')
+      throw new Error(`[${this.name}] Invalid sinks returned from component factory of switchable element`)
     }
 
     return sink$
@@ -1024,7 +1216,7 @@ class Component {
     const factory   = componentName === 'sygnal-factory' ? props.sygnalFactory : (this.components[componentName] || props.sygnalFactory)
     if (!factory) {
       if (componentName === 'sygnal-factory') throw new Error(`Component not found on element with Capitalized selector and nameless function: JSX transpilation replaces selectors starting with upper case letters with functions in-scope with the same name, Sygnal cannot see the name of the resulting component.`)
-      throw new Error(`Component not found: ${ componentName }`)
+      throw new Error(`Component not found: ${componentName}`)
     }
 
     let lense
@@ -1033,7 +1225,7 @@ class Component {
       get: state => state[stateField],
       set: (oldState, newState) => {
         if (this.calculated && stateField in this.calculated) {
-          console.warn(`Sub-component of ${ this.name } attempted to update state on a calculated field '${ stateField }': Update ignored`)
+          console.warn(`Sub-component of ${this.name} attempted to update state on a calculated field '${stateField}': Update ignored`)
           return oldState
         }
         return { ...oldState, [stateField]: newState }
@@ -1051,17 +1243,17 @@ class Component {
       lense = fieldLense
     } else if (isObj(stateField)) {
       if (typeof stateField.get !== 'function') {
-        console.error(`Sub-component in ${ this.name } has an invalid 'state' field: Expecting 'undefined', a string indicating an array property in the state, or an object with 'get' and 'set' functions for retrieving and setting sub-component state from the current state. Attempting to use parent component state.`)
+        console.error(`Sub-component in ${this.name} has an invalid 'state' field: Expecting 'undefined', a string indicating an array property in the state, or an object with 'get' and 'set' functions for retrieving and setting sub-component state from the current state. Attempting to use parent component state.`)
         lense = baseLense
       } else {
         lense = { get: stateField.get, set: stateField.set }
       }
     } else {
-      console.error(`Invalid state provided to sub-component of ${ this.name }: Expecting string, object, or undefined, but found ${ typeof stateField }. Attempting to use parent component state.`)
+      console.error(`Invalid state provided to sub-component of ${this.name}: Expecting string, object, or undefined, but found ${typeof stateField}. Attempting to use parent component state.`)
       lense = baseLense
     }
 
-    const sources = { ...this.sources, [this.stateSourceName]: stateSource, props$, children$, __parentContext$: this.context$ }
+    const sources = { ...this.sources, [this.stateSourceName]: stateSource, props$, children$, __parentContext$: this.context$, __parentComponentNumber: this._componentNumber }
     const sink$   = isolate(factory, { [this.stateSourceName]: lense })(sources)
 
     if (!isObj(sink$)) {
@@ -1136,14 +1328,22 @@ class Component {
     const fixedMsg = (typeof msg === 'function') ? msg : _ => msg
     if (immediate) {
       if (this.debug) {
-        console.log(`[${context}] ${fixedMsg(msg)}`)
+        const text = `[${context}] ${fixedMsg(msg)}`
+        console.log(text)
+        if (typeof window !== 'undefined' && window.__SYGNAL_DEVTOOLS__?.connected) {
+          window.__SYGNAL_DEVTOOLS__.onDebugLog(this._componentNumber, text)
+        }
       }
       return
     } else {
       return stream => {
         return stream.debug(msg => {
           if (this.debug) {
-            console.log(`[${context}] ${fixedMsg(msg)}`)
+            const text = `[${context}] ${fixedMsg(msg)}`
+            console.log(text)
+            if (typeof window !== 'undefined' && window.__SYGNAL_DEVTOOLS__?.connected) {
+              window.__SYGNAL_DEVTOOLS__.onDebugLog(this._componentNumber, text)
+            }
           }
         })
       }
@@ -1153,11 +1353,11 @@ class Component {
 
 
 
-function getComponents(currentElement, componentNames, depth=0, index=0, parentId) {
+function getComponents(currentElement, componentNames, path='r', parentId) {
   if (!currentElement) return {}
 
   if (currentElement.data?.componentsProcessed) return {}
-  if (depth === 0) currentElement.data.componentsProcessed = true
+  if (path === 'r') currentElement.data.componentsProcessed = true
 
   const sel          = currentElement.sel
   const isCollection = sel && sel.toLowerCase() === 'collection'
@@ -1171,11 +1371,11 @@ function getComponents(currentElement, componentNames, depth=0, index=0, parentI
   
   let id = parentId
   if (isComponent) {
-    id  = getComponentIdFromElement(currentElement, depth, index, parentId)
+    id  = getComponentIdFromElement(currentElement, path, parentId)
     if (isCollection) {
       if (!props.of)   throw new Error(`Collection element missing required 'component' property`)
       if (typeof props.of !== 'string' && typeof props.of !== 'function')         throw new Error(`Invalid 'component' property of collection element: found ${ typeof props.of } requires string or component factory function`)
-      if (typeof props.of !== 'function' && !componentNames.includes(props.of))   throw new Error(`Specified component for collection not found: ${ props.of }`)
+      if (typeof props.of !== 'function' && !componentNames.includes(props.of))   throw new Error(`Specified component for collection not found: ${props.of}`)
       if (typeof props.from !== 'undefined' && !(typeof props.from === 'string' || Array.isArray(props.from) || typeof props.from.get === 'function')) console.warn(`No valid array found for collection ${ typeof props.of === 'string' ? props.of : 'function component' }: no collection components will be created`, props.from)
       currentElement.data.isCollection = true
       currentElement.data.props ||= {}
@@ -1186,7 +1386,7 @@ function getComponents(currentElement, componentNames, depth=0, index=0, parentI
       if (!switchableComponents.every(comp => typeof comp === 'function')) throw new Error(`One or more components provided to switchable element is not a valid component factory`)
       if (!props.current || (typeof props.current !== 'string' && typeof props.current !== 'function')) throw new Error(`Missing or invalid 'current' property for switchable element: found '${ typeof props.current }' requires string or function`)
       const switchableComponentNames = Object.keys(props.of)
-      if (!switchableComponentNames.includes(props.current)) throw new Error(`Component '${ props.current }' not found in switchable element`)
+      if (!switchableComponentNames.includes(props.current)) throw new Error(`Component '${props.current}' not found in switchable element`)
       currentElement.data.isSwitchable = true
     } else {
 
@@ -1196,7 +1396,7 @@ function getComponents(currentElement, componentNames, depth=0, index=0, parentI
   }
 
   if (children.length > 0) {
-    children.map((child, i) => getComponents(child, componentNames, depth + 1, index + i, id))
+    children.map((child, i) => getComponents(child, componentNames, `${path}.${i}`, id))
             .forEach((child) => {
               Object.entries(child).forEach(([id, el]) => found[id] = el)
             })
@@ -1205,10 +1405,10 @@ function getComponents(currentElement, componentNames, depth=0, index=0, parentI
   return found
 }
 
-function injectComponents(currentElement, components, componentNames, depth=0, index=0, parentId) {
+function injectComponents(currentElement, components, componentNames, path='r', parentId) {
   if (!currentElement) return
   if (currentElement.data?.componentsInjected) return currentElement
-  if (depth === 0 && currentElement.data) currentElement.data.componentsInjected = true
+  if (path === 'r' && currentElement.data) currentElement.data.componentsInjected = true
 
 
   const sel          = currentElement.sel || 'NO SELECTOR'
@@ -1220,7 +1420,7 @@ function injectComponents(currentElement, components, componentNames, depth=0, i
 
   let id = parentId
   if (isComponent) {
-    id  = getComponentIdFromElement(currentElement, depth, index, parentId)
+    id  = getComponentIdFromElement(currentElement, path, parentId)
     const component = components[id]
     if (isCollection) {
       currentElement.sel = 'div'
@@ -1232,21 +1432,20 @@ function injectComponents(currentElement, components, componentNames, depth=0, i
       return component
     }
   } else if (children.length > 0) {
-    currentElement.children = children.map((child, i) => injectComponents(child, components, componentNames, depth + 1, index + i, id)).flat()
+    currentElement.children = children.map((child, i) => injectComponents(child, components, componentNames, `${path}.${i}`, id)).flat()
     return currentElement
   } else {
     return currentElement
   }
 }
 
-function getComponentIdFromElement(el, depth, index, parentId) {
+function getComponentIdFromElement(el, path, parentId) {
   const sel    = el.sel
   const name   = typeof sel === 'string' ? sel : 'functionComponent'
-  const uid    = `${depth}:${index}`
   const props  = el.data?.props || {}
-  const id     = (props.id && JSON.stringify(props.id).replaceAll('"', '')) || uid
-  const parentString = parentId ? `${ parentId }|` : ''
-  const fullId = `${ parentString }${ name }::${ id }`
+  const id     = (props.id && JSON.stringify(props.id).replaceAll('"', '')) || path
+  const parentString = parentId ? `${parentId}|` : ''
+  const fullId = `${parentString}${name}::${id}`
   return fullId
 }
 
@@ -1390,7 +1589,7 @@ function sortFunctionFromProp(sortProp) {
   } else if (isObj(sortProp)) {
     return __sortFunctionFromObj(sortProp)
   } else {
-    console.error('Invalid sort option (ignoring):', item)
+    console.error('Invalid sort option (ignoring):', sortProp)
     return undefined
   }
 }