move dependency expansion earlier in the process

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

diff --git a/lib/DX/DependencyMap.pm b/lib/DX/DependencyMap.pm
index 1b55b93..1a34208 100644 (file)
--- a/lib/DX/DependencyMap.pm
+++ b/lib/DX/DependencyMap.pm
@@ -1,13 +1,13 @@
 package DX::DependencyMap;
 
 use DX::Utils qw(CONTENTS_OF INDICES_OF);
-use Moo;
+use DX::Class;
 
 # { x => [ { y => [ ...
 # my $targ = $root; $targ = $targ->[0]{$_[0]} for @path
 # my $deps = $targ->[$${$dep_type}];
 
-has deps => (is => 'ro', required => 1);
+has deps => (is => 'ro', isa => DependencyTree, required => 1);
 
 has revdeps => (is => 'ro', required => 1);
 
@@ -18,12 +18,13 @@ sub new_empty {
 
 sub with_entry_for {
   my ($self, $for_id, $deps_for) = @_;
-  my @expanded = $self->_expand_deps($deps_for);
   my $new_revdeps = {
     %{$self->revdeps},
-    $for_id => \@expanded,
+    $for_id => $deps_for,
   };
-  my $new_deps = $self->_merge_deps_for($self->deps, $for_id, @expanded);
+  my $new_deps = $self->_merge_deps_for(
+    $self->deps, $for_id, map @{$_}[1..$#$_], @$deps_for
+  );
   ref($self)->new(
     deps => $new_deps,
     revdeps => $new_revdeps
@@ -35,7 +36,7 @@ sub without_entries_for {
   my %new_revdeps = %{$self->revdeps};
   my $new_deps = $self->deps;
   $new_deps = $self->_unmerge_deps_for(
-    $new_deps, $_, @{$new_revdeps{$_}}
+    $new_deps, $_, map @{$_}[1..$#$_], @{$new_revdeps{$_}}
   ) for @for_ids;
   delete @new_revdeps{@for_ids};
   ref($self)->new(
@@ -64,6 +65,7 @@ sub _mangle_deps {
   my ($self, $deps, $mangler, @to_mangle) = @_;
   my $root = [ $deps ];
   foreach my $mangle_this (@to_mangle) {
+    assert_DependencySpec $mangle_this;
     my ($type, @path) = @$mangle_this;
     my $targ = $root;
     foreach my $part (@path) {
@@ -75,19 +77,6 @@ sub _mangle_deps {
   return $root->[0];
 }
 
-sub _expand_deps {
-  my ($self, $deps) = @_;
-  my @exp;
-  DEP: foreach my $dep (@$deps) {
-    my ($type, @path) = @$dep;
-    push @exp, [
-      $type,
-      map { ref() ? @{$_->identity_path or next DEP} : $_ } @path
-    ];
-  }
-  return @exp;
-}
-
 sub _dependents_of {
   my ($self, $event) = @_;
   my ($type, @path) = @$event;
@@ -132,4 +121,6 @@ sub but_expire_dependents_of {
   ($self->without_entries_for(@expired), @expired);
 }
 
+sub dependencies_for { $_[0]->revdeps->{$_[1]} }
+
 1;