jsonapi-resources-anchor 2.11.1 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e653189b74aa45f96e4fd6a0e7f50623ddec2482ba913a3b69d6c5a5265541d
-  data.tar.gz: 2ce59101060a5da7c1ad982012eab85112c4809deda41cea99170dac6bf88a4d
+  metadata.gz: 2a315147926ca737e06a0b594d33a8a5d435333abfb529c2ae8fade5342a641e
+  data.tar.gz: 13fd9b832e61b49bec167c58b45700b5b527fee09d4eb555f4dc4a4680395078
 SHA512:
-  metadata.gz: e9d7c8469c790d7461b9d959b45022648151ed429c082016115f7ea8c7f5229b4d1028bd72d7cd78b12be4ce93b502f246b78147bb65501c2a5bb2be7b84e286
-  data.tar.gz: 628ff8ae3d24a17d9698de87f6bb0010cb57c5f7d66c487c6a11a7f2fd1554a6800d60c944891668bdc8b20fdbabb894131bb2ae35248f02d650b6a1658733e2
+  metadata.gz: 48ad87a68af94a2774d734ac8b591e1e77f25f558706d0b9de4d95d81f136b7edbd5a161c62732d5c5f5e35e94bbf1352dfffc54ab44b2b3b4c7b6dbaf98e4cd
+  data.tar.gz: 4d0ed1301e0a22b61c867603b8484d7bcf7a925365caa7c90032981f19dab78e2487e3f239bfdd86bf71c75c9bc7cf9888bc62c8c42f27d6237053c64772af65

data/lib/anchor/json_schema/serializer.rb

@@ -21,6 +21,7 @@ module Anchor::JSONSchema
         when Anchor::Types::Object, Anchor::Types::Object.singleton_class then serialize_object(type)
         when Anchor::Types::Enum.singleton_class then { enum: type.values.map(&:second) }
         when Anchor::Types::Unknown.singleton_class then {}
+        when Anchor::Types::Intersection then {}
         else raise RuntimeError
         end
       end

data/lib/anchor/resource.rb

@@ -79,7 +79,13 @@ module Anchor
           enum = Anchor.config.infer_ar_enums && !method_defined && _model_class.try(:defined_enums).try(:[], model_method.to_s)
           column = !method_defined && _model_class.try(:columns_hash).try(:[], model_method.to_s)
 
-          if column
+          rbs_defined = defined?(::RBS) && ::RBS::VERSION.first == "3"
+
+          if resource_method_defined && rbs_defined
+            Anchor::Types::Inference::RBS.from(name.to_sym, resource_method)
+          elsif model_method_defined && rbs_defined
+            Anchor::Types::Inference::RBS.from(_model_class.name.to_sym, model_method.to_sym)
+          elsif column
             type = Anchor::Types::Inference::ActiveRecord::SQL.from(column)
 
             if enum
@@ -109,6 +115,12 @@ module Anchor
             else
               type
             end
+          elsif rbs_defined
+            # TODO: Methods may not be defined on the class at generation time?
+            [
+              Anchor::Types::Inference::RBS.from(name.to_sym, resource_method),
+              Anchor::Types::Inference::RBS.from(_model_class.name.to_sym, model_method.to_sym),
+            ].find { |t| t != Anchor::Types::Unknown } || Anchor::Types::Unknown
           else
             Anchor::Types::Unknown
           end

data/lib/anchor/type_script/serializer.rb

@@ -11,6 +11,7 @@ module Anchor::TypeScript
         when Anchor::Types::Null.singleton_class then "null"
         when Anchor::Types::Record, Anchor::Types::Record.singleton_class then "Record<string, #{type_string(type.try(:value_type) || Anchor::Types::Unknown)}>"
         when Anchor::Types::Union then type.types.map { |type| type_string(type, depth) }.join(" | ")
+        when Anchor::Types::Intersection then type.types.map { |type| "(#{type_string(type, depth)})" }.join(" & ")
         when Anchor::Types::Maybe then Anchor.config.maybe_as_union ? type_string(Anchor::Types::Union.new([type.type, Anchor::Types::Null]), depth) : "Maybe<#{type_string(type.type, depth)}>"
         when Anchor::Types::Array then Anchor.config.array_bracket_notation ? "(#{type_string(type.type, depth)})[]" : "Array<#{type_string(type.type, depth)}>"
         when Anchor::Types::Literal then serialize_literal(type.value)

data/lib/anchor/types/inference/rbs.rb

@@ -0,0 +1,83 @@
+module Anchor::Types::Inference
+  module RBS
+    class << self
+      # @param class_name [Symbol] e.g. :Exhaustive
+      # @param method_name [Symbol] e.g. :model_overridden
+      def from(class_name, method_name)
+        @loader ||= ::RBS::EnvironmentLoader.new.tap do |l|
+          l.add(path: Rails.root.join("sig"))
+        end
+
+        @env ||= ::RBS::Environment.from_loader(@loader).resolve_type_names
+
+        # TODO: Do we need both the absolute and non-absolute namespaces?
+        klass = @env.class_decls.keys.find { |kl| [class_name.to_s, "::#{class_name}"].include?(kl.to_s) }
+        return Types::Unknown unless klass
+
+        @builder ||= ::RBS::DefinitionBuilder.new(env: @env)
+        instance = @builder.build_instance(klass)
+
+        instance_method = instance.methods[method_name]
+        return Types::Unknown unless instance_method
+
+        method_types = instance.methods[method_name].method_types
+        return Types::Unknown unless method_types.length == 1
+
+        return_type = method_types.first.type.return_type
+        from_rbs_type(return_type)
+      end
+
+      private
+
+      def from_rbs_type(type)
+        case type
+        when ::RBS::Types::ClassInstance then from_class_instance(type)
+        when ::RBS::Types::Literal then Types::Literal.new(type.literal)
+        when ::RBS::Types::Bases::Bool then Types::Boolean
+        when ::RBS::Types::Bases::Nil then Types::Null
+        when ::RBS::Types::Bases::Void then Types::Unknown
+        when ::RBS::Types::Bases::Any then Types::Unknown
+        when ::RBS::Types::Optional then Types::Maybe.new(from_rbs_type(type.type))
+        when ::RBS::Types::Record then from_record(type)
+        when ::RBS::Types::Union then from_union(type)
+        when ::RBS::Types::Intersection then from_intersection(type)
+        when ::RBS::Types::Tuple then Types::Unknown # TODO
+        else Types::Unknown
+        end
+      end
+
+      def from_record(type)
+        properties = type.fields.map do |name, type|
+          Types::Property.new(name, from_rbs_type(type))
+        end
+        optional_properties = type.optional_fields.map do |name, type|
+          Types::Property.new(name, from_rbs_type(type), true)
+        end
+        Types::Object.new(properties + optional_properties)
+      end
+
+      def from_union(type)
+        types = type.types.map { |type| from_rbs_type(type) }
+        Types::Union.new(types)
+      end
+
+      def from_intersection(type)
+        types = type.types.map { |type| from_rbs_type(type) }
+        Types::Intersection.new(types)
+      end
+
+      def from_class_instance(type)
+        case type.name.to_s
+        when "::String" then Types::String
+        when "::Numeric" then Types::Float
+        when "::Integer" then Types::Integer
+        when "::Float" then Types::Float
+        when "::BigDecimal" then Types::String
+        when "::Boolean" then Types::Boolean
+        when "::Array" then Types::Array.new(from_rbs_type(type.args.first))
+        else Types::Unknown
+        end
+      end
+    end
+  end
+end

data/lib/anchor/types.rb

@@ -12,6 +12,7 @@ module Anchor
     Array = Struct.new(:type)
     Literal = Struct.new(:value)
     Union = Struct.new(:types)
+    Intersection = Struct.new(:types)
     Reference = Struct.new(:name) do
       def anchor_schema_name
         name

data/lib/anchor/version.rb

@@ -1,3 +1,3 @@
 module Anchor
-  VERSION = "2.11.1"
+  VERSION = "2.12.0"
 end

data/lib/jsonapi-resources-anchor.rb

@@ -12,6 +12,7 @@ require "anchor/concerns/schema_serializable"
 require "anchor/schema"
 require "anchor/types/inference/jsonapi"
 require "anchor/types/inference/active_record"
+require "anchor/types/inference/rbs"
 require "anchor/type_script/file_structure"
 require "anchor/type_script/types"
 require "anchor/type_script/schema_generator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources-anchor
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.12.0
 platform: ruby
 authors:
 - Matt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-26 00:00:00.000000000 Z
+date: 2025-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-resources
@@ -110,6 +110,7 @@ files:
 - lib/anchor/types.rb
 - lib/anchor/types/inference/active_record.rb
 - lib/anchor/types/inference/jsonapi.rb
+- lib/anchor/types/inference/rbs.rb
 - lib/anchor/version.rb
 - lib/jsonapi-resources-anchor.rb
 homepage:
@@ -117,7 +118,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/mattkhan/jsonapi-resources-anchor/blob/main/CHANGELOG.md
-  documentation_uri: https://anchor-gem.vercel.app/docs
+  documentation_uri: https://jsonapi-resources-anchor.up.railway.app/docs
   source_code_uri: https://github.com/mattkhan/jsonapi-resources-anchor
   github_repo: ssh://github.com/mattkhan/jsonapi-resources-anchor
 post_install_message: