fix duplicate declaration issue

anmolitor · Mar 1, 2024 · ec56faa · ec56faa
1 parent e47b4b3
commit ec56faa
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protoc-gen-elm",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Elm protoc plugin",
   "keywords": [
     "elm",

diff --git a/src/Generator.elm b/src/Generator.elm
@@ -124,11 +124,12 @@ convert versions options fileNames descriptors =
                     rootModName ++ [ "Internals_" ]
 
                 declarations =
-                    List.concatMap (Enum.toAST options packageName) struct.enums
-                        ++ List.concatMap (Message.reexportAST options internalsModule packageName) struct.messages
-                        ++ List.concatMap OneOf.reexportAST struct.oneOfs
-                        ++ List.concatMap (OneOf.reexportDataType internalsModule packageName) struct.oneOfReexports
-                        ++ List.concatMap Service.toAST struct.services
+                    removeDuplicateDeclarations <|
+                        List.concatMap (Enum.toAST options packageName) struct.enums
+                            ++ List.concatMap (Message.reexportAST options internalsModule packageName) struct.messages
+                            ++ List.concatMap OneOf.reexportAST struct.oneOfs
+                            ++ List.concatMap (OneOf.reexportDataType internalsModule packageName) struct.oneOfReexports
+                            ++ List.concatMap Service.toAST struct.services
 
                 exports =
                     Export.fromDeclarations declarations
@@ -140,7 +141,7 @@ convert versions options fileNames descriptors =
             C.file
                 (C.normalModule packageName exports)
                 (List.map (\importedModule -> C.importStmt importedModule Nothing Nothing) (Set.toList <| Import.extractImports declarations))
-                (removeDuplicateDeclarations declarations)
+                declarations
                 (C.emptyFileComment
                     |> fileComment versions struct.originFiles
                     |> Common.addDocs fileDocs

diff --git a/src/Proto/Google/Protobuf.elm b/src/Proto/Google/Protobuf.elm
@@ -61,53 +61,53 @@ To run it, add a dependency via `elm install` on [`elm-protocol-buffers`](https:
  individual entries of a map or fields of a oneof can already detect presence.
 
 
-@docs Any, Api, BoolValue, BytesValue, DescriptorProto, DescriptorProto_, DescriptorProto_, DoubleValue, Duration, Empty, Enum, EnumDescriptorProto
+@docs Any, Api, BoolValue, BytesValue, DescriptorProto, DescriptorProto_, DoubleValue, Duration, Empty, Enum, EnumDescriptorProto, EnumOptions
 
-@docs EnumOptions, EnumValue, EnumValueDescriptorProto, EnumValueOptions, ExtensionRangeOptions, Field, FieldDescriptorProto, FieldMask
+@docs EnumValue, EnumValueDescriptorProto, EnumValueOptions, ExtensionRangeOptions, Field, FieldDescriptorProto, FieldMask, FieldOptions
 
-@docs FieldOptions, FileDescriptorProto, FileDescriptorSet, FileOptions, FloatValue, GeneratedCodeInfo, Int32Value, Int64Value, ListValue
+@docs FileDescriptorProto, FileDescriptorSet, FileOptions, FloatValue, GeneratedCodeInfo, Int32Value, Int64Value, ListValue, ListValue_
 
-@docs ListValue_, MessageOptions, Method, MethodDescriptorProto, MethodOptions, Mixin, OneofDescriptorProto, OneofOptions, Option
+@docs MessageOptions, Method, MethodDescriptorProto, MethodOptions, Mixin, OneofDescriptorProto, OneofOptions, Option, ServiceDescriptorProto
 
-@docs ServiceDescriptorProto, ServiceOptions, SourceCodeInfo, SourceContext, StringValue, Struct, Timestamp, Type, UInt32Value, UInt64Value
+@docs ServiceOptions, SourceCodeInfo, SourceContext, StringValue, Struct, Timestamp, Type, UInt32Value, UInt64Value, UninterpretedOption, Value
 
-@docs UninterpretedOption, Value, Value_, Value_, decodeAny, decodeApi, decodeBoolValue, decodeBytesValue, decodeDescriptorProto
+@docs Value_, decodeAny, decodeApi, decodeBoolValue, decodeBytesValue, decodeDescriptorProto, decodeDoubleValue, decodeDuration, decodeEmpty
 
-@docs decodeDoubleValue, decodeDuration, decodeEmpty, decodeEnum, decodeEnumDescriptorProto, decodeEnumOptions, decodeEnumValue
+@docs decodeEnum, decodeEnumDescriptorProto, decodeEnumOptions, decodeEnumValue, decodeEnumValueDescriptorProto, decodeEnumValueOptions
 
-@docs decodeEnumValueDescriptorProto, decodeEnumValueOptions, decodeExtensionRangeOptions, decodeField, decodeFieldDescriptorProto
+@docs decodeExtensionRangeOptions, decodeField, decodeFieldDescriptorProto, decodeFieldMask, decodeFieldOptions
 
-@docs decodeFieldMask, decodeFieldOptions, decodeFileDescriptorProto, decodeFileDescriptorSet, decodeFileOptions, decodeFloatValue
+@docs decodeFileDescriptorProto, decodeFileDescriptorSet, decodeFileOptions, decodeFloatValue, decodeGeneratedCodeInfo, decodeInt32Value
 
-@docs decodeGeneratedCodeInfo, decodeInt32Value, decodeInt64Value, decodeListValue, decodeMessageOptions, decodeMethod
+@docs decodeInt64Value, decodeListValue, decodeMessageOptions, decodeMethod, decodeMethodDescriptorProto, decodeMethodOptions, decodeMixin
 
-@docs decodeMethodDescriptorProto, decodeMethodOptions, decodeMixin, decodeOneofDescriptorProto, decodeOneofOptions, decodeOption
+@docs decodeOneofDescriptorProto, decodeOneofOptions, decodeOption, decodeServiceDescriptorProto, decodeServiceOptions
 
-@docs decodeServiceDescriptorProto, decodeServiceOptions, decodeSourceCodeInfo, decodeSourceContext, decodeStringValue, decodeStruct
+@docs decodeSourceCodeInfo, decodeSourceContext, decodeStringValue, decodeStruct, decodeTimestamp, decodeType, decodeUInt32Value
 
-@docs decodeTimestamp, decodeType, decodeUInt32Value, decodeUInt64Value, decodeUninterpretedOption, decodeValue, defaultAny, defaultApi
+@docs decodeUInt64Value, decodeUninterpretedOption, decodeValue, defaultAny, defaultApi, defaultBoolValue, defaultBytesValue
 
-@docs defaultBoolValue, defaultBytesValue, defaultDescriptorProto, defaultDoubleValue, defaultDuration, defaultEmpty, defaultEnum
+@docs defaultDescriptorProto, defaultDoubleValue, defaultDuration, defaultEmpty, defaultEnum, defaultEnumDescriptorProto
 
-@docs defaultEnumDescriptorProto, defaultEnumOptions, defaultEnumValue, defaultEnumValueDescriptorProto, defaultEnumValueOptions
+@docs defaultEnumOptions, defaultEnumValue, defaultEnumValueDescriptorProto, defaultEnumValueOptions, defaultExtensionRangeOptions
 
-@docs defaultExtensionRangeOptions, defaultField, defaultFieldDescriptorProto, defaultFieldMask, defaultFieldOptions
+@docs defaultField, defaultFieldDescriptorProto, defaultFieldMask, defaultFieldOptions, defaultFileDescriptorProto
 
-@docs defaultFileDescriptorProto, defaultFileDescriptorSet, defaultFileOptions, defaultFloatValue, defaultGeneratedCodeInfo
+@docs defaultFileDescriptorSet, defaultFileOptions, defaultFloatValue, defaultGeneratedCodeInfo, defaultInt32Value, defaultInt64Value
 
-@docs defaultInt32Value, defaultInt64Value, defaultListValue, defaultMessageOptions, defaultMethod, defaultMethodDescriptorProto
+@docs defaultListValue, defaultMessageOptions, defaultMethod, defaultMethodDescriptorProto, defaultMethodOptions, defaultMixin
 
-@docs defaultMethodOptions, defaultMixin, defaultOneofDescriptorProto, defaultOneofOptions, defaultOption, defaultServiceDescriptorProto
+@docs defaultOneofDescriptorProto, defaultOneofOptions, defaultOption, defaultServiceDescriptorProto, defaultServiceOptions
 
-@docs defaultServiceOptions, defaultSourceCodeInfo, defaultSourceContext, defaultStringValue, defaultStruct, defaultTimestamp, defaultType
+@docs defaultSourceCodeInfo, defaultSourceContext, defaultStringValue, defaultStruct, defaultTimestamp, defaultType, defaultUInt32Value
 
-@docs defaultUInt32Value, defaultUInt64Value, defaultUninterpretedOption, defaultValue, encodeAny, encodeApi, encodeBoolValue
+@docs defaultUInt64Value, defaultUninterpretedOption, defaultValue, encodeAny, encodeApi, encodeBoolValue, encodeBytesValue
 
-@docs encodeBytesValue, encodeDescriptorProto, encodeDoubleValue, encodeDuration, encodeEmpty, encodeEnum, encodeEnumDescriptorProto
+@docs encodeDescriptorProto, encodeDoubleValue, encodeDuration, encodeEmpty, encodeEnum, encodeEnumDescriptorProto, encodeEnumOptions
 
-@docs encodeEnumOptions, encodeEnumValue, encodeEnumValueDescriptorProto, encodeEnumValueOptions, encodeExtensionRangeOptions
+@docs encodeEnumValue, encodeEnumValueDescriptorProto, encodeEnumValueOptions, encodeExtensionRangeOptions, encodeField
 
-@docs encodeField, encodeFieldDescriptorProto, encodeFieldMask, encodeFieldOptions, encodeFileDescriptorProto, encodeFileDescriptorSet
+@docs encodeFieldDescriptorProto, encodeFieldMask, encodeFieldOptions, encodeFileDescriptorProto, encodeFileDescriptorSet
 
 @docs encodeFileOptions, encodeFloatValue, encodeGeneratedCodeInfo, encodeInt32Value, encodeInt64Value, encodeListValue
 
@@ -175,9 +175,7 @@ To run it, add a dependency via `elm install` on [`elm-protocol-buffers`](https:
 
 @docs jsonEncodeTimestamp, jsonEncodeType, jsonEncodeUInt32Value, jsonEncodeUInt64Value, jsonEncodeUninterpretedOption, jsonEncodeValue
 
-@docs unwrapDescriptorProto, unwrapDescriptorProto, unwrapListValue, unwrapValue, unwrapValue, wrapDescriptorProto, wrapDescriptorProto
-
-@docs wrapListValue, wrapValue, wrapValue
+@docs unwrapDescriptorProto, unwrapListValue, unwrapValue, wrapDescriptorProto, wrapListValue, wrapValue
 
 -}