Try ts-proto

Author: Hilzu

.github/workflows/build-and-test.yml

@@ -31,6 +31,10 @@ jobs:
         with:
           version: "3.1.45"
           actions-cache-folder: "emsdk-cache"
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v2
+        with:
+          version: "24.x"
       - run: npm ci
       - name: Cache libpg_query build
         uses: actions/cache@v3

package-lock.json

@@ -38,10 +38,11 @@
     "build": "npm run build:libpg_query && npm run build:wasm && npm run build:protobuf && npm run build:ts",
     "build:clean": "npm run clean && npm run build",
     "build:libpg_query": "(cd libpg_query && sed -i.bak 's/AR = ar rs/AR = emar rs/' Makefile && emmake make build)",
-    "build:protobuf": "cp libpg_query/protobuf/pg_query.proto dist/ && npm run build:protobuf:js && npm run build:protobuf:js:post && npm run build:protobuf:ts",
+    "build:protobuf": "npm run build:protobuf:copy && npm run build:protobuf:ts",
+    "build:protobuf:copy": "cp libpg_query/protobuf/pg_query.proto dist/",
     "build:protobuf:js": "pbjs -t static-module -w es6 -o dist/pg_query.js dist/pg_query.proto",
     "build:protobuf:js:post": "sed -i.bak 's|^import.*|import $protobuf from \"protobufjs/minimal.js\"|' dist/pg_query.js && rm -f dist/pg_query.js.bak",
-    "build:protobuf:ts": "pbts -o dist/pg_query.d.ts dist/pg_query.js",
+    "build:protobuf:ts": "protoc --plugin ../../node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./src/ts-proto --ts_proto_opt=esModuleInterop=true --ts_proto_opt=importSuffix=.js -I dist pg_query.proto",
     "build:ts": "tsc",
     "build:wasm": "npm run emcc -- -o dist/bindings.mjs",
     "clean": "npm run clean:package && npm run clean:libpg_query",
@@ -56,6 +57,7 @@
     "protobufjs": "~7.2.5"
   },
   "devDependencies": {
-    "protobufjs-cli": "^1.1.2"
+    "protobufjs-cli": "^1.1.2",
+    "ts-proto": "^1.158.0"
   }
 }

packages/libpg-query-wasm/package.json

@@ -1,5 +1,5 @@
 import module, { ModuleError } from "./bindings-wrapper.js";
-import { pg_query } from "../dist/pg_query.js";
+import * as pg_query from "./ts-proto/pg_query.js";
 
 export { pg_query };
 

packages/libpg-query-wasm/src/main.ts

@@ -0,0 +1 @@
+*.ts