chore: update protv2 proto-ts generated folder structure

Author: ThomasRalee

pnpm-lock.yaml

@@ -75,7 +75,7 @@ npm run generate:skip-clone  # Quick regeneration
 ### 4. Build
 
 ```bash
-npm run build  # Builds to proto-ts/esm/
+pnpm run build  # Builds to proto-ts/
 ```
 
 ## Directory Structure
@@ -89,7 +89,7 @@ protoV2/
 │   ├── src/
 │   │   ├── index.template.ts     # Template for exports (manual)
 │   │   └── generated/            # Generated proto files
-│   ├── proto-ts/esm/             # Built output
+│   ├── proto-ts/                 # Built output
 │   ├── gen.sh                    # Generation script
 │   └── tsup.config.ts            # Build configuration
 ├── indexer/

protoV2/README.md

@@ -24,9 +24,9 @@ function findJsFiles(dir) {
   return results
 }
 
-// Find all .js files in proto-ts/esm
-const esmDir = join(__dirname, 'proto-ts/esm')
-const files = findJsFiles(esmDir)
+// Find all .js files in proto-ts
+const outDir = join(__dirname, 'proto-ts')
+const files = findJsFiles(outDir)
 
 console.log(`Found ${files.length} .js files to process`)
 

protoV2/abacus/fix-imports.mjs

@@ -87,4 +87,4 @@ cp ./package.json.template ./proto-ts/package.json
 echo ""
 echo "✅ Generation complete!"
 echo "📦 Generated files: src/generated/"
-echo "📦 Built files: proto-ts/esm/"
+echo "📦 Built files: proto-ts/"

protoV2/abacus/gen.sh

@@ -1,38 +1,40 @@
 #!/usr/bin/env node
-import { readdirSync, statSync, copyFileSync, mkdirSync } from 'fs';
-import { join, dirname, relative } from 'path';
+import { readdirSync, statSync, copyFileSync, mkdirSync } from 'fs'
+import { join, relative } from 'path'
 
-console.log('Generating .d.ts files...');
+console.log('Generating .d.ts files...')
 
 // Simply copy the .ts files as .d.ts files
 // Since protobuf-ts generates type-safe code, the .ts files ARE the type definitions
 function copyAsDts(srcDir, outDir) {
   function traverse(currentSrcDir, currentOutDir) {
-    const files = readdirSync(currentSrcDir);
+    const files = readdirSync(currentSrcDir)
 
     for (const file of files) {
-      const srcPath = join(currentSrcDir, file);
-      const stat = statSync(srcPath);
+      const srcPath = join(currentSrcDir, file)
+      const stat = statSync(srcPath)
 
       if (stat.isDirectory()) {
-        const newOutDir = join(currentOutDir, file);
-        mkdirSync(newOutDir, { recursive: true });
-        traverse(srcPath, newOutDir);
+        const newOutDir = join(currentOutDir, file)
+        mkdirSync(newOutDir, { recursive: true })
+        traverse(srcPath, newOutDir)
       } else if (file.endsWith('.ts') && !file.endsWith('.d.ts')) {
-        const dtsFile = file.replace(/\.ts$/, '.d.ts');
-        const outPath = join(currentOutDir, dtsFile);
-        
-        console.log(`Copying ${relative('src', srcPath)} -> ${relative('proto-ts/esm', outPath)}`);
-        copyFileSync(srcPath, outPath);
+        const dtsFile = file.replace(/\.ts$/, '.d.ts')
+        const outPath = join(currentOutDir, dtsFile)
+
+        console.log(
+          `Copying ${relative('src', srcPath)} -> ${relative('proto-ts', outPath)}`,
+        )
+        copyFileSync(srcPath, outPath)
       }
     }
   }
 
-  traverse(srcDir, outDir);
+  traverse(srcDir, outDir)
 }
 
 // Copy src files as .d.ts
-copyAsDts('src/generated', 'proto-ts/esm/generated');
-copyFileSync('src/index.ts', 'proto-ts/esm/index.d.ts');
+copyAsDts('src/generated', 'proto-ts/generated')
+copyFileSync('src/index.ts', 'proto-ts/index.d.ts')
 
-console.log('✅ .d.ts files generated successfully!');
+console.log('✅ .d.ts files generated successfully!')

protoV2/abacus/generate-dts.mjs

@@ -2,23 +2,25 @@
   "name": "@injectivelabs/abacus-proto-ts-v2",
   "version": "1.0.0",
   "type": "module",
-  "main": "./esm/index.js",
-  "types": "./esm/index.d.ts",
+  "main": "./index.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
-      "types": "./esm/index.d.ts",
-      "import": "./esm/index.js",
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "import": "./index.js",
+      "default": "./index.js"
     },
     "./generated/*": {
-      "types": "./esm/generated/*.d.ts",
-      "import": "./esm/generated/*.js",
-      "default": "./esm/generated/*.js"
+      "types": "./generated/*.d.ts",
+      "import": "./generated/*.js",
+      "default": "./generated/*.js"
     },
-    "./generated/*.js": "./esm/generated/*.js"
+    "./generated/*.js": "./generated/*.js"
   },
   "files": [
-    "esm"
+    "index.js",
+    "index.d.ts",
+    "generated"
   ],
   "sideEffects": false,
   "license": "Apache-2.0",

protoV2/abacus/package.json.template

@@ -45,7 +45,7 @@ export default defineConfig(() => {
   return [
     {
       entry: entries,
-      outDir: 'proto-ts/esm',
+      outDir: 'proto-ts',
       format: ['esm'],
       dts: false, // Disable DTS generation in tsup (use generate-dts.mjs instead)
       sourcemap: false,

protoV2/abacus/tsup.config.js

@@ -24,9 +24,9 @@ function findJsFiles(dir) {
   return results
 }
 
-// Find all .js files in proto-ts/esm
-const esmDir = join(__dirname, 'proto-ts/esm')
-const files = findJsFiles(esmDir)
+// Find all .js files in proto-ts
+const outDir = join(__dirname, 'proto-ts')
+const files = findJsFiles(outDir)
 
 console.log(`Found ${files.length} .js files to process`)
 

protoV2/abacus/tsup.config.ts

@@ -173,7 +173,7 @@ if [ "$SKIP_CLONE" = true ]; then
   echo "📝 Updated: index.ts and tsup.config.ts (proto generation was skipped)"
 else
   echo "📦 Generated files: src/generated/"
-  echo "📦 Built files: proto-ts/esm/"
+  echo "📦 Built files: proto-ts/"
 fi
 if [ "$PERSIST" = true ]; then
   echo "💾 Temporary directories preserved in proto/gen and proto/proto"