jsonapi-resources-anchor 2.15.1 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f44e1bcdbc48e8901c4cb5357fb7990b9941c0ad43717d12a0205d712648df0
-  data.tar.gz: 8ab3a2d26e535943cbf20897fe9d9c71d88de6c2c577d232bdbb4d603da1a188
+  metadata.gz: 8b9afc04c9c59a4f335d1fa3aa40315f95ca9a7aaa93c00cf2f0efe3e55cc696
+  data.tar.gz: 97bca89ce7e80fe1b7f3fd483d724c07bb22a0531b0414c5cd4f40fa7f760e4a
 SHA512:
-  metadata.gz: 657bf977322522f66ce8e834bedb62d93ede3d518d006827ae1e22e05d0ae50c8e717ba6cd4b63b08d17142024696785abd5472775e64179701680bd1bd72757
-  data.tar.gz: bb9a45159038719f0ded55b3d9d7fd54e166a2acb880229b777c2bb7aee90205604484ea3fb7a8a9ce8a3dade1eac7e368ccc9dc832aa35585b527cbf87cec95
+  metadata.gz: 828d73a8dcf74a00f4de0aa85d66c830775d187d65555599a2452e285666832b97a8fe2ed3a8cedad75cffc850349cca38b8991c4d638c5775d0a416e0fce034
+  data.tar.gz: 4995651e8c865620224d9515e816f767940232d3b6395274f4db488e0712e421e38997d47bcf472bf8f9d6f7f66ea3027109fe7f7ee9c55367f9ea741ffa458e

data/lib/anchor/concerns/typeable.rb

@@ -12,6 +12,8 @@ module Anchor
       def literals(values) = union(values.map { |value| literal(value) })
       def reference(...) = Anchor::Types::Reference.new(...)
       def references(names) = union(names.map { |name| reference(name) })
+      def resource(...) = Anchor::Types::Resource.new(...)
+      def resources(names) = union(names.map { |name| resource(name) })
       def record(value_type = Anchor::Types::Unknown) = Anchor::Types::Record.new(value_type)
 
       def boolean = Anchor::Types::Boolean

data/lib/anchor/inference/jsonapi/infer/anchor_def.rb

@@ -46,9 +46,9 @@ module Anchor::Inference::JSONAPI::Infer
         polymorphic = anchor_relationship.resources.present?
 
         base_type = if polymorphic
-          references(anchor_relationship.resources.map(&:anchor_schema_name))
+          resources(anchor_relationship.resources.map(&:anchor_schema_name))
         else
-          reference(anchor_relationship.resource.anchor_schema_name)
+          resource(anchor_relationship.resource.anchor_schema_name)
         end
 
         if rel.is_a?(::JSONAPI::Relationship::ToMany)

data/lib/anchor/inference/jsonapi/infer/filter.rb

@@ -0,0 +1,13 @@
+module Anchor::Inference::JSONAPI::Infer
+  class Filter < Base
+    def infer = object(properties)
+
+    private
+
+    def properties
+      filters.map { |name, _opts| property(name.to_s, unknown) }
+    end
+
+    def filters = @klass._allowed_filters
+  end
+end

data/lib/anchor/inference/jsonapi/infer/relationship_references.rb

@@ -16,7 +16,7 @@ module Anchor::Inference::JSONAPI::Infer
         return unknown
       end
 
-      return reference(rel.resource_klass.anchor_schema_name) unless rel.polymorphic?
+      return resource(rel.resource_klass.anchor_schema_name) unless rel.polymorphic?
 
       version = nil
       version ||= rel.respond_to?(:polymorphic_types) && :new # 0.11.0.beta2
@@ -27,10 +27,10 @@ module Anchor::Inference::JSONAPI::Infer
       when :old then rel.class.polymorphic_types
       end
 
-      return reference(rel.resource_klass.anchor_schema_name) unless polymorphic_types
+      return resource(rel.resource_klass.anchor_schema_name) unless polymorphic_types
 
       resource_klasses = polymorphic_types.map { |t| @klass.resource_klass_for(t) }
-      union(resource_klasses.map { |rk| reference(rk.anchor_schema_name) })
+      resources(resource_klasses.map(&:anchor_schema_name))
     end
 
     def relationships = @klass._relationships

data/lib/anchor/json_schema/schema_generator.rb

@@ -27,7 +27,7 @@ module Anchor::JSONSchema
     # @return [Anchor::Types::Object]
     def root_object
       properties = resources.map do |resource|
-        Types::Property.new(resource.anchor_schema_name.underscore, Types::Reference.new(resource.anchor_schema_name))
+        Types::Property.new(resource.anchor_schema_name.underscore, Types::Resource.new(resource.anchor_schema_name))
       end
 
       Types::Object.new(properties)

data/lib/anchor/region.rb

@@ -0,0 +1,14 @@
+module Anchor
+  class Region
+    def initialize(start_marker:, end_marker:)
+      @start_marker = start_marker
+      @end_marker = end_marker
+    end
+
+    def present?(text) = text.match?(regex)
+    def replace(text:, content:) = text.gsub(regex) { content[regex] }
+    def fence(content) = [@start_marker, content, @end_marker].join("\n")
+
+    def regex = /#{Regexp.escape(@start_marker)}(.*?)#{Regexp.escape(@end_marker)}/m
+  end
+end

data/lib/anchor/type_script/file_structure.rb

@@ -42,10 +42,8 @@ module Anchor::TypeScript
       export_string = FileUtils.export_code(@definition.name)
 
       if manually_editable
-        start_autogen = "// START AUTOGEN\n"
-        end_autogen = "// END AUTOGEN\n"
         unedited_export_def = "type #{@name} = Model;\n"
-        [start_autogen, imports_string, typedef, end_autogen, unedited_export_def, export_string].join("\n")
+        [Anchor::TypeScript::MultifileSaveService.default_region.fence([imports_string, typedef].join("\n")), unedited_export_def, export_string].join("\n")
       else
         [imports_string, typedef, export_string].join("\n")
       end
@@ -80,8 +78,9 @@ module Anchor::TypeScript
       case type
       when Anchor::Types::Array, Anchor::Types::Maybe, Anchor::Types::Identity then references_from_type(type.type)
       when Anchor::Types::Union then type.types.flat_map { |t| references_from_type(t) }
-      when Anchor::Types::Reference then [type]
+      when Anchor::Types::Resource then [type]
       when Anchor::Types::Unknown.singleton_class then []
+      else []
       end.uniq.sort_by(&:anchor_schema_name)
     end
 

data/lib/anchor/type_script/multifile_save_service.rb

@@ -1,9 +1,5 @@
 module Anchor::TypeScript
   class MultifileSaveService
-    START_MARKER = "// START AUTOGEN\n"
-    END_MARKER = "\n// END AUTOGEN\n"
-    REGEX = /#{Regexp.escape(START_MARKER)}(.*?)#{Regexp.escape(END_MARKER)}/m
-
     def self.call(...)
       new(...).call
     end
@@ -23,6 +19,12 @@ module Anchor::TypeScript
       modified_files
     end
 
+    def self.default_region
+      start_marker = "// START AUTOGEN\n"
+      end_marker = "// END AUTOGEN\n"
+      Anchor::Region.new(start_marker:, end_marker:)
+    end
+
     private
 
     def sha_hash_path
@@ -52,11 +54,8 @@ module Anchor::TypeScript
 
       existing_content = File.read(path)
 
-      new_content = if manually_editable?(existing_content)
-        replace_between(
-          existing: existing_content,
-          new: result.text,
-        )
+      new_content = if manually_editable_file?(existing_content)
+        self.class.default_region.replace(text: existing_content, content: result.text)
       else
         result.text
       end
@@ -65,20 +64,6 @@ module Anchor::TypeScript
       result.name
     end
 
-    def manually_editable?(text)
-      !text.match(REGEX).nil?
-    end
-
-    def replace_between(existing:, new:)
-      new_content = extract_between(new)
-      raise "Was @generator initialized with manually_editable: false?" unless new_content
-
-      existing.gsub(REGEX, "#{START_MARKER}\n#{new_content}\n#{END_MARKER}")
-    end
-
-    def extract_between(text)
-      match = text.match(REGEX)
-      match[1].strip
-    end
+    def manually_editable_file?(text) = self.class.default_region.present?(text)
   end
 end

data/lib/anchor/types.rb

@@ -1,5 +1,48 @@
 module Anchor
   module Types
+    class NodeStream
+      include Enumerable
+
+      def initialize(root) = @root = root
+
+      def each(&blk)
+        return enum_for(:each) unless blk
+        walk(@root, &blk)
+      end
+
+      def of_kind(klass)
+        select { |n| n.is_a?(Class) ? n <= klass : n.is_a?(klass) }
+      end
+
+      def enums = of_kind(Anchor::Types::Enum)
+      def references = of_kind(Anchor::Types::Reference)
+      def resources = of_kind(Anchor::Types::Resource)
+
+      private
+
+      def walk(node, &blk)
+        yield(node)
+        Anchor::Types.children(node).each { |c| walk(c, &blk) }
+      end
+    end
+
+    class << self
+      def children(node) = default_children(node)
+
+      def default_children(node)
+        case node
+        when Anchor::Types::Array, Anchor::Types::Maybe, Anchor::Types::Identity then [node.type]
+        when Anchor::Types::Union, Anchor::Types::Intersection then node.types
+        when Anchor::Types::Record then [node.value_type]
+        when Anchor::Types::Object then node.properties
+        when Anchor::Types::Property then [node.type]
+        else []
+        end
+      end
+
+      def each_node(node) = Anchor::Types::NodeStream.new(node)
+    end
+
     class String; end
     class Float; end
     class Integer; end
@@ -66,6 +109,8 @@ module Anchor
       end
     end
 
+    class Resource < Reference; end
+
     Property = Data.define(:name, :type, :optional, :description) do
       def initialize(name:, type:, optional: false, description: nil)
         super

data/lib/anchor/version.rb

@@ -1,3 +1,3 @@
 module Anchor
-  VERSION = "2.15.1"
+  VERSION = "2.16.0"
 end

data/lib/anchor/walk.rb

@@ -0,0 +1,11 @@
+module Anchor
+  module Types
+    class Walk
+      def self.call(...) = new(...).call
+
+      def initialize(type)
+        @type = type
+      end
+    end
+  end
+end

data/lib/jsonapi-resources-anchor.rb

@@ -1,4 +1,5 @@
 require "anchor/types"
+require "anchor/region"
 require "anchor/anchor"
 require "anchor/config"
 require "anchor/schema_generator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources-anchor
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.16.0
 platform: ruby
 authors:
 - Matt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-06 00:00:00.000000000 Z
+date: 2026-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-resources
@@ -31,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +111,7 @@ files:
 - lib/anchor/inference/jsonapi/infer.rb
 - lib/anchor/inference/jsonapi/infer/anchor_def.rb
 - lib/anchor/inference/jsonapi/infer/base.rb
+- lib/anchor/inference/jsonapi/infer/filter.rb
 - lib/anchor/inference/jsonapi/infer/rbs.rb
 - lib/anchor/inference/jsonapi/infer/relationship_references.rb
 - lib/anchor/inference/jsonapi/infer/resource.rb
@@ -139,6 +128,7 @@ files:
 - lib/anchor/json_schema/resource.rb
 - lib/anchor/json_schema/schema_generator.rb
 - lib/anchor/json_schema/serializer.rb
+- lib/anchor/region.rb
 - lib/anchor/schema.rb
 - lib/anchor/schema_generator.rb
 - lib/anchor/type_script/file_structure.rb
@@ -152,6 +142,7 @@ files:
 - lib/anchor/types/inference/active_record.rb
 - lib/anchor/types/inference/rbs.rb
 - lib/anchor/version.rb
+- lib/anchor/walk.rb
 - lib/jsonapi-resources-anchor.rb
 homepage:
 licenses: