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);
+ }
}
{
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, $attr_order) = do {
if (my $info = $Moo::Role::INFO{$name}) {
{ @attr_info },
[ @attr_info[grep !($_ % 2), 0..$#attr_info] ]
)
- } else {
- my $specs = Moo->_constructor_maker_for($name)->all_attribute_specs;
+ } 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 {
+ # This codepath is used if $name does not exist in $Moo::MAKERS
+ (0, Moose::Meta::Class->initialize($name), {}, [] )
}
};
- my %methods = %{Role::Tiny->_concrete_methods_of($name)};
-
- while (my ($meth_name, $meth_code) = each %methods) {
- $meta->add_method($meth_name, $meth_code) if $meth_code;
+ 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.
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}) {
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 } }
);
}
};
- if (my $coerce = $spec{coerce}) {
+ if ($coerce) {
$tc->coercion(Moose::Meta::TypeCoercion->new)
->_compiled_type_coercion($coerce);
$spec{coerce} = 1;
}
- } elsif (my $coerce = $spec{coerce}) {
+ } elsif ($coerce) {
my $attr = perlstring($name);
my $tc = Moose::Meta::TypeConstraint->new(
constraint => sub { die "This is not going to work" },
}
}
}
+ 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}});