ts-proto 1.115.4 → 1.115.5

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.115.5](https://github.com/stephenh/ts-proto/compare/v1.115.4...v1.115.5) (2022-06-22)
+
+
+### Bug Fixes
+
+* remove Long import statement when Long was unused ([#599](https://github.com/stephenh/ts-proto/issues/599)) ([58dc10c](https://github.com/stephenh/ts-proto/commit/58dc10c61ec5a76d4b54ba9eddf34021979dd4aa))
+
 ## [1.115.4](https://github.com/stephenh/ts-proto/compare/v1.115.3...v1.115.4) (2022-06-05)
 
 

package/build/main.js

@@ -188,9 +188,6 @@ function generateFile(ctx, fileDesc) {
         if (v instanceof ConditionalOutput_1.ConditionalOutput) {
             return ts_poet_1.code `${v.ifUsed}`;
         }
-        else if (v instanceof ts_poet_1.Code) {
-            return v;
-        }
         else {
             return ts_poet_1.code ``;
         }
@@ -237,23 +234,22 @@ function makeLongUtils(options, bytes) {
     //
     // I.e there is not an import for long that "just works" in both esModuleInterop and
     // not esModuleInterop.
-    const Long = options.esModuleInterop ? ts_poet_1.imp('Long=long') : ts_poet_1.imp('Long*long');
+    const LongImp = options.esModuleInterop ? ts_poet_1.imp('Long=long') : ts_poet_1.imp('Long*long');
     const disclaimer = options.esModuleInterop
         ? ''
         : `
     // If you get a compile-error about 'Constructor<Long> and ... have no overlap',
     // add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.`;
-    // Kinda hacky, but we always init long unless in onlyTypes mode. I'd rather do
-    // this more implicitly, like if `Long@long` is imported or something like that.
-    const longInit = options.onlyTypes
-        ? ts_poet_1.code ``
-        : ts_poet_1.code `
+    // Instead of exposing `LongImp` directly, let callers think that they are getting the
+    // `imp(Long)` but really it is that + our long initialization snippet. This means the
+    // initialization code will only be emitted in files that actually use the Long import.
+    const Long = ts_poet_1.conditionalOutput('Long', ts_poet_1.code `
       ${disclaimer}
-      if (${util}.Long !== ${Long}) {
-        ${util}.Long = ${Long} as any;
+      if (${util}.Long !== ${LongImp}) {
+        ${util}.Long = ${LongImp} as any;
         ${configure}();
       }
-    `;
+    `);
     // TODO This is unused?
     const numberToLong = ts_poet_1.conditionalOutput('numberToLong', ts_poet_1.code `
       function numberToLong(number: number) {
@@ -273,7 +269,7 @@ function makeLongUtils(options, bytes) {
         return long.toNumber();
       }
     `);
-    return { numberToLong, longToNumber, longToString, longInit, Long };
+    return { numberToLong, longToNumber, longToString, Long };
 }
 function makeByteUtils() {
     const globalThis = ts_poet_1.conditionalOutput('globalThis', ts_poet_1.code `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.115.4",
+  "version": "1.115.5",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",