Feature/#126 use config in tests

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
-## [7.0.0] - 2022-12-25
+## [7.0.0] - 2023-01-10
+- Updated min dart version to >2.17
 - Added support for generating drift tables by adding `generate_drift_table: true` on model definition
+- Added jsonValue to enum values to easily map from/to json values
 
 ## [6.1.0] - 2022-10-14
 - Support passing a directory instead of a file. All .yaml files inside this folder (recursively) will be used to build the final model data.

bin/model_generator.dart

@@ -3,13 +3,11 @@ import 'dart:io';
 import 'package:args/args.dart';
 import 'package:model_generator/config/pubspec_config.dart';
 import 'package:model_generator/config/yml_generator_config.dart';
-import 'package:model_generator/model/field.dart';
 import 'package:model_generator/model/model/custom_model.dart';
 import 'package:model_generator/model/model/enum_model.dart';
 import 'package:model_generator/model/model/json_converter_model.dart';
 import 'package:model_generator/model/model/model.dart';
 import 'package:model_generator/model/model/object_model.dart';
-import 'package:model_generator/util/list_extensions.dart';
 import 'package:model_generator/writer/drift_model_writer.dart';
 import 'package:model_generator/writer/enum_model_writer.dart';
 import 'package:model_generator/writer/object_model_writer.dart';
@@ -100,37 +98,15 @@ void writeToFiles(
     }
     String? content;
     if (model is ObjectModel) {
-      final extendsModelfields = <Field>[];
-      var extendsModelextends = model.extendsModel;
-      while (extendsModelextends != null) {
-        final extendsModelextendsModel = modelGeneratorConfig.models
-                .firstWhereOrNull(
-                    (element) => element.name == extendsModelextends)
-            as ObjectModel?; // ignore: avoid_as
-        extendsModelfields.addAll(extendsModelextendsModel?.fields ?? []);
-        extendsModelextends = extendsModelextendsModel?.extendsModel;
-      }
       content = ObjectModelWriter(
         pubspecConfig,
         model,
-        extendsModelfields,
         modelGeneratorConfig,
       ).write();
       if (model.generateDriftTable == true) {
-        final enumFields = <Field>[];
-        for (final field
-            in model.fields.where((element) => !element.ignoreForTable)) {
-          final fieldModel = modelGeneratorConfig.models
-              .firstWhereOrNull((element) => element.name == field.type.name);
-          if (fieldModel is EnumModel) {
-            enumFields.add(field);
-          }
-        }
         final tableContent = DriftModelWriter(
           pubspecConfig,
           model,
-          extendsModelfields,
-          enumFields,
           modelGeneratorConfig,
         ).write();
         _saveFile(model, tableContent, 'database');

example/model_generator/config.yaml

@@ -198,6 +198,7 @@ Book:
     publishers:
       type: array
       required: false # this is NOT required, so will be added to the getModel method as optional
+      ignore_for_table: true
       items:
         type: Person
     category: BookCategory

example/pubspec.yaml

@@ -3,7 +3,7 @@ description: A project used to demo the model generator
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
   drift: ^2.3.0 # This is added since we can now generate database tables

lib/util/field_util.dart

@@ -0,0 +1,35 @@
+import 'package:model_generator/config/yml_generator_config.dart';
+import 'package:model_generator/model/field.dart';
+import 'package:model_generator/model/model/enum_model.dart';
+import 'package:model_generator/model/model/object_model.dart';
+import 'package:model_generator/util/list_extensions.dart';
+
+class FieldUtil {
+  static List<Field> getExtendedFields(
+      ObjectModel model, YmlGeneratorConfig ymlConfig) {
+    final extendsModelfields = <Field>[];
+    var extendsModelextends = model.extendsModel;
+    while (extendsModelextends != null) {
+      final extendsModelextendsModel = ymlConfig.models.firstWhereOrNull(
+              (element) => element.name == extendsModelextends)
+          as ObjectModel?; // ignore: avoid_as
+      extendsModelfields.addAll(extendsModelextendsModel?.fields ?? []);
+      extendsModelextends = extendsModelextendsModel?.extendsModel;
+    }
+    return extendsModelfields;
+  }
+
+  static List<Field> getEnumFields(
+      ObjectModel model, YmlGeneratorConfig ymlConfig) {
+    final enumFields = <Field>[];
+    for (final field
+        in model.fields.where((element) => !element.ignoreForTable)) {
+      final fieldModel = ymlConfig.models
+          .firstWhereOrNull((element) => element.name == field.type.name);
+      if (fieldModel is EnumModel) {
+        enumFields.add(field);
+      }
+    }
+    return enumFields;
+  }
+}