puppet 4.8.2-universal-darwin → 4.9.0-universal-darwin

data/lib/puppet/plugins/data_providers/data_provider.rb

@@ -1,25 +1,37 @@
 require 'puppet/pops/lookup/interpolation'
 
+# TODO: API 5.0, remove this module
+# @api private
+# @deprecated
 module Puppet::Plugins::DataProviders
-  # @api private
+  # @deprecated
   module DataProvider
+    include Puppet::Pops::Lookup::DataProvider
     include Puppet::Pops::Lookup::Interpolation
 
-    # Performs a lookup with an endless recursion check.
-    #
-    # @param key [String] The key to lookup
-    # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
-    # @param merge [String|Hash<String,Object>|nil] Merge strategy or hash with strategy and options
-    def lookup(name, lookup_invocation, merge)
-      lookup_invocation.check(name) { unchecked_lookup(name, lookup_invocation, merge) }
+    def key_lookup(key, lookup_invocation, merge)
+      lookup(key.to_s, lookup_invocation, merge)
+    end
+
+    def unchecked_key_lookup(key, lookup_invocation, merge)
+      unchecked_lookup(key.to_s, lookup_invocation, merge)
+    end
+
+    # @deprecated
+    def lookup(key, lookup_invocation, merge)
+      lookup_invocation.check(key) { unchecked_lookup(key, lookup_invocation, merge) }
     end
 
     # Performs a lookup with the assumption that a recursive check has been made.
     #
     # @param key [String] The key to lookup
     # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
-    # @param merge [String|Hash<String,Object>|nil] Merge strategy or hash with strategy and options
+    # @param merge [String|Hash{String => Object}] Merge strategy or hash with strategy and options
     def unchecked_lookup(key, lookup_invocation, merge)
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'DataProvider#unchecked_lookup',
+          'DataProvider#unchecked_lookup is deprecated and will be removed in the next major version of Puppet')
+      end
       segments = split_key(key)
       root_key = segments.shift
       lookup_invocation.with(:data_provider, self) do
@@ -41,6 +53,7 @@ module Puppet::Plugins::DataProviders
     # @param value [Object] The value to perform post processing on
     # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
     # @return [Object] The result of post processing the value.
+    # @deprecated
     def post_process(value, lookup_invocation)
       interpolate(value, lookup_invocation, true)
     end
@@ -56,10 +69,15 @@ module Puppet::Plugins::DataProviders
     # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
     # @param merge [String|Hash<String,Object>|nil] Merge strategy or hash with strategy and options
     # @return [Hash] The data hash for the given _key_
+    # @deprecated
     def data(data_key, lookup_invocation)
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'DataProvider#data',
+          'DataProvider#data is deprecated and will be removed in the next major version of Puppet')
+      end
       compiler = lookup_invocation.scope.compiler
       adapter = Puppet::DataProviders::DataAdapter.get(compiler) || Puppet::DataProviders::DataAdapter.adapt(compiler)
-      adapter.data[data_key] ||= validate_data(initialize_data(data_key, lookup_invocation), data_key)
+      adapter.data[data_key] ||= validate_data(initialize_data(data_key, lookup_invocation))
     end
     protected :data
 
@@ -67,7 +85,12 @@ module Puppet::Plugins::DataProviders
     #
     # @param key [String] The key to lookup
     # @return [String,nil] The data key or nil if not applicable
+    # @deprecated
     def data_key(key, lookup_invocation)
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'DataProvider#data_key',
+          'DataProvider#data_key is deprecated and will be removed in the next major version of Puppet')
+      end
       nil
     end
 
@@ -76,7 +99,12 @@ module Puppet::Plugins::DataProviders
     # @param data_key [String] The data key such as the name of a module or the constant 'environment'
     # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
     # @return [Hash] The hash of values
+    # @deprecated
     def initialize_data(data_key, lookup_invocation)
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'DataProvider#initialize_data',
+          'DataProvider#initialize_data is deprecated and will be removed in the next major version of Puppet')
+      end
       {}
     end
     protected :initialize_data
@@ -86,23 +114,38 @@ module Puppet::Plugins::DataProviders
       cname[cname.rindex(':')+1..-1]
     end
 
+    # @deprecated
     def validate_data(data, data_key)
       data
     end
   end
 
+  # TODO: API 5.0 Remove this class
+  # @deprecated
   # @api private
   class ModuleDataProvider
-    LOOKUP_OPTIONS = Puppet::Pops::Lookup::LOOKUP_OPTIONS
+    LOOKUP_OPTIONS = 'lookup_options'.freeze
     include DataProvider
 
+    attr_reader :module_name
+
+    def initialize(module_name = nil)
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'Plugins::DataProviders::ModuleDataProvider',
+          'Plugins::DataProviders::ModuleDataProvider is deprecated and will be removed in the next major version of Puppet')
+      end
+      @module_name = module_name || Puppet::Pops::Lookup::Invocation.current.module_name
+    end
+
     # Retrieve the first segment of the qualified name _key_. This method will throw
     # :no_such_key unless the segment can be extracted.
     #
     # @param key [String] The key
     # @return [String] The first segment of the given key
+    # @api private
+    # @deprecated
     def data_key(key, lookup_invocation)
-      return lookup_invocation.module_name if key == LOOKUP_OPTIONS
+      return module_name if key == LOOKUP_OPTIONS
       qual_index = key.index('::')
       throw :no_such_key if qual_index.nil?
       key[0..qual_index-1]
@@ -132,10 +175,21 @@ module Puppet::Plugins::DataProviders
     end
   end
 
+  # TODO: API 5.0 Remove this class
+  # @deprecated
   # @api private
   class EnvironmentDataProvider
     include DataProvider
 
+    def initialize
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'Plugins::DataProviders::EnvironmentDataProvider',
+          'Plugins::DataProviders::EnvironmentDataProvider is deprecated and will be removed in the next major version of Puppet')
+      end
+    end
+
+    # @api private
+    # @deprecated
     def data_key(key, lookup_invocation)
       'environment'
     end
@@ -145,11 +199,13 @@ module Puppet::Plugins::DataProviders
   # the fully resolved path, and whether or the resolved path exists.
   #
   # @api private
+  # @deprecated
   class ResolvedPath
     attr_reader :original_path, :path
 
     # @param original_path [String] path as found in declaration. May contain interpolation expressions
     # @param path [Pathname] the expanded absolute path
+    # @deprecated
     def initialize(original_path, path)
       @original_path = original_path
       @path = path
@@ -157,11 +213,12 @@ module Puppet::Plugins::DataProviders
     end
 
     # @return [Boolean] cached info if the path exists or not
-    # @api public
+    # @deprecated
     def exists?
       @exists = @path.exist? if @exists.nil?
       @exists
     end
+    alias exist? exists?
   end
 
   # A data provider that is initialized with a set of _paths_. When performing lookup, each
@@ -170,6 +227,7 @@ module Puppet::Plugins::DataProviders
   #
   # @abstract
   # @api private
+  # @deprecated
   class PathBasedDataProvider
     include DataProvider
 
@@ -178,7 +236,12 @@ module Puppet::Plugins::DataProviders
     # @param name [String] The name of the data provider
     # @param paths [Array<ResolvedPath>] Paths used by this provider
     # @param parent_data_provider [DataProvider] The data provider that is the container of this data provider
+    # @deprecated
     def initialize(name, paths, parent_data_provider = nil)
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'PathBasedDataProvider',
+          'PathBasedDataProvider is deprecated and will be removed in the next major version of Puppet')
+      end
       @name = name
       @paths = paths
       @parent_data_provider = parent_data_provider
@@ -196,6 +259,7 @@ module Puppet::Plugins::DataProviders
     # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
     # @param merge [String|Hash<String,Object>|nil] Merge strategy or hash with strategy and options
     # @return [Hash] The data hash for the given _key_
+    # @deprecated
     def load_data(path, data_key, lookup_invocation)
       compiler = lookup_invocation.scope.compiler
       adapter = Puppet::DataProviders::DataAdapter.get(compiler) || Puppet::DataProviders::DataAdapter.adapt(compiler)
@@ -203,6 +267,7 @@ module Puppet::Plugins::DataProviders
     end
     protected :data
 
+    # @deprecated
     def validate_data(data, module_name)
       @parent_data_provider.nil? ? data : @parent_data_provider.validate_data(data, module_name)
     end
@@ -213,6 +278,7 @@ module Puppet::Plugins::DataProviders
     # @param key [String] The key to lookup
     # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
     # @param merge [Puppet::Pops::MergeStrategy,String,Hash<String,Object>,nil] Merge strategy or hash with strategy and options
+    # @deprecated
     def unchecked_lookup(key, lookup_invocation, merge)
       segments = split_key(key)
       root_key = segments.shift
@@ -222,7 +288,7 @@ module Puppet::Plugins::DataProviders
         merge_strategy = Puppet::Pops::MergeStrategy.strategy(merge)
         lookup_invocation.with(:merge, merge_strategy) do
           merged_result = merge_strategy.merge_lookup(@paths) do |path|
-            lookup_invocation.with(:path, path) do
+            lookup_invocation.with(:location, path) do
               if path.exists?
                 hash = load_data(path.path, module_name, lookup_invocation)
                 value = hash[root_key]
@@ -234,7 +300,7 @@ module Puppet::Plugins::DataProviders
                   throw :no_such_key
                 end
               else
-                lookup_invocation.report_path_not_found
+                lookup_invocation.report_location_not_found
                 throw :no_such_key
               end
             end
@@ -245,17 +311,28 @@ module Puppet::Plugins::DataProviders
     end
   end
 
+  # TODO: API 5.0 Remove this class
   # Factory for creating path based data providers
   #
   # @abstract
   # @api private
+  # @deprecated
   class PathBasedDataProviderFactory
+    # @deprecated
+    def initialize
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'PathBasedDataProviderFactory',
+        'PathBasedDataProviderFactory is deprecated and will be removed in the next major version of Puppet')
+      end
+    end
+
     # Create a path based data provider with the given _name_ and _paths_
     #
     # @param name [String] the name of the created provider (for logging and debugging)
     # @param paths [Array<String>] array of resolved paths
     # @param parent_data_provider [DataProvider] The data provider that is the container of this data provider
     # @return [DataProvider] The created data provider
+    # @deprecated
     def create(name, paths, parent_data_provider)
       raise NotImplementedError, "Subclass of PathBasedDataProviderFactory must implement 'create' method"
     end
@@ -271,6 +348,7 @@ module Puppet::Plugins::DataProviders
     # @param paths [Array<String>] paths that have been preprocessed (interpolations resolved)
     # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
     # @return [Array<ResolvedPath>] Array of resolved paths
+    # @deprecated
     def resolve_paths(datadir, declared_paths, paths, lookup_invocation)
       []
     end
@@ -283,30 +361,43 @@ module Puppet::Plugins::DataProviders
     end
   end
 
+  # TODO: API 5.0 Remove this class
   # Factory for creating file based data providers. This is an extension of the path based
   # factory where it is required that each resolved path appoints an existing file in the local
   # file system.
   #
   # @abstract
   # @api private
+  # @deprecated
   class FileBasedDataProviderFactory < PathBasedDataProviderFactory
+    # @deprecated
+    def initialize
+      unless Puppet[:strict] == :off
+        Puppet.warn_once(:deprecation, 'FileBasedDataProviderFactory',
+          'FileBasedDataProviderFactory is deprecated and will be removed in the next major version of Puppet')
+      end
+    end
+
     # @param datadir [Pathname] The base when creating absolute paths
     # @param declared_paths [Array<String>] paths as found in declaration. May contain interpolation expressions
     # @param paths [Array<String>] paths that have been preprocessed (interpolations resolved)
     # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] The current lookup invocation
-    # @return [Array<ResolvedPath>] Array of resolved paths
+    # @return [Array<Puppet::DataProviders::ResolvedLocation>] Array of resolved paths
+    # @deprecated
     def resolve_paths(datadir, declared_paths, paths, lookup_invocation)
       resolved_paths = []
       unless paths.nil? || datadir.nil?
         ext = path_extension
         paths.each_with_index do |path, idx|
           path = path + ext unless path.end_with?(ext)
-          resolved_paths << ResolvedPath.new(declared_paths[idx], datadir + path)
+          path = datadir + path
+          resolved_paths << Puppet::Pops::Lookup::ResolvedLocation.new(declared_paths[idx], path, path.exist?)
         end
       end
       resolved_paths
     end
 
+    # @deprecated
     def path_extension
       raise NotImplementedError, "Subclass of FileBasedProviderFactory must implement 'path_extension' method"
     end

data/lib/puppet/plugins/data_providers/registry.rb

@@ -1,4 +1,6 @@
+# TODO: API 5.0, remove this module
 # @api private
+# @deprecated
 module Puppet::Plugins::DataProviders
   class Registry
     def self.register_extensions(extensions)
@@ -38,47 +40,11 @@ module Puppet::Plugins::DataProviders
         to_instance(ENV_DATA_PROVIDERS_TYPE)
       end
 
-      default_bindings.bind do
-        name('function')
-        in_multibind(ENV_DATA_PROVIDERS_KEY)
-        to_instance('Puppet::DataProviders::FunctionEnvDataProvider')
-      end
-
-      default_bindings.bind do
-        name('hiera')
-        in_multibind(ENV_DATA_PROVIDERS_KEY)
-        to_instance('Puppet::DataProviders::HieraEnvDataProvider')
-      end
-
       default_bindings.bind do
         name('none')
         in_multibind(MODULE_DATA_PROVIDERS_KEY)
         to_instance(MODULE_DATA_PROVIDERS_TYPE)
       end
-
-      default_bindings.bind do
-        name('function')
-        in_multibind(MODULE_DATA_PROVIDERS_KEY)
-        to_instance('Puppet::DataProviders::FunctionModuleDataProvider')
-      end
-
-      default_bindings.bind do
-        name('hiera')
-        in_multibind(MODULE_DATA_PROVIDERS_KEY)
-        to_instance('Puppet::DataProviders::HieraModuleDataProvider')
-      end
-
-      default_bindings.bind do
-        name('json')
-        in_multibind(PATH_BASED_DATA_PROVIDER_FACTORIES_KEY)
-        to_instance('Puppet::DataProviders::JsonDataProviderFactory')
-      end
-
-      default_bindings.bind do
-        name('yaml')
-        in_multibind(PATH_BASED_DATA_PROVIDER_FACTORIES_KEY)
-        to_instance('Puppet::DataProviders::YamlDataProviderFactory')
-      end
     end
   end
 end

data/lib/puppet/plugins/data_providers.rb

@@ -1,6 +1,8 @@
 module Puppet::Plugins; end
 
+# TODO: API 5.0, remove this module
 # @api private
+# @deprecated
 module Puppet::Plugins::DataProviders
 
   # The lookup **key** for the multibind containing data provider name per module

data/lib/puppet/pops/adaptable.rb

@@ -176,9 +176,6 @@ module Adaptable
       adapter
     end
 
-    DOUBLE_COLON = '::'
-    USCORE = '_'
-
     # Returns a suitable instance variable name given a class name.
     # The returned string is the fully qualified name of a class with '::' replaced by '_' since
     # '::' is not allowed in an instance variable name.

data/lib/puppet/pops/binder/producers.rb

@@ -722,7 +722,7 @@ module Producers
       end
 
       if uniq || flatten || conflict_resolution.to_s == 'append'
-        etype = binding.type.element_type
+        etype = binding.type.value_type
         unless etype.class == Types::PDataType || etype.is_a?(Types::PArrayType)
           detail = []
           detail << ":uniq" if uniq
@@ -818,10 +818,10 @@ module Producers
         raise ArgumentError, "Entry contributing to multibind hash with id '#{binding.id}' must have a name."
       end
 
-      unless tc.instance?(binding.type.element_type, value)
+      unless tc.instance?(binding.type.value_type, value)
         raise ArgumentError, ["Type Error: value contribution to #{binding.name}['#{key}'] ",
           "is incompatible, ",
-          type_error_detail(binding.type.element_type, value)].join()
+          type_error_detail(binding.type.value_type, value)].join()
       end
     end
   end

data/lib/puppet/pops/evaluator/access_operator.rb

@@ -158,7 +158,7 @@ class AccessOperator
 
   def access_PSemVerType(o, scope, keys)
     keys.flatten!
-    assert_keys(keys, o, 1, Float::INFINITY, String, Semantic::VersionRange)
+    assert_keys(keys, o, 1, Float::INFINITY, String, SemanticPuppet::VersionRange)
     Types::TypeFactory.sem_ver(*keys)
   end
 
@@ -284,7 +284,7 @@ class AccessOperator
       type = keys[0]
       unless type.is_a?(Types::PAnyType)
         if type.is_a?(String)
-          type = Types::TypeFactory.string(nil, type)
+          type = Types::TypeFactory.string(type)
         else
           fail(Issues::BAD_TYPE_SLICE_TYPE, @semantic.keys[0], {:base_type => 'Optional-Type', :actual => type.class})
         end
@@ -335,7 +335,7 @@ class AccessOperator
       type = keys[0]
       case type
       when String
-        type = Types::TypeFactory.string(nil, type)
+        type = Types::TypeFactory.string(type)
       when Types::PAnyType
         type = nil if type.class == Types::PAnyType
       else
@@ -460,7 +460,7 @@ class AccessOperator
       fail(Issues::BAD_TYPE_SLICE_ARITY, @semantic,
         {:base_type => 'Collection-Type', :min => 1, :max => 2, :actual => keys.size})
     end
-    Types::PCollectionType.new(nil, size_t)
+    Types::PCollectionType.new(size_t)
   end
 
   # An Array can create a new Array type. It is not possible to create a collection of Array types.

data/lib/puppet/pops/evaluator/closure.rb

@@ -311,7 +311,7 @@ class Closure < CallableSignature
 
     parameters.each do |param|
       arg_type, param_range = create_param_type(param, closure_scope)
-      key_type = type_factory.string(nil, param.name.to_s)
+      key_type = type_factory.string(param.name.to_s)
       key_type = type_factory.optional(key_type) unless param.value.nil?
       members[key_type] = arg_type
     end

data/lib/puppet/pops/evaluator/compare_operator.rb

@@ -103,7 +103,7 @@ class CompareOperator
   end
 
   def cmp_Version(a, b)
-    raise ArgumentError.new('Versions not comparable to non Versions') unless b.is_a?(Semantic::Version)
+    raise ArgumentError.new('Versions not comparable to non Versions') unless b.is_a?(SemanticPuppet::Version)
     a <=> b
   end
 
@@ -172,7 +172,7 @@ class CompareOperator
       # Always set match data, a "not found" should not keep old match data visible
       set_match_data(matched, scope) # creates ephemeral
       return !!matched
-    when String, Semantic::Version
+    when String, SemanticPuppet::Version
       a.any? { |element| match(b, element, scope) }
     when Types::PAnyType
       a.each {|element| return true if b.instance?(element) }
@@ -206,11 +206,11 @@ class CompareOperator
 
   # Matches against semvers and strings
   def match_Version(version, left, scope)
-    if left.is_a?(Semantic::Version)
+    if left.is_a?(SemanticPuppet::Version)
       version == left
     elsif left.is_a? String
       begin
-        version == Semantic::Version.parse(left)
+        version == SemanticPuppet::Version.parse(left)
       rescue ArgumentError
         false
       end

data/lib/puppet/pops/evaluator/evaluator_impl.rb

@@ -570,7 +570,7 @@ class EvaluatorImpl
       return o.operator == :'=~' ? !!matched : !matched
     end
 
-    if pattern.is_a?(Semantic::VersionRange)
+    if pattern.is_a?(SemanticPuppet::VersionRange)
       # evaluate if range includes version
       matched = Types::PSemVerRangeType.include?(pattern, left)
       return o.operator == :'=~' ? matched : !matched

data/lib/puppet/pops/issues.rb

@@ -619,6 +619,10 @@ module Issues
     "The key '#{key}' is declared more than once"
   end
 
+  DUPLICATE_DEFAULT = issue :DUPLICATE_DEFAULT, :container do
+    "This #{label.label(container)} already has a 'default' entry - this is a duplicate"
+  end
+
   RESERVED_PARAMETER = hard_issue :RESERVED_PARAMETER, :container, :param_name do
     "The parameter $#{param_name} redefines a built in parameter in #{label.the(container)}"
   end

data/lib/puppet/pops/label_provider.rb

@@ -40,6 +40,20 @@ module Puppet::Pops::LabelProvider
     count == 1 ? text : "#{text}s"
   end
 
+  # Combines several strings using commas and a final conjunction
+  def combine_strings(strings, conjunction = 'or')
+    case strings.size
+    when 0
+      ''
+    when 1
+      strings[0]
+    when 2
+      "#{strings[0]} #{conjunction} #{strings[1]}"
+    else
+      "#{strings[0...-1].join(', ')}, #{conjunction} #{strings.last}"
+    end
+  end
+
   # Produces an *indefinite article* (a/an) for the given text ('a' if
   # it starts with a vowel) This is obviously flawed in the general
   # sense as may labels have punctuation at the start and this method

data/lib/puppet/pops/loader/loader_paths.rb

@@ -109,7 +109,9 @@ module Puppet::Pops::Loader::LoaderPaths
     def effective_path(typed_name, start_index_in_name)
       # Puppet name to path always skips the name-space as that is part of the generic path
       # i.e. <module>/mymodule/functions/foo.pp is the function mymodule::foo
-      "#{File.join(generic_path, typed_name.name_parts[ 1..-1 ])}.pp"
+      parts = typed_name.name_parts
+      parts = parts[start_index_in_name..-1] if parts.size > 1
+      "#{File.join(generic_path, parts)}.pp"
     end
   end
 

data/lib/puppet/pops/loader/module_loaders.rb

@@ -21,6 +21,8 @@ module Loader
 # @api private
 #
 module ModuleLoaders
+  ENVIRONMENT = 'environment'.freeze
+
   def self.system_loader_from(parent_loader, loaders)
     # Puppet system may be installed in a fixed location via RPM, installed as a Gem, via source etc.
     # The only way to find this across the different ways puppet can be installed is
@@ -37,6 +39,15 @@ module ModuleLoaders
                                                        )
   end
 
+  def self.environment_loader_from(parent_loader, loaders, env_path)
+    ModuleLoaders::FileBased.new(parent_loader,
+      loaders,
+      ENVIRONMENT,
+      File.join(env_path, 'lib'),
+      ENVIRONMENT
+    )
+  end
+
   def self.module_loader_from(parent_loader, loaders, module_name, module_path)
     ModuleLoaders::FileBased.new(parent_loader,
                                                        loaders,
@@ -107,7 +118,6 @@ module ModuleLoaders
       return nil unless typed_name.name_authority == Pcore::RUNTIME_NAME_AUTHORITY
 
       # Assume it is a global name, and that all parts of the name should be used when looking up
-      name_part_index = 0
       name_parts = typed_name.name_parts
 
       # Certain types and names can be disqualified up front
@@ -119,10 +129,6 @@ module ModuleLoaders
         # ok since such a "module" cannot have namespaced content).
         #
         return nil unless name_parts[0] == module_name
-
-        # Skip the first part of the name when computing the path since the path already contains the name of the
-        # module
-        name_part_index = 1
       else
         # The name is in the global name space.
 
@@ -144,7 +150,7 @@ module ModuleLoaders
       # Find the file to instantiate, and instantiate the entity if file is found
       origin = nil
       if (smart_path = smart_paths.effective_paths(typed_name.type).find do |sp|
-          origin = sp.effective_path(typed_name, name_part_index)
+          origin = sp.effective_path(typed_name, global? ? 0 : 1)
           existing_path(origin)
         end)
         value = smart_path.instantiator.create(self, typed_name, origin, get_contents(origin))
@@ -200,12 +206,20 @@ module ModuleLoaders
       raise NotImplementedError.new
     end
 
+    # Answers the question if this loader represents a global component (true for resource type loader and environment loader)
+    #
+    # @return [Boolean] `true` if this loader represents a global component
+    #
+    def global?
+      module_name.nil? || module_name == ENVIRONMENT
+    end
+
     # Produces the private loader for the module. If this module is not already resolved, this will trigger resolution
     #
     def private_loader
       # The system loader has a nil module_name and it does not have a private_loader as there are no functions
       # that can only by called by puppet runtime - if so, it acts as the private loader directly.
-      @private_loader ||= (module_name.nil? || module_name == 'environment' ? self : @loaders.private_loader_for_module(module_name))
+      @private_loader ||= (global? ? self : @loaders.private_loader_for_module(module_name))
     end
   end
 

data/lib/puppet/pops/loader/typed_name.rb

@@ -4,8 +4,6 @@ module Loader
 #
 # @api public
 class TypedName
-  DOUBLE_COLON = '::'.freeze
-
   attr_reader :hash
   attr_reader :type
   attr_reader :name_authority