cocina-models 0.86.0 → 0.87.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15d31900b286fa2945fbbb10a957cdb71aadc1b7f3f4a0463a9ab04ac5d181d5
-  data.tar.gz: d1ee89eec766056327f8999bff0ae9c15d908b4d75338d98c6ab427c5a8c5ef8
+  metadata.gz: 90ae20c8c80e4bbcf51179f0c6cba44c76f3f1551962f4da938d297c152ed77d
+  data.tar.gz: b71a9f5c05e153ebdf93f623164a7a77c12aeae2de32b96757096a7d2f747cfa
 SHA512:
-  metadata.gz: 7dafbf718bf85eecf60c896342e88b94381055b8b39f729eecfc3117d5e632c70763e4630d358e09e7477b235f3bc007321884fa0ac7930f663b9dbcc25ac112
-  data.tar.gz: b1c7a624ecdb052f1273b0aa1bc9267c046bab1b25b32e79ad4a9c7dc18da60b426cc334a1f2d36c64c9b45682589929343b9b6b872b02ba4b1538937bafd5b1
+  metadata.gz: 26f2fe285a9249a70015b31b7fb30983d3f4fff6befe671508f56ac57d6bbcb901f5740290fcd3bcfb6a5e7ccc9697ccf8032b0d3aa07d6a743485ce34cb9c1d
+  data.tar.gz: cf8992389b7097a416f5050d196758145dd958abeef155a672fa21ffdef382f5e025e6b101dd2f26baf427aef2b195b43b93431b9faaae569d1386efe9cafb1d

data/.circleci/config.yml

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

data/.rubocop.yml

@@ -20,6 +20,10 @@ Layout/LineLength:
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 
+# This cop throws an error in 1.37.1
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
 # ----- Lint ------
 
 Lint/BinaryOperatorWithIdenticalOperands:
@@ -331,7 +335,7 @@ Style/MapCompactWithConditionalBlock: # new in 1.30
   Enabled: true
 RSpec/ChangeByZero: # new in 2.11.0
   Enabled: true
-RSpec/Capybara/SpecificMatcher: # new in 2.12
+Capybara/SpecificMatcher: # new in 2.12
   Enabled: false
 RSpec/Rails/HaveHttpStatus: # new in 2.12
   Enabled: false
@@ -340,5 +344,53 @@ RSpec/ClassCheck: # new in 2.13
   Enabled: true
 RSpec/NoExpectationExample: # new in 2.13
   Enabled: true
-RSpec/Capybara/SpecificFinders: # new in 2.13
+Capybara/SpecificFinders: # new in 2.13
+  Enabled: true
+Gemspec/DevelopmentDependencies: # new in 1.44
+  Enabled: true
+Lint/DuplicateMagicComment: # new in 1.37
+  Enabled: true
+Lint/UselessRescue: # new in 1.43
+  Enabled: true
+Style/ArrayIntersect: # new in 1.40
+  Enabled: true
+Style/ComparableClamp: # new in 1.44
+  Enabled: true
+Style/ConcatArrayLiterals: # new in 1.41
+  Enabled: true
+Style/MapToSet: # new in 1.42
+  Enabled: true
+Style/MinMaxComparison: # new in 1.42
+  Enabled: true
+Style/OperatorMethodCall: # new in 1.37
+  Enabled: true
+Style/RedundantConstantBase: # new in 1.40
+  Enabled: true
+Style/RedundantDoubleSplatHashBraces: # new in 1.41
+  Enabled: true
+Style/RedundantEach: # new in 1.38
+  Enabled: true
+Style/RedundantStringEscape: # new in 1.37
+  Enabled: true
+Capybara/MatchStyle: # new in <<next>>
+  Enabled: true
+Capybara/NegationMatcher: # new in 2.14
+  Enabled: true
+Capybara/SpecificActions: # new in 2.14
+  Enabled: true
+RSpec/DuplicatedMetadata: # new in 2.16
+  Enabled: true
+RSpec/PendingWithoutReason: # new in 2.16
+  Enabled: true
+RSpec/SortMetadata: # new in 2.14
+  Enabled: true
+RSpec/FactoryBot/ConsistentParenthesesStyle: # new in 2.14
+  Enabled: true
+RSpec/FactoryBot/FactoryNameStyle: # new in 2.16
+  Enabled: true
+RSpec/Rails/InferredSpecType: # new in 2.14
+  Enabled: true
+RSpec/Rails/MinitestAssertions: # new in 2.17
+  Enabled: true
+Style/RedundantHeredocDelimiterQuotes: # new in 1.45
   Enabled: true

data/.rubocop_todo.yml

@@ -1,17 +1,27 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2022-06-08 23:20:02 UTC using RuboCop version 1.28.2.
+# on 2023-02-07 01:43:53 UTC using RuboCop version 1.44.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 3
+# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# SupportedStyles: Gemfile, gems.rb, gemspec
+# AllowedGems: bundler
+# Include: **/*.gemspec, **/Gemfile, **/gems.rb
+Gemspec/DevelopmentDependencies:
+  Exclude:
+    - 'cocina-models.gemspec'
+
 # Offense count: 1
 Lint/NoReturnInBeginEndBlocks:
   Exclude:
     - 'lib/cocina/models/mapping/to_mods/description.rb'
 
-# Offense count: 1
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: present?, blank?, presence, try, try!, in?
 Lint/SafeNavigationChain:
@@ -19,7 +29,7 @@ Lint/SafeNavigationChain:
     - 'lib/cocina/generator/schema_base.rb'
 
 # Offense count: 13
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
   Exclude:
@@ -35,16 +45,30 @@ Lint/UnusedMethodArgument:
     - 'lib/cocina/models/mapping/from_mods/subject.rb'
     - 'lib/cocina/models/mapping/to_mods/event.rb'
 
-# Offense count: 96
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Offense count: 95
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 40
 
-# Offense count: 42
-# Configuration parameters: IgnoredMethods.
+# Offense count: 43
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 12
 
+# Offense count: 1
+# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+Metrics/MethodLength:
+  Exclude:
+    - 'spec/cocina/models/file_access_spec.rb'
+    - 'spec/cocina/models/dro_access_spec.rb'
+    - 'lib/cocina/rspec/factories.rb'
+    - 'lib/cocina/models/mapping/to_mods/*'
+    - 'lib/cocina/models/mapping/from_mods/*'
+    - 'lib/cocina/models/mapping/normalizers/mods/origin_info_normalizer.rb'
+    - 'lib/cocina/models/mapping/normalizers/mods/subject_normalizer.rb'
+    - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'
+    - 'lib/cocina/generator/schema_base.rb'
+
 # Offense count: 1
 # Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
@@ -62,20 +86,30 @@ RSpec/ExampleLength:
   Max: 128
 
 # Offense count: 10
-# Configuration parameters: Max.
+# Configuration parameters: Max, AllowedGroups.
 RSpec/NestedGroups:
   Exclude:
     - 'spec/cocina/models/mapping/normalizers/mods/origin_info_normalizer_spec.rb'
     - 'spec/cocina/models/validators/date_time_validator_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
+# Offense count: 19
+RSpec/PendingWithoutReason:
   Exclude:
-    - 'lib/cocina/generator/schema_base.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/name_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/origin_info_place_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/physical_description_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/record_info_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/subject_classification_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/subject_genre_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/subject_geographic_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/subject_name_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/subject_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/subject_title_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/title_info_spec.rb'
+    - 'spec/cocina/models/mapping/descriptive/mods/type_of_resource_spec.rb'
 
 # Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
+# This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/cocina/models/validators/open_api_validator.rb'
@@ -88,8 +122,8 @@ Style/MultilineBlockChain:
     - 'lib/cocina/models/mapping/to_mods/form.rb'
     - 'lib/cocina/models/mapping/to_mods/subject.rb'
 
-# Offense count: 223
-# This cop supports safe auto-correction (--auto-correct).
+# Offense count: 225
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.86.0)
+    cocina-models (0.87.1)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -20,57 +20,58 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    attr_extras (6.2.5)
+    attr_extras (7.1.0)
     byebug (11.1.3)
-    committee (4.4.0)
+    committee (4.99.1)
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (>= 0.11.1, < 1.0)
       rack (>= 1.5)
-    commonmarker (0.23.6)
-    concurrent-ruby (1.1.10)
+    commonmarker (0.23.8)
+    concurrent-ruby (1.2.0)
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-container (0.11.0)
+    dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
-    dry-core (0.8.1)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.3.0)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
-    dry-types (1.5.1)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    edtf (3.1.0)
+      dry-core (~> 1.0, < 2)
+      dry-inflector (~> 1.0, < 2)
+      dry-logic (>= 1.4, < 2)
+      zeitwerk (~> 2.6)
+    edtf (3.1.1)
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.6.2)
+    json (2.6.3)
     json_schema (0.21.0)
     jsonpath (1.1.2)
       multi_json
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     multi_json (1.15.0)
-    nokogiri (1.13.8)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
@@ -78,51 +79,54 @@ GEM
     openapi_parser (0.15.0)
     optimist (3.0.1)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    racc (1.6.0)
-    rack (3.0.0)
+    racc (1.6.2)
+    rack (3.0.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rspec_junit_formatter (0.5.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.2.9)
       rexml
-    rubocop (1.36.0)
+    rubocop (1.45.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.2)
+    rubocop-rspec (2.18.1)
       rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -133,10 +137,10 @@ GEM
       diff-lcs
       patience_diff
     thor (1.2.1)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    zeitwerk (2.6.0)
+    unicode-display_width (2.4.2)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

data/lib/cocina/generator/datatype.rb

@@ -11,7 +11,7 @@ module Cocina
           module Cocina
             module Models
               #{name} = Types::String.constrained(
-                format: /#{schema_doc.pattern}/i
+                format: /#{schema_doc.pattern}/
               )
             end
           end

data/lib/cocina/generator/generator.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 module Cocina
   module Generator
     # Class for generating Cocina models from openapi.
-    class Generator < Thor
+    class Generator < Thor # rubocop:disable Metrics/ClassLength
       include Thor::Actions
 
       class_option :openapi, desc: 'Path of openapi.yml', default: 'openapi.yml'
@@ -19,14 +19,12 @@ module Cocina
       def generate
         clean_output
 
-        # rubocop:disable Style/HashEachMethods
-        # This is not a Hash
-        schemas.keys.each do |schema_name|
+        filepaths = schemas.keys.filter_map do |schema_name|
           schema = schema_for(schema_name)
           generate_for(schema) if schema
         end
-        # rubocop:enable Style/HashEachMethods
 
+        auto_format(filepaths)
         generate_vocab
         generate_descriptive_docs
       end
@@ -38,7 +36,8 @@ module Cocina
 
         FileUtils.mkdir_p(options[:output])
 
-        generate_for(schema)
+        filepath = generate_for(schema)
+        auto_format(filepath)
       end
 
       desc 'generate_vocab', 'generate vocab'
@@ -101,18 +100,26 @@ module Cocina
 
         case schema_doc.type
         when 'object'
-          Schema.new(schema_doc)
+          Schema.new(schema_doc, schemas: schemas.keys)
         when 'string'
-          Datatype.new(schema_doc)
+          Datatype.new(schema_doc, schemas: schemas.keys)
+        when NilClass
+          return unless schema_doc.one_of.map(&:name).all? { |ref_schema_name| schemas.keys.include?(ref_schema_name) }
+
+          UnionType.new(schema_doc)
         end
       end
 
       def generate_for(schema)
-        filepath = "#{options[:output]}/#{schema.filename}"
-        FileUtils.rm_f(filepath)
+        "#{options[:output]}/#{schema.filename}".tap do |filepath|
+          FileUtils.rm_f(filepath)
+
+          create_file filepath, schema.generate
+        end
+      end
 
-        create_file filepath, schema.generate
-        run("rubocop -a #{filepath} > /dev/null")
+      def auto_format(*filepaths)
+        run("rubocop -a #{filepaths.join(' ')} > /dev/null")
       end
 
       NO_CLEAN = [

data/lib/cocina/generator/schema.rb

@@ -111,7 +111,8 @@ module Cocina
                                                    # different oneOf schemas. Validation is still performed
                                                    # by openAPI.
                                                    relaxed: true,
-                                                   parent: self)
+                                                   parent: self,
+                                                   schemas: schemas)
           end
         end
       end
@@ -122,7 +123,8 @@ module Cocina
                                                  key: key,
                                                  required: doc.requires?(key),
                                                  nullable: properties_doc.nullable?,
-                                                 parent: self)
+                                                 parent: self,
+                                                 schemas: schemas)
         end
       end
     end

data/lib/cocina/generator/schema_array.rb

@@ -9,7 +9,7 @@ module Cocina
       end
 
       def array_of_type
-        schema_doc.items.name || "Types::#{dry_datatype(schema_doc.items)}"
+        schema_doc.items.name || dry_datatype(schema_doc.items)
       end
     end
   end

data/lib/cocina/generator/schema_base.rb

@@ -4,15 +4,16 @@ module Cocina
   module Generator
     # Base class for generating from openapi
     class SchemaBase
-      attr_reader :schema_doc, :key, :required, :nullable, :parent, :relaxed
+      attr_reader :schema_doc, :key, :required, :nullable, :parent, :relaxed, :schemas
 
-      def initialize(schema_doc, key: nil, required: false, nullable: false, parent: nil, relaxed: false)
+      def initialize(schema_doc, key: nil, required: false, nullable: false, parent: nil, relaxed: false, schemas: [])
         @schema_doc = schema_doc
         @key = key
         @required = required
         @nullable = nullable
         @parent = parent
         @relaxed = relaxed
+        @schemas = schemas
       end
 
       def filename
@@ -23,10 +24,16 @@ module Cocina
         key || schema_doc.name
       end
 
-      # Allows nillable values to be set to nil. This is useful when doing
-      # an update and you want to clear out a value.
+      # Allows nullable values to be set to nil. This is useful when doing an
+      # update and you want to clear out a value. The logic also permits custom
+      # types (e.g., `Barcode`, `SourceId`) to be nullable if they are not
+      # required.
       def optional
-        nullable || relaxed ? '.optional' : ''
+        return '.optional' if nullable ||
+                              relaxed ||
+                              (custom_type? && !required)
+
+        ''
       end
 
       def quote(item)
@@ -59,34 +66,58 @@ module Cocina
         "# Validation of this property is relaxed. See the openapi for full validation.\n"
       end
 
+      # dry-types-based types contain the word `Types` (e.g., `Types::String`), and custom types (e.g., `SourceId`) do not
+      def custom_type?
+        !dry_datatype(schema_doc).match?('Types')
+      end
+
       def dry_datatype(doc)
+        return doc.name if doc.name.present? && schemas.include?(doc.name)
+
+        datatype_from_doc_names(doc) ||
+          datatype_from_doc_type(doc) ||
+          raise("#{doc.type} not supported")
+      end
+
+      def datatype_from_doc_type(doc)
         case doc.type
         when 'integer'
-          'Strict::Integer'
+          'Types::Strict::Integer'
         when 'string'
           string_dry_datatype(doc)
         when 'boolean'
-          'Strict::Bool'
+          'Types::Strict::Bool'
         else
-          if any_datatype?(doc)
-            'Nominal::Any'
-          else
-            raise "#{schema_doc.type} not supported"
-          end
+          return 'Types::Nominal::Any' if any_datatype?(doc)
+
+          raise "#{schema_doc.type} not supported"
         end
       end
 
+      def datatype_from_doc_names(doc)
+        return unless defined_datatypes?(doc)
+
+        doc.one_of.map(&:name).join(' | ')
+      end
+
+      def defined_datatypes?(doc)
+        doc.one_of&.map(&:name)&.all? { |name| name.present? && schemas.include?(name) }
+      end
+
       def any_datatype?(doc)
-        relaxed || doc.one_of&.map(&:type).all? { |o| %w[integer string].include?(o) }
+        relaxed || doc.one_of&.map(&:type)&.all? { |o| %w[integer string].include?(o) }
       end
 
       def string_dry_datatype(doc)
-        case doc.format
-        when 'date-time'
-          'Params::DateTime'
-        else
-          'Strict::String'
-        end
+        format = case doc.format
+                 when 'date-time'
+                   'Types::Params::DateTime'
+                 else
+                   'Types::Strict::String'
+                 end
+        return format unless doc.pattern
+
+        "Types::Strict::String.constrained(format: /#{doc.pattern}/)"
       end
 
       def preamble

data/lib/cocina/generator/schema_value.rb

@@ -5,7 +5,6 @@ module Cocina
     # Class for generating from an openapi value
     class SchemaValue < SchemaBase
       def generate
-        # optional has to come before default or the default value that gets set will be nil.
         if required && !relaxed
           "#{preamble}attribute :#{name.camelize(:lower)}, #{type}"
         else
@@ -16,7 +15,8 @@ module Cocina
       private
 
       def type
-        "Types::#{dry_datatype(schema_doc)}#{optional}#{default}#{enum}"
+        # optional has to come before default or the default value that gets set will be nil.
+        "#{dry_datatype(schema_doc)}#{optional}#{default}#{enum}"
       end
 
       def enum
@@ -33,7 +33,7 @@ module Cocina
 
       def default
         # Provide version as default for cocinaVersion
-        return '.default(Cocina::Models::VERSION)' if name == 'cocinaVersion'
+        return '.default(VERSION)' if name == 'cocinaVersion'
 
         # If type is boolean and default is false, erroneously getting a nil.
         # Assuming that if required, then default is false.

data/lib/cocina/generator/union_type.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Generator
+    # Class for generating a union type
+    class UnionType < SchemaBase
+      def generate
+        <<~RUBY
+          # frozen_string_literal: true
+
+          module Cocina
+            module Models
+              #{name} = #{type_names}
+            end
+          end
+        RUBY
+      end
+
+      def type_names
+        schema_doc.one_of.map(&:name).join(' | ')
+      end
+    end
+  end
+end