fix(core): add TS non-null assertion operator for non-nullable columns (

#323)
mikro-orm · Feb 12, 2020 · e6d6f21 · e6d6f21
1 parent 283e58d
commit e6d6f21
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 84 deletions.
diff --git a/lib/schema/EntityGenerator.ts b/lib/schema/EntityGenerator.ts
@@ -70,10 +70,12 @@ export class EntityGenerator {
   }
 
   private getPropertyDefinition(column: Column, prop: string, type: string, defaultValue: any): string {
-    const ret = `${prop}${column.nullable ? '?' : ''}: ${type}`;
-
     // string defaults are usually things like SQL functions
-    if (!defaultValue || typeof defaultValue === 'string') {
+    const useDefault = defaultValue && typeof defaultValue !== 'string';
+    const optional = column.nullable ? '?' : (useDefault ? '' : '!');
+    const ret = `${prop}${optional}: ${type}`;
+
+    if (!useDefault) {
       return ret + ';';
     }