cocina-models 0.118.1 → 0.119.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 980d1887539c11b65c897fc0f48a6d5529b8bb9e23821f9f87ac677623c7a05a
-  data.tar.gz: 58b30197236ad99946ec8598fd84b03e8e8ea804a9625483ef4d678d93972dd9
+  metadata.gz: 95fdb985d82245efee3898558df726439ee7d27e7fa45bd47815b44d52f58679
+  data.tar.gz: 0a7644f423957828280316d0c5709847f260919e1ceb384c130e8196f4d5eb6a
 SHA512:
-  metadata.gz: 8e599c4ce9337e1ef65ece3c33522f3efa88ee986b048d628889e329aaee752616208eb4e048193f2a5173fa506b9c8170b9032129418d9434f32e60f7c625d4
-  data.tar.gz: 07ab88971c0c7a3d2810d9db68c3423755c421d96d7d778339350a64348a2d39a7c021719639fad4a05fdb14b08e4a5313953c3b62865521b7249b2b0a63059b
+  metadata.gz: ce4a6079617e05fd8d5b1547d16e983e06f0f53914339f9f19dcb4a870d52c1c565844bb39b0ed5decffe2c68f2a4fc4f2b385b9d8dd4796700f2c1f9aed5c7b
+  data.tar.gz: eb72b867dcab3ad0ee2e63d3b68276c17fb831365f4c6a785a95fa8250998b663c6bcca2d50d4ffc6786044a17df7321847c069595587a9ae3ac96120f093020

data/.rubocop.yml

@@ -14,11 +14,12 @@ Layout/BeginEndAlignment: # (new in 0.91)
   Enabled: true
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
 Layout/LineLength:
   Exclude:
     - lib/cocina/models/*
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
+    - spec/**/*
 
 # This cop throws an error in 1.37.1
 Layout/SpaceInsideHashLiteralBraces:
@@ -80,35 +81,35 @@ Metrics/BlockLength:
     - cocina-models.gemspec
     - spec/cocina/**/*
     - lib/cocina/rspec/matchers.rb
-    - 'spec/support/mods_mapping_spec_helper.rb'
+    - "spec/support/mods_mapping_spec_helper.rb"
 
 # Offense count: 16
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 100
   Exclude:
-    - 'lib/cocina/rspec/factories.rb'
+    - "lib/cocina/rspec/factories.rb"
 
 Metrics/MethodLength:
   Max: 14
   Exclude:
-    - 'spec/cocina/models/file_access_spec.rb'
-    - 'spec/cocina/models/dro_access_spec.rb'
-    - 'lib/cocina/rspec/factories.rb'
-    - 'lib/cocina/models/mapping/to_mods/*'
-    - 'lib/cocina/models/mapping/from_mods/*'
-    - 'lib/cocina/models/mapping/normalizers/mods/origin_info_normalizer.rb'
-    - 'lib/cocina/models/mapping/normalizers/mods/subject_normalizer.rb'
-    - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'
+    - "spec/cocina/models/file_access_spec.rb"
+    - "spec/cocina/models/dro_access_spec.rb"
+    - "lib/cocina/rspec/factories.rb"
+    - "lib/cocina/models/mapping/to_mods/*"
+    - "lib/cocina/models/mapping/from_mods/*"
+    - "lib/cocina/models/mapping/normalizers/mods/origin_info_normalizer.rb"
+    - "lib/cocina/models/mapping/normalizers/mods/subject_normalizer.rb"
+    - "lib/cocina/models/mapping/normalizers/mods_normalizer.rb"
 
 # Offense count: 37
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   # Max: 20
   Exclude:
-    - 'lib/cocina/models/mapping/from_mods/*'
-    - 'lib/cocina/models/mapping/to_mods/*'
-    - 'lib/cocina/models/mapping/normalizers/**/*'
+    - "lib/cocina/models/mapping/from_mods/*"
+    - "lib/cocina/models/mapping/to_mods/*"
+    - "lib/cocina/models/mapping/normalizers/**/*"
 
 Naming/PredicatePrefix:
   ForbiddenPrefixes:

data/.rubocop_todo.yml

@@ -1,27 +1,29 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2023-11-01 19:51:40 UTC using RuboCop version 1.57.2.
+# on 2026-06-02 13:55:43 UTC using RuboCop version 1.87.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 8
-# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# Offense count: 7
+# Configuration parameters: EnforcedStyle, AllowedGems.
 # SupportedStyles: Gemfile, gems.rb, gemspec
-# Include: **/*.gemspec, **/Gemfile, **/gems.rb
 Gemspec/DevelopmentDependencies:
   Exclude:
     - 'cocina-models.gemspec'
 
-# Offense count: 1
-Lint/NoReturnInBeginEndBlocks:
-  Exclude:
-    - 'lib/cocina/models/mapping/to_mods/description.rb'
+# Offense count: 55
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 159
 
-# Offense count: 13
+# Offense count: 12
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/cocina/models/mapping/from_mods/admin_metadata.rb'
@@ -34,17 +36,27 @@ Lint/UnusedMethodArgument:
     - 'lib/cocina/models/mapping/from_mods/language.rb'
     - 'lib/cocina/models/mapping/from_mods/note.rb'
     - 'lib/cocina/models/mapping/from_mods/subject.rb'
-    - 'lib/cocina/models/mapping/to_mods/event.rb'
 
-# Offense count: 98
+# Offense count: 62
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 40
+  Max: 48
 
-# Offense count: 43
-# Configuration parameters: AllowedMethods, AllowedPatterns.
+# Offense count: 27
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
-  Max: 12
+  Exclude:
+    - 'lib/cocina/generator/generator.rb'
+    - 'lib/cocina/models/builders/title_builder.rb'
+    - 'lib/cocina/models/mapping/from_mods/event.rb'
+    - 'lib/cocina/models/mapping/from_mods/form.rb'
+    - 'lib/cocina/models/mapping/from_mods/identifier_type.rb'
+    - 'lib/cocina/models/mapping/from_mods/language_term.rb'
+    - 'lib/cocina/models/mapping/from_mods/name_builder.rb'
+    - 'lib/cocina/models/mapping/from_mods/subject.rb'
+    - 'lib/cocina/models/mapping/from_mods/title.rb'
+    - 'lib/cocina/models/mapping/from_mods/title_builder.rb'
+    - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'
 
 # Offense count: 1
 # Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
@@ -52,12 +64,12 @@ Metrics/ParameterLists:
   Exclude:
     - 'lib/cocina/generator/schema_base.rb'
 
-# Offense count: 41
+# Offense count: 32
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 224
+# Offense count: 95
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 103
@@ -78,23 +90,9 @@ RSpec/PendingWithoutReason:
     - 'spec/cocina/models/mapping/descriptive/mods/title_info_spec.rb'
     - 'spec/cocina/models/mapping/descriptive/mods/type_of_resource_spec.rb'
 
-# Offense count: 1
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
-    - 'lib/cocina/models/validators/open_api_validator.rb'
-
-# Offense count: 9
-Style/MultilineBlockChain:
-  Exclude:
-    - 'lib/cocina/models/mapping/to_mods/access.rb'
-    - 'lib/cocina/models/mapping/to_mods/contributor.rb'
-    - 'lib/cocina/models/mapping/to_mods/form.rb'
-    - 'lib/cocina/models/mapping/to_mods/subject.rb'
-
-# Offense count: 249
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 267
+    - 'lib/cocina/models/mapping/from_mods/name_builder.rb'
+    - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.118.1)
+    cocina-models (0.119.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -84,7 +84,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.5)
+    json (2.19.7)
     json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
@@ -142,7 +142,7 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.86.2)
+    rubocop (1.87.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -210,7 +210,7 @@ CHECKSUMS
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   bundler (4.0.12) sha256=7f8b757d28dfb636e7b24fba2344ac6dd13b5b24f4b46d62573d483f211825ac
-  cocina-models (0.118.1)
+  cocina-models (0.119.0)
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
@@ -232,7 +232,7 @@ CHECKSUMS
   ice_nine (0.11.2) sha256=5d506a7d2723d5592dc121b9928e4931742730131f22a1a37649df1c1e2e63db
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  json (2.19.5) sha256=218a18553e4801d579ca7e0f5bc72bafd776d7397238a1fb4e74db5b0a812c59
+  json (2.19.7) sha256=fe432c8639f6efff69f9d73b518a3705d9581ab93156f981ea72806e1e5bcc3e
   json_schemer (2.5.0) sha256=2f01fb4cce721a4e08dd068fc2030cffd0702a7f333f1ea2be6e8991f00ae396
   jsonpath (1.1.5) sha256=29f70467193a2dc93ab864ec3d3326d54267961acc623f487340eb9c34931dbe
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
@@ -262,7 +262,7 @@ CHECKSUMS
   rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   rspec_junit_formatter (0.6.0) sha256=40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15
-  rubocop (1.86.2) sha256=bb2e97f635eda42c448f2588f4a6ff78f221b8bdfdf65b1e9b07fbd57521b45d
+  rubocop (1.87.0) sha256=b9d9ddf55116a513f8ef2c7ae660662d8b49301f118d3f0df61865b33a5c188d
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2

data/lib/cocina/models/builders/title_builder.rb

@@ -227,8 +227,6 @@ module Cocina
         #
         # for punctuaion funky town, thank MARC and catalog cards
         #
-        # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/PerceivedComplexity
         def rebuild_structured_value(cocina_title)
@@ -283,8 +281,6 @@ module Cocina
 
           result
         end
-        # rubocop:enable Metrics/AbcSize
-        # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/MethodLength
         # rubocop:enable Metrics/PerceivedComplexity
 

data/lib/cocina/models/california_historical_society_barcode.rb

@@ -4,6 +4,6 @@ module Cocina
   module Models
     # The barcode associated with a CHS DRO, prefixed with 405
     # example: 405000111956
-    CaliforniaHistoricalSocietyBarcode = Types::String.constrained(format: /^405[0-9]+$/)
+    CaliforniaHistoricalSocietyBarcode = Types::String.constrained(format: /^405[0-9]{9}$/)
   end
 end

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

@@ -9,6 +9,7 @@ module Cocina
         class Form
           # NOTE: H2 is the first case of structured form (genre/typeOfResource) values we're implementing
           H2_GENRE_TYPE_PREFIX = 'H2 '
+          H2_SOURCE_LABEL = 'Stanford self-deposit resource types'
 
           # @param [Nokogiri::XML::Element] resource_element mods or relatedItem element
           # @param [Cocina::Models::Mapping::FromMods::DescriptionBuilder] description_builder
@@ -58,7 +59,8 @@ module Cocina
 
           def build_cartographics(subject_node)
             carto_forms = []
-            subject_node.xpath('mods:cartographics[mods:scale]', mods: Description::DESC_METADATA_NS).each do |carto_node|
+            subject_node.xpath('mods:cartographics[mods:scale]',
+                               mods: Description::DESC_METADATA_NS).each do |carto_node|
               scale_nodes = carto_node.xpath('mods:scale', mods: Description::DESC_METADATA_NS).reject do |scale_node|
                 scale_node.text.blank?
               end
@@ -142,7 +144,7 @@ module Cocina
             forms << {
               type: 'resource type',
               source: {
-                value: Cocina::Models::Mapping::ToMods::Form::H2_SOURCE_LABEL
+                value: H2_SOURCE_LABEL
               },
               structuredValue: structured_genre.map do |genre|
                 {

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

@@ -7,7 +7,7 @@ module Cocina
       module FromMods
         # Maps a name
         class NameBuilder
-          UNCITED_DESCRIPTION = Cocina::Models::Mapping::ToMods::NameWriter::UNCITED_DESCRIPTION
+          UNCITED_DESCRIPTION = 'not included in citation'
           TYPE_FOR_ROLES = Cocina::Models::Mapping::FromMods::Contributor::ROLES.merge('event' => 'event').freeze
 
           # @param [Array<Nokogiri::XML::Element>] name_elements (multiple if parallel)
@@ -154,7 +154,9 @@ module Cocina
           end
 
           def build_structured_value_name(name_node, name_part_nodes)
-            vals = name_part_nodes.filter_map { |name_part_node| build_name_part(name_node, name_part_node, default_type: name_node['type'] != 'corporate').presence }
+            vals = name_part_nodes.filter_map do |name_part_node|
+              build_name_part(name_node, name_part_node, default_type: name_node['type'] != 'corporate').presence
+            end
             display_form_node = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS).first
             if display_form_node.present?
               cocina_contrib_name =

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

@@ -6,6 +6,11 @@ module Cocina
       module FromMods
         # Maps notes
         class Note # rubocop:disable Metrics/ClassLength
+          # notes with these types will produce an `abstract` XML node
+          NOTE_TYPE_TO_ABSTRACT_TYPE = ['summary', 'abstract', 'scope and content'].freeze
+          DISPLAY_LABEL_TO_ABSTRACT_TYPE = ['Content advice', 'Subject', 'Abstract', 'Review', 'Summary', 'Scope and content',
+                                            'Scope and Content', 'Content Advice'].freeze
+
           # @param [Nokogiri::XML::Element] resource_element mods or relatedItem element
           # @param [Cocina::Models::Mapping::FromMods::DescriptionBuilder] description_builder (not used, but passed in by DescriptionBuilder)
           # @param [String] purl (not used, but passed in by DescriptionBuilder)
@@ -28,7 +33,8 @@ module Cocina
           attr_reader :resource_element
 
           def abstracts
-            all_abstract_nodes = resource_element.xpath('mods:abstract', mods: Description::DESC_METADATA_NS).select do |node|
+            all_abstract_nodes = resource_element.xpath('mods:abstract',
+                                                        mods: Description::DESC_METADATA_NS).select do |node|
               note_present?(node)
             end
             altrepgroup_abstract_nodes, other_abstract_nodes = AltRepGroup.split(nodes: all_abstract_nodes)
@@ -58,13 +64,13 @@ module Cocina
           end
 
           def note_type(node)
-            return node['type'].downcase if Cocina::Models::Mapping::ToMods::Note.note_type_to_abstract_type.include?(node['type']&.downcase)
+            return node['type'].downcase if NOTE_TYPE_TO_ABSTRACT_TYPE.include?(node['type']&.downcase)
 
             node['type']
           end
 
           def display_label(node)
-            return node[:displayLabel].capitalize if Cocina::Models::Mapping::ToMods::Note.display_label_to_abstract_type.include? node[:displayLabel]
+            return node[:displayLabel].capitalize if DISPLAY_LABEL_TO_ABSTRACT_TYPE.include? node[:displayLabel]
 
             node[:displayLabel].presence
           end
@@ -72,7 +78,7 @@ module Cocina
           def abstract_type(node, parallel: false)
             if node['type'].present?
               { type: node['type'].downcase }
-            elsif Cocina::Models::Mapping::ToMods::Note.display_label_to_abstract_type.exclude?(node['displayLabel']) && !parallel
+            elsif DISPLAY_LABEL_TO_ABSTRACT_TYPE.exclude?(node['displayLabel']) && !parallel
               { type: 'abstract' }
             else
               {}
@@ -111,7 +117,8 @@ module Cocina
           end
 
           def table_of_contents
-            all_toc_nodes = resource_element.xpath('mods:tableOfContents', mods: Description::DESC_METADATA_NS).select do |node|
+            all_toc_nodes = resource_element.xpath('mods:tableOfContents',
+                                                   mods: Description::DESC_METADATA_NS).select do |node|
               note_present?(node)
             end
             altrepgroup_toc_nodes, other_toc_nodes = AltRepGroup.split(nodes: all_toc_nodes)

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

@@ -5,9 +5,42 @@ module Cocina
     module Mapping
       module FromMods
         # Maps MODS relatedItem to cocina relatedResource
-        class RelatedResource
-          TYPES = Cocina::Models::Mapping::ToMods::RelatedResource::TYPES.invert.freeze
-          DETAIL_TYPES = Cocina::Models::Mapping::ToMods::RelatedResource::DETAIL_TYPES.invert.freeze
+        class RelatedResource # rubocop:disable Metrics/ClassLength
+          # see https://docs.google.com/spreadsheets/d/1d5PokzgXqNykvQeckG2ND43B6i9_CsjfIVwS_IsphS8/edit#gid=0
+          TYPES = {
+            'has original version' => 'original',
+            'has other format' => 'otherFormat',
+            'has part' => 'constituent',
+            'has version' => 'otherVersion',
+            'in series' => 'series',
+            'part of' => 'host',
+            'preceded by' => 'preceding',
+            'related to' => nil, # 'related to' is a null type by design
+            'reviewed by' => 'reviewOf',
+            'referenced by' => 'isReferencedBy',
+            'references' => 'references',
+            'succeeded by' => 'succeeding'
+          }.invert.freeze
+
+          DETAIL_TYPES = {
+            'location within source' => 'part',
+            'volume' => 'volume',
+            'issue' => 'issue',
+            'chapter' => 'chapter',
+            'section' => 'section',
+            'paragraph' => 'paragraph',
+            'track' => 'track',
+            'marker' => 'marker'
+          }.invert.freeze
+
+          OTHER_TYPES = [
+            'supplement to',
+            'supplemented by',
+            'derived from',
+            'source of',
+            'version of record',
+            'identical to'
+          ].freeze
 
           # @param [Nokogiri::XML::Element] resource_element mods or relatedItem element
           # @param [Cocina::Models::Mapping::FromMods::DescriptionBuilder] description_builder
@@ -52,7 +85,7 @@ module Cocina
               if related_item['type']
                 item[:type] = normalized_type_for(related_item['type'])
               elsif (other_type = related_item['otherType'])
-                if Cocina::Models::Mapping::ToMods::RelatedResource::OTHER_TYPES.include?(other_type)
+                if OTHER_TYPES.include?(other_type)
                   item[:type] = other_type
                 else
                   item[:type] = 'related to'

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

@@ -55,8 +55,6 @@ module Cocina
             }.compact.presence
           end
 
-          # rubocop:disable Metrics/CyclomaticComplexity
-          # rubocop:disable Metrics/AbcSize
           def build_subject(subject_node)
             if subject_node['xlink:href']
               return { valueAt: subject_node['xlink:href'] } if subject_node.elements.empty?
@@ -96,8 +94,6 @@ module Cocina
               simple_item(first_child_node, attrs)
             end
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
-          # rubocop:enable Metrics/AbcSize
 
           def temporal_range?(children_nodes)
             children_nodes.all? { |node| node.name == 'temporal' && node['point'] }

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

@@ -39,7 +39,9 @@ module Cocina
 
         def validate_sort_key
           # TODO: remove this validation by switching to dependentRequired in schema.json
-          serials_links = catalog_links.select { |catalog_link| catalog_link[:catalog] == 'folio' && catalog_link[:sortKey].present? }
+          serials_links = catalog_links.select do |catalog_link|
+            catalog_link[:catalog] == 'folio' && catalog_link[:sortKey].present?
+          end
           serials_links.each do |catalog_link|
             # If partLabel is present, catalog_link is valid
             next if catalog_link[:partLabel].present?

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

@@ -22,9 +22,18 @@ module Cocina
 
           validate_obj(attributes, [])
 
-          raise ValidationError, "Multiple value, groupedValue, structuredValue, and parallelValue in description: #{error_paths_multiple.join(', ')}" unless error_paths_multiple.empty?
-          raise ValidationError, "Blank value in description: #{error_paths_blank.join(', ')}" unless error_paths_blank.empty?
-          raise ValidationError, "Missing type for value in description: #{error_paths_missing_title_type.join(', ')}" unless error_paths_missing_title_type.empty?
+          unless error_paths_multiple.empty?
+            raise ValidationError,
+                  "Multiple value, groupedValue, structuredValue, and parallelValue in description: #{error_paths_multiple.join(', ')}"
+          end
+          unless error_paths_blank.empty?
+            raise ValidationError,
+                  "Blank value in description: #{error_paths_blank.join(', ')}"
+          end
+          return if error_paths_missing_title_type.empty?
+
+          raise ValidationError,
+                "Missing type for value in description: #{error_paths_missing_title_type.join(', ')}"
         end
 
         private
@@ -62,7 +71,9 @@ module Cocina
         end
 
         def validate_values_for_multiples(hash, path)
-          return unless hash.count { |key, value| %w[value groupedValue structuredValue parallelValue].include?(key) && value.present? } > 1
+          return unless hash.count do |key, value|
+            %w[value groupedValue structuredValue parallelValue].include?(key) && value.present?
+          end > 1
 
           error_paths_multiple << path_to_s(path)
         end

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

@@ -39,6 +39,11 @@ module Cocina
           new(...).validate
         end
 
+        # @return [JSONSchemer::Schema]
+        def self.schema
+          @schema ||= JSONSchemer.schema(document)
+        end
+
         # @return [Hash] a hash representation of the schema.json document
         def self.document
           @document ||= begin
@@ -77,7 +82,7 @@ module Cocina
 
         # @return [JSONSchemer::Schema]
         def schema
-          @schema ||= JSONSchemer.schema(self.class.document)
+          self.class.schema
         end
 
         # @return [String] the method name derived from the class name

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

@@ -48,7 +48,9 @@ module Cocina
         end
 
         def invalid_filenames_with_language_tags
-          invalid_files.map { |invalid_file| "#{invalid_file[:filename] || invalid_file[:label]} (#{invalid_file[:languageTag]})" }
+          invalid_files.map do |invalid_file|
+            "#{invalid_file[:filename] || invalid_file[:label]} (#{invalid_file[:languageTag]})"
+          end
         end
 
         def language_tag_files

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.118.1'
+    VERSION = '0.119.0'
   end
 end

data/lib/cocina/rspec/factories.rb

@@ -143,7 +143,8 @@ module Cocina
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def self.build_request_collection_properties(type:, version:, label:, title:, admin_policy_id:, source_id: nil, catkeys: [], folio_instance_hrids: [])
+      def self.build_request_collection_properties(type:, version:, label:, title:, admin_policy_id:, source_id: nil,
+                                                   catkeys: [], folio_instance_hrids: [])
         {
           type: type,
           version: version,
@@ -228,7 +229,10 @@ module Cocina
           props[:administrative][:accessTemplate][:copyright] = copyright if copyright
           props[:administrative][:accessTemplate][:license] = license if license
           props[:administrative][:registrationWorkflow] = registration_workflow if registration_workflow
-          props[:administrative][:collectionsForRegistration] = collections_for_registration if collections_for_registration
+          if collections_for_registration
+            props[:administrative][:collectionsForRegistration] =
+              collections_for_registration
+          end
           props.delete(:description) if without_description
         end
       end

data/schema.json

@@ -1039,7 +1039,61 @@
               "description": "URL or other pointer to the location of the value of the descriptive element.",
               "type": "string"
             }
-          }
+          },
+          "anyOf": [
+            {
+              "required": ["value"]
+            },
+            {
+              "required": ["code"]
+            },
+            {
+              "required": ["uri"]
+            },
+            {
+              "required": ["identifier"],
+              "properties": {
+                "identifier": {
+                  "minItems": 1
+                }
+              }
+            },
+            {
+              "required": ["note"],
+              "properties": {
+                "note": {
+                  "minItems": 1
+                }
+              }
+            },
+            {
+              "required": ["valueAt"]
+            },
+            {
+              "required": ["structuredValue"],
+              "properties": {
+                "structuredValue": {
+                  "minItems": 1
+                }
+              }
+            },
+            {
+              "required": ["parallelValue"],
+              "properties": {
+                "parallelValue": {
+                  "minItems": 1
+                }
+              }
+            },
+            {
+              "required": ["groupedValue"],
+              "properties": {
+                "groupedValue": {
+                  "minItems": 1
+                }
+              }
+            }
+          ]
         }
       ]
     },