Merge pull request #21 from reload/dependabot/npm_and_yarn/bufbuild/protobuf-2.11.0

chore(deps): Bump @bufbuild/protobuf from 1.4.2 to 2.11.0

Author: arnested

.gitattributes

@@ -0,0 +1 @@
+/src/gen/plugin/codegen_pb.ts linguist-generated=true

Makefile

@@ -12,7 +12,7 @@ out.js: src/app.ts $(wildcard src/drivers/*.ts) src/gen/plugin/codegen_pb.ts nod
 	npx esbuild --bundle src/app.ts --tree-shaking=true --format=esm --target=es2020 --outfile=out.js
 
 src/gen/plugin/codegen_pb.ts: buf.gen.yaml
-	buf generate --template buf.gen.yaml buf.build/sqlc/sqlc --path plugin/
+	npx @bufbuild/buf generate --template buf.gen.yaml buf.build/sqlc/sqlc --path plugin/
 
 node_modules: package.json package-lock.json
 	npm install

buf.gen.yaml

@@ -1,5 +1,5 @@
 version: v1
 plugins:
-   - plugin: buf.build/bufbuild/es:v1.4.2
+   - plugin: buf.build/bufbuild/es:v2.11.0
      opt: target=ts
      out: src/gen

package-lock.json

@@ -13,7 +13,7 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^1.4.2",
+    "@bufbuild/protobuf": "^2.11.0",
     "javy": "^0.1.2",
     "pg": "^8.11.3"
   }

package.json

@@ -18,12 +18,16 @@ import {
   factory,
 } from "typescript";
 
+import { create, fromBinary, toBinary } from "@bufbuild/protobuf";
 import {
   GenerateRequest,
+  GenerateRequestSchema,
   GenerateResponse,
+  GenerateResponseSchema,
   Parameter,
   Column,
   File,
+  FileSchema,
   Query,
 } from "./gen/plugin/codegen_pb";
 
@@ -200,7 +204,7 @@ ${query.text}`
       }
       if (nodes) {
         files.push(
-          new File({
+          create(FileSchema, {
             name: `${filename.replace(".", "_")}.ts`,
             contents: new TextEncoder().encode(printNode(nodes)),
           })
@@ -209,15 +213,15 @@ ${query.text}`
     }
   }
 
-  return new GenerateResponse({
+  return create(GenerateResponseSchema, {
     files: files,
   });
 }
 
 // Read input from stdin
 function readInput(): GenerateRequest {
   const buffer = readFileSync(STDIO.Stdin);
-  return GenerateRequest.fromBinary(buffer);
+  return fromBinary(GenerateRequestSchema, buffer);
 }
 
 function queryDecl(name: string, sql: string) {
@@ -299,7 +303,6 @@ function printNode(nodes: Node[]): string {
 
 // Write output to stdout
 function writeOutput(output: GenerateResponse) {
-  const encodedOutput = output.toBinary();
-  const buffer = new Uint8Array(encodedOutput);
+  const buffer = toBinary(GenerateResponseSchema, output);
   writeFileSync(STDIO.Stdout, buffer);
 }