quby-compiler 0.5.22 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f0d4268936ab1120ebb48d593645367e443a2b236f705de943599aa5e44847
-  data.tar.gz: e7462e8862d04e7b54badb52f833371aa304d42798c28c5da5edb4fe3d2be5f3
+  metadata.gz: 4562dd43458813b4fcb9602d10ec82732aea08c22ca12dd1f0b0b934dd25282b
+  data.tar.gz: '041953ff8c41909b57b03f98fa20f14bb6094d4392b911cbc56a464b454ad6d1'
 SHA512:
-  metadata.gz: f34d09ad62cbcf84a1749d014c651960409c0bde03a408be228f2940f7efb81c01c97bdeb7a82889d92c16aad637bdaf8cf7674a94bf513dd78454546ee15dc5
-  data.tar.gz: 3743a39d0850ee252b3c9d6fa32ef8d89c6ee88e69ffd1a280f39d49af97c5635943b47fec4bce53b0ab9920d408a790e780cb09907691b779254d1957893a01
+  metadata.gz: 280c9f616bf3d451f82ccb35ab8eda3e5f1983b1a050171cebe12c4f59e334e61a4d58f51172ed69663733cb65bb7d44e1ef716d219e248745e6cc87ed5cce8e
+  data.tar.gz: 4c7ce2ae68ddd2c044dd24d02b7d29f7172b19a6424a8728328d3b79a352f97a0a5e9a9634928703670e27c14e7138d1fac2b76010a015fdf9a61acae1c0bd30

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.5.24
+
+* frontend_v_2: Add dependsOnQuestions and DependsOnOptions to requires_answer validation.
+
+# 0.5.23
+
+* Validate check_all_option and uncheck_all_option exists.
+* Validate checkbox keys start with question key (disable with do_not_check_checkbox_options_start_with_question_key)
+
 # 0.5.22
 
 * quby2: Add questionKeys to panels, so we can validate completeness and make quby2 simpler.

data/lib/quby/compiler/dsl/questionnaire_builder.rb

@@ -292,6 +292,10 @@ module Quby
           @questionnaire.add_outcome_table(**table_options)
         end
 
+        def do_not_check_checkbox_options_start_with_question_key
+          @questionnaire.check_checkbox_options_start_with_question_key = false
+        end
+
         private
 
         def default_panel_options

data/lib/quby/compiler/entities/question.rb

@@ -10,8 +10,6 @@ module Quby
 
         MARKDOWN_ATTRIBUTES = %w(description title).freeze
 
-        set_callback :after_dsl_enhance, :expand_depends_on_input_keys
-
         # Standard attributes
         attr_accessor :key
         validates :key, presence: true, 'quby/compiler/type': {is_a: Symbol}
@@ -183,7 +181,7 @@ module Quby
 
           # Require subquestions of required questions by default
           options[:required] = true if @parent&.validations&.first&.fetch(:type, nil) == :requires_answer
-          @validations << {type: :requires_answer, explanation: options[:error_explanation]} if options[:required]
+          @validations << {type: :requires_answer, explanation: options[:error_explanation] } if options[:required]
 
           if @type == :float
             @validations << {type: :valid_float, explanation: options[:error_explanation]}
@@ -232,14 +230,6 @@ module Quby
         end
         # rubocop:enable AccessorMethodName
 
-        def expand_depends_on_input_keys
-          return unless @depends_on
-          @depends_on = questionnaire.expand_input_keys(@depends_on)
-          @extra_data[:"depends-on"] = @depends_on.to_json
-        rescue => e
-          raise e.class, "Question #{key} depends_on contains an error: #{e.message}"
-        end
-
         def col_span
           options.length > 0 && type != :select ? options.length : @col_span
         end

data/lib/quby/compiler/entities/questionnaire.rb

@@ -58,6 +58,7 @@ module Quby
           @versions = []
           @seeds_patch = {}
           @anonymous_conditions = Entities::AnonymousConditions.new
+          @check_checkbox_options_start_with_question_key = true
         end
 
         attr_accessor :key
@@ -110,6 +111,8 @@ module Quby
         attr_accessor :lookup_tables
         attr_accessor :anonymous_conditions
 
+        attr_accessor :check_checkbox_options_start_with_question_key
+
         delegate :question_hash, :input_keys, :answer_keys, :expand_input_keys, to: :fields
 
         def tags=(tags)

data/lib/quby/compiler/outputs/quby_frontend_v1_serializer.rb

@@ -68,7 +68,7 @@ module Quby
             description: question.description,
             presentation: question.presentation,
             hidden: question.hidden,
-            depends_on: question.depends_on,
+            depends_on: expand_depends_on_input_keys(question),
             default_position: question.default_position,
             col_span: question.col_span,
             row_span: question.row_span,
@@ -366,6 +366,14 @@ module Quby
             exclude_end: range.exclude_end?
           }
         end
+
+        def expand_depends_on_input_keys(question)
+          return unless question.depends_on.present?
+
+          questionnaire.expand_input_keys(question.depends_on)
+        rescue => e
+          raise e.class, "Question #{question.key} depends_on contains an error: #{e.message}"
+        end
       end
     end
   end

data/lib/quby/compiler/outputs/quby_frontend_v2_serializer.rb

@@ -90,7 +90,7 @@ module Quby
           {
             type: 'info',
             key: info_block.key,
-            html: handle_html(info_block.html, type: :question_description, v1_markdown: false),
+            html: handle_html(info_block.html, type: :prose, v1_markdown: false),
             startOpen: info_block.start_open,
             items: info_block.items.map { panel_item(_1) }.compact
           }
@@ -289,15 +289,44 @@ module Quby
           @questionnaire.validations.map do |validation|
             validation.config.compact
               .transform_keys{ _1.to_s.camelize(:lower) }
-              .tap do |validation_hsh|
+              .tap { |validation_hsh|
                 # otherwise ruby will put a (?-mix around the regex, which js errors on.
                 validation_hsh['matcher'] = validation_hsh['matcher'].source.to_s  if validation_hsh['matcher']
                 validation_hsh['type'] = 'minimum_date' if validation_hsh['type'] == :minimum && validation_hsh['subtype'] == :date
                 validation_hsh['type'] = 'maximum_date' if validation_hsh['type'] == :maximum && validation_hsh['subtype'] == :date
-              end.as_json
+                validation_hsh['dependsOnQuestions'] = depends_on(validation_hsh) if validation_hsh['type'] == :requires_answer
+                validation_hsh['dependsOnOptions'] = depends_on_options(validation_hsh) if validation_hsh['type'] == :requires_answer
+              }.compact.as_json
           end
         end
 
+        def depends_on(validation_hsh)
+          question = @questionnaire.question_hash[validation_hsh['fieldKey']]
+          return unless question.depends_on.present?
+
+          question.depends_on.select { @questionnaire.question_hash.key?(_1) }
+        end
+
+        def depends_on_options(validation_hsh)
+          question = @questionnaire.question_hash[validation_hsh['fieldKey']]
+          return unless question.depends_on.present?
+            
+          question.depends_on
+            .map(&:to_s)
+            .reject { @questionnaire.question_hash.key?(_1) }
+            .map { |key|
+              question_key, option_key = key.split(/_(?=[^_]+$)/) # split on last _, works for all existing questionnaires.
+              if @questionnaire.question_hash.key?(question_key)
+                if @questionnaire.question_hash[question_key].options.any? { _1.key.to_s == option_key } # single_select
+                  next [question_key, option_key]
+                elsif @questionnaire.question_hash[question_key].options.any? { _1.key.to_s == key } # multi_select
+                  next [question_key, key]                
+                end
+              end
+              raise "#{validation_hsh['fieldKey']} depends_on: can't find key '#{question_key}_#{option_key}'."
+            }.group_by(&:first).transform_values{ _1.map(&:last) }
+        end
+
         def handle_html(html, type: :simple, v1_markdown: true)
           if layout_version == :v2
             case type

data/lib/quby/compiler/services/definition_validator.rb

@@ -28,6 +28,7 @@ module Quby
           validate_raw_content_items(questionnaire) if questionnaire.validate_html
           validate_sexp_variables(questionnaire)
           validate_info_blocks(questionnaire)
+          validate_checkbox_options(questionnaire)
         # Some compilation errors are Exceptions (pure syntax errors) and some StandardErrors (NameErrors)
         rescue Exception => exception # rubocop:disable Lint/RescueException
           definition.errors.add(:sourcecode, message: "Questionnaire error: #{definition.key}\n" \
@@ -376,12 +377,46 @@ scores_schema tables to the resulting seed."
         def validate_sexp_variables(questionnaire)
           questionnaire.sexp_variables.each_value do |sexp_variable|
             sexp_variable.validate(questionnaire)
-          end 
+          end
         end
 
         def delete_prefix(key, questionnaire)
           key.delete_prefix("#{questionnaire.key}_")
         end
+
+        def validate_checkbox_options(questionnaire)
+          questionnaire.panels.each do |panel|
+            panel.items.each do |item|
+              return unless item.type == :check_box
+              validate_checkbox_options_are_assignable_to_question_key(item, questionnaire)
+              validate_check_all_question_exists(item)
+            end
+          end
+        end
+
+        def validate_checkbox_options_are_assignable_to_question_key(question, questionnaire)
+          return unless questionnaire.check_checkbox_options_start_with_question_key
+
+          question.options.each do |option|
+            next if option.key.to_s.start_with?(question.key.to_s)
+
+            fail "Question with key :#{question.key} has one or more invalid option keys: #{question.options.map(&:key)}"
+          end
+        end
+
+        def validate_check_all_question_exists(question)
+          return unless question.uncheck_all_option || question.check_all_option
+
+          option_keys = question.options.map(&:key)
+
+          if question.check_all_option && !option_keys.include?(question.check_all_option)
+            fail "check_all_option key :#{question.check_all_option} does not exist on question :#{question.key}"
+          end
+
+          if question.uncheck_all_option && !option_keys.include?(question.uncheck_all_option)
+            fail "uncheck_all_option key :#{question.uncheck_all_option} does not exist on question :#{question.key}"
+          end
+        end
       end
     end
   end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.22"
+    VERSION = "0.5.24"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.22
+  version: 0.5.24
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel