Preserve protoscript import when well known types are imported (#47)

tatethurston · Oct 25, 2023 · f02cb79 · f02cb79
1 parent 314321a
commit f02cb79
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.0.20
+
+- Preserve protoscript import when well known types are imported. This corrects a regression in 0.0.19.
+
 ## v0.0.19
 
 - Fix JSON serializtion for Timestamp and Duration well known types. See [#39](https://github.com/tatethurston/ProtoScript/issues/39).

diff --git a/e2e/serialization/service.pb.ts b/e2e/serialization/service.pb.ts
@@ -0,0 +1,5 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+// Source: service.proto
+/* eslint-disable */
+
+import * as protoscript from "protoscript";
diff --git a/e2e/serialization/service.proto b/e2e/serialization/service.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+import "google/protobuf/empty.proto";
+
+service Service {
+  rpc Bar (google.protobuf.Empty) returns (google.protobuf.Empty);
+}
diff --git a/e2e/serialization/tsconfig.json b/e2e/serialization/tsconfig.json
@@ -2,7 +2,8 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": ".",
-    "outDir": "dist"
+    "outDir": "dist",
+    "noUnusedLocals": false
   },
   "exclude": ["dist"]
 }
diff --git a/packages/protoscript/package.json b/packages/protoscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protoscript",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "A Protobuf runtime and code generation tool for JavaScript and TypeScript",
   "license": "MIT",
   "author": "Tate <[email protected]>",

diff --git a/packages/protoscript/src/codegen/autogenerate/index.ts b/packages/protoscript/src/codegen/autogenerate/index.ts
@@ -839,6 +839,10 @@ export function generate(
     ? writeJSONSerializers(types, [])
     : "";
 
+  const hasWellKnownTypeImports = imports.some(
+    ({ moduleName }) => moduleName === "protoscript",
+  );
+
   return `\
 // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 // Source: ${sourceFile}
@@ -848,7 +852,10 @@ ${printIf(
   config.isTS && hasSerializer,
   `import type { ByteSource, PartialDeep } from "protoscript";`,
 )}
-${printIf(hasSerializer, `import * as protoscript from "protoscript";`)}
+${printIf(
+  hasSerializer || hasWellKnownTypeImports,
+  `import * as protoscript from "protoscript";`,
+)}
 ${printIf(pluginImports.length > 0, pluginImports.join("\n"))}
 ${imports
   .filter(({ moduleName }) => moduleName !== "protoscript")