cocina-models 0.117.0 → 0.118.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2609452ca800a04e29d10e8412138a6a537fb1808b5555b25948962651754037
-  data.tar.gz: 355fb239388276b6f13e514b97a2b7cf30a9467674a59dfab0b87ce159b187f1
+  metadata.gz: ee0ad9dfc1b1845db07b8d94510214d98be20b7d732e0909dfe1935c046e9a34
+  data.tar.gz: 60f04cbd3e7531c45357c546d490851b8b781f0224468c2d2c81d9e3e550575f
 SHA512:
-  metadata.gz: 9b5b6684d1dc9c477a8fe215b9a7312fc20160861413b9bc1bdf3a3e09f97e7e129549996831b4d04609074e0bfa7fbdba05c3f2621dc71e5d814d2fd91ba71e
-  data.tar.gz: 9874c91f51dd30606fe87d9d848f51adc3ff91785d4d7b604bab667ea9869357453c9a76d7aff54332f4bf676c1c2836ec3677d864777130bbf50fcd49423a1f
+  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.7.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.117.0)
+    cocina-models (0.118.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.4)
+    json (2.19.5)
     json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
@@ -95,13 +95,13 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    minitest (6.0.5)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    multi_json (1.20.1)
-    nokogiri (1.19.2-arm64-darwin)
+    multi_json (1.21.1)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     optimist (3.2.1)
     parallel (2.1.0)
@@ -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.1)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -172,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)
@@ -184,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
@@ -209,7 +209,8 @@ CHECKSUMS
   attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
-  cocina-models (0.117.0)
+  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
@@ -231,16 +232,16 @@ CHECKSUMS
   ice_nine (0.11.2) sha256=5d506a7d2723d5592dc121b9928e4931742730131f22a1a37649df1c1e2e63db
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  json (2.19.4) sha256=670a7d333fb3b18ca5b29cb255eb7bef099e40d88c02c80bd42a3f30fe5239ac
+  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
-  minitest (6.0.5) sha256=f007d7246bf4feea549502842cd7c6aba8851cdc9c90ba06de9c476c0d01155c
-  multi_json (1.20.1) sha256=2f3934e805cc45ef91b551a1f89d0e9191abd06a5e04a2ef09a6a036c452ca6d
-  nokogiri (1.19.2-arm64-darwin) sha256=58d8ea2e31a967b843b70487a44c14c8ba1866daa1b9da9be9dbdf1b43dee205
-  nokogiri (1.19.2-x86_64-linux-gnu) sha256=fa8feca882b73e871a9845f3817a72e9734c8e974bdc4fbad6e4bc6e8076b94f
+  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 (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
   parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
@@ -261,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.1) sha256=44415f3f01d01a21e01132248d2fd0867572475b566ca188a0a42133a08d4531
+  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
@@ -272,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.10
+  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/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/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/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

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

@@ -3,39 +3,172 @@
 module Cocina
   module Models
     module Validators
-      # Perform validation against JSON schema
+      # Validates Cocina model instances against the JSON schema.
+      #
+      # The schema uses OpenAPI 3.1.0 conventions with `unevaluatedProperties: false` to enforce
+      # strict validation. However, when schemas use `allOf` with `$ref` (which is common for
+      # composing mixins), json_schemer reports cascaded unevaluatedProperties errors that are
+      # not actionable.
+      #
+      # For example, if a schema has:
+      #   AdminPolicy:
+      #     allOf:
+      #       - $ref: '#/$defs/AdminPolicyMixin'   # defines properties
+      #     unevaluatedProperties: false
+      #
+      # And an unexpected property appears at `/administrative/releaseTags`, json_schemer will
+      # report both:
+      #   - The actual error at `/administrative/releaseTags` (actionable)
+      #   - Cascaded errors for every known root property like `/label`, `/type` (noise)
+      #
+      # This happens because `unevaluatedProperties` semantics with `allOf`/$ref can be
+      # ambiguous. See https://github.com/davishmcclurg/json_schemer/issues/157
+      #
+      # To reduce noise while preserving actionable errors, this validator applies de-noising
+      # by keeping only:
+      #
+      #   1. All errors for nested properties (depth > 1)
+      #   2. Root-level errors for genuinely unknown properties (not in the model schema)
+      #
+      # This filters out cascaded root-level false positives without hiding real nested issues.
       class JsonSchemaValidator
-        def self.validate(clazz, attributes)
-          return unless clazz.name
+        SCHEMA_PATH = ::File.expand_path('../../../../schema.json', __dir__)
 
-          method_name = clazz.name.split('::').last
+        # @see #validate
+        def self.validate(...)
+          new(...).validate
+        end
+
+        # @param clazz [Class] the Cocina model class being validated (e.g., Cocina::Models::DRO)
+        # @param attributes [Hash] the attributes of the model instance being validated
+        def initialize(clazz, attributes)
+          @clazz = clazz
+          @attributes = attributes
+        end
 
-          attributes['cocinaVersion'] = Cocina::Models::VERSION if %w[DRO RequestDRO AdminPolicy RequestAdminPolicy Collection RequestCollection DROWithMetadata].include? method_name
+        # Validates attributes against the Cocina model schema.
+        #
+        # Injects the cocinaVersion if the model includes it as an attribute, then validates
+        # the attributes against the schema definition for this model. De-noises
+        # unevaluatedProperties errors before raising a ValidationError.
+        #
+        # @return [NilClass] returns nil if validation passes
+        # @raise [ValidationError] if validation fails, with a de-noised error message
+        def validate
+          attributes['cocinaVersion'] = Cocina::Models::VERSION if clazz.attribute_names.include?(:cocinaVersion)
 
           errors = schema.ref("#/$defs/#{method_name}").validate(attributes.as_json).to_a
-          return unless errors.any?
+          return if errors.empty?
 
-          raise ValidationError, "When validating #{method_name}: " + errors.map { |e| e['error'] }.uniq.join(', ')
+          raise ValidationError, "When validating #{method_name}: " + filtered_error_messages(errors).join(', ')
+        end
+
+        private
+
+        attr_reader :clazz, :attributes
+
+        # @return [JSONSchemer::Schema]
+        def schema
+          @schema ||= JSONSchemer.schema(document)
         end
 
         # @return [Hash] a hash representation of the schema.json document
-        def self.document
+        def document
           @document ||= begin
-            file_content = ::File.read(schema_path)
+            file_content = ::File.read(SCHEMA_PATH)
             JSON.parse(file_content)
           end
         end
 
-        # @return [JSONSchemer::Schema]
-        def self.schema
-          @schema ||= JSONSchemer.schema(document)
+        # @return [String] the method name derived from the class name
+        def method_name
+          @method_name ||= clazz.name.split('::').last
+        end
+
+        # @return [Array<String>] list of known root property names for the model class
+        def known_root_properties
+          @known_root_properties ||= clazz.attribute_names.map(&:to_s)
         end
-        private_class_method :schema
 
-        def self.schema_path
-          ::File.expand_path('../../../../schema.json', __dir__)
+        # Filters and de-duplicates error messages.
+        #
+        # Applies unevaluatedProperties de-noising to reduce cascaded false-positive errors,
+        # then extracts the error message strings and removes duplicates.
+        #
+        # @param errors [Array<Hash>] errors returned by json_schemer validator
+        # @return [Array<String>] de-noised, unique error message strings
+        def filtered_error_messages(errors)
+          denoised_errors = filter_unevaluated_property_noise(errors)
+          denoised_errors.map { |error| error['error'] }.uniq
+        end
+
+        # Filters out cascaded unevaluatedProperties errors while preserving actionable ones.
+        #
+        # When unevaluatedProperties errors are present, this method keeps:
+        #   - All non-unevaluatedProperties errors (unchanged)
+        #   - All unevaluatedProperties errors for nested properties (depth > 1)
+        #   - Root-level unevaluatedProperties errors for genuinely unknown properties
+        #
+        # It discards:
+        #   - Root-level unevaluatedProperties errors for known model attributes
+        #
+        # This filtering leverages the class attribute schema to distinguish between
+        # cascaded noise (root-level disallowed errors for known properties) and genuine
+        # issues (unexpected properties at any depth).
+        #
+        # @param errors [Array<Hash>] errors from json_schemer validator
+        # @return [Array<Hash>] filtered error hashes
+        def filter_unevaluated_property_noise(errors)
+          unevaluated_errors = errors.select { |error| unevaluated_property_error?(error) }
+          return errors if unevaluated_errors.empty?
+
+          # Keep non-unevaluated errors and filtered unevaluated errors
+          non_unevaluated = errors.reject { |error| unevaluated_property_error?(error) }
+          filtered_unevaluated = unevaluated_errors.select do |error|
+            depth = pointer_depth(error['data_pointer'])
+            # Keep if: no depth data, nested path, or unknown root property
+            depth.nil? || depth > 1 || root_unknown_property_error?(error)
+          end
+          non_unevaluated + filtered_unevaluated
+        end
+
+        # Checks if an error represents an unknown property at the root level.
+        #
+        # A root-level error is actionable only if the property name is not in the model's
+        # defined attributes. This distinguishes between genuine unexpected properties and
+        # cascaded noise from allOf/$ref evaluation.
+        #
+        # @param error [Hash] json_schemer error hash
+        # @return [Boolean] true if error is for a root-level unknown property
+        def root_unknown_property_error?(error)
+          return false unless pointer_depth(error['data_pointer']) == 1
+
+          property_name = error['data_pointer'].split('/').last
+          !known_root_properties.include?(property_name)
+        end
+
+        # Identifies errors related to unevaluatedProperties violations.
+        #
+        # @param error [Hash] json_schemer error hash
+        # @return [Boolean] true if error is an unevaluatedProperties violation
+        def unevaluated_property_error?(error)
+          error['schema_pointer']&.end_with?('/unevaluatedProperties') ||
+            error['error']&.include?('disallowed unevaluated property')
+        end
+
+        # Calculates the depth of a JSON pointer path.
+        #
+        # A root-level property has depth 1 (e.g., `/label`), a nested property has depth > 1
+        # (e.g., `/administrative/releaseTags` has depth 2).
+        #
+        # @param pointer [String, nil] JSON pointer path (e.g., `/administrative/releaseTags`)
+        # @return [Integer, nil] path depth, or nil if pointer is nil
+        def pointer_depth(pointer)
+          return if pointer.nil?
+          return 0 if pointer.empty?
+
+          pointer.split('/').reject(&:empty?).length
         end
-        private_class_method :schema_path
       end
     end
   end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.117.0'
+    VERSION = '0.118.0'
   end
 end