mangrove 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b103efd7003a037c53a885f2ee19899ba8643770237c11bee728f06054611be7
-  data.tar.gz: 5e7557ab35bb32b8212b830ba5d06c6f32904cf2b40fd04de3f469770afb19d1
+  metadata.gz: c1fff1639273ef4d4926c8a962ccca0717601bf37b5358f2ba65d1d3dd6f30ea
+  data.tar.gz: beb11055a2c9fff7b68af66586a226b97fe53cec2d22fb67180f81d1613eb07c
 SHA512:
-  metadata.gz: d8f487f7ccd5ce99225cb19108eed5e3f89d1fece9048bd589ad78f4179a07ce370d47a876a66e30a992661cee5f40f970e3d3544b2a53e32677d58c3a5294c1
-  data.tar.gz: 1c3003bca763ff503c496f15d271d253a8510c33bdb74ade89708c91774d31fd0c0f29b06a89de4a3661ef4b1b8fa8e863f838d42b4a89aa7e02cca189abcfed
+  metadata.gz: 82a914cdda372923944b1ff69839cc46b7bc00e26b2aca4abe91308bbb7d40ac6ce2fe0959eb6a8ae0d4b09f029744d83f807fa6e2b4d1e4469fa4eba56edbc7
+  data.tar.gz: 4dc31bad6e1b504d1c175d787074d0e2623964bbeceeb292300e6c84103e5dc8917177e8d191060a759c28dae1eaf7ff4ab9fbb40557300f2630a5e1ea90c83b

data/lib/mangrove/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Mangrove
-  VERSION = "0.22.0"
+  VERSION = "0.23.0"
 end

data/lib/tapioca/dsl/compilers/mangrove_enum.rb

@@ -24,20 +24,24 @@ module Tapioca
             RBI::Helper.new("sealed")
           )
 
-          variants = constant.constants.filter_map { |variant_name|
-            maybe_variant = constant.const_get(variant_name, false)
+          variants = constant
+            .constants
+            .filter_map { |variant_name|
+              maybe_variant = constant.const_get(variant_name, false)
 
-            if maybe_variant.instance_variable_defined?(:@__mangrove__enum_inner_type)
-              maybe_variant
-            end
-          }
+              if maybe_variant.instance_variable_defined?(:@__mangrove__enum_inner_type)
+                maybe_variant
+              end
+            }
+            .sort_by { |variant| variant.name.to_s }
 
           inner_types = variants.map { |variant|
-            inner_type = variant.instance_variable_get(:@__mangrove__enum_inner_type).to_s
+            inner_type = runtime_type_to_type_name(variant.instance_variable_get(:@__mangrove__enum_inner_type))
             constant_type.create_class(variant.name.gsub(/.*::/, ""), superclass_name: constant_type.fully_qualified_name) { |variant_type|
               variant_type.create_method("initialize", parameters: [create_param("inner", type: inner_type)], return_type: "void")
               variant_type.create_method("inner", return_type: inner_type)
               variant_type.create_method("as_super", return_type: constant.name.to_s)
+              variant_type.sort_nodes!
             }
 
             inner_type
@@ -45,8 +49,34 @@ module Tapioca
 
           constant_type.create_method("inner", return_type: "T.any(#{inner_types.join(", ")})")
           constant_type.create_method("as_super", return_type: constant.name.to_s)
+          constant_type.sort_nodes!
         }
       end
+
+      private
+
+      sig { params(runtime_type: T.untyped).returns(String) }
+      def runtime_type_to_type_name(runtime_type)
+        if runtime_type.is_a?(Array)
+          content = runtime_type.map { |inner|
+            runtime_type_to_type_name(inner)
+          }.join(", ")
+
+          "[#{content}]"
+        elsif runtime_type.is_a?(Hash)
+          content = runtime_type.map { |k, v|
+            unless k.is_a?(Symbol) || k.is_a?(String)
+              raise "shape key must be Symbol or String"
+            end
+
+            "#{k}: #{runtime_type_to_type_name(v)}"
+          }.join(", ")
+
+          "{ #{content} }"
+        else
+          runtime_type.to_s
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangrove
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Kazuma Murata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime