@stream44.studio/encapsulate 0.2.0-rc.2 → 0.2.0-rc.4

package/src/capsule-projectors/CapsuleModuleProjector.v0.ts

@@ -49,25 +49,25 @@ async function constructCacheFilePath(moduleFilepath: string, importStackLine: n
 async function constructNpmUriForCache(absoluteFilepath: string, spineRoot: string): Promise<string | null> {
     let currentDir = dirname(absoluteFilepath)
     const maxDepth = 20 // Prevent infinite loops
-    
+
     for (let i = 0; i < maxDepth; i++) {
         const packageJsonPath = join(currentDir, 'package.json')
-        
+
         try {
             await stat(packageJsonPath)
             // Found package.json, read it
             const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf-8'))
             const packageName = packageJson.name
-            
+
             if (!packageName) {
                 // No name in package.json, continue searching
                 currentDir = dirname(currentDir)
                 continue
             }
-            
+
             // Get the relative path from the package root to the file
             const relativeFromPackage = relative(currentDir, absoluteFilepath)
-            
+
             // Construct npm URI: packageName/relativePath
             return `${packageName}/${relativeFromPackage}`
         } catch (error) {
@@ -80,7 +80,7 @@ async function constructNpmUriForCache(absoluteFilepath: string, spineRoot: stri
             currentDir = parentDir
         }
     }
-    
+
     return null
 }
 
@@ -149,17 +149,17 @@ export function CapsuleModuleProjector({
                                 })
                             }
                         }
-                        
+
                         // If not found in ambient refs, try string-based mapping
                         if (mapped.length === 0 && prop.valueExpression && capsules) {
                             const mappingValue = prop.valueExpression.replace(/['"]/g, '')
-                            
+
                             // Look through all capsules to find one that matches
                             for (const [key, potentialCapsule] of Object.entries(capsules)) {
                                 if (potentialCapsule === capsule) continue
-                                
+
                                 const mappedModulePath = potentialCapsule.cst?.source?.moduleFilepath
-                                
+
                                 if (mappedModulePath && (
                                     mappedModulePath === mappingValue ||
                                     mappedModulePath.endsWith(mappingValue) ||
@@ -199,17 +199,17 @@ export function CapsuleModuleProjector({
                                             foundInAmbient = true
                                         }
                                     }
-                                    
+
                                     // If not found in ambient refs, try string-based mapping
                                     if (!foundInAmbient && nestedProp.valueExpression && capsules) {
                                         const mappingValue = nestedProp.valueExpression.replace(/['"]/g, '')
-                                        
+
                                         // Look through all capsules to find one that matches
                                         for (const [key, potentialCapsule] of Object.entries(capsules)) {
                                             if (potentialCapsule === capsule) continue
-                                            
+
                                             const mappedModulePath = potentialCapsule.cst?.source?.moduleFilepath
-                                            
+
                                             if (mappedModulePath && (
                                                 mappedModulePath === mappingValue ||
                                                 mappedModulePath.endsWith(mappingValue) ||
@@ -238,13 +238,13 @@ export function CapsuleModuleProjector({
     // Helper: Traverse CST to collect all capsule URIs from mappings and property contracts
     function collectAllCapsuleUris(capsule: any, spineContractUri: string): Set<string> {
         const uris = new Set<string>()
-        
+
         function traverseProperties(properties: any) {
             if (!properties) return
-            
+
             for (const [key, prop] of Object.entries(properties)) {
                 const propTyped = prop as any
-                
+
                 // Check for Mapping type
                 if (propTyped.type === 'CapsulePropertyTypes.Mapping') {
                     if (propTyped.valueExpression) {
@@ -255,19 +255,19 @@ export function CapsuleModuleProjector({
                         }
                     }
                 }
-                
+
                 // Recursively traverse nested properties
                 if (propTyped.properties) {
                     traverseProperties(propTyped.properties)
                 }
             }
         }
-        
+
         const spineContract = capsule.cst.spineContracts[spineContractUri]
         if (spineContract?.properties) {
             traverseProperties(spineContract.properties)
         }
-        
+
         return uris
     }
 
@@ -277,7 +277,7 @@ export function CapsuleModuleProjector({
         // Check both top-level and nested under '#' property contract
         const topLevelProps = spineContract?.properties || {}
         const nestedProps = spineContract?.properties?.['#']?.properties || {}
-        
+
         // Check for solidjs.com/standalone specifically
         for (const key of Object.keys(topLevelProps)) {
             if (key === 'solidjs.com/standalone') return true
@@ -294,7 +294,7 @@ export function CapsuleModuleProjector({
         // Check both top-level and nested under '#' property contract
         const topLevelProps = spineContract?.properties || {}
         const nestedProps = spineContract?.properties?.['#']?.properties || {}
-        
+
         // Check for exact match or with suffix
         for (const key of Object.keys(topLevelProps)) {
             if (key === 'encapsulate.dev/standalone' || key.startsWith('encapsulate.dev/standalone/')) return true
@@ -312,7 +312,7 @@ export function CapsuleModuleProjector({
         // Check nested under '#' property contract first, looking for solidjs.com/standalone
         const nestedProps = spineContract?.properties?.['#']?.properties || {}
         const topLevelProps = spineContract?.properties || {}
-        
+
         let solidjsProp = null
         for (const key of Object.keys(nestedProps)) {
             if (key === 'solidjs.com/standalone') {
@@ -372,7 +372,7 @@ export function CapsuleModuleProjector({
         // Check nested under '#' property contract first, looking for encapsulate.dev/standalone or encapsulate.dev/standalone/*
         const nestedProps = spineContract?.properties?.['#']?.properties || {}
         const topLevelProps = spineContract?.properties || {}
-        
+
         let standaloneProp = null
         for (const key of Object.keys(nestedProps)) {
             if (key === 'encapsulate.dev/standalone' || key.startsWith('encapsulate.dev/standalone/')) {
@@ -452,7 +452,7 @@ export function CapsuleModuleProjector({
         const sourceExtension = capsule.cst.source.moduleFilepath?.endsWith('.tsx') ? '.tsx' : '.ts'
 
         let projectedPath: string
-        
+
         // Use capsuleName if it exists (WITHOUT line number), otherwise use capsuleSourceUriLineRef (WITH line number)
         if (capsule.cst.source.capsuleName) {
             // Use capsuleName as the path - NO line number
@@ -490,7 +490,16 @@ export function CapsuleModuleProjector({
         }
     }
 
-    const projectCapsule = async ({ capsule, capsules, snapshotValues, spineContractUri }: { capsule: any, capsules?: Record<string, any>, snapshotValues?: any, spineContractUri: string }): Promise<boolean> => {
+    const projectCapsule = async ({ capsule, capsules, snapshotValues, spineContractUri, projectingCapsules }: { capsule: any, capsules?: Record<string, any>, snapshotValues?: any, spineContractUri: string, projectingCapsules?: Set<string> }): Promise<boolean> => {
+
+        // Check for circular dependency - if already projecting this capsule, skip
+        if (projectingCapsules) {
+            const capsuleId = capsule.cst?.capsuleSourceNameRefHash || capsule.capsuleSourceLineRef
+            if (projectingCapsules.has(capsuleId)) {
+                return true
+            }
+            projectingCapsules.add(capsuleId)
+        }
 
         timing?.record(`Projector: Start projection for ${capsule.cst.source.moduleFilepath}`)
 
@@ -580,7 +589,7 @@ export function CapsuleModuleProjector({
                                                 mappedModulePath.endsWith(mappingValue + '.tsx') ||
                                                 mappedModulePath.includes(mappingValue.replace('./', ''))
                                             )) {
-                                                await projectCapsule({ capsule: potentialMappedCapsule, capsules, snapshotValues, spineContractUri })
+                                                await projectCapsule({ capsule: potentialMappedCapsule, capsules, snapshotValues, spineContractUri, projectingCapsules })
                                             }
                                         }
                                     }
@@ -607,7 +616,7 @@ export function CapsuleModuleProjector({
         // Helper: Rewrite capsule expression to inline CST using regex
         function rewriteCapsuleExpressionWithCST(targetCapsule: any): string {
             let expression = targetCapsule.cst.source.capsuleExpression || ''
-            
+
             const cstJson = JSON.stringify(targetCapsule.cst, null, 4)
             const crtJson = JSON.stringify(targetCapsule.crt || {}, null, 4)
             const moduleFilepath = targetCapsule.cst.source.moduleFilepath
@@ -810,7 +819,7 @@ export function CapsuleModuleProjector({
             if (solidjsComponent) {
                 // Collect all capsule URIs from CST (mappings and property contracts)
                 const allCapsuleUris = collectAllCapsuleUris(capsule, spineContractUri)
-                
+
                 // Also collect from ambient references and build import paths from snapshots
                 const capsuleDeps: Array<{ uri: string, importName: string, importPath: string }> = []
                 for (const [name, ref] of Object.entries(ambientReferences)) {
@@ -819,20 +828,20 @@ export function CapsuleModuleProjector({
                         const snapshot = await buildCapsuleSnapshotForReference(refTyped, capsules, spineContractUri)
                         const capsuleName = snapshot.spineContracts?.['#@stream44.studio/encapsulate/spine-contracts/CapsuleSpineContract.v0']?.['#@stream44.studio/encapsulate/structs/Capsule.v0']?.capsuleName
                         const projectedFilepath = snapshot.spineContracts?.['#@stream44.studio/encapsulate/spine-contracts/CapsuleSpineContract.v0']?.['#@stream44.studio/encapsulate/structs/Capsule.v0']?.projectedCapsuleFilepath
-                        
+
                         if (capsuleName && projectedFilepath) {
                             allCapsuleUris.add(capsuleName)
-                            
+
                             // Build import path from projected filepath
                             const importName = `_capsule_${capsuleName.replace(/[^a-zA-Z0-9]/g, '_')}`
                             // Remove .~caps/ prefix and strip extension
                             const importPath = projectedFilepath.replace(/^\.~caps\//, '').replace(/\.(ts|tsx)$/, '')
-                            
+
                             capsuleDeps.push({ uri: capsuleName, importName, importPath })
                         }
                     }
                 }
-                
+
                 // Generate static imports for all capsule dependencies
                 // Compute relative path from projected file to .~caps directory
                 let importPrefix: string
@@ -844,15 +853,15 @@ export function CapsuleModuleProjector({
                     const relativePathToCaps = relative(projectedFileDir, capsDir)
                     importPrefix = relativePathToCaps.startsWith('.') ? relativePathToCaps : './' + relativePathToCaps
                 }
-                const capsuleImports = capsuleDeps.map(dep => 
+                const capsuleImports = capsuleDeps.map(dep =>
                     `import * as ${dep.importName} from '${importPrefix}/${dep.importPath}'`
                 ).join('\n')
-                
+
                 // Generate capsules map
                 const capsulesMapEntries = capsuleDeps.map(dep =>
                     `    '${dep.uri}': ${dep.importName}`
                 ).join(',\n')
-                
+
                 defaultExport = `
 ${capsuleImports}
 
@@ -965,10 +974,10 @@ export default function({ onMembraneEvent }: { onMembraneEvent?: (event: any) =>
         } else if (hasStandalone) {
             // Generate a wrapper function that directly invokes the standalone function
             const capsuleSourceLineRef = capsule.cst.capsuleSourceLineRef
-            
+
             // Collect all capsule URIs from CST (mappings and property contracts)
             const allCapsuleUris = collectAllCapsuleUris(capsule, spineContractUri)
-            
+
             // Also collect from ambient references
             for (const [name, ref] of Object.entries(ambientReferences)) {
                 const refTyped = ref as any
@@ -980,7 +989,7 @@ export default function({ onMembraneEvent }: { onMembraneEvent?: (event: any) =>
                     }
                 }
             }
-            
+
             // Build import paths from snapshots for ALL collected URIs
             const capsuleDeps: Array<{ uri: string, importName: string, importPath: string }> = []
             for (const uri of allCapsuleUris) {
@@ -995,22 +1004,22 @@ export default function({ onMembraneEvent }: { onMembraneEvent?: (event: any) =>
                         }
                     }
                 }
-                
+
                 if (capsuleRef) {
                     const snapshot = await buildCapsuleSnapshotForReference(capsuleRef, capsules, spineContractUri)
                     const projectedFilepath = snapshot.spineContracts?.['#@stream44.studio/encapsulate/spine-contracts/CapsuleSpineContract.v0']?.['#@stream44.studio/encapsulate/structs/Capsule.v0']?.projectedCapsuleFilepath
-                    
+
                     if (projectedFilepath) {
                         // Build import path from projected filepath
                         const importName = `_capsule_${uri.replace(/[^a-zA-Z0-9]/g, '_')}`
                         // Remove .~caps/ prefix and strip extension
                         const importPath = projectedFilepath.replace(/^\.~caps\//, '').replace(/\.(ts|tsx)$/, '')
-                        
+
                         capsuleDeps.push({ uri, importName, importPath })
                     }
                 }
             }
-            
+
             // Generate static imports for all capsule dependencies
             // Compute relative path from projected file to .~caps directory
             let importPrefix: string
@@ -1022,15 +1031,15 @@ export default function({ onMembraneEvent }: { onMembraneEvent?: (event: any) =>
                 const relativePathToCaps = relative(projectedFileDir, capsDir)
                 importPrefix = relativePathToCaps.startsWith('.') ? relativePathToCaps : './' + relativePathToCaps
             }
-            const capsuleImports = capsuleDeps.map(dep => 
+            const capsuleImports = capsuleDeps.map(dep =>
                 `import * as ${dep.importName} from '${importPrefix}/${dep.importPath}'`
             ).join('\n')
-            
+
             // Generate capsules map
             const capsulesMapEntries = capsuleDeps.map(dep =>
                 `    '${dep.uri}': ${dep.importName}`
             ).join(',\n')
-            
+
             defaultExport = `
 ${capsuleImports}
 
@@ -1116,7 +1125,7 @@ ${capsulesMapEntries}
         // Prepare literal references with proper indentation
         const indentedLiteralRefs = literalReferences ? literalReferences.split('\n').map(line => line ? `    ${line}` : '').join('\n') + '\n' : ''
         const indentedInstanceInits = instanceInitializations ? '    ' + instanceInitializations.split('\n').join('\n    ') + '\n' : ''
-        
+
         const fileContent = `${runtimeImport}${importStatements}
 ${moduleLocalFunctions}
 
@@ -1297,7 +1306,7 @@ ${defaultExport}
 
             // Add runtime imports for SolidJS and standalone functions
             const mappedRuntimeImport = mappedNeedsRuntime ? `"use client"\nimport { Spine, SpineRuntime } from '@stream44.studio/encapsulate/encapsulate'\nimport { CapsuleSpineContract } from '@stream44.studio/encapsulate/spine-contracts/CapsuleSpineContract.v0/Membrane.v0'\n${mappedSolidJsImport}` : ''
-            
+
             let mappedDefaultExport = ''
             if (mappedHasSolidJs) {
                 // Generate a wrapper that sets up runtime and exports the SolidJS component
@@ -1306,7 +1315,7 @@ ${defaultExport}
                 if (solidjsComponent) {
                     // Collect all capsule URIs from CST (mappings and property contracts)
                     const allMappedCapsuleUris = collectAllCapsuleUris(mappedCapsule, spineContractUri)
-                    
+
                     // Also collect from ambient references
                     for (const [name, ref] of Object.entries(mappedAmbientRefs)) {
                         const refTyped = ref as any
@@ -1318,7 +1327,7 @@ ${defaultExport}
                             }
                         }
                     }
-                    
+
                     // Build capsule dependencies array
                     const mappedCapsuleDeps: Array<{ uri: string, importName: string, importPath: string }> = []
                     for (const uri of allMappedCapsuleUris) {
@@ -1327,7 +1336,7 @@ ${defaultExport}
                         const importPath = uri.startsWith('@') ? uri.substring(1) : uri
                         mappedCapsuleDeps.push({ uri, importName, importPath })
                     }
-                    
+
                     // Generate static imports for all capsule dependencies
                     // Compute relative path from projected file to .~caps directory
                     let importPrefix: string
@@ -1339,15 +1348,15 @@ ${defaultExport}
                         const relativePathToCaps = relative(projectedFileDir, capsDir)
                         importPrefix = relativePathToCaps.startsWith('.') ? relativePathToCaps : './' + relativePathToCaps
                     }
-                    const mappedCapsuleImports = mappedCapsuleDeps.map(dep => 
+                    const mappedCapsuleImports = mappedCapsuleDeps.map(dep =>
                         `import * as ${dep.importName} from '${importPrefix}/${dep.importPath}'`
                     ).join('\n')
-                    
+
                     // Generate capsules map
                     const mappedCapsulesMapEntries = mappedCapsuleDeps.map(dep =>
                         `    '${dep.uri}': ${dep.importName}`
                     ).join(',\n')
-                    
+
                     mappedDefaultExport = `
 ${mappedCapsuleImports}
 
@@ -1457,10 +1466,10 @@ export default function({ onMembraneEvent }: { onMembraneEvent?: (event: any) =>
             } else if (mappedHasStandalone) {
                 // Generate a wrapper function that directly invokes the standalone function
                 const mappedCapsuleSourceLineRef = mappedCapsule.cst.capsuleSourceLineRef
-                
+
                 // Collect all capsule URIs from CST (mappings and property contracts)
                 const allMappedCapsuleUris = collectAllCapsuleUris(mappedCapsule, spineContractUri)
-                
+
                 // Also collect from ambient references
                 for (const [name, ref] of Object.entries(mappedAmbientRefs)) {
                     const refTyped = ref as any
@@ -1472,7 +1481,7 @@ export default function({ onMembraneEvent }: { onMembraneEvent?: (event: any) =>
                         }
                     }
                 }
-                
+
                 // Build capsule dependencies array
                 const mappedCapsuleDeps: Array<{ uri: string, importName: string, importPath: string }> = []
                 for (const uri of allMappedCapsuleUris) {
@@ -1481,7 +1490,7 @@ export default function({ onMembraneEvent }: { onMembraneEvent?: (event: any) =>
                     const importPath = uri.startsWith('@') ? uri.substring(1) : uri
                     mappedCapsuleDeps.push({ uri, importName, importPath })
                 }
-                
+
                 // Generate static imports for all capsule dependencies
                 // Compute relative path from projected file to .~caps directory
                 let importPrefix: string
@@ -1493,15 +1502,15 @@ export default function({ onMembraneEvent }: { onMembraneEvent?: (event: any) =>
                     const relativePathToCaps = relative(projectedFileDir, capsDir)
                     importPrefix = relativePathToCaps.startsWith('.') ? relativePathToCaps : './' + relativePathToCaps
                 }
-                const mappedCapsuleImports = mappedCapsuleDeps.map(dep => 
+                const mappedCapsuleImports = mappedCapsuleDeps.map(dep =>
                     `import * as ${dep.importName} from '${importPrefix}/${dep.importPath}'`
                 ).join('\n')
-                
+
                 // Generate capsules map
                 const mappedCapsulesMapEntries = mappedCapsuleDeps.map(dep =>
                     `    '${dep.uri}': ${dep.importName}`
                 ).join(',\n')
-                
+
                 mappedDefaultExport = `
 ${mappedCapsuleImports}
 
@@ -1627,7 +1636,7 @@ ${mappedDefaultExport}
                 if (registryCapsule === capsule) {
                     continue
                 }
-                
+
                 // Skip if this capsule doesn't have the required CST structure
                 if (!registryCapsule.cst?.source?.moduleFilepath || !registryCapsule.cst?.source?.importStackLine) {
                     continue
@@ -1645,16 +1654,16 @@ ${mappedDefaultExport}
                         snapshotData: await buildCapsuleSnapshotForReference({ value: registryCapsule.cst }, capsules, spineContractUri)
                     }
                     await projectionCacheStore.writeFile(capsuleCacheFilename, JSON.stringify(capsuleCacheData, null, 2))
-                    
+
                     // Also project the capsule to .~caps
                     const projectedPath = capsuleCacheData.snapshotData.spineContracts[spineContractUri]['#@stream44.studio/encapsulate/structs/Capsule.v0'].projectedCapsuleFilepath
-                    
+
                     // Generate the capsule file content with proper imports and ambient reference loading
                     const capsuleExpression = rewriteCapsuleExpressionWithCST(registryCapsule)
-                    
+
                     // Get ambient references for this capsule
                     const capsuleAmbientRefs = registryCapsule.cst.source?.ambientReferences || {}
-                    
+
                     // Generate literal references
                     const capsuleLiteralRefs = Object.entries(capsuleAmbientRefs)
                         .map(([name, ref]: [string, any]) => {
@@ -1665,7 +1674,7 @@ ${mappedDefaultExport}
                         })
                         .filter(Boolean)
                         .join('\n')
-                    
+
                     // Generate instance initializations for ambient references
                     const capsuleInstanceInitPromises = Object.entries(capsuleAmbientRefs)
                         .map(async ([name, ref]: [string, any]) => {
@@ -1678,26 +1687,26 @@ ${mappedDefaultExport}
                     const capsuleInstanceInits = (await Promise.all(capsuleInstanceInitPromises))
                         .filter(Boolean)
                         .join('\n    ')
-                    
+
                     // Add necessary imports
                     const imports = `import { CapsulePropertyTypes } from '@stream44.studio/encapsulate/encapsulate'
 import { makeImportStack } from '@stream44.studio/encapsulate/encapsulate'
 `
-                    
+
                     // Get the capsule name for the assignment
                     const capsuleName = registryCapsule.cst.source.capsuleName || ''
-                    
+
                     // Combine literal refs and instance inits with proper indentation
                     const indentedLiterals = capsuleLiteralRefs ? capsuleLiteralRefs.split('\n').map(line => `    ${line}`).join('\n') + '\n' : ''
                     const indentedInits = capsuleInstanceInits ? '    ' + capsuleInstanceInits + '\n' : ''
-                    
+
                     const capsuleFileContent = `${imports}
 export async function capsule({ encapsulate, loadCapsule }: { encapsulate: any, loadCapsule: any }) {
 ${indentedLiterals}${indentedInits}    return ${capsuleExpression}
 }
 capsule['#'] = ${JSON.stringify(capsuleName)}
 `
-                    
+
                     if (projectionStore) {
                         await projectionStore.writeFile(projectedPath, capsuleFileContent)
                     }