rbs_protobuf 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563169bcedcc8c4392d8ad6c428c8fd4f31b5ca3373705439fa94a0e3f05b138
-  data.tar.gz: a55dd8d55cc9b866b101e51bb90ba88aa5e138251c3083b010671b03346d9db8
+  metadata.gz: 36689cc81f238ec33c07f1485ab4ff50f73fe365c1e84fcb925d34b0159859d3
+  data.tar.gz: a149120654ab2387721383d723bf3c54923385a66feff3a755ebce1056bf014c
 SHA512:
-  metadata.gz: d0ea93fd55f7b9efb4a864156e428033da4116499c99ef8f222949ae301b16fe302cd00c022ce2ad91ac9216dca508a084a9c59fb5b296dbd5e41d4d8dd6b205
-  data.tar.gz: c143b93fce43ede0ff094a26f2e51d3d72e6b35853852cc11e1b571f74abbe68ec7f579af206bec8213c908bb34d1421986f57a6f14417d316d7b666491c04ce
+  metadata.gz: f2bc3a51198e70d9617edf6df9c40e9fbfbac8061d3b849d6cf2ec21b839bd379bea6bf94d5a63dc134af173c773338f7b937b53597906e1bb3e85dd6c965c3c
+  data.tar.gz: 349c294046f6c7665dad74a0461311bf4c7edb58d9c8f804bd70b6c6ed11442d295086a59b9990465d478195c87c96e54180237e8fdd1a73c202e48ffde73b60

data/.github/workflows/test.yml

@@ -12,12 +12,13 @@ jobs:
     strategy:
       matrix:
         container_tag:
-          - 2.7-bionic
-          - 3.0-focal
-          - 3.1-focal
+          - 3.0-dev-focal
+          - 3.1-dev-jammy
+          - 3.2-dev-jammy
         protoc_version:
-          - 3.18.2
-          - 3.19.4
+          - "3.18.2"
+          - "3.19.4"
+          - "24.0"
     container:
       image: rubylang/ruby:${{ matrix.container_tag }}
     steps:
@@ -31,8 +32,9 @@ jobs:
           mv bin/protoc /usr/local/bin/protoc
           protoc --version
       - uses: actions/checkout@v3
-        with:
-          submodules: true
+      - name: Set up git safe.directory
+        run: |
+          git config --global --add safe.directory /__w/rbs_protobuf/rbs_protobuf
       - name: Run test
         run: |
           ruby -v

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/gem_rbs_collection"]
-	path = vendor/gem_rbs_collection
-	url = git@github.com:ruby/gem_rbs_collection.git

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.0 (2023-08-16)
+
+* Support optional fields in proto3 ([\#32](https://github.com/square/rbs_protobuf/pull/32))
+* Update Steep to 1.5 and RBS to 3.1 ([\#30](https://github.com/square/rbs_protobuf/pull/30))
+
 ## 1.0.0 (2022-04-25)
 
 This is version 1.0.0. 🎉

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
-gem "steep"
-gem "rbs"
+gem "steep", require: false
+gem "rbs", "~> 3.1"
 
 gem "protobuf", "~> 3.10"

data/Gemfile.lock

@@ -1,59 +1,72 @@
 PATH
   remote: .
   specs:
-    rbs_protobuf (1.0.0)
+    rbs_protobuf (1.1.0)
       activesupport (>= 4.0)
       rbs (>= 2.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
+    csv (3.2.7)
     ffi (1.15.5)
-    i18n (1.10.0)
+    fileutils (1.7.1)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    language_server-protocol (3.16.0.3)
-    listen (3.7.1)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.5.3)
     middleware (0.1.0)
-    minitest (5.15.0)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    minitest (5.19.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     protobuf (3.10.5)
       activesupport (>= 3.2)
       middleware
       thor
       thread_safe
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (12.3.3)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.3.2)
-    steep (0.52.1)
+    rbs (3.1.3)
+    securerandom (0.2.2)
+    steep (1.5.3)
       activesupport (>= 5.1)
+      concurrent-ruby (>= 1.1.10)
+      csv (>= 3.0.9)
+      fileutils (>= 1.1.0)
+      json (>= 2.1.0)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
-      parallel (>= 1.0.0)
-      parser (>= 3.0)
+      logger (>= 1.3.0)
+      parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.3.2)
+      rbs (>= 3.1.0)
+      securerandom (>= 0.1)
+      strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
+    strscan (3.0.6)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -62,7 +75,7 @@ DEPENDENCIES
   minitest (~> 5.0)
   protobuf (~> 3.10)
   rake (~> 12.0)
-  rbs
+  rbs (~> 3.1)
   rbs_protobuf!
   steep
 

data/Rakefile

@@ -27,7 +27,8 @@ namespace :example do
       "-I#{proto_path}",
       "example/a.proto",
       "example/b.proto",
-      "example/c.proto"
+      "example/c.proto",
+      "example/d.proto"
     )
     sh(
       { "RBS_PROTOBUF_BACKEND" => "protobuf", "RBS_PROTOBUF_EXTENSION" => "true" },
@@ -35,7 +36,8 @@ namespace :example do
       "--rbs_out=example/protobuf-gem",
       "-Iexample",
       "example/a.proto",
-      "example/b.proto"
+      "example/b.proto",
+      "example/d.proto"
     )
     sh(
       { "RBS_PROTOBUF_BACKEND" => "protobuf", "RBS_PROTOBUF_EXTENSION" => "true", "RUBYOPT" => "-rbundler/setup -Iexample/protobuf-gem -rc.pb" },

data/Steepfile

@@ -2,7 +2,6 @@ D = Steep::Diagnostic
 
 target :lib do
   signature "sig"
-  signature "vendor/gem_rbs_collection/gems/protobuf"
   check "lib"
 
   configure_code_diagnostics do |hash|

data/bin/protoc-gen-dumper

@@ -7,5 +7,7 @@ require "rbs_protobuf"
 input = STDIN.read()
 File.write(ENV["PROTOC_DUMPER_OUT"] || "a.pb.out", input)
 
-response = Google::Protobuf::Compiler::CodeGeneratorResponse.new
+response = Google::Protobuf::Compiler::CodeGeneratorResponse.new(
+  :supported_features => ::Google::Protobuf::Compiler::CodeGeneratorResponse::Feature::FEATURE_PROTO3_OPTIONAL.to_i
+)
 print Google::Protobuf::Compiler::CodeGeneratorResponse.encode(response)

data/example/d.proto

@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+message Foo {
+  string bar = 2;
+  optional string baz = 1;
+}

data/lib/rbs_protobuf/translator/base.rb

@@ -14,7 +14,7 @@ module RBSProtobuf
       end
 
       def response
-        @response ||= Google::Protobuf::Compiler::CodeGeneratorResponse.new
+        @response ||= Google::Protobuf::Compiler::CodeGeneratorResponse.new(:supported_features => ::Google::Protobuf::Compiler::CodeGeneratorResponse::Feature::FEATURE_PROTO3_OPTIONAL.to_i)
       end
 
       def generate_rbs!

data/lib/rbs_protobuf/translator/protobuf_gem.rb

@@ -188,96 +188,114 @@ module RBSProtobuf
 
           class_decl.members << RBS::AST::Members::MethodDefinition.new(
             name: :initialize,
-            types: [
-              factory.method_type(
-                type: factory.function().update(
-                  optional_keywords: field_types.transform_values {|pair|
-                    _, _, init_type = pair
-                    factory.param(init_type)
-                  }
-                )
-              )
+            overloads: [
+              RBS::AST::Members::MethodDefinition::Overload.new(
+                method_type: factory.method_type(
+                  type: factory.function().update(
+                    optional_keywords: field_types.transform_values {|pair|
+                      _, _, init_type = pair
+                      factory.param(init_type)
+                    }
+                  )
+                ),
+                annotations: []
+              ),
             ],
             annotations: [],
             comment: nil,
             location: nil,
-            overload: false,
+            overloading: false,
+            visibility: nil,
             kind: :instance
           )
 
           unless field_types.empty?
             class_decl.members << RBS::AST::Members::MethodDefinition.new(
               name: :[],
-              types:
+              overloads:
                 field_types.map do |field_name, pair|
                   read_type, _ = pair
 
-                  factory.method_type(
-                    type: factory.function(read_type).update(
-                      required_positionals: [
-                        factory.param(factory.literal_type(field_name))
-                      ]
-                    )
-                  )
-                end +
-                  [
-                    factory.method_type(
-                      type: factory.function(factory.untyped).update(
+                  RBS::AST::Members::MethodDefinition::Overload.new(
+                    method_type: factory.method_type(
+                      type: factory.function(read_type).update(
                         required_positionals: [
-                          factory.param(RBS::BuiltinNames::Symbol.instance_type)
+                          factory.param(factory.literal_type(field_name))
                         ]
                       )
+                    ),
+                    annotations: []
+                  )
+                end +
+                  [
+                    RBS::AST::Members::MethodDefinition::Overload.new(
+                      method_type: factory.method_type(
+                        type: factory.function(factory.untyped).update(
+                          required_positionals: [
+                            factory.param(RBS::BuiltinNames::Symbol.instance_type)
+                          ]
+                        )
+                      ),
+                      annotations: []
                     )
                   ],
               annotations: [],
               comment: nil,
               location: nil,
-              overload: false,
+              overloading: false,
+              visibility: nil,
               kind: :instance
             )
 
             class_decl.members << RBS::AST::Members::MethodDefinition.new(
               name: :[]=,
-              types:
+              overloads:
                 field_types.flat_map do |field_name, pair|
                   read_type, write_types = pair
 
                   [read_type, *write_types].map do |type|
-                    if (type_param, type_var = interface_type?(type))
-                      factory.method_type(
-                        type: factory.function(type_var).update(
-                          required_positionals: [
-                            factory.literal_type(field_name),
-                            type_var
-                          ].map {|t| factory.param(t) }
+                    method_type =
+                      if (type_param, type_var = interface_type?(type))
+                        factory.method_type(
+                          type: factory.function(type_var).update(
+                            required_positionals: [
+                              factory.literal_type(field_name),
+                              type_var
+                            ].map {|t| factory.param(t) }
+                          )
+                        ).update(type_params: [type_param])
+                      else
+                        factory.method_type(
+                          type: factory.function(type).update(
+                            required_positionals: [
+                              factory.literal_type(field_name),
+                              type
+                            ].map {|t| factory.param(t) }
+                          )
                         )
-                      ).update(type_params: [type_param])
-                    else
-                      factory.method_type(
-                        type: factory.function(type).update(
-                          required_positionals: [
-                            factory.literal_type(field_name),
-                            type
-                          ].map {|t| factory.param(t) }
-                        )
-                      )
-                    end
+                      end
+
+                    RBS::AST::Members::MethodDefinition::Overload.new(method_type: method_type, annotations: [])
                   end
                 end +
                   [
-                    factory.method_type(
-                      type: factory.function(factory.untyped).update(
-                        required_positionals: [
-                          RBS::BuiltinNames::Symbol.instance_type,
-                          factory.untyped
-                        ].map {|t| factory.param(t) }
-                      )
+                    RBS::AST::Members::MethodDefinition::Overload.new(
+                      method_type: factory.method_type(
+                        type: factory.function(factory.untyped).update(
+                          required_positionals: [
+                            RBS::BuiltinNames::Symbol.instance_type,
+                            factory.untyped
+                          ].map {|t| factory.param(t) }
+                        )
+                      ),
+                      annotations: []
                     )
                   ],
               annotations: [],
               comment: nil,
               location: nil,
-              overload: false,
+              overloading: false,
+              visibility: nil,
               kind: :instance
             )
           end
@@ -286,15 +304,19 @@ module RBSProtobuf
             if field.type == FieldDescriptorProto::Type::TYPE_BOOL
               class_decl.members << RBS::AST::Members::MethodDefinition.new(
                 name: :"#{field.name}?",
-                types: [
-                  factory.method_type(
-                    type: factory.function(factory.bool_type)
+                overloads: [
+                  RBS::AST::Members::MethodDefinition::Overload.new(
+                    method_type: factory.method_type(
+                      type: factory.function(factory.bool_type)
+                    ),
+                    annotations: []
                   )
                 ],
                 annotations: [],
                 comment: nil,
                 location: nil,
-                overload: false,
+                overloading: false,
+                visibility: nil,
                 kind: :instance
               )
             end
@@ -310,20 +332,24 @@ module RBSProtobuf
           ).tap do |interface_decl|
             interface_decl.members << RBS::AST::Members::MethodDefinition.new(
               name: :to_proto,
-              types: [
-                factory.method_type(
-                  type: factory.function(class_instance_type)
+              overloads: [
+                RBS::AST::Members::MethodDefinition::Overload.new(
+                  method_type: factory.method_type(
+                    type: factory.function(class_instance_type)
+                  ),
+                  annotations: []
                 )
               ],
               annotations: [],
               comment: nil,
               location: nil,
-              overload: false,
+              overloading: false,
+              visibility: nil,
               kind: :instance
             )
           end
 
-          class_decl.members << RBS::AST::Declarations::Alias.new(
+          class_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("init"),
             type_params: [],
             type: factory.union_type(class_instance_type, TO_PROTO[]),
@@ -332,7 +358,7 @@ module RBSProtobuf
             location: nil
           )
 
-          class_decl.members << RBS::AST::Declarations::Alias.new(
+          class_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("field_array"),
             type_params: [],
             type: FIELD_ARRAY[
@@ -344,7 +370,7 @@ module RBSProtobuf
             location: nil
           )
 
-          class_decl.members << RBS::AST::Declarations::Alias.new(
+          class_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("field_hash"),
             type_params: [RBS::AST::TypeParam.new(name: :KEY, variance: :invariant, upper_bound: nil, location: nil)],
             type: FIELD_HASH[
@@ -357,7 +383,7 @@ module RBSProtobuf
             location: nil
           )
 
-          class_decl.members << RBS::AST::Declarations::Alias.new(
+          class_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("array"),
             type_params: [],
             type: RBS::BuiltinNames::Array.instance_type(factory.union_type(class_instance_type, TO_PROTO[])),
@@ -366,7 +392,7 @@ module RBSProtobuf
             location: nil
           )
 
-          class_decl.members << RBS::AST::Declarations::Alias.new(
+          class_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("hash"),
             type_params: [RBS::AST::TypeParam.new(name: :KEY, variance: :invariant, upper_bound: nil, location: nil)],
             type: RBS::BuiltinNames::Hash.instance_type(
@@ -567,41 +593,52 @@ module RBSProtobuf
         unless write_types.empty?
           members << RBS::AST::Members::MethodDefinition.new(
             name: :"#{name}=",
-            types:
+            overloads:
               write_types.map do |write_type|
-                if (type_param, type = interface_type?(write_type))
-                  factory.method_type(
-                    type: factory.function(type).update(
-                      required_positionals:[factory.param(type)]
-                    )
-                  ).update(type_params: [type_param])
-                else
-                  factory.method_type(
-                    type: factory.function(write_type).update(
-                      required_positionals:[factory.param(write_type)]
+                method_type =
+                  if (type_param, type = interface_type?(write_type))
+                    factory.method_type(
+                      type: factory.function(type).update(
+                        required_positionals:[factory.param(type)]
+                      )
+                    ).update(type_params: [type_param])
+                  else
+                    factory.method_type(
+                      type: factory.function(write_type).update(
+                        required_positionals:[factory.param(write_type)]
+                      )
                     )
-                  )
-                end
+                  end
+
+                RBS::AST::Members::MethodDefinition::Overload.new(
+                  method_type: method_type,
+                  annotations: []
+                )
               end,
             annotations: [],
             comment: comment,
             location: nil,
-            overload: true,
+            overloading: true,
+            visibility: nil,
             kind: :instance
           )
         end
 
         members << RBS::AST::Members::MethodDefinition.new(
           name: :"#{name}!",
-          types: [
-            factory.method_type(
-              type: factory.function(factory.optional_type(read_type))
+          overloads: [
+            RBS::AST::Members::MethodDefinition::Overload.new(
+              method_type: factory.method_type(
+                type: factory.function(factory.optional_type(read_type))
+              ),
+              annotations: []
             )
           ],
           annotations: [],
           comment: nil,
           location: nil,
-          overload: false,
+          overloading: false,
+          visibility: nil,
           kind: :instance
         )
       end
@@ -638,7 +675,7 @@ module RBSProtobuf
             factory.literal_type(v.number)
           end.uniq
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: factory.type_name("names"),
             type_params: [],
             type: factory.union_type(*names),
@@ -647,7 +684,7 @@ module RBSProtobuf
             annotations: []
           )
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: factory.type_name("strings"),
             type_params: [],
             type: factory.union_type(*strings),
@@ -656,7 +693,7 @@ module RBSProtobuf
             annotations: []
           )
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: factory.type_name("tags"),
             type_params: [],
             type: factory.union_type(*tags),
@@ -665,7 +702,7 @@ module RBSProtobuf
             annotations: []
           )
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: factory.type_name("values"),
             type_params: [],
             type: factory.union_type(
@@ -712,7 +749,7 @@ module RBSProtobuf
           enum_instance_type = factory.instance_type(RBS::TypeName.new(name: enum_name.to_sym, namespace: RBS::Namespace.empty))
           values_type = factory.alias_type(RBS::TypeName.new(name: :values, namespace: RBS::Namespace.empty))
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("init"),
             type_params: [],
             type: factory.union_type(enum_instance_type, values_type),
@@ -721,7 +758,7 @@ module RBSProtobuf
             location: nil
           )
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("field_array"),
             type_params: [],
             type: FIELD_ARRAY[
@@ -733,7 +770,7 @@ module RBSProtobuf
             location: nil
           )
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("field_hash"),
             type_params: [RBS::AST::TypeParam.new(name: :KEY, variance: :invariant, upper_bound: nil, location: nil)],
             type: FIELD_HASH[
@@ -746,7 +783,7 @@ module RBSProtobuf
             location: nil
           )
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("array"),
             type_params: [],
             type: RBS::BuiltinNames::Array.instance_type(factory.union_type(enum_instance_type, values_type)),
@@ -755,7 +792,7 @@ module RBSProtobuf
             location: nil
           )
 
-          enum_decl.members << RBS::AST::Declarations::Alias.new(
+          enum_decl.members << RBS::AST::Declarations::TypeAlias.new(
             name: TypeName("hash"),
             type_params: [RBS::AST::TypeParam.new(name: :KEY, variance: :invariant, upper_bound: nil, location: nil)],
             type: RBS::BuiltinNames::Hash.instance_type(
@@ -790,49 +827,59 @@ module RBSProtobuf
 
           class_decl.members << RBS::AST::Members::MethodDefinition.new(
             name: :[],
-            types: [
-              factory.method_type(
-                type: factory.function(read_type).update(
-                  required_positionals: [
-                    factory.param(factory.literal_type(field_name))
-                  ]
-                )
+            overloads: [
+              RBS::AST::Members::MethodDefinition::Overload.new(
+                method_type: factory.method_type(
+                  type: factory.function(read_type).update(
+                    required_positionals: [
+                      factory.param(factory.literal_type(field_name))
+                    ]
+                  )
+                ),
+                annotations: []
               )
             ],
             annotations: [],
             comment: nil,
             location: nil,
-            overload: true,
+            overloading: true,
+            visibility: nil,
             kind: :instance
           )
 
           class_decl.members << RBS::AST::Members::MethodDefinition.new(
             name: :[]=,
-            types: [read_type, *write_types].map do |write_type|
-              if (type_param, type_var = interface_type?(write_type))
-                factory.method_type(
-                  type: factory.function(type_var).update(
-                    required_positionals: [
-                      factory.param(factory.literal_type(field_name)),
-                      factory.param(type_var)
-                    ]
-                  )
-                ).update(type_params: [type_param])
-              else
-                factory.method_type(
-                  type: factory.function(write_type).update(
-                    required_positionals: [
-                      factory.param(factory.literal_type(field_name)),
-                      factory.param(write_type)
-                    ]
+            overloads: [read_type, *write_types].map do |write_type|
+              method_type =
+                if (type_param, type_var = interface_type?(write_type))
+                  factory.method_type(
+                    type: factory.function(type_var).update(
+                      required_positionals: [
+                        factory.param(factory.literal_type(field_name)),
+                        factory.param(type_var)
+                      ]
+                    )
+                  ).update(type_params: [type_param])
+                else
+                  factory.method_type(
+                    type: factory.function(write_type).update(
+                      required_positionals: [
+                        factory.param(factory.literal_type(field_name)),
+                        factory.param(write_type)
+                      ]
+                    )
                   )
-                )
-              end
+                end
+              RBS::AST::Members::MethodDefinition::Overload.new(
+                method_type: method_type,
+                annotations: []
+              )
             end,
             annotations: [],
             comment: nil,
             location: nil,
-            overload: true,
+            overloading: true,
+            visibility: nil,
             kind: :instance
           )
         end

data/lib/rbs_protobuf/version.rb

@@ -1,3 +1,3 @@
 module RBSProtobuf
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/rbs_collection.lock.yaml

@@ -1,76 +1,61 @@
 ---
 sources:
-- name: ruby/gem_rbs_collection
+- type: git
+  name: ruby/gem_rbs_collection
+  revision: 8a678b2ec20e9d594055f53745399814e3a887dc
   remote: https://github.com/ruby/gem_rbs_collection.git
-  revision: main
   repo_dir: gems
 path: ".gem_rbs_collection"
 gems:
-- name: rbs
-  version: 2.3.2
+- name: abbrev
+  version: '0'
   source:
-    type: rubygems
+    type: stdlib
 - name: activesupport
-  version: '6.0'
+  version: '7.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: c7b9329222debd0b8a4a85c0ccdae6588fedd57a
+    revision: 8a678b2ec20e9d594055f53745399814e3a887dc
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
-- name: ast
-  version: '2.4'
+- name: concurrent-ruby
+  version: '1.1'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: c7b9329222debd0b8a4a85c0ccdae6588fedd57a
+    revision: 8a678b2ec20e9d594055f53745399814e3a887dc
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: date
+  version: '0'
+  source:
+    type: stdlib
 - name: i18n
   version: '1.10'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: c7b9329222debd0b8a4a85c0ccdae6588fedd57a
+    revision: 8a678b2ec20e9d594055f53745399814e3a887dc
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
-- name: listen
-  version: '3.2'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: c7b9329222debd0b8a4a85c0ccdae6588fedd57a
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: parallel
-  version: '1.20'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: c7b9329222debd0b8a4a85c0ccdae6588fedd57a
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: rainbow
-  version: '3.0'
+- name: json
+  version: '0'
   source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: c7b9329222debd0b8a4a85c0ccdae6588fedd57a
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
+    type: stdlib
 - name: logger
   version: '0'
   source:
     type: stdlib
-- name: set
+- name: minitest
   version: '0'
   source:
     type: stdlib
-- name: pathname
+- name: monitor
   version: '0'
   source:
     type: stdlib
-- name: json
+- name: mutex_m
   version: '0'
   source:
     type: stdlib
@@ -78,19 +63,27 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: rubygems
+- name: pathname
   version: '0'
   source:
     type: stdlib
-- name: tsort
-  version: '0'
+- name: protobuf
+  version: 3.10.3
   source:
-    type: stdlib
-- name: monitor
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 8a678b2ec20e9d594055f53745399814e3a887dc
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rbs
+  version: 3.1.3
+  source:
+    type: rubygems
+- name: rdoc
   version: '0'
   source:
     type: stdlib
-- name: date
+- name: securerandom
   version: '0'
   source:
     type: stdlib
@@ -98,11 +91,12 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: mutex_m
+- name: time
   version: '0'
   source:
     type: stdlib
-- name: time
+- name: tsort
   version: '0'
   source:
     type: stdlib
+gemfile_lock_path: Gemfile.lock

data/rbs_collection.yaml

@@ -8,12 +8,4 @@ sources:
 # A directory to install the downloaded RBSs
 path: .gem_rbs_collection
 
-gems:
-  # Skip loading rbs gem's RBS.
-  # It's unnecessary if you don't use rbs as a library.
-  - name: rbs
-  - name: activesupport
-  - name: protobuf
-    ignore: true
-  - name: rbs_protobuf
-    ignore: true
+gems: []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_protobuf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -49,7 +49,6 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".protoc-version"
 - ".rakeTasks"
 - ".travis.yml"
 - CHANGELOG.md
@@ -69,6 +68,7 @@ files:
 - example/a.proto
 - example/b.proto
 - example/c.proto
+- example/d.proto
 - example/protobuf_gem_example.rb
 - exe/protoc-gen-rbs
 - lib/rbs_protobuf.rb
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Generate RBS files from .proto files

data/.protoc-version

@@ -1 +0,0 @@
-3.9.0-square-1.0