Merge pull request #292 from Parabeac/release/1.3.5

Release/1.3.5

lib/eggs/injected_app_bar.dart

@@ -89,15 +89,15 @@ class PBAppBarGenerator extends PBGenerator {
   @override
   String generate(
       PBIntermediateNode source, GeneratorContext generatorContext) {
-    generatorContext.sizingContext = SizingValueContext.PointValue;
+    generatorContext.sizingContext = SizingValueContext.AppBarChild;
     if (source is InjectedNavbar) {
       var buffer = StringBuffer();
 
       buffer.write('AppBar(');
       if (source.leadingItem != null) {
         source.leadingItem.currentContext = source.currentContext;
         buffer.write(
-            'leading: ${source.leadingItem.generator.generate(source.leadingItem, generatorContext)},');
+            'leading: ${_wrapOnIconButton(source.leadingItem.generator.generate(source.leadingItem, generatorContext))}');
       }
       if (source.middleItem != null) {
         source.middleItem.currentContext = source.currentContext;
@@ -110,11 +110,22 @@ class PBAppBarGenerator extends PBGenerator {
         source.trailingItem.currentContext = source.currentContext;
         trailingItem =
             '${source.trailingItem.generator.generate(source.trailingItem, generatorContext)}';
-        buffer.write('actions: [$trailingItem],');
+        buffer.write('actions: [${_wrapOnIconButton(trailingItem)}],');
       }
 
       buffer.write(')');
       return buffer.toString();
     }
   }
+
+  String _wrapOnIconButton(String body) {
+    return '''
+    IconButton(
+        icon: $body,
+        onPressed: () {
+            // TODO: Fill action
+            },
+            ),
+    ''';
+  }
 }

lib/generation/generators/attribute-helper/pb_generator_context.dart

@@ -4,4 +4,9 @@ class GeneratorContext {
   SizingValueContext sizingContext = SizingValueContext.PointValue;
 }
 
-enum SizingValueContext { PointValue, MediaQueryValue, LayoutBuilderValue }
+enum SizingValueContext {
+  PointValue,
+  MediaQueryValue,
+  LayoutBuilderValue,
+  AppBarChild,
+}

lib/generation/generators/layouts/pb_layout_gen.dart

@@ -9,13 +9,17 @@ abstract class PBLayoutGenerator extends PBGenerator {
   String generate(PBIntermediateNode source, GeneratorContext generatorContext);
 
   String generateBodyBoilerplate(String body,
-      {String layoutName = 'Column', String crossAxisAlignment = ''}) {
+      {String layoutName = 'Column',
+      String crossAxisAlignment = '',
+      String mainAxisAlignment = ''}) {
     layoutName ??= 'Column';
     crossAxisAlignment ??= '';
+    mainAxisAlignment ??= '';
     var buffer = StringBuffer();
     layoutName[0].toUpperCase();
     buffer.write('''$layoutName(
       $crossAxisAlignment
+      $mainAxisAlignment
     children:[
       $body
     ]

lib/generation/generators/layouts/pb_row_gen.dart

@@ -22,9 +22,12 @@ class PBRowGenerator extends PBLayoutGenerator {
         counter++;
       }
 
-      return generateBodyBoilerplate(buffer.toString(),
-          layoutName: 'Row',
-          crossAxisAlignment: source.alignment['crossAxisAlignment']);
+      return generateBodyBoilerplate(
+        buffer.toString(),
+        layoutName: 'Row',
+        crossAxisAlignment: source.alignment['crossAxisAlignment'],
+        mainAxisAlignment: source.alignment['mainAxisAlignment'],
+      );
     }
   }
 }

lib/generation/generators/layouts/pb_stack_gen.dart

@@ -15,6 +15,7 @@ class PBStackGenerator extends PBGenerator {
       if (source.children.isNotEmpty) {
         buffer.write('\nchildren: [');
         for (var index = 0; index < source.children.length; index++) {
+          source.children[index].currentContext = source.currentContext;
           var element = source.children[index].generator
               .generate(source.children[index], generatorContext);
           buffer.write(element);

lib/generation/generators/middleware/state_management/bloc_middleware.dart

@@ -60,6 +60,7 @@ class BLoCMiddleware extends Middleware {
 
     var isFirst = true;
     await states.forEach((element) {
+      element.currentContext.treeRoot.data = node.managerData;
       element.generator.templateStrategy = BLoCStateTemplateStrategy(
         isFirst: isFirst,
         abstractClassName: parentState,

lib/generation/generators/middleware/state_management/provider_middleware.dart

@@ -3,6 +3,7 @@ import 'package:parabeac_core/generation/generators/middleware/state_management/
 import 'package:parabeac_core/generation/generators/pb_generation_manager.dart';
 import 'package:parabeac_core/generation/generators/pb_variable.dart';
 import 'package:parabeac_core/generation/generators/value_objects/file_structure_strategy.dart/provider_file_structure_strategy.dart';
+import 'package:parabeac_core/generation/generators/value_objects/template_strategy/stateless_template_strategy.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/pb_shared_instance.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_symbol_storage.dart';
 import 'package:recase/recase.dart';
@@ -26,12 +27,20 @@ class ProviderMiddleware extends Middleware {
       node.currentContext.project.genProjectData
           .addDependencies(PACKAGE_NAME, PACKAGE_VERSION);
       managerData.addImport('package:provider/provider.dart');
+      watcherName = node.name.snakeCase + '_notifier';
       var widgetName = node.functionCallName.camelCase;
+      var watcher;
 
-      watcherName = getVariableName(node.name.snakeCase + '_notifier');
-      var watcher = PBVariable(watcherName, 'final ', true,
-          'context.watch<${getName(node.functionCallName).pascalCase}>().${widgetName}');
-      managerData.addMethodVariable(watcher);
+      if (node.currentContext.treeRoot.rootNode.generator.templateStrategy
+          is StatelessTemplateStrategy) {
+        watcher = PBVariable(watcherName, 'final ', true,
+            '${getName(node.functionCallName).pascalCase}().${widgetName}');
+        managerData.addGlobalVariable(watcher);
+      } else {
+        watcher = PBVariable(watcherName, 'final ', true,
+            'context.watch<${getName(node.functionCallName).pascalCase}>().${widgetName}');
+        managerData.addMethodVariable(watcher);
+      }
 
       addImportToCache(node.SYMBOL_ID, getImportPath(node, fileStrategy));
 

lib/generation/generators/middleware/state_management/riverpod_middleware.dart

@@ -1,6 +1,7 @@
 import 'package:parabeac_core/generation/generators/middleware/state_management/utils/middleware_utils.dart';
 import 'package:parabeac_core/generation/generators/value_objects/file_structure_strategy.dart/riverpod_file_structure_strategy.dart';
 import 'package:parabeac_core/generation/generators/value_objects/generator_adapter.dart';
+import 'package:parabeac_core/generation/generators/value_objects/template_strategy/stateless_template_strategy.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/pb_shared_instance.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_symbol_storage.dart';
@@ -31,14 +32,18 @@ class RiverpodMiddleware extends Middleware {
       var watcher = PBVariable(watcherName + '_provider', 'final ', true,
           'ChangeNotifierProvider((ref) => ${getName(node.functionCallName).pascalCase}())');
 
-      managerData.addMethodVariable(watcher);
-      var widgetName = node.functionCallName.camelCase;
+      if (node.currentContext.treeRoot.rootNode.generator.templateStrategy
+          is StatelessTemplateStrategy) {
+        managerData.addGlobalVariable(watcher);
+      } else {
+        managerData.addMethodVariable(watcher);
+      }
 
       addImportToCache(node.SYMBOL_ID, getImportPath(node, fileStrategy));
 
       if (node.generator is! StringGeneratorAdapter) {
-        node.generator =
-            StringGeneratorAdapter(getConsumer(watcherName, widgetName));
+        node.generator = StringGeneratorAdapter(
+            getConsumer(watcherName, node.functionCallName.camelCase));
       }
       return node;
     }

lib/generation/generators/middleware/state_management/stateful_middleware.dart

@@ -36,6 +36,7 @@ class StatefulMiddleware extends Middleware {
     });
 
     await states.forEach((element) async {
+      element.currentContext.treeRoot.data = node.managerData;
       await fileStrategy.generatePage(
         await generationManager.generate(element),
         '${parentDirectory}/${element.name.snakeCase}',

lib/generation/generators/middleware/state_management/utils/middleware_utils.dart

@@ -28,6 +28,7 @@ class MiddlewareUtils {
       stateBuffer.write(MiddlewareUtils.generateVariable(node));
     }
     node?.auxiliaryData?.stateGraph?.states?.forEach((state) {
+      state.variation.node.currentContext.treeRoot.data = node.managerData;
       var variationNode = state.variation.node;
 
       if (variationNode is PBSharedMasterNode &&

lib/generation/generators/symbols/pb_mastersym_gen.dart

@@ -34,7 +34,7 @@ class PBMasterSymbolGenerator extends PBGenerator {
             );
         log.error(e.toString());
       }
-
+      source.child.currentContext = source.currentContext;
       var generatedWidget =
           source.child.generator.generate(source.child, generatorContext);
       if (generatedWidget == null || generatedWidget.isEmpty) {

lib/generation/generators/value_objects/generation_configuration/pb_generation_configuration.dart

@@ -9,9 +9,11 @@ import 'package:parabeac_core/interpret_and_optimize/entities/inherited_scaffold
 import 'package:parabeac_core/generation/generators/value_objects/file_structure_strategy.dart/flutter_file_structure_strategy.dart';
 import 'package:parabeac_core/generation/generators/value_objects/file_structure_strategy.dart/pb_file_structure_strategy.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/pb_shared_instance.dart';
+import 'package:parabeac_core/interpret_and_optimize/entities/pb_shared_master_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_layout_intermediate_node.dart';
 import 'package:parabeac_core/generation/generators/pb_flutter_generator.dart';
+import 'package:parabeac_core/interpret_and_optimize/helpers/pb_gen_cache.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_symbol_storage.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_project.dart';
 import 'package:quick_log/quick_log.dart';
@@ -138,12 +140,9 @@ abstract class GenerationConfiguration {
 
   void _commitImports(
       PBIntermediateNode node, String directoryName, String fileName) {
-    var screenFilePath =
-        '${pbProject.projectName}/lib/screens/${directoryName}/${fileName.snakeCase}.dart';
-    var viewFilePath =
-        '${pbProject.projectName}/lib/views/${directoryName}/${fileName.snakeCase}.dart'; // Removed .g
-    var imports = ImportHelper.findImports(
-        node, node is InheritedScaffold ? screenFilePath : viewFilePath);
+    var nodePath = PBGenCache()
+        .getPath(node is PBSharedMasterNode ? node.SYMBOL_ID : node.UUID);
+    var imports = ImportHelper.findImports(node, nodePath);
     imports.forEach((import) {
       node.managerData.addImport(import);
     });

lib/generation/generators/visual-widgets/pb_padding_gen.dart

@@ -25,6 +25,10 @@ class PBPaddingGen extends PBGenerator {
   @override
   String generate(
       PBIntermediateNode source, GeneratorContext generatorContext) {
+    if (generatorContext.sizingContext == SizingValueContext.AppBarChild) {
+      source.child.currentContext = source.currentContext;
+      return source.child.generator.generate(source.child, generatorContext);
+    }
     if (!(source is Padding)) {
       return '';
     }

lib/generation/generators/visual-widgets/pb_positioned_gen.dart

@@ -53,6 +53,7 @@ class PBPositionedGenerator extends PBGenerator {
       }
 
       try {
+        source.child.currentContext = source.currentContext;
         buffer.write(
             'child: ${source.child.generator.generate(source.child, generatorContext)},');
       } catch (e, stackTrace) {

lib/interpret_and_optimize/entities/layouts/row.dart

@@ -101,6 +101,8 @@ class PBIntermediateRowLayout extends PBLayoutIntermediateNode {
     // TODO: this is the default for now
     alignment['crossAxisAlignment'] =
         'crossAxisAlignment: CrossAxisAlignment.start,';
+    alignment['mainAxisAlignment'] =
+        'mainAxisAlignment: MainAxisAlignment.center,';
   }
 
   @override

lib/interpret_and_optimize/entities/layouts/rules/handle_flex.dart

@@ -61,8 +61,9 @@ List<PBIntermediateNode> handleFlex(bool isVertical, Point topLeft,
     if (child is! PBIntermediateRowLayout &&
         child is! PBIntermediateColumnLayout) {
       // Wrap text in container
-      if (child is! Text)
+      if (child is! Text) {
         resultingChildren.add(_putChildInFlex(isVertical, child, parentLength));
+      }
     } else {
       resultingChildren.add(child);
     }

lib/interpret_and_optimize/services/pb_visual_generation_service.dart

@@ -131,8 +131,12 @@ class PBVisualGenerationService implements PBGenerationService {
   ///We are assuming that since the [rootIntermediateNode] contains all of the nodes
   ///then it should represent the biggest screen size that encapsulates the entire UI elements.
   void _extractScreenSize(PBIntermediateNode rootIntermediateNode) {
-    if (currentContext.screenBottomRightCorner == null &&
-        currentContext.screenTopLeftCorner == null) {
+    if ((currentContext.screenBottomRightCorner == null &&
+            currentContext.screenTopLeftCorner == null) ||
+        (currentContext.screenBottomRightCorner !=
+                rootIntermediateNode.bottomRightCorner ||
+            currentContext.screenTopLeftCorner !=
+                rootIntermediateNode.bottomRightCorner)) {
       currentContext.screenBottomRightCorner =
           rootIntermediateNode.bottomRightCorner;
       currentContext.screenTopLeftCorner = rootIntermediateNode.topLeftCorner;

pubspec.yaml

@@ -1,6 +1,6 @@
 name: parabeac_core
 description: A starting point for Dart libraries or applications.
-version: 1.3.3
+version: 1.3.5
 # homepage: https://www.example.com
 
 environment:

test/lib/middleware/bloc_test.dart

@@ -10,6 +10,7 @@ import 'package:parabeac_core/generation/generators/value_objects/file_structure
 import 'package:parabeac_core/generation/generators/writers/pb_flutter_writer.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart';
+import 'package:parabeac_core/interpret_and_optimize/helpers/pb_intermediate_node_tree.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_project.dart';
 import 'package:test/test.dart';
 import 'provider_test.dart';
@@ -22,6 +23,8 @@ class MockContext extends Mock implements PBContext {}
 
 class MockProject extends Mock implements PBProject {}
 
+class MockTree extends Mock implements PBIntermediateTree {}
+
 class MockPBGenerationProjectData extends Mock
     implements PBGenerationProjectData {}
 
@@ -50,6 +53,7 @@ void main() {
     var mockDirectedStateGraph = MockDirectedStateGraph();
     var mockIntermediateState = MockIntermediateState();
     var mockIntermediateVariation = MockIntermediateVariation();
+    var mockTree = MockTree();
 
     setUp(() async {
       /// Set up nodes
@@ -61,6 +65,7 @@ void main() {
       // 2
       when(node2.name).thenReturn('someElement/green');
       when(node2.generator).thenReturn(mockPBGenerator);
+      when(node2.currentContext).thenReturn(mockContext);
 
       /// IntermediateAuxiliaryData
       when(mockIntermediateAuxiliaryData.stateGraph)
@@ -78,6 +83,7 @@ void main() {
 
       /// Context
       when(mockContext.project).thenReturn(mockProject);
+      when(mockContext.treeRoot).thenReturn(mockTree);
 
       /// Project
       when(mockProject.genProjectData).thenReturn(mockPBGenerationProjectData);

test/lib/middleware/provider_test.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 import 'package:mockito/mockito.dart';
-import 'package:parabeac_core/generation/generators/attribute-helper/pb_generator_context.dart';
 import 'package:parabeac_core/generation/generators/middleware/state_management/provider_middleware.dart';
 import 'package:parabeac_core/generation/generators/pb_generation_manager.dart';
 import 'package:parabeac_core/generation/generators/pb_generator.dart';
@@ -10,6 +9,7 @@ import 'package:parabeac_core/generation/generators/value_objects/file_structure
 import 'package:parabeac_core/generation/generators/writers/pb_flutter_writer.dart';
 import 'package:parabeac_core/interpret_and_optimize/entities/subclasses/pb_intermediate_node.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_context.dart';
+import 'package:parabeac_core/interpret_and_optimize/helpers/pb_intermediate_node_tree.dart';
 import 'package:parabeac_core/interpret_and_optimize/helpers/pb_project.dart';
 import 'package:parabeac_core/interpret_and_optimize/state_management/directed_state_graph.dart';
 import 'package:parabeac_core/interpret_and_optimize/state_management/intermediate_auxillary_data.dart';
@@ -41,6 +41,8 @@ class MockIntermediateState extends Mock implements IntermediateState {}
 
 class MockIntermediateVariation extends Mock implements IntermediateVariation {}
 
+class MockTree extends Mock implements PBIntermediateTree {}
+
 void main() {
   group('Middlewares Tests', () {
     var testingPath = '${Directory.current.path}/test/lib/middleware/';
@@ -62,6 +64,7 @@ void main() {
     var mockDirectedStateGraph = MockDirectedStateGraph();
     var mockIntermediateState = MockIntermediateState();
     var mockIntermediateVariation = MockIntermediateVariation();
+    var mockTree = MockTree();
 
     setUp(() async {
       /// Nodes set up
@@ -74,6 +77,7 @@ void main() {
       // 2
       when(node2.name).thenReturn('someElement/green');
       when(node2.generator).thenReturn(mockPBGenerator);
+      when(node2.currentContext).thenReturn(mockContext);
 
       /// IntermediateAuxiliaryData
       when(mockIntermediateAuxiliaryData.stateGraph)
@@ -94,6 +98,7 @@ void main() {
 
       /// Context
       when(mockContext.project).thenReturn(mockProject);
+      when(mockContext.treeRoot).thenReturn(mockTree);
 
       /// Project
       when(mockProject.genProjectData).thenReturn(mockPBGenerationProjectData);