ts-proto 1.154.0 → 1.155.1

package/build/main.js

@@ -310,29 +310,13 @@ function makeProtobufStructWrapper(options) {
 function makeLongUtils(options, bytes) {
     // Regardless of which `forceLong` config option we're using, we always use
     // the `long` library to either represent or at least sanity-check 64-bit values
-    const util = (0, utils_1.impFile)(options, "util@protobufjs/minimal");
-    const configure = (0, utils_1.impFile)(options, "configure@protobufjs/minimal");
-    // Before esModuleInterop, we had to use 'import * as Long from long` b/c long is
-    // an `export =` module and exports only the Long constructor (which is callable).
-    // See https://www.typescriptlang.org/docs/handbook/modules.html#export--and-import--require.
-    //
-    // With esModuleInterop on, `* as Long` is no longer the constructor, it's the module,
-    // so we want to go back to `import { Long } from long`, which is specifically forbidden
-    // due to `export =` w/o esModuleInterop.
-    //
-    // I.e there is not an import for long that "just works" in both esModuleInterop and
-    // not esModuleInterop.
-    const LongImp = options.esModuleInterop ? (0, ts_poet_1.imp)("Long=long") : (0, 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'.`;
+    const util = (0, utils_1.impFile)(options, `util@protobufjs/minimal`);
+    const configure = (0, utils_1.impFile)(options, `configure@protobufjs/minimal`);
+    const LongImp = (0, ts_poet_1.imp)("Long=long");
     // 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 = (0, ts_poet_1.conditionalOutput)("Long", (0, ts_poet_1.code) `
-      ${disclaimer}
       if (${util}.Long !== ${LongImp}) {
         ${util}.Long = ${LongImp} as any;
         ${configure}();

package/build/options.js

@@ -202,12 +202,15 @@ function parseParameter(parameter) {
 function parseParamValue(value) {
     return value === "true" ? true : value === "false" ? false : value;
 }
-function getTsPoetOpts(_options) {
-    const imports = ["protobufjs/minimal" + _options.importSuffix];
+function getTsPoetOpts(options) {
+    const { importSuffix, esModuleInterop } = options;
+    const pbjs = "protobufjs/minimal" + importSuffix;
     return {
         prefix: `/* eslint-disable */`,
         dprintOptions: { preferSingleLine: true, lineWidth: 120 },
-        ...(_options.esModuleInterop ? { forceDefaultImport: imports } : { forceModuleImport: imports }),
+        forceRequireImport: esModuleInterop ? [] : ["long"],
+        forceDefaultImport: esModuleInterop ? [pbjs] : [],
+        forceModuleImport: esModuleInterop ? [] : [pbjs],
     };
 }
 exports.getTsPoetOpts = getTsPoetOpts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.154.0",
+  "version": "1.155.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -67,8 +67,8 @@
   "dependencies": {
     "case-anything": "^2.1.13",
     "protobufjs": "^7.2.4",
-    "ts-poet": "^6.4.1",
-    "ts-proto-descriptors": "1.12.0"
+    "ts-poet": "^6.5.0",
+    "ts-proto-descriptors": "1.14.0"
   },
   "packageManager": "yarn@3.6.0"
 }