refactor: improve JSX delegate creation and component ID resolution

Author: skiniks

crates/rari/src/rsc/rendering/core/js/component_eval_setup.js

@@ -23,12 +23,16 @@ if (!globalThis.React || typeof globalThis.React.createElement !== 'function') {
 }
 
 function createJsxDelegate(runtimeJsx, globalJsx) {
-  return runtimeJsx || globalJsx || ((type, props, key) => {
-    if (!globalThis.React || typeof globalThis.React.createElement !== 'function')
-      return null
+  return (type, props, key) => {
+    if (globalThis.React && typeof globalThis.React.createElement === 'function')
+      return globalThis.React.createElement(type, key !== undefined ? { ...props, key } : props)
+    if (typeof runtimeJsx === 'function')
+      return runtimeJsx(type, props, key)
+    if (typeof globalJsx === 'function')
+      return globalJsx(type, props, key)
 
-    return globalThis.React.createElement(type, key !== undefined ? { ...props, key } : props)
-  })
+    return null
+  }
 }
 
 if (typeof _jsx === 'undefined')

packages/rari/src/runtime/shared/get-client-component.ts

@@ -223,26 +223,21 @@ export async function getClientComponentAsync(id: string): Promise<any> {
   const clientComponentPaths = (globalThis as unknown as GlobalWithRari)['~clientComponentPaths'] || {}
   const clientComponentNames = (globalThis as unknown as GlobalWithRari)['~clientComponentNames'] || {}
 
-  let componentInfo = clientComponents[id] as LazyComponentInfo
+  const hashIndex = id.indexOf('#')
+  const baseId = hashIndex === -1 ? id : id.slice(0, hashIndex)
+  const exportName = hashIndex === -1 ? undefined : id.slice(hashIndex + 1)
 
-  if (componentInfo) {
-    const exportName = id.includes('#') ? id.slice(id.indexOf('#') + 1) : undefined
+  let componentInfo = clientComponents[baseId] as LazyComponentInfo
+  if (componentInfo)
     return await ensureComponentLoaded(componentInfo, exportName)
-  }
 
-  if (id.includes('#')) {
-    const hashIndex = id.indexOf('#')
-    const path = id.slice(0, hashIndex)
-    const exportName = id.slice(hashIndex + 1)
-    const variants = getPathVariants(path)
-
-    for (const variant of variants) {
-      const componentId = clientComponentPaths[variant]
-      if (componentId) {
-        componentInfo = clientComponents[componentId] as LazyComponentInfo
-        if (componentInfo)
-          return await ensureComponentLoaded(componentInfo, exportName)
-      }
+  const variants = getPathVariants(baseId)
+  for (const variant of variants) {
+    const componentId = clientComponentPaths[variant]
+    if (componentId) {
+      componentInfo = clientComponents[componentId] as LazyComponentInfo
+      if (componentInfo)
+        return await ensureComponentLoaded(componentInfo, exportName)
     }
   }