Merge pull request #9 from ARK4579/develop

flutter widget parsing udpates

.gitignore

@@ -1,4 +1,5 @@
 # See https://www.dartlang.org/guides/libraries/private-files
+*.exe
 
 # Files and directories created by pub
 .dart_tool/

example/dj_example.dart

@@ -15,13 +15,13 @@ void main() {
             // Adding this line for demonstration only!
             ImportDj(importStr: 'package:io/io.dart'),
             FunctionDj(
-              description: 'Main entry point to this file!',
+              descriptionDj: 'Main entry point to this file!',
               outputType: VariableType.Void,
               name: 'main',
               bodyCodeParts: [
                 FunctionCallDj(
                   name: 'print',
-                  args: ["'Hellow World!'"],
+                  args: ["'Hello World!'"],
                 ),
               ],
             ),

lib/main/djs/code_djs/base_widget_dj.dart

@@ -0,0 +1,29 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:dj/main/main.dart';
+
+part 'base_widget_dj.g.dart';
+
+@JsonSerializable()
+class BaseWidgetDj extends CodePartDj {
+  @JsonKey(name: 'baseWidgetDjType')
+  final String baseWidgetDjType;
+
+  BaseWidgetDj({
+    required this.baseWidgetDjType,
+    descriptionDj,
+    CodePartDjType codePartDjType = CodePartDjType.BaseWidget,
+  }) : super(
+          descriptionDj: descriptionDj,
+          codePartDjType: codePartDjType,
+        );
+
+  factory BaseWidgetDj.fromJson(Map<String, dynamic> json) =>
+      _$BaseWidgetDjFromJson(json);
+  @override
+  Map<String, dynamic> toJson() => _$BaseWidgetDjToJson(this);
+
+  @override
+  List<String> toCode() {
+    return super.toCode();
+  }
+}

lib/main/djs/code_djs/class.dart

@@ -0,0 +1,154 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:dj/main/main.dart';
+
+part 'class.g.dart';
+
+@JsonSerializable()
+class ClassDj extends CodePartDj {
+  @JsonKey(name: 'name')
+  final String? name;
+
+  @JsonKey(name: 'baseName')
+  final String? baseName;
+
+  @JsonKey(name: 'fields')
+  final List<FieldDj>? fields;
+
+  @JsonKey(name: 'isExtends')
+  final bool? isExtends;
+
+  @JsonKey(name: 'isImplements')
+  final bool? isImplements;
+
+  @JsonKey(name: 'jsonSerializable')
+  final bool? jsonSerializable;
+
+  @JsonKey(name: 'functions')
+  final List<CodePartDj>? functions;
+
+  ClassDj({
+    descriptionDj,
+    this.name,
+    this.baseName,
+    this.fields,
+    this.isExtends,
+    this.isImplements,
+    this.jsonSerializable,
+    this.functions,
+    CodePartDjType codePartDjType = CodePartDjType.Class,
+  }) : super(
+          descriptionDj: descriptionDj,
+          codePartDjType: codePartDjType,
+        );
+
+  factory ClassDj.fromJson(Map<String, dynamic> json) =>
+      _$ClassDjFromJson(json);
+  @override
+  Map<String, dynamic> toJson() => _$ClassDjToJson(this);
+
+  List<String> _constructorCode() {
+    var codeLines = <String>[];
+
+    codeLines.add('$name({');
+
+    var superOnlyFields = <FieldDj>[];
+
+    fields?.forEach((field) {
+      String? comment;
+      var fieldLine = '${field.name}';
+      if (field.superOnly ?? false) {
+        superOnlyFields.add(field);
+        if (field.defaultValue != null) {
+          fieldLine = '$fieldLine = ${field.defaultValue}';
+        } else {
+          fieldLine = '$fieldLine';
+        }
+      } else if (field.hasDefaultValue) {
+        comment = 'ignoring defaultValue ${field.defaultValue}';
+        fieldLine = 'this.$fieldLine';
+      } else {
+        fieldLine = 'this.$fieldLine';
+        if ((field.isRequired ?? false) &&
+            (field.appliedDataType != 'dynamic')) {
+          fieldLine = 'required $fieldLine';
+        }
+      }
+      fieldLine += ',';
+      if (comment != null) {
+        fieldLine += ' // $comment';
+      }
+      if (!field.isPrivate) {
+        codeLines.add(fieldLine);
+      }
+    });
+
+    if (superOnlyFields.isEmpty) {
+      codeLines.add('});');
+    } else {
+      codeLines.add('}) : super(');
+      superOnlyFields.forEach((field) {
+        codeLines.add('${field.name}:${field.name},');
+      });
+      codeLines.add(');');
+    }
+
+    if (functions != null) {
+      codeLines.add('\n');
+      functions?.forEach((function) {
+        codeLines += function.toCode();
+      });
+    }
+
+    return codeLines;
+  }
+
+  @override
+  List<String> toCode() {
+    var _lines = super.toCode();
+
+    var _jsonSerializable = jsonSerializable ?? false;
+
+    if (name == null) return _lines;
+
+    var baseLine = '';
+    if ((isExtends ?? false) && (baseName ?? '').isNotEmpty) {
+      baseLine = 'extends $baseName';
+    }
+    var classStartLine = [
+      if (_jsonSerializable) '@JsonSerializable()',
+      'class $name $baseLine {'
+    ];
+    _lines += classStartLine;
+
+    fields
+        ?.where((field) => (!(field.superOnly ?? false) && !field.isPrivate))
+        .forEach((field) {
+      if (_jsonSerializable) {
+        _lines.add("@JsonKey(name: '${field.name}')");
+      }
+      _lines += field.toCode();
+      _lines.add('');
+    });
+
+    _lines = _lines + _constructorCode();
+
+    if (jsonSerializable ?? false) {
+      _lines.add('');
+      var jsFromLine1 = '$name.fromJson(Map<String, dynamic> json)';
+      var jsFromLine2 = '_\$${name}FromJson(json);';
+      var jsFromLine = 'factory $jsFromLine1 => $jsFromLine2';
+      _lines.add(jsFromLine);
+    }
+
+    if (jsonSerializable ?? false) {
+      _lines.add('');
+      _lines.add('@override');
+      _lines.add('Map<String, dynamic> toJson() => _\$${name}ToJson(this);');
+    }
+
+    // class end line
+    _lines.add('}');
+
+    return _lines;
+  }
+}

lib/main/djs/code_djs/code_djs.dart

@@ -3,5 +3,14 @@ export 'import.dart';
 export 'function_call.dart';
 export 'function.dart';
 export 'if_else.dart';
-export 'stateless_widget.dart';
 export 'return.dart';
+export 'field.dart';
+export 'class.dart';
+export 'enum.dart';
+export 'map.dart';
+export 'empty_line.dart';
+export 'variable_declaration.dart';
+export 'single_line.dart';
+export 'export.dart';
+export 'base_widget_dj.dart';
+export 'manual_widget_dj.dart';