literal 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9721432521677aa431dda4e94240521a54a8ac21ece07fef009393544d19214d
-  data.tar.gz: c5b41c95f4c24ff4fad28869bf61ff93174118a2d3e5890928961b382bf9b285
+  metadata.gz: 8ee13d939895155fc3ce4ae1717036b565b0a59d7a4e87b50ea0a1390cc40bf3
+  data.tar.gz: 42df47f2efce39eb14976d226645adb7a9dacc681948a71a9254ca44e19d8d1f
 SHA512:
-  metadata.gz: 715a03576aed152e2fd5737236eb227dd98da9f02b421a14722395a3b9992dc667302574490955f0f9d81192dc5f64f793d916b196bc4509244afad5daa8a37b
-  data.tar.gz: 475df2645d537e5c8151ba6431e1469fdcfdd1a80d766489bfa00b135f3c3e57a86b0c09c7e6738c6033609a69864a596660a0b5498bd6762e314588a67bac35
+  metadata.gz: f3a9b286744de95185baea476e8d7387238912aeb7f956eeef4e7b203bd0a55313885baaf6c5e71e27eb6d252961d44f850ede7e09abbc05c323c88a099be6f6
+  data.tar.gz: f2cc33927ce452c94b3146dc7714cd9078cd532da5523afbbae5372ec2a5aa0319460db07525d9d7a5d709deb9ff929b804d0f3a86425f3d4844bf641a5a669b

data/lib/literal/array.rb

@@ -23,7 +23,7 @@ class Literal::Array
 		def >=(other)
 			case other
 			when Literal::Array::Generic
-				@type >= other.type
+				Literal.subtype?(other.type, of: @type)
 			else
 				false
 			end
@@ -256,6 +256,14 @@ class Literal::Array
 		super
 	end
 
+	def hash
+		[self.class, @__value__].hash
+	end
+
+	def include?(...)
+		@__value__.include?(...)
+	end
+
 	alias_method :index, :find_index
 
 	def insert(index, *value)
@@ -389,10 +397,44 @@ class Literal::Array
 		@__value__.one?(...)
 	end
 
+	def pack(...)
+		@__value__.pack(...)
+	end
+
 	def pop(...)
 		@__value__.pop(...)
 	end
 
+	def product(*others, &)
+		if block_given?
+			@__value__.product(
+				*others.map do |other|
+					case other
+					when Array
+						other
+					when Literal::Array
+						other.__value__
+					end
+				end, &
+			)
+
+			self
+		elsif others.all?(Literal::Array)
+			tuple_type = Literal::Tuple(
+				@__type__,
+				*others.map(&:__type__)
+			)
+
+			values = @__value__.product(*others.map(&:__value__)).map do |tuple_values|
+				tuple_type.new(*tuple_values)
+			end
+
+			Literal::Array(tuple_type).new(*values)
+		else
+			@__value__.product(*others)
+		end
+	end
+
 	def push(*value)
 		Literal.check(actual: value, expected: _Array(@__type__)) do |c|
 			c.fill_receiver(receiver: self, method: "#push")
@@ -434,6 +476,17 @@ class Literal::Array
 		self
 	end
 
+	alias_method :initialize_copy, :replace
+
+	def rotate(...)
+		__with__(@__value__.rotate(...))
+	end
+
+	def rotate!(...)
+		@__value__.rotate!(...)
+		self
+	end
+
 	def sample(...)
 		@__value__.sample(...)
 	end
@@ -450,6 +503,15 @@ class Literal::Array
 		@__value__.shift(...)
 	end
 
+	def shuffle(...)
+		__with__(@__value__.shuffle(...))
+	end
+
+	def shuffle!(...)
+		@__value__.shuffle!(...)
+		self
+	end
+
 	def size(...)
 		@__value__.size(...)
 	end
@@ -463,6 +525,10 @@ class Literal::Array
 		self
 	end
 
+	def take(...)
+		__with__(@__value__.take(...))
+	end
+
 	def to_a
 		@__value__.dup
 	end

data/lib/literal/data.rb

@@ -9,17 +9,11 @@ class Literal::Data < Literal::DataStructure
 		def literal_properties
 			return @literal_properties if defined?(@literal_properties)
 
-			if superclass.is_a?(Literal::Data)
+			if superclass < Literal::Data
 				@literal_properties = superclass.literal_properties.dup
 			else
 				@literal_properties = Literal::Properties::DataSchema.new
 			end
 		end
-
-		private
-
-		def __literal_property_class__
-			Literal::DataProperty
-		end
 	end
 end

data/lib/literal/enum.rb

@@ -77,6 +77,9 @@ class Literal::Enum
 			object = const_get(name)
 
 			if self === object
+				if @values.key?(object.value)
+					raise ArgumentError.new("The value #{object.value} is already used by #{@values[object.value].name}.")
+				end
 				object.instance_variable_set(:@name, name)
 				@values[object.value] = object
 				@members << object
@@ -155,8 +158,12 @@ class Literal::Enum
 			method(:coerce).to_proc
 		end
 
-		def to_h(*args)
-			@values.dup
+		def to_h(&)
+			if block_given?
+				@members.to_h(&)
+			else
+				@members.to_h { |it| [it, it.value] }
+			end
 		end
 	end
 

data/lib/literal/property.rb

@@ -157,7 +157,7 @@ class Literal::Property
 
 	def generate_initializer_handle_property(buffer = +"")
 		buffer << "  # " << @name.name << "\n" <<
-			"  property = __properties__[:" << @name.name << "]\n"
+			"  __property__ = __properties__[:" << @name.name << "]\n"
 
 		if @kind == :keyword && ruby_keyword?
 			generate_initializer_escape_keyword(buffer)
@@ -191,7 +191,7 @@ class Literal::Property
 	def generate_initializer_coerce_property(buffer = +"")
 		buffer <<
 			escaped_name <<
-			"= property.coerce(" <<
+			"= __property__.coerce(" <<
 			escaped_name <<
 			", context: self)\n"
 	end
@@ -204,12 +204,12 @@ class Literal::Property
 			escaped_name <<
 			"\n    " <<
 			escaped_name <<
-			" = property.default_value\n  end\n"
+			" = __property__.default_value\n  end\n"
 	end
 
 	def generate_initializer_check_type(buffer = +"")
 		buffer <<
-			"  property.check_initializer(self, " << escaped_name << ")\n"
+			"  __property__.check_initializer(self, " << escaped_name << ")\n"
 	end
 
 	def generate_initializer_assign_value(buffer = +"")

data/lib/literal/tuple.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class Literal::Tuple
+	class Generic
+		include Literal::Type
+
+		def initialize(*types)
+			@types = types
+		end
+
+		attr_reader :types
+
+		def ===(other)
+			return false unless Literal::Tuple === other
+			types = @types
+			other_types = other.__types__
+
+			return false unless types.size == other_types.size
+
+			i, len = 0, types.size
+			while i < len
+				return false unless Literal.subtype?(other_types[i], of: types[i])
+				i += 1
+			end
+
+			true
+		end
+
+		def >=(other)
+			case other
+			when Literal::Tuple::Generic
+				types = @types
+				other_types = other.types
+
+				return false unless types.size == other_types.size
+
+				i, len = 0, types.size
+				while i < len
+					return false unless Literal.subtype?(other_types[i], of: types[i])
+					i += 1
+				end
+
+				true
+			else
+				false
+			end
+		end
+
+		def new(*values)
+			Literal::Tuple.new(values, @types)
+		end
+	end
+
+	def initialize(values, types)
+		@__values__ = values
+		@__types__ = types
+	end
+
+	attr_reader :__values__, :__types__
+end

data/lib/literal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Literal
-	VERSION = "1.3.0"
+	VERSION = "1.4.0"
 end

data/lib/literal.rb

@@ -22,6 +22,7 @@ module Literal
 	autoload :Struct, "literal/struct"
 	autoload :Type, "literal/type"
 	autoload :Types, "literal/types"
+	autoload :Tuple, "literal/tuple"
 
 	# Errors
 	autoload :Error, "literal/errors/error"
@@ -48,6 +49,10 @@ module Literal
 		Literal::Hash::Generic.new(key_type, value_type)
 	end
 
+	def self.Tuple(*types)
+		Literal::Tuple::Generic.new(*types)
+	end
+
 	def self.check(actual:, expected:)
 		if expected === actual
 			true

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: literal
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies: []
-description: A literal Ruby gem.
+description: Enums, properties, generics, structured objects and runtime type checking.
 email:
 - joel@drapper.me
 executables: []
@@ -22,7 +22,6 @@ files:
 - lib/literal.rb
 - lib/literal/array.rb
 - lib/literal/data.rb
-- lib/literal/data_property.rb
 - lib/literal/data_structure.rb
 - lib/literal/deferred_type.rb
 - lib/literal/enum.rb
@@ -46,6 +45,7 @@ files:
 - lib/literal/set.rb
 - lib/literal/struct.rb
 - lib/literal/transforms.rb
+- lib/literal/tuple.rb
 - lib/literal/type.rb
 - lib/literal/types.rb
 - lib/literal/types/any_type.rb
@@ -78,7 +78,7 @@ licenses:
 metadata:
   homepage_uri: https://literal.fun
   source_code_uri: https://github.com/joeldrapper/literal
-  changelog_uri: https://github.com/joeldrapper/literal/blob/main/CHANGELOG.md
+  changelog_uri: https://github.com/joeldrapper/literal/releases
   funding_uri: https://github.com/sponsors/joeldrapper
   rubygems_mfa_required: 'true'
 post_install_message:

data/lib/literal/data_property.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class Literal::DataProperty < Literal::Property
-	def generate_initializer_assign_value(buffer = +"")
-		buffer <<
-			"@" <<
-			@name.name <<
-			" = " <<
-			escaped_name <<
-			".frozen? ? " <<
-			escaped_name <<
-			" : " <<
-			escaped_name <<
-			".dup.freeze\n"
-	end
-end