From 7905a76494008c513e11d7c7fd0ec33536ebdd34 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Fri, 18 Apr 2025 11:14:06 -0700
Subject: [PATCH] proto-loader: Apply targetFileExtension to root files

---
 packages/proto-loader/bin/proto-loader-gen-types.ts | 6 +++---
 packages/proto-loader/package.json                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/proto-loader/bin/proto-loader-gen-types.ts b/packages/proto-loader/bin/proto-loader-gen-types.ts
index af01ecfc..e3e8a058 100644
--- a/packages/proto-loader/bin/proto-loader-gen-types.ts
+++ b/packages/proto-loader/bin/proto-loader-gen-types.ts
@@ -47,8 +47,8 @@ type GeneratorOptions = Protobuf.IParseOptions & Protobuf.IConversionOptions & {
   outputTemplate: string;
   inputBranded: boolean;
   outputBranded: boolean;
-  targetFileExtension?: string;
-  importFileExtension?: string;
+  targetFileExtension: string;
+  importFileExtension: string;
 }
 
 class TextFormatter {
@@ -832,7 +832,7 @@ async function writeAllFiles(protoFiles: string[], options: GeneratorOptions) {
   await fs.promises.mkdir(options.outDir, {recursive: true});
   const basenameMap = new Map<string, string[]>();
   for (const filename of protoFiles) {
-    const basename = path.basename(filename).replace(/\.proto$/, '.ts');
+    const basename = path.basename(filename).replace(/\.proto$/, options.targetFileExtension);
     if (basenameMap.has(basename)) {
       basenameMap.get(basename)!.push(filename);
     } else {
diff --git a/packages/proto-loader/package.json b/packages/proto-loader/package.json
index 5c42184f..d9da2f7f 100644
--- a/packages/proto-loader/package.json
+++ b/packages/proto-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/proto-loader",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "author": "Google Inc.",
   "contributors": [
     {