pervasive type constraints

[scpubgit/DX.git] / lib / DX / ResolvedPropositionSet.pm

diff --git a/lib/DX/ResolvedPropositionSet.pm b/lib/DX/ResolvedPropositionSet.pm
index ff37b41..89a3d5e 100644 (file)
--- a/lib/DX/ResolvedPropositionSet.pm
+++ b/lib/DX/ResolvedPropositionSet.pm
@@ -1,13 +1,16 @@
 package DX::ResolvedPropositionSet;
 
 use DX::DependencyMap;
-use Moo;
+use DX::Utils qw(deparse);
+use DX::Class;
 
-has dependency_map => (is => 'ro', required => 1);
+has dependency_map => (is => 'ro', isa => DependencyMap, required => 1);
 
-has propositions => (is => 'ro', required => 1);
+has propositions => (is => 'ro', isa => ArrayRef[Proposition], required => 1);
 
-has scope_depth => (is => 'ro', required => 1);
+has scope_depth => (is => 'ro', isa => Int, required => 1);
+
+sub resolved_count { scalar @{$_[0]->propositions} }
 
 sub new_empty {
   my ($class) = @_;
@@ -34,7 +37,8 @@ sub with_updated_dependencies_for {
   my ($self, $prop, $deps) = @_;
   my @props = @{$self->propositions};
   my ($id) = grep $props[$_] eq $prop, 0..$#props;
-  die "WHUT" unless $id;
+  # 0 is valid, undef means the grep failed
+  die "Unable to find $prop in proplist" unless defined $id;
   my $new_depmap = $self->dependency_map
                         ->with_entry_for($id, $deps);
   ref($self)->new(
@@ -50,8 +54,20 @@ sub but_expire_for {
                                     ->but_expire_dependents_of(@events);
   # Didn't expire anything? Don't clone self
   return $self if $depmap eq $self->dependency_map;
-  die 'WHUT';
+  my $props = $self->propositions;
+  return (
+    $self->but(dependency_map => $depmap),
+    map $props->[$_], @expired_ids
+  );
 }
 
+sub dependencies_for {
+  my ($self, $prop) = @_;
+  my @props = @{$self->propositions};
+  my ($id) = grep $props[$_] eq $prop, 0..$#props;
+  # 0 is valid, undef means the grep failed
+  die "Unable to find $prop in proplist" unless defined $id;
+  return $self->dependency_map->dependencies_for($id)||[];
+}
 
 1;