cocina-models 0.128.0 → 0.129.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e36b1b2a099fed16e2cc7c49b46479b80ce03f2ee65ef5a87ef49e9d74379ac6
-  data.tar.gz: 878705f40ff9598207bcee6a2e8ff0c89f5dbcc8e9bc9fc5c755642c93c30440
+  metadata.gz: e825fe93a987da1a8c23ce57093eb0ee376229a605d4e7bb548e56cabb03fc86
+  data.tar.gz: 542a860bd40cd64f31232cd4dfd0b65e2b8ae53dddc1f86597a0b86951d0327a
 SHA512:
-  metadata.gz: 9ea6f8363bb8a487a0670c8c062859ee1c16f618f6a12e5224ee0eb4ee30ebb6165a124c2d478f4e34250e9b3655a95b8d9f503e38f6afea4c130dfd9d4b3de8
-  data.tar.gz: c0de7bb6610cfa67a118a4c847add1da3a4d395fb0b8325e9bd2020a88a9a8555afa04fabce3e860b21569e9741d38b5e89f0e64c47e32a7dec22165791b7261
+  metadata.gz: 0a31ff1218930150d45c3457bd8f7915934416fae3ba9b37abbbc7acfea177e38943b9493d00335933ae9d7cde8a02def61a37780d805762fd9ac0f65fb6a46c
+  data.tar.gz: bf0406a3f1d6267a40de10d1e747ac90bd9b57d75f11eeb33826b5161b7a7c46fcd84447f74e57b5b6e2e33c8313c7d493f5e0da682799a7bcf784bbc2c458e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.128.0)
+    cocina-models (0.129.0)
       activesupport
       cocina_display
       deprecation
@@ -37,7 +37,7 @@ GEM
     base64 (0.3.0)
     bigdecimal (4.1.2)
     builder (3.3.0)
-    cocina_display (2.8.0)
+    cocina_display (2.9.0)
       activesupport (>= 7)
       edtf (~> 3.2)
       geo_coord (~> 0.2)
@@ -54,7 +54,6 @@ GEM
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.6.2)
-    docile (1.4.1)
     drb (2.2.3)
     dry-core (1.2.0)
       concurrent-ruby (~> 1.0)
@@ -101,10 +100,10 @@ GEM
       reline (>= 0.4.2)
     iso8601 (0.13.0)
     janeway-jsonpath (1.0.0)
-    json (2.20.0)
-    jsonschema_rs (0.46.10-arm64-darwin)
+    json (2.21.1)
+    jsonschema_rs (0.47.0-arm64-darwin)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.46.10-x86_64-linux)
+    jsonschema_rs (0.47.0-x86_64-linux)
       bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
@@ -162,7 +161,7 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.88.1)
+    rubocop (1.88.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -185,12 +184,7 @@ GEM
       rubocop (~> 1.86, >= 1.86.2)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.2)
-    simplecov_json_formatter (0.1.4)
+    simplecov (1.0.0)
     super_diff (0.19.0)
       attr_extras (>= 6.2.4, < 8)
       diff-lcs (~> 1.5)
@@ -231,16 +225,15 @@ CHECKSUMS
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
-  bundler (4.0.15) sha256=a4ceb882fe94a0e0ac63cd0813932bbfd631a14e5ac0b7975189b19a4d28d9e7
-  cocina-models (0.128.0)
-  cocina_display (2.8.0) sha256=89722e8e204c07cfa38f3deacbd66d42f3db9c7b29fdc034973d847cf93c4995
+  bundler (4.0.16) sha256=d6ca5dd440c24f9abce9844cf44cc8e18c6a553de65a47efb4544137af92c47d
+  cocina-models (0.129.0)
+  cocina_display (2.9.0) sha256=00e97cf826dafd5c547ca87b58e55f1d3bfa68fa4ddcddbbe25b4d9d9ed05d8f
   concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
   debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6
   deprecation (1.1.0) sha256=01707cea9a6ed2d7270377457941f43394a345e6dd8048e1be6d18ff2f2a01e1
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
-  docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
   drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
   dry-core (1.2.0) sha256=0cc5a7da88df397f153947eeeae42e876e999c1e30900f3c536fb173854e96a1
   dry-inflector (1.3.1) sha256=7fb0c2bb04f67638f25c52e7ba39ab435d922a3a5c3cd196120f63accb682dcc
@@ -259,9 +252,9 @@ CHECKSUMS
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2
   janeway-jsonpath (1.0.0) sha256=c8293f009f2aea9487ddee3067ca735a1f758eb1c8834ff4fab3ffd06c56d0a3
-  json (2.20.0) sha256=9362bc6e55a952b056abf9167cf053358181c904cb70cd6eee0808ea830fc32b
-  jsonschema_rs (0.46.10-arm64-darwin) sha256=1bece46823184a8cbec55d7585f09de68cc2bc03772d8aa9c29deba23b490609
-  jsonschema_rs (0.46.10-x86_64-linux) sha256=ef1f8a244e8e5b4a9e35ccd0b7f7aa9912a7e15b00f1170ba3f3cade0bdc627b
+  json (2.21.1) sha256=13a43df75d95641443f5702dff350f237164a9d811ff0f2c2800d4d980220583
+  jsonschema_rs (0.47.0-arm64-darwin) sha256=ab3aae9da5796999d2686dfacaa2b4c9a5510b9194b4e4b73a6aa8767a78ac8a
+  jsonschema_rs (0.47.0-x86_64-linux) sha256=5dfc5c14362cf5efee24242be23feb4342665f489b63e1eba4c256aac8c96047
   language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
@@ -290,15 +283,13 @@ 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.88.1) sha256=726af773d6bc169ed3ff852f3ca020b7c58d39c34e7a8d879a8e0147cc994f26
+  rubocop (1.88.2) sha256=8def251c90cd955feb4daa3edc0ab56893250c4ce90ef81e6c80c03f9a939bbf
   rubocop-ast (1.50.0) sha256=b9ca88300da0803ee222ad20cdb30494c0a784eed06fdc35d254b06d662788db
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
-  simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
-  simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
-  simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
+  simplecov (1.0.0) sha256=bdc50b41fa4a8b3c860da4bf5d61ba4704479c51d08a8f53cbd56ae50778dca8
   super_diff (0.19.0) sha256=c35fc1c0daa223d67b203fe3fb49a6cfd67850a53920319565c3c654e03ec902
   thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
@@ -309,4 +300,4 @@ CHECKSUMS
   zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12
 
 BUNDLED WITH
-  4.0.15
+  4.0.16

data/form_source_codes.yml

@@ -0,0 +1,600 @@
+# Form source codes from LC source lists
+# Sources:
+# - https://www.loc.gov/standards/sourcelist/genre-form.html
+# - https://www.loc.gov/standards/sourcelist/subject.html
+- aass
+- aat
+- aatnor
+- abne
+- aedoml
+- afo
+- afset
+- agrifors
+- agrovoc
+- agrovocf
+- agrovocs
+- ahecc
+- aiatsisl
+- aiatsisp
+- aiatsiss
+- aktp
+- albt
+- alett
+- allars
+- amg
+- anzsic
+- anzsoc
+- anzsrc
+- apaist
+- armarc
+- ascdc
+- asced
+- ascl
+- asft
+- ashlnl
+- asrcrfcd
+- asrcseo
+- asrctoa
+- asth
+- ated
+- atg
+- atla
+- aucsh
+- ausext
+- bare
+- barn
+- barngf
+- bdrc
+- bella
+- bellobv
+- bet
+- bgtchm
+- bhammf
+- bhashe
+- bhb
+- bib1814
+- bibalex
+- bibbi
+- biccbmc
+- bicssc
+- bidex
+- bisacmt
+- bisacrt
+- bisacsh
+- bjornson
+- blcpss
+- blmlsh
+- blnpn
+- bokbas
+- bt
+- btr
+- buscem
+- buscxf
+- cabt
+- cash
+- cbk
+- cbktrf
+- cccv
+- cck
+- cckthema
+- ccsa
+- cct
+- ccte
+- cctf
+- cdcng
+- ceeus
+- cgndb
+- cgpa
+- chirosh
+- cht
+- ciesiniv
+- cilla
+- cjh
+- coarrt
+- collett
+- conorsi
+- conorsr
+- csahssa
+- csalsct
+- csapa
+- csh
+- csht
+- cstud
+- cyac
+- czenas
+- czmesh
+- dbcsh
+- dbn
+- dcs
+- dct
+- ddcri
+- ddcrit
+- ddcut
+- dhb-jdg
+- dicgenam
+- dicgenes
+- dicgentop
+- dissao
+- dit
+- dltlt
+- dltt
+- doll
+- drama
+- dtict
+- dugfr
+- ebfem
+- eclas
+- eet
+- eflch
+- eks
+- elsst
+- embehu
+- embiaecid
+- embne
+- embucm
+- embus
+- embuz
+- emnmus
+- ept
+- erfemn
+- ericd
+- esar
+- est
+- estc
+- etiras
+- etuesh
+- etuturkob
+- eum
+- eurovoc
+- eurovocen
+- eurovoces
+- eurovocfr
+- eurovocsl
+- fast
+- fbg
+- fcb
+- fes
+- fgtpcm
+- finmesh
+- fire
+- flgeo
+- fmesh
+- fnhl
+- francis
+- frst
+- fssh
+- ftamc
+- galestne
+- gatbeg
+- gbd
+- gccst
+- gcipmedia
+- gcipplatform
+- gem
+- gemet
+- gemppg
+- geni
+- geonames
+- geonet
+- georeft
+- gmd
+- gmgpc
+- gnd
+- gnd-carrier
+- gnd-content
+- gnd-music
+- gnis
+- gpn
+- gsafd
+- gsso
+- gst
+- gtlm
+- gtmm
+- gtt
+- gttg
+- habibe
+- habich
+- habifr
+- habiit
+- hamsun
+- hapi
+- helecon
+- henn
+- hkcan
+- hlasstg
+- hoidokki
+- homoit
+- hrvmesh
+- hrvmr
+- huc
+- humord
+- ibsen
+- ica
+- iconauth
+- icpsr
+- idas
+- idref
+- idsbb
+- idszbz
+- idszbzes
+- idszbzna
+- idszbzzg
+- idszbzzh
+- idszbzzk
+- iescs
+- iest
+- ilot
+- ilpt
+- inist
+- inspect
+- ipat
+- ipsp
+- iptcnc
+- isbdcontent
+- isbdmedia
+- isis
+- itglit
+- itis
+- itrt
+- jhpb
+- jhpk
+- jlabsh
+- juho
+- jupo
+- jurivoc
+- kaa
+- kaba
+- kao
+- kassu
+- kauno
+- kaunokki
+- kdm
+- khib
+- kito
+- kitu
+- kkts
+- koko
+- kssbar
+- kta
+- kto
+- ktpt
+- ktta
+- kubikat
+- kula
+- kulo
+- kupu
+- labloc
+- lacnaf
+- lapponica
+- larpcal
+- lcac
+- lcdgt
+- lcgft
+- lcmpt
+- lcsh
+- lcshac
+- lcstt
+- lctgm
+- leaubsh
+- lemac
+- lemb
+- liito
+- liv
+- lnmmbr
+- lobt
+- local
+- lst
+- ltcsh
+- lua
+- maaq
+- maknaz
+- maotao
+- mar
+- marccarrier
+- marccategory
+- marcform
+- marcgt
+- marcsmd
+- masa
+- mech
+- mero
+- mesh
+- meshscr
+- migfg
+- mim
+- minecost
+- mipfesd
+- mmm
+- mpirdes
+- msc
+- msh
+- msupplcont
+- mtirdes
+- mts
+- musa
+- muso
+- musvok-sf
+- muzeukc
+- muzeukn
+- muzeukv
+- muzvukci
+- naf
+- nal
+- nalnaf
+- nasat
+- nbdbgf
+- nbdbt
+- nbiemnfag
+- ncjt
+- ncrbs
+- ncrcarrier
+- ncrcontent
+- ncrcpc
+- ncrfs
+- ncrft
+- ncrmat
+- ncrmedia
+- ncrpm
+- ncrpo
+- ncrrm
+- ncrtr
+- ncrvf
+- ndlgft
+- ndlsh
+- neo
+- netc
+- ngl
+- nicem
+- nimacsc
+- nimafc
+- niodt
+- nlgaf
+- nlggf
+- nlgkk
+- nlgsh
+- nli
+- nlksh
+- nlmnaf
+- nmaict
+- nmc
+- no-ubo-mr
+- nom
+- noraf
+- noram
+- norbok
+- normesh
+- norvok
+- noubojur
+- noubomn
+- nsbncf
+- nskps
+- nskzs
+- nta
+- ntc
+- ntcpsc
+- ntcsd
+- ntids
+- ntissc
+- ntsf
+- nzcoh
+- nzggn
+- nznb
+- oabt
+- odlt
+- ogst
+- olacvggt
+- opat
+- opms
+- ordnok
+- orgnr
+- pana
+- pascal
+- peakbag
+- pepp
+- peri
+- periodo
+- pha
+- pkk
+- pldi
+- pleiades
+- pmbok
+- pmcsg
+- pmont
+- pmt
+- poha
+- poliscit
+- popinte
+- pplt
+- ppluk
+- precis
+- prnpdi
+- proqsc
+- proysen
+- prvt
+- psh
+- psychit
+- puho
+- qlit
+- qlsp
+- qnaf
+- qnlsh
+- qrma
+- qrmak
+- qtglit
+- quiding
+- radfg
+- ram
+- rasuqam
+- rbbin
+- rbgenr
+- rbmscv
+- rbpap
+- rbpri
+- rbprov
+- rbpub
+- rbtyp
+- rda
+- rdaar
+- rdabf
+- rdabs
+- rdacarrier
+- rdacc
+- rdaco
+- rdacontent
+- rdacpc
+- rdact
+- rdaep
+- rdafmn
+- rdafnm
+- rdafr
+- rdafs
+- rdaft
+- rdagen
+- rdagrp
+- rdagw
+- rdaill
+- rdalay
+- rdamat
+- rdamedia
+- rdami
+- rdamt
+- rdapf
+- rdapm
+- rdapo
+- rdare
+- rdarm
+- rdarr
+- rdasco
+- rdaspc
+- rdatb
+- rdatc
+- rdatr
+- rdavf
+- renib
+- reo
+- rero
+- rerovoc
+- reveal
+- rma
+- root
+- rpe
+- rswk
+- rswkaf
+- rugeo
+- rurkp
+- rvm
+- rvmfast
+- rvmgd
+- rvmgf
+- samisk
+- sanb
+- sao
+- saogf
+- sbaa
+- sbiao
+- sbt
+- scbi
+- scgdst
+- scisshl
+- scot
+- sears
+- sesca
+- sfit
+- sgc
+- sgce
+- sgp
+- shbe
+- she
+- shsples
+- sigle
+- sipri
+- sk
+- skbb
+- skish
+- skon
+- slem
+- slm
+- smda
+- snt
+- socio
+- solstad
+- sosa
+- soto
+- spines
+- ssg
+- stcv
+- sthus
+- stw
+- swd
+- swemesh
+- taika
+- tasmas
+- taxhs
+- tbjvp
+- tef
+- tekord
+- tept
+- tero
+- tesa
+- tesbhaecid 
+- test
+- tgfbne
+- tgfc
+- tgn
+- tha
+- thema
+- thesoz
+- thia
+- thla
+- tho
+- thub
+- tips
+- tisa
+- tlka
+- tlsh
+- tmdbm
+- tmdbp
+- tmdbtv
+- tpro
+- trfarn
+- trfbmb
+- trfdh
+- trfgr
+- trfoba
+- trfzb
+- trt
+- trtsa
+- tsaij
+- tshd
+- tsht
+- tsr
+- ttka
+- ttll
+- tucua
+- udc
+- ukslc
+- ula
+- ulan
+- umitrist
+- unbisn
+- unbist
+- unescot
+- unicefirc
+- usaidt
+- usgst
+- valo
+- vcaadu
+- vffyl
+- vgmsgg
+- vgmsng
+- vmj
+- waqaf
+- watrest
+- wgst
+- wikidata
+- worldcat
+- wot
+- wpicsh
+- ysa
+- yso
+- zst

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/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/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.128.0'
+    VERSION = '0.129.0'
   end
 end

data/schema.json

@@ -2546,9 +2546,21 @@
       "required": [
         "cocinaVersion",
         "administrative",
+        "description",
         "type",
         "version"
       ],
+      "allOf": [
+        {
+          "properties": {
+            "description": {
+              "required": [
+                "title"
+              ]
+            }
+          }
+        }
+      ],
       "unevaluatedProperties": false
     },
     "RequestAdministrative": {
@@ -2616,6 +2628,47 @@
         "type",
         "version"
       ],
+      "anyOf": [
+        {
+          "required": [
+            "description"
+          ],
+          "properties": {
+            "description": {
+              "required": [
+                "title"
+              ]
+            }
+          }
+        },
+        {
+          "required": [
+            "identification"
+          ],
+          "properties": {
+            "identification": {
+              "required": [
+                "catalogLinks"
+              ],
+              "properties": {
+                "catalogLinks": {
+                  "contains": {
+                    "type": "object",
+                    "required": [
+                      "refresh"
+                    ],
+                    "properties": {
+                      "refresh": {
+                        "const": true
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      ],
       "unevaluatedProperties": false
     },
     "RequestDRO": {
@@ -2682,6 +2735,47 @@
         "type",
         "version"
       ],
+      "anyOf": [
+        {
+          "required": [
+            "description"
+          ],
+          "properties": {
+            "description": {
+              "required": [
+                "title"
+              ]
+            }
+          }
+        },
+        {
+          "required": [
+            "identification"
+          ],
+          "properties": {
+            "identification": {
+              "required": [
+                "catalogLinks"
+              ],
+              "properties": {
+                "catalogLinks": {
+                  "contains": {
+                    "type": "object",
+                    "required": [
+                      "refresh"
+                    ],
+                    "properties": {
+                      "refresh": {
+                        "const": true
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      ],
       "unevaluatedProperties": false
     },
     "RequestDROStructural": {
@@ -2803,9 +2897,6 @@
           "type": "string"
         }
       },
-      "required": [
-        "title"
-      ],
       "unevaluatedProperties": false
     },
     "RequestFile": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.128.0
+  version: 0.129.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -326,6 +326,7 @@ files:
 - docs/cocina-base.jsonld
 - docs/description_types.md
 - exe/generator
+- form_source_codes.yml
 - identifier_source_codes.yml
 - iso15924_codes.yml
 - language_uri_iso639_2_codes.yml
@@ -485,6 +486,7 @@ files:
 - lib/cocina/models/validators/description_date_time_visitor_validator.rb
 - lib/cocina/models/validators/description_event_date_visitor_validator.rb
 - lib/cocina/models/validators/description_form_resource_type_visitor_validator.rb
+- lib/cocina/models/validators/description_form_source_code_visitor_validator.rb
 - lib/cocina/models/validators/description_identifier_source_code_visitor_validator.rb
 - lib/cocina/models/validators/description_language_code_visitor_validator.rb
 - lib/cocina/models/validators/description_language_uri_visitor_validator.rb
@@ -536,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Data models for the SDR
 test_files: []