cocina-models 0.127.0 → 0.129.0

data/lib/cocina/models/admin_policy_access_template.rb

@@ -6,6 +6,17 @@ module Cocina
     # an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults
     # and has no embargo.
     class AdminPolicyAccessTemplate < Struct
+      # Access level.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :view, Types::Strict::String.optional.default('dark')
+      # Download access level.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :download, Types::Strict::String.optional.default('none')
+      # Not used for this access type, must be null.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :location, Types::Strict::String.optional
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
       attribute? :copyright, Copyright.optional
@@ -18,17 +29,6 @@ module Cocina
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e.
       # CC, RightsStatement.org URI, etc.).
       attribute? :license, License.optional.enum(nil, 'https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
-      # Access level.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :view, Types::Strict::String.optional.default('dark')
-      # Download access level.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :download, Types::Strict::String.optional.default('none')
-      # Not used for this access type, must be null.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :location, Types::Strict::String.optional
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
     end
   end
 end

data/lib/cocina/models/applies_to.rb

@@ -2,10 +2,44 @@
 
 module Cocina
   module Models
-    # Property model for indicating the parts, aspects, or versions of the resource to
-    # which a descriptive element is applicable.
+    # Value model for appliesTo property.
     class AppliesTo < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
+      attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
+      attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
+      attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
+      # String or integer value of the descriptive element.
+      attribute? :value, Types::Nominal::Any
+      # Type of value provided by the descriptive element. See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md
+      # for valid types.
+      attribute? :type, Types::Strict::String
+      # Status of the descriptive element value relative to other instances of the element.
+      attribute? :status, Types::Strict::String
+      # Code value of the descriptive element.
+      attribute? :code, Types::Strict::String
+      # URI value of the descriptive element.
+      attribute? :uri, Types::Strict::String
+      # Property model for indicating the encoding, standard, or syntax to which a value
+      # conforms (e.g. RDA).
+      attribute? :standard, Standard.optional
+      # Property model for indicating the encoding, standard, or syntax to which a value
+      # conforms (e.g. RDA).
+      attribute? :encoding, Standard.optional
+      # Property model for indicating the vocabulary, authority, or other origin for a term,
+      # code, or identifier.
+      attribute? :source, Source.optional
+      # The preferred display label to use for the descriptive element in access systems.
+      attribute? :displayLabel, Types::Strict::String.optional
+      # A term providing information about the circumstances of the statement (e.g., approximate
+      # dates).
+      attribute? :qualifier, Types::Strict::String
+      # Other information related to the descriptive element.
+      attribute :note, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
+      # Language of the descriptive element value
+      attribute? :valueLanguage, DescriptiveValueLanguage.optional
+      # URL or other pointer to the location of the value of the descriptive element.
+      attribute? :valueAt, Types::Strict::String
+      # Identifiers and URIs associated with the descriptive element.
+      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
     end
   end
 end

data/lib/cocina/models/descriptive_basic_value.rb

@@ -3,7 +3,7 @@
 module Cocina
   module Models
     # Basic value model for descriptive elements. Can only have one of value, parallelValue,
-    # groupedValue, or structuredValue.
+    # groupedValue, or structuredValue. Does not have identifier or appliesTo properties.
     class DescriptiveBasicValue < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
@@ -25,8 +25,6 @@ module Cocina
       # Property model for indicating the encoding, standard, or syntax to which a value
       # conforms (e.g. RDA).
       attribute? :encoding, Standard.optional
-      # Identifiers and URIs associated with the descriptive element.
-      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
       # Property model for indicating the vocabulary, authority, or other origin for a term,
       # code, or identifier.
       attribute? :source, Source.optional

data/lib/cocina/models/descriptive_identifier.rb

@@ -2,10 +2,8 @@
 
 module Cocina
   module Models
-    # Value model for descriptive identifiers. Same as DescriptiveValue but omits the identifier
-    # property to prevent infinite recursion.
+    # Default value model for identifiers.
     class DescriptiveIdentifier < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
@@ -40,6 +38,7 @@ module Cocina
       attribute? :valueLanguage, DescriptiveValueLanguage.optional
       # URL or other pointer to the location of the value of the descriptive element.
       attribute? :valueAt, Types::Strict::String
+      attribute :appliesTo, Types::Strict::Array.of(AppliesTo).default([].freeze)
     end
   end
 end

data/lib/cocina/models/descriptive_value.rb

@@ -4,7 +4,6 @@ module Cocina
   module Models
     # Default value model for descriptive elements.
     class DescriptiveValue < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
@@ -25,8 +24,6 @@ module Cocina
       # Property model for indicating the encoding, standard, or syntax to which a value
       # conforms (e.g. RDA).
       attribute? :encoding, Standard.optional
-      # Identifiers and URIs associated with the descriptive element.
-      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
       # Property model for indicating the vocabulary, authority, or other origin for a term,
       # code, or identifier.
       attribute? :source, Source.optional
@@ -41,6 +38,9 @@ module Cocina
       attribute? :valueLanguage, DescriptiveValueLanguage.optional
       # URL or other pointer to the location of the value of the descriptive element.
       attribute? :valueAt, Types::Strict::String
+      attribute :appliesTo, Types::Strict::Array.of(AppliesTo).default([].freeze)
+      # Identifiers and URIs associated with the descriptive element.
+      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
     end
   end
 end

data/lib/cocina/models/dro_access.rb

@@ -3,6 +3,17 @@
 module Cocina
   module Models
     class DROAccess < Struct
+      # Access level.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :view, Types::Strict::String.optional.default('dark')
+      # Download access level.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :download, Types::Strict::String.optional.default('none')
+      # Not used for this access type, must be null.
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :location, Types::Strict::String.optional
+      # Validation of this property is relaxed. See the schema.json for full validation.
+      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
       attribute? :copyright, Copyright.optional
@@ -16,17 +27,6 @@ module Cocina
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e.
       # CC, RightsStatement.org URI, etc.).
       attribute? :license, License.optional.enum(nil, 'https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
-      # Access level.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :view, Types::Strict::String.optional.default('dark')
-      # Download access level.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :download, Types::Strict::String.optional.default('none')
-      # Not used for this access type, must be null.
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :location, Types::Strict::String.optional
-      # Validation of this property is relaxed. See the schema.json for full validation.
-      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
     end
   end
 end

data/lib/cocina/models/language.rb

@@ -5,7 +5,7 @@ module Cocina
     # Languages, scripts, symbolic systems, and notations used in all or part of a resource
     # or its descriptive metadata.
     class Language < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
+      attribute :appliesTo, Types::Strict::Array.of(AppliesTo).default([].freeze)
       # Code value of the descriptive element.
       attribute? :code, Types::Strict::String
       # The preferred display label to use for the descriptive element in access systems.

data/lib/cocina/models/mapping/from_mods/description_builder.rb

@@ -37,8 +37,10 @@ module Cocina
             @notifier = notifier
           end
 
+          # @param [Boolean] include_related_resource whether to map nested relatedItem elements;
+          #   false when building a relatedItem, since RelatedResource cannot itself nest a relatedResource
           # @return [Hash] a hash that can be mapped to a cocina description model
-          def build(resource_element:, purl: nil, require_title: true)
+          def build(resource_element:, purl: nil, require_title: true, include_related_resource: true)
             cocina_description = {}
             title_result = @title_builder.build(resource_element: resource_element, require_title: require_title,
                                                 notifier: notifier)
@@ -47,7 +49,8 @@ module Cocina
             purl_value = purl || Purl.primary_purl_value(resource_element, purl)
             cocina_description[:purl] = purl_value if purl_value
 
-            BUILDERS.each do |description_property, builder|
+            builders = include_related_resource ? BUILDERS : BUILDERS.except(:relatedResource)
+            builders.each do |description_property, builder|
               result = builder.build(resource_element: resource_element, description_builder: self,
                                      purl: purl_value)
               cocina_description.merge!(description_property => result) if result.present?

data/lib/cocina/models/mapping/from_mods/form.rb

@@ -88,7 +88,7 @@ module Cocina
                 uri: ValueURI.sniff(subject_node['valueURI'], notifier)
               }.tap do |attrs|
                 source = {
-                  code: subject_node['authority'],
+                  value: subject_node['authority'],
                   uri: subject_node['authorityURI']
                 }.compact
                 attrs[:source] = source if source.present?

data/lib/cocina/models/mapping/from_mods/related_resource.rb

@@ -80,7 +80,8 @@ module Cocina
           end
 
           def build_related_item(related_item)
-            description_builder.build(resource_element: related_item, require_title: false).tap do |item|
+            description_builder.build(resource_element: related_item, require_title: false,
+                                      include_related_resource: false).tap do |item|
               item[:displayLabel] = related_item['displayLabel']
               if related_item['type']
                 item[:type] = normalized_type_for(related_item['type'])

data/lib/cocina/models/related_resource.rb

@@ -38,8 +38,6 @@ module Cocina
       attribute? :purl, Purl.optional
       # Information about how to access digital and physical versions of the object.
       attribute? :access, DescriptiveAccessMetadata.optional
-      # Other resources associated with the related resource.
-      attribute :relatedResource, Types::Strict::Array.of(RelatedResource).default([].freeze)
       # Information about this resource description.
       attribute? :adminMetadata, DescriptiveAdminMetadata.optional
       # The version of the related resource.

data/lib/cocina/models/request_admin_policy.rb

@@ -20,7 +20,7 @@ module Cocina
       attribute(:administrative, AdminPolicyAdministrative.default { AdminPolicyAdministrative.new })
       # Description that is included in a request to create a DRO. This is the same as a
       # Description, except excludes PURL.
-      attribute? :description, RequestDescription.optional
+      attribute(:description, RequestDescription.default { RequestDescription.new })
     end
   end
 end

data/lib/cocina/models/title.rb

@@ -3,7 +3,6 @@
 module Cocina
   module Models
     class Title < Struct
-      attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).default([].freeze)
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
@@ -24,8 +23,6 @@ module Cocina
       # Property model for indicating the encoding, standard, or syntax to which a value
       # conforms (e.g. RDA).
       attribute? :encoding, Standard.optional
-      # Identifiers and URIs associated with the descriptive element.
-      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
       # Property model for indicating the vocabulary, authority, or other origin for a term,
       # code, or identifier.
       attribute? :source, Source.optional
@@ -40,6 +37,9 @@ module Cocina
       attribute? :valueLanguage, DescriptiveValueLanguage.optional
       # URL or other pointer to the location of the value of the descriptive element.
       attribute? :valueAt, Types::Strict::String
+      attribute :appliesTo, Types::Strict::Array.of(AppliesTo).default([].freeze)
+      # Identifiers and URIs associated with the descriptive element.
+      attribute :identifier, Types::Strict::Array.of(DescriptiveIdentifier).default([].freeze)
     end
   end
 end

data/lib/cocina/models/validatable.rb

@@ -12,7 +12,18 @@ module Cocina
           Thread.current[:top_level_validate] = validate unless Thread.current.key?(:top_level_validate)
 
           Validators::Validator.validate(self, attributes) if Thread.current[:top_level_validate]
-          super(attributes, safe, &)
+
+          # Tracks that any Validatable construction triggered by `super` below is nested inside this one, so
+          # JsonSchemaValidator can skip it: this object's own schema check above already covers.
+          # See JsonSchemaValidator#validate.
+          # In practice, this avoids doing schema validation on a DRO / AdminPolicy / Collection and
+          # its nested Description.
+          Thread.current[:cocina_construction_depth] = Thread.current[:cocina_construction_depth].to_i + 1
+          begin
+            super(attributes, safe, &)
+          ensure
+            Thread.current[:cocina_construction_depth] -= 1
+          end
         ensure
           Thread.current[:top_level_validate] = nil
         end
@@ -20,7 +31,14 @@ module Cocina
 
       def new(*args)
         validate = args.first.delete(:validate) if args.present?
-        new_model = super
+
+        Thread.current[:cocina_construction_depth] = Thread.current[:cocina_construction_depth].to_i + 1
+        begin
+          new_model = super
+        ensure
+          Thread.current[:cocina_construction_depth] -= 1
+        end
+
         Validators::Validator.validate(new_model.class, new_model) if validate || validate.nil?
         new_model
       end

data/lib/cocina/models/validators/composite_description_validator.rb

@@ -11,6 +11,7 @@ module Cocina
           DescriptionRoleSourceCodeVisitorValidator,
           DescriptionNameSourceCodeVisitorValidator,
           DescriptionFormResourceTypeVisitorValidator,
+          DescriptionFormSourceCodeVisitorValidator,
           DescriptionLanguageCodeVisitorValidator,
           DescriptionSubjectSourceCodeVisitorValidator,
           DescriptionValuesVisitorValidator,
@@ -30,7 +31,7 @@ module Cocina
         def initialize(clazz, attributes, validators: VALIDATORS)
           @clazz = clazz
           @attributes = attributes
-          @validators = validators.map(&:new)
+          @validators = meets_preconditions? ? validators.map(&:new) : []
         end
 
         def validate

data/lib/cocina/models/validators/composite_structural_validator.rb

@@ -18,7 +18,7 @@ module Cocina
         def initialize(clazz, attributes, validators: VALIDATORS)
           @clazz = clazz
           @attributes = attributes
-          @validators = validators.map { |v| v.new(attributes) }
+          @validators = meets_preconditions? ? validators.map { |v| v.new(attributes) } : []
         end
 
         def validate

data/lib/cocina/models/validators/description_form_source_code_visitor_validator.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Validators
+      # Validates form.source.code values against form_source_codes.yml.
+      class DescriptionFormSourceCodeVisitorValidator < BaseDescriptionVisitorValidator
+        def validate!
+          return if error_paths.empty?
+
+          raise ValidationError, "Unrecognized form source codes in description: #{error_paths.join(', ')}"
+        end
+
+        def visit_hash(hash:, path:)
+          return unless form_entry_path?(path)
+
+          source_code = hash.dig(:source, :code)
+          return unless source_code
+
+          error_paths << "#{path_to_s(path)}.source.code (#{source_code})" unless valid_codes.include?(source_code.downcase)
+        end
+
+        private
+
+        def error_paths
+          @error_paths ||= []
+        end
+
+        def form_entry_path?(path)
+          path.length >= 2 && path[-1].is_a?(Integer) && path[-2].to_s == 'form'
+        end
+
+        # rubocop:disable Style/ClassVars
+        def valid_codes
+          @@valid_codes ||= YAML.load_file(::File.expand_path('../../../../form_source_codes.yml', __dir__)).to_set(&:downcase)
+        end
+        # rubocop:enable Style/ClassVars
+      end
+    end
+  end
+end

data/lib/cocina/models/validators/json_schema_validator.rb

@@ -25,6 +25,11 @@ module Cocina
 
         # @see #validate
         def self.validate(...)
+          # Skip when nested inside another Validatable's construction: the enclosing object's own
+          # schema check already covers this, so re-evaluating it here would be
+          # redundant. See Validatable#new.
+          return if Thread.current[:cocina_construction_depth].to_i.positive?
+
           new(...).validate
         end
 
@@ -67,7 +72,7 @@ module Cocina
           evaluation = self.class.validator_for(method_name).evaluate(attributes.as_json)
           return if evaluation.valid?
 
-          raise ValidationError, "When validating #{method_name}: " + filtered_error_messages(evaluation).join(', ')
+          raise ValidationError, "When validating #{method_name}: " + filtered_error_messages(evaluation).join('; ')
         end
 
         private
@@ -90,7 +95,7 @@ module Cocina
           denoised.flat_map { |d| format_detail(d) }.uniq
         end
 
-        # Removes two categories of cascade noise produced by `unevaluatedProperties: false`:
+        #  Removes three categories of cascade noise from errors:
         #
         #   1. falseSchema errors — every `unevaluatedProperties: false` on a sub-path emits
         #      a "False schema does not allow …" entry for each matched value.  These are
@@ -100,8 +105,28 @@ module Cocina
         #      is a known model attribute — these arise because allOf/$ref composition means
         #      the validator can't prove top-level properties were "evaluated", even though
         #      they are valid model fields.
+        #
+        #   3. anyOf branch noise — when each branch requires a different property, all failing
+        #      branches emit a separate "required" error at the same path. Collapse into one
+        #      "needs to include at least one of: …" message.
         def denoise(details)
-          details.reject { |d| false_schema_noise?(d) || root_unevaluated_noise?(d) }
+          filtered = details.reject { |detail| false_schema_noise?(detail) || root_unevaluated_noise?(detail) }
+          collapse_anyof_required(filtered)
+        end
+
+        def collapse_anyof_required(details)
+          # instanceLocation is the input data that failed. Group errors for each failing data location.
+          details.group_by { |detail| detail[:instanceLocation] }.flat_map do |loc, group|
+            # splits errors into "required" anyOf errors and others (minItems, unevaluatedProperties)
+            required, others = group.partition { |detail| detail[:errors].keys == ['required'] }
+            next group if required.size <= 1
+
+            # Extract property name from "required" messages such as, '"url" is a required property'
+            props = required.filter_map { |detail| detail[:errors]['required'][/"([^"]+)"/, 1] }.uniq
+            # Put the data path at the start of the message; blank instanceLocation so format_detail won't also append it
+            msg = "#{loc} needs to include at least one of the following: #{props.join(', ')}"
+            others + [required.first.merge(instanceLocation: '', errors: { 'required' => msg })]
+          end
         end
 
         def false_schema_noise?(detail)
@@ -120,12 +145,32 @@ module Cocina
           unexpected.all? { |prop| known_root_properties.include?(prop) }
         end
 
+        # Formats error details hash into more user-friendly messages
+        # A detail can carry multiple errors (one per JSON Schema keyword), so this returns an array.
+        # minItems errors get a dedicated formatter; everything else uses the generic one.
         def format_detail(detail)
           loc = detail[:instanceLocation]
-          detail[:errors].map do |_keyword, message|
-            loc.empty? ? message : "#{message} at #{loc}"
+          detail[:errors].map do |keyword, message|
+            keyword == 'minItems' ? format_min_items(message, loc) : format_generic(message, loc)
           end
         end
+
+        # Rewrites messages regarding minItems validation
+        # "[] has less than 1 item at /event/0/date " is rewritten to "/event/0/date is empty but should have at least 1 item"
+        # Arrays with items but fewer than the minimum will be rewritten to "/event/0/date should have at least 2 items"
+        def format_min_items(message, loc)
+          # extract minimum number of items from message
+          min = message[/less than (\d+)/, 1] || '1'
+          # pluralize "item" when appropriate
+          items = min == '1' ? 'item' : 'items'
+          # determine if the message is about an empty array or an non-empty array without enough items
+          prefix = message.start_with?('[]') ? "#{loc} is empty but" : loc.to_s
+          "#{prefix} should have at least #{min} #{items}"
+        end
+
+        def format_generic(message, loc)
+          loc.empty? ? message : "#{message} at #{loc}"
+        end
       end
     end
   end

data/lib/cocina/models/validators/validator.rb

@@ -16,12 +16,22 @@ module Cocina
         ].freeze
 
         def self.validate(clazz, attributes, validators: VALIDATORS)
-          # This gets rid of nested model objects.
-          attributes_hash = attributes.to_h.deep_transform_values do |value|
+          hash = attributes_hash(attributes)
+          validators.each { |validator| validator.validate(clazz, hash) }
+        end
+
+        # @return [Hash] attributes with any embedded Cocina model instances flattened to hashes
+        def self.attributes_hash(attributes)
+          # Dry::Struct#to_h is already fully recursive (Dry::Struct::Hashify flattens nested
+          # structs all the way down), so a Cocina model instance's #to_h has no embedded
+          # Cocina model instances left to flatten and the deep walk below would be a no-op.
+          return attributes.to_h.with_indifferent_access if attributes.class.name.starts_with?('Cocina::Models')
+
+          attributes.to_h.deep_transform_values do |value|
             value.class.name.starts_with?('Cocina::Models') ? value.to_h : value
           end.with_indifferent_access
-          validators.each { |validator| validator.validate(clazz, attributes_hash) }
         end
+        private_class_method :attributes_hash
 
         def self.deep_transform_values(object, ...)
           case object

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.127.0'
+    VERSION = '0.129.0'
   end
 end

data/lib/cocina/rspec/factories.rb

@@ -48,7 +48,6 @@ module Cocina
         type: Cocina::Models::ObjectType.object,
         id: 'druid:bc234fg5678',
         version: 1,
-        label: 'factory DRO label',
         title: 'factory DRO title',
         source_id: 'sul:1234',
         admin_policy_id: 'druid:hv992ry2431'
@@ -60,7 +59,6 @@ module Cocina
         type: Cocina::Models::ObjectType.collection,
         id: 'druid:bb222ff5555',
         version: 1,
-        label: 'factory collection label',
         title: 'factory collection title',
         admin_policy_id: 'druid:hv992ry2431',
         source_id: 'sulcollection:1234'
@@ -72,7 +70,6 @@ module Cocina
         type: Cocina::Models::ObjectType.admin_policy,
         id: 'druid:cb432gf8765',
         version: 1,
-        label: 'factory APO label',
         title: 'factory APO title',
         admin_policy_id: 'druid:hv992ry2431',
         agreement_id: 'druid:hp308wm0436'
@@ -97,12 +94,11 @@ module Cocina
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def self.build_request_dro_properties(type:, version:, label:, title:, source_id:, admin_policy_id:,
+      def self.build_request_dro_properties(type:, version:, title:, source_id:, admin_policy_id:,
                                             barcode: nil, catkeys: [], folio_instance_hrids: [], collection_ids: [])
         {
           type: type,
           version: version,
-          label: label,
           access: {},
           administrative: { hasAdminPolicy: admin_policy_id },
           description: {
@@ -143,12 +139,11 @@ module Cocina
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def self.build_request_collection_properties(type:, version:, label:, title:, admin_policy_id:, source_id: nil,
+      def self.build_request_collection_properties(type:, version:, title:, admin_policy_id:, source_id: nil,
                                                    catkeys: [], folio_instance_hrids: [])
         {
           type: type,
           version: version,
-          label: label,
           access: {},
           administrative: { hasAdminPolicy: admin_policy_id },
           description: {
@@ -204,7 +199,7 @@ module Cocina
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def self.build_request_admin_policy_properties(type:, version:, label:, title:,
+      def self.build_request_admin_policy_properties(type:, version:, title:,
                                                      admin_policy_id:, agreement_id:,
                                                      use_statement: nil, copyright: nil, license: nil,
                                                      registration_workflow: nil, collections_for_registration: nil,
@@ -212,7 +207,6 @@ module Cocina
         {
           type: type,
           version: version,
-          label: label,
           administrative: {
             hasAdminPolicy: admin_policy_id,
             hasAgreement: agreement_id,