quby-compiler 0.5.29 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb884b82a733382fca3791ab2b9f2f72062dbb7c378f7ed2cd97c10bcd8f2aae
-  data.tar.gz: 4a4835da650c648b416246797a550d5ea02f0923eee774c0bf269058f1b0a025
+  metadata.gz: a6013111357cf3e8e7e55045da2b06aeec8040b66034709091357ed43fb2eff6
+  data.tar.gz: eac3c3ce3e2d961336fe7b230d9f299a3fc0065cac2695e87019ba12ad9d60ed
 SHA512:
-  metadata.gz: 86ab18bb6a9bdadee7ad7ab299cb823c601dc5aeaccc48740353326b68cae8f4b775fbdba79fdd2a241e9643f7e466d16ef12d49fff1152c640eb4b222fa5799
-  data.tar.gz: e76c0cd997943943648f5d1d0a01f2753fa544a6ff2f712bfd97feea87ae6119e74b7378790f6862d99ace2729779bce16141ad579cef126a6c68e3e5bdfb052
+  metadata.gz: 6ecb2bf5bdfaad1a377466e14d8c9cf39cf7d761144c0fa4c203e42ecfdeb46b5495005a029274c6bfe1baabf0e2bb526de080b1e2170a35f9ea3c5e973439a9
+  data.tar.gz: 45da18a37f6878de89bab06f3c9d87fa0ab52cb8ef767a796689d8ca8b9fd6511e9a9672b4095eba5220d93a8105b035a949a418e530f9fe73d0d4dc187defd1

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.5.31
+
+* Fix validator not looking inside optgroups.
+
+# 0.5.30
+
+* Added support for optgroups under select questions for quby2 (flattened for roqua/quby jsons)
+* Added comparing and boolean logic to sexp_variables. Add type to sexp_variables.
+
 # 0.5.29
 
 * quby2.json: force scale questions to horizontal (so quby2 doesn't have to anymore)

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

@@ -212,8 +212,8 @@ module Quby
           end
         end
 
-        def sexp_variable(key, &block)
-          @questionnaire.add_sexp_variable(key, SexpVariableBuilder.new(key, &block).build)
+        def sexp_variable(key, type: :number, &block)
+          @questionnaire.add_sexp_variable(key, SexpVariableBuilder.new(key, type:, &block).build)
         end
 
         # variable :totaal do

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

@@ -5,12 +5,33 @@ module Quby
     module DSL
       module Questions
         class SelectQuestionBuilder < Base
-          include MultipleChoice
           include CompareVisibilityRule
 
           def initialize(key, **options, &block)
             super
             @question = Entities::Questions::SelectQuestion.new(key, options)
+            @current_optgroup = nil
+          end
+
+          def optgroup(key, label: , &block)
+            raise "Cannot nest optgroups" if @current_optgroup
+            @question.options << @current_optgroup = Entities::QuestionOptgroup.new(key, label:)
+            instance_eval(&block)
+            @current_optgroup = nil
+          end
+
+          def option(key, options = {}, &block)
+            question_option = Entities::QuestionOption.new(key, @question, options)
+            if @questionnaire.key_in_use?(question_option.input_key) || @question.key_in_use?(question_option.input_key)
+              fail "#{questionnaire.key}:#{@question.key}:#{question_option.key}: " \
+                    "A question or option with input key #{question_option.input_key} is already defined."
+            end
+
+            if @current_optgroup
+              @current_optgroup.options << question_option
+            else
+              @question.options << question_option
+            end
           end
         end
       end

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

@@ -7,10 +7,11 @@ module Quby::Compiler
     #   sum(number_values(:v_1, :v_2))
     # end
     class ::SexpVariableBuilder
-      attr_reader :calculation, :key
+      attr_reader :calculation, :key, :type
 
-      def initialize(key, &block)
+      def initialize(key, type:, &block)
         @key = key
+        @type = type
         @calculation = instance_eval(&block)
       end
 
@@ -32,25 +33,39 @@ module Quby::Compiler
         end
       end
 
+      %i[eq not_eq gt gteq lt lteq].each do |op|
+        define_method(op) do |left:, right:|
+          Entities::SexpVariables::Comparer.new(op:, left: wrap_scalars(left), right: wrap_scalars(right))
+        end
+      end
+
+      %i[all some none].each do |op|
+        define_method(op) do |*values|
+          Entities::SexpVariables::BooleanReducer.new(op:, values:)
+        end
+      end
+
       def round(value)
         Entities::SexpVariables::NumberMethod.new(op: :round, value: value)
       end
 
       def build
-        Entities::SexpVariable.new(key:, calculation:)
+        Entities::SexpVariable.new(key:, calculation:, type:)
       end
 
       private
 
       def wrap_and_flatten(values)
-        values.flat_map { |value|
-          case value
-          when Numeric
-            Entities::SexpVariables::Number.new(op: :number, value: value)
-          else
-            value
-          end 
-        }
+        values.flat_map { wrap_scalars(_1)}
+      end
+
+      def wrap_scalars(value)
+        case value
+        when Numeric
+          Entities::SexpVariables::Number.new(op: :number, value: value)
+        else
+          value
+        end 
       end
     end
   end

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

@@ -46,7 +46,7 @@ module Quby
           @question_hash[question.key] = question
           @input_keys.merge(new_input_keys)
           @answer_keys.merge(new_answer_keys)
-          question.options.each do |option|
+          question.all_options.each do |option|
             @option_hash[option.input_key] = option
           end
         end

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

@@ -45,6 +45,7 @@ module Quby
 
         # Multiple-choice questions have options to choose from
         attr_accessor :options
+        attr_accessor :opt_groups
 
         # string question that is displayed after the  title of this  question.
         attr_accessor :title_question
@@ -246,10 +247,21 @@ module Quby
             answer_keys
           else
             # Some options don't have a key (inner_title), they are stripped
-            options.map { |opt| opt.input_key }.compact
+            all_options.map { |opt| opt.input_key }.compact
           end
         end
 
+        def all_options
+          options.flat_map { |option|
+            case option
+            when Quby::Compiler::Entities::QuestionOptgroup
+              option.options
+            else
+              option
+            end
+          }
+        end
+
         def key_in_use?(k)
           claimed_keys.include?(k) ||
           options.any? { |option| option.key_in_use?(k) }

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Quby
+  module Compiler
+    module Entities
+      class QuestionOptgroup
+        include ActiveModel::Validations
+        include ::Quby::InspectExcept.new(:@question, :@questions)
+
+        attr_reader :key
+        attr_reader :label
+        attr_reader :options
+
+        def initialize(key, label:)
+          @key = key
+          @label = label
+          @options = []
+        end
+
+        def key_in_use?(key)
+          @options.any? { _1.key_in_use?(key) }
+        end
+
+        # We don't allow subquestions on select questions
+        def questions
+          []
+        end
+
+        def path_str
+          "#{question.path_str}:Optgroup:#{key}"
+        end
+      end
+    end
+  end
+end

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

@@ -2,25 +2,53 @@ require 'quby/compiler/entities/sexp_variables'
 
 module Quby::Compiler::Entities
   class SexpVariable
-    attr_reader :calculation, :key
+    attr_reader :calculation, :key, :type
 
-    def initialize(key:, calculation:)
+    def initialize(key:, calculation:, type:)
       @key = key
+      @type = type
       @calculation = calculation
     end
 
     # Called by DefinitionValidator.
-    def validate(questionnaire)
-      case calculation
+    def validate(questionnaire, calculation: self.calculation)
+      validate_node(calculation, questionnaire:, type:)
+    end
+    
+    private
+
+    def validate_node(node, questionnaire:, type:)
+      validate_type(node, type:)
+
+      case node
       when SexpVariables::NumberValue
-        validate_question_exist(questionnaire, calculation)
-        validate_value_is_number(questionnaire, calculation)
+        validate_question_exist(questionnaire, node)
+        validate_value_is_number(questionnaire, node)
       when SexpVariables::StringValue
-        validate_question_exist(questionnaire, calculation)
-        validate_value_is_string(questionnaire, calculation)
+        validate_question_exist(questionnaire, node)
+        validate_value_is_string(questionnaire, node)
+      when SexpVariables::NumberReducer
+        calculation.values.each do |value|
+          validate_node(value, questionnaire:, type: :number)
+        end
+      when SexpVariables::BooleanReducer
+        calculation.values.each do |value|
+          validate_node(value, questionnaire:, type: :boolean)
+        end
+      when SexpVariables::Comparer
+        validate_node(node.left, questionnaire:, type: :number)
+        validate_node(node.right, questionnaire:, type: :number)
       end
     end
 
+    def validate_type(node, type:)
+      return if type == :number && SexpVariables::NumericType === node
+      return if type == :boolean && SexpVariables::BooleanType === node
+      return if type == :string && SexpVariables::StringValue === node
+
+      fail "sexp_variable #{key} has invalid type #{node.class} for expected type #{type}."
+    end
+
     def validate_question_exist(questionnaire, sexp)
       return if questionnaire.question_hash.key?(sexp.key)
 

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

@@ -8,8 +8,11 @@ module Quby::Compiler::Entities
     class Number < Base; end
     class NumberReducer < Base; end
     class NumberMethod < Base; end
+    class BooleanReducer < Base; end
+    class Comparer < Base; end
 
     NumericType = Number | NumberReducer | NumberMethod | NumberValue
+    BooleanType = BooleanReducer | Comparer
 
     class NumberValue
       attribute :op, Quby::Types::Symbol.enum(:number_value)
@@ -32,6 +35,19 @@ module Quby::Compiler::Entities
       attribute :values, Quby::Types::Array.of(NumericType)
     end
 
+    # returning a Boolean
+    class BooleanReducer < Base
+      attribute :op, Quby::Types::Symbol.enum(:all, :some, :none)
+      attribute :values, Quby::Types::Array.of(Base)
+    end
+
+    # returning a Boolean
+    class Comparer < Base
+      attribute :op, Quby::Types::Symbol.enum(:eq, :not_eq, :gt, :gteq, :lt, :lteq)
+      attribute :left, NumericType
+      attribute :right, NumericType
+    end
+
     # returning a Number
     class NumberMethod
       attribute :op, Quby::Types::Symbol.enum(:round)     

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

@@ -21,7 +21,7 @@ module Quby
 
             case question.type
             when :radio, :scale, :select
-              question.options.each do |option|
+              question.all_options.each do |option|
                 rules.concat rules_for_option(question, option, type: :equal)
               end
             when :check_box

data/lib/quby/compiler/entities.rb

@@ -5,6 +5,7 @@ require 'quby/compiler/entities/definition'
 require 'quby/compiler/entities/questionnaire'
 require 'quby/compiler/entities/version'
 require 'quby/compiler/entities/question_option'
+require 'quby/compiler/entities/question_optgroup'
 require 'quby/compiler/entities/item'
 require 'quby/compiler/entities/score_calculation'
 require 'quby/compiler/entities/anonymous_conditions'

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

@@ -183,7 +183,7 @@ module Quby
         # Also adds the title question under the last option.
         # TODO old dsl put it there, remove after quby gem uses title_question
         def options_as_json(question)
-          question.options.map { |option| option_as_json(option) }.tap do |options_json|
+          question.all_options.map { |option| option_as_json(option) }.tap do |options_json|
             if question.title_question
               options_json.last[:questions] << question_as_json(question.title_question)
             end

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

@@ -173,7 +173,7 @@ module Quby
           {
             **base_question(question),
             children: children(question),
-            placeholder: question.options.find { _1.placeholder }&.description,
+            placeholder: question.all_options.find { _1.placeholder }&.description,
           }.compact
         end
 
@@ -245,7 +245,12 @@ module Quby
 
         def children(question)
           question.options.map.with_index { |child, idx|
-            if child.inner_title
+            if child.is_a?(Quby::Compiler::Entities::QuestionOptgroup)
+              { type: 'optgroup',
+                key: child.key,
+                options: child.options.map { option_as_json(_1) }
+              }
+            elsif child.inner_title
               inner_title_as_json(child, idx)
             elsif child.placeholder
               nil # placeholder attr on question.
@@ -274,7 +279,7 @@ module Quby
             value: option.question.type != :check_box && option.value,
             label:,
             description:,
-            questions: option.question.type != :select && option.questions.map{ question(_1) },
+            questions: option.question.type != :select ? option.questions.map{ question(_1) } : nil,
             hidden: option.hidden.presence,
             viewId: option.view_id
         }.compact

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

@@ -239,7 +239,7 @@ module Quby
         def options_for(question)
           return nil if question.options.empty?
 
-          question.options.reject { |option| option.inner_title || option.placeholder }
+          question.all_options.reject { |option| option.inner_title || option.placeholder }
                           .map { |option|
             {
               key: option.key,

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

@@ -106,7 +106,7 @@ module Quby
         end
 
         def validate_question_options(questionnaire, question)
-          question.options.each do |option|
+          question.all_options.each do |option|
             validate_item(option)
             to_be_hidden_questions_exist_and_not_subquestion?(questionnaire, option, msg_base: option.path_str)
             to_be_shown_questions_exist_and_not_subquestion?(questionnaire, option, msg_base: option.path_str)
@@ -296,7 +296,7 @@ scores_schema tables to the resulting seed."
 
         def validate_subquestion_absence_in_select(question)
           return unless question.type == :select
-          question.options.each do |option|
+          question.all_options.each do |option|
             unless option.questions.empty?
               fail "Question '#{question.key}' of type ':select' may not include other questions."
             end
@@ -304,7 +304,7 @@ scores_schema tables to the resulting seed."
         end
 
         def validate_placeholder_options_nil_values(question)
-          question.options.each do |question_option|
+          question.all_options.each do |question_option|
             if question_option.placeholder && question_option.value.present?
               fail "#{question.key}:#{question_option.key}: Placeholder options should not have values defined."
             end
@@ -314,7 +314,7 @@ scores_schema tables to the resulting seed."
         def validate_values_unique(question)
           return if question.type == :check_box || question.allow_duplicate_option_values
 
-          question.options.each_with_object([]) do |question_option, seen_values|
+          question.all_options.each_with_object([]) do |question_option, seen_values|
             next if question_option.placeholder || question_option.inner_title
 
             fail "#{question.key}:#{question_option.key}: Has no option value defined." if question_option.value.blank?
@@ -344,7 +344,7 @@ scores_schema tables to the resulting seed."
           questionnaire.questions.each do |question|
             Entities::Question::MARKDOWN_ATTRIBUTES.each do |attr|
               validate_markdown(question.send(attr), "#{question.key}.#{attr}")
-              question.options.each do |option|
+              question.all_options.each do |option|
                 Entities::QuestionOption::MARKDOWN_ATTRIBUTES.each do |option_attr|
                   validate_markdown(option.send(option_attr), "#{question.key}:#{option.key}.#{option_attr}")
                 end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.29"
+    VERSION = "0.5.31"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.29
+  version: 0.5.31
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-08-27 00:00:00.000000000 Z
+date: 2025-09-17 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
@@ -188,6 +187,7 @@ files:
 - lib/quby/compiler/entities/outcome_table.rb
 - lib/quby/compiler/entities/panel.rb
 - lib/quby/compiler/entities/question.rb
+- lib/quby/compiler/entities/question_optgroup.rb
 - lib/quby/compiler/entities/question_option.rb
 - lib/quby/compiler/entities/questionnaire.rb
 - lib/quby/compiler/entities/questions/checkbox_question.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