fix: handle public imports

src/compiler/descriptor.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeneratedCodeInfo = exports.SourceCodeInfo = exports.UninterpretedOption = exports.MethodOptions = exports.ServiceOptions = exports.EnumValueOptions = exports.EnumOptions = exports.OneofOptions = exports.FieldOptions = exports.MessageOptions = exports.FileOptions = exports.MethodDescriptorProto = exports.ServiceDescriptorProto = exports.EnumValueDescriptorProto = exports.EnumDescriptorProto = exports.OneofDescriptorProto = exports.FieldDescriptorProto = exports.ExtensionRangeOptions = exports.DescriptorProto = exports.FileDescriptorProto = exports.FileDescriptorSet = void 0;
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
+ * compiler version: 3.9.1
  * source: src/compiler/descriptor.proto
  * git: https://github.com/thesayyn/protoc-gen-ts
  * buymeacoffee: https://www.buymeacoffee.com/thesayyn
@@ -194,9 +195,9 @@ class FileDescriptorProto extends pb_1.Message {
         if (this.dependency !== undefined)
             writer.writeRepeatedString(3, this.dependency);
         if (this.public_dependency !== undefined)
-            writer.writePackedInt32(10, this.public_dependency);
+            writer.writeRepeatedInt32(10, this.public_dependency);
         if (this.weak_dependency !== undefined)
-            writer.writePackedInt32(11, this.weak_dependency);
+            writer.writeRepeatedInt32(11, this.weak_dependency);
         if (this.message_type !== undefined)
             writer.writeRepeatedMessage(4, this.message_type, (item) => item.serialize(writer));
         if (this.enum_type !== undefined)
@@ -230,10 +231,10 @@ class FileDescriptorProto extends pb_1.Message {
                     pb_1.Message.addToRepeatedField(message, 3, reader.readString());
                     break;
                 case 10:
-                    message.public_dependency = reader.readPackedInt32();
+                    pb_1.Message.addToRepeatedField(message, 10, reader.readInt32());
                     break;
                 case 11:
-                    message.weak_dependency = reader.readPackedInt32();
+                    pb_1.Message.addToRepeatedField(message, 11, reader.readInt32());
                     break;
                 case 4:
                     reader.readMessage(message.message_type, () => pb_1.Message.addToRepeatedWrapperField(message, 4, DescriptorProto.deserialize(reader), DescriptorProto));
@@ -2836,10 +2837,10 @@ exports.SourceCodeInfo = SourceCodeInfo;
                     break;
                 switch (reader.getFieldNumber()) {
                     case 1:
-                        message.path = reader.readPackedInt32();
+                        pb_1.Message.addToRepeatedField(message, 1, reader.readPackedInt32());
                         break;
                     case 2:
-                        message.span = reader.readPackedInt32();
+                        pb_1.Message.addToRepeatedField(message, 2, reader.readPackedInt32());
                         break;
                     case 3:
                         message.leading_comments = reader.readString();
@@ -2990,7 +2991,7 @@ exports.GeneratedCodeInfo = GeneratedCodeInfo;
                     break;
                 switch (reader.getFieldNumber()) {
                     case 1:
-                        message.path = reader.readPackedInt32();
+                        pb_1.Message.addToRepeatedField(message, 1, reader.readPackedInt32());
                         break;
                     case 2:
                         message.source_file = reader.readString();

src/compiler/plugin.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodeGeneratorResponse = exports.CodeGeneratorRequest = exports.Version = void 0;
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
+ * compiler version: 3.9.1
  * source: src/compiler/plugin.proto
  * git: https://github.com/thesayyn/protoc-gen-ts
  * buymeacoffee: https://www.buymeacoffee.com/thesayyn

src/index.js

@@ -5,6 +5,7 @@ const ts = require("typescript");
 const type = require("./type");
 const descriptor = require("./descriptor");
 const rpc = require("./rpc");
+const transitive = require("./transitive");
 
 function createImport(identifier, moduleSpecifier) {
   return ts.factory.createImportDeclaration(
@@ -36,16 +37,20 @@ for (const fileDescriptor of request.proto_file) {
   // Will keep track of import statements
   const importStatements = [];
 
+  // Will keep track of export statements for transitive dependencies
+  const exportStatements = [];
 
   // Create all named imports from dependencies
-  for (const dependency of fileDescriptor.dependency) {
+  for (const [index, dependency] of fileDescriptor.dependency.entries()) {
     const identifier = ts.factory.createUniqueName("dependency");
     const moduleSpecifier = replaceExtension(dependency, "");
     type.setIdentifierForDependency(dependency, identifier);
     const importedFrom = `./${path.relative(path.dirname(fileDescriptor.name), moduleSpecifier)}`;
     importStatements.push(createImport(identifier, importedFrom));
   }
 
+  transitive.reExport(fileDescriptor, request);
+
   // Create all messages recursively
   let statements = [];
 
@@ -76,30 +81,30 @@ for (const fileDescriptor of request.proto_file) {
     importStatements.push(createImport(grpcIdentifier, process.env.GRPC_PACKAGE_NAME || "@grpc/grpc-js"));
   }
 
-
-  const {major, minor, patch} = request.compiler_version || {major: 0, minor: 0, patch: 0};
+  const { major, minor, patch } = request.compiler_version || { major: 0, minor: 0, patch: 0 };
 
   const doNotEditComment = ts.factory.createJSDocComment(
     `Generated by the protoc-gen-ts.  DO NOT EDIT!\n` +
-    `compiler version: ${major}.${minor}.${patch}\n` + 
+    `compiler version: ${major}.${minor}.${patch}\n` +
     `source: ${fileDescriptor.name}\n` +
     `git: https://github.com/thesayyn/protoc-gen-ts\n` +
     `buymeacoffee: https://www.buymeacoffee.com/thesayyn\n`
   );
 
   // Wrap statements within the namespace
   if (fileDescriptor.package) {
-
     statements = [
       doNotEditComment,
       ...importStatements,
       descriptor.createNamespace(fileDescriptor.package, statements),
+      ...exportStatements
     ]
   } else {
     statements = [
       doNotEditComment,
       ...importStatements,
-      ...statements
+      ...statements,
+      ...exportStatements
     ];
   }
 

src/transitive.js

@@ -0,0 +1,19 @@
+const type = require('./type');
+const descriptor = require('./compiler/descriptor');
+const ts = require('typescript');
+const plugin = require("./compiler/plugin");
+
+/**
+ * 
+ * @param {descriptor.FileDescriptorProto} descriptor 
+ * @param {plugin.CodeGeneratorRequest} request 
+ */
+function reExport(descriptor, request) {
+    const statements = [];
+    for (const index of descriptor.public_dependency) {
+        const dependency = descriptor.dependency[index];
+
+    }
+}
+
+module.exports = {reExport}

test/BUILD.bazel

@@ -7,7 +7,7 @@ load("//:index.bzl", "ts_proto_library")
 proto_library(
     name = "protos",
     srcs = glob(
-        include = ["**/*.proto"],
+        include = ["import/*.proto"],
         exclude = ["**/*experimental*.proto"]
     )
 )
@@ -34,7 +34,7 @@ ts_proto_library(
 
 ts_project(
     name = "test_lib",
-    srcs = glob(["**/*.ts"]),
+    srcs = glob(["import/*.ts"]),
     tsconfig = {
         "compilerOptions": {
             "target": "ES2020",

test/importdirective.proto → test/import/importdirective.proto

@@ -2,7 +2,8 @@ syntax = "proto3";
 
 package importdirective;
 
-import "test/imported.proto";
+import "test/import/imported.proto";
+import "test/import/old.proto";
 
 service ImportedService {
     rpc ImportedServiceTest(importdirective.Imported) returns (importdirective.Imported.SubMessage);
@@ -12,4 +13,6 @@ message Message {
     importdirective.Imported importedField = 1;
     importdirective.Imported.SubMessage submessageField = 2;
     importdirective.Imported.SubMessage.MyEnum enumField = 3;
+    importdirective.PublicMessage pubMessageField = 4;
+    importdirective.PublicMessage2 pubMessageField2 = 5;
 }

test/import/old.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+import public "test/import/public.proto";
+import public "test/import/public2.proto";
+
+message OldMarker {
+    importdirective.PublicMessage pubMessageField = 4;
+    importdirective.PublicMessage2 pubMessageField2 = 5;
+}

test/import/oldpkg.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package importdirective;
+
+import public "test/import/public.proto";
+import public "test/import/public2.proto";
+
+message OldMarker {
+    importdirective.PublicMessage pubMessageField = 4;
+    importdirective.PublicMessage2 pubMessageField2 = 5;
+}

test/import/public.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+package importdirective;
+
+
+message PublicMessage {
+    bool pb = 1;
+}

test/import/public2.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package importdirective;
+
+message PublicMessage2 {
+    bool pb = 1;
+}

test/map.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-import "test/imported.proto";
+import "test/import/imported.proto";
 
 message Topic {
     string link = 2;

test/map.spec.ts

@@ -1,6 +1,6 @@
 
 import { Tags, Topic } from "./map";
-import { importdirective } from "./imported";
+import { importdirective } from "./import/imported";
 
 describe("maps", () => {
     it("should serialize as map", () => {