quby-compiler 0.5.14 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35bdecff443479812941ad2ced1e6585228fb03881c4ba9c48af3468b48c544f
-  data.tar.gz: 3cf5faea78f741c241c0f57d873480fcc3b028aa91942ff020e9970eaf332530
+  metadata.gz: 5fbd126d732f2ab8201f325d09041cb564138354150fbedc83f3f7e9f68a755f
+  data.tar.gz: df750a8516c8596596cf11a03f3ce758bdb745de607068d4b8b753ae62a95e17
 SHA512:
-  metadata.gz: d0b431d1f495544c5541bc5b2e5ceb57ece1d6d5782cabf6bfa80b9d7bb251a33e9b13764ebc6f0ac726523883eab6ee04585d4e4b102cd10ee419a3466cf1e7
-  data.tar.gz: 4f22422b8789dbad63cb5cc57550582971ef47c2958b829bae72e9d140081a4378797534c5d5ae7a9888f562f3cfd87ad87bac6cc0c620032610264cc55b46e2
+  metadata.gz: ddd7e5767209991dd94f35b086294903cc2616d76104cbdaf776181e661e0cefe501393033abc41674aed88f14a7849a3f275c81330c72c68384dd42cf9052a3
+  data.tar.gz: 1ba99e0f79496a7d64d95952739bd5fcc1f0ef6f1927c2cd5ce211c6bddd134dd37f617400dd3201344d35a58503e7b14503856c274404f41d6e90391b07ace3

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 0.5.16
+
+* add integer as split_to_units option, with units and conversions as attributes
+* add sexp_variables to do calculations using s expressions, for now in quby2, but later in the backend.
+* test that select/radio options are always numeric
+* quby2.json
+  * add split_to_units question, that saves a integer.
+  * Calculate sexpr variables and allow strings to interpolate them {{calculation.some_var}}
+
+# 0.5.15
+
+* Add context_description to questions, to have a text item that is hidden together with the question.
+* quby2.json
+  * Moved quby2 serialization to the serializer, compact everything, no markdown for v2 title/descriptions.
+  * Sanitize Quby2 html in v2.
+  * Add contextDescription to questions.
+
 # 0.5.14
 
 * Support for activemodel 7.1 and 7.2

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

@@ -8,6 +8,7 @@ require 'quby/compiler/dsl/charting/line_chart_builder'
 require 'quby/compiler/dsl/charting/radar_chart_builder'
 require 'quby/compiler/dsl/charting/bar_chart_builder'
 require 'quby/compiler/dsl/charting/overview_chart_builder'
+require 'quby/compiler/dsl/sexp_variable_builder'
 
 require_relative 'standardized_panel_generators'
 
@@ -200,6 +201,10 @@ module Quby
           end
         end
 
+        def sexp_variable(key, &block)
+          @questionnaire.add_sexp_variable(key, SexpVariableBuilder.new(key, &block).build)
+        end
+
         # variable :totaal do
         #   # Plain old Ruby code here, executed in the scope of the answer
         #   # variables are private to the score calculation

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

@@ -12,6 +12,7 @@ module Quby
           end
 
           def build
+            @question.after_build
             @question
           end
 
@@ -27,6 +28,10 @@ module Quby
             @question.description = value
           end
 
+          def context_description(value)
+            @question.context_description = value
+          end
+
           def presentation(value)
             @question.presentation = value
           end

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

@@ -14,6 +14,16 @@ module Quby
             super
             @question = Entities::Questions::IntegerQuestion.new(key, options)
           end
+
+          # as split_to_units
+          def units(*values)
+            @question.units = values
+          end
+
+          # as split_to_units
+          def conversions(value)
+            @question.conversions = value
+          end
         end
       end
     end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'quby/compiler/entities/sexp_variable'
+module Quby::Compiler
+  module DSL
+    # sexp_variable :myvar do
+    #   sum(number_values(:v_1, :v_2))
+    # end
+    class ::SexpVariableBuilder
+      attr_reader :calculation, :key
+
+      def initialize(key, &block)
+        @key = key
+        @calculation = instance_eval(&block)
+      end
+
+      def string_value(key)
+        Entities::SexpVariables::StringValue.new(op: :string_value, key: key)
+      end
+
+      def number_value(key)
+        Entities::SexpVariables::NumberValue.new(op: :number_value, key: key)
+      end
+
+      def number_values(*keys)
+        keys.map { |key| number_value(key) }
+      end
+
+      %i[sum subtract multiply divide].each do |op|
+        define_method(op) do |*values|
+          Entities::SexpVariables::NumberReducer.new(op:, values: wrap_and_flatten(values))
+        end
+      end
+
+      def round(value)
+        Entities::SexpVariables::NumberMethod.new(op: :round, value: value)
+      end
+
+      def build
+        Entities::SexpVariable.new(key:, calculation:)
+      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 
+        }
+      end
+    end
+  end
+end

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

@@ -16,10 +16,6 @@ module Quby
           @items = options[:items] || []
         end
 
-        def as_json(options = {})
-          super.merge(title: title, index: index, items: json_items)
-        end
-
         def index
           @questionnaire.panels.index(self)
         end
@@ -44,20 +40,6 @@ module Quby
           end
         end
 
-        def json_items
-          items.map do |item|
-            case item
-            when Text
-              { type: 'html', html: item.html }
-            when Question
-              next if item.table # things inside a table are added to the table, AND ALSO to the panel. skip them.
-              { type: 'question', key: item.key }
-            when Table
-              { type: "table" }
-            end
-          end.compact
-        end
-
         def validations
           vals = {}
           items.each do |item|

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

@@ -6,6 +6,8 @@ module Quby
   module Compiler
     module Entities
       class Question < Item
+        include ::Quby::InspectExcept.new(*%i[@dependencies @options @questionnaire @table @validations @parent])
+
         MARKDOWN_ATTRIBUTES = %w(description title).freeze
 
         set_callback :after_dsl_enhance, :expand_depends_on_input_keys
@@ -18,6 +20,7 @@ module Quby
         attr_accessor :title
         attr_accessor :context_free_title
         attr_accessor :description
+        attr_accessor :context_description
 
         attr_accessor :labels
 
@@ -205,6 +208,10 @@ module Quby
         end
         # rubocop:enable CyclomaticComplexity, Metrics/MethodLength
 
+        # called after DSL has instance_evalled everything within the question block.
+        def after_build
+        end
+
         def context_free_title_or_title
           context_free_title || title
         end
@@ -229,30 +236,6 @@ module Quby
           options.length > 0 && type != :select ? options.length : @col_span
         end
 
-        def as_json(options = {})
-          # rubocop:disable SymbolName
-          super.merge(
-            key: key,
-            title: Quby::Compiler::MarkdownParser.new(title).to_html,
-            description: Quby::Compiler::MarkdownParser.new(description).to_html,
-            type: type,
-            size: size.presence && Integer(size), # 2022-11: 4k string and 7k integer
-            hidden: hidden?,
-            displayModes: display_modes,
-            defaultInvisible: default_invisible,
-            viewSelector: view_selector,
-            parentKey: parent&.key,
-            parentOptionKey: parent_option_key,
-            deselectable: deselectable,
-            presentation: presentation,
-            as: as || type, # default to type so typescript can narrow on it.
-            questionGroup: question_group
-          ).tap do |json|
-            json[:unit] = unit if %i[integer float string].include?(type) && as != :slider
-            json[:showValues] = [true, :all].include?(show_values) if %i[radio scale].include?(type) && show_values
-          end
-        end
-
         def title_question?
           presentation == :next_to_title
         end

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

@@ -5,11 +5,13 @@ module Quby
     module Entities
       class QuestionOption
         include ActiveModel::Validations
+        include ::Quby::InspectExcept.new(:@question, :@questions)
 
         MARKDOWN_ATTRIBUTES = %w(description).freeze
 
         attr_reader :key
         attr_reader :value
+        validates :value, numericality: {allow_nil: true} # nil for checkbox questions.
         attr_reader :description, :context_free_description
         attr_reader :questions
         # for scale/radio/checbox questions, piece of of html that is rendered between the options
@@ -53,40 +55,6 @@ module Quby
           @questions.each { |q| return true if q.key_in_use?(k) }
           false
         end
-
-        def as_json(options = {})
-          if inner_title
-            inner_title_as_json(options)
-          elsif placeholder
-            nil # placeholder attr on question.
-          else
-            option_as_json(options)
-          end
-        end
-
-        def inner_title_as_json(options = {})
-          {
-            type: 'html',
-            key: SecureRandom.uuid,
-            html: Quby::Compiler::MarkdownParser.new(description).to_html
-          }
-        end
-
-        def option_as_json(options = {})
-          {
-            type: 'option',
-            key: key,
-            value: value,
-            description: question.type == :select \
-              ? description
-              : Quby::Compiler::MarkdownParser.new(description).to_html,
-            questions: questions,
-            hidesQuestions: hides_questions,
-            showsQuestions: shows_questions,
-            hidden: hidden,
-            viewId: view_id
-          }
-        end
       end
     end
   end

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

@@ -17,6 +17,7 @@ module Quby
       class Questionnaire
         extend  ActiveModel::Naming
         include ActiveModel::Validations
+        include ::Quby::InspectExcept.new(*%i[@attributes @charts @fields @flags @panels @questions @sourcecode @score_calculations @score_schemas @textvars])
 
         class ValidationError < StandardError; end
         class UnknownInputKey < ValidationError; end
@@ -52,6 +53,7 @@ module Quby
           @outcome_tables = []
           @check_score_keys_consistency = true
           @lookup_tables = {}
+          @sexp_variables = {}
           @versions = []
           @seeds_patch = {}
           @anonymous_conditions = Entities::AnonymousConditions.new
@@ -101,6 +103,7 @@ module Quby
 
         attr_accessor :outcome_tables
         attr_accessor :score_schemas
+        attr_accessor :sexp_variables
         attr_accessor :lookup_tables
         attr_accessor :anonymous_conditions
 
@@ -361,6 +364,10 @@ module Quby
           end
         end
 
+        def add_sexp_variable(key, sexp_variable)
+          sexp_variables[key] = sexp_variable
+        end
+
         def add_outcome_table(outcome_table_options)
           outcome_tables << OutcomeTable.new(**outcome_table_options, questionnaire: self)
         end

data/lib/quby/compiler/entities/questions/checkbox_question.rb

@@ -58,14 +58,6 @@ module Quby
             # Some options don't have a key (inner_title), they are stripped.
             options.map { |opt| opt.input_key }.compact
           end
-
-          def as_json(options = {})
-            super.tap do |json|
-              json[:children] = @options.as_json
-              json[:checkAllOption] = check_all_option if check_all_option.present?
-              json[:uncheckAllOption] = uncheck_all_option if uncheck_all_option.present?
-            end
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/concerns/slider.rb

@@ -5,19 +5,5 @@ module Quby::Compiler::Entities::Questions::Concerns
     included do
       validates :minimum, :maximum, presence: true, if: -> { as == :slider }
     end
-
-    def as_json(options = {})
-      if as == :slider
-        super.merge(
-          step: step,
-          defaultPosition: default_position.is_a?(Numeric) ? default_position : minimum,
-          startThumbHidden: default_position == :hidden,
-          valueTooltip: input_data[:value_tooltip] || false,
-          labels: labels
-        )
-      else
-        super
-      end
-    end
   end
 end

data/lib/quby/compiler/entities/questions/concerns/split_to_units.rb

@@ -0,0 +1,58 @@
+module Quby::Compiler::Entities::Questions::Concerns
+  module SplitToUnits
+    extend ActiveSupport::Concern
+    DEFAULT_SPLIT_TO_UNIT_CONVERSIONS = {
+      minutes: {
+        hours: 60,
+        days: 1440,
+        weeks: 10080
+      },
+      seconds: {
+        minutes: 60,
+        hours: 3600,
+        days: 86400
+      },
+      m: {
+        km: 1000
+      },
+      cm: {
+        m: 100
+      },
+      mm: {
+        cm: 10,
+        m: 1000
+      },
+      g: {
+        kg: 1000
+      }
+    }.freeze
+
+    included do
+      attr_accessor :units, :conversions
+
+      validates :units, :conversions, presence: true, if: -> { as == :split_to_units }
+      validate :validate_split_to_units, if: -> { as == :split_to_units }
+    end
+
+    def after_build
+      super
+      return unless as == :split_to_units
+      @unit = units&.last
+      (@conversions ||= {}).reverse_merge!(default_split_to_units_conversions)
+    end
+
+    def default_split_to_units_conversions
+      (DEFAULT_SPLIT_TO_UNIT_CONVERSIONS[unit] || {}).slice(*units)
+    end
+
+    def validate_split_to_units
+      return unless units.present? && conversions.present?
+
+      (units - [unit]).each do |unit_to_convert|
+        if conversions[unit_to_convert].nil?
+          errors.add(:conversions, "should contain a conversion for unit #{unit_to_convert}")
+        end
+      end
+    end
+  end
+end

data/lib/quby/compiler/entities/questions/date_question.rb

@@ -53,19 +53,6 @@ module Quby
               send("#{component}_key").to_sym
             end
           end
-
-          def as_json(options = {})
-            super.merge(
-              type: 'date_parts',
-              as: 'date_parts',
-              dateParts: components.map { |component|
-                {
-                  part: component,
-                  key: send("#{component}_key")
-                }
-              }
-            )
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/deprecated_question.rb

@@ -8,10 +8,6 @@ module Quby
           def hidden?
             true
           end
-
-          def as_json(options = {})
-            super.merge(options: @options.as_json)
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/float_question.rb

@@ -9,13 +9,6 @@ module Quby
         class FloatQuestion < Question
           include Concerns::Slider
 
-          def as_json(options = {})
-            super.merge(
-              minimum: minimum,
-              maximum: maximum
-            )
-          end
-
           def size
             @size || 30
           end

data/lib/quby/compiler/entities/questions/integer_question.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'concerns/slider'
+require_relative 'concerns/split_to_units'
 
 module Quby
   module Compiler
@@ -8,13 +9,7 @@ module Quby
       module Questions
         class IntegerQuestion < Question
           include Concerns::Slider
-
-          def as_json(options = {})
-            super.merge(
-              minimum: minimum,
-              maximum: maximum
-            )
-          end
+          include Concerns::SplitToUnits
 
           def size
             @size || 30

data/lib/quby/compiler/entities/questions/radio_question.rb

@@ -5,9 +5,6 @@ module Quby
     module Entities
       module Questions
         class RadioQuestion < Question
-          def as_json(options = {})
-            super.merge(children: @options.as_json)
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/select_question.rb

@@ -5,12 +5,6 @@ module Quby
     module Entities
       module Questions
         class SelectQuestion < Question
-          def as_json(options = {})
-            super.merge(
-              children: @options.as_json.compact, # for now just options, but we'll add optgroups later.
-              placeholder: @options.find { _1.placeholder }&.description # nil for no placeholder
-            )
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/string_question.rb

@@ -5,12 +5,6 @@ module Quby
     module Entities
       module Questions
         class StringQuestion < Question
-          def as_json(options = {})
-            super.merge(autocomplete: @autocomplete)
-            super.merge(autocomplete: @autocomplete).tap do |json|
-              json[:setsTextvar] = sets_textvar if sets_textvar
-            end
-          end
         end
       end
     end

data/lib/quby/compiler/entities/questions/text_question.rb

@@ -5,9 +5,6 @@ module Quby
     module Entities
       module Questions
         class TextQuestion < Question
-          def as_json(options = {})
-            super.merge(autocomplete: @autocomplete, lines: lines)
-          end
         end
       end
     end

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

@@ -0,0 +1,50 @@
+require 'quby/compiler/entities/sexp_variables'
+
+module Quby::Compiler::Entities
+  class SexpVariable
+    attr_reader :calculation, :key
+
+    def initialize(key:, calculation:)
+      @key = key
+      @calculation = calculation
+    end
+
+    # Called by DefinitionValidator.
+    def validate(questionnaire)
+      case calculation
+      when SexpVariables::NumberValue
+        validate_question_exist(questionnaire, calculation)
+        validate_value_is_number(questionnaire, calculation)
+      when SexpVariables::StringValue
+        validate_question_exist(questionnaire, calculation)
+        validate_value_is_string(questionnaire, calculation)
+      end
+    end
+
+    def validate_question_exist(questionnaire, sexp)
+      return if questionnaire.question_hash.key?(sexp.key)
+
+      fail "sexp_variable #{key} uses nonexistent question #{sexp.key}."
+    end
+
+    def validate_value_is_number(questionnaire, sexp)
+      question = questionnaire.question_hash[sexp.key]
+      case question
+      when Questions::IntegerQuestion, Questions::FloatQuestion, Questions::SelectQuestion, Questions::RadioQuestion
+        return
+      end
+
+      fail "sexp_variable #{key} uses non-numeric question #{sexp.key} for number_value."
+    end
+
+    def validate_value_is_string(questionnaire, sexp)
+      question = questionnaire.question_hash[sexp.key]
+      case question
+      when Questions::StringQuestion, Questions::TextareaQuestion
+        return
+      end
+
+      fail "sexp_variable #{key} uses non-string question #{sexp.key} for string_value."
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Quby::Compiler::Entities
+  module SexpVariables
+    class Base < Dry::Struct
+    end
+
+    # recursive dependencies, we so we define the classes first.
+    class NumberValue < Base; end
+    class Number < Base; end
+    class NumberReducer < Base; end
+    class NumberMethod < Base; end
+
+    NumericType = Number | NumberReducer | NumberMethod | NumberValue
+
+    class NumberValue
+      attribute :op, Quby::Types::Symbol.enum(:number_value)
+      attribute :key, Quby::Types::Symbol
+    end
+
+    class StringValue < Base
+      attribute :op, Quby::Types::Symbol.enum(:string_value)
+      attribute :key, Quby::Types::Symbol
+    end
+
+    class Number
+      attribute :op, Quby::Types::Symbol.enum(:value)     
+      attribute :value, Quby::Types::Integer | Quby::Types::Float
+    end
+
+    # returning a Number
+    class NumberReducer
+      attribute :op, Quby::Types::Symbol.enum(:sum, :subtract, :multiply, :divide)
+      attribute :values, Quby::Types::Array.of(NumericType)
+    end
+
+    # returning a Number
+    class NumberMethod
+      attribute :op, Quby::Types::Symbol.enum(:round)     
+      attribute :value, NumericType
+    end
+  end
+end

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

@@ -19,12 +19,217 @@ module Quby
             description: description,
             shortDescription: short_description,
             defaultAnswerValue: Services::TransformQuby1ValuesIntoQuby2Values.run!(@questionnaire, default_answer_value),
-            panels: panels,
-            questions: fields.question_hash.as_json,
-            flags: flags,
+            panels: panels.map { panel(_1) },
+            questions: questions,
             textvars: textvars,
             validations: validations,
-            visibilityRules: visibility_rules
+            visibilityRules: visibility_rules.as_json,
+            sexpVariables: sexp_variables,
+          }
+        end
+
+        def panel(panel)
+          {
+            title: panel.title,
+            items: panel.items.map { panel_item(_1) }.compact,
+          }.compact
+        end
+
+        def panel_item(item)
+          case item
+          when Quby::Compiler::Entities::Text
+            { type: 'html', html: handle_html(item.html, type: :prose, v1_markdown: false) }
+          when Quby::Compiler::Entities::Question
+            return if item.table # things inside a table are added to the table, AND ALSO to the panel. skip them.
+            { type: 'question', key: item.key }
+          when Quby::Compiler::Entities::Table
+            { type: "table" }
+          end
+        end
+
+        def questions
+          fields.question_hash \
+            .to_h { |k, question| [k, question(question)] } \
+            .compact
+        end
+
+        def question(question)
+          send(:"#{question_type(question)}_question", question)
+        end
+
+        def check_box_question(question)
+          {
+            **base_question(question),
+            children: children(question),
+            checkAllOption: question.check_all_option,
+            uncheckAllOption: question.uncheck_all_option,
+         }.compact
+        end
+
+        def date_parts_question(question)
+          {
+            **base_question(question),
+            dateParts: question.components.map { |component|
+              {
+                part: component,
+                key: question.send("#{component}_key"),
+              }
+            },
+          }.compact
+        end
+
+        # deprecated
+        def hidden_question(question)
+          nil
+        end
+
+        def float_question(question)
+          number_question(question)
+        end            
+
+        def integer_question(question)
+          {
+            **number_question(question),
+            **split_to_units_question(question),
+          }.compact
+        end
+
+        def number_question(question)
+          {
+            **base_question(question),
+            **slider_question(question),
+            minimum: question.minimum,
+            maximum: question.maximum,
+            size: size(question),
+            unit: question.as != :slider && question.unit,
+          }.compact
+        end
+
+        def radio_question(question)
+          {
+            **base_question(question),
+            children: children(question),
+            showValues: [true, :all].include?(question.show_values),
+        }.compact
+        end
+
+        def scale_question(question)
+          radio_question(question)
+        end
+
+        def select_question(question)
+          {
+            **base_question(question),
+            children: children(question),
+            placeholder: question.options.find { _1.placeholder }&.description,
+          }.compact
+        end
+
+        def string_question(question)
+          {
+            **base_question(question),
+            setsTextvar: question.sets_textvar,
+            size: size(question),
+            unit: question.as != :slider && question.unit,
+        }.compact
+        end
+
+        def textarea_question(question)
+          {
+            **base_question(question),
+            autocomplete: question.autocomplete,
+            lines: question.lines,
+          }.compact
+        end
+
+        def base_question(question)
+          {
+            key: question.key,
+            title: handle_html(question.title),
+            description: handle_html(question.description, type: :question_description),
+            contextDescription: handle_html(question.context_description, type: :prose, v1_markdown: false),
+            type: question_type(question),
+            hidden: question.hidden?,
+            displayModes: question.display_modes,
+            viewSelector: question.view_selector,
+            parentKey: question.parent&.key,
+            parentOptionKey: question.parent_option_key,
+            deselectable: question.deselectable,
+            presentation: question.presentation,
+            as: question.as || question_type(question), # default to type so typescript can narrow on it.
+            questionGroup: question.question_group,
+          }
+        end
+
+        def slider_question(question)
+          return {} unless question.as == :slider
+
+          {
+            step: question.step,
+            defaultPosition: question.default_position.is_a?(Numeric) ? question.default_position : question.minimum,
+            startThumbHidden: question.default_position == :hidden,
+            valueTooltip: question.input_data[:value_tooltip] || false,
+            labels: question.labels,
+          }
+        end
+
+        def split_to_units_question(question)
+          {
+            units: question.units,
+            conversions: question.conversions,
+          }
+        end
+
+        def question_type(question)
+          {
+            date: 'date_parts',
+          }[question.type] || question.type
+        end
+
+        def size(question)
+          question.size.presence && Integer(question.size) # 2022-11: 4k string and 7k integer
+        end
+
+        def children(question)
+          question.options.map { |child|
+            if child.inner_title
+              inner_title_as_json(child)
+            elsif child.placeholder
+              nil # placeholder attr on question.
+            else
+              option_as_json(child)
+            end
+          }.compact
+        end
+
+        def inner_title_as_json(option)
+          {
+            type: 'html',
+            key: SecureRandom.uuid,
+            html: handle_html(option.description)
+          }
+        end
+
+        def option_as_json(option)
+          {
+            type: 'option',
+            key: option.key,
+            value: option.question.type != :check_box && option.value,
+            description: option.question.type == :select ? option.description : handle_html(option.description),
+            questions: option.question.type != :select && option.questions.map{ question(_1) }, 
+            viewId: option.view_id
+        }.compact
+        end
+
+        def textvars
+          @questionnaire.textvars.to_h { |key, textvar|
+            [
+              key,
+              {
+                key: textvar.key,
+                default: textvar.default,
+              }
+            ]
           }
         end
 
@@ -40,6 +245,27 @@ module Quby
               end.as_json
           end
         end
+
+        def handle_html(html, type: :simple, v1_markdown: true)
+          if layout_version == :v2
+            case type
+            when :simple
+              html_sanitizer.sanitize(html, tags: %w[strong em sup sub br span], attributes: %w[class])
+            when :question_description
+              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub p span br ul ol li], attributes: %w[class])
+            when :prose
+              html_sanitizer.sanitize(html, tags: %w[strong em b i u sup sub pre blockquote p span br ul ol li a h1 h2 h3 h4], attributes: %w[href class target])
+            end
+          elsif v1_markdown
+            Quby::Compiler::MarkdownParser.new(html).to_html
+          else
+            html
+          end
+        end
+
+        def html_sanitizer
+          @html_sanitize ||= Rails::HTML5::SafeListSanitizer.new
+        end
       end
     end
   end

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

@@ -26,6 +26,7 @@ module Quby
           validate_outcome_tables(questionnaire)
           validate_markdown_fields(questionnaire) if questionnaire.validate_html
           validate_raw_content_items(questionnaire) if questionnaire.validate_html
+          validate_sexp_variables(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" \
@@ -364,6 +365,12 @@ scores_schema tables to the resulting seed."
           fail "#{key || html} contains invalid html: #{fragment.errors.map(&:to_s).join(', ')}."
         end
 
+        def validate_sexp_variables(questionnaire)
+          questionnaire.sexp_variables.each_value do |sexp_variable|
+            sexp_variable.validate(questionnaire)
+          end 
+        end
+
         def delete_prefix(key, questionnaire)
           key.delete_prefix("#{questionnaire.key}_")
         end

data/lib/quby/compiler/version.rb

@@ -1,5 +1,5 @@
 module Quby
   module Compiler
-    VERSION = "0.5.14"
+    VERSION = "0.5.16"
   end
 end

data/lib/quby/compiler.rb

@@ -15,6 +15,7 @@ module Quby
   end
 end
 
+require 'quby/inspect_except'
 require 'quby/compiler/markdown_parser'
 require 'quby/range_categories'
 require 'quby/compiler/type_validator'

data/lib/quby/inspect_except.rb

@@ -0,0 +1,12 @@
+class Quby::InspectExcept < Module
+  def initialize(*excepts)
+    define_method :inspect do
+      prefix = "#<#{self.class}:0x#{self.__id__.to_s(16)}"
+
+      parts = (instance_variables - excepts).map do |var|
+        "#{var}=#{instance_variable_get(var).inspect}"
+      end
+      "#{prefix}\n #{parts.join(", ")}>"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quby-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.16
 platform: ruby
 authors:
 - Marten Veldthuis
 bindir: exe
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -165,6 +165,7 @@ files:
 - lib/quby/compiler/dsl/questions/text_question_builder.rb
 - lib/quby/compiler/dsl/score_builder.rb
 - lib/quby/compiler/dsl/score_schema_builder.rb
+- lib/quby/compiler/dsl/sexp_variable_builder.rb
 - lib/quby/compiler/dsl/standardized_panel_generators.rb
 - lib/quby/compiler/dsl/table_builder.rb
 - lib/quby/compiler/entities.rb
@@ -188,6 +189,7 @@ files:
 - lib/quby/compiler/entities/questionnaire.rb
 - lib/quby/compiler/entities/questions/checkbox_question.rb
 - lib/quby/compiler/entities/questions/concerns/slider.rb
+- lib/quby/compiler/entities/questions/concerns/split_to_units.rb
 - lib/quby/compiler/entities/questions/date_question.rb
 - lib/quby/compiler/entities/questions/deprecated_question.rb
 - lib/quby/compiler/entities/questions/float_question.rb
@@ -198,6 +200,8 @@ files:
 - lib/quby/compiler/entities/questions/text_question.rb
 - lib/quby/compiler/entities/score_calculation.rb
 - lib/quby/compiler/entities/score_schema.rb
+- lib/quby/compiler/entities/sexp_variable.rb
+- lib/quby/compiler/entities/sexp_variables.rb
 - lib/quby/compiler/entities/subscore_schema.rb
 - lib/quby/compiler/entities/table.rb
 - lib/quby/compiler/entities/text.rb
@@ -220,6 +224,7 @@ files:
 - lib/quby/compiler/services/transform_quby1_values_into_quby2_values.rb
 - lib/quby/compiler/type_validator.rb
 - lib/quby/compiler/version.rb
+- lib/quby/inspect_except.rb
 - lib/quby/range_categories.rb
 - lib/quby/settings.rb
 - lib/quby/text_transformation.rb