easol-canvas 4.18.0 → 4.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 012fee086d69a166e3b2e062e0e8d9f658db0749bed1dad6e5a30c25ea4c8678
-  data.tar.gz: fb1a4df7f2aa7961c16e85b26472dd35e728b4c5519ef7f7a99c41a14c25e82a
+  metadata.gz: c37703170f2a9f0870de51fa994e8929d1ed3a53ebe7f510c27ab943bddf9b6c
+  data.tar.gz: 1ccfe78c1b4aaaf9cb4bcbbd1d0afc062b63e94d93b41e162174aedff5fe9832
 SHA512:
-  metadata.gz: 56ced44aa44c09a09f254c459dc35962b9114e5a747c5d257df0cef32d2bdd94739dd46c779344ecd4fb7df58c54a9614179bda162405ae889c9fb70fc33cc1a
-  data.tar.gz: 23128bde9e9f69d7faf52e121f8bc077ec68a9407cad32b7ff15b4863fa8dadb3f0bf92cff5e1a2a1b1b27f88ac833a934d6636825178a80eadde036d5e8d65b
+  metadata.gz: 9f2ca1fc7300356060311c3e1622b05df28e9d9e48985a8d50a40319c83d15a882a4ac7174c9f39bdc501f47e2988e8a9e9980187dbf513d03b6c8193f927f62
+  data.tar.gz: 883efd325fda12742d09a6ae3b30c102c51406fec1caf10f112d1ee8ce6ea9f145de80e9c1a4d6dd2f8562c7b5909aee99895a72207108c610d735a89a318db6

data/lib/canvas/checks/valid_custom_types_check.rb

@@ -6,9 +6,11 @@ module Canvas
   # custom types that are defined in the /types directory.
   class ValidCustomTypesCheck < Check
     def run
+      custom_types = Canvas::FetchCustomTypes.call
+
       custom_type_files.each do |filename|
         schema = extract_json(filename)
-        validator = Validator::CustomType.new(schema: schema)
+        validator = Validator::CustomType.new(schema: schema, custom_types: custom_types)
 
         next if validator.validate
 

data/lib/canvas/checks/valid_liquid_check.rb

@@ -30,27 +30,30 @@ module Canvas
       ::Liquid::Template.register_tag(name, klass)
     end
 
-    # These are the tags that we define in the Rails app. If we add a new custom tag
-    # in the Rails app, we'll need to register it here.
+    # These are the tags that we define in the Rails app. If we add a
+    # new custom tag in the Rails app, we'll need to register it here.
     def register_tags!
-      register_tag("form", ::Liquid::Block)
-      register_tag("product_search", ::Liquid::Block)
-      register_tag("easol_badge", ::Liquid::Tag)
-      register_tag("accommodation_availability", ::Liquid::Block)
-      register_tag("cache", ::Liquid::Block)
-      register_tag("currency_switcher", ::Liquid::Tag)
-      register_tag("json", ::Liquid::Block)
-      register_tag("variant_pricing", ::Liquid::Tag)
-      register_tag("dynamic_package_booking_price", ::Liquid::Tag)
+      # Single statement non-block tags, no closing tag required.
       register_tag("cart_timer", ::Liquid::Tag)
       register_tag("cart_timer_add_time", ::Liquid::Tag)
-      register_tag("experience_slot_search", ::Liquid::Block)
-      register_tag("experience_slot_calendar", ::Liquid::Block)
-      register_tag("package_availability", Liquid::Block)
-      register_tag("package_price", Liquid::Block)
+      register_tag("currency_switcher", ::Liquid::Tag)
+      register_tag("dynamic_package_booking_price", ::Liquid::Tag)
+      register_tag("easol_badge", ::Liquid::Tag)
       register_tag("input", ::Liquid::Tag)
       register_tag("label", ::Liquid::Tag)
+      register_tag("variant_pricing", ::Liquid::Tag)
+      # Tags wrapping nested content with a closing tag.
+      register_tag("accommodation_availability", ::Liquid::Block)
+      register_tag("cache", ::Liquid::Block)
+      register_tag("experience_slot_calendar", ::Liquid::Block)
+      register_tag("experience_slot_search", ::Liquid::Block)
+      register_tag("form", ::Liquid::Block)
+      register_tag("json", ::Liquid::Block)
+      register_tag("package_availability", ::Liquid::Block)
+      register_tag("package_price", ::Liquid::Block)
       register_tag("package_step_product_search", ::Liquid::Block)
+      register_tag("packages_search_and_calendar", ::Liquid::Block)
+      register_tag("product_search", ::Liquid::Block)
     end
   end
 end

data/lib/canvas/validators/custom_type.rb

@@ -25,11 +25,13 @@ module Canvas
     #
     class CustomType
       REQUIRED_KEYS = %w[key name attributes].freeze
+      OPTIONAL_KEYS = %w[layout].freeze
 
-      attr_reader :schema, :errors
+      attr_reader :schema, :errors, :custom_types
 
-      def initialize(schema:)
+      def initialize(schema:, custom_types: [])
         @schema = schema
+        @custom_types = custom_types
         @errors = []
       end
 
@@ -42,7 +44,8 @@ module Canvas
           ensure_key_value_is_not_reserved &&
           ensure_no_duplicate_attributes &&
           ensure_attributes_are_valid &&
-          ensure_first_attribute_not_array
+          ensure_first_attribute_not_array &&
+          ensure_layout_is_valid
 
         errors.empty?
       end
@@ -65,7 +68,7 @@ module Canvas
       end
 
       def ensure_no_unrecognized_keys
-        unrecognized_keys = schema.keys - REQUIRED_KEYS
+        unrecognized_keys = schema.keys - REQUIRED_KEYS - OPTIONAL_KEYS
         return true if unrecognized_keys.empty?
 
         @errors << "Unrecognized keys: #{unrecognized_keys.join(', ')}"
@@ -127,7 +130,7 @@ module Canvas
         schema["attributes"].each do |attribute_schema|
           attr_validator = Validator::SchemaAttribute.new(
             attribute: attribute_schema,
-            custom_types: []
+            custom_types: custom_types
           )
           next if attr_validator.validate
 
@@ -144,6 +147,16 @@ module Canvas
         @errors << "The first attribute cannot be an array"
         false
       end
+
+      def ensure_layout_is_valid
+        return true unless schema["layout"]
+
+        layout_validator = CustomTypeLayoutSchema.new(schema:)
+        return true if layout_validator.validate
+
+        @errors += layout_validator.errors
+        false
+      end
     end
   end
 end

data/lib/canvas/validators/custom_type_layout_schema.rb

@@ -0,0 +1,172 @@
+# frozen_string_literal: true
+
+require "json"
+require "json-schema"
+
+module Canvas
+  module Validator
+    # :documented:
+    # This class is used to validate a layout definition for a custom type.
+    # Custom type layouts use a flat array of elements (unlike block layouts which use tabs).
+    #
+    # Example of a valid custom type layout definition:
+    # {
+    #   "attributes" => [
+    #     { "name" => "question", "type" => "string" },
+    #     { "name" => "answer", "type" => "text" },
+    #     { "name" => "show_icon", "type" => "boolean" }
+    #   ],
+    #   "layout" => [
+    #     "question",
+    #     {
+    #       "type" => "accordion",
+    #       "label" => "Advanced",
+    #       "elements" => [
+    #         "answer",
+    #         { "type" => "attribute", "name" => "show_icon" }
+    #       ]
+    #     }
+    #   ]
+    # }
+    class CustomTypeLayoutSchema
+      attr_reader :errors
+
+      def initialize(schema:)
+        @schema = schema
+        @errors = []
+      end
+
+      def validate
+        @errors = []
+
+        if ensure_valid_format
+          ensure_no_unrecognized_keys
+          ensure_no_duplicate_keys
+          ensure_accordion_toggles_are_valid
+        end
+
+        @errors.empty?
+      end
+
+      private
+
+      attr_reader :schema
+
+      def ensure_no_duplicate_keys
+        attributes = fetch_all_attribute_names
+        duplicates =
+          attributes
+            .group_by { |(key)| key }
+            .filter { |_key, usage| usage.size > 1 }
+
+        return if duplicates.empty?
+
+        duplicates.each do |attribute, usage|
+          @errors << "Duplicated attribute key `#{attribute}` found. "\
+                     "Location: #{usage.map { |(_, location)| location }.join(', ')}"
+        end
+      end
+
+      def ensure_no_unrecognized_keys
+        attributes = fetch_all_attribute_names
+        defined_attributes = schema_attributes.map { |attr| normalize_attribute(attr["name"]) }
+
+        attributes.each do |attribute, location|
+          unless defined_attributes.include?(attribute)
+            @errors << "Unrecognized attribute `#{attribute}`. Location: #{location}"
+          end
+        end
+      end
+
+      # @return [Array<Array(String, String)>] an array of all the attribute names that
+      #         are mentioned in the layout schema, along with its path. The names are
+      #         normalized, i.e. downcased.
+      def fetch_all_attribute_names
+        attributes = fetch_elements_of_type("attribute")
+        attributes.map do |(node, path)|
+          [
+            normalize_attribute(node.is_a?(Hash) ? node["name"] : node),
+            path
+          ]
+        end
+      end
+
+      # @param type [String] the element type to fetch
+      # @return [Array<Array(<Hash, String>, String)] an array of elements that match
+      #   the given type. Each element is an array containing the node and its path.
+      def fetch_elements_of_type(type)
+        elements = []
+
+        fetch_element = lambda { |node, path|
+          if type == "attribute" && node.is_a?(String)
+            elements << [node, path]
+          elsif node.is_a?(Hash) && node["type"] == type
+            elements << [node, path]
+          end
+
+          if node.is_a?(Hash) && node.key?("elements")
+            node["elements"].each_with_index do |element, i|
+              current_path = "#{path}/elements/#{i}"
+              fetch_element.call(element, current_path)
+            end
+          end
+        }
+
+        # Flat layout: iterate directly over layout elements
+        layout_schema.each_with_index do |element, i|
+          current_path = "layout/#{i}"
+          fetch_element.call(element, current_path)
+        end
+
+        elements
+      end
+
+      def ensure_valid_format
+        result = JSON::Validator.fully_validate(
+          schema_definition,
+          { "layout" => layout_schema },
+          strict: true,
+          clear_cache: true
+        )
+
+        return true if result.empty?
+
+        @errors += result
+        false
+      end
+
+      def ensure_accordion_toggles_are_valid
+        accordion_toggles = fetch_elements_of_type("accordion_toggle")
+        accordion_toggles.each do |accordion_toggle, location|
+          toggle_attribute = schema_attributes.detect { |attr|
+            attr["name"] == accordion_toggle["toggle_attribute"]
+          }
+
+          if toggle_attribute.nil?
+            @errors << "The toggle_attribute in accordion_toggle is unrecognized. Location: #{location}"
+          elsif toggle_attribute["type"]&.downcase != "boolean"
+            @errors << "The toggle_attribute in accordion_toggle must be a boolean. Location: #{location}"
+          end
+        end
+      end
+
+      def layout_schema
+        schema["layout"] || []
+      end
+
+      def schema_definition
+        File.read(
+          File.join(File.dirname(__FILE__), "../../../", "schema_definitions", "custom_type_layout.json")
+        )
+      end
+
+      def normalize_attribute(name)
+        name.to_s.strip.downcase
+      end
+
+      def schema_attributes
+        schema["attributes"] || []
+      end
+    end
+  end
+end

data/lib/canvas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canvas
-  VERSION = "4.18.0"
+  VERSION = "4.21.0"
 end

data/schema_definitions/custom_type_layout.json

@@ -0,0 +1,79 @@
+{
+  "type": "object",
+  "properties": {
+    "layout": {
+      "type": "array",
+      "items": {
+        "oneOf": [
+          { "type": "string" },
+          { "$ref": "#/$defs/accordion" },
+          { "$ref": "#/$defs/accordion_toggle" },
+          { "$ref": "#/$defs/attribute" }
+        ]
+      }
+    }
+  },
+  "$defs": {
+    "accordion": {
+      "type": "object",
+      "required": ["label", "type"],
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "accordion"
+        },
+        "label": {
+          "type": "string"
+        },
+        "elements": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              { "type": "string" },
+              { "$ref": "#/$defs/accordion_toggle" },
+              { "$ref": "#/$defs/attribute" }
+            ]
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "accordion_toggle": {
+      "type": "object",
+      "required": ["type", "toggle_attribute", "elements"],
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "accordion_toggle"
+        },
+        "toggle_attribute": {
+          "type": "string"
+        },
+        "elements": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              { "type": "string" },
+              { "$ref": "#/$defs/attribute" }
+            ]
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "attribute": {
+      "type": "object",
+      "required": ["name", "type"],
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "attribute"
+        },
+        "name": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 4.18.0
+  version: 4.21.0
 platform: ruby
 authors:
 - Kyle Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-26 00:00:00.000000000 Z
+date: 2026-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -129,6 +129,7 @@ files:
 - lib/canvas/services/front_matter_extractor.rb
 - lib/canvas/validators/block_schema.rb
 - lib/canvas/validators/custom_type.rb
+- lib/canvas/validators/custom_type_layout_schema.rb
 - lib/canvas/validators/footer_schema.rb
 - lib/canvas/validators/html.rb
 - lib/canvas/validators/json.rb
@@ -157,6 +158,7 @@ files:
 - lib/canvas/validators/schema_attributes/variant.rb
 - lib/canvas/version.rb
 - lib/easol/canvas.rb
+- schema_definitions/custom_type_layout.json
 - schema_definitions/layout.json
 homepage: https://rubygems.org/gems/easol-canvas
 licenses: