@stream44.studio/encapsulate 0.4.0-rc.18 → 0.4.0-rc.19

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stream44.studio/encapsulate",
-    "version": "0.4.0-rc.18",
+    "version": "0.4.0-rc.19",
     "license": "MIT",
     "repository": {
         "type": "git",

package/src/encapsulate.ts

@@ -1,7 +1,7 @@
 
 // CACHE_BUST_VERSION: Increment this whenever CST cache must be invalidated due to structural changes
 // This ensures projected capsules are regenerated when the CST format changes
-const CACHE_BUST_VERSION = 9
+const CACHE_BUST_VERSION = 11
 
 type TSpineOptions = {
     spineFilesystemRoot?: string,

package/src/static-analyzer.v0.ts

@@ -930,6 +930,10 @@ function extractModuleLocalCode(
         // Check if this identifier refers to a module-local variable
         const varDecl = moduleLocalVariables.get(name)
         if (varDecl) {
+            // If already classified as 'literal' with a value, keep it — don't reclassify
+            if (refTyped.type === 'literal' && refTyped.value !== undefined) {
+                continue
+            }
             // Analyze the variable to see if it's self-contained
             const varDependencies = analyzeVariableDependencies(varDecl, sourceFile, importMap, assignmentMap, moduleLocalFunctions, moduleLocalVariables)
             if (varDependencies.isContained) {
@@ -1583,9 +1587,20 @@ function extractCapsuleAmbientReferences(
                         }
                     }
 
-                    // Check if it's a module-local variable (const/let/var at module level)
+                    // Check if it's a module-local variable (const/let/var at module level or enclosing block)
                     const varDecl = moduleLocalVariables.get(identifierName)
                     if (varDecl) {
+                        // If the runtime value is provided as a literal ambient reference,
+                        // prefer 'literal' classification over 'module-local'.
+                        // A `const x = 'foo'` in an enclosing block is semantically a literal.
+                        if (runtimeAmbientRefs && identifierName in runtimeAmbientRefs) {
+                            const value = runtimeAmbientRefs[identifierName]
+                            if (isLiteralType(value)) {
+                                ambientRefs[identifierName] = { type: 'literal', value }
+                                return
+                            }
+                        }
+
                         // Analyze the variable's initializer for dependencies
                         const varDependencies = analyzeVariableDependencies(varDecl, sourceFile, importMap, assignmentMap, moduleLocalFunctions, moduleLocalVariables)
 
@@ -1937,6 +1952,17 @@ function extractAndValidateAmbientReferences(
                     // Check if it's a module-local variable (const/let/var at module level)
                     const varDecl = moduleLocalVariables.get(identifierName)
                     if (varDecl) {
+                        // If the runtime value is provided as a literal ambient reference,
+                        // prefer 'literal' classification over 'module-local'.
+                        // A `const x = 'foo'` in an enclosing block is semantically a literal.
+                        if (runtimeAmbientRefs && identifierName in runtimeAmbientRefs) {
+                            const value = runtimeAmbientRefs[identifierName]
+                            if (isLiteralType(value)) {
+                                ambientRefs[identifierName] = { type: 'literal', value }
+                                return
+                            }
+                        }
+
                         // Analyze the variable's initializer for dependencies
                         const varDependencies = analyzeVariableDependencies(varDecl, sourceFile, importMap, assignmentMap, moduleLocalFunctions, moduleLocalVariables)