cocina-models 0.116.0 → 0.118.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe265fcb4aa056742a278f0f49cdaec73de7cab666ef011217c98918441d2d7
-  data.tar.gz: 407191578301b2dabb6db984f3e039a76a3a81e6d8bc305df705526154bcd5ca
+  metadata.gz: ee0ad9dfc1b1845db07b8d94510214d98be20b7d732e0909dfe1935c046e9a34
+  data.tar.gz: 60f04cbd3e7531c45357c546d490851b8b781f0224468c2d2c81d9e3e550575f
 SHA512:
-  metadata.gz: 3517ded3340511228c488a66a19885bce82c20dfbddcea85ab43dcceb8a92b17accb2124bb87381f671bbbaa3955089d6e8e47f499677b77021acf33108fc2a6
-  data.tar.gz: 28598c41ae1c8ffef3e698c462983e05438ef6bc0f8f1f7ed27da03c5f09a8c10a99896e51568793f8578f553ee5907052737144769226097384dc2439fb14da
+  metadata.gz: 70072f8f40350f2341e230f2cee198c72872b418eda5e1682e7ab1cdb7fac5c5121386a6e53d3d0c3995139b80797ec51783f0630a9844d948cc8fd79afa7f19
+  data.tar.gz: c56237be3e22069ade32d6ad81d9a989c78759dc9d3ff8a99150709958da55f942707670aa2b7aad05f35d9dcbc9e9d073a01f47079f8deefbb7d42902725a77

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.6.0
+  ruby-rails: sul-dlss/ruby-rails@4.8.0
 workflows:
   build:
     jobs:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.116.0)
+    cocina-models (0.118.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.2)
+    activesupport (8.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -32,12 +32,10 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.9)
-      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     attr_extras (7.1.0)
     base64 (0.3.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     date (3.5.1)
@@ -75,21 +73,18 @@ GEM
       activesupport (>= 3.0, < 9.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erb (6.0.2)
+    erb (6.0.4)
     hana (1.3.7)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     io-console (0.8.2)
-    irb (1.17.0)
+    irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.2)
-    json-schema (6.2.0)
-      addressable (~> 2.8)
-      bigdecimal (>= 3.1, < 5)
+    json (2.19.5)
     json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
@@ -100,19 +95,17 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    mcp (0.8.0)
-      json-schema (>= 4.1)
-    minitest (6.0.2)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    multi_json (1.19.1)
-    nokogiri (1.19.1-arm64-darwin)
+    multi_json (1.21.1)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.1-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     optimist (3.2.1)
-    parallel (1.27.0)
-    parser (3.3.10.2)
+    parallel (2.1.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
@@ -124,15 +117,14 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.1)
+    rake (13.4.2)
     rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     rspec (3.13.2)
@@ -150,12 +142,11 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.85.1)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      mcp (~> 0.6)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
@@ -181,10 +172,10 @@ GEM
     simplecov_json_formatter (0.1.4)
     simpleidn (0.2.3)
     stringio (3.2.0)
-    super_diff (0.18.0)
-      attr_extras (>= 6.2.4)
-      diff-lcs
-      patience_diff
+    super_diff (0.19.0)
+      attr_extras (>= 6.2.4, < 8)
+      diff-lcs (~> 1.5)
+      patience_diff (~> 1.2)
     thor (1.5.0)
     tsort (0.2.0)
     tzinfo (2.0.6)
@@ -193,7 +184,7 @@ GEM
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
     uri (1.1.1)
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.2)
 
 PLATFORMS
   arm64-darwin
@@ -213,13 +204,13 @@ DEPENDENCIES
   simplecov
 
 CHECKSUMS
-  activesupport (8.1.2) sha256=88842578ccd0d40f658289b0e8c842acfe9af751afee2e0744a7873f50b6fdae
-  addressable (2.8.9) sha256=cc154fcbe689711808a43601dee7b980238ce54368d23e127421753e46895485
+  activesupport (8.1.3) sha256=21a5e0dfbd4c3ddd9e1317ec6a4d782fa226e7867dc70b0743acda81a1dca20e
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
-  bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
-  cocina-models (0.116.0)
+  bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
+  bundler (4.0.12) sha256=7f8b757d28dfb636e7b24fba2344ac6dd13b5b24f4b46d62573d483f211825ac
+  cocina-models (0.118.0)
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
@@ -235,38 +226,35 @@ CHECKSUMS
   dry-types (1.9.1) sha256=baebeecdb9f8395d6c9d227b62011279440943e3ef2468fe8ccc1ba11467f178
   edtf (3.2.0) sha256=a15a0ee274e49c8047a3ebb5d61d793ba44f7f8ffbf0595392c467e3ea8d2447
   equivalent-xml (0.6.0) sha256=8919761efa848ad0846369ff8be1f646b17e5061698c4867b09829000cc3f487
-  erb (6.0.2) sha256=9fe6264d44f79422c87490a1558479bd0e7dad4dd0e317656e67ea3077b5242b
+  erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9
   hana (1.3.7) sha256=5425db42d651fea08859811c29d20446f16af196308162894db208cac5ce9b0d
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   ice_nine (0.11.2) sha256=5d506a7d2723d5592dc121b9928e4931742730131f22a1a37649df1c1e2e63db
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
-  irb (1.17.0) sha256=168c4ddb93d8a361a045c41d92b2952c7a118fa73f23fe14e55609eb7a863aae
-  json (2.19.2) sha256=e7e1bd318b2c37c4ceee2444841c86539bc462e81f40d134cf97826cb14e83cf
-  json-schema (6.2.0) sha256=e8bff46ed845a22c1ab2bd0d7eccf831c01fe23bb3920caa4c74db4306813666
+  irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
+  json (2.19.5) sha256=218a18553e4801d579ca7e0f5bc72bafd776d7397238a1fb4e74db5b0a812c59
   json_schemer (2.5.0) sha256=2f01fb4cce721a4e08dd068fc2030cffd0702a7f333f1ea2be6e8991f00ae396
   jsonpath (1.1.5) sha256=29f70467193a2dc93ab864ec3d3326d54267961acc623f487340eb9c34931dbe
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
-  mcp (0.8.0) sha256=ae8bd146bb8e168852866fd26f805f52744f6326afb3211e073f78a95e0c34fb
-  minitest (6.0.2) sha256=db6e57956f6ecc6134683b4c87467d6dd792323c7f0eea7b93f66bd284adbc3d
-  multi_json (1.19.1) sha256=7aefeff8f2c854bf739931a238e4aea64592845e0c0395c8a7d2eea7fdd631b7
-  nokogiri (1.19.1-arm64-darwin) sha256=dfe2d337e6700eac47290407c289d56bcf85805d128c1b5a6434ddb79731cb9e
-  nokogiri (1.19.1-x86_64-linux-gnu) sha256=1a4902842a186b4f901078e692d12257678e6133858d0566152fe29cdb98456a
+  minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
+  multi_json (1.21.1) sha256=e6126a31808e3b4d19f483c775ceac34df190dffa62adfb63a165ee14ba68080
+  nokogiri (1.19.3-arm64-darwin) sha256=71b9bd424b1b7abc18b05052a1a3cfd3627abdca62be280854cc411791357e42
+  nokogiri (1.19.3-x86_64-linux-gnu) sha256=2f5078620fe12e83669b5b17311b32532a8153d02eee7ad06948b926d6080976
   optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
-  parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
-  parser (3.3.10.2) sha256=6f60c84aa4bdcedb6d1a2434b738fe8a8136807b6adc8f7f53b97da9bc4e9357
+  parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
+  parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
   patience_diff (1.2.0) sha256=f492094486af02fff4a80070fa6b4d0ebbcf4d42fb38bba29d095eef43f6822c
   pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
   psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974
-  public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
-  rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
-  regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
+  regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
   reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
   rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
   rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
@@ -274,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.85.1) sha256=3dbcf9e961baa4c376eeeb2a03913dca5e3987033b04d38fa538aa1e7406cc77
+  rubocop (1.86.2) sha256=bb2e97f635eda42c448f2588f4a6ff78f221b8bdfdf65b1e9b07fbd57521b45d
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
@@ -285,14 +273,14 @@ CHECKSUMS
   simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
   simpleidn (0.2.3) sha256=08ce96f03fa1605286be22651ba0fc9c0b2d6272c9b27a260bc88be05b0d2c29
   stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1
-  super_diff (0.18.0) sha256=9f5e77464fa75150619f7783174fbbe1bbac50a1eaf157cd39ad5584b0eac142
+  super_diff (0.19.0) sha256=c35fc1c0daa223d67b203fe3fb49a6cfd67850a53920319565c3c654e03ec902
   thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
   tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
   unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
   unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
   uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
-  zeitwerk (2.7.5) sha256=d8da92128c09ea6ec62c949011b00ed4a20242b255293dd66bf41545398f73dd
+  zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12
 
 BUNDLED WITH
-  4.0.8
+  4.0.12

data/README.md

@@ -16,6 +16,10 @@ For more about the model for description see https://consul.stanford.edu/display
 
 The [schema.json](schema.json) can also be viewed via JSON HERO: https://jsonhero.io/j/rynNH3NLBhcf and DOR Services App's openapi.yml: https://sul-dlss.github.io/dor-services-app/
 
+### Schema Design
+
+Our JSON Schema uses *terminal & mixin* composition strategy so we can enforce deep validation without running into **allOf** composition pitfalls. Terminal schemas (e.g., **DRO**, **Collection**, **AdminPolicy**, their **WithMetadata** variants, and **Request** variants) are the validation boundaries and generally set the `unevaluatedProperties: false` property. Reusable mixins (e.g., **DROMixin**, **CollectionMixin**, **AdminPolicyMixin**, and **AccessMixin**) are intentionally open and are composed into terminal schemas via **allOf** or **oneOf**, so these schemas **may not** take advantage of `unevaluatedProperties` to prevent unexpected properties.
+
 ## Configuration
 
 Set the PURL url base:
@@ -121,9 +125,7 @@ Before you release a major or minor change, think about if this release will inc
 If unsure, ask the team or ask for help to just run the validation report anyway (as described above).
 
 ### Partial release process
-NOTE: If dependency updates are about to be released, you have the option of shortening the process and stopping after Step 3. This is because Steps 4 onwards will be taken care of by the regular dependency updates process (basically the updating of cocina-models, dor-services-client and sdr-client as needed in the rest of the associated apps).  You still do need to manually bump some gems and the pinned version of cocina-models in the directly coupled apps and get those PRs approved and merged, as described in Steps 1-3 below.
-
-IMPORTANT: If you do opt to skip steps 4 onward, you should NOT merge the dor-services-app and sdr-api PRs you created in step 3 until you are ready to finish the dependency updates process.  You can have them reviewed and approved, but if you merge, you will greatly increase the risk of issues if the main branch of DSA or sdr-api are deployed after steps 1-3 are complete but before the rest of the apps are updated to use the new cocina-models via regular dependency updates. The fix for this is to either roll back DSA and sdr-api to the previous release tag, or proceed forwards with step 4-5.
+NOTE: If dependency updates are about to be released, you have the option of shortening the process and stopping after Step 2. This is because Steps 3 onwards will be taken care of by the regular dependency updates process (basically the updating of cocina-models, dor-services-client and sdr-client as needed in the rest of the associated apps).  You still do need to manually bump some gems and get those PRs approved and merged, as described in Steps 1-2 below.
 
 ### Step 0: Share intent to change the models
 
@@ -160,8 +162,6 @@ Perform `bundle update --conservative cocina-models dor-services-client` in the
 
 Get the directly coupled services PRs merged before the deploy in step 5.
 
-See the IMPORTANT note above about the timing of merging these PRs if you are waiting for dependency updates to make the updates to other dependent applications.
-
 ### Step 4: Update other dependent applications
 
 All applications that use cocina-models should be updated and released at the same time.  "Cocina Level 2" describes this set of updates. The applications that use cocina-models are those in [this list](https://github.com/sul-dlss/access-update-scripts/blob/master/infrastructure/projects.yml) that are NOT marked with `cocina_level2: false`.

data/lib/cocina/generator/generator.rb

@@ -102,8 +102,10 @@ module Cocina
       end
 
       def schema_for(schema_name, lite: false)
+        return if schema_name.ends_with?('Mixin')
+
         schema_doc = schemas[schema_name]
-        return nil if schema_doc.nil?
+        return if schema_doc.nil?
 
         case schema_doc.type
         when 'object'

data/lib/cocina/generator/schema.rb

@@ -5,21 +5,25 @@ module Cocina
     # Class for generating from a JSON schema
     class Schema < SchemaBase
       def schema_properties
-        @schema_properties ||= (properties + all_of_properties + one_of_properties).uniq(&:key)
+        @schema_properties ||= (
+          schema_properties_for(schema_doc) +
+          all_of_properties_for(schema_doc) +
+          one_of_properties_for(schema_doc)
+        ).uniq(&:key)
       end
 
-      VALIDATE_TYPES = %w[DRO RequestDRO DROWithMetadata Collection RequestCollection CollectionWithMetadata AdminPolicy
-                          RequestAdminPolicy AdminPolicyWithMetadata Description RequestDescription].freeze
+      VALIDATABLE_TYPES = %w[DRO RequestDRO DROWithMetadata Collection RequestCollection CollectionWithMetadata AdminPolicy
+                             RequestAdminPolicy AdminPolicyWithMetadata Description RequestDescription].freeze
 
       def generate
         <<~RUBY
           # frozen_string_literal: true
 
           module Cocina
-            module Models#{'              '}
+            module Models
               #{preamble}class #{name} < Struct
 
-                #{validate}
+                #{validatable}
                 #{types}
 
                 #{model_attributes}
@@ -65,68 +69,41 @@ module Cocina
         RUBY
       end
 
-      def validate
-        return '' unless validatable?
+      def validatable
+        return '' if VALIDATABLE_TYPES.exclude?(name)
 
         <<~RUBY
           include Validatable
         RUBY
       end
 
-      def validatable?
-        VALIDATE_TYPES.include?(name) && !lite
-      end
-
-      def properties
-        schema_properties_for(schema_doc)
-      end
-
-      def all_of_properties
-        all_of_properties_for(schema_doc)
-      end
-
-      def one_of_properties
-        one_of_properties_for(schema_doc)
-      end
-
       def all_of_properties_for(doc)
-        return [] if doc.all_of.nil?
-
-        doc.all_of.map do |all_of_schema|
-          # All of for this + recurse
+        Array(doc.all_of).flat_map do |all_of_schema|
           schema_properties_for(all_of_schema) +
             all_of_properties_for(all_of_schema) +
             one_of_properties_for(all_of_schema)
-        end.flatten
+        end
       end
 
       def one_of_properties_for(doc)
-        return [] if doc.one_of.nil?
-
-        # All properties must be objects.
-        raise 'All properties for oneOf must be objects' unless doc.one_of.all? { |schema| schema.type == 'object' }
-
-        doc.one_of.flat_map do |one_of_doc|
-          one_of_doc.properties.map do |key, properties_doc|
-            property_class_for(properties_doc).new(properties_doc,
-                                                   key: key,
-                                                   # The property does less validation because may vary between
-                                                   # different oneOf schemas. Validation is still performed
-                                                   # by JSON Schema.
-                                                   relaxed: true,
-                                                   parent: self,
-                                                   schemas: schemas)
-          end
+        Array(doc.one_of).flat_map do |one_of_schema|
+          schema_properties_for(one_of_schema, relaxed: true) +
+            all_of_properties_for(one_of_schema) +
+            one_of_properties_for(one_of_schema)
         end
       end
 
-      def schema_properties_for(doc)
+      def schema_properties_for(doc, relaxed: nil)
+        relax_all_properties = relaxed
+
         Array(doc.properties).map do |key, properties_doc|
           clazz = property_class_for(properties_doc)
+          relaxed = relax_all_properties.nil? ? lite && clazz != SchemaValue : relax_all_properties
+
           clazz.new(properties_doc,
                     key: key,
                     required: doc.required&.include?(key),
-                    relaxed: lite && clazz != SchemaValue,
+                    relaxed: relaxed,
                     nullable: Array(properties_doc.type).include?('null'),
                     parent: self,
                     schemas: schemas)

data/lib/cocina/models/barcode.rb

@@ -3,6 +3,6 @@
 module Cocina
   module Models
     # A barcode
-    Barcode = BusinessBarcode | LaneMedicalBarcode | CatkeyBarcode | StandardBarcode
+    Barcode = BusinessBarcode | LaneMedicalBarcode | CatkeyBarcode | StandardBarcode | CaliforniaHistoricalSocietyBarcode
   end
 end

data/lib/cocina/models/business_barcode.rb

@@ -2,7 +2,7 @@
 
 module Cocina
   module Models
-    # The barcode associated with a business library DRO object, prefixed with 2050
+    # The barcode associated with a business library DRO, prefixed with 2050
     # example: 20503740296
     BusinessBarcode = Types::String.constrained(format: /^2050[0-9]{7}$/)
   end

data/lib/cocina/models/california_historical_society_barcode.rb

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

data/lib/cocina/models/catkey_barcode.rb

@@ -2,8 +2,8 @@
 
 module Cocina
   module Models
-    # The barcode associated with a DRO object based on catkey, prefixed with a catkey
-    # followed by a hyphen
+    # The barcode associated with a DRO based on catkey, prefixed with a catkey followed
+    # by a hyphen
     # example: 6772719-1001
     CatkeyBarcode = Types::String.constrained(format: /^[0-9]+-[0-9]+$/)
   end

data/lib/cocina/models/descriptive_value.rb

@@ -4,6 +4,7 @@ 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)
@@ -40,7 +41,6 @@ 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(DescriptiveBasicValue).default([].freeze)
     end
   end
 end

data/lib/cocina/models/dro_access.rb

@@ -3,17 +3,6 @@
 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
@@ -27,6 +16,17 @@ 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/embargo.rb

@@ -3,6 +3,15 @@
 module Cocina
   module Models
     class Embargo < Struct
+      # Date when the Collection is released from an embargo.
+      # example: 2029-06-22T07:00:00.000+00:00
+      attribute :releaseDate, Types::Params::DateTime
+      # The human readable use and reproduction statement that applies
+      # example: Property rights reside with the repository. Literary rights reside with
+      # the creators of the documents or their heirs. To obtain permission to publish or
+      # reproduce, please contact the Public Services Librarian of the Dept. of Special Collections
+      # (http://library.stanford.edu/spc).
+      attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
       # Access level.
       # Validation of this property is relaxed. See the schema.json for full validation.
       attribute? :view, Types::Strict::String.optional.default('dark')
@@ -14,15 +23,6 @@ module Cocina
       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)
-      # Date when the Collection is released from an embargo.
-      # example: 2029-06-22T07:00:00.000+00:00
-      attribute :releaseDate, Types::Params::DateTime
-      # The human readable use and reproduction statement that applies
-      # example: Property rights reside with the repository. Literary rights reside with
-      # the creators of the documents or their heirs. To obtain permission to publish or
-      # reproduce, please contact the Public Services Librarian of the Dept. of Special Collections
-      # (http://library.stanford.edu/spc).
-      attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
     end
   end
 end

data/lib/cocina/models/lane_medical_barcode.rb

@@ -2,7 +2,7 @@
 
 module Cocina
   module Models
-    # The barcode associated with a Lane Medical Library DRO object, prefixed with 245
+    # The barcode associated with a Lane Medical Library DRO, prefixed with 245
     # example: 24503259768
     LaneMedicalBarcode = Types::String.constrained(format: /^245[0-9]{8}$/)
   end

data/lib/cocina/models/mapping/normalizers/mods_normalizer.rb

@@ -394,13 +394,14 @@ module Cocina
           end
 
           def blank_ng_xml
-            Nokogiri::XML(<<~XML
-              <mods xmlns="http://www.loc.gov/mods/v3"#{' '}
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"#{' '}
-                version="3.6"#{' '}
-                xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-6.xsd" />
-            XML
-                         )
+            Nokogiri::XML(
+              <<~XML
+                <mods xmlns="http://www.loc.gov/mods/v3"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  version="3.6"
+                  xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-6.xsd" />
+              XML
+            )
           end
         end
       end

data/lib/cocina/models/standard_barcode.rb

@@ -2,7 +2,7 @@
 
 module Cocina
   module Models
-    # The standard barcode associated with a DRO object, prefixed with 36105
+    # The standard barcode associated with a DRO, prefixed with 36105
     # example: 36105010362304
     StandardBarcode = Types::String.constrained(format: /^36105[0-9]{9}$/)
   end

data/lib/cocina/models/title.rb

@@ -3,6 +3,7 @@
 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)
@@ -39,7 +40,6 @@ 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(DescriptiveBasicValue).default([].freeze)
     end
   end
 end