Properly implement import public.

README.md

@@ -111,8 +111,6 @@ will generate the haskell files `Proto/Project/{Foo,Bar}.hs`.
 - Extensions (proto2-only) are not supported.
 - Unknown proto2 enum values cause a decoding error, instead of being preserved
   round-trip.
-- Files with `import public` statements compile correctly, but don't explicitly
-  reexport the definitions from those imports.
 
 # Troubleshooting
 

proto-lens-protoc/Changelog.md

@@ -1,6 +1,12 @@
 # Changelog for `proto-lens-protoc`
 
 ## Pending
+
+### Breaking Changes
+- Reexport transitive definitions from modules generated for `.proto` files
+  with `import public` statements (#329).
+
+### Backwards-Compatible Changes
 - Fix a potential naming conflict when message types and enum values
   are the same except for case.
 

proto-lens-protoc/app/protoc-gen-haskell.hs

@@ -41,6 +41,7 @@ import Data.ProtoLens.Compiler.Combinators
     ( prettyPrint
     , prettyPrintModule
     , getModuleName
+    , Module
     )
 import Data.ProtoLens.Compiler.Generate
 import Data.ProtoLens.Compiler.Plugin
@@ -80,14 +81,13 @@ generateFiles modifyImports header files toGenerate = let
   modulePrefix = "Proto"
   filesByName = analyzeProtoFiles modulePrefix files
   -- The contents of the generated Haskell file for a given .proto file.
+  modulesToBuild :: ProtoFile -> [Module]
   modulesToBuild f = let
       deps = descriptor f ^. dependency
       imports = Set.toAscList $ Set.fromList
-                  [ haskellModule (filesByName ! exportName)
-                  | dep <- deps
-                  , exportName <- exports (filesByName ! dep)
-                  ]
+                  $ map (haskellModule . (filesByName !)) deps
       in generateModule (haskellModule f) imports
+            (publicImports f)
              modifyImports
              (definitions f)
              (collectEnvFromDeps deps filesByName)

proto-lens-protoc/src/Data/ProtoLens/Compiler/Combinators.hs

@@ -295,6 +295,9 @@ exportWith q = Syntax.EThingWith ()
                     q
                     . map (Syntax.ConName ())
 
+exportModule :: ModuleName -> ExportSpec
+exportModule = Syntax.EModuleContents ()
+
 type Name = Syntax.Name ()
 
 type Pat = Syntax.Pat ()

proto-lens-protoc/src/Data/ProtoLens/Compiler/Generate.hs

@@ -60,22 +60,27 @@ data UseRuntime = UseRuntime | UseOriginal
 -- input contains all defined names, incl. those in this module
 generateModule :: ModuleName
                -> [ModuleName]  -- ^ The imported modules
+               -> [ModuleName]  -- ^ The publically imported modules
                -> ModifyImports
                -> Env Name      -- ^ Definitions in this file
                -> Env QName     -- ^ Definitions in the imported modules
                -> [ServiceInfo]
                -> [Module]
-generateModule modName imports modifyImport definitions importedEnv services
+generateModule modName imports publicImports modifyImport definitions importedEnv services
     = [ Module modName
-                (Just $ (serviceExports ++) $ concatMap generateExports $ Map.elems definitions)
+                (Just $ serviceExports
+                        ++ concatMap generateExports (Map.elems definitions)
+                        ++ map exportModule publicImports)
                 pragmas
-                (mainImports ++ sharedImports)
+                (mainImports ++ sharedImports
+                    ++ map importSimple (imports List.\\ publicImports)
+                    ++ map importPublic publicImports)
           $ (concatMap generateDecls $ Map.toList definitions)
          ++ map uncommented (concatMap (generateServiceDecls env) services)
       , Module fieldModName
                 Nothing
                 pragmas
-                sharedImports
+                (sharedImports ++ map importSimple imports)
           . map uncommented
           $ concatMap generateFieldDecls allLensNames
       ]
@@ -115,7 +120,6 @@ generateModule modName imports modifyImport definitions importedEnv services
               , "Data.Vector.Unboxed"
               , "Text.Read"
               ]
-            ++ map importSimple imports
     env = Map.union (unqualifyEnv definitions) importedEnv
     generateDecls (protoName, Message m)
         = generateMessageDecls fieldModName env (stripDotPrefix protoName) m
@@ -143,6 +147,24 @@ allMessageFields env info =
     map (plainRecordField env) (messageFields info)
         ++ map (oneofRecordField env) (messageOneofFields info)
 
+{- We import modules as follows:
+
+1) Modules from proto-lens-runtime: import qualified, strip the prefix:
+     import qualified Data.ProtoLens.Runtime.Data.Text as Data.Text
+
+2) Modules from "import" declarations: import qualified:
+     import qualified Proto.Foo.Bar
+
+3) Modules from "import public" declarations: import unqualified:
+     import Proto.Foo.Bar
+   To reexport the imported declarations from the current module via
+     module ... (module Proto.Foo.Bar)
+   the module Proto.Foo.Bar needs to be unqualified. 
+   Alternately we could explicitly enumerate every definition being reexported, but
+   that would lead to less readable Haddocks and also make codegen a little more
+   complicated.
+-}
+
 importSimple :: ModuleName -> ImportDecl ()
 importSimple m = ImportDecl
     { importAnn = ()
@@ -156,6 +178,19 @@ importSimple m = ImportDecl
     , importSpecs = Nothing
     }
 
+importPublic :: ModuleName -> ImportDecl ()
+importPublic m = ImportDecl
+    { importAnn = ()
+    , importModule = m
+    -- Don't import qualified so that this module can reexport its definitions.
+    , importQualified = False
+    , importSrc = False
+    , importSafe = False
+    , importPkg = Nothing
+    , importAs = Nothing
+    , importSpecs = Nothing
+    }
+
 type ModifyImports = ImportDecl () -> ImportDecl ()
 
 reexported :: ModifyImports
@@ -967,7 +1002,7 @@ fieldAccessorExpr (PlainFieldInfo kind f) = accessorCon @@ fieldOfExp hsFieldNam
                   -> "Data.ProtoLens.MapField"
                          @@ fieldOfExp (overloadedField $ keyField entry)
                          @@ fieldOfExp (overloadedField $ valueField entry)
-          RepeatedField packed -> 
+          RepeatedField packed ->
                 "Data.ProtoLens.RepeatedField"
                   @@ if packed == Packed
                         then "Data.ProtoLens.Packed"

proto-lens-protoc/src/Data/ProtoLens/Compiler/Plugin.hs

@@ -42,10 +42,8 @@ data ProtoFile = ProtoFile
     , haskellModule :: ModuleName
     , definitions :: Env Name
     , services :: [ServiceInfo]
-    -- | The names of proto files exported (transitively, via "import public"
-    -- decl) by this file.
-    , exports :: [ProtoFileName]
     , exportedEnv :: Env QName
+    , publicImports :: [ModuleName]
     }
 
 -- Given a list of FileDescriptorProtos, collect information about each file
@@ -59,23 +57,24 @@ analyzeProtoFiles modulePrefix files =
     -- The definitions in each input proto file, indexed by filename.
     definitionsByName = fmap collectDefinitions filesByName
     servicesByName = fmap collectServices filesByName
-    -- The exports from each .proto file (including any "public import"
-    -- dependencies), as they appear to other modules that are importing them;
-    -- i.e., qualified by module name.
     exportsByName = transitiveExports files
-    localExports = Map.intersectionWith qualifyEnv moduleNames definitionsByName
-    exportedEnvs = fmap (\es -> unions [localExports ! e | e <- es]) exportsByName
+    exportedEnvs = fmap (foldMap (definitionsByName !)) exportsByName
 
     ingestFile f = ProtoFile
         { descriptor = f
-        , haskellModule = moduleNames ! n
+        , haskellModule = m
         , definitions = definitionsByName ! n
         , services = servicesByName ! n
-        , exports = exportsByName ! n
-        , exportedEnv = exportedEnvs ! n
+        , exportedEnv = qualifyEnv m $ exportedEnvs ! n
+        , publicImports = [moduleNames ! i | i <- reexported]
         }
       where
         n = f ^. name
+        m = moduleNames ! n
+        reexported =
+            [ (f ^. dependency) !! fromIntegral i
+            | i <- f ^. publicDependency
+            ]
 
 collectEnvFromDeps :: [ProtoFileName] -> Map ProtoFileName ProtoFile -> Env QName
 collectEnvFromDeps deps filesByName =
@@ -106,11 +105,13 @@ moduleNameStr prefix path = fixModuleName rawModuleName
                         . splitDirectories $ dropExtension
                         $ path
 
+
 -- | Given a list of .proto files (topologically sorted), determine which
 -- files' definitions are exported by which files.
 --
 -- Files only export their own definitions, along with the definitions exported
--- by any "import public" declarations.
+-- by any "import public" declarations.  (And any definitions that *those* files
+-- "import public", etc.)
 transitiveExports :: [FileDescriptorProto] -> Map ProtoFileName [ProtoFileName]
 -- Accumulate the transitive dependencies by folding over the files in
 -- topological order.
@@ -127,4 +128,3 @@ transitiveExports = foldl' setExportsFromFile Map.empty
                        | i <- fd ^. publicDependency
                        ]
       where n = fd ^. name
-

proto-lens-tests/tests/imports_test.hs

@@ -49,6 +49,11 @@ testUseDep = testCase "testUseDep" $ do
     testField @Imports.UseDep @ImportsDep.DepPkg #foo
     testField @Imports.UseDep @ImportsTransitive.TransitiveDep #bar
     testField @Imports.UseDep @ImportsTransitive2.TransitiveDep2 #baz
+    -- Due to "import public" statements, these modules reexport their
+    -- dependencies transitively:
+    testField @Imports.UseDep @ImportsDep.TransitiveDep #bar
+    testField @Imports.UseDep @ImportsDep.TransitiveDep2 #baz
+    testField @Imports.UseDep @ImportsTransitive.TransitiveDep2 #baz
 
 testUseBootstrapped :: Test
 testUseBootstrapped = testCase "testUseBootstrapped" $ do