lowtype 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c777de40504eea68870df0ee7936de827b1e5a771aca97e40d1ef2b41d3e38ed
-  data.tar.gz: cab3b2a605413173922eee3680a18951f19ec28065e0eb320d5d649b99300c34
+  metadata.gz: dd21f076ae997541e19b4bd3d405d434a7a3395165afa5084dbe7e2701d591a7
+  data.tar.gz: ab3cc40ff0baef867751c9a0c5660cb6340951167c677ab7c4412b389e49f394
 SHA512:
-  metadata.gz: 7c4391bb32203a889a6a88ebdbe2895fd19bf8f195caa2a6d890475a5312fbb4b3e184bd5ea7a6d0031d95246411b8c56cf8323f62774aeda7d78b958f6bd2f0
-  data.tar.gz: d958d6ccd1f5d6c8c328aef5d7a12b2a46dc75253f82ed0f26d31da29666aa81f6e49e06515be901f6bd1ee5c4781e048131ef5d72505fd753da9135a52dee05
+  metadata.gz: 906c8a132cbddaf7b907b7933f4a8fe9686c47dad2ad5811c49be40637c8ce4cb63efd88bcb602255610addf80b57421fdde95b5919e5708e5931994a3575c8f
+  data.tar.gz: 2e7f57855d2e290a2bc353470bec98af3bbf24550006de66ae265de3ecd99623a75874e47ce57bf9667ecf8efaad843a4d173c219222c35067c52002e50e5a05

data/lib/definitions/redefiner.rb

@@ -26,25 +26,28 @@ module Low
   #      │              │                 │                 │               │
   class Redefiner
     class << self
-      # TODO: Pass in "klass" and use it to class_eval/eval methods in the binding of the class that included LowType.
-      def redefine(method_proxies:, class_proxy:)
-        if LowType.config.type_checking
-          typed_methods(method_proxies:, class_proxy:)
-        else
-          untyped_methods(method_proxies:, class_proxy:)
+      def redefine(method_proxies:, class_proxy:, klass: nil)
+        return typed_methods(method_proxies:, class_proxy:) if LowType.config.type_checking
+
+        case LowType.config.disable_mode
+        when :shim
+          shimmed_methods(method_proxies:, class_proxy:)
+        when :strip
+          strip_types(method_proxies:, class_proxy:, klass:)
         end
       end
 
-      def untyped_args(args:, kwargs:, method_proxy:) # rubocop:disable Metrics/AbcSize
+      def untyped_shimmed_args(args:, kwargs:, method_proxy:) # rubocop:disable Metrics/AbcSize
         method_proxy.params_with_expressions.each do |param_proxy|
-          value = param_proxy.position ? args[param_proxy.position] : kwargs[param_proxy.name]
+          positional = %i[pos_req pos_opt].include?(param_proxy.type)
+          value = positional ? args[param_proxy.position] : kwargs[param_proxy.name]
 
           next unless value.nil?
           raise param_proxy.error_type, param_proxy.error_message(value:) if param_proxy.expression.required?
 
           value = param_proxy.expression.default_value # Default value can still be `nil`.
           value = value.value if value.is_a?(ValueExpression)
-          param_proxy.position ? args[param_proxy.position] = value : kwargs[param_proxy.name] = value
+          positional ? args[param_proxy.position] = value : kwargs[param_proxy.name] = value
         end
 
         [args, kwargs]
@@ -82,15 +85,13 @@ module Low
         end
       end
 
-      def untyped_methods(method_proxies:, class_proxy:)
+      def shimmed_methods(method_proxies:, class_proxy:)
         Module.new do
           method_proxies.values.filter(&:expressions?).each do |method_proxy|
-            # You are now in the binding of the includer class.
+            # You are now in the binding of both LowType and the includer class.
             define_method(method_proxy.name) do |*args, **kwargs|
-              # NOTE: Type checking is currently disabled. See 'config.type_checking'.
-              method_proxy = Lowkey[class_proxy.file_path][class_proxy.namespace][__method__]
-
-              args, kwargs = Low::Redefiner.untyped_args(args:, kwargs:, method_proxy:)
+              # NOTE: Type checking is currently disabled via shim. See 'config.type_checking'.
+              args, kwargs = Low::Redefiner.untyped_shimmed_args(args:, kwargs:, method_proxy:)
               super(*args, **kwargs)
             end
 
@@ -98,6 +99,20 @@ module Low
           end
         end
       end
+
+      def strip_types(method_proxies:, class_proxy:, klass:)
+        method_proxies.values.filter(&:expressions?).each do |method_proxy|
+          method_proxy.rewrite_signature
+
+          klass.class_eval(method_proxy.export, method_proxy.file_path, method_proxy.start_line)
+
+          if class_proxy.private_start_line && method_proxy.start_line > class_proxy.private_start_line
+            klass.send(:private, method_proxy.name)
+          end
+        end
+
+        nil
+      end
     end
   end
 end

data/lib/expressions/type_expression.rb

@@ -18,7 +18,7 @@ module Low
     attr_reader :types, :default_value
 
     # @param type - A literal type or an instance representation of a typed structure.
-    def initialize(type: nil, default_value: :LOW_TYPE_UNDEFINED)
+    def initialize(type: nil, default_value: :LOWTYPE_UNDEFINED)
       @types = []
       @types << type unless type.nil?
       @default_value = default_value
@@ -27,9 +27,10 @@ module Low
     end
 
     def required?
-      @default_value == :LOW_TYPE_UNDEFINED
+      @default_value == :LOWTYPE_UNDEFINED
     end
 
+    # TODO: Might need to accept error class here so that type accessors can be disabled and supply ArgumentError.
     def validate!(value:, proxy:) # rubocop:disable Metrics
       if value.nil?
         return true if @default_value.nil?

data/lib/lowtype.rb

@@ -52,8 +52,11 @@ module LowType
 
       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:)
+      result = Low::Redefiner.redefine(method_proxies: class_proxy.instance_methods, class_proxy:, klass:)
+      klass.prepend result if result.is_a?(Module)
+
+      singleton_result = Low::Redefiner.redefine(method_proxies: class_proxy.class_methods, class_proxy:, klass: klass.singleton_class)
+      klass.singleton_class.prepend singleton_result if singleton_result.is_a?(Module)
 
       Low::Adapter::Loader.load(klass:, class_proxy:)
 
@@ -65,6 +68,7 @@ module LowType
 
   Config = Struct.new(
     :type_checking,
+    :disable_mode,
     :error_mode,
     :output_mode,
     :output_size,
@@ -74,7 +78,7 @@ module LowType
 
   class << self
     def config
-      @config ||= Config.new(true, :error, :type, 100, true, true)
+      @config ||= Config.new(true, :shim, :error, :type, 100, true, true)
     end
 
     def configure

data/lib/proxies/param_proxy.rb

@@ -9,10 +9,14 @@ module ::Lowkey
   class ParamProxy
     include ::Low::ErrorHandling
 
+    # Error type should be an ArgumentError when type checking disabled via shim methods.
     def error_type
-      ::Low::ArgumentTypeError
+      return ::Low::ArgumentTypeError if LowType.config.type_checking
+
+      ArgumentError
     end
 
+    # When shimmed the error message will be from LowType, when stripped standard Ruby.
     def error_message(value:)
       "Invalid argument type '#{output(value:)}' for parameter '#{@name}'. Valid types: '#{@expression.valid_types}'"
     end

data/lib/types/error_types.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Low
-  class ArgumentTypeError < TypeError; end
+  class ArgumentTypeError < ArgumentError; end
   class LocalTypeError < TypeError; end
   class ReturnTypeError < TypeError; end
   class AllowedTypeError < TypeError; end

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module Low
   module Type
-    VERSION = '1.3.2'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lowtype
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - maedi