@Moo::HandleMoose::FakeConstructor::ISA = 'Moose::Meta::Method::Constructor';
}
+sub maybe_reinject_fake_metaclass_for {
+ my ($name) = @_;
+ our %DID_INJECT;
+ if (delete $DID_INJECT{$name}) {
+ unless ($Moo::Role::INFO{$name}) {
+ Moo->_constructor_maker_for($name)->install_delayed;
+ }
+ inject_fake_metaclass_for($name);
+ }
+}
+
sub inject_fake_metaclass_for {
my ($name) = @_;
require Class::MOP;
+ require Moo::HandleMoose::FakeMetaClass;
Class::MOP::store_metaclass_by_name(
$name, bless({ name => $name }, 'Moo::HandleMoose::FakeMetaClass')
);
+ require Moose::Util::TypeConstraints;
+ if ($Moo::Role::INFO{$name}) {
+ Moose::Util::TypeConstraints::find_or_create_does_type_constraint($name);
+ } else {
+ Moose::Util::TypeConstraints::find_or_create_isa_type_constraint($name);
+ }
}
-our %DID_INJECT;
-
{
package Moo::HandleMoose::FakeConstructor;
sub inject_real_metaclass_for {
my ($name) = @_;
+ our %DID_INJECT;
return Class::MOP::get_metaclass_by_name($name) if $DID_INJECT{$name};
- require Moose; require Moo; require Moo::Role;
+ require Moose; require Moo; require Moo::Role; require Scalar::Util;
Class::MOP::remove_metaclass_by_name($name);
- my ($am_role, $meta, $attr_specs) = do {
+ my ($am_role, $meta, $attr_specs, $attr_order) = do {
if (my $info = $Moo::Role::INFO{$name}) {
- (1, Moose::Meta::Role->initialize($name), $info->{attributes})
+ my @attr_info = @{$info->{attributes}||[]};
+ (1, Moose::Meta::Role->initialize($name),
+ { @attr_info },
+ [ @attr_info[grep !($_ % 2), 0..$#attr_info] ]
+ )
+ } elsif ( my $cmaker = Moo->_constructor_maker_for($name) ) {
+ my $specs = $cmaker->all_attribute_specs;
+ (0, Moose::Meta::Class->initialize($name), $specs,
+ [ sort { $specs->{$a}{index} <=> $specs->{$b}{index} } keys %$specs ]
+ );
} else {
- my $specs = Moo->_constructor_maker_for($name)->all_attribute_specs;
- (0, Moose::Meta::Class->initialize($name), $specs);
+ # This codepath is used if $name does not exist in $Moo::MAKERS
+ (0, Moose::Meta::Class->initialize($name), {}, [] )
}
};
+
+ for my $spec (values %$attr_specs) {
+ if (my $inflators = delete $spec->{moosify}) {
+ $_->($spec) for @$inflators;
+ }
+ }
+
my %methods = %{Role::Tiny->_concrete_methods_of($name)};
+
+ # if stuff gets added afterwards, _maybe_reset_handlemoose should
+ # trigger the recreation of the metaclass but we need to ensure the
+ # Role::Tiny cache is cleared so we don't confuse Moo itself.
+ if (my $info = $Role::Tiny::INFO{$name}) {
+ delete $info->{methods};
+ }
+
# needed to ensure the method body is stable and get things named
Sub::Defer::undefer_sub($_) for grep defined, values %methods;
my @attrs;
{
# This local is completely not required for roles but harmless
local @{_getstash($name)}{keys %methods};
- foreach my $name (keys %$attr_specs) {
+ my %seen_name;
+ foreach my $name (@$attr_order) {
+ $seen_name{$name} = 1;
my %spec = %{$attr_specs->{$name}};
delete $spec{index};
$spec{is} = 'ro' if $spec{is} eq 'lazy' or $spec{is} eq 'rwp';
delete $spec{asserter};
+ my $coerce = $spec{coerce};
if (my $isa = $spec{isa}) {
- $spec{isa} = do {
+ my $tc = $spec{isa} = do {
if (my $mapped = $TYPE_MAP{$isa}) {
- $mapped->();
+ my $type = $mapped->();
+ Scalar::Util::blessed($type) && $type->isa("Moose::Meta::TypeConstraint")
+ or die "error inflating attribute '$name' for package '$_[0]': \$TYPE_MAP{$isa} did not return a valid type constraint'";
+ $coerce ? $type->create_child_type(name => $type->name) : $type;
} else {
Moose::Meta::TypeConstraint->new(
constraint => sub { eval { &$isa; 1 } }
);
}
};
- die "Aaaargh" if $spec{coerce};
- } elsif (my $coerce = $spec{coerce}) {
+ if ($coerce) {
+ $tc->coercion(Moose::Meta::TypeCoercion->new)
+ ->_compiled_type_coercion($coerce);
+ $spec{coerce} = 1;
+ }
+ } elsif ($coerce) {
my $attr = perlstring($name);
my $tc = Moose::Meta::TypeConstraint->new(
constraint => sub { die "This is not going to work" },
'my $r = $_[42]{'.$attr.'}; $_[42]{'.$attr.'} = 1; $r'
},
);
- $tc->coercion(Moose::Meta::TypeCoercion->new)
- ->_compiled_type_coercion($coerce);
- $spec{isa} = $tc;
- $spec{coerce} = 1;
+ $tc->coercion(Moose::Meta::TypeCoercion->new)
+ ->_compiled_type_coercion($coerce);
+ $spec{isa} = $tc;
+ $spec{coerce} = 1;
}
push @attrs, $meta->add_attribute($name => %spec);
}
+ foreach my $mouse (do { our %MOUSE; @{$MOUSE{$name}||[]} }) {
+ foreach my $attr ($mouse->get_all_attributes) {
+ my %spec = %{$attr};
+ delete @spec{qw(
+ associated_class associated_methods __METACLASS__
+ provides curries
+ )};
+ my $name = delete $spec{name};
+ next if $seen_name{$name}++;
+ push @attrs, $meta->add_attribute($name => %spec);
+ }
+ }
+ }
+ for my $meth_name (keys %methods) {
+ my $meth_code = $methods{$meth_name};
+ $meta->add_method($meth_name, $meth_code) if $meth_code;
}
+
if ($am_role) {
my $info = $Moo::Role::INFO{$name};
$meta->add_required_methods(@{$info->{requires}});
);
}
$meta->add_role(Class::MOP::class_of($_))
- for do { no warnings 'once'; keys %{$Role::Tiny::APPLIED_TO{$name}} };
+ for grep !/\|/ && $_ ne $name, # reject Foo|Bar and same-role-as-self
+ do { no warnings 'once'; keys %{$Role::Tiny::APPLIED_TO{$name}} };
$DID_INJECT{$name} = 1;
$meta;
}
-{
- package Moo::HandleMoose::FakeMetaClass;
-
- sub DESTROY { }
-
- sub AUTOLOAD {
- my ($meth) = (our $AUTOLOAD =~ /([^:]+)$/);
- Moo::HandleMoose::inject_real_metaclass_for((shift)->{name})->$meth(@_)
- }
- sub can {
- Moo::HandleMoose::inject_real_metaclass_for((shift)->{name})->can(@_)
- }
- sub isa {
- Moo::HandleMoose::inject_real_metaclass_for((shift)->{name})->isa(@_)
- }
-}
-
1;