fixes

lib/src/builder/generator.dart

@@ -253,19 +253,22 @@ class EntityGenerator extends GeneratorForAnnotation<entity.Table> {
         ..fields.addAll(fieldsRequiredForCreate.map((f) => Field(
               (fb) => fb
                 ..name = f.name
-                ..type = refer('value<${f.type.withNullability}>')
+                ..type = refer('value<${f.type.withNullability}>${!f.type.isNullable ? '?' : ''}')
                 ..modifier = FieldModifier.final$,
             )))
         ..constructors.add(
           Constructor(
             (c) => c
               ..constant = true
               ..optionalParameters.addAll(fieldsRequiredForCreate.map(
-                (field) => Parameter((p) => p
-                  ..named = true
-                  ..name = field.name
-                  ..toThis = true
-                  ..defaultTo = Code('const NoValue()')),
+                (field) => Parameter((p) {
+                  p
+                    ..named = true
+                    ..name = field.name
+                    ..toThis = true;
+
+                  if (field.type.isNullable) p.defaultTo = Code('const NoValue()');
+                }),
               )),
           ),
         )
@@ -276,7 +279,12 @@ class EntityGenerator extends GeneratorForAnnotation<entity.Table> {
           ..annotations.add(CodeExpression(Code('override')))
           ..lambda = true
           ..body = Code('''{
-      ${entity.normalFields.map((e) => 'if (${e.name} is! NoValue) #${e.name}: ${e.name}.val${!e.type.isNullable ? '!' : ''}'.trim()).join(',')},
+      ${entity.normalFields.map((e) {
+            if (e.type.isNullable) {
+              return 'if (${e.name} is! NoValue) #${e.name}: ${e.name}.val';
+            }
+            return 'if (${e.name} != null) #${e.name}: ${e.name}!.val';
+          }).join(',')},
 }''')))),
     ];
   }
@@ -417,11 +425,13 @@ class EntityGenerator extends GeneratorForAnnotation<entity.Table> {
           )''';
     }
 
-    return '''DBEntityField(
-        $requiredOpts
-        ${field.type.isNullable ? 'nullable: true, ' : ''}
-        ${unique ? 'unique: true, ' : ''}
-        )''';
+    final args = [
+      requiredOpts,
+      if (field.type.isNullable) 'nullable: true',
+      if (unique) 'unique: true',
+    ].join(',');
+
+    return '''DBEntityField($args)''';
   }
 
   /// Generate JOIN for BelongsTo getters on Entity

lib/src/builder/utils.dart

@@ -167,9 +167,6 @@ Stream<(ResolvedLibraryResult, String, String)> _libraries(AnalysisContextCollec
     final futures =
         analyzedFiles.where((path) => path.endsWith('.dart') && !path.endsWith('_test.dart')).map((filePath) async {
       final library = await context.currentSession.getResolvedLibrary(filePath);
-
-      print(library);
-
       if (library is! ResolvedLibraryResult) return null;
       return (library, filePath, context.contextRoot.root.path);
     });

lib/src/cli/model/migration.dart

@@ -6,7 +6,7 @@ part 'migration.g.dart';
 
 @Table(name: 'migrations')
 class MigrationEntity extends Entity<MigrationEntity> {
-  @autoIncrementPrimary
+  @primaryKey
   final int id;
 
   final String migration;

lib/src/database/entity/entity.dart

@@ -151,16 +151,11 @@ class bindTo {
   const bindTo(this.type, {this.on, this.onUpdate, this.onDelete});
 }
 
-const autoIncrementPrimary = PrimaryKey(autoIncrement: true);
-const table = Table();
-const createdAtCol = CreatedAtColumn();
-const updatedAtCol = UpdatedAtColumn();
-
-class value<T extends Object> {
-  final T? val;
+class value<T> {
+  final T val;
   const value(this.val);
 }
 
-class NoValue<T extends Object> extends value<T> {
+class NoValue<T> extends value<T?> {
   const NoValue() : super(null);
 }

lib/yaroorm.dart

@@ -1,5 +1,7 @@
 library;
 
+import 'src/database/entity/entity.dart';
+
 export 'src/query/query.dart';
 export 'src/database/driver/driver.dart';
 export 'src/database/entity/entity.dart' hide entityMapToDbData, entityToDbData, dbDataToEntity, combineConverters;
@@ -8,3 +10,8 @@ export 'src/config.dart';
 export 'src/reflection.dart'
     hide getEntityTableName, getEntityPrimaryKey, EntityInstanceReflector, EntityInstanceBuilder;
 export 'src/migration.dart';
+
+const primaryKey = PrimaryKey(autoIncrement: true);
+const table = Table();
+const createdAtCol = CreatedAtColumn();
+const updatedAtCol = UpdatedAtColumn();