foobara 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbe07dc4815630bc663e2d203a40e6ee507e7a35cd800937ed075c717b349842
-  data.tar.gz: aa8b0cfe1e3dc73a9d5633a709589b8cd51efea18d901d801a33700bfba390d3
+  metadata.gz: 3dedef3834e7b4624c4087f4c551c89ccd89eb7b775da12248142fa85b113f15
+  data.tar.gz: 6c87f09dfffd75f143b3fa8f49d0c66e670558d62af49f240b5a1a210560d2d1
 SHA512:
-  metadata.gz: 7dba889d195cd4e4f6cf6edc640f6e2b3090822e272961aa0041bd7fa1e30ac75d2a624b8ca7433aa43d4bc16401416664c0666bfcfcf29e7a1a0128555e76a9
-  data.tar.gz: e123cb980d054dd4c853143f22c35423712891feb1a8bf69a1f33af8f9fa0c85ac47b2195542a09a3077db8926843b980f77ccc3d05b4185a312ee5aa00ae971
+  metadata.gz: e9c8b7dc58977b80469b01811b525a0402b381baf54337806eb00c05ef2b9f90b3e9078a521b221f234113387f52524b01862129c22c93871b33cf89fe4286e0
+  data.tar.gz: 241fa758312ee4570da8732246c450e161c27dc0c1ca7344a99d8832d7a34058ed601037133389d0033ecac31218960dc22846b3fccb426d3883f2b22bba7db9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# [0.5.2] - 2026-02-23
+
+- Fix bug that results in duplicate required entries when merging declarations
+- Communicate which nested attributes are guaranteed to exist to help external generators
+
 # [0.5.1] - 2026-01-29
 
 - Fix bug where checking defaults on a type reference explodes

data/projects/command_connectors/spec/command_connector_spec.rb

@@ -1850,12 +1850,12 @@ RSpec.describe Foobara::CommandConnector do
             expect(JSON.parse(response.body)).to eq(
               "stuff2" => {
                 "things2" => [
-                  "user" => {
+                  { "user" => {
                     "id" => user_id,
                     "name" => "whatever",
                     "foo" => "bar",
                     "username" => "some_username"
-                  }
+                  } }
                 ]
               }
             )

data/projects/entities/Guardfile

@@ -0,0 +1,6 @@
+guard :rspec, all_after_pass: false, all_on_start: true, cmd: "bundle exec rspec", failed_mode: :focus do
+  watch(%r{^spec/(.+)_spec\.rb$})
+  watch(%r{^src/(.+)\.rb$}) { "spec/" }
+  watch(%r{^lib/(.+)\.rb$}) { "spec/" }
+  watch(%r{^spec/spec_helper.rb$}) { "spec/" }
+end

data/projects/entities/projects/model/src/concerns/reflection.rb

@@ -23,10 +23,57 @@ module Foobara
               model_name: foobara_model_name,
               model_base_class: foobara_type.declaration_data[:model_base_class],
               model_class: foobara_type.declaration_data[:model_class],
-              delegates: foobara_delegates,
+              delegates: foobara_delegates_manifest,
               private: foobara_private_attribute_names
             )
           end
+
+          private
+
+          def foobara_delegates_manifest
+            if foobara_delegates&.any?
+              manifest = foobara_delegates.dup
+              guaranteed_to_exist = []
+
+              delegates.each_pair do |attribute_name, delegate_manifest|
+                data_path = DataPath.for(delegate_manifest[:data_path])
+
+                if delegate_guaranteed_to_exist?(data_path)
+                  guaranteed_to_exist << attribute_name
+                end
+              end
+
+              if guaranteed_to_exist.any?
+                manifest[:guaranteed_to_exist] = guaranteed_to_exist
+              end
+
+              manifest
+            end
+          end
+
+          def delegate_guaranteed_to_exist?(data_path)
+            parent_path = data_path.parent
+            return true unless parent_path
+
+            return false unless delegate_guaranteed_to_exist?(parent_path)
+
+            parent_type = model_type.type_at_path(parent_path)
+
+            parent_type = if parent_type.extends?(BuiltinTypes[:model])
+                            parent_type.target_class.attributes_type
+                          elsif parent_type.extends?(BuiltinTypes[:attributes])
+                            parent_type
+                          end
+
+            return true unless parent_type
+
+            symbol = data_path.last
+
+            parent_declaration_data = parent_type.declaration_data
+
+            parent_declaration_data[:required]&.include?(symbol) ||
+              parent_declaration_data[:defaults]&.key?(symbol)
+          end
         end
       end
     end

data/projects/entities/spec/model/types_spec.rb

@@ -49,7 +49,8 @@ RSpec.describe Foobara::Model do
         expect(manifest[:delegates]).to eq(
           username: {
             data_path: "auth_user.username"
-          }
+          },
+          guaranteed_to_exist: [:username]
         )
 
         expect(manifest[:declaration_data][:delegates]).to eq(
@@ -77,7 +78,8 @@ RSpec.describe Foobara::Model do
             username: {
               data_path: "auth_user.username",
               writer: true
-            }
+            },
+            guaranteed_to_exist: [:username]
           )
 
           expect(manifest[:declaration_data][:delegates]).to eq(
@@ -150,7 +152,8 @@ RSpec.describe Foobara::Model do
         expect(manifest[:delegates]).to eq(
           username: {
             data_path: "auth_user.username"
-          }
+          },
+          guaranteed_to_exist: [:username]
         )
 
         expect(manifest[:declaration_data][:delegates]).to eq(
@@ -206,7 +209,8 @@ RSpec.describe Foobara::Model do
             username: {
               data_path: "auth_user.username",
               writer: true
-            }
+            },
+            guaranteed_to_exist: [:username]
           )
 
           expect(manifest[:declaration_data][:delegates]).to eq(

data/projects/manifest/Guardfile

@@ -0,0 +1,6 @@
+guard :rspec, all_after_pass: false, all_on_start: true, cmd: "bundle exec rspec", failed_mode: :focus do
+  watch(%r{^spec/(.+)_spec\.rb$})
+  watch(%r{^src/(.+)\.rb$}) { "spec/" }
+  watch(%r{^lib/(.+)\.rb$}) { "spec/" }
+  watch(%r{^spec/spec_helper.rb$}) { "spec/" }
+end

data/projects/manifest/spec/model_spec.rb

@@ -71,4 +71,56 @@ RSpec.describe Foobara::Manifest do
       it { is_expected.to be(true) }
     end
   end
+
+  describe "#guaranteed_to_exist?" do
+    subject { model.guaranteed_to_exist?(attribute_name) }
+
+    let(:attribute_name) { :name }
+
+    context "when the model has no delegates" do
+      let(:some_model) do
+        stub_class "SomeModel", Foobara::Model do
+          attributes do
+            name :string
+          end
+        end
+      end
+
+      it { is_expected.to be(false) }
+    end
+
+    context "when it's nested attributes" do
+      let(:some_model) do
+        stub_class "SomeModel", Foobara::Model do
+          attributes do
+            name do
+              first :string
+              last :string
+            end
+          end
+
+          delegate_attribute :first, :name
+        end
+      end
+
+      it { is_expected.to be(false) }
+    end
+
+    context "when required all the way down" do
+      let(:some_model) do
+        stub_class "SomeModel", Foobara::Model do
+          attributes do
+            name_parts :required do
+              name :string, :required
+              surname :string
+            end
+          end
+
+          delegate_attribute :name, :name_parts
+        end
+      end
+
+      it { is_expected.to be(true) }
+    end
+  end
 end

data/projects/manifest/src/model.rb

@@ -5,12 +5,24 @@ module Foobara
     class Model < Type
       self.category_symbol = :type
 
+      optional_keys :delegates
+
       alias model_manifest relevant_manifest
 
       def attributes_type
         Attributes.new(root_manifest, [*manifest_path, :declaration_data, :attributes_declaration])
       end
 
+      def guaranteed_to_exist?(attribute_name)
+        return true if attributes_type.required?(attribute_name)
+
+        guaranteed_to_exist = DataPath.value_at([:delegates, :guaranteed_to_exist], relevant_manifest)
+
+        return false unless guaranteed_to_exist
+
+        guaranteed_to_exist.include?(attribute_name.to_sym) || guaranteed_to_exist.include?(attribute_name.to_s)
+      end
+
       def attribute_names
         attributes_type.attribute_names
       end

data/projects/typesystem/projects/common/src/data_path.rb

@@ -221,6 +221,12 @@ module Foobara
       path.empty?
     end
 
+    def parent
+      if path.size > 1
+        DataPath.new(path[0..-2])
+      end
+    end
+
     private
 
     def normalize_all(key_parts)

data/projects/typesystem/projects/type_declarations/src/attributes.rb

@@ -17,7 +17,7 @@ module Foobara
             end
 
             if type_required && !type_required.empty?
-              required += type_required
+              required |= type_required
             end
           end
 

data/version.rb

@@ -1,6 +1,6 @@
 module Foobara
   module Version
-    VERSION = "0.5.1".freeze
+    VERSION = "0.5.2".freeze
     MINIMUM_RUBY_VERSION = ">= 3.4.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Miles Georgi
@@ -186,6 +186,7 @@ files:
 - projects/domain_mapper/lib/foobara/domain_mapper.rb
 - projects/domain_mapper/src/domain_mapper.rb
 - projects/domain_mapper/src/domain_mapper_lookups.rb
+- projects/entities/Guardfile
 - projects/entities/projects/detached_entity/lib/foobara/detached_entity.rb
 - projects/entities/projects/detached_entity/src/concerns/aliases.rb
 - projects/entities/projects/detached_entity/src/concerns/associations.rb
@@ -335,6 +336,7 @@ files:
 - projects/entities_plumbing/spec/support/term_trap.rb
 - projects/entities_plumbing/src/command_connectors_extension.rb
 - projects/entities_plumbing/src/extensions/authenticator.rb
+- projects/manifest/Guardfile
 - projects/manifest/lib/foobara/manifest.rb
 - projects/manifest/spec/manifest_spec.rb
 - projects/manifest/spec/model_spec.rb