optify-config 1.15.2-arm64-darwin → 1.16.1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0c1fbad5bbf75a91223091a05241e3328f4863b82be6b614697c456febfef7
-  data.tar.gz: 8bd0c840eaa52325e39b857b05eb80a4db9083c98f79f07041bdf96d30287c1c
+  metadata.gz: a14f2876dd13f7c71a874930c897ba31460c81460b12865433a4941e1c8dc3e1
+  data.tar.gz: aeadb9a296e169a5e48789be5d550b5a60a69698b2b66e756f8a1b916f485d35
 SHA512:
-  metadata.gz: 17d3c8d8a6bd9edaceb34171fcb0745147ddf8568a89b688e59c45de72638abb5a2022531fdeca6bfbdf5e178777e839fca1a069888964f246da2bacc6b0281d
-  data.tar.gz: 47068d0497f5e9281180dd6d74207b85079da7fc422f10a54cced951b00d54e59727e063a1ccfd9f64f3ff56b4c3cbe43189f4d6fc145399c6eb2897b55cacdb
+  metadata.gz: 26a3f2ae7f88b07fd50f31fcf7d2b3c7e93f2d1ef7004ec160d92d21247672f5af1dba65e98acde006793303e30f038ec8449192a3efc12710b3a3e665d28fe2
+  data.tar.gz: 30735a598f9e63cef63ad721f6184fd71d1c350e610ab66b65f4f4c050e47f89f56dc2a68e3e0e553f4d733ed4660823d099d6c2dd3a475d2cc892039a011628

data/lib/optify.rb

@@ -15,7 +15,7 @@ require_relative 'optify_ruby/watcher_implementation'
 # but that doesn't work when building for multiple versions of Ruby.
 # So we have to do this which is similar to something from 'https://github.com/matsadler/halton-rb/blob/main/lib/halton.rb'.
 begin
-  ruby_version = T.must(RUBY_VERSION.match(/\d+\.\d+/))[0]
+  ruby_version = RUBY_VERSION.match(/\d+\.\d+/)&.[](0)
   require_relative "optify_ruby/#{ruby_version}/optify_ruby"
 rescue LoadError
   begin

data/lib/optify_ruby/provider_module.rb

@@ -6,8 +6,6 @@ require 'sorbet-runtime'
 module Optify
   # @!visibility private
   module ProviderModule
-    extend T::Sig
-
     #: (Array[String] feature_names) -> Array[String]
     def get_canonical_feature_names(feature_names)
       # Try to optimize a typical case where there are just a few features.
@@ -40,7 +38,7 @@ module Optify
       end
       result.freeze
 
-      @features_with_metadata = T.let(result, T.nilable(T::Hash[String, OptionsMetadata]))
+      @features_with_metadata = result
       result
     end
 
@@ -71,13 +69,14 @@ module Optify
                        get_options_json(key, feature_names)
                      end
       hash = JSON.parse(options_json)
-      T.unsafe(config_class).from_hash(hash)
+      config_class #: as untyped
+        .from_hash(hash)
     end
 
     #: -> void
     def _init
-      @cache = T.let({}, T.nilable(T::Hash[T.untyped, T.untyped]))
-      @features_with_metadata = T.let(nil, T.nilable(T::Hash[String, OptionsMetadata]))
+      @cache = {} #: Hash[untyped, untyped]?
+      @features_with_metadata = nil #: Hash[String, OptionsMetadata]?
     end
 
     NOT_FOUND_IN_CACHE_SENTINEL = Object.new
@@ -93,28 +92,31 @@ module Optify
       end
 
       init unless @cache
-      feature_names = get_canonical_feature_names(feature_names) unless preferences&.skip_feature_name_conversion
 
-      cache_key = [key, feature_names, preferences&.constraints_json, config_class]
-      result = @cache&.fetch(cache_key, NOT_FOUND_IN_CACHE_SENTINEL)
+      if preferences.nil?
+        feature_names = get_filtered_features(feature_names, GetOptionsPreferences.new)
+      elsif !preferences.skip_feature_name_conversion || preferences.constraints_json
+        feature_names = get_filtered_features(feature_names, preferences)
+      end
+
+      # Features are filtered, so we don't need the constraints in the cache key.
+      cache_key = [key, feature_names, config_class]
+      result = @cache #: as !nil
+               .fetch(cache_key, NOT_FOUND_IN_CACHE_SENTINEL)
       return result unless result.equal?(NOT_FOUND_IN_CACHE_SENTINEL)
 
       # Handle a cache miss.
 
-      # We can avoid converting the features names because they're already converted, if that was desired.
-      if preferences.nil?
-        preferences = GetOptionsPreferences.new
-        preferences.skip_feature_name_conversion = true
-      else
-        # Indeed the copying of preferences could be wasteful, but this only happens on a cache miss
-        # and when no custom preferences are provided.
-        preferences = preferences.dup
-        preferences.skip_feature_name_conversion = true
-      end
+      # We can avoid converting the features names because they're already converted from filtering above, if that was desired.
+      # We don't need the constraints because we filtered the features above.
+      # We already know there are no overrides because we checked above.
+      preferences = GetOptionsPreferences.new
+      preferences.skip_feature_name_conversion = true
 
       result = get_options(key, feature_names, config_class, nil, preferences)
 
-      T.must(@cache)[cache_key] = result
+      @cache #: as !nil
+        .[]= cache_key, result
     end
   end
 end

data/lib/optify_ruby/watcher_implementation.rb

@@ -33,7 +33,7 @@ module Optify
     #: -> OptionsWatcher
     def init
       _init
-      @cache_creation_time = T.let(Time.now, T.nilable(Time))
+      @cache_creation_time = Time.now #: Time?
       self
     end
 

data/rbi/optify.rbi

@@ -183,6 +183,18 @@ module Optify
     sig { params(canonical_feature_name: String).returns(T.nilable(OptionsMetadata)) }
     def get_feature_metadata(canonical_feature_name); end
 
+    # Filters `feature_names` based on the preferences,
+    # such as the `preferences`'s constraints.
+    # Also converts the feature names to canonical feature names if `preferences.skip_feature_name_conversion` is `false`.
+    sig do
+      params(
+        feature_names: T::Array[String],
+        preferences: GetOptionsPreferences
+      )
+        .returns(T::Array[String])
+    end
+    def get_filtered_features(feature_names, preferences); end
+
     # Fetches options based on the provided key and feature names.
     #
     # @param key The key to fetch options for.

data/sig/optify.rbs

@@ -142,6 +142,8 @@ module Optify::ProviderModule
   # @return The metadata for the feature.
   def get_feature_metadata: (String canonical_feature_name) -> OptionsMetadata?
 
+  def get_filtered_features: (::Array[String] feature_names, GetOptionsPreferences preferences) -> ::Array[String]
+
   def get_options: [Config] (String key, ::Array[String] feature_names, T::Class[Config] config_class, ?CacheOptions? cache_options, ?Optify::GetOptionsPreferences? preferences) -> Config
 
   # Fetches options in JSON format based on the provided key and feature names.

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: optify-config
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.16.1
 platform: arm64-darwin
 authors:
 - Justin D. Harris
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-09-03 00:00:00.000000000 Z
+date: 2025-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.12477
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.12477
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +62,22 @@ dependencies:
   name: sorbet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.12477
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.12477
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: tapioca
   requirement: !ruby/object:Gem::Requirement