quby-compiler 0.5.33 → 0.5.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c1af309fb9a9b4b95c7ec4e7d41cc9e1f69a21bfbf2b7267649f50b7d87bffe
-  data.tar.gz: 06caabaaed4da6c9951f37491e0d8e31817ec2998b3662bb09186d024a52ce52
+  metadata.gz: b2ea33225ad03f296485cdec6a219a1febb04b8dfb59a1f590c161a520d3c1ba
+  data.tar.gz: 3a9371ab504dcaf1435d972928f6a03139135ac540b9b6591677f1b6a1177b1a
 SHA512:
-  metadata.gz: b46018e140022030f7aa573e02d9ac213fd8acd28c3d31b24ac4f06d079deade64f60a39455476e337ff34499eb6921449d4f73024d579eb61fe9aabfba0008c
-  data.tar.gz: 821f576e5a389a6cd6f988e667e6440e3aecdc025443caf56a572773065d7142110f298331140b7555fe35867e11ebcfc26a16ab74a4656f4e28413b7a7d2aab
+  metadata.gz: 0feb9af9ef47f2a5789da4f2ee839eaee5d55e3cdea29712519ef9beb7328ae091d5cdc67d449ee49cec0330fc7dbca4ded34f225805b4682a45d5509819cf77
+  data.tar.gz: 16ba9e37aebb7e7ffb665902bb3b40525c2e281097de2795f708c0f794e4c6c861becc8d81428ce26d29266a30f2d57678cb62be37fcfe1eddea277c631f5f88

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.5.34
+
+* Sorting visibility rules by question shown/hidden
+* Added sexp_visibility_rule (quby2 only)
+
 # 0.5.33
 
 * quby_proxy: fixes for optgroups.

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

@@ -296,6 +296,16 @@ module Quby
           @questionnaire.check_checkbox_options_start_with_question_key = false
         end
 
+        def sexp_visibility_rule(sexp_key:, show_questions: [], hide_questions: [])
+          condition = {
+            type: 'sexp_variable_true',
+            sexp_key:
+          }
+          @questionnaire.sexp_visibility_rules.concat(
+            Entities::VisibilityRule.for_condition(condition, show_questions:, hide_questions:)
+          )
+        end
+
         private
 
         def default_panel_options

data/lib/quby/compiler/dsl/questions/base.rb

@@ -92,24 +92,9 @@ module Quby
               op:,
               value:
             }
-            show_questions.each do |show_key|
-              @question.visibility_rules << Entities::VisibilityRule.new(
-                condition:,
-                action: {
-                  type: 'show_question',
-                  field_key: show_key
-                }
-              )
-            end
-            hide_questions.each do |hide_key|
-              @question.visibility_rules << Entities::VisibilityRule.new(
-                condition:,
-                action: {
-                  type: 'hide_question',
-                  field_key: hide_key
-                }
-              )
-            end
+            @question.visibility_rules.concat(
+              Entities::VisibilityRule.for_condition(condition, show_questions:, hide_questions:)
+            )
           end
         end
 

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

@@ -55,6 +55,7 @@ module Quby
           @check_score_keys_consistency = true
           @lookup_tables = {}
           @sexp_variables = {}
+          @sexp_visibility_rules = []
           @versions = []
           @seeds_patch = {}
           @anonymous_conditions = Entities::AnonymousConditions.new
@@ -108,6 +109,7 @@ module Quby
         attr_accessor :outcome_tables
         attr_accessor :score_schemas
         attr_accessor :sexp_variables
+        attr_reader   :sexp_visibility_rules
         attr_accessor :lookup_tables
         attr_accessor :anonymous_conditions
 
@@ -392,13 +394,18 @@ module Quby
         end
 
         # Order is important
-        # quby2 follows them one by one and ignores rules by hidden question, so needs to be in order of interface.
-        # Flags don't have this issue, so as long as they are first, their order doesn't matter.
+        # We sort by order of the question being shown/hidden with showing winning from hiding, since showing wins from hiding.
+        # This is important since a shown question can't be hidden, so each question is only ever changed once while looping over the rules.
         def visibility_rules
+          return @visibility_rules if @visibility_rules
+          question_order = sorted_questions.map.with_index{ [_1, _2] }.to_h
           @visibility_rules ||= [
             *flags.values.flat_map { |flag| VisibilityRule.from_flag(flag) },
-            *sorted_questions.flat_map { |question| VisibilityRule.from(question) }
-          ]
+            *sorted_questions.flat_map { |question| VisibilityRule.from(question) },
+            *sexp_visibility_rules
+          ].sort_by.with_index do |rule, idx|
+            [question_order[rule.action[:field_key]], rule.action[:type] == 'show_question' ? 0 : 1, idx]
+          end
         end
 
         private

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

@@ -60,6 +60,29 @@ module Quby
           end
         end
 
+        def self.for_condition(condition, show_questions: [], hide_questions: [])
+          [
+            *show_questions.map { |show_key|
+              VisibilityRule.new(
+                condition:,
+                action: {
+                  type: 'show_question',
+                  field_key: show_key
+                }
+              )
+            },
+            *hide_questions.map { |hide_key|
+              VisibilityRule.new(
+                condition:,
+                action: {
+                  type: 'hide_question',
+                  field_key: hide_key
+                }
+              )
+            }
+          ]
+        end
+
         attr_reader :condition, :action
 
         def initialize(condition:, action:)

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

@@ -29,6 +29,7 @@ module Quby
           validate_sexp_variables(questionnaire)
           validate_info_blocks(questionnaire)
           validate_checkbox_options(questionnaire)
+          validate_visiblity_rules(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" \
@@ -417,6 +418,24 @@ scores_schema tables to the resulting seed."
             fail "uncheck_all_option key :#{question.uncheck_all_option} does not exist on question :#{question.key}"
           end
         end
+
+        def validate_visiblity_rules(questionnaire)
+          questionnaire.visibility_rules.each do |rule|
+            case rule.condition[:type]
+            when 'sexp_variable_true'
+              sexp_key = rule.condition[:sexp_key]
+              unless questionnaire.sexp_variables.key?(sexp_key)
+                fail "sexp_visibility_rule references nonexistent sexp variable :#{sexp_key}."
+              end
+              unless questionnaire.sexp_variables[sexp_key].type == :boolean
+                fail "sexp_visibility_rule references sexp variable :#{sexp_key} with non-boolean type"
+              end
+            end
+            unless questionnaire.question_hash.key?(rule.action[:field_key])
+              fail "visibility_rule references nonexistent question :#{rule.action[:field_key]}."
+            end
+          end
+        end
       end
     end
   end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.33"
+    VERSION = "0.5.34"
   end
 end

metadata

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