quby-compiler 0.5.20 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58538613874bd655f416eba086f07ba45321bab1306a6bd710df279e3a9cead0
-  data.tar.gz: 1a0c1ea24a9c0fd6e8387f6b1760e14d387e1ed41061d66c8176bf642e72f64e
+  metadata.gz: 07f0d4268936ab1120ebb48d593645367e443a2b236f705de943599aa5e44847
+  data.tar.gz: e7462e8862d04e7b54badb52f833371aa304d42798c28c5da5edb4fe3d2be5f3
 SHA512:
-  metadata.gz: 68251dfd41c4d5054e0d23c7cfa202f6acced87251d2f16b9373c5494d2cbea52955d241479d807e11af8617ced647b49769204b38907bb3728d045a254431cb
-  data.tar.gz: 6f34cd861fec8ae281c6fffb8dea442054d5500f5e90fb5ff3594cf1d41e3dd28200e601edc29f05e68e7be32653e084f2e5c5c02ea92cbdac87c64c6581e438
+  metadata.gz: f34d09ad62cbcf84a1749d014c651960409c0bde03a408be228f2940f7efb81c01c97bdeb7a82889d92c16aad637bdaf8cf7674a94bf513dd78454546ee15dc5
+  data.tar.gz: 3743a39d0850ee252b3c9d6fa32ef8d89c6ee88e69ffd1a280f39d49af97c5635943b47fec4bce53b0ab9920d408a790e780cb09907691b779254d1957893a01

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.5.22
+
+* quby2: Add questionKeys to panels, so we can validate completeness and make quby2 simpler.
+
+# 0.5.21
+
+* Allow custom methods inside info_blocks
+
 # 0.5.20
 
 * dsl: Add info_block support

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

@@ -11,9 +11,10 @@ module Quby
         delegate :panel, to: :info_block
         delegate :questionnaire, to: :panel
 
-        def initialize(key, start_open: true, panel:, default_question_options:)
+        def initialize(key, start_open: true, panel:, default_question_options:, custom_methods:)
           @info_block = Entities::InfoBlock.new(key: , panel:, start_open:)
           @default_question_options = default_question_options
+          @custom_methods = custom_methods
           check_key_uniqueness(key, questionnaire:)
           questionnaire.fields.info_block_keys << key
           panel.items << @info_block
@@ -38,6 +39,14 @@ module Quby
           questionnaire.register_question(question)
           info_block.items << question
         end
+
+        def method_missing(method_sym, *args, **kwargs, &block)
+          if @custom_methods.key? method_sym
+            instance_exec(*args, **kwargs, &@custom_methods[method_sym])
+          else
+            super
+          end
+        end
       end
     end
   end

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

@@ -70,6 +70,7 @@ module Quby
             key,
             panel: @panel,
             default_question_options: @default_question_options,
+            custom_methods: @custom_methods,
             **options
           info_block_builder.instance_eval(&block)
         end

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

@@ -27,13 +27,24 @@ module Quby
             visibilityRules: visibility_rules.as_json,
             sexpVariables: sexp_variables,
             cssVars: css_vars,
-          }.compact
+          }.compact.tap do |json|
+            validate_all_questions_in_a_panel_question_keys(json)
+          end
+        end
+
+        # safeguard that question_keys_for_panel is considering all options.
+        def validate_all_questions_in_a_panel_question_keys(json)
+          missings = @questionnaire.question_hash.values.map(&:key) - json[:panels].flat_map{_1[:questionKeys]}
+          return if missings.empty?
+          
+          raise "Not all questions are listed in a panel['questionKeys']: #{missings.join(",")}."
         end
 
         def panel(panel)
           {
             title: panel.title,
             items: panel.items.map { panel_item(_1) }.compact,
+            questionKeys: question_keys_for_panel(panel) # added instead of calculated in js, so we can validate completeness.
           }.compact
         end
 
@@ -51,6 +62,30 @@ module Quby
           end
         end
 
+        def question_keys_for_panel(panel)
+          panel.items.flat_map do |item|
+            case item
+            when Quby::Compiler::Entities::Question
+              question_keys_for_question(item)
+            when Quby::Compiler::Entities::InfoBlock, Quby::Compiler::Entities::Table
+              item.items.flat_map do |nested_item|
+                next unless nested_item.is_a?(Quby::Compiler::Entities::Question)
+                question_keys_for_question(nested_item)
+              end
+            else
+              []
+            end
+          end.compact
+        end
+
+        def question_keys_for_question(question)
+          keys = [question.key]
+          keys << question.title_question.key if question.title_question
+          keys + question.options&.flat_map do |option|
+            option.questions&.map(&:key) # We only allow subquestions one level deep.
+          end
+        end
+
         def info_block_item(info_block)
           {
             type: 'info',

data/lib/quby/compiler/version.rb

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

metadata

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