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.

Sign up for GitHub

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

chore: Improve exports and interal references #386

Merged
merged 3 commits into from
Jul 18, 2024
Merged

chore: Improve exports and interal references #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de9a079
Improved export script
leoafarias Jul 18, 2024
d106b9d
Merge branch 'main' into chore/improve-exports
leoafarias Jul 18, 2024
dfa36aa
Exports fix
leoafarias Jul 18, 2024
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
109 changes: 102 additions & 7 deletions packages/mix/lib/mix.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,105 @@

library mix;

export 'src/attributes/attributes.dart';
export 'src/core/core.dart';
export 'src/modifiers/modifiers.dart';
export 'src/specs/specs.dart';
export 'src/theme/theme.dart';
export 'src/variants/variants.dart';
export 'src/widgets/widgets.dart';
/// ATTRIBUTES
export 'src/attributes/animated/animated_data.dart';
export 'src/attributes/animated/animated_data_dto.dart';
export 'src/attributes/animated/animated_util.dart';
export 'src/attributes/border/border_dto.dart';
export 'src/attributes/border/border_radius_dto.dart';
export 'src/attributes/border/border_radius_util.dart';
export 'src/attributes/border/border_util.dart';
export 'src/attributes/border/shape_border_dto.dart';
export 'src/attributes/color/color_directives.dart';
export 'src/attributes/color/color_dto.dart';
export 'src/attributes/color/color_util.dart';
export 'src/attributes/color/material_colors_util.dart';
export 'src/attributes/constraints/constraints_dto.dart';
export 'src/attributes/decoration/decoration_dto.dart';
export 'src/attributes/decoration/image/decoration_image_dto.dart';
export 'src/attributes/enum/enum_util.dart';
export 'src/attributes/gap/gap_util.dart';
export 'src/attributes/gap/spacing_side_dto.dart';
export 'src/attributes/gradient/gradient_dto.dart';
export 'src/attributes/modifiers/widget_modifiers_data.dart';
export 'src/attributes/modifiers/widget_modifiers_data_dto.dart';
export 'src/attributes/modifiers/widget_modifiers_util.dart';
export 'src/attributes/nested_style/nested_style_attribute.dart';
export 'src/attributes/nested_style/nested_style_util.dart';
export 'src/attributes/scalars/scalar_util.dart';
export 'src/attributes/shadow/shadow_dto.dart';
export 'src/attributes/shadow/shadow_util.dart';
export 'src/attributes/spacing/edge_insets_dto.dart';
export 'src/attributes/spacing/spacing_util.dart';
export 'src/attributes/strut_style/strut_style_dto.dart';
export 'src/attributes/text_style/text_style_dto.dart';
export 'src/attributes/text_style/text_style_util.dart';
/// CORE
export 'src/core/attribute.dart';
export 'src/core/attributes_map.dart';
export 'src/core/deprecation_notices.dart';
export 'src/core/directive.dart';
export 'src/core/dto.dart';
export 'src/core/factory/mix_data.dart';
export 'src/core/factory/mix_provider.dart';
export 'src/core/factory/style_mix.dart';
export 'src/core/factory/style_widgets_ext.dart';
export 'src/core/helpers.dart';
export 'src/core/modifier.dart';
export 'src/core/spec.dart';
export 'src/core/styled_widget.dart';
export 'src/core/utility.dart';
export 'src/core/variant.dart';
/// MODIFIERS
export 'src/modifiers/align_widget_modifier.dart';
export 'src/modifiers/aspect_ratio_widget_modifier.dart';
export 'src/modifiers/clip_widget_modifier.dart';
export 'src/modifiers/flexible_widget_modifier.dart';
export 'src/modifiers/fractionally_sized_box_widget_modifier.dart';
export 'src/modifiers/intrinsic_widget_modifier.dart';
export 'src/modifiers/opacity_widget_modifier.dart';
export 'src/modifiers/padding_widget_modifier.dart';
export 'src/modifiers/rotated_box_widget_modifier.dart';
export 'src/modifiers/sized_box_widget_modifier.dart';
export 'src/modifiers/transform_widget_modifier.dart';
export 'src/modifiers/visibility_widget_modifier.dart';
export 'src/modifiers/widget_modifiers_util.dart';
/// SPECS
export 'src/specs/box/box_spec.dart';
export 'src/specs/box/box_widget.dart';
export 'src/specs/flex/flex_spec.dart';
export 'src/specs/flex/flex_widget.dart';
export 'src/specs/icon/icon_spec.dart';
export 'src/specs/icon/icon_widget.dart';
export 'src/specs/image/image_spec.dart';
export 'src/specs/image/image_widget.dart';
export 'src/specs/spec_util.dart';
export 'src/specs/stack/stack_spec.dart';
export 'src/specs/stack/stack_widget.dart';
export 'src/specs/text/text_directives_util.dart';
export 'src/specs/text/text_spec.dart';
export 'src/specs/text/text_widget.dart';
/// THEME
export 'src/theme/material/material_theme.dart';
export 'src/theme/material/material_tokens.dart';
export 'src/theme/mix/mix_theme.dart';
export 'src/theme/tokens/breakpoints_token.dart';
export 'src/theme/tokens/color_token.dart';
export 'src/theme/tokens/mix_token.dart';
export 'src/theme/tokens/radius_token.dart';
export 'src/theme/tokens/space_token.dart';
export 'src/theme/tokens/text_style_token.dart';
export 'src/theme/tokens/token_resolver.dart';
export 'src/theme/tokens/token_util.dart';
/// VARIANTS
export 'src/variants/context_variant.dart';
export 'src/variants/context_variant_util/on_breakpoint_util.dart';
export 'src/variants/context_variant_util/on_brightness_util.dart';
export 'src/variants/context_variant_util/on_directionality_util.dart';
export 'src/variants/context_variant_util/on_not_util.dart';
export 'src/variants/context_variant_util/on_orientation_util.dart';
export 'src/variants/context_variant_util/on_util.dart';
export 'src/variants/variant_attribute.dart';
export 'src/variants/widget_state_variant.dart';
/// WIDGETS
export 'src/widgets/pressable_widget.dart';
39 changes: 0 additions & 39 deletions packages/mix/lib/src/attributes/attributes.dart
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion packages/mix/lib/src/attributes/modifiers/widget_modifiers_data_dto.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import 'package:flutter/foundation.dart';

import '../../core/core.dart';
import '../../core/attributes_map.dart';
import '../../core/dto.dart';
import '../../core/factory/mix_data.dart';
import '../../core/modifier.dart';
import 'widget_modifiers_data.dart';

class WidgetModifiersDataDto extends Dto<WidgetModifiersData>
Expand Down
5 changes: 3 additions & 2 deletions packages/mix/lib/src/attributes/modifiers/widget_modifiers_util.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import '../../core/core.dart';
import '../../modifiers/modifiers.dart';
import '../../core/attribute.dart';
import '../../core/modifier.dart';
import '../../modifiers/widget_modifiers_util.dart';
import 'widget_modifiers_data_dto.dart';

final class SpecModifierUtility<T extends Attribute>
Expand Down
22 changes: 0 additions & 22 deletions packages/mix/lib/src/core/core.dart
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/mix/lib/src/core/factory/mix_data.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';

import '../../attributes/attributes.dart';
import '../../attributes/animated/animated_data.dart';
import '../../internal/iterable_ext.dart';
import '../../internal/string_ext.dart';
import '../../theme/tokens/token_resolver.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/mix/lib/src/core/helpers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:flutter/rendering.dart' as r;
import 'package:flutter/widgets.dart' as w;

import '../internal/deep_collection_equality.dart';
import 'core.dart';
import 'dto.dart';

/// Class to provide some helpers without conflicting
/// name space with other libraries.
Expand Down
5 changes: 4 additions & 1 deletion packages/mix/lib/src/core/styled_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import 'package:flutter/widgets.dart';

import '../modifiers/internal/render_widget_modifier.dart';
import 'core.dart';
import 'factory/mix_data.dart';
import 'factory/mix_provider.dart';
import 'factory/style_mix.dart';
import 'internal/widget_state/interactive_widget.dart';
import 'modifier.dart';

/// An abstract widget for applying custom styles.
///
Expand Down
19 changes: 16 additions & 3 deletions packages/mix/lib/src/modifiers/internal/render_widget_modifier.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,22 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

import '../../core/core.dart';
import '../../theme/theme.dart';
import '../modifiers.dart';
import '../../core/factory/mix_data.dart';
import '../../core/modifier.dart';
import '../../core/spec.dart';
import '../../theme/mix/mix_theme.dart';
import '../align_widget_modifier.dart';
import '../aspect_ratio_widget_modifier.dart';
import '../clip_widget_modifier.dart';
import '../flexible_widget_modifier.dart';
import '../fractionally_sized_box_widget_modifier.dart';
import '../intrinsic_widget_modifier.dart';
import '../opacity_widget_modifier.dart';
import '../padding_widget_modifier.dart';
import '../rotated_box_widget_modifier.dart';
import '../sized_box_widget_modifier.dart';
import '../transform_widget_modifier.dart';
import '../visibility_widget_modifier.dart';

const _defaultOrder = [
// 1. FlexibleModifier: When the widget is used inside a Row, Column, or Flex widget, it will
Expand Down
20 changes: 0 additions & 20 deletions packages/mix/lib/src/modifiers/modifiers.dart
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions packages/mix/lib/src/specs/specs.dart
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions packages/mix/lib/src/theme/theme.dart
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions packages/mix/lib/src/variants/variants.dart
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/mix/lib/src/widgets/pressable_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import '../core/factory/style_mix.dart';
import '../core/internal/widget_state/gesturable_builder.dart';
import '../core/internal/widget_state/interactive_widget.dart';
import '../internal/constants.dart';
import '../specs/specs.dart';
import '../specs/box/box_widget.dart';

class PressableBox extends StatelessWidget {
const PressableBox({
Expand Down
7 changes: 0 additions & 7 deletions packages/mix/lib/src/widgets/widgets.dart
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions packages/mix/scripts/exports.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ Future<void> _libraryExport() async {
final importList = fileMap[key]!;
final barrelDir = Directory(_joinPaths(_srcDirectory.path, key));
final barreFile = File(_joinPaths(barrelDir.path, '$key.dart'));
if (barreFile.existsSync()) {
barreFile.deleteSync();
}
libOutputString.writeln('/// ${key.toUpperCase()}');

final barrelOutput = StringBuffer();
barrelOutput.write(_generatedMessage);
for (final import in importList) {
final relativePath = import.replaceAll('src/$key/', '');
barrelOutput.writeln('export \'$relativePath\';');
libOutputString.writeln('export \'$import\';');
}

barreFile.writeAsStringSync(barrelOutput.toString());
final relativePath = _getRelativePath(barreFile.path, _libDirectory.path);
libOutputString.writeln('export \'$relativePath\';');
}

_mixFile.writeAsStringSync(libOutputString.toString());
Expand Down
Loading