quby-compiler 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6d745ba161d7dca63ed71bd68f0e0d3fcd22f217f730c1a06584bee9084d62c
-  data.tar.gz: 4ac2be2cd51b3f9ad5e91e2c16f0654ea3fc52263ab93da3416cf3afcca745c0
+  metadata.gz: 4562dd43458813b4fcb9602d10ec82732aea08c22ca12dd1f0b0b934dd25282b
+  data.tar.gz: '041953ff8c41909b57b03f98fa20f14bb6094d4392b911cbc56a464b454ad6d1'
 SHA512:
-  metadata.gz: 66cf125bda0986919c0d019d704cab0180eff8a075d0d16649eac654517df018585800d88629548bec29289a92d7f712c7c036680f8e64ea00f87de93a04bfea
-  data.tar.gz: 7e639345f39abf65ab07353751cbfddd7db6ecab328eed8feaf0bfa239ebb3b18e3d5e7961a4e42a46932d1090db00c60c4c41c9eaac1fec875cab5601a55ec2
+  metadata.gz: 280c9f616bf3d451f82ccb35ab8eda3e5f1983b1a050171cebe12c4f59e334e61a4d58f51172ed69663733cb65bb7d44e1ef716d219e248745e6cc87ed5cce8e
+  data.tar.gz: 4c7ce2ae68ddd2c044dd24d02b7d29f7172b19a6424a8728328d3b79a352f97a0a5e9a9634928703670e27c14e7138d1fac2b76010a015fdf9a61acae1c0bd30

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 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.

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/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/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.23"
+    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.23
+  version: 0.5.24
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-06-24 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -151,7 +151,6 @@ files:
 - lib/quby/compiler/dsl/charting/radar_chart_builder.rb
 - lib/quby/compiler/dsl/helpers.rb
 - lib/quby/compiler/dsl/info_block_builder.rb
-- lib/quby/compiler/dsl/merge(values(:v_1, :v_2), values(v_4).rb
 - lib/quby/compiler/dsl/panel_builder.rb
 - lib/quby/compiler/dsl/question_builder.rb
 - lib/quby/compiler/dsl/questionnaire_builder.rb

data/lib/quby/compiler/dsl/merge(values(:v_1, :v_2), values(v_4).rb

@@ -1,16 +0,0 @@
-merge(values(:v_1, :v_2), values(v_4).recode(1 => 3)).sum
-
-
-
-divide(value(:v_2), multiply(value(:v_1), value(:v_1)))
-
-w / l * l
-
-
-sexp_variable :key1 do
-  foo = values(:v_1, :v_2)
-  bar = recode(foo, 1 => 3)
-  bla = merge(foo, bar)
-  sum(bla)
-
-end