low_type 1.1.13 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f0cac83a3d18258da13254f3d293d0630a718d7c2640bc56974d9973b78b330
-  data.tar.gz: b6c8fda73a3ca4d6c6d2a5aa91015cd162641f42edce4c3b901e1c481f2152af
+  metadata.gz: a35463e7919196f86142b2120884cc3ddb70375569d14b9a5c48d734b002b942
+  data.tar.gz: 93f54ee40ee59d4bc95e81a05aacdd4c20a5c0b5c546e756f72337118d9d1f52
 SHA512:
-  metadata.gz: b93f26a5ff5a22466aaa898201549205f3acef574488b887193a2c9fd0deef69894b679f4c966e01ac7fedc0326c69e694851bf0de9445f51922a7b6c12caa5f
-  data.tar.gz: f377e9f4f5bc85cb1e51e1a0cc3c36c0d6ac1b057da181341924377fb208208fa35bc27a1e5070ced94270fa46351c56c6d93dda9f08a21c69d913ae43d9b5b4
+  metadata.gz: '00039a16689c9dedae5b0dde2af61e705d5959a354a58fe9321d46ef973d698da0339658fe51cee366051a15351ac6a3164b0a6f79ef2e14361e30f8058adb7b'
+  data.tar.gz: bc1e1ff7f780f51c5d902616c8593e955f7130a0e17ee0557038d1f31f6b948fd7d9306c3842cac149698ecfe932be3b08a526e4f93b73c262e4d995354712e8

data/lib/definitions/evaluator.rb

@@ -40,26 +40,36 @@ module Low
       eval(proxy.value, binding, proxy.file_path, proxy.start_line) # rubocop:disable Security/Eval
     end
 
+    def class_evaluate(proxy:, class_binding:)
+      # Not a security risk because the code comes from a trusted source; the file that included lowtype.
+      eval(proxy.value, class_binding, proxy.file_path, proxy.start_line) # rubocop:disable Security/Eval
+    end
+
     class << self
-      def evaluate(method_proxies:)
+      def evaluate(method_proxies:, class_binding: nil)
         require_relative '../syntax/union_types' if LowType.config.union_type_expressions
 
         method_proxies.each_value do |method_proxy|
-          evaluate_param_proxy_expressions(method_proxy:)
+          evaluate_param_proxy_expressions(method_proxy:, class_binding:)
           evaluate_return_proxy_expression(return_proxy: method_proxy.return_proxy) if method_proxy.return_proxy
         end
       end
 
-      def evaluate_param_proxy_expressions(method_proxy:)
+      def evaluate_param_proxy_expressions(method_proxy:, class_binding: nil)
         begin # rubocop:disable Style/RedundantBegin
           method_proxy.tagged_params(:value).each do |param_proxy|
-            # TODO: Evaluate in the binding of the class that included LowType if not a type managed by LowType.
-            expression = new.instance_evaluate(proxy: param_proxy)
+            expression = begin
+              new.instance_evaluate(proxy: param_proxy)
+            rescue NameError
+              raise unless class_binding
+
+              new.class_evaluate(proxy: param_proxy, class_binding:)
+            end
             param_proxy.expression = cast_type_expression(expression:, method_proxy:)
           end
-        rescue NameError
+        rescue NameError => e
           mp = method_proxy
-          raise NameError, "Unknown type '#{mp.value}' for #{mp.scope} at #{mp.file_path}:#{mp.start_line}"
+          raise NameError, "Unknown type '#{e.name}' for #{mp.scope} at #{mp.file_path}:#{mp.start_line}"
         end
       end
 

data/lib/expressions/type_expression.rb

@@ -2,6 +2,7 @@
 
 require 'expressions'
 
+require_relative 'value_expression'
 require_relative '../proxies/param_proxy'
 require_relative '../queries/type_query'
 
@@ -123,6 +124,10 @@ module Low
     end
 
     def hash_types_match_values?(types:, values:)
+      return true if values.empty? && empty_hash_default_value?
+      return values.empty? if types.empty?
+      return false if values.empty?
+
       # TODO: Shallow validation of hash could be made deeper with user config.
       types.keys[0] == values.keys[0].class && types.values[0] == values.values[0].class
     end
@@ -130,9 +135,10 @@ module Low
     def type_matches_value?(type:, value:, proxy:)
       if type.instance_of?(Class)
         return type.match?(value:) if Low::TypeQuery.complex_type?(expression: type)
+        return value.value <= type if value.instance_of?(ValueExpression)
 
-        return type == value.class
-      elsif type.instance_of?(::Low::TypeExpression)
+        return value.is_a?(type)
+      elsif type.instance_of?(Low::TypeExpression)
         type.validate!(value:, proxy:)
         return true
       end
@@ -145,5 +151,9 @@ module Low
 
       LowType.config.deep_type_check
     end
+
+    def empty_hash_default_value?
+      @default_value.is_a?(Hash) && @default_value.empty?
+    end
   end
 end

data/lib/expressions/value_expression.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
-# A value expression presents a type as a value:
-# 1. It is an instance
-# 2. It has a class method
-class ValueExpression
-  attr_reader :value
+module Low
+  # A value expression presents a type as a value:
+  #   1. It is an instance
+  #   2. It mimics the class method
+  class ValueExpression
+    attr_reader :value
 
-  def initialize(value:)
-    @value = value
-  end
+    def initialize(value:)
+      @value = value
+    end
 
-  def class
-    @value
+    def class
+      @value
+    end
   end
 end

data/lib/low_type.rb

@@ -31,23 +31,36 @@ require_relative 'types/complex_types'
 #      │              │                 │◄┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┤
 #      │              │                 │                 │               │
 module LowType
-  # We do as much as possible on class load rather than on object instantiation to be thread-safe and efficient.
+  # Defers evaluation and redefinition until after the class body finishes loading via TracePoint :end.
   def self.included(klass)
     file_path = Low::FileQuery.file_path(klass:)
     file_proxy = Lowkey.load(file_path)
     class_proxy = file_proxy[klass.name]
 
-    Low::Evaluator.evaluate(method_proxies: class_proxy.keyed_methods)
-
     klass.include Low::ExpressionHelpers
     klass.extend Low::ExpressionHelpers
     klass.extend Low::TypeAccessors
     klass.extend Low::Types
 
-    klass.prepend Low::Redefiner.redefine(method_proxies: class_proxy.instance_methods, class_proxy:)
-    klass.singleton_class.prepend Low::Redefiner.redefine(method_proxies: class_proxy.class_methods, class_proxy:)
+    # Use TracePoint :end to capture the class binding after the class body finishes loading.
+    # At :end time, trace.self is the including class and trace.binding is the class body's binding,
+    # stored on class_proxy.class_binding for use by LowType and other consumers.
+    tp = TracePoint.new(:end) do |trace|
+      next unless trace.self == klass
+
+      class_proxy.class_binding = trace.binding
+
+      Low::Evaluator.evaluate(method_proxies: class_proxy.keyed_methods, class_binding: class_proxy.class_binding)
+
+      klass.prepend Low::Redefiner.redefine(method_proxies: class_proxy.instance_methods, class_proxy:)
+      klass.singleton_class.prepend Low::Redefiner.redefine(method_proxies: class_proxy.class_methods, class_proxy:)
+
+      Low::Adapter::Loader.load(klass:, class_proxy:)
+
+      tp.disable
+    end
 
-    Low::Adapter::Loader.load(klass:, class_proxy:)
+    tp.enable
   end
 
   class << self

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module Low
   module Type
-    VERSION = '1.1.13'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: low_type
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.3.0
 platform: ruby
 authors:
 - maedi
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Elegant types in Ruby
 test_files: []