tidy up

package.json

@@ -1,6 +1,6 @@
 {
   "name": "twirp-ts",
-  "version": "2.3.4",
+  "version": "2.3.0",
   "description": "Typescript implementation of the Twirp protocol",
   "main": "build/twirp/index.js",
   "bin": {

src/protoc-gen-twirp-ts/gen/index-file.ts

@@ -0,0 +1,33 @@
+import { DescriptorRegistry } from "@protobuf-ts/plugin-framework";
+import { File } from "../file";
+
+export function genIndexFile(registry: DescriptorRegistry, files: File[]) {
+  const fileToExport = registry.allFiles()
+    .filter((fileDescriptor) => {
+      let hasExports = false;
+      registry.visitTypes(fileDescriptor, descriptor => {
+        // we are not interested in synthetic types like map entry messages
+        if (registry.isSyntheticElement(descriptor)) return;
+        hasExports = true;
+      });
+
+      return hasExports;
+    })
+    .map((file => file.name?.replace(".proto", "")));
+
+  const compiledFiles = files.filter(file => file.getContent() !== "").map(file => {
+    return file.fileName.replace(".ts", "")
+  });
+
+  if (compiledFiles.length > 0) {
+    fileToExport.push(
+      ...compiledFiles,
+    )
+  }
+
+  const indexFile = new File('index.ts');
+
+  return indexFile.setContent(fileToExport.map((fileName) => {
+    return `export * from "./${fileName}";`
+  }).join("\n"));
+}

src/protoc-gen-twirp-ts/plugin.ts

@@ -11,6 +11,7 @@ import { genGateway } from "./gen/gateway";
 import { createLocalTypeName } from "./local-type-name";
 import { Interpreter } from "./interpreter";
 import { genOpenAPI, OpenAPIType } from "./gen/open-api";
+import { genIndexFile } from "./gen/index-file";
 
 export class ProtobuftsPlugin extends PluginBase<File> {
   parameters = {
@@ -130,19 +131,19 @@ export class ProtobuftsPlugin extends PluginBase<File> {
     if (params.openapi_twirp) {
       docs.push(
         ...(await genOpenAPI(ctx, registry.allFiles(), OpenAPIType.TWIRP)),
-      )
+      );
     }
 
     if (params.openapi_gateway) {
       docs.push(
         ...(await genOpenAPI(ctx, registry.allFiles(), OpenAPIType.GATEWAY)),
-      )
+      );
     }
 
     docs.forEach((doc) => {
-      const file = new File(`${doc.fileName}`)
-      file.setContent(doc.content)
-      files.push(file)
+      const file = new File(`${doc.fileName}`);
+      file.setContent(doc.content);
+      files.push(file);
     })
 
     return files;
@@ -152,37 +153,6 @@ export class ProtobuftsPlugin extends PluginBase<File> {
   protected getSupportedFeatures = () => [CodeGeneratorResponse_Feature.PROTO3_OPTIONAL];
 }
 
-function genIndexFile(registry: DescriptorRegistry, files: File[]) {
-  const fileToExport = registry.allFiles()
-    .filter((fileDescriptor) => {
-      let hasExports = false;
-      registry.visitTypes(fileDescriptor, descriptor => {
-        // we are not interested in synthetic types like map entry messages
-        if (registry.isSyntheticElement(descriptor)) return;
-        hasExports = true;
-      });
-
-      return hasExports;
-    })
-    .map((file => file.name?.replace(".proto", "")));
-
-  const compiledFiles = files.filter(file => file.getContent() !== "").map(file => {
-    return file.fileName.replace(".ts", "")
-  });
-
-  if (compiledFiles.length > 0) {
-    fileToExport.push(
-      ...compiledFiles,
-    )
-  }
-
-  const indexFile = new File('index.ts');
-
-  return indexFile.setContent(fileToExport.map((fileName) => {
-    return `export * from "./${fileName}";`
-  }).join("\n"));
-}
-
 new ProtobuftsPlugin().run().then(() => {
   process.exit(0);
 })

src/twirp/errors.ts

@@ -1,5 +1,3 @@
-import * as http from 'http';
-
 /**
  * Represents a twirp error
  */

src/twirp/http.client.ts

@@ -13,7 +13,6 @@ export interface Rpc {
 }
 
 export type HttpClientOptions = Omit<(http.RequestOptions | https.RequestOptions), "path" | "host" | "port"> & {
-    prefix?: string
     baseUrl: string
 }
 
@@ -50,7 +49,9 @@ export const NodeHttpRPC: (options: HttpClientOptions) => Rpc = (options) => ({
                 path: `${prefix}/${service}/${method}`,
                 headers: {
                     'Content-Type': contentType,
-                    'Content-Length': contentType === "application/protobuf" ? Buffer.byteLength(requestData as Uint8Array) : Buffer.from(requestData as string).byteLength,
+                    'Content-Length': contentType === "application/protobuf" ?
+                      Buffer.byteLength(requestData as Uint8Array) :
+                      Buffer.from(requestData as string).byteLength,
                 },
             }, res => {
                 res.on('data', chunk => responseChunks.push(chunk));