explicit 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7af55a714a82013bc41a2a3b29775b1f3ffd3886a30e39441937ce05ee8f9a38
-  data.tar.gz: baa6e0725cd885adcb764cf3627305ff5693000506e2153bd137eeffdd5c3cc3
+  metadata.gz: d5c59437da284708551b719ae8b40a62e98e38886b6327807edef311068b7634
+  data.tar.gz: 9175b15ba7d61853e56ec823a781565b413886793f32efeb8f5ae37459511ff4
 SHA512:
-  metadata.gz: 687b57c6d6c099c9f4e0f3010b1117751b0033846109218c894a3392d968392fbd16a3574c8b6b0663b46b4849f0e1a4cf4c479ec94f9ef48c28b4e3de513eef
-  data.tar.gz: 681fb242515af80b13e48855ee964d0795410697be6d657a3afda94bc192a6b5fd27f20cfe862eb993f3a1ca5aa344c6c2a1023507c200ef0a0fae35ed84d9c8
+  metadata.gz: 0ebe27efff3c7a9e1379e2e2025a9c75499905efaa1bdaaacff51ff17e963175e1cfc2d2e81f98f4fce615f6161be792ebad385a38471e2a9901bb076e17f3d3
+  data.tar.gz: 1da9daabfa4d8e59c85051eff97fce1f9091fb744ec3294403fc7baff972c50cf0b965ea0670f92fe26a9d8bbc01337a8a7631f1a32465e2f8e9ce764f036657

data/README.md

@@ -3,7 +3,9 @@
 Explicit is a validation and documentation library for REST APIs that enforces
 documented types at runtime.
 
-![Documentation example screenshot](https://raw.githubusercontent.com/luizpvas/explicit/refs/heads/main/assets/webapp_screenshot.png)
+| ![Documentation example screenshot](https://raw.githubusercontent.com/luizpvas/explicit/refs/heads/main/assets/webapp_screenshot.png) |
+| :-----------------------------------------------------------------------------------------------------------------------------------: |
+|             [Click here](https://luizpvas.github.io/explicit_documentation.html) to visit the example documentation page              |
 
 1. [Installation](#installation)
 2. [Defining requests](#defining-requests)
@@ -15,9 +17,12 @@ documented types at runtime.
 7. Types
    - [Agreement](#agreement)
    - [Array](#array)
-   - [BigDecimal](#bigdecimal)
+   - [BigDecimal](#big_decimal)
    - [Boolean](#boolean)
+   - [Date](#date)
+   - [Date Range](#date-range)
    - [Date Time ISO8601](#date-time-iso8601)
+   - [Date Time ISO8601 Range](#date-time-iso8601-range)
    - [Date Time Posix](#date-time-posix)
    - [Default](#default)
    - [Description](#description)
@@ -58,6 +63,10 @@ available:
 - `header(name, type)` - Adds a type to the request header.
 - `param(name, type, options = {})` - Adds a type to the request param.
   It works for params in the request body, query string and path params.
+  - The following conveniences are available via options:
+    - `optional: true` - Makes the param nilable.
+    - `default: value` - Sets a default value to the param, which makes it optional.
+    - `description: "text"` - Adds a documentation to the param. Markdown supported.
 - `response(status, type)` - Adds a response type. You can add multiple
   responses with different formats.
 - `add_example(params:, headers:, response:)` - Adds an example to the
@@ -245,7 +254,8 @@ Call `Explicit::Documentation.new` to group, organize and publish the
 documentation for your API. The following methods are available:
 
 - `page_title(text)` - Sets the web page title.
-- `company_logo_url(url)` - Shows the company logo above the navigation menu.
+- `company_logo_url(url)` - Shows the company logo in the navigation menu.
+- `favicon_url(url)` - Adds a favicon to the web page.
 - `version(semver)` - Sets the version of the API. Default: "1.0"
 - `section(name, &block)` - Adds a section to the navigation menu.
 - `add(request)` - Adds a request to the section
@@ -258,6 +268,7 @@ module MyApp::API::V1
   Documentation = Explicit::Documentation.new do
     page_title "Acme API Docs"
     company_logo_url "https://my-app.com/logo.png"
+    favicon_url "https://my-app.com/favicon.ico"
     version "1.0.5"
 
     section "Introduction" do
@@ -401,9 +412,9 @@ value is invalid then the array is invalid.
 ### BigDecimal
 
 ```ruby
-:bigdecimal
-[:bigdecimal, min: 0] # inclusive
-[:bigdecimal, max: 100] # inclusive
+:big_decimal
+[:big_decimal, min: 0] # inclusive
+[:big_decimal, max: 100] # inclusive
 ```
 
 Value must be an integer or a string like `"0.2"` to avoid rounding errors.
@@ -418,19 +429,60 @@ Value must be an integer or a string like `"0.2"` to avoid rounding errors.
 The following values are true: `true`, `"true"`, `"on"`, `"1"` and `1`, and the
 following values are false: `false`, `"false"`, `"off"`, `"0"` and `0`.
 
+### Date
+
+```ruby
+:date
+[:date, min: -> { 2.months.ago }]
+[:date, max: -> { 1.month.from_now }]
+```
+
+A date in the format of `"YYYY-MM-DD"`.
+
+### Date Range
+
+```ruby
+:date_range
+[:date_range, min_range: 2.days]
+[:date_range, max_range: 30.days]
+[:date_range, min_date: -> { 2.months.ago }]
+[:date_range, max_date: -> { 1.day.from_now }]
+```
+
+A range between two dates in the format of `"YYYY-MM-DD..YYYY-MM-DD"`.
+The range is inclusive.
+
 ### Date Time ISO8601
 
 ```ruby
 :date_time_iso8601
+[:date_time_iso8601, min: -> { 2.months.ago }]
+[:date_time_iso8601, max: -> { Time.current.end_of_day }]
 ```
 
 String encoded date time following the ISO 8601 spec. For example:
 `"2024-12-10T14:21:00Z"`
 
+### Date Time ISO8601 Range
+
+```ruby
+:date_time_iso8601_range
+[:date_time_iso8601_range, min_range: 30.minutes]
+[:date_time_iso8601_range, max_range: 2.months]
+[:date_time_iso8601_range, min_date_time: -> { 2.months.ago }]
+[:date_time_iso8601_range, max_date_time: -> { 1.hour.from_now }]
+```
+
+A range between two date times in the format of
+`"start_date_time..end_date_time"`. For example:
+`"2024-12-10T14:00:00Z..2024-12-11T15:00:00Z"`. The range is inclusive.
+
 ### Date Time Posix
 
 ```ruby
-:date_time_posix
+:date_time_unix_epoch
+[:date_time_unix_epoch, min: -> { 2.months.ago }]
+[:date_time_unix_epoch, max: -> { Time.current.end_of_day }]
 ```
 
 The number of elapsed seconds since January 1, 1970 in timezone UTC. For
@@ -467,15 +519,15 @@ Markdown supported.
 ### Hash
 
 ```ruby
-[:hash, keytype, valuetype, options = {}]
+[:hash, key_type, value_type, options = {}]
 [:hash, :string, :string]
 [:hash, :string, :integer]
 [:hash, :string, :integer, empty: false]
 [:hash, :string, [:array, :date_time_iso8601]]
 ```
 
-Hashes are key value pairs where all keys must match keytype and all values must
-match valuetype. If you are expecting a hash with a specific set of keys use a
+Hashes are key value pairs where all keys must match key_type and all values must
+match value_type. If you are expecting a hash with a specific set of keys use a
 [record](#record) instead.
 
 ### Enum
@@ -558,7 +610,7 @@ address_type = {
 
 payment_type = {
   currency: [:nilable, :string], # use :nilable for optional attribute
-  amount: :bigdecimal
+  amount: :big_decimal
 }
 ```
 
@@ -574,8 +626,8 @@ records with array of records, etc.
 [:string, empty: false]
 [:string, downcase: true] # "FOO" gets transformed to "foo"
 [:string, format: URI::MailTo::EMAIL_REGEXP]
-[:string, minlength: 8] # inclusive
-[:string, maxlength: 20] # inclusive
+[:string, min_length: 8] # inclusive
+[:string, max_length: 20] # inclusive
 ```
 
 # Configuration

data/app/views/explicit/documentation/_attribute.html.erb

@@ -13,7 +13,7 @@
     <% end %>
 
     <% if type.has_details? || type.description.present? %>
-      <div class="record__summary__expand">
+      <div class="ml-auto text-neutral-300">
         <span x-show="expanded">&#9650;</span>
         <span x-show="!expanded">&#9660;</span>
       </div>
@@ -29,7 +29,7 @@
       <% end %>
 
       <% if type.has_details? %>
-        <div class="record__subtype">
+        <div class="mt-2">
           <%= type_render type %>
         </div>
       <% end %>

data/app/views/explicit/documentation/_page.html.erb

@@ -1,49 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= local_assigns[:page_title] || "API Documentation" %></title>
+  <title><%= page_title || "API Documentation" %></title>
+
+  <% if favicon_url %>
+    <link rel="icon" href="<%= favicon_url %>" />
+  <% end %>
 
   <style>
     html, body {
-      font-family: sans-serif;
       font-size: 14px;
-      margin: 0;
-      padding: 0;
-
-      --color-neutral-50: #fafafa;
-      --color-neutral-100: #f5f5f5;
-      --color-neutral-200: #e5e5e5;
-      --color-neutral-300: #d4d4d8;
-      --color-neutral-400: #a3a3a3;
-      --color-neutral-500: #737373;
-      --color-neutral-600: #525252;
-    }
-
-    .page:not(:first-of-type) {
-      border-top: 1px solid var(--color-neutral-200);
-    }
-    .page__url {
-      background: var(--color-neutral-100);
-      border: 1px solid var(--color-neutral-300);
-      font-family: monospace;
-      padding: 0.8rem;
-    }
-    .page__url__shared {
-      color: var(--color-neutral-500);
-    }
-    .page__url__path {
-      font-weight: bold;
-    }
-    .page__container {
-      display: flex;
-      gap: 1rem;
-      margin-top: 1rem;
-    }
-    .page__request {
-      width: 50%;
-    }
-    .page__response {
-      width: 50%;
+      font-family: system-ui, sans-serif;
     }
 
     .markdown code {
@@ -62,48 +29,6 @@
     .markdown li {
       margin-left: 2rem;
     }
-
-    .record__param {
-      padding: 0.8rem;
-    }
-    .record__param:not(:last-of-type) {
-      border-bottom: 1px solid var(--color-neutral-200);
-    }
-    .record__summary {
-      display: flex;
-      align-items: end;
-      gap: 1rem;
-    }
-    .record__summary__expand {
-      margin-left: auto;
-      color: var(--color-neutral-400);
-    }
-    .record__constraint {
-      font-size: 12px;
-      background: var(--color-neutral-200);
-      padding: 1px 4px;
-      border-radius: 1px;
-    }
-    .record__subtype {
-      margin-top: 0.5rem;
-    }
-
-    .responses__tabs {
-      display: flex;
-    }
-    .responses__tab {
-      padding: 10px;
-    }
-    .responses__tab.active {
-      border-left: 1px solid var(--color-neutral-300);
-      border-top: 1px solid var(--color-neutral-300);
-      border-right: 1px solid var(--color-neutral-300);
-      border-bottom: 1px solid #FFF;
-      margin-bottom: -1px;
-    }
-    .responses__types {
-      border: 1px solid var(--color-neutral-300);
-    }
   </style>
 
   <script src="https://cdn.tailwindcss.com"></script>
@@ -113,7 +38,7 @@
 
 <body>
   <div class="flex" x-data="{ activeLink: null }">
-    <section class="bg-neutral-100 border-r w-[280px] shrink-0 h-screen overflow-y-auto">
+    <section class="hidden lg:block bg-neutral-100 border-r w-[280px] shrink-0 h-screen overflow-y-auto">
       <% if company_logo_url.present? %>
         <div class="flex items-center justify-center mt-4 mb-8">
           <img src="<%= company_logo_url %>" class="max-w-full h-auto" />

data/app/views/explicit/documentation/_request.html.erb

@@ -26,8 +26,8 @@
   </div>
 <% end %>
 
-<div class="flex mt-4 gap-8">
-  <div class="page__request space-y-4">
+<div class="block lg:flex mt-4 gap-8">
+  <div class="w-full lg:w-1/2 space-y-4">
     <% if (description = page.request.get_description) %>
       <div class="markdown">
         <%= Explicit::Documentation::Markdown.to_html(description) %>
@@ -57,10 +57,7 @@
 
   <% statuses = page.request.responses.keys.sort %>
 
-  <div
-    class="page__response"
-    x-data="{ active: <%= statuses.first %> }"
-  >
+  <div class="w-full lg:w-1/2 mt-4 lt:mt-0" x-data="{ active: <%= statuses.first %> }">
     <div class="flex">
       <% statuses.each do |status| %>
         <button

data/app/views/explicit/documentation/type/_array.html.erb

@@ -1,3 +1,3 @@
 <div class="border divide-y">
-  <%= type_attribute_render name: "Items", type: type.itemtype %>
+  <%= type_attribute_render name: "Items", type: type.item_type %>
 </div>

data/app/views/explicit/documentation/type/_date.html.erb

@@ -0,0 +1 @@
+A date in the format of <code>"YYYY-MM-DD"</code>.

data/app/views/explicit/documentation/type/_date_range.html.erb

@@ -0,0 +1,6 @@
+A date followed by two dots then another date, no spaces: <code>"YYYY-MM-DD..YYYY-MM-DD"</code>.
+
+<%= type_constraints do %>
+  <%= type_constraint "Min range:", type.min_range.inspect if type.min_range %>
+  <%= type_constraint "Max range:", type.max_range.inspect if type.max_range %>
+<% end %>

data/app/views/explicit/documentation/type/_date_time_iso8601_range.html.erb

@@ -0,0 +1,8 @@
+A range between two date times in the format of
+<code>"start_date_time..end_date_time"</code> where both date times are valid
+according to ISO8601. For example: <code>"2024-12-10T14:00:00Z..2024-12-11T15:00:00Z"</code>.
+
+<%= type_constraints do %>
+  <%= type_constraint "Min range:", type.min_range.inspect if type.min_range %>
+  <%= type_constraint "Max range:", type.max_range.inspect if type.max_range %>
+<% end %>

data/app/views/explicit/documentation/type/_hash.html.erb

@@ -1,4 +1,4 @@
 <div class="border divide-y">
-  <%= type_attribute_render name: "Keys", type: type.keytype %>
-  <%= type_attribute_render name: "Values", type: type.valuetype %>
+  <%= type_attribute_render name: "Keys", type: type.key_type %>
+  <%= type_attribute_render name: "Values", type: type.value_type %>
 </div>

data/app/views/explicit/documentation/type/_string.html.erb

@@ -3,12 +3,12 @@
     <%= type_constraint "not", "empty" %>
   <% end %>
 
-  <% if type.minlength %>
-    <%= type_constraint "minlength", type.minlength %>
+  <% if type.min_length %>
+    <%= type_constraint "min_length", type.min_length %>
   <% end %>
 
-  <% if type.maxlength %>
-    <%= type_constraint "maxlength", type.maxlength %>
+  <% if type.max_length %>
+    <%= type_constraint "max_length", type.max_length %>
   <% end %>
 
   <% if type.format %>

data/config/locales/en.yml

@@ -2,11 +2,31 @@ en:
   explicit:
     errors:
       agreement: "must be accepted"
-      array: "invalid item at index(%{index}): %{error}"
-      bigdecimal: "must be a string-encoded decimal number"
+      array: "must be an array"
+      array_item: "invalid item at index(%{index}): %{error}"
+      big_decimal: "must be a string-encoded decimal number"
       boolean: "must be a boolean"
-      date_time_iso8601: "must be a valid iso8601 date time"
-      date_time_posix: "must be a valid posix timestamp"
+      date_range_format: 'must be a string in the format of "YYYY-MM-DD..YYYY-MM-DD"'
+      date_range_inverted: "starting date must be the same day or a day before the ending date"
+      date_range_min_date: "starting date must not be a day before %{min_date}"
+      date_range_max_date: "ending date must not be a day after %{max_date}"
+      date_range_min_range: "must not be less than %{min_range}"
+      date_range_max_range: "must not be more than %{max_range}"
+      date_time_iso8601_range_format: 'must be a string in the format of: "YYYY-MM-DDTHH:MM:SS..YYYY-MM-DDTHH:MM:SS"'
+      date_time_iso8601_range_inverted: "starting datetime must be a moment before ending datetime"
+      date_time_iso8601_range_min_date_time: "starting datetime must not be a moment before %{min_date_time}"
+      date_time_iso8601_range_max_date_time: "ending datetime must not be a moment after %{max_date_time}"
+      date_time_iso8601_range_min_range: "must not be less than %{min_range}"
+      date_time_iso8601_range_max_range: "must not be more than %{max_range}"
+      date_time_iso8601: "must be a valid datetime according to ISO8601"
+      date_time_iso8601_min: "must not be a moment before %{min}"
+      date_time_iso8601_max: "must not be a moment after %{max}"
+      date_time_unix_epoch: "must be a valid posix timestamp"
+      date_time_unix_epoch_min: "must not be a moment before %{min}"
+      date_time_unix_epoch_max: "must not be a moment after %{max}"
+      date_format: 'must be a date in the format "YYYY-MM-DD"'
+      date_min: "must not be a date before %{min}"
+      date_max: "must not be a date after %{max}"
       hash: "must be an object"
       hash_key: "invalid key (%{key}): %{error}"
       hash_value: "invalid value at key (%{key}): %{error}"
@@ -20,17 +40,24 @@ en:
       not_negative: "must not be negative"
       not_positive: "must not be positive"
       literal: "must be %{value}"
+      one_of_separator: "OR"
       string: "must be a string"
       empty: "must not be empty"
-      minlength: "length must be at least %{minlength}"
-      maxlength: "length must be at most %{maxlength}"
+      min_length: "length must be at least %{min_length}"
+      max_length: "length must be at most %{max_length}"
       format: "must have format %{regex}"
     swagger:
       agreement: "* Must be accepted (true)"
       big_decimal_min: "* Minimum: %{min}"
       big_decimal_max: "* Maximum: %{max}"
+      date_range: '* The value must be a range between two dates in the format of: "YYYY-MM-DD..YYYY-MM-DD"'
+      date_range_min_range: "* The range must not be less than %{min_range}"
+      date_range_max_range: "* The range must not be more than %{max_range}"
+      date_time_iso8601_range: '* The value must be a range between two date times in the format of: "YYYY-MM-DDTHH:MM:SS..YYYY-MM-DDTHH:MM:SS"'
+      date_time_iso8601_range_min_range: "* The range must not be less than %{min_range}"
+      date_time_iso8601_range_max_range: "* The range must not be more than %{max_range}"
       date_time_iso8601: "* Must be valid according to ISO 8601"
-      date_time_posix: "* POSIX time or Unix epoch is the amount of seconds since 1970-01-01"
+      date_time_unix_epoch: "* POSIX time or Unix epoch is the amount of seconds since 1970-01-01"
       file_max_size: "* Max size: %{max_size}"
       file_content_types: "* Content types: %{content_types}"
       hash_not_empty: "* Must have at least one value"

data/lib/explicit/documentation/builder.rb

@@ -19,6 +19,9 @@ module Explicit::Documentation
     def company_logo_url(url) = (@company_logo_url = url)
     def get_company_logo_url = @company_logo_url
 
+    def favicon_url(url) = (@favicon_url = url)
+    def get_favicon_url = @favicon_url
+
     def version(version) = (@version = version)
     def get_version = @version
 

data/lib/explicit/documentation/output/swagger.rb

@@ -34,6 +34,10 @@ module Explicit::Documentation::Output
       [200, {"Content-Type" => "application/json"}, [@swagger_document.to_json]]
     end
 
+    def inspect
+      "#{self.class.name}#call"
+    end
+
     private
       def get_base_url
         base_urls = builder.requests.map(&:get_base_url).uniq

data/lib/explicit/documentation/output/webpage.rb

@@ -14,6 +14,10 @@ module Explicit::Documentation::Output
       [200, {}, [@html]]
     end
 
+    def inspect
+      "#{self.class.name}#call"
+    end
+
     private
       def render_documentation_page
         Explicit::ApplicationController.render(
@@ -22,6 +26,7 @@ module Explicit::Documentation::Output
             url_helpers: @builder.rails_engine.routes.url_helpers,
             page_title: builder.get_page_title,
             company_logo_url: builder.get_company_logo_url,
+            favicon_url: builder.get_favicon_url,
             version: builder.get_version,
             sections: builder.sections,
           }

data/lib/explicit/request/invalid_response_error.rb

@@ -9,7 +9,7 @@ Got:
 
 HTTP #{response.status} #{JSON.pretty_generate(response.data)}
 
-This response doesn't match any type. Here are the errors:
+This response doesn't match expected responses:
 
 #{error.presence || " ==> no response types found for status #{response.status}"}
 

data/lib/explicit/request.rb

@@ -10,7 +10,9 @@ class Explicit::Request
     @responses = Hash.new { |hash, key| hash[key] = [] }
     @examples = Hash.new { |hash, key| hash[key] = [] }
 
-    if Explicit.configuration.rescue_from_invalid_params?
+    instance_eval(&block)
+
+    if Explicit.configuration.rescue_from_invalid_params? && @params.any?
       @responses[422] << {
         error: "invalid_params",
         params: [
@@ -20,28 +22,28 @@ class Explicit::Request
         ]
       }
     end
-
-    instance_eval(&block)
   end
 
   def new(&block)
-    subrequest = self.class.new { }
+    this = self
 
-    subrequest.instance_variable_set(:@base_url,  @base_url)
-    subrequest.instance_variable_set(:@base_path, @base_path)
-    subrequest.instance_variable_set(:@routes,    @routes.dup)
-    subrequest.instance_variable_set(:@headers,   @headers.dup)
-    subrequest.instance_variable_set(:@params,    @params.dup)
+    self.class.new do
+      instance_variable_set(:@base_url,  this.get_base_url)
+      instance_variable_set(:@base_path, this.get_base_path)
+      instance_variable_set(:@routes,    this.routes.dup)
+      instance_variable_set(:@headers,   this.headers.dup)
+      instance_variable_set(:@params,    this.params.dup)
 
-    @responses.each do |status, types|
-      subrequest.responses[status] = types.dup
-    end
+      this.responses.each do |status, types|
+        @responses[status] = types.dup
+      end
 
-    @examples.each do |status, examples|
-      subrequest.examples[status] = examples.dup
-    end
+      this.examples.each do |status, examples|
+        @examples[status] = examples.dup
+      end
 
-    subrequest.tap { _1.instance_eval(&block) }
+      instance_eval(&block)
+    end
   end
 
   def get(path)     = @routes << Route.new(method: :get, path:)

data/lib/explicit/test_helper.rb

@@ -54,6 +54,19 @@ module Explicit::TestHelper
 
     process(method, path, params:, headers:)
 
+    if @response.headers["content-type"]&.include?("text/html")
+      html = @response.parsed_body
+
+      html.search("style").each { _1.remove }
+      html.search("script").each { _1.remove }
+
+      raise <<~TXT
+        Unexpected HTML response:
+
+        #{html.text}
+      TXT
+    end
+
     response = Explicit::Request::Response.new(
       status: @response.status,
       data: @response.parsed_body.deep_symbolize_keys

data/lib/explicit/type/agreement.rb

@@ -8,7 +8,7 @@ class Explicit::Type::Agreement < Explicit::Type
     if VALUES.include?(value)
       OK
     else
-      [:error, error_i18n("agreement")]
+      error_i18n("agreement")
     end
   end
 
@@ -28,12 +28,12 @@ class Explicit::Type::Agreement < Explicit::Type
 
   concerning :Swagger do
     def swagger_schema
-      {
+      merge_base_swagger_schema({
         type: "boolean",
-        description: swagger_description([
+        description_topics: [
           swagger_i18n("agreement")
-        ])
-      }
+        ]
+      })
     end
   end
 end

data/lib/explicit/type/array.rb

@@ -1,28 +1,28 @@
 # frozen_string_literal: true
 
 class Explicit::Type::Array < Explicit::Type
-  attr_reader :itemtype, :empty
+  attr_reader :item_type, :empty
 
-  def initialize(itemtype:, empty: true)
-    @itemtype = Explicit::Type.build(itemtype)
+  def initialize(item_type:, empty: true)
+    @item_type = Explicit::Type.build(item_type)
     @empty = empty
   end
 
   def validate(values)
-    return [:error, :array] if !values.is_a?(::Array)
+    return error_i18n("array") if !values.is_a?(::Array)
 
     if values.empty? && !empty
-      return [:error, :empty]
+      return error_i18n("empty")
     end
 
     validated = []
 
     values.each.with_index do |value, index|
-      case itemtype.validate(value)
+      case item_type.validate(value)
       in [:ok, value]
         validated << value
       in [:error, error]
-        return [:error, error_i18n("array", index:, error:)]
+        return error_i18n("array_item", index:, error:)
       end
     end
 
@@ -31,7 +31,7 @@ class Explicit::Type::Array < Explicit::Type
 
   concerning :Webpage do
     def summary
-      "array of #{itemtype.summary}"
+      "array of #{item_type.summary}"
     end
 
     def partial
@@ -45,12 +45,11 @@ class Explicit::Type::Array < Explicit::Type
 
   concerning :Swagger do
     def swagger_schema
-      {
+      merge_base_swagger_schema({
         type: "array",
-        items: itemtype.swagger_schema,
-        minItems: empty ? 0 : 1,
-        description: swagger_description([])
-      }.compact_blank
+        items: item_type.swagger_schema,
+        minItems: empty ? 0 : 1
+      })
     end
   end
 end