tina4ruby 3.11.1 → 3.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aac5b02fd85a6eb7582cf1eddd1575323513bb4c26e1ddca556bd75fd54e4b35
-  data.tar.gz: 161ef65b78f9f7007815a76494f1f24919dfc7811bf9817d398fde61ad5e4a4a
+  metadata.gz: ef9466f8965eb7728b8aadecd725236011298269966d3775c9f11dc1aa9b0c62
+  data.tar.gz: 11f5cc6ac83ad16b63a23068476517e0babe7db60f793942e2fa4b7048f12894
 SHA512:
-  metadata.gz: c7b42bbe344e93288c3d05798039b6660650ccd5fdeac07e8b1e38b014a7d91e2975bfba34564753c2c4815c0c0851aed51421d39ab4bdce11f72a09dda2482c
-  data.tar.gz: 051321fea2a3a94e54415a3d1a8d1a0e95d1a85617aae8ff64f22b94e54d0a2938c4a7c01231b6a4de1a63003d431c1160ec25432cc52db68c4e5146f05fdb1a
+  metadata.gz: d214fe2b2e79c28232fec6ed03af2d352b70854e66a1611535ad49bd6c79059110579a6d85ab2c8fdc0de8db215abcfae8fe1332d4398985a53c9a3bb4cc5ede
+  data.tar.gz: 5095de7d8683d27ef009859f3e9272e50be8eece9eeea94a7abf62332028cbf9a4aaabf1d3fd6468c57bfbfeca13d2b276703ea55d89d3190343686fd46d5765

data/lib/tina4/graphql.rb

@@ -651,14 +651,29 @@ module Tina4
       field_name = selection[:name]
       output_name = selection[:alias] || field_name
 
+      # Check directives (@skip, @include, @auth, @role, @guest)
+      return unless check_directives(selection[:directives] || [], variables, context)
+
       # Resolve arguments (substitute variables)
       args = resolve_args(selection[:arguments], variables)
 
       field_def = fields[field_name]
 
+      # Input validation
+      if field_def && field_def[:args]
+        validation_errors = validate_args(args, field_def[:args], field_name)
+        if validation_errors.any?
+          errors.concat(validation_errors)
+          data[output_name] = nil
+          return
+        end
+      end
+
       begin
         if field_def && field_def[:resolve]
-          value = field_def[:resolve].call(parent, args, context)
+          # Inject sub-selections into context for DataLoader/eager-loading
+          ctx = context.merge("__selections" => (selection[:selection_set] || []))
+          value = field_def[:resolve].call(parent, args, ctx)
         elsif parent.is_a?(Hash)
           value = parent[field_name] || parent[field_name.to_sym]
         else
@@ -705,6 +720,81 @@ module Tina4
       result
     end
 
+    # Check directives: @skip, @include, @auth, @role, @guest.
+    # Returns true if the field should be included.
+    def check_directives(directives, variables, context = {})
+      directives.each do |d|
+        val = d[:arguments]&.dig("if")
+        val = variables[val[:name]] if val.is_a?(Hash) && val[:kind] == :variable
+
+        return false if d[:name] == "skip" && val
+        return false if d[:name] == "include" && !val
+
+        # Auth: @auth — requires authenticated user
+        return false if d[:name] == "auth" && !context["user"]
+
+        # Auth: @role(role: "admin") — requires specific role
+        if d[:name] == "role"
+          required = d[:arguments]&.dig("role")
+          user = context["user"]
+          actual = user.is_a?(Hash) ? (user["role"] || user[:role]) : nil
+          actual ||= context["role"]
+          return false if required.nil? || actual != required
+        end
+
+        # Auth: @guest — only for unauthenticated
+        return false if d[:name] == "guest" && context["user"]
+      end
+      true
+    end
+
+    # Validate resolved args against declared types.
+    def validate_args(args, arg_configs, field_name)
+      errors = []
+      arg_configs.each do |arg_name, declared_type|
+        value = args[arg_name]
+        is_non_null = declared_type.to_s.end_with?("!")
+        base_type = declared_type.to_s.gsub(/[!\[\]]/, "").strip
+
+        if is_non_null && (value.nil? || value == "")
+          errors << {
+            "message" => "Argument '#{arg_name}' on field '#{field_name}' is required (type: #{declared_type})",
+            "path" => [field_name]
+          }
+          next
+        end
+
+        next if value.nil?
+
+        if %w[Int Float Boolean String ID].include?(base_type)
+          unless coerce_check(value, base_type)
+            errors << {
+              "message" => "Argument '#{arg_name}' on field '#{field_name}' expected type #{base_type}, got #{value.class}",
+              "path" => [field_name]
+            }
+          end
+        end
+      end
+      errors
+    end
+
+    def coerce_check(value, type_name)
+      case type_name
+      when "String", "ID"
+        value.is_a?(String) || value.is_a?(Numeric) || value.is_a?(Symbol)
+      when "Int"
+        return false if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+        value.is_a?(Integer) || (value.is_a?(String) && value.match?(/\A-?\d+\z/))
+      when "Float"
+        return false if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+        value.is_a?(Numeric) || (value.is_a?(String) && value.match?(/\A-?\d+(\.\d+)?\z/))
+      when "Boolean"
+        value.is_a?(TrueClass) || value.is_a?(FalseClass) || [0, 1, "true", "false"].include?(value)
+      else
+        true
+      end
+    end
+
     def resolve_args(args, variables)
       return {} unless args
       resolved = {}

data/lib/tina4/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tina4
-  VERSION = "3.11.1"
+  VERSION = "3.11.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.11.2
 platform: ruby
 authors:
 - Tina4 Team