Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AF-3082: transform static meta fields #200

Merged
merged 3 commits into from
Nov 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions lib/src/transformer/impl_generation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,21 @@ class ImplGenerator {
Map keyConstants = {};
Map constants = {};

typedMap.node.members
.where((member) => member is FieldDeclaration && member.isStatic)
.forEach((_field) {
final field = _field as FieldDeclaration; // ignore: avoid_as

final name = typedMap.node.name.name;
final metaType = type == AccessorType.props ? 'Props' : 'State';

field.fields.variables.forEach((VariableDeclaration variable) {
if (variable.name.toString() == 'meta' && variable.initializer != null) {
transformedFile.replace(sourceFile.span(variable.initializer.offset, variable.initializer.end), '\$$metaType($name)');
}
});
});

typedMap.node.members
.where((member) => member is FieldDeclaration && !member.isStatic)
.forEach((_field) {
Expand Down
72 changes: 72 additions & 0 deletions test/vm_tests/transformer/impl_generation_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,78 @@ main() {
reason: 'should preserve existing inheritance');
});

test('with static PropsMeta and StateMeta declaration', () {
final originalPropsMetaLine = 'static const PropsMeta meta = \$metaForFooProps;';
final originalStateMetaLine = 'static const StateMeta meta = \$metaForFooState;';
final transformedPropsMetaLine = 'static const PropsMeta meta = \$Props(FooProps);';
final transformedStateMetaLine = 'static const StateMeta meta = \$State(FooState);';

setUpAndGenerate('''
@Factory()
UiFactory<FooProps> Foo;

@Props()
class FooProps {
static const PropsMeta meta = \$metaForFooProps;
}

@State()
class FooState {
static const StateMeta meta = \$metaForFooState;
}

@Component()
class FooComponent {
render() => null;
}
'''
);

var transformedSource = transformedFile.getTransformedText();
expect(transformedSource.contains(originalPropsMetaLine), isFalse);
expect(transformedSource.contains(originalStateMetaLine), isFalse);
expect(transformedSource, contains(transformedPropsMetaLine));
expect(transformedSource, contains(transformedStateMetaLine));
});

test('with static PropsMeta declaration in PropsMixin', () {
final originalLine = 'static const PropsMeta meta = \$metaForFooPropsMixin;';
final transformedLine = 'static const PropsMeta meta = \$Props(FooPropsMixin);';

setUpAndGenerate('''
@PropsMixin()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get one more test added that tests this functionality on StateMixins?

class FooPropsMixin {
static const PropsMeta meta = \$metaForFooPropsMixin;

Map get props;
}
'''
);

var transformedSource = transformedFile.getTransformedText();
expect(transformedSource.contains(originalLine), isFalse);
expect(transformedSource, contains(transformedLine));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might make sense to also verify that the original meta line is not longer present to ensure that the transformer is replacing and not simply adding a line.

});

test('with static StateMeta declaration in StateMixin', () {
final originalLine = 'static const StateMeta meta = \$metaForFooStateMixin; ';
final transformedLine = 'static const StateMeta meta = \$State(FooStateMixin);';

setUpAndGenerate('''
@StateMixin()
class FooStateMixin {
static const StateMeta meta = \$metaForFooStateMixin;

Map get state;
}
'''
);

var transformedSource = transformedFile.getTransformedText();
expect(transformedSource.contains(originalLine), isFalse);
expect(transformedSource, contains(transformedLine));
});

group('that subtypes another component, referencing the component class via', () {
test('a simple identifier', () {
preservedLineNumbersTest('''
Expand Down