fix: code rabbit review

Author: ThomasRalee

pnpm-lock.yaml

@@ -83,6 +83,9 @@ pnpm run build  # Builds to proto-ts/
 ```
 protoV2/
 ├── _scripts/
+│   ├── generate-dts.mjs          # Shared: Generate .d.ts files
+│   ├── fix-imports.mjs           # Shared: Fix ESM import extensions
+│   ├── tsup-base.config.mjs      # Shared: Base tsup configuration
 │   ├── update-index-template.sh  # Auto-generate index templates
 │   └── README.md                 # Script documentation
 ├── core/
@@ -91,7 +94,7 @@ protoV2/
 │   │   └── generated/            # Generated proto files
 │   ├── proto-ts/                 # Built output
 │   ├── gen.sh                    # Generation script
-│   └── tsup.config.ts            # Build configuration
+│   └── tsup.config.ts            # Build configuration (uses shared base)
 ├── indexer/
 │   ├── src/
 │   │   ├── index.template.ts     # Template for exports (auto-gen)

protoV2/README.md

@@ -1,9 +1,12 @@
 #!/usr/bin/env node
+/**
+ * Shared script to fix ESM imports by adding .js extensions.
+ * Usage: node ../_scripts/fix-imports.mjs
+ *
+ * Must be run from a package directory (e.g., protoV2/core/)
+ */
 import { readFileSync, writeFileSync, readdirSync, statSync } from 'fs'
-import { join, dirname } from 'path'
-import { fileURLToPath } from 'url'
-
-const __dirname = dirname(fileURLToPath(import.meta.url))
+import { join } from 'path'
 
 // Recursively find all .js files
 function findJsFiles(dir) {
@@ -24,8 +27,8 @@ function findJsFiles(dir) {
   return results
 }
 
-// Find all .js files in proto-ts
-const outDir = join(__dirname, 'proto-ts')
+// Find all .js files in proto-ts (relative to cwd)
+const outDir = join(process.cwd(), 'proto-ts')
 const files = findJsFiles(outDir)
 
 console.log(`Found ${files.length} .js files to process`)
@@ -60,7 +63,7 @@ files.forEach((fullPath) => {
 
   if (fileReplacements > 0) {
     writeFileSync(fullPath, newContent, 'utf8')
-    const relativePath = fullPath.replace(__dirname + '/', '')
+    const relativePath = fullPath.replace(process.cwd() + '/', '')
     console.log(`  ✓ ${relativePath}: ${fileReplacements} imports fixed`)
     totalReplacements += fileReplacements
   }

protoV2/abacus/fix-imports.mjs protoV2/_scripts/fix-imports.mjsprotoV2/abacus/fix-imports.mjs renamed to protoV2/_scripts/fix-imports.mjs

@@ -1,4 +1,10 @@
 #!/usr/bin/env node
+/**
+ * Shared script to generate .d.ts files for proto packages.
+ * Usage: node ../_scripts/generate-dts.mjs
+ *
+ * Must be run from a package directory (e.g., protoV2/core/)
+ */
 import { readdirSync, statSync, copyFileSync, mkdirSync } from 'fs'
 import { join, relative } from 'path'
 

protoV2/indexer/generate-dts.mjs protoV2/_scripts/generate-dts.mjsprotoV2/indexer/generate-dts.mjs renamed to protoV2/_scripts/generate-dts.mjs

@@ -0,0 +1,74 @@
+import path from 'path'
+import { readdirSync, statSync } from 'fs'
+
+/**
+ * Recursively find all TypeScript files in a directory.
+ * @param {string} dir - Directory to search
+ * @returns {string[]} Array of file paths
+ */
+export function findFiles(dir) {
+  const result = []
+
+  function traverse(currentDir) {
+    const files = readdirSync(currentDir)
+
+    for (const file of files) {
+      const fullPath = path.join(currentDir, file)
+      const stat = statSync(fullPath)
+
+      if (stat.isDirectory()) {
+        traverse(fullPath)
+      } else if (
+        file.endsWith('.ts') &&
+        !file.endsWith('.d.ts') &&
+        !file.endsWith('.spec.ts')
+      ) {
+        result.push(fullPath)
+      }
+    }
+  }
+
+  traverse(dir)
+  return result
+}
+
+/**
+ * Create tsup configuration for proto packages.
+ * All proto packages share the same build configuration.
+ * @returns {import('tsup').Options[]}
+ */
+export function createProtoTsupConfig() {
+  // Automatically find all generated files
+  const generatedFiles = findFiles('src/generated')
+
+  const entries = {
+    index: 'src/index.ts',
+  }
+
+  // Add all generated files as entry points
+  generatedFiles.forEach((file) => {
+    const key = path.relative('src', file).replace(/\.ts$/, '')
+    entries[key] = file
+  })
+
+  return [
+    {
+      entry: entries,
+      outDir: 'proto-ts',
+      format: ['esm'],
+      dts: false, // Disable DTS generation in tsup (too slow/memory intensive)
+      sourcemap: false,
+      clean: true,
+      splitting: false,
+      treeshake: false,
+      minify: false,
+      bundle: false,
+      outExtension: () => ({ js: '.js' }),
+      external: [
+        '@protobuf-ts/runtime',
+        '@protobuf-ts/runtime-rpc',
+        '@protobuf-ts/grpcweb-transport',
+      ],
+    },
+  ]
+}

protoV2/_scripts/tsup-base.config.mjs

@@ -4,8 +4,8 @@
     "generate": "sh ./gen.sh",
     "generate:persist": "sh ./gen.sh --persist",
     "generate:skip-clone": "sh ./gen.sh --skip-clone",
-    "build": "tsup && node generate-dts.mjs && node fix-imports.mjs",
-    "build:esm": "tsup --format esm && node generate-dts.mjs && node fix-imports.mjs",
+    "build": "tsup && node ../_scripts/generate-dts.mjs && node ../_scripts/fix-imports.mjs",
+    "build:esm": "tsup --format esm && node ../_scripts/generate-dts.mjs && node ../_scripts/fix-imports.mjs",
     "build:cjs": "tsup --format cjs"
   },
   "devDependencies": {

protoV2/abacus/generate-dts.mjs

@@ -1,65 +1,4 @@
-import path from 'path'
 import { defineConfig } from 'tsup'
-import { readdirSync, statSync } from 'fs'
+import { createProtoTsupConfig } from '../_scripts/tsup-base.config.mjs'
 
-function findFiles(dir: string): string[] {
-  const result: string[] = []
-
-  function traverse(currentDir: string) {
-    const files = readdirSync(currentDir)
-
-    for (const file of files) {
-      const fullPath = path.join(currentDir, file)
-      const stat = statSync(fullPath)
-
-      if (stat.isDirectory()) {
-        traverse(fullPath)
-      } else if (
-        file.endsWith('.ts') &&
-        !file.endsWith('.d.ts') &&
-        !file.endsWith('.spec.ts')
-      ) {
-        result.push(fullPath)
-      }
-    }
-  }
-
-  traverse(dir)
-  return result
-}
-
-export default defineConfig(() => {
-  // Automatically find all generated files
-  const generatedFiles = findFiles('src/generated')
-
-  const entries: Record<string, string> = {
-    index: 'src/index.ts',
-  }
-
-  // Add all generated files as entry points
-  generatedFiles.forEach((file: string) => {
-    const key = path.relative('src', file).replace(/\.ts$/, '')
-    entries[key] = file
-  })
-
-  return [
-    {
-      entry: entries,
-      outDir: 'proto-ts',
-      format: ['esm'],
-      dts: false, // Disable DTS generation in tsup (use generate-dts.mjs instead)
-      sourcemap: false,
-      clean: true,
-      splitting: false,
-      treeshake: false,
-      minify: false,
-      bundle: false,
-      outExtension: () => ({ js: '.js' }),
-      external: [
-        '@protobuf-ts/runtime',
-        '@protobuf-ts/runtime-rpc',
-        '@protobuf-ts/grpcweb-transport',
-      ],
-    },
-  ]
-})
+export default defineConfig(createProtoTsupConfig)