ann-flavor-flutter 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57c1bc278619e03093217b10da943867c6451ec3f7a9aa5bb1467a4237e23e3
-  data.tar.gz: 0ba8e70d266810c144431767937f454ea91d20f5d05360a83ed53c92a1b4b688
+  metadata.gz: 2884061122825135d9f07bb18db889d23509649848aca1fca2c45b63b9b8c3bd
+  data.tar.gz: 5ed44c51bcf6c29195763aaa2615f4bb59b71a5b0908f26fdbc83677419273a4
 SHA512:
-  metadata.gz: e4e38b858c0b17060676cd37fe24af154fa01bf9defe1bb104e92e5d4290e26da0eb62a05ff58bbf77145b30054238a1d81ab27f4d8e7891ec6c9796095dd65b
-  data.tar.gz: 8db5bae8d0e7688a68fe7ed319211cc25d8135c80dbf2e6255c14d5c845bf43568481e94241bf6fe51fbcf615c2f6f8309802aa66464653d0d4f1199ac730b72
+  metadata.gz: 8635f03da486e2aa4da6a7c9ed423d76260624ff5710a58c4a174951ecf2922bd874e4ff197edcb551db650ae7ef3fc76725d4f58935a076785f0c3f203e3a81
+  data.tar.gz: 0e5a13e1e4c03ddf24b31bb7b7c07fd330934213601b7a373408fdb051b8cfb2bb0bf298a9ad254df1ede039315b4871f6b2ff44a90818c7574a7361f2f197b6

data/.gitignore

@@ -1,2 +1,7 @@
 /pkg/
 Gemfile.lock
+
+# Vendored ann_flavor_core source, generated transiently during publish (DEF-058).
+# Never committed for real — CI/`make publish-fastlane` `git add -f` it briefly
+# so `gem build`'s `git ls-files`-based file list includes it, then discard it.
+/lib/vendor/

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.4.6
+
+### Fixed
+- Loading this gem (`require 'ann_flavor_flutter'` / `require 'fastlane/plugin/ann_flavor_flutter'`) failed with `cannot load such file -- ann_flavor_core` — the 0.4.5 core-delegation change added a hard `require 'ann_flavor_core'` in `utils_spec_loader.rb`, but `ann_flavor_core` is intentionally never published to RubyGems (ADR-008). The published gem now vendors `ann_flavor_core`'s source and resolves it automatically; local monorepo development is unaffected. ([#58](https://github.com/anntech-dev/ann-flavor-tooling/issues/58))
+
+## 0.4.5
+
+### Changed
+- `YamlSpecLoader` and `PodspecBridge` now delegate `annspec.yaml` parsing and resolution to the shared `ann-flavor-core-ruby` gem ([ADR-008](../../docs/02-decisions/008-core-delegation-mandate.md)).
+
+### Fixed
+- Fixed a `service_account` cascade bug where a flavor's or default's top-level Firebase `service_account` override was never consulted — only the two build-type-specific levels were checked.
+- `PodspecBridge#bundle_id` no longer hardcodes the release build type's bundle ID regardless of the actual build type; debug/profile builds now resolve their own correct bundle ID.
+
 ## 0.4.4
 
 ### Fixed

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "ann-flavor-core", path: "../../core/ann-flavor-core-ruby"

data/lib/ann_flavor_flutter/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorFlutter
-  VERSION = "0.4.4"
+  VERSION = "0.4.6"
 end

data/lib/ann_flavor_flutter.rb

@@ -1,5 +1,13 @@
 # This file is loaded by require 'annai-flutter-flavor'
 
+# The published gem vendors ann_flavor_core's source under lib/vendor/ (ADR-008:
+# ann_flavor_core is never published to RubyGems, only path/git dependencies).
+# In the monorepo this directory doesn't exist, and ann_flavor_core resolves via
+# the real gem installed by the local Gemfile's `path:` dependency instead.
+vendored_core_lib = File.expand_path('vendor/ann_flavor_core/lib', __dir__)
+$LOAD_PATH.unshift(vendored_core_lib) if File.directory?(vendored_core_lib) &&
+                                          !$LOAD_PATH.include?(vendored_core_lib)
+
 # Load the version (Good Practice)
 require 'ann_flavor_flutter/version'
 

data/lib/fastlane/plugin/ann_flavor_flutter/helper/podspec_bridge.rb

@@ -118,7 +118,7 @@ module FastlaneFlutterFlavor
     end
 
     def bundle_id
-      @loader.get_package_id(@platform, @flavor)
+      @loader.get_package_id(@platform, @flavor, @build_type)
     end
 
     def version_name

data/lib/fastlane/plugin/ann_flavor_flutter/helper/utils_spec_loader.rb

@@ -1,39 +1,37 @@
 require 'yaml'
 require 'fileutils'
 require 'fastlane/action'
+require 'ann_flavor_core'
 
 module FastlaneFlutterFlavor
 
   class YamlSpecLoader
 
+    STANDARD_BUILD_TYPES = %w[debug release profile].freeze
+
     # Initialize the loader with the project root folder context and load the spec file.
     def initialize(root_folder, file_path)
       @root_folder = root_folder
       @file_path = file_path # The file path, potentially overridden by ENV outside this class
 
       # Load the file content immediately and store it
-      @spec_data = load_file
+      @spec = load_file
     end
 
-    # Loads and parses the raw YAML spec file using the instance file path.
-    # @return [Hash, nil] The parsed YAML data, or nil on error.
+    # Loads and parses annspec.yaml via the shared core (ADR-008) — the single
+    # source of truth for parsing, cascade merging, and resolution.
+    # @return [AnnFlavorCore::AnnSpec, nil] The parsed spec, or nil on error.
     def load_file
       begin
         # Ensure the file path is resolved relative to the project root
         full_path = File.expand_path(@file_path, @root_folder)
         Fastlane::UI.verbose("Reading Annai spec from: #{full_path}")
 
-        # Use safe_load to prevent arbitrary code execution from YAML files
-        yaml_content = YAML.safe_load(File.read(full_path), aliases: true)
-
-        # Ensure the content is a Hash before returning
-        unless yaml_content.is_a?(Hash)
-          raise "YAML content must be a top-level Hash."
-        end
+        spec = AnnFlavorCore::Parser.parse_file(full_path)
 
-        check_removed_firebase_fields(yaml_content)
+        check_removed_firebase_fields(spec)
 
-        return yaml_content
+        return spec
       rescue Fastlane::Shell::ShellError => e
         raise e
       rescue => e
@@ -44,9 +42,13 @@ module FastlaneFlutterFlavor
     end
 
     # Raises UI.user_error! if firebase_app_id or build_target are present in any iOS firebase block.
-    # Both fields were removed — they are derived automatically now.
-    def check_removed_firebase_fields(spec_data)
-      ios_app = spec_data.dig('app', 'ios')
+    # Both fields were removed — they are derived automatically now. The core's model has no fields
+    # for them at all, so this reads the raw YAML directly (a narrow, deliberate exception to
+    # delegation — it is a migration guard, not spec parsing/merging/resolution, per ADR-008).
+    def check_removed_firebase_fields(spec)
+      full_path = File.expand_path(@file_path, @root_folder)
+      raw = YAML.safe_load(File.read(full_path), aliases: true) || {}
+      ios_app = raw.dig('app', 'ios')
       return unless ios_app.is_a?(Hash)
 
       sections = {}
@@ -82,263 +84,199 @@ module FastlaneFlutterFlavor
       end
     end
 
-    # Recursively merges defaults into a flavor's data.
-    # This function prioritizes 'current_data' (the flavor-specific value).
-    # If a key is present in 'default_data' but missing in 'current_data',
-    # the default value is used.
-    #
-    # @param current_data [Object] The flavor-specific data (Hash or scalar).
-    # @param default_data [Object] The default data to merge (Hash or scalar).
-    # @return [Object] The merged data.
-    def deep_merge_defaults(current_data, default_data)
-
-      # FIX: If current_data is a scalar, it means the flavor explicitly set this value.
-      # It overrides the default, so we return it immediately.
-      return current_data unless current_data.is_a?(Hash)
-
-      # Base case 2: If default_data is not a hash, there's nothing left to merge deeply.
-      return current_data unless default_data.is_a?(Hash)
-
-      # Recursive case: Both are hashes, perform the merge
-      default_data.each do |key, default_value|
-        current_value = current_data[key]
-
-        if current_data.key?(key)
-          # Key exists in flavor (current_data), recursively merge
-          current_data[key] = deep_merge_defaults(current_value, default_value)
-        else
-          # The key is missing in the current flavor data. Use the default value.
-          current_data[key] = default_value
-        end
-      end
-
-      return current_data
-    end
-
     def enabled?
-      return false unless @spec_data
-      @spec_data.fetch('enabled', true) != false
+      return false unless @spec
+      @spec.enabled != false
     end
 
-    # Retrieves the configuration for a specific flavor, merged with the platform defaults.
-    # This function uses the spec data loaded into the instance variable @spec_data.
-    #
-    # @param platform [Symbol] The target platform (:ios or :android).
-    # @param flavor_name [String] The name of the flavor (e.g., 'dev', 'staging').
-    # @return [Hash, nil] The fully merged configuration for the flavor, or nil if missing.
-    def get_merged_flavor_config(platform, flavor_name)
-      return nil unless @spec_data && enabled?
-
-      platform_key = platform.to_s
-      flavor_key = flavor_name.to_s
-
-      # 1. Extract platform data from instance spec data
-      platform_data = @spec_data.dig('app', platform_key)
-      unless platform_data.is_a?(Hash)
-        Fastlane::UI.verbose("Annai spec missing 'app' or platform '#{platform_key}'.")
-        return nil
-      end
+    # Returns the [flavor, defaults] structs for a platform, or nil if the
+    # platform/flavor cannot be resolved.
+    def platform_flavor_and_defaults(platform, flavor_name)
+      return nil unless @spec && enabled?
 
-      # 2. Extract specific flavor data and defaults
-      flavor_data = platform_data.dig('flavor', flavor_key)
-      default_data = platform_data.dig('default')
+      platform_data = platform_for(@spec, platform)
+      return nil if platform_data.nil?
 
-      # If flavor data is missing entirely, and we can't merge, return nil
-      if flavor_data.nil? && default_data.nil?
-        Fastlane::UI.verbose("Flavor '#{flavor_key}' and platform default config are missing for platform '#{platform_key}'.")
-        return nil
-      end
+      flavor = platform_data.flavors[flavor_name.to_s]
+      return nil if flavor.nil? && platform_data.default.nil?
+
+      [flavor, platform_data.default]
+    end
 
-      # 3. Deep merge the flavor data (current) over the default data (base)
-      current_config = flavor_data || {}
+    def platform_for(spec, platform)
+      case platform.to_s
+      when 'android' then spec.app&.android
+      when 'ios'      then spec.app&.ios
+      when 'web'      then spec.app&.web
+      when 'windows'  then spec.app&.windows
+      end
+    end
 
-      # Perform the merge operation. We clone current_config to avoid modifying the original spec hash.
-      merged_config = deep_merge_defaults(current_config.dup, default_data || {})
+    # Resolves a flavor against a build type via the core resolver. Returns nil
+    # when the platform/flavor cannot be resolved.
+    def resolve(platform, flavor_name, build_type)
+      pair = platform_flavor_and_defaults(platform, flavor_name)
+      return nil if pair.nil?
+
+      flavor, defaults = pair
+      flavor ||= empty_flavor_for(platform)
+      defaults ||= empty_defaults_for(platform)
+
+      case platform.to_s
+      when 'android' then AnnFlavorCore::Resolver.resolve_android_flavor(flavor, defaults, build_type.to_s)
+      when 'ios'      then AnnFlavorCore::Resolver.resolve_ios_flavor(flavor, defaults, build_type.to_s)
+      when 'web'      then AnnFlavorCore::Resolver.resolve_web_flavor(flavor, defaults, build_type.to_s)
+      when 'windows'  then AnnFlavorCore::Resolver.resolve_windows_flavor(flavor, defaults, build_type.to_s)
+      end
+    end
 
-      # Add the flavor name itself for consistency in the returned config hash
-      merged_config['flavor'] = flavor_key
+    def empty_flavor_for(platform)
+      case platform.to_s
+      when 'android' then AnnFlavorCore::AndroidFlavor.defaults
+      when 'ios'      then AnnFlavorCore::IosFlavor.defaults
+      when 'web'      then AnnFlavorCore::WebFlavor.defaults
+      when 'windows'  then AnnFlavorCore::WindowsFlavor.defaults
+      end
+    end
 
-      return merged_config
+    def empty_defaults_for(platform)
+      case platform.to_s
+      when 'android' then AnnFlavorCore::AndroidDefault.defaults
+      when 'ios'      then AnnFlavorCore::IosDefault.defaults
+      when 'web'      then AnnFlavorCore::WebDefault.defaults
+      when 'windows'  then AnnFlavorCore::WindowsDefault.defaults
+      end
     end
 
     # --- GETTER WRAPPERS ---
 
     # Retrieves the hash of all defined flavors for a given platform.
-    # Uses the instance spec data.
-    #
     # @param platform [Symbol] The target platform (:ios or :android).
-    # @return [Hash] A hash where keys are flavor names (String) and values are their raw configs (Hash).
+    # @return [Hash] flavor name => core flavor struct. Callers only rely on
+    #   .empty? and .keys, so the struct-valued Hash is a compatible superset
+    #   of the previous raw-Hash-valued return.
     def get_platform_flavors(platform)
-      return {} unless @spec_data && enabled?
-      platform_key = platform.to_s
-
-      # Use dig to safely retrieve the flavors hash from @spec_data
-      flavors = @spec_data.dig('app', platform_key, 'flavor')
+      return {} unless @spec && enabled?
+      platform_data = platform_for(@spec, platform)
+      return {} if platform_data.nil?
 
-      # Return the flavors hash, or an empty hash if no flavors are defined
-      return flavors.is_a?(Hash) ? flavors : {}
+      platform_data.flavors
     end
 
     # @return [String, nil] The flavor name (just for consistency with other getters).
     def get_flavor_name(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      config.dig('flavor') if config
+      pair = platform_flavor_and_defaults(platform, flavor_name)
+      pair ? flavor_name.to_s : nil
     end
 
-    # @return [String, nil] The merged package ID (bundle ID or application ID).
-    # It combines 'id' and 'id_suffix' (if present) via direct concatenation.
-    # NOTE: It is assumed that the 'id_suffix' defined in the configuration
-    def get_package_id(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      return nil unless config
-
-      base_id = config.dig('id')
-      return nil unless base_id
-
-      # Check for an optional suffix
-      suffix = config.dig('id_suffix')
-
-      # If a suffix is present, combine it directly with the base ID.
-      # This relies on the suffix string itself containing the correct separator (like ".")
-      # to correctly form the final package ID (e.g., "com.base" + ".dev" -> "com.base.dev").
-      if suffix && !suffix.empty?
-        return base_id + suffix
-      else
-        # Return the base ID if no suffix is present.
-        return base_id
-      end
+    # @return [String, nil] The merged package ID (bundle ID or application ID)
+    #   for the given build type. Was previously hardcoded to 'release'
+    #   regardless of the caller's actual build — corrected via plan-030
+    #   Phase 6 / REQ-CDEL-00070 (PodspecBridge#bundle_id now threads its real
+    #   @build_type through instead of relying on this default).
+    def get_package_id(platform, flavor_name, build_type = 'release')
+      resolved = resolve(platform, flavor_name, build_type)
+      resolved&.effective_id
     end
 
     # @return [String, nil] The merged app name.
-    # It combines 'name' and 'name_suffix' (if present) via direct concatenation.
-    # NOTE: It is assumed that the 'name_suffix' defined in the configuration
     def get_display_name(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      return nil unless config
-
-      base_name = config.dig('name')
-      return nil unless base_name
-
-      # Check for an optional suffix
-      suffix = config.dig('name_suffix')
-
-      # If a suffix is present, combine it directly with the base Name.
-      # This relies on the suffix string itself containing the correct separator
-      # to correctly form the final Name (e.g., "Test" + " App" -> "Test App").
-      if suffix && !suffix.empty?
-        return base_name + suffix
-      else
-        # Return the base Name if no suffix is present.
-        return base_name
-      end
+      resolved = resolve(platform, flavor_name, 'release')
+      resolved&.effective_name
     end
 
     # @return [String, nil] The merged version name.
     def get_version_name(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      return nil unless config
-
-      config.dig('version_name')
+      resolved = resolve(platform, flavor_name, 'release')
+      resolved&.effective_version_name
     end
 
     # @return [String, nil] The path to the version_code.
     def get_version_code(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      if config
-        version_code_value = config.dig('version_code').to_s.strip
-        return version_code_value.to_i(10).to_s
-      end
-      return nil
+      resolved = resolve(platform, flavor_name, 'release')
+      return nil unless resolved
+      resolved.effective_version_code.to_i.to_s
     end
 
     # @return [String, nil] The path to the main Dart file.
     def get_main_file(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      config.dig('main_file') if config
+      resolved = resolve(platform, flavor_name, 'release')
+      resolved&.effective_main_file
     end
 
     # @return [String, nil] The Google Play update priority for the flavor.
     def get_priority(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      config.dig('stores', 'google_play', 'priority') if config
+      pair = platform_flavor_and_defaults(platform, flavor_name)
+      return nil unless pair
+      flavor, = pair
+      flavor&.stores&.google_play&.priority
     end
 
     # @return [String, nil] The Apple ID (numeric) for the flavor from App Store stores config.
     def get_apple_id(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      config.dig('stores', 'app_store', 'apple_id') if config
+      pair = platform_flavor_and_defaults(platform, flavor_name)
+      return nil unless pair
+      flavor, = pair
+      flavor&.stores&.app_store&.apple_id
     end
 
     # @return [String, nil] The API key path (platform-level credential for uploading to the store).
     def get_api_key_path(platform, flavor_name)
-      return nil unless @spec_data
-
-      platform_key = platform.to_s
-      case platform
-      when :android
-        @spec_data.dig('app', platform_key, 'default', 'credentials', 'google_play', 'api_key')
-      when :ios
-        @spec_data.dig('app', platform_key, 'default', 'credentials', 'app_store', 'api_key')
-      else
-        nil
+      return nil unless @spec
+
+      platform_data = platform_for(@spec, platform)
+      return nil unless platform_data
+
+      case platform.to_s
+      when 'android'
+        platform_data.default&.credentials&.google_play&.api_key
+      when 'ios'
+        platform_data.default&.credentials&.app_store&.api_key
       end
     end
 
     # @return [String, nil] The export options plist path (inside default.credentials.app_store).
     def get_export_option_file(platform, flavor_name)
-      return nil unless @spec_data
-
-      platform_key = platform.to_s
-      case platform
-      when :ios
-        @spec_data.dig('app', platform_key, 'default', 'credentials', 'app_store', 'export_options_plist')
-      else
-        nil
-      end
+      return nil unless @spec
+      return nil unless platform.to_s == 'ios'
+
+      ios = @spec.app&.ios
+      ios&.default&.credentials&.app_store&.export_options_plist
     end
 
     # @return [String, nil] The Apple Team ID for the flavor (flavor-level credentials override, falls back to default).
     def get_team_id(platform, flavor_name)
-      return nil unless @spec_data
-
-      platform_key = platform.to_s
-      case platform
-      when :ios
-        # Flavor-level credentials.signing.team_id takes precedence
-        config = get_merged_flavor_config(platform, flavor_name)
-        flavor_team_id = config&.dig('credentials', 'signing', 'team_id')
-        return flavor_team_id if flavor_team_id && !flavor_team_id.empty?
-        # Fall back to default credentials.signing.team_id
-        @spec_data.dig('app', platform_key, 'default', 'credentials', 'signing', 'team_id')
-      else
-        nil
-      end
+      return nil unless @spec
+      return nil unless platform.to_s == 'ios'
+
+      ios = @spec.app&.ios
+      return nil unless ios
+
+      flavor_team_id = ios.flavors[flavor_name.to_s]&.credentials&.signing&.team_id
+      return flavor_team_id if flavor_team_id && !flavor_team_id.empty?
+
+      ios.default&.credentials&.signing&.team_id
     end
 
     # @return [String, nil] The Firebase Project ID.
     def get_firebase_project_id(platform, flavor_name, build_config)
-      # 1. Get the merged configuration for the specific flavor
-      config = get_merged_flavor_config(platform, flavor_name)
-
-      config.dig('build_types', build_config, 'firebase', 'project_id') if config
+      resolved = resolve(platform, flavor_name, build_config)
+      resolved&.effective_firebase&.project_id
     end
 
     # Returns the resolved service_account path for the given platform/flavor/build_config,
-    # cascading from flavor build_type → default build_type.
+    # cascading through the core's full 4-level resolution:
+    #   flavor.build_types[bt].firebase.service_account  (most specific)
+    #   flavor.firebase.service_account
+    #   default.build_types[bt].firebase.service_account
+    #   default.firebase.service_account                 (least specific)
+    # Corrected via ADR-008/REQ-CDEL-00060 — the pre-delegation implementation only
+    # checked the first and third levels, silently skipping the flavor-top-level and
+    # default-top-level fallbacks.
     # @return [String, nil]
     def get_service_account(platform, flavor_name, build_config)
-      return nil unless @spec_data
-
-      platform_data = @spec_data.dig('app', platform)
-      return nil unless platform_data
-
-      flavor_data   = platform_data.dig('flavor', flavor_name) || {}
-      default_data  = platform_data['default'] || {}
-
-      flavor_bt_sa  = flavor_data.dig('build_types', build_config, 'firebase', 'service_account')
-      default_bt_sa = default_data.dig('build_types', build_config, 'firebase', 'service_account')
-
-      path = flavor_bt_sa || default_bt_sa
+      resolved = resolve(platform, flavor_name, build_config)
+      path = resolved&.effective_firebase&.service_account
       return nil if path.nil? || path.empty?
 
       File.expand_path(path, @root_folder)
@@ -346,68 +284,50 @@ module FastlaneFlutterFlavor
 
     # For AdMob (annai_ads)
     # Returns the full app ID for a specific build type, applying build_types[build_type].id_suffix.
-    # Falls back to get_package_id if no build-type-specific suffix is defined.
     def get_effective_id(platform, flavor_name, build_type)
-      config = get_merged_flavor_config(platform, flavor_name)
-      return nil unless config
-
-      base_id = config.dig('id')
-      return nil unless base_id
-
-      id_suffix = config.dig('id_suffix') || ''
-      bt_id_suffix = config.dig('build_types', build_type.to_s, 'id_suffix') || ''
-      base_id + id_suffix + bt_id_suffix
+      resolved = resolve(platform, flavor_name, build_type)
+      resolved&.effective_id
     end
 
     # Returns the full display name for a specific build type, applying build_types[build_type].name_suffix.
     def get_effective_name(platform, flavor_name, build_type)
-      config = get_merged_flavor_config(platform, flavor_name)
-      return nil unless config
-
-      base_name = config.dig('name')
-      return nil unless base_name
-
-      name_suffix = config.dig('name_suffix') || ''
-      bt_name_suffix = config.dig('build_types', build_type.to_s, 'name_suffix') || ''
-      base_name + name_suffix + bt_name_suffix
+      resolved = resolve(platform, flavor_name, build_type)
+      resolved&.effective_name
     end
 
     def get_gms_ads_id(platform, flavor_name)
-      config = get_merged_flavor_config(platform, flavor_name)
-      config&.dig('admob', 'gms_ads_id') || config&.dig('gms_ads_id')
+      resolved = resolve(platform, flavor_name, 'release')
+      resolved&.effective_gms_ads_id
     end
 
     # Returns the resolved Cloudflare config for a web flavor as a Hash with keys:
     # project_name, account_id, branch, mode — cascaded flavor → default → hardcoded fallback.
-    # project_name is flavor-only (never inherited from default).
     # @return [Hash] Always returns a Hash; values may be nil if not configured.
     def get_cloudflare_config(platform, flavor_name)
-      return {} unless @spec_data
-
-      platform_key = platform.to_s
-      platform_data = @spec_data.dig('app', platform_key)
-      return {} unless platform_data.is_a?(Hash)
+      return {} unless @spec
+      return {} unless platform.to_s == 'web'
 
-      flavor_cf  = platform_data.dig('flavor', flavor_name.to_s, 'cloudflare') || {}
-      default_cf = platform_data.dig('default', 'cloudflare') || {}
+      resolved = resolve(platform, flavor_name, 'release')
+      cf = resolved&.effective_cloudflare
+      return {} unless cf
 
       {
-        'project_name' => flavor_cf['project_name'],
-        'account_id'   => flavor_cf['account_id']   || default_cf['account_id'],
-        'branch'       => flavor_cf['branch']        || default_cf['branch'] || 'main',
-        'mode'         => flavor_cf['mode']          || default_cf['mode']   || 'pages',
+        'project_name' => cf.project_name,
+        'account_id'   => cf.account_id,
+        'branch'       => cf.branch,
+        'mode'         => cf.mode,
       }
     end
 
     # For Google Sign-In (annai_auth)
     def get_auth_client_id(platform, flavor_name, build_config)
-      config = get_merged_flavor_config(platform, flavor_name)
-      config.dig('build_types', build_config, 'auth', 'clientId') if config
+      resolved = resolve(platform, flavor_name, build_config)
+      resolved&.effective_auth&.client_id
     end
 
     def get_auth_reversed_client_id(platform, flavor_name, build_config)
-      config = get_merged_flavor_config(platform, flavor_name)
-      config.dig('build_types', build_config, 'auth', 'reversedClientId') if config
+      resolved = resolve(platform, flavor_name, build_config)
+      resolved&.effective_auth&.reversed_client_id
     end
   end
-end
+end