Generated by Spark: Make this function smarter, wide variety of search paths and other permissive logic - function createLazyComponent(componentConfig: ComponentConfig) {

const loader = () => {
    if (componentConfig.preloadDependencies) {
      componentConfig.preloadDependencies.forEach(depName => {
        const preloader = dependencyPreloaders[depName]
        if (preloader) {
          preloader()
        }
      })
    }

    return import(componentConfig.path).then(m => ({ default: m[componentConfig.export] }))
  }
This commit is contained in:
2026-01-17 17:46:36 +00:00
committed by GitHub
parent 8e1e35196a
commit feaa7d7a9e

View File

@@ -36,7 +36,7 @@ const dependencyPreloaders: Record<string, () => void> = {
}
function createLazyComponent(componentConfig: ComponentConfig) {
const loader = () => {
const loader = async () => {
if (componentConfig.preloadDependencies) {
componentConfig.preloadDependencies.forEach(depName => {
const preloader = dependencyPreloaders[depName]
@@ -46,7 +46,49 @@ function createLazyComponent(componentConfig: ComponentConfig) {
})
}
return import(componentConfig.path).then(m => ({ default: m[componentConfig.export] }))
const pathVariants = generatePathVariants(componentConfig.path, componentConfig.name)
let lastError: Error | null = null
for (const path of pathVariants) {
try {
const module = await import(path)
const exportName = componentConfig.export || 'default'
if (module[exportName]) {
return { default: module[exportName] }
}
if (exportName === 'default' && module.default) {
return { default: module.default }
}
if (module[componentConfig.name]) {
return { default: module[componentConfig.name] }
}
const firstExport = Object.keys(module).find(key =>
key !== '__esModule' &&
key !== 'default' &&
typeof module[key] === 'function'
)
if (firstExport) {
return { default: module[firstExport] }
}
if (module.default) {
return { default: module.default }
}
return { default: module }
} catch (err) {
lastError = err as Error
continue
}
}
console.error(`[REGISTRY] ❌ Failed to load component "${componentConfig.name}" after trying ${pathVariants.length} path variants`)
throw lastError || new Error(`Failed to load component: ${componentConfig.name}`)
}
if (componentConfig.type === 'dialog' || componentConfig.type === 'pwa') {
@@ -56,6 +98,77 @@ function createLazyComponent(componentConfig: ComponentConfig) {
return lazyWithPreload(loader, componentConfig.name)
}
function generatePathVariants(path: string, componentName: string): string[] {
const variants: string[] = []
const cleanPath = path.replace(/\.tsx?$/, '')
variants.push(path)
if (!path.endsWith('.tsx') && !path.endsWith('.ts')) {
variants.push(`${cleanPath}.tsx`)
variants.push(`${cleanPath}.ts`)
}
if (path.startsWith('@/components/')) {
const relativePath = path.replace('@/components/', '')
variants.push(`/src/components/${relativePath}`)
variants.push(`/src/components/${relativePath}.tsx`)
variants.push(`/src/components/${relativePath}.ts`)
variants.push(`./components/${relativePath}`)
variants.push(`./components/${relativePath}.tsx`)
variants.push(`../components/${relativePath}`)
variants.push(`../components/${relativePath}.tsx`)
}
if (path.startsWith('@/')) {
const relativePath = path.replace('@/', '')
variants.push(`/src/${relativePath}`)
variants.push(`/src/${relativePath}.tsx`)
variants.push(`/src/${relativePath}.ts`)
variants.push(`./${relativePath}`)
variants.push(`./${relativePath}.tsx`)
variants.push(`../${relativePath}`)
variants.push(`../${relativePath}.tsx`)
}
if (!path.startsWith('@/') && !path.startsWith('/') && !path.startsWith('./') && !path.startsWith('../')) {
variants.push(`@/${path}`)
variants.push(`@/${path}.tsx`)
variants.push(`@/components/${path}`)
variants.push(`@/components/${path}.tsx`)
variants.push(`/src/${path}`)
variants.push(`/src/${path}.tsx`)
variants.push(`/src/components/${path}`)
variants.push(`/src/components/${path}.tsx`)
}
if (path.endsWith('.tsx')) {
variants.push(path.replace('.tsx', ''))
}
const pathWithoutExt = cleanPath
const lastSegment = pathWithoutExt.split('/').pop() || ''
if (lastSegment !== componentName) {
const dirPath = pathWithoutExt.substring(0, pathWithoutExt.lastIndexOf('/'))
if (dirPath) {
variants.push(`${dirPath}/${componentName}`)
variants.push(`${dirPath}/${componentName}.tsx`)
variants.push(`${dirPath}/${componentName}.ts`)
variants.push(`${dirPath}/index.tsx`)
variants.push(`${dirPath}/index.ts`)
}
}
const seen = new Set<string>()
return variants.filter(v => {
if (seen.has(v)) return false
seen.add(v)
return true
})
}
function buildRegistry(components: ComponentConfig[]) {
return components.reduce((registry, component) => {
registry[component.name] = createLazyComponent(component)