cocina-models 0.127.0 → 0.129.0

data/schema.json

@@ -155,19 +155,22 @@
       "allOf": [
         {
           "$ref": "#/$defs/Access"
-        }
-      ],
-      "properties": {
-        "copyright": {
-          "$ref": "#/$defs/Copyright"
         },
-        "useAndReproductionStatement": {
-          "$ref": "#/$defs/UseAndReproductionStatement"
-        },
-        "license": {
-          "$ref": "#/$defs/License"
+        {
+          "type": "object",
+          "properties": {
+            "copyright": {
+              "$ref": "#/$defs/Copyright"
+            },
+            "useAndReproductionStatement": {
+              "$ref": "#/$defs/UseAndReproductionStatement"
+            },
+            "license": {
+              "$ref": "#/$defs/License"
+            }
+          }
         }
-      },
+      ],
       "unevaluatedProperties": false
     },
     "AdminPolicyAdministrative": {
@@ -230,18 +233,6 @@
       ],
       "unevaluatedProperties": false
     },
-    "AppliesTo": {
-      "description": "Property model for indicating the parts, aspects, or versions of the resource to which a descriptive element is applicable.",
-      "type": "object",
-      "properties": {
-        "appliesTo": {
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveBasicValue"
-          }
-        }
-      }
-    },
     "Barcode": {
       "description": "A barcode",
       "oneOf": [
@@ -262,6 +253,28 @@
         }
       ]
     },
+    "AppliesTo": {
+      "description": "Value model for appliesTo property.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/$defs/DescriptiveBasicValue"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "identifier": {
+              "description": "Identifiers and URIs associated with the descriptive element.",
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/DescriptiveIdentifier"
+              }
+            }
+          }
+        }
+      ],
+      "unevaluatedProperties": false
+    },
     "BusinessBarcode": {
       "description": "The barcode associated with a business library DRO, prefixed with 2050",
       "type": "string",
@@ -672,23 +685,26 @@
     },
     "DROAccess": {
       "type": "object",
-      "properties": {
-        "copyright": {
-          "$ref": "#/$defs/Copyright"
-        },
-        "embargo": {
-          "$ref": "#/$defs/Embargo"
-        },
-        "useAndReproductionStatement": {
-          "$ref": "#/$defs/UseAndReproductionStatement"
-        },
-        "license": {
-          "$ref": "#/$defs/License"
-        }
-      },
       "allOf": [
         {
           "$ref": "#/$defs/Access"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "copyright": {
+              "$ref": "#/$defs/Copyright"
+            },
+            "embargo": {
+              "$ref": "#/$defs/Embargo"
+            },
+            "useAndReproductionStatement": {
+              "$ref": "#/$defs/UseAndReproductionStatement"
+            },
+            "license": {
+              "$ref": "#/$defs/License"
+            }
+          }
         }
       ],
       "unevaluatedProperties": false
@@ -1073,7 +1089,7 @@
       "unevaluatedProperties": false
     },
     "DescriptiveBasicValue": {
-      "description": "Basic value model for descriptive elements. Can only have one of value, parallelValue, groupedValue, or structuredValue.",
+      "description": "Basic value model for descriptive elements. Can only have one of value, parallelValue, groupedValue, or structuredValue. Does not have identifier or appliesTo properties.",
       "type": "object",
       "allOf": [
         {
@@ -1118,13 +1134,6 @@
             "encoding": {
               "$ref": "#/$defs/Standard"
             },
-            "identifier": {
-              "description": "Identifiers and URIs associated with the descriptive element.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveIdentifier"
-              }
-            },
             "source": {
               "$ref": "#/$defs/Source"
             },
@@ -1203,7 +1212,7 @@
               "required": ["groupedValue"],
               "properties": {
                 "groupedValue": {
-                  "minItems": 2
+                  "minItems": 1
                 }
               }
             }
@@ -1349,181 +1358,49 @@
         }
       }
     },
-    "DescriptiveValue": {
-      "description": "Default value model for descriptive elements.",
+    "DescriptiveIdentifier": {
+      "description": "Default value model for identifiers.",
       "type": "object",
-      "properties": {
-        "appliesTo": {
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveBasicValue"
-          }
-        }
-      },
       "allOf": [
         {
-          "$ref": "#/$defs/DescriptiveStructuredValue"
-        },
-        {
-          "$ref": "#/$defs/DescriptiveParallelValue"
-        },
-        {
-          "$ref": "#/$defs/DescriptiveGroupedValue"
+          "$ref": "#/$defs/DescriptiveBasicValue"
         },
         {
           "type": "object",
           "properties": {
-            "value": {
-              "description": "String or integer value of the descriptive element.",
-              "oneOf": [
-                {
-                  "type": "string"
-                }
-              ]
-            },
-            "type": {
-              "description": "Type of value provided by the descriptive element. See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.",
-              "type": "string"
-            },
-            "status": {
-              "description": "Status of the descriptive element value relative to other instances of the element.",
-              "type": "string"
-            },
-            "code": {
-              "description": "Code value of the descriptive element.",
-              "type": "string"
-            },
-            "uri": {
-              "description": "URI value of the descriptive element.",
-              "type": "string"
-            },
-            "standard": {
-              "$ref": "#/$defs/Standard"
-            },
-            "encoding": {
-              "$ref": "#/$defs/Standard"
-            },
-            "identifier": {
-              "description": "Identifiers and URIs associated with the descriptive element.",
+            "appliesTo": {
               "type": "array",
               "items": {
-                "$ref": "#/$defs/DescriptiveIdentifier"
-              }
-            },
-            "source": {
-              "$ref": "#/$defs/Source"
-            },
-            "displayLabel": {
-              "description": "The preferred display label to use for the descriptive element in access systems.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "qualifier": {
-              "description": "A term providing information about the circumstances of the statement (e.g., approximate dates).",
-              "type": "string"
-            },
-            "note": {
-              "description": "Other information related to the descriptive element.",
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/DescriptiveValue"
+                "$ref": "#/$defs/AppliesTo"
               }
-            },
-            "valueLanguage": {
-              "$ref": "#/$defs/DescriptiveValueLanguage"
-            },
-            "valueAt": {
-              "description": "URL or other pointer to the location of the value of the descriptive element.",
-              "type": "string"
             }
           }
         }
       ],
       "unevaluatedProperties": false
     },
-    "DescriptiveIdentifier": {
-      "description": "Value model for descriptive identifiers. Same as DescriptiveValue but omits the identifier property to prevent infinite recursion.",
+    "DescriptiveValue": {
+      "description": "Default value model for descriptive elements.",
       "type": "object",
-      "properties": {
-        "appliesTo": {
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/DescriptiveBasicValue"
-          }
-        }
-      },
       "allOf": [
         {
-          "$ref": "#/$defs/DescriptiveStructuredValue"
-        },
-        {
-          "$ref": "#/$defs/DescriptiveParallelValue"
-        },
-        {
-          "$ref": "#/$defs/DescriptiveGroupedValue"
+          "$ref": "#/$defs/DescriptiveBasicValue"
         },
         {
           "type": "object",
           "properties": {
-            "value": {
-              "description": "String or integer value of the descriptive element.",
-              "oneOf": [
-                {
-                  "type": "string"
-                }
-              ]
-            },
-            "type": {
-              "description": "Type of value provided by the descriptive element. See https://github.com/sul-dlss/cocina-models/blob/main/docs/description_types.md for valid types.",
-              "type": "string"
-            },
-            "status": {
-              "description": "Status of the descriptive element value relative to other instances of the element.",
-              "type": "string"
-            },
-            "code": {
-              "description": "Code value of the descriptive element.",
-              "type": "string"
-            },
-            "uri": {
-              "description": "URI value of the descriptive element.",
-              "type": "string"
-            },
-            "standard": {
-              "$ref": "#/$defs/Standard"
-            },
-            "encoding": {
-              "$ref": "#/$defs/Standard"
-            },
-            "source": {
-              "$ref": "#/$defs/Source"
-            },
-            "displayLabel": {
-              "description": "The preferred display label to use for the descriptive element in access systems.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "qualifier": {
-              "description": "A term providing information about the circumstances of the statement (e.g., approximate dates).",
-              "type": "string"
-            },
-            "note": {
-              "description": "Other information related to the descriptive element.",
+            "appliesTo": {
               "type": "array",
               "items": {
-                "$ref": "#/$defs/DescriptiveValue"
+                "$ref": "#/$defs/AppliesTo"
               }
             },
-            "valueLanguage": {
-              "$ref": "#/$defs/DescriptiveValueLanguage"
-            },
-            "valueAt": {
-              "description": "URL or other pointer to the location of the value of the descriptive element.",
-              "type": "string"
+            "identifier": {
+              "description": "Identifiers and URIs associated with the descriptive element.",
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/DescriptiveIdentifier"
+              }
             }
           }
         }
@@ -2012,7 +1889,7 @@
         "appliesTo": {
           "type": "array",
           "items": {
-            "$ref": "#/$defs/DescriptiveBasicValue"
+            "$ref": "#/$defs/AppliesTo"
           }
         },
         "code": {
@@ -2502,13 +2379,6 @@
         "access": {
           "$ref": "#/$defs/DescriptiveAccessMetadata"
         },
-        "relatedResource": {
-          "description": "Other resources associated with the related resource.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/RelatedResource"
-          }
-        },
         "adminMetadata": {
           "$ref": "#/$defs/DescriptiveAdminMetadata"
         },
@@ -2676,9 +2546,21 @@
       "required": [
         "cocinaVersion",
         "administrative",
+        "description",
         "type",
         "version"
       ],
+      "allOf": [
+        {
+          "properties": {
+            "description": {
+              "required": [
+                "title"
+              ]
+            }
+          }
+        }
+      ],
       "unevaluatedProperties": false
     },
     "RequestAdministrative": {
@@ -2746,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": {
@@ -2812,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": {
@@ -2933,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.127.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