fix: add .js suffix to proto cross-reference imports

When importing a cross-referenced file, a line like this is generated:

  import { MyMessage } from '../myother/myother'

.. assuming there's a proto at ../myother/myother.proto

But if we add the suffix '.pb.ts' to the generated files:

  import { MyMessage } from '../myother/myother.pb'

Is not recognized as a TypeScript import by tsc because of the .pb suffix.

To fix this, we can just add .js, and the TypeScript compiler recognizes that we actually mean the .ts file:

  import { MyMessage } from '../myother/myother.pb.js'

Fixes stephenh#601

Fix the resolution in ts-jest with the jest-ts-webcompat-resolver:
See: kulshekhar/ts-jest#1057 (comment)

Signed-off-by: Christian Stewart <christian@paral.in>

.gitignore

@@ -2,6 +2,7 @@ node_modules/
 build/
 /.idea
 /.vscode
+/.log
 /integration/*/pbjs.js
 /integration/*/pbjs.d.ts
 coverage/

integration/avoid-import-conflicts-types-only/simple.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import type { SimpleEnum as SimpleEnum1, Simple as Simple2 } from './simple2';
+import type { SimpleEnum as SimpleEnum1, Simple as Simple2 } from './simple2.js';
 
 export const protobufPackage = 'simple';
 

integration/avoid-import-conflicts/simple.ts

@@ -4,7 +4,7 @@ import {
   Simple as Simple2,
   simpleEnumFromJSON as simpleEnumFromJSON3,
   simpleEnumToJSON as simpleEnumToJSON4,
-} from './simple2';
+} from './simple2.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/barrel-imports/foo.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Bar } from './bar';
+import { Bar } from './bar.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export interface Foo {

integration/bytes-node/point.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import * as _m0 from 'protobufjs/minimal';
-import { BytesValue } from './google/protobuf/wrappers';
+import { BytesValue } from './google/protobuf/wrappers.js';
 
 export const protobufPackage = '';
 

integration/fieldmask/fieldmask.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import * as _m0 from 'protobufjs/minimal';
-import { FieldMask } from './google/protobuf/field_mask';
+import { FieldMask } from './google/protobuf/field_mask.js';
 
 export const protobufPackage = '';
 

integration/file-suffix/parent.pb.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
-import { ChildEnum, Child, childEnumFromJSON, childEnumToJSON } from './child.pb';
-import { Timestamp } from './google/protobuf/timestamp.pb';
+import { ChildEnum, Child, childEnumFromJSON, childEnumToJSON } from './child.pb.js';
+import { Timestamp } from './google/protobuf/timestamp.pb.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'file_suffix';

integration/grpc-js/simple.ts

@@ -17,8 +17,8 @@ import {
   ClientDuplexStream,
   ServiceError,
 } from '@grpc/grpc-js';
-import { Timestamp } from './google/protobuf/timestamp';
-import { Empty } from './google/protobuf/empty';
+import { Timestamp } from './google/protobuf/timestamp.js';
+import { Empty } from './google/protobuf/empty.js';
 import {
   StringValue,
   Int64Value,
@@ -29,8 +29,8 @@ import {
   FloatValue,
   DoubleValue,
   BoolValue,
-} from './google/protobuf/wrappers';
-import { Struct, ListValue, Value } from './google/protobuf/struct';
+} from './google/protobuf/wrappers.js';
+import { Struct, ListValue, Value } from './google/protobuf/struct.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/meta-typings/import_dir/thing.ts

@@ -1,6 +1,7 @@
 /* eslint-disable */
 import { FileDescriptorProto } from 'ts-proto-descriptors';
-import { protoMetadata as protoMetadata1, Timestamp } from '../google/protobuf/timestamp';
+import { protoMetadata as protoMetadata1 } from '../google/protobuf/timestamp';
+import { Timestamp } from '../google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/meta-typings/simple.ts

@@ -1,11 +1,15 @@
 /* eslint-disable */
 import { FileDescriptorProto } from 'ts-proto-descriptors';
-import { protoMetadata as protoMetadata1, DateMessage } from './google/type/date';
-import { protoMetadata as protoMetadata2, StringValue, Int32Value, BoolValue } from './google/protobuf/wrappers';
-import { protoMetadata as protoMetadata3, Timestamp } from './google/protobuf/timestamp';
-import { protoMetadata as protoMetadata4, ImportedThing } from './import_dir/thing';
+import { protoMetadata as protoMetadata1 } from './google/type/date';
+import { protoMetadata as protoMetadata2 } from './google/protobuf/wrappers';
+import { protoMetadata as protoMetadata3 } from './google/protobuf/timestamp';
+import { protoMetadata as protoMetadata4 } from './import_dir/thing';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as Long from 'long';
+import { ImportedThing } from './import_dir/thing.js';
+import { DateMessage } from './google/type/date.js';
 import * as _m0 from 'protobufjs/minimal';
+import { StringValue, Int32Value, BoolValue } from './google/protobuf/wrappers.js';
 
 export const protobufPackage = 'simple';
 

integration/nestjs-simple-restparameters/hero.ts

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import { GrpcMethod, GrpcStreamMethod } from '@nestjs/microservices';
 import { Observable } from 'rxjs';
-import { Empty } from './google/protobuf/empty';
+import { Empty } from './google/protobuf/empty.js';
 
 export const protobufPackage = 'hero';
 

integration/nestjs-simple/hero.ts

@@ -1,8 +1,8 @@
 /* eslint-disable */
 import { GrpcMethod, GrpcStreamMethod } from '@nestjs/microservices';
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import { Observable } from 'rxjs';
-import { Empty } from './google/protobuf/empty';
+import { Empty } from './google/protobuf/empty.js';
 
 export const protobufPackage = 'hero';
 

integration/nice-grpc/simple.ts

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import { CallContext, CallOptions } from 'nice-grpc-common';
-import { Timestamp } from './google/protobuf/timestamp';
-import { Empty } from './google/protobuf/empty';
+import { Timestamp } from './google/protobuf/timestamp.js';
+import { Empty } from './google/protobuf/empty.js';
 import {
   StringValue,
   Int64Value,
@@ -12,8 +12,8 @@ import {
   FloatValue,
   DoubleValue,
   BoolValue,
-} from './google/protobuf/wrappers';
-import { Struct, Value, ListValue } from './google/protobuf/struct';
+} from './google/protobuf/wrappers.js';
+import { Struct, Value, ListValue } from './google/protobuf/struct.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/oneof-unions-snake/simple.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import * as _m0 from 'protobufjs/minimal';
-import { Struct } from './google/protobuf/struct';
+import { Struct } from './google/protobuf/struct.js';
 
 export const protobufPackage = 'simple';
 

integration/oneof-unions/oneof.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import * as _m0 from 'protobufjs/minimal';
-import { Value } from './google/protobuf/struct';
+import { Value } from './google/protobuf/struct.js';
 
 export const protobufPackage = 'oneof';
 

integration/only-types/reservation.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import type { Any } from './google/protobuf/any';
+import type { Any } from './google/protobuf/any.js';
 
 export const protobufPackage = 'event';
 

integration/options/options.ts

@@ -1,8 +1,9 @@
 /* eslint-disable */
 import { FileDescriptorProto as FileDescriptorProto1 } from 'ts-proto-descriptors';
 import { protoMetadata as protoMetadata1 } from './google/protobuf/descriptor';
-import { protoMetadata as protoMetadata2, Something } from './something/something';
+import { protoMetadata as protoMetadata2 } from './something/something';
 import * as _m0 from 'protobufjs/minimal';
+import { Something } from './something/something.js';
 
 export const protobufPackage = '';
 

integration/simple-json-name/simple.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/simple-long-string/simple.ts

@@ -1,8 +1,8 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
-import { UInt64Value } from './google/protobuf/wrappers';
+import { UInt64Value } from './google/protobuf/wrappers.js';
 
 export const protobufPackage = 'simple';
 

integration/simple-long/simple.ts

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
-import { StringValue, Int32Value, BoolValue, Int64Value } from './google/protobuf/wrappers';
+import { StringValue, Int32Value, BoolValue, Int64Value } from './google/protobuf/wrappers.js';
 
 export const protobufPackage = 'simple';
 

integration/simple-optionals/import_dir/thing.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from '../google/protobuf/timestamp';
+import { Timestamp } from '../google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/simple-optionals/simple.ts

@@ -1,9 +1,9 @@
 /* eslint-disable */
-import { ImportedThing } from './import_dir/thing';
-import { Timestamp } from './google/protobuf/timestamp';
+import { ImportedThing } from './import_dir/thing.js';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as Long from 'long';
 import * as _m0 from 'protobufjs/minimal';
-import { StringValue, Int32Value, BoolValue } from './google/protobuf/wrappers';
+import { StringValue, Int32Value, BoolValue } from './google/protobuf/wrappers.js';
 
 export const protobufPackage = 'simple';
 

integration/simple-optionals/thing.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/simple-prototype-defaults/import_dir/thing.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from '../google/protobuf/timestamp';
+import { Timestamp } from '../google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/simple-prototype-defaults/simple.ts

@@ -1,10 +1,10 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as Long from 'long';
-import { ImportedThing } from './import_dir/thing';
-import { DateMessage } from './google/type/date';
+import { ImportedThing } from './import_dir/thing.js';
+import { DateMessage } from './google/type/date.js';
 import * as _m0 from 'protobufjs/minimal';
-import { StringValue, Int32Value, BoolValue, BytesValue } from './google/protobuf/wrappers';
+import { StringValue, Int32Value, BoolValue, BytesValue } from './google/protobuf/wrappers.js';
 
 export const protobufPackage = 'simple';
 

integration/simple-snake/import_dir/thing.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from '../google/protobuf/timestamp';
+import { Timestamp } from '../google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/simple-snake/simple.ts

@@ -1,10 +1,10 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as Long from 'long';
-import { ImportedThing } from './import_dir/thing';
+import { ImportedThing } from './import_dir/thing.js';
 import * as _m0 from 'protobufjs/minimal';
-import { StringValue, Int32Value, BoolValue } from './google/protobuf/wrappers';
-import { Struct } from './google/protobuf/struct';
+import { StringValue, Int32Value, BoolValue } from './google/protobuf/wrappers.js';
+import { Struct } from './google/protobuf/struct.js';
 
 export const protobufPackage = 'simple';
 

integration/simple-string-enums/simple.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { NullValue, nullValueToNumber, nullValueFromJSON, nullValueToJSON } from './google/protobuf/struct';
+import { NullValue, nullValueToNumber, nullValueFromJSON, nullValueToJSON } from './google/protobuf/struct.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/simple-unrecognized-enum/import_dir/thing.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from '../google/protobuf/timestamp';
+import { Timestamp } from '../google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/simple-unrecognized-enum/simple.ts

@@ -1,9 +1,9 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as Long from 'long';
-import { ImportedThing } from './import_dir/thing';
+import { ImportedThing } from './import_dir/thing.js';
 import * as _m0 from 'protobufjs/minimal';
-import { StringValue, Int32Value, BoolValue } from './google/protobuf/wrappers';
+import { StringValue, Int32Value, BoolValue } from './google/protobuf/wrappers.js';
 
 export const protobufPackage = 'simple';
 

integration/simple/import_dir/thing.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from '../google/protobuf/timestamp';
+import { Timestamp } from '../google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'simple';

integration/simple/simple.ts

@@ -1,10 +1,10 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as Long from 'long';
-import { ImportedThing } from './import_dir/thing';
-import { DateMessage } from './google/type/date';
+import { ImportedThing } from './import_dir/thing.js';
+import { DateMessage } from './google/type/date.js';
 import * as _m0 from 'protobufjs/minimal';
-import { StringValue, Int32Value, BoolValue, BytesValue } from './google/protobuf/wrappers';
+import { StringValue, Int32Value, BoolValue, BytesValue } from './google/protobuf/wrappers.js';
 
 export const protobufPackage = 'simple';
 

integration/struct/struct.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import * as _m0 from 'protobufjs/minimal';
-import { Struct } from './google/protobuf/struct';
+import { Struct } from './google/protobuf/struct.js';
 
 export const protobufPackage = '';
 

integration/type-registry/bar/bar.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import { messageTypeRegistry } from '../typeRegistry';
-import { Foo } from '../foo';
+import { Foo } from '../foo.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'foo.bar';

integration/type-registry/foo.ts

@@ -1,8 +1,8 @@
 /* eslint-disable */
 import { messageTypeRegistry } from './typeRegistry';
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
-import { Struct } from './google/protobuf/struct';
+import { Struct } from './google/protobuf/struct.js';
 
 export const protobufPackage = 'foo';
 

integration/unknown-fields/google/protobuf/compiler/plugin.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import * as Long from 'long';
-import { FileDescriptorProto, GeneratedCodeInfo } from '../../../google/protobuf/descriptor';
+import { FileDescriptorProto, GeneratedCodeInfo } from '../descriptor.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = 'google.protobuf.compiler';

integration/use-date-false/metadata.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = '';

integration/use-date-string/use-date-string.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
+import { Timestamp } from './google/protobuf/timestamp.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = '';

integration/use-date-true/use-date-true.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
-import { Timestamp } from './google/protobuf/timestamp';
-import { Empty } from './google/protobuf/empty';
+import { Timestamp } from './google/protobuf/timestamp.js';
+import { Empty } from './google/protobuf/empty.js';
 import * as _m0 from 'protobufjs/minimal';
 
 export const protobufPackage = '';

integration/use-objectid-true-external-import/use-objectid-true.ts

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import * as mongodb from 'mongodb';
 import * as _m0 from 'protobufjs/minimal';
-import { ObjectId } from './objectid/objectid';
+import { ObjectId } from './objectid/objectid.js';
 
 export const protobufPackage = 'foo';