fetch __dirname dynamically

Author: charleslien

packages/code-map/src/init-node.ts

@@ -1,18 +1,19 @@
-import * as path from 'path'
 import * as fs from 'fs'
-import { Parser } from 'web-tree-sitter'
+import * as path from 'path'
 import { fileURLToPath } from 'url'
 
+import { Parser } from 'web-tree-sitter'
+
+import { getDirnameDynamically } from './utils'
+
 /**
  * Helper function to get the current directory path that works in both ESM and CJS
- * Uses dynamic evaluation to prevent bundlers from inlining absolute paths
+ * Uses runtime-only approach to prevent bundlers from inlining absolute paths
  */
 function hereDir() {
-  // In CJS, __dirname is available - use indirect eval to prevent inlining
-  if (typeof __dirname !== 'undefined') {
-    // Use a trick to get __dirname dynamically without bundler inlining it
-    // This works because bundlers won't inline values from Function constructor
-    return new Function('return __dirname')()
+  const dirname = getDirnameDynamically()
+  if (typeof dirname !== 'undefined') {
+    return dirname
   }
 
   // For ESM builds, use import.meta.url

packages/code-map/src/languages.ts

@@ -1,10 +1,12 @@
-import * as path from 'path'
 import * as fs from 'fs'
+import * as path from 'path'
 
 // Import some types for wasm & .scm files
 import './types'
 
 import { Language, Parser, Query } from 'web-tree-sitter'
+
+import { initTreeSitterForNode } from './init-node'
 import { DEBUG_PARSING } from './parse'
 
 /* ------------------------------------------------------------------ */
@@ -19,6 +21,7 @@ import pythonQuery from './tree-sitter-queries/tree-sitter-python-tags.scm'
 import rubyQuery from './tree-sitter-queries/tree-sitter-ruby-tags.scm'
 import rustQuery from './tree-sitter-queries/tree-sitter-rust-tags.scm'
 import typescriptQuery from './tree-sitter-queries/tree-sitter-typescript-tags.scm'
+import { getDirnameDynamically } from './utils'
 
 /* ------------------------------------------------------------------ */
 /* 2. Types and interfaces                                           */
@@ -150,8 +153,9 @@ function resolveWasmPath(wasmFileName: string): string {
 
   // Get the directory of this module
   const moduleDir = (() => {
-    if (typeof __dirname !== 'undefined') {
-      return __dirname
+    const dirname = getDirnameDynamically()
+    if (typeof dirname !== 'undefined') {
+      return dirname
     }
     // For ESM builds, we can't reliably get the module directory in all environments
     // So we fall back to process.cwd() which works for our use case
@@ -199,7 +203,6 @@ function tryResolveFromPackage(wasmFileName: string): string | null {
 /* 7. One-time library init                                          */
 /* ------------------------------------------------------------------ */
 // Initialize tree-sitter with Node.js-specific configuration
-import { initTreeSitterForNode } from './init-node'
 
 /* ------------------------------------------------------------------ */
 /* 8. Unified runtime loader                                         */

packages/code-map/src/utils.ts

@@ -0,0 +1,3 @@
+export function getDirnameDynamically(): string {
+  return new Function('return __dirname')()
+}

sdk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codebuff/sdk",
   "private": false,
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "Official SDK for Codebuff — AI coding agent & framework",
   "license": "Apache-2.0",
   "type": "module",

sdk/src/native/ripgrep.ts

@@ -1,5 +1,5 @@
-import { join, dirname } from 'path'
 import { existsSync } from 'fs'
+import { join, dirname } from 'path'
 import { fileURLToPath } from 'url'
 
 /**
@@ -16,7 +16,7 @@ export function getBundledRgPath(importMetaUrl?: string): string {
   // Determine platform-specific directory name
   const platform = process.platform
   const arch = process.arch
-  
+
   let platformDir: string
   if (platform === 'win32' && arch === 'x64') {
     platformDir = 'x64-win32'
@@ -33,47 +33,74 @@ export function getBundledRgPath(importMetaUrl?: string): string {
   }
 
   const binaryName = platform === 'win32' ? 'rg.exe' : 'rg'
-  
+
   // Try to find the bundled binary relative to this module
   let vendorPath: string | undefined
-  
+
   if (importMetaUrl) {
     // ESM context - use import.meta.url to find relative path
     const currentFile = fileURLToPath(importMetaUrl)
     const currentDir = dirname(currentFile)
-    
+
     // Try relative to current file (development - from src/native/ripgrep.ts to vendor/)
-    const devPath = join(currentDir, '..', '..', 'vendor', 'ripgrep', platformDir, binaryName)
+    const devPath = join(
+      currentDir,
+      '..',
+      '..',
+      'vendor',
+      'ripgrep',
+      platformDir,
+      binaryName,
+    )
     if (existsSync(devPath)) {
       vendorPath = devPath
     }
   }
-  
+
   // If not found via importMetaUrl, try CJS approach or other methods
   if (!vendorPath) {
     // Try from __dirname if available (CJS context)
-    if (typeof __dirname !== 'undefined') {
-      const cjsPath = join(__dirname, '..', '..', 'vendor', 'ripgrep', platformDir, binaryName)
+    const dirname = new Function('return __dirname')()
+    if (typeof dirname !== 'undefined') {
+      const cjsPath = join(
+        dirname,
+        '..',
+        '..',
+        'vendor',
+        'ripgrep',
+        platformDir,
+        binaryName,
+      )
       if (existsSync(cjsPath)) {
         vendorPath = cjsPath
       }
     }
   }
-  
+
   if (vendorPath && existsSync(vendorPath)) {
     return vendorPath
   }
-  
+
   // Fallback: try to find in dist/vendor (for published package)
-  const distVendorPath = join(process.cwd(), 'node_modules', '@codebuff', 'sdk', 'dist', 'vendor', 'ripgrep', platformDir, binaryName)
+  const distVendorPath = join(
+    process.cwd(),
+    'node_modules',
+    '@codebuff',
+    'sdk',
+    'dist',
+    'vendor',
+    'ripgrep',
+    platformDir,
+    binaryName,
+  )
   if (existsSync(distVendorPath)) {
     return distVendorPath
   }
-  
+
   // No fallback available - bundled binaries are required
   throw new Error(
     `Ripgrep binary not found for ${platform}-${arch}. ` +
-    `Expected at: ${vendorPath} or ${distVendorPath}. ` +
-    `Please run 'npm run fetch-ripgrep' or set CODEBUFF_RG_PATH environment variable.`
+      `Expected at: ${vendorPath} or ${distVendorPath}. ` +
+      `Please run 'npm run fetch-ripgrep' or set CODEBUFF_RG_PATH environment variable.`,
   )
 }