puppet 4.5.3-x64-mingw32 → 4.6.1-x64-mingw32

data/lib/puppet/pops/types/p_runtime_type.rb

@@ -5,6 +5,19 @@ module Types
 class PRuntimeType < PAnyType
   TYPE_NAME_OR_PATTERN = PVariantType.new([PStringType::NON_EMPTY, PTupleType.new([PRegexpType::DEFAULT, PStringType::NON_EMPTY])])
 
+  def self.register_ptype(loader, ir)
+    create_ptype(loader, ir, 'AnyType',
+      'runtime' => {
+        KEY_TYPE => POptionalType.new(PStringType::NON_EMPTY),
+        KEY_VALUE => nil
+      },
+      'name_or_pattern' => {
+        KEY_TYPE => POptionalType.new(TYPE_NAME_OR_PATTERN),
+        KEY_VALUE => nil
+      }
+    )
+  end
+
   attr_reader :runtime, :name_or_pattern
 
   # Creates a new instance of a Runtime type

data/lib/puppet/pops/types/p_sem_ver_range_type.rb

@@ -5,6 +5,10 @@ module Types
 #
 # @api public
 class PSemVerRangeType < PScalarType
+  def self.register_ptype(loader, ir)
+    create_ptype(loader, ir, 'ScalarType')
+  end
+
   # Check if a version is included in a version range. The version can be a string or
   # a `Semantic::SemVer`
   #
@@ -28,6 +32,25 @@ class PSemVerRangeType < PScalarType
     end
   end
 
+  # Creates a {Semantic::VersionRange} from the given _version_range_ argument. If the argument is `nil` or
+  # a {Semantic::VersionRange}, it is returned. If it is a {String}, it will be parsed into a
+  # {Semantic::VersionRange}. Any other class will raise an {ArgumentError}.
+  #
+  # @param version_range [Semantic::VersionRange,String,nil] the version range to convert
+  # @return [Semantic::VersionRange] the converted version range
+  # @raise [ArgumentError] when the argument cannot be converted into a version range
+  #
+  def self.convert(version_range)
+    case version_range
+    when nil, Semantic::VersionRange
+      version_range
+    when String
+      Semantic::VersionRange.parse(version_range)
+    else
+      raise ArgumentError, "Unable to convert a #{version_range.class.name} to a SemVerRange"
+    end
+  end
+
   # Checks if range _a_ is a sub-range of (i.e. completely covered by) range _b_
   # @param a [Semantic::VersionRange] the first range
   # @param b [Semantic::VersionRange] the second range

data/lib/puppet/pops/types/p_sem_ver_type.rb

@@ -6,9 +6,18 @@ module Types
 #
 # @api public
 class PSemVerType < PScalarType
+  def self.register_ptype(loader, ir)
+    create_ptype(loader, ir, 'ScalarType',
+       'ranges' => {
+         KEY_TYPE => PArrayType.new(PVariantType.new([PSemVerRangeType::DEFAULT,PStringType::NON_EMPTY])),
+         KEY_VALUE => []
+       }
+    )
+  end
+
   attr_reader :ranges
 
-  def initialize(*ranges)
+  def initialize(ranges)
     ranges = ranges.map { |range| range.is_a?(Semantic::VersionRange) ? range : Semantic::VersionRange.parse(range) }
     ranges = merge_ranges(ranges) if ranges.size > 1
     @ranges = ranges
@@ -26,6 +35,25 @@ class PSemVerType < PScalarType
     super ^ @ranges.hash
   end
 
+  # Creates a SemVer version from the given _version_ argument. If the argument is `nil` or
+  # a {Semantic::Version}, it is returned. If it is a {String}, it will be parsed into a
+  # {Semantic::Version}. Any other class will raise an {ArgumentError}.
+  #
+  # @param version [Semantic::Version,String,nil] the version to convert
+  # @return [Semantic::Version] the converted version
+  # @raise [ArgumentError] when the argument cannot be converted into a version
+  #
+  def self.convert(version)
+    case version
+    when nil, Semantic::Version
+      version
+    when String
+      Semantic::Version.parse(version)
+    else
+      raise ArgumentError, "Unable to convert a #{version.class.name} to a SemVer"
+    end
+  end
+
   # @api private
   def self.new_function(_, loader)
     @@new_function ||= Puppet::Functions.create_loaded_function(:new_Version, loader) do
@@ -72,7 +100,7 @@ class PSemVerType < PScalarType
     end
   end
 
-  DEFAULT = PSemVerType.new
+  DEFAULT = PSemVerType.new(EMPTY_ARRAY)
 
   protected
 

data/lib/puppet/pops/types/p_sensitive_type.rb

@@ -0,0 +1,69 @@
+module Puppet::Pops
+module Types
+
+# A Puppet Language type that wraps sensitive information. The sensitive type is parameterized by
+# the wrapped value type.
+#
+#
+# @api public
+class PSensitiveType < Puppet::Pops::Types::PTypeWithContainedType
+
+  class Sensitive
+    def initialize(value)
+      @value = value
+    end
+
+    def unwrap
+      @value
+    end
+
+    def to_s
+      "Sensitive [value redacted]"
+    end
+
+    def inspect
+      "#<#{to_s}>"
+    end
+  end
+
+  def initialize(type = nil)
+    @type = type.nil? ? PAnyType.new : type.generalize
+  end
+
+  def instance?(o, guard = nil)
+    o.is_a?(Sensitive) && @type.instance?(o.unwrap, guard)
+  end
+
+  def self.new_function(_, loader)
+    @new_function ||= Puppet::Functions.create_loaded_function(:new_Sensitive, loader) do
+
+      dispatch :from_sensitive do
+        param 'Sensitive', :value
+      end
+
+      dispatch :from_any do
+        param 'Any', :value
+      end
+
+      def from_any(value)
+        Sensitive.new(value)
+      end
+
+      # Since the Sensitive value is immutable we can reuse the existing instance instead of making a copy.
+      def from_sensitive(value)
+        value
+      end
+    end
+  end
+
+  private
+
+  def _assignable?(o, guard)
+    self.class == o.class && @type.assignable?(o.type, guard)
+  end
+
+  DEFAULT = PSensitiveType.new
+end
+
+end
+end

data/lib/puppet/pops/types/p_type_set_type.rb

@@ -0,0 +1,361 @@
+module Puppet::Pops
+module Types
+
+KEY_NAME_AUTHORITY = 'name_authority'.freeze
+KEY_TYPES = 'types'.freeze
+KEY_ALIAS = 'alias'.freeze
+KEY_VERSION = 'version'.freeze
+KEY_VERSION_RANGE = 'version_range'.freeze
+KEY_REFERENCES = 'references'.freeze
+
+class PTypeSetType < PMetaType
+
+  # A Loader that makes the types known to the TypeSet visible
+  #
+  # @api private
+  class TypeSetLoader < Loader::BaseLoader
+    def initialize(type_set, parent)
+      super(parent, "(TypeSetFirstLoader '#{type_set.name}')")
+      @type_set = type_set
+    end
+
+    def name_authority
+      @type_set.name_authority
+    end
+
+    def find(typed_name)
+      if typed_name.type == :type && typed_name.name_authority == @type_set.name_authority
+        type = @type_set[typed_name.name]
+        return set_entry(typed_name, type) unless type.nil?
+      end
+      nil
+    end
+  end
+
+  TYPE_STRING_OR_VERSION = TypeFactory.variant(PStringType::NON_EMPTY, TypeFactory.sem_ver)
+  TYPE_STRING_OR_RANGE = TypeFactory.variant(PStringType::NON_EMPTY, TypeFactory.sem_ver_range)
+
+  TYPE_TYPE_REFERENCE_I12N = TypeFactory.struct({
+    KEY_NAME => Pcore::TYPE_QUALIFIED_REFERENCE,
+    KEY_VERSION_RANGE => TYPE_STRING_OR_RANGE,
+    TypeFactory.optional(KEY_NAME_AUTHORITY) => Pcore::TYPE_URI,
+    TypeFactory.optional(KEY_ANNOTATIONS) => TYPE_ANNOTATIONS
+  })
+
+  TYPE_TYPESET_I12N = TypeFactory.struct({
+    TypeFactory.optional(Pcore::KEY_PCORE_URI) => Pcore::TYPE_URI,
+    Pcore::KEY_PCORE_VERSION => TYPE_STRING_OR_VERSION,
+    TypeFactory.optional(KEY_NAME_AUTHORITY) => Pcore::TYPE_URI,
+    TypeFactory.optional(KEY_NAME) => Pcore::TYPE_QUALIFIED_REFERENCE,
+    KEY_VERSION => TYPE_STRING_OR_VERSION,
+    TypeFactory.optional(KEY_TYPES) => TypeFactory.hash_kv(Pcore::TYPE_SIMPLE_TYPE_NAME, PType::DEFAULT, PCollectionType::NOT_EMPTY_SIZE),
+    TypeFactory.optional(KEY_REFERENCES) => TypeFactory.hash_kv(Pcore::TYPE_SIMPLE_TYPE_NAME, TYPE_TYPE_REFERENCE_I12N, PCollectionType::NOT_EMPTY_SIZE),
+    TypeFactory.optional(KEY_ANNOTATIONS) => TYPE_ANNOTATIONS,
+  })
+
+
+  attr_reader :pcore_uri
+  attr_reader :pcore_version
+  attr_reader :name_authority
+  attr_reader :name
+  attr_reader :version
+  attr_reader :types
+  attr_reader :references
+  attr_reader :annotations
+
+  # Initialize a TypeSet Type instance. The initialization will use either a name and an initialization
+  # hash expression, or a fully resolved initialization hash.
+  #
+  # @overload initialize(name, i12n_hash_expression)
+  #   Used when the TypeSet type is loaded using a type alias expression. When that happens, it is important that
+  #   the actual resolution of the expression is deferred until all definitions have been made known to the current
+  #   loader. The package will then be resolved when it is loaded by the {TypeParser}. "resolved" here, means that
+  #   the hash expression is fully resolved, and then passed to the {#initialize_from_hash} method.
+  #   @param name [String] The name of the type set
+  #   @param i12n_hash_expression [Model::LiteralHash] The hash describing the TypeSet features
+  #   @param name_authority [String] The default name authority for the type set
+  #
+  # @overload initialize(i12n_hash)
+  #   Used when the package is created by the {TypeFactory}. The i12n_hash must be fully resolved.
+  #   @param i12n_hash [Hash{String=>Object}] The hash describing the TypeSet features
+  #
+  # @api private
+  def initialize(name_or_i12n_hash, i12n_hash_expression = nil, name_authority = nil)
+    @types = EMPTY_HASH
+    @references = EMPTY_HASH
+
+    if name_or_i12n_hash.is_a?(Hash)
+      initialize_from_hash(name_or_i12n_hash)
+    else
+      # Creation using "type XXX = TypeSet[{}]". This means that the name is given
+      @name = TypeAsserter.assert_instance_of('TypeSet name', Pcore::TYPE_QUALIFIED_REFERENCE, name_or_i12n_hash)
+      @name_authority = TypeAsserter.assert_instance_of('TypeSet name_authority', Pcore::TYPE_URI, name_authority, true)
+      @i12n_hash_expression = i12n_hash_expression
+    end
+  end
+
+  # @api private
+  def initialize_from_hash(i12n_hash)
+    TypeAsserter.assert_instance_of('TypeSet initializer', TYPE_TYPESET_I12N, i12n_hash)
+
+    # Name given to the loader have higher precedence than a name declared in the type
+    @name ||= i12n_hash[KEY_NAME].freeze
+    @name_authority ||= i12n_hash[KEY_NAME_AUTHORITY].freeze
+
+    @pcore_version = PSemVerType.convert(i12n_hash[Pcore::KEY_PCORE_VERSION]).freeze
+    unless Pcore::PARSABLE_PCORE_VERSIONS.include?(@pcore_version)
+      raise ArgumentError,
+        "The pcore version for TypeSet '#{@name}' is not understood by this runtime. Expected range #{Pcore::PARSABLE_PCORE_VERSIONS}, got #{@pcore_version}"
+    end
+
+    @pcore_uri = i12n_hash[Pcore::KEY_PCORE_URI].freeze
+    @version = PSemVerType.convert(i12n_hash[KEY_VERSION])
+    @types = i12n_hash[KEY_TYPES] || EMPTY_HASH
+    @types.freeze
+
+    # Map downcase names to their camel-cased equivalent
+    @dc_to_cc_map = {}
+    @types.keys.each { |key| @dc_to_cc_map[key.downcase] = key }
+
+    refs = i12n_hash[KEY_REFERENCES]
+    if refs.nil?
+      @references = EMPTY_HASH
+    else
+      ref_map = {}
+      root_map = Hash.new { |h, k| h[k] = {} }
+      refs.each do |ref_alias, ref|
+        ref = TypeSetReference.new(self, ref)
+
+        # Protect against importing the exact same name_authority/name combination twice if the version ranges intersect
+        ref_name = ref.name
+        ref_na = ref.name_authority || @name_authority
+        na_roots = root_map[ref_na]
+
+        ranges = na_roots[ref_name]
+        if ranges.nil?
+          na_roots[ref_name] = [ref.version_range]
+        else
+          unless ranges.all? { |range| (range & ref.version_range).nil? }
+            raise ArgumentError, "TypeSet '#{@name}' references TypeSet '#{ref_na}/#{ref_name}' more than once using overlapping version ranges"
+          end
+          ranges << ref.version_range
+        end
+
+        if ref_map.has_key?(ref_alias)
+          raise ArgumentError, "TypeSet '#{@name}' references a TypeSet using alias '#{ref_alias}' more than once"
+        end
+        if @types.has_key?(ref_alias)
+          raise ArgumentError, "TypeSet '#{@name}' references a TypeSet using alias '#{ref_alias}'. The alias collides with the name of a declared type"
+        end
+        ref_map[ref_alias] = ref
+
+        @dc_to_cc_map[ref_alias.downcase] = ref_alias
+        ref_map[ref_alias] = ref
+      end
+      @references = ref_map.freeze
+    end
+    @dc_to_cc_map.freeze
+    init_annotatable(i12n_hash)
+  end
+
+  # Produce a hash suitable for the initializer
+  # @return [Hash{String => Object}] the initialization hash
+  #
+  # @api private
+  def i12n_hash
+    result = super()
+    result[Pcore::KEY_PCORE_URI] = @pcore_uri unless @pcore_uri.nil?
+    result[Pcore::KEY_PCORE_VERSION] =  @pcore_version.to_s
+    result[KEY_NAME_AUTHORITY] = @name_authority unless @name_authority.nil?
+    result[KEY_NAME] = @name
+    result[KEY_VERSION] = @version.to_s
+    result[KEY_TYPES] = @types unless @types.empty?
+    result[KEY_REFERENCES] = Hash[@references.map { |ref_alias, ref| [ref_alias, ref.i12n_hash] }] unless @references.empty?
+    result
+  end
+
+  # Resolve a type in this type set using a qualified name. The resolved type may either be a type defined in this type set
+  # or a type defined in a type set that is referenced by this type set (nesting may occur to any level).
+  # The name resolution is case insensitive.
+  #
+  # @param qname [String] the qualified name of the type to resolve
+  # @return [PAnyType,nil] the resolved type, or `nil` in case no type could be found
+  #
+  # @api public
+  def [](qname)
+    type = @types[qname] || @types[@dc_to_cc_map[qname.downcase]]
+    if type.nil? && !@references.empty?
+      segments = qname.split(TypeFormatter::NAME_SEGMENT_SEPARATOR)
+      first = segments[0]
+      type_set_ref = @references[first] || @references[@dc_to_cc_map[first.downcase]]
+      if type_set_ref.nil?
+        nil
+      else
+        type_set = type_set_ref.type_set
+        case segments.size
+        when 1
+          type_set
+        when 2
+          type_set[segments[1]]
+        else
+          segments.shift
+          type_set[segments.join(TypeFormatter::NAME_SEGMENT_SEPARATOR)]
+        end
+      end
+    else
+      type
+    end
+  end
+
+  def defines_type?(t)
+    !@types.key(t).nil?
+  end
+
+  # Returns the name by which the given type is referenced from within this type set
+  # @param t [PAnyType]
+  # @return [String] the name by which the type is referenced within this type set
+  #
+  # @api private
+  def name_for(t)
+    key = @types.key(t)
+    if key.nil?
+      qname = t.name
+      if @references.empty?
+        qname
+      else
+        segments = qname.split(TypeFormatter::NAME_SEGMENT_SEPARATOR)
+        first = segments[0]
+        type_set = @references[first]
+        if type_set.nil?
+          qname
+        else
+          if segments.size == 1
+            qname
+          else
+            sub_name = type_set.name_for(t)
+            sub_name = "#{first}::#{sub_name}" unless sub_name == qname
+            sub_name
+          end
+        end
+      end
+    else
+      key
+    end
+  end
+
+  def accept(visitor, guard)
+    super
+    @types.each_value { |type| type.accept(visitor, guard) }
+    @references.each_value { |ref| ref.accept(visitor, guard) }
+  end
+
+  # @api private
+  def label
+    "TypeSet '#{@name}'"
+  end
+
+  # @api private
+  def resolve(type_parser, loader)
+    super
+    @references.each_value { |ref| ref.resolve(type_parser, loader) }
+    tsa_loader = TypeSetLoader.new(self, loader)
+    @types.values.each { |type| type.resolve(type_parser, tsa_loader) }
+    self
+  end
+
+  # @api private
+  def resolve_literal_hash(type_parser, loader, i12n_hash_expression)
+    result = {}
+    i12n_hash_expression.entries.each do |entry|
+      key = type_parser.interpret_any(entry.key, loader)
+      if (key == KEY_TYPES || key == KEY_REFERENCES) && entry.value.is_a?(Model::LiteralHash)
+        # Skip type parser interpretation and convert qualified references directly to String keys.
+        hash = {}
+        entry.value.entries.each do |he|
+          kex = he.key
+          name = kex.is_a?(Model::QualifiedReference) ? kex.cased_value : type_parser.interpret_any(kex, loader)
+          hash[name] = key == KEY_TYPES ? he.value : type_parser.interpret_any(he.value, loader)
+        end
+        result[key] = hash
+      else
+        result[key] = type_parser.interpret_any(entry.value, loader)
+      end
+    end
+
+    name_auth = resolve_name_authority(result, loader)
+
+    types = result[KEY_TYPES]
+    if types.is_a?(Hash)
+      types.each do |type_name, value|
+        full_name = "#{@name}::#{type_name}".freeze
+        typed_name = Loader::TypedName.new(:type, full_name.downcase, name_auth)
+        type = Loader::TypeDefinitionInstantiator.create_type(full_name, value, name_auth)
+        loader.set_entry(typed_name, type, Adapters::SourcePosAdapter.adapt(value).to_uri)
+        types[type_name] = type
+      end
+    end
+    result
+  end
+
+  # @api private
+  def resolve_hash(type_parser, loader, i12n_hash)
+    result = Hash[i12n_hash.map do |key, value|
+      key = resolve_type_refs(type_parser, loader, key)
+      value = resolve_type_refs(type_parser, loader, value) unless key == KEY_TYPES && value.is_a?(Hash)
+      [key, value]
+    end]
+    name_auth = resolve_name_authority(result, loader)
+    types = result[KEY_TYPES]
+    if types.is_a?(Hash)
+      types.each do |type_name, value|
+        full_name = "#{@name}::#{type_name}".freeze
+        typed_name = Loader::TypedName.new(:type, full_name.downcase, name_auth)
+        meta_name = value.is_a?(Hash) ? 'Object' : 'TypeAlias'
+        type = Loader::TypeDefinitionInstantiator.create_named_type(full_name, meta_name, value, name_auth)
+        loader.set_entry(typed_name, type)
+        types[type_name] = type
+      end
+    end
+    result
+  end
+
+  def hash
+    @name_authority.hash ^ @name.hash ^ @version.hash
+  end
+
+  def eql?(o)
+    self.class == o.class && @name_authority == o.name_authority && @name == o.name && @version == o.version
+  end
+
+  DEFAULT = self.new({
+    KEY_NAME => 'DefaultTypeSet',
+    KEY_NAME_AUTHORITY => Pcore::RUNTIME_NAME_AUTHORITY,
+    Pcore::KEY_PCORE_URI => Pcore::PCORE_URI,
+    Pcore::KEY_PCORE_VERSION => Pcore::PCORE_VERSION,
+    KEY_VERSION => Semantic::Version.new(0,0,0)
+  })
+
+  protected
+
+  # @api_private
+  def _assignable?(o, guard)
+    self.class == o.class && (self == DEFAULT || eql?(o))
+  end
+
+  private
+
+  def resolve_name_authority(i12n_hash, loader)
+    name_auth = @name_authority
+    if name_auth.nil?
+      name_auth = i12n_hash[KEY_NAME_AUTHORITY]
+      name_auth = loader.name_authority if name_auth.nil? && loader.is_a?(TypeSetLoader)
+      if name_auth.nil?
+        name = @name || i12n_hash[KEY_NAME]
+        raise ArgumentError, "No 'name_authority' is declared in TypeSet '#{name}' and it cannot be inferred"
+      end
+    end
+    name_auth
+  end
+end
+end
+end