foobara 0.0.49 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c906fa3ff55b19d33976a861a7d249aaf8b869507ba845cd8743459653fc117f
-  data.tar.gz: 86da929e2ed3d0b478067f27e7605060941a593eb8c5c95298304d3cf048fc45
+  metadata.gz: 046fdc3bab52559499e744edbde0ef847e26c4e6107423779351a26acc654619
+  data.tar.gz: 56174a565dafcdf3cd03a66e791be3d5a6074bd426c203371b6d7f41fa3a7e12
 SHA512:
-  metadata.gz: 04424105e5a0d9788839c40c3689ae34d8f1c39192128cf6e30a8c85e326fb3f5aa0b02a11cec7ac374ae62862cd941bb774db423d01e6e912b4a1a21977b3c2
-  data.tar.gz: 4030da0e998f344b19a453a624481189dbf432654c8af7a63a5197eeeb281d7a64df683c4babfcb59abad342a5b436036d61eda8bb760a0d011aa30cac1b780b
+  metadata.gz: ca08c711d53d11eb7ee073d040163df8bfe23c69b4b8e4c4f9647c6d216578755388b009b6d67e2cf988cc4e043413bfbe8f4f78ecb7690f713191cf00474255
+  data.tar.gz: a3b1e726a7295d1a0e4d22ef8f7a8130b39d57a1576f07f3f36bb20347ffce4bde07d6205c9c2853b392f47542ef7c696de57ab02c7c11d463484e3f5eebc779

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## [0.0.49] - 2025-01-21
+## [0.0.50] - 2025-01-22
 
 - Fill out more foobara_ model attribute helper methods to further support the ActiveRecordType gem
 

data/projects/builtin_types/src/attributes/supported_transformers/defaults/type_declaration_extension/extend_attributes_type_declaration/desugarizers/move_defaults_from_element_types_to_root.rb

@@ -25,7 +25,11 @@ module Foobara
                       end
                     end
 
-                    rawish_type_declaration[:defaults] = defaults unless defaults.empty?
+                    if defaults.empty?
+                      rawish_type_declaration.delete(:defaults)
+                    else
+                      rawish_type_declaration[:defaults] = defaults
+                    end
 
                     rawish_type_declaration
                   end

data/projects/builtin_types/src/attributes/supported_validators/required/type_declaration_extension/extend_attributes_type_declaration/desugarizers/move_required_from_element_types_to_root.rb

@@ -40,7 +40,11 @@ module Foobara
                       end
                     end
 
-                    rawish_type_declaration[:required] = required_attributes unless required_attributes.empty?
+                    if required_attributes.empty?
+                      rawish_type_declaration.delete(:required)
+                    else
+                      rawish_type_declaration[:required] = required_attributes
+                    end
 
                     rawish_type_declaration
                   end

data/projects/command/src/concerns/inputs_type.rb

@@ -25,6 +25,16 @@ module Foobara
             @inputs_type
           end
 
+          def add_inputs(...)
+            new_type = type_for_declaration(...)
+            new_declaration = TypeDeclarations::Attributes.merge(
+              inputs_type.declaration_data,
+              new_type.declaration_data
+            )
+
+            inputs new_declaration
+          end
+
           def inputs_type
             return @inputs_type if defined?(@inputs_type)
 

data/projects/model_attribute_helpers/src/attribute_helpers.rb

@@ -25,8 +25,8 @@ module Foobara
             respond_to?(:foobara_primary_key_attribute)
           end
 
-          def foobara_attributes_for_update
-            foobara_attributes_for_aggregate_update
+          def foobara_attributes_for_update(require_primary_key: false)
+            foobara_attributes_for_aggregate_update(require_primary_key:)
           end
 
           # TODO: we should have metadata on the entity about whether it required a primary key
@@ -35,39 +35,24 @@ module Foobara
             return foobara_attributes_type if includes_primary_key
             return foobara_attributes_type unless foobara_has_primary_key?
 
-            primary_key_attribute = foobara_primary_key_attribute
-
-            declaration = attributes_type.declaration_data
-            # TODO: just slice out the element type declarations
-            declaration = Util.deep_dup(declaration)
-
-            declaration[:element_type_declarations].delete(primary_key_attribute)
-
-            if declaration.key?(:required)
-              declaration[:required].delete(primary_key_attribute)
-            end
-
-            if declaration.key?(:defaults)
-              declaration[:defaults].delete(primary_key_attribute)
-            end
-
-            handler = Domain.global.foobara_type_builder.handler_for_class(
-              TypeDeclarations::Handlers::ExtendAttributesTypeDeclaration
-            )
+            declaration = foobara_attributes_type.declaration_data
 
-            handler.desugarize(declaration)
+            Foobara::TypeDeclarations::Attributes.reject(declaration, foobara_primary_key_attribute)
           end
 
-          def foobara_attributes_for_aggregate_update(initial = true)
+          def foobara_attributes_for_aggregate_update(require_primary_key: false, initial: true)
             declaration = foobara_attributes_type.declaration_data
-            # TODO: just slice out the element type declarations
             declaration = Util.deep_dup(declaration)
 
             declaration.delete(:defaults)
             declaration.delete(:required)
 
             if initial && foobara_has_primary_key?
-              declaration[:required] = [foobara_primary_key_attribute]
+              if require_primary_key
+                declaration[:required] = [foobara_primary_key_attribute]
+              else
+                TypeDeclarations::Attributes.reject(declaration, foobara_primary_key_attribute)
+              end
             end
 
             foobara_associations.each_pair do |data_path, type|
@@ -76,21 +61,25 @@ module Foobara
 
                 entry = foobara_type_declaration_value_at(declaration, DataPath.new(data_path).path)
                 entry.clear
-                entry.merge!(target_class.foobara_attributes_for_aggregate_update(false))
+                entry.merge!(target_class.foobara_attributes_for_aggregate_update(initial: false))
               end
             end
 
             declaration
           end
 
-          def foobara_attributes_for_atom_update
+          def foobara_attributes_for_atom_update(require_primary_key: false)
             declaration = foobara_attributes_type.declaration_data
-            # TODO: just slice out the element type declarations
             declaration = Util.deep_dup(declaration)
 
             declaration.delete(:defaults)
+
             if foobara_has_primary_key?
-              declaration[:required] = [foobara_primary_key_attribute]
+              if require_primary_key
+                declaration[:required] = [foobara_primary_key_attribute]
+              else
+                declaration = TypeDeclarations::Attributes.reject(declaration, foobara_primary_key_attribute)
+              end
             end
 
             # expect all associations to be expressed as primary key values

data/projects/type_declarations/src/attributes.rb

@@ -21,12 +21,55 @@ module Foobara
             end
           end
 
-          {
+          handler = Domain.global.foobara_type_builder.handler_for_class(
+            TypeDeclarations::Handlers::ExtendAttributesTypeDeclaration
+          )
+
+          handler.desugarize(
             type: "::attributes",
             element_type_declarations:,
             required:,
             defaults:
-          }
+          )
+        end
+
+        def reject(declaration, *keys)
+          declaration = Util.deep_dup(declaration)
+
+          element_type_declarations = declaration[:element_type_declarations]
+          required = declaration[:required]
+          defaults = declaration[:defaults]
+
+          changed = false
+
+          keys.flatten.each do |key|
+            key = key.to_sym
+
+            if element_type_declarations.key?(key)
+              changed = true
+              element_type_declarations.delete(key)
+            end
+
+            if required&.include?(key)
+              changed = true
+              required.delete(key)
+            end
+
+            if defaults&.key?(key)
+              changed = true
+              defaults.delete(key)
+            end
+          end
+
+          if changed
+            handler = Domain.global.foobara_type_builder.handler_for_class(
+              TypeDeclarations::Handlers::ExtendAttributesTypeDeclaration
+            )
+
+            handler.desugarize(declaration)
+          else
+            declaration
+          end
         end
       end
     end

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

@@ -47,7 +47,6 @@ module Foobara
 
         def _to_declaration(&)
           instance_eval(&)
-          _prune_type_declaration
           _type_declaration
         end
 
@@ -163,30 +162,20 @@ module Foobara
         end
 
         def _add_to_required(attribute_name)
+          _type_declaration[:required] ||= []
           _type_declaration[:required] << attribute_name.to_sym
         end
 
         def _add_to_defaults(attribute_name, value)
+          _type_declaration[:defaults] ||= {}
           _type_declaration[:defaults][attribute_name.to_sym] = value
         end
 
-        def _prune_type_declaration
-          if _type_declaration[:required].empty?
-            _type_declaration.delete(:required)
-          end
-
-          if _type_declaration[:defaults].empty?
-            _type_declaration.delete(:defaults)
-          end
-        end
-
         def _type_declaration
           @_type_declaration ||= begin
             sugar = {
               type: "::attributes",
-              element_type_declarations: {},
-              required: [],
-              defaults: {}
+              element_type_declarations: {}
             }
 
             handler = Domain.current.foobara_type_builder.handler_for_class(Handlers::ExtendAttributesTypeDeclaration)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.50
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-01-21 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal