@stream44.studio/encapsulate 0.4.0-rc.21 → 0.4.0-rc.23

package/package.json

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

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

@@ -28,12 +28,16 @@ function safeCapsuleName(name: string) {
  * @returns The cache file path to use
  */
 async function constructCacheFilePath(moduleFilepath: string, importStackLine: number, spineFilesystemRoot: string): Promise<string> {
-    if (moduleFilepath.startsWith('../')) {
-        // External module - construct npm URI
+    const isExternal = moduleFilepath.startsWith('../')
+    const hasNodeModules = moduleFilepath.includes('node_modules/')
+
+    if (isExternal || hasNodeModules) {
+        // External module or node_modules path - construct npm URI
         const absoluteFilepath = join(spineFilesystemRoot, moduleFilepath)
         const npmUri = await constructNpmUriForCache(absoluteFilepath, spineFilesystemRoot)
         if (npmUri) {
-            return `${npmUri}:${importStackLine}`
+            // Prefix with o/npmjs.com/node_modules/ for external modules
+            return `o/npmjs.com/node_modules/${npmUri}:${importStackLine}`
         }
         // Fallback to normalized path
         return `${normalize(moduleFilepath).replace(/^\.\.\//, '').replace(/\.\.\//g, '')}:${importStackLine}`
@@ -43,10 +47,20 @@ async function constructCacheFilePath(moduleFilepath: string, importStackLine: n
 }
 
 /**
- * Finds the nearest package.json and constructs an npm URI for cache files
+ * Finds the nearest package.json and constructs an npm URI for cache files.
+ * First checks if the path contains /node_modules/ and if so, extracts the portion
+ * after the last /node_modules/ occurrence for consistent paths in dev and installed mode.
  * This matches the logic from static-analyzer.v0.ts
  */
 async function constructNpmUriForCache(absoluteFilepath: string, spineRoot: string): Promise<string | null> {
+    // Check for /node_modules/ in the path — use the last occurrence to handle nested node_modules
+    const nodeModulesMarker = '/node_modules/'
+    const lastIdx = absoluteFilepath.lastIndexOf(nodeModulesMarker)
+    if (lastIdx !== -1) {
+        // Extract everything after the last /node_modules/
+        return absoluteFilepath.substring(lastIdx + nodeModulesMarker.length)
+    }
+
     let currentDir = dirname(absoluteFilepath)
     const maxDepth = 20 // Prevent infinite loops
 

package/src/static-analyzer.v0.ts

@@ -14,12 +14,22 @@ const ENCAPSULATE_MODULE_EXPORTS = new Set([
 ])
 
 /**
- * Finds the nearest package.json and constructs an npm URI for the given filepath
+ * Finds the nearest package.json and constructs an npm URI for the given filepath.
+ * First checks if the path contains /node_modules/ and if so, extracts the portion
+ * after the last /node_modules/ occurrence for consistent paths in dev and installed mode.
  * @param absoluteFilepath - The absolute path to the file
  * @param spineRoot - The spine filesystem root
  * @returns The npm URI (e.g., '@scope/package/path/to/file.ts') or null if not found
  */
 async function constructNpmUri(absoluteFilepath: string, spineRoot: string): Promise<string | null> {
+    // Check for /node_modules/ in the path — use the last occurrence to handle nested node_modules
+    const nodeModulesMarker = '/node_modules/'
+    const lastIdx = absoluteFilepath.lastIndexOf(nodeModulesMarker)
+    if (lastIdx !== -1) {
+        // Extract everything after the last /node_modules/
+        return absoluteFilepath.substring(lastIdx + nodeModulesMarker.length)
+    }
+
     let currentDir = dirname(absoluteFilepath)
     const maxDepth = 20 // Prevent infinite loops
 
@@ -57,6 +67,13 @@ async function constructNpmUri(absoluteFilepath: string, spineRoot: string): Pro
     return null
 }
 
+/**
+ * Checks if a filepath was resolved via node_modules
+ */
+function isFromNodeModules(absoluteFilepath: string): boolean {
+    return absoluteFilepath.includes('/node_modules/')
+}
+
 // Native JavaScript APIs that don't require explicit ambient reference declaration
 // These are module-global builtins available in all JavaScript runtimes
 const MODULE_GLOBAL_BUILTINS = new Set([
@@ -224,11 +241,15 @@ export function StaticAnalyzer({
 
             // Determine the cache file path based on whether the module is external or internal
             let cacheFilePath: string
-            if (encapsulateOptions.moduleFilepath.startsWith('../')) {
-                // External module - construct npm URI
+            const isExternal = encapsulateOptions.moduleFilepath.startsWith('../')
+            const hasNodeModules = encapsulateOptions.moduleFilepath.includes('node_modules/')
+
+            if (isExternal || hasNodeModules) {
+                // External module or node_modules path - construct npm URI
                 const npmUri = await constructNpmUri(moduleFilepath, spineOptions.spineFilesystemRoot)
                 if (npmUri) {
-                    cacheFilePath = npmUri
+                    // Prefix with o/npmjs.com/node_modules/ for external modules
+                    cacheFilePath = `o/npmjs.com/node_modules/${npmUri}`
                 } else {
                     // Fallback to normalized path if npm URI construction fails
                     cacheFilePath = normalize(encapsulateOptions.moduleFilepath).replace(/^\.\.\//, '').replace(/\.\.\//g, '')

package/tsconfig.json

@@ -1,5 +1,4 @@
 {
-    "extends": "../../../tsconfig.paths.json",
     "compilerOptions": {
         "target": "ES2020",
         "module": "esnext",
@@ -27,4 +26,4 @@
     "exclude": [
         "node_modules"
     ]
-}
+}