+breaking: Add support for better polymorphism

Author: t0mb3rr

.gitignore

@@ -17,4 +17,9 @@
 **/.github/.git
 **/.metadata
 **/.flutter-plugins
-**/.flutter-plugins-dependencies
+**/.flutter-plugins-dependencies
+**/pubspec_overrides.yaml
+
+# Don't support IntelliJ.
+**/*.iml
+**/*.idea/

example/example.dart

@@ -320,7 +320,7 @@ class FieldModel extends Model /* _FieldModel */ {
   }
 
   @override
-  FieldModel mergeWith(
+  BaseModel mergeWith(
     BaseModel? other, {
     bool deepMerge = false,
   }) {
@@ -331,7 +331,7 @@ class FieldModel extends Model /* _FieldModel */ {
   }
 
   /// Creates a copy of this instance, replacing the specified fields.
-  FieldModel copyWith({
+  FieldModel copyWithFieldModelProperties({
     List<String>? fieldPath,
     dynamic? fieldType,
     bool? nullable,
@@ -354,7 +354,7 @@ class FieldModel extends Model /* _FieldModel */ {
   }
 
   /// Creates a copy of this instance, removing the specified fields.
-  FieldModel copyWithout({
+  FieldModel copyWithoutFieldModelProperties({
     bool fieldPath = true,
     bool fieldType = true,
     bool nullable = true,

lib/src/models/data_ref/_data_ref_model.g.dart

@@ -237,7 +237,7 @@ class DataRefModel extends _DataRefModel {
   }
 
   @override
-  DataRefModel mergeWith(
+  BaseModel mergeWith(
     BaseModel? other, {
     bool deepMerge = false,
   }) {
@@ -248,7 +248,7 @@ class DataRefModel extends _DataRefModel {
   }
 
   /// Creates a copy of this instance, replacing the specified fields.
-  DataRefModel copyWith({
+  DataRefModel copyWithDataRefModelProperties({
     String? id,
     List<String>? collection,
   }) {
@@ -259,7 +259,7 @@ class DataRefModel extends _DataRefModel {
   }
 
   /// Creates a copy of this instance, removing the specified fields.
-  DataRefModel copyWithout({
+  DataRefModel copyWithoutDataRefModelProperties({
     bool id = true,
     bool collection = true,
   }) {

lib/src/models/field_model/_field_model.g.dart

@@ -334,7 +334,7 @@ class FieldModel extends _FieldModel {
   }
 
   @override
-  FieldModel mergeWith(
+  BaseModel mergeWith(
     BaseModel? other, {
     bool deepMerge = false,
   }) {
@@ -345,7 +345,7 @@ class FieldModel extends _FieldModel {
   }
 
   /// Creates a copy of this instance, replacing the specified fields.
-  FieldModel copyWith({
+  FieldModel copyWithFieldModelProperties({
     List<String>? fieldPath,
     dynamic? fieldType,
     bool? nullable,
@@ -368,7 +368,7 @@ class FieldModel extends _FieldModel {
   }
 
   /// Creates a copy of this instance, removing the specified fields.
-  FieldModel copyWithout({
+  FieldModel copyWithoutFieldModelProperties({
     bool fieldPath = true,
     bool fieldType = true,
     bool nullable = true,

lib/src/models/generate_dart_model/_generate_dart_model.g.dart

@@ -283,7 +283,7 @@ class GenerateDartModel extends _GenerateDartModel {
   }
 
   @override
-  GenerateDartModel mergeWith(
+  BaseModel mergeWith(
     BaseModel? other, {
     bool deepMerge = false,
   }) {
@@ -294,7 +294,7 @@ class GenerateDartModel extends _GenerateDartModel {
   }
 
   /// Creates a copy of this instance, replacing the specified fields.
-  GenerateDartModel copyWith({
+  GenerateDartModel copyWithGenerateDartModelProperties({
     String? className,
     Set<dynamic>? fields,
     bool? shouldInherit,
@@ -314,7 +314,7 @@ class GenerateDartModel extends _GenerateDartModel {
   }
 
   /// Creates a copy of this instance, removing the specified fields.
-  GenerateDartModel copyWithout({
+  GenerateDartModel copyWithoutGenerateDartModelProperties({
     bool className = true,
     bool fields = true,
     bool shouldInherit = true,

lib/src/models/model.dart

@@ -96,7 +96,7 @@ class Model extends BaseModel {
   //
 
   @override
-  Model mergeWith(
+  BaseModel mergeWith(
     BaseModel? other, {
     bool deepMerge = false,
   }) {

lib/src/models/referenced_model.dart/_referenced_model.g.dart

@@ -225,7 +225,7 @@ class ReferencedModel extends _ReferencedModel {
   }
 
   @override
-  ReferencedModel mergeWith(
+  BaseModel mergeWith(
     BaseModel? other, {
     bool deepMerge = false,
   }) {
@@ -236,7 +236,7 @@ class ReferencedModel extends _ReferencedModel {
   }
 
   /// Creates a copy of this instance, replacing the specified fields.
-  ReferencedModel copyWith({
+  ReferencedModel copyWithReferencedModelProperties({
     String? id,
     DataRefModel? ref,
   }) {
@@ -247,7 +247,7 @@ class ReferencedModel extends _ReferencedModel {
   }
 
   /// Creates a copy of this instance, removing the specified fields.
-  ReferencedModel copyWithout({
+  ReferencedModel copyWithoutReferencedModelProperties({
     bool id = true,
     bool ref = true,
   }) {

pubspec.yaml

@@ -12,7 +12,7 @@
 
 name: df_generate_dart_models_core
 description: A package that provides core dependencies for models generated with df_generate_dart_models.
-version: 0.6.11
+version: 0.7.0
 repository: https://github.com/DevCetra/df_generate_dart_models_core
 funding:
   - https://www.buymeacoffee.com/robmllze

templates/v2.dart.md

@@ -215,7 +215,7 @@ class ___CLASS_NAME___ extends ___SUPER_CLASS_NAME___ {
   }
 
   @override
-  ___CLASS_NAME___ mergeWith(
+  BaseModel mergeWith(
     BaseModel? other, {
     bool deepMerge = false,
   }) {
@@ -227,7 +227,7 @@ class ___CLASS_NAME___ extends ___SUPER_CLASS_NAME___ {
 
 
   /// Creates a copy of this instance, replacing the specified fields.
-  ___CLASS_NAME___ copyWith({
+  ___CLASS_NAME___ copyWith___CLASS_NAME___Properties({
     ___COPY_WITH_PARAMS___
   }) {
     return ___CLASS_NAME___.assertRequired(
@@ -236,7 +236,7 @@ class ___CLASS_NAME___ extends ___SUPER_CLASS_NAME___ {
   }
 
   /// Creates a copy of this instance, removing the specified fields.
-  ___CLASS_NAME___ copyWithout({
+  ___CLASS_NAME___ copyWithout___CLASS_NAME___Properties({
     ___COPY_WITHOUT_PARAMS___
   }) {
     return ___CLASS_NAME___.assertRequired(