@mikro-orm/entity-generator 7.0.0-rc.2 → 7.0.0-rc.3

package/DefineEntitySourceFile.js

@@ -28,7 +28,7 @@ export class DefineEntitySourceFile extends EntitySchemaSourceFile {
         else {
             entitySchemaOptions.class = this.meta.className;
         }
-        Object.assign(entitySchemaOptions, (this.meta.embeddable ? this.getEmbeddableDeclOptions() : (this.meta.collection ? this.getEntityDeclOptions() : {})));
+        Object.assign(entitySchemaOptions, this.meta.embeddable ? this.getEmbeddableDeclOptions() : this.meta.collection ? this.getEntityDeclOptions() : {});
         const nameSuffix = this.options.inferEntityType ? '' : 'Schema';
         const declLine = `export const ${this.meta.className + nameSuffix} = ${this.referenceCoreImport('defineEntity')}(`;
         ret += declLine;
@@ -81,14 +81,45 @@ export class DefineEntitySourceFile extends EntitySchemaSourceFile {
             }
         }
         const simpleOptions = new Set([
-            'primary', 'ref', 'nullable', 'array', 'object', 'mapToPk', 'hidden', 'concurrencyCheck', 'lazy', 'eager',
-            'orphanRemoval', 'version', 'unsigned', 'returning', 'createForeignKeyConstraint', 'fixedOrder', 'owner',
-            'getter', 'setter', 'unique', 'index', 'hydrate', 'persist', 'autoincrement',
+            'primary',
+            'ref',
+            'nullable',
+            'array',
+            'object',
+            'mapToPk',
+            'hidden',
+            'concurrencyCheck',
+            'lazy',
+            'eager',
+            'orphanRemoval',
+            'version',
+            'unsigned',
+            'returning',
+            'createForeignKeyConstraint',
+            'fixedOrder',
+            'owner',
+            'getter',
+            'setter',
+            'unique',
+            'index',
+            'hydrate',
+            'persist',
+            'autoincrement',
         ]);
         const skipOptions = new Set(['entity', 'kind', 'type', 'items']);
         const spreadOptions = new Set([
-            'fieldNames', 'joinColumns', 'inverseJoinColumns', 'referencedColumnNames', 'ownColumns', 'columnTypes',
-            'cascade', 'ignoreSchemaChanges', 'customOrder', 'groups', 'where', 'orderBy',
+            'fieldNames',
+            'joinColumns',
+            'inverseJoinColumns',
+            'referencedColumnNames',
+            'ownColumns',
+            'columnTypes',
+            'cascade',
+            'ignoreSchemaChanges',
+            'customOrder',
+            'groups',
+            'where',
+            'orderBy',
         ]);
         const rename = {
             fieldName: 'name',

package/EntityGenerator.js

@@ -71,7 +71,8 @@ export class EntityGenerator {
         return files.map(([, data]) => data);
     }
     async getEntityMetadata(schema, options) {
-        const metadata = schema.getTables()
+        const metadata = schema
+            .getTables()
             .filter(table => !options.schema || table.schema === options.schema)
             .sort((a, b) => `${a.schema}.${a.name}`.localeCompare(`${b.schema}.${b.name}`))
             .map(table => {
@@ -87,12 +88,17 @@ export class EntityGenerator {
         });
         for (const meta of metadata) {
             for (const prop of meta.relations) {
-                if (!metadata.some(otherMeta => prop.referencedTableName === otherMeta.collection || prop.referencedTableName === `${otherMeta.schema ?? schema.name}.${otherMeta.collection}`)) {
+                if (!metadata.some(otherMeta => prop.referencedTableName === otherMeta.collection ||
+                    prop.referencedTableName === `${otherMeta.schema ?? schema.name}.${otherMeta.collection}`)) {
                     prop.kind = ReferenceKind.SCALAR;
                     const mappedTypes = prop.columnTypes.map((t, i) => this.platform.getMappedType(t));
                     const runtimeTypes = mappedTypes.map(t => t.runtimeType);
                     prop.runtimeType = (runtimeTypes.length === 1 ? runtimeTypes[0] : `[${runtimeTypes.join(', ')}]`);
-                    prop.type = mappedTypes.length === 1 ? (Utils.entries(types).find(([k, v]) => Object.getPrototypeOf(mappedTypes[0]) === v.prototype)?.[0] ?? mappedTypes[0].name) : 'unknown';
+                    prop.type =
+                        mappedTypes.length === 1
+                            ? (Utils.entries(types).find(([k, v]) => Object.getPrototypeOf(mappedTypes[0]) === v.prototype)?.[0] ??
+                                mappedTypes[0].name)
+                            : 'unknown';
                 }
                 const meta2 = metadata.find(meta2 => meta2.className === prop.type);
                 const targetPrimaryColumns = meta2?.getPrimaryProps().flatMap(p => p.fieldNames);
@@ -111,7 +117,9 @@ export class EntityGenerator {
                 meta.className = this.namingStrategy.getEntityName(`${meta.schema ?? schema.name}_${meta.className}`);
                 for (const relMeta of metadata) {
                     for (const prop of relMeta.relations) {
-                        if (prop.type === duplicate && (prop.referencedTableName === meta.collection || prop.referencedTableName === `${meta.schema ?? schema.name}.${meta.collection}`)) {
+                        if (prop.type === duplicate &&
+                            (prop.referencedTableName === meta.collection ||
+                                prop.referencedTableName === `${meta.schema ?? schema.name}.${meta.collection}`)) {
                             prop.type = meta.className;
                         }
                     }
@@ -197,9 +205,11 @@ export class EntityGenerator {
     detectManyToManyRelations(metadata, onlyPurePivotTables, readOnlyPivotTables, outputPurePivotTables) {
         for (const meta of metadata) {
             const isReferenced = metadata.some(m => {
-                return m.tableName !== meta.tableName && m.relations.some(r => {
-                    return r.referencedTableName === meta.tableName && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(r.kind);
-                });
+                return (m.tableName !== meta.tableName &&
+                    m.relations.some(r => {
+                        return (r.referencedTableName === meta.tableName &&
+                            [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(r.kind));
+                    }));
             });
             if (isReferenced) {
                 this.referencedEntities.add(meta);
@@ -210,8 +220,7 @@ export class EntityGenerator {
             }
             // Entities where there are not exactly 2 PK relations that are both ManyToOne are never pivot tables. Skip.
             const pkRelations = meta.relations.filter(rel => rel.primary);
-            if (pkRelations.length !== 2 ||
-                pkRelations.some(rel => rel.kind !== ReferenceKind.MANY_TO_ONE)) {
+            if (pkRelations.length !== 2 || pkRelations.some(rel => rel.kind !== ReferenceKind.MANY_TO_ONE)) {
                 continue;
             }
             const pkRelationFields = new Set(pkRelations.flatMap(rel => rel.fieldNames));
@@ -227,8 +236,7 @@ export class EntityGenerator {
                     continue;
                 }
                 const pkRelationNames = pkRelations.map(rel => rel.name);
-                let otherProps = meta.props
-                    .filter(prop => !pkRelationNames.includes(prop.name) &&
+                let otherProps = meta.props.filter(prop => !pkRelationNames.includes(prop.name) &&
                     prop.persist !== false && // Skip checking non-persist props
                     prop.fieldNames.some(fieldName => nonPkFields.includes(fieldName)));
                 // Deal with the auto increment column first. That is the column used for fixed ordering, if present.
@@ -327,9 +335,9 @@ export class EntityGenerator {
                     continue;
                 }
                 let i = 1;
-                const name = newProp.name = this.namingStrategy.inverseSideName(meta.className, prop.name, newProp.kind);
+                const name = (newProp.name = this.namingStrategy.inverseSideName(meta.className, prop.name, newProp.kind));
                 while (targetMeta.properties[newProp.name]) {
-                    newProp.name = name + (i++);
+                    newProp.name = name + i++;
                 }
                 targetMeta.addProperty(newProp);
             }

package/EntitySchemaSourceFile.js

@@ -19,7 +19,11 @@ export class EntitySchemaSourceFile extends SourceFile {
         ret += `\n`;
         const entitySchemaOptions = {
             class: this.meta.className,
-            ...(this.meta.embeddable ? this.getEmbeddableDeclOptions() : (this.meta.collection ? this.getEntityDeclOptions() : {})),
+            ...(this.meta.embeddable
+                ? this.getEmbeddableDeclOptions()
+                : this.meta.collection
+                    ? this.getEntityDeclOptions()
+                    : {}),
         };
         const declLine = `export const ${this.meta.className}Schema = new ${this.referenceCoreImport('EntitySchema')}(`;
         ret += declLine;
@@ -122,7 +126,7 @@ export class EntitySchemaSourceFile extends SourceFile {
             }
             const defaultName = this.platform.getIndexName(this.meta.collection, prop.fieldNames, type);
             /* v8 ignore next */
-            options[type] = (propType === true || defaultName === propType) ? 'true' : this.quote(propType);
+            options[type] = propType === true || defaultName === propType ? 'true' : this.quote(propType);
             const expected = {
                 index: this.platform.indexForeignKeys(),
                 unique: prop.kind === ReferenceKind.ONE_TO_ONE,

package/SourceFile.js

@@ -177,7 +177,8 @@ export class SourceFile {
             uniqueOpt.properties = Utils.asArray(index.properties).map(prop => this.quote('' + prop));
         }
         if (index.deferMode) {
-            uniqueOpt.deferMode = `${this.referenceCoreImport('DeferMode')}.INITIALLY_${index.deferMode.toUpperCase()}`;
+            uniqueOpt.deferMode =
+                `${this.referenceCoreImport('DeferMode')}.INITIALLY_${index.deferMode.toUpperCase()}`;
         }
         const columns = this.getColumnOptions(index.columns);
         if (columns) {
@@ -197,25 +198,31 @@ export class SourceFile {
     generateImports() {
         const imports = new Set();
         if (this.coreImports.size > 0) {
-            imports.add(`import { ${([...this.coreImports].sort().map(t => {
+            imports.add(`import { ${[...this.coreImports]
+                .sort()
+                .map(t => {
                 let ret = POSSIBLE_TYPE_IMPORTS.includes(t) ? `type ${t}` : t;
                 if (this.options.coreImportsPrefix) {
                     const resolvedIdentifier = `${this.options.coreImportsPrefix}${t}`;
                     ret += ` as ${resolvedIdentifier}`;
                 }
                 return ret;
-            }).join(', '))} } from '@mikro-orm/core';`);
+            })
+                .join(', ')} } from '@mikro-orm/core';`);
         }
         if (this.decoratorImports.size > 0) {
             const type = this.options.decorators;
-            imports.add(`import { ${([...this.decoratorImports].sort().map(t => {
+            imports.add(`import { ${[...this.decoratorImports]
+                .sort()
+                .map(t => {
                 let ret = t;
                 if (this.options.coreImportsPrefix) {
                     const resolvedIdentifier = `${this.options.coreImportsPrefix}${t}`;
                     ret += ` as ${resolvedIdentifier}`;
                 }
                 return ret;
-            }).join(', '))} } from '@mikro-orm/decorators/${type}';`);
+            })
+                .join(', ')} } from '@mikro-orm/decorators/${type}';`);
         }
         const extension = this.options.esmImport ? '.js' : '';
         const { dir, base } = parse(`${this.options.path ?? '.'}/${this.getBaseName()}`);
@@ -325,22 +332,28 @@ export class SourceFile {
                 }
                 return prop.type;
             })();
-        const hasUsableNullDefault = (prop.nullable && !this.options.forceUndefined && prop.default === null);
-        const useDefault = hasUsableNullDefault || (!(typeof prop.default === 'undefined' || prop.default === null) && propType !== 'unknown' && typeof breakdownOfIType === 'undefined');
-        const optional = (prop.nullable && (this.options.forceUndefined || prop.optional)) ? '?' : (useDefault ? '' : '!');
+        const hasUsableNullDefault = prop.nullable && !this.options.forceUndefined && prop.default === null;
+        const useDefault = hasUsableNullDefault ||
+            (!(typeof prop.default === 'undefined' || prop.default === null) &&
+                propType !== 'unknown' &&
+                typeof breakdownOfIType === 'undefined');
+        const optional = prop.nullable && (this.options.forceUndefined || prop.optional) ? '?' : useDefault ? '' : '!';
         let ret = `${propName}${optional}: `;
         const isArray = prop.array && (prop.kind === ReferenceKind.EMBEDDED || prop.enum);
         const complexType = isArray ? `${propType}[]` : propType;
         let wrappedType = prop.ref
-            ? `${this.referenceCoreImport('Ref')}<${complexType}${(isScalar && prop.nullable && !this.options.forceUndefined) ? ' | null' : ''}>`
-            : ((this.options.esmImport && !isScalar) ? `${this.referenceCoreImport('Rel')}<${complexType}>` : complexType);
-        if (prop.nullable && !this.options.forceUndefined && (!isScalar || (!prop.ref && !wrappedType.includes(' | null')))) {
+            ? `${this.referenceCoreImport('Ref')}<${complexType}${isScalar && prop.nullable && !this.options.forceUndefined ? ' | null' : ''}>`
+            : this.options.esmImport && !isScalar
+                ? `${this.referenceCoreImport('Rel')}<${complexType}>`
+                : complexType;
+        if (prop.nullable &&
+            !this.options.forceUndefined &&
+            (!isScalar || (!prop.ref && !wrappedType.includes(' | null')))) {
             wrappedType += ' | null';
         }
-        const optionalType = (optional !== '?' && prop.optional)
-            ? ` & ${this.referenceCoreImport('Opt')}`
-            : '';
-        ret += (!this.options.forceUndefined && prop.nullable && (hiddenType || optionalType)) ? `(${wrappedType})` : wrappedType;
+        const optionalType = optional !== '?' && prop.optional ? ` & ${this.referenceCoreImport('Opt')}` : '';
+        ret +=
+            !this.options.forceUndefined && prop.nullable && (hiddenType || optionalType) ? `(${wrappedType})` : wrappedType;
         ret += hiddenType;
         ret += optionalType;
         if (!useDefault) {
@@ -424,17 +437,19 @@ export class SourceFile {
                 return res;
             }
         }
-        const nextWordwrap = typeof wordwrap === 'number' ? 80 - (spaces ?? 0) - (level * 2) : undefined;
+        const nextWordwrap = typeof wordwrap === 'number' ? 80 - (spaces ?? 0) - level * 2 : undefined;
         const sep = typeof spaces === 'undefined' ? ', ' : `,\n${' '.repeat(spaces)}`;
         const doIndent = typeof spaces !== 'undefined';
         if (Array.isArray(options)) {
-            return `[${doIndent ? `\n${' '.repeat(spaces)}` : ''}${options.map(val => `${doIndent ? ' '.repeat((level * 2) + (spaces + 2)) : ''}${this.serializeValue(val, typeof nextWordwrap === 'number' ? nextWordwrap : undefined, doIndent ? spaces : undefined, level + 1)}`).join(sep)}${doIndent ? `${options.length > 0 ? ',\n' : ''}${' '.repeat(spaces + (level * 2))}` : ''}]`;
+            return `[${doIndent ? `\n${' '.repeat(spaces)}` : ''}${options.map(val => `${doIndent ? ' '.repeat(level * 2 + (spaces + 2)) : ''}${this.serializeValue(val, typeof nextWordwrap === 'number' ? nextWordwrap : undefined, doIndent ? spaces : undefined, level + 1)}`).join(sep)}${doIndent ? `${options.length > 0 ? ',\n' : ''}${' '.repeat(spaces + level * 2)}` : ''}]`;
         }
         const entries = Object.entries(options);
-        return `{${doIndent ? `\n${' '.repeat(spaces)}` : ' '}${entries.map(([opt, val]) => {
+        return `{${doIndent ? `\n${' '.repeat(spaces)}` : ' '}${entries
+            .map(([opt, val]) => {
             const key = identifierRegex.test(opt) ? opt : this.quote(opt);
-            return `${doIndent ? ' '.repeat((level * 2) + (spaces + 2)) : ''}${key}: ${this.serializeValue(val, typeof nextWordwrap === 'number' ? nextWordwrap - key.length - 2 /* ': '.length*/ : undefined, doIndent ? spaces : undefined, level + 1)}`;
-        }).join(sep)}${doIndent ? `${entries.length > 0 ? ',\n' : ''}${' '.repeat(spaces + (level * 2))}` : ' '}}`;
+            return `${doIndent ? ' '.repeat(level * 2 + (spaces + 2)) : ''}${key}: ${this.serializeValue(val, typeof nextWordwrap === 'number' ? nextWordwrap - key.length - 2 /* ': '.length*/ : undefined, doIndent ? spaces : undefined, level + 1)}`;
+        })
+            .join(sep)}${doIndent ? `${entries.length > 0 ? ',\n' : ''}${' '.repeat(spaces + level * 2)}` : ' '}}`;
     }
     serializeValue(val, wordwrap, spaces, level = 1) {
         if (typeof val === 'object' && val !== null) {
@@ -480,14 +495,19 @@ export class SourceFile {
             options.abstract = true;
         }
         if (this.meta.discriminatorValue) {
-            options.discriminatorValue = typeof this.meta.discriminatorValue === 'string' ? this.quote(this.meta.discriminatorValue) : this.meta.discriminatorValue;
+            options.discriminatorValue =
+                typeof this.meta.discriminatorValue === 'string'
+                    ? this.quote(this.meta.discriminatorValue)
+                    : this.meta.discriminatorValue;
         }
         if (this.meta.discriminatorColumn) {
             options.discriminatorColumn = this.quote(this.meta.discriminatorColumn);
         }
         if (this.meta.discriminatorMap) {
-            options.discriminatorMap = Object.fromEntries(Object.entries(this.meta.discriminatorMap)
-                .map(([discriminatorValue, cls]) => [discriminatorValue, this.quote(Utils.className(cls))]));
+            options.discriminatorMap = Object.fromEntries(Object.entries(this.meta.discriminatorMap).map(([discriminatorValue, cls]) => [
+                discriminatorValue,
+                this.quote(Utils.className(cls)),
+            ]));
         }
         return options;
     }
@@ -529,7 +549,7 @@ export class SourceFile {
                 return;
             }
             const defaultName = this.platform.getIndexName(this.meta.collection, prop.fieldNames, type);
-            options[type] = (propType === true || defaultName === propType) ? 'true' : this.quote(propType);
+            options[type] = propType === true || defaultName === propType ? 'true' : this.quote(propType);
             const expected = {
                 index: this.platform.indexForeignKeys(),
                 unique: prop.kind === ReferenceKind.ONE_TO_ONE,
@@ -574,12 +594,10 @@ export class SourceFile {
         if (prop.primary && (prop.enum || !(typeof prop.kind === 'undefined' || prop.kind === ReferenceKind.SCALAR))) {
             options.primary = true;
         }
-        ['persist', 'hydrate']
-            .filter(key => prop[key] === false)
-            .forEach(key => options[key] = false);
+        ['persist', 'hydrate'].filter(key => prop[key] === false).forEach(key => (options[key] = false));
         ['onCreate', 'onUpdate', 'serializer']
             .filter(key => typeof prop[key] === 'function')
-            .forEach(key => options[key] = `${prop[key]}`);
+            .forEach(key => (options[key] = `${prop[key]}`));
         if (typeof prop.serializedName === 'string') {
             options.serializedName = this.quote(prop.serializedName);
         }
@@ -588,7 +606,7 @@ export class SourceFile {
         }
         ['hidden', 'version', 'concurrencyCheck', 'eager', 'lazy', 'orphanRemoval']
             .filter(key => prop[key])
-            .forEach(key => options[key] = true);
+            .forEach(key => (options[key] = true));
         if (prop.cascade && (prop.cascade.length !== 1 || prop.cascade[0] !== Cascade.PERSIST)) {
             options.cascade = `[${prop.cascade.map(value => `${this.referenceCoreImport('Cascade')}.${value.toUpperCase()}`).join(', ')}]`;
         }
@@ -597,11 +615,17 @@ export class SourceFile {
         }
         // TODO: Composite FKs with default values require additions to default/defaultRaw that are not yet supported.
         if (prop.fieldNames?.length <= 1) {
-            if (typeof prop.defaultRaw !== 'undefined' && prop.defaultRaw !== 'null' && prop.defaultRaw !== '' &&
+            if (typeof prop.defaultRaw !== 'undefined' &&
+                prop.defaultRaw !== 'null' &&
+                prop.defaultRaw !== '' &&
                 prop.defaultRaw !== (typeof prop.default === 'string' ? this.quote(prop.default) : `${prop.default}`)) {
                 options.defaultRaw = `\`${prop.defaultRaw}\``;
             }
-            else if (!(typeof prop.default === 'undefined' || prop.default === null) && (prop.ref || (!prop.enum && (typeof prop.kind === 'undefined' || prop.kind === ReferenceKind.SCALAR) && (prop.type === 'unknown' || typeof this.breakdownOfIType(prop) !== 'undefined')))) {
+            else if (!(typeof prop.default === 'undefined' || prop.default === null) &&
+                (prop.ref ||
+                    (!prop.enum &&
+                        (typeof prop.kind === 'undefined' || prop.kind === ReferenceKind.SCALAR) &&
+                        (prop.type === 'unknown' || typeof this.breakdownOfIType(prop) !== 'undefined')))) {
                 options.default = typeof prop.default === 'string' ? this.quote(prop.default) : prop.default;
             }
         }
@@ -622,11 +646,12 @@ export class SourceFile {
             return this.propTypeBreakdowns.get(prop);
         }
         const mappedDeclaredType = this.platform.getMappedType(prop.type);
-        const mappedRawType = (prop.customTypes?.[0] ?? ((prop.type !== 'unknown' && mappedDeclaredType instanceof UnknownType)
-            ? this.platform.getMappedType(prop.columnTypes[0])
-            : mappedDeclaredType));
+        const mappedRawType = prop.customTypes?.[0] ??
+            (prop.type !== 'unknown' && mappedDeclaredType instanceof UnknownType
+                ? this.platform.getMappedType(prop.columnTypes[0])
+                : mappedDeclaredType);
         const rawType = mappedRawType.runtimeType;
-        const mappedSerializedType = (prop.customType ?? mappedRawType);
+        const mappedSerializedType = prop.customType ?? mappedRawType;
         const serializedType = mappedSerializedType.runtimeType;
         // Add non-lib imports where needed.
         for (const typeSpec of [prop.runtimeType, rawType, serializedType]) {
@@ -640,10 +665,12 @@ export class SourceFile {
             mappedRawType.prop?.nullable ?? prop.nullable ?? false,
             mappedSerializedType.prop?.nullable ?? prop.nullable ?? false,
         ];
-        const hasMixedNullability = (new Set(nullables)).size > 1;
+        const hasMixedNullability = new Set(nullables).size > 1;
         if (prop.runtimeType !== rawType || rawType !== serializedType || hasMixedNullability) {
             const nullType = this.options.forceUndefined ? ' | undefined' : ' | null';
-            if (rawType !== serializedType || nullables[1] !== nullables[2] || (prop.hidden && nullables[0] !== nullables[1])) {
+            if (rawType !== serializedType ||
+                nullables[1] !== nullables[2] ||
+                (prop.hidden && nullables[0] !== nullables[1])) {
                 const r = [prop.runtimeType, rawType, serializedType];
                 if (hasMixedNullability || prop.hidden) {
                     for (let i = r.length - 1; i >= 0; --i) {
@@ -708,14 +735,19 @@ export class SourceFile {
             options.type = prop.type;
         }
         else {
-            if (this.options.scalarTypeInDecorator // always output type if forced by the generator options
-                || (prop.nullable && !this.options.forceUndefined) // also when there is the "| null" type modifier (because reflect-metadata can't extract the base)
-                || prop.hidden // also when there is the "& Hidden" type modifier (because reflect-metadata can't extract the base)
-                || (new Set([mappedRuntimeType.name, mappedColumnType.name, mappedDeclaredType.name, this.platform.getMappedType(prop.runtimeType === 'Date' ? 'datetime' : prop.runtimeType).name])).size > 1 // also, if there's any ambiguity in the type
-                || (() => {
-                    const hasUsableNullDefault = (prop.nullable && !this.options.forceUndefined && prop.default === null);
+            if (this.options.scalarTypeInDecorator || // always output type if forced by the generator options
+                (prop.nullable && !this.options.forceUndefined) || // also when there is the "| null" type modifier (because reflect-metadata can't extract the base)
+                prop.hidden || // also when there is the "& Hidden" type modifier (because reflect-metadata can't extract the base)
+                new Set([
+                    mappedRuntimeType.name,
+                    mappedColumnType.name,
+                    mappedDeclaredType.name,
+                    this.platform.getMappedType(prop.runtimeType === 'Date' ? 'datetime' : prop.runtimeType).name,
+                ]).size > 1 || // also, if there's any ambiguity in the type
+                (() => {
+                    const hasUsableNullDefault = prop.nullable && !this.options.forceUndefined && prop.default === null;
                     const useDefault = hasUsableNullDefault || !(typeof prop.default === 'undefined' || prop.default === null);
-                    return ((useDefault && !hasUsableNullDefault) || (prop.optional && !prop.nullable));
+                    return (useDefault && !hasUsableNullDefault) || (prop.optional && !prop.nullable);
                 })() // also when there is the "| Opt" type modifier (because reflect-metadata can't extract the base)
             ) {
                 options.type = quote ? this.quote(prop.type) : prop.type;
@@ -725,13 +757,16 @@ export class SourceFile {
         const columnTypeFromMappedColumnType = mappedColumnType.getColumnType({ ...prop, autoincrement: false }, this.platform);
         const columnTypeFromMappedDeclaredType = mappedDeclaredType.getColumnType({ ...prop, autoincrement: false }, this.platform);
         const needsExplicitColumnType = () => {
-            if (isTypeStringMissingFromMap || [mappedRuntimeType, mappedColumnType, columnTypeFromMappedDeclaredType].some(t => t instanceof UnknownType)) {
+            if (isTypeStringMissingFromMap ||
+                [mappedRuntimeType, mappedColumnType, columnTypeFromMappedDeclaredType].some(t => t instanceof UnknownType)) {
                 return true;
             }
-            if (this.platform.normalizeColumnType(prop.columnTypes[0], prop) !== this.platform.normalizeColumnType(columnTypeFromMappedColumnType, prop)) {
+            if (this.platform.normalizeColumnType(prop.columnTypes[0], prop) !==
+                this.platform.normalizeColumnType(columnTypeFromMappedColumnType, prop)) {
                 return prop.columnTypes[0] !== columnTypeFromMappedColumnType;
             }
-            return columnTypeFromMappedRuntimeType !== columnTypeFromMappedColumnType || columnTypeFromMappedDeclaredType !== columnTypeFromMappedColumnType;
+            return (columnTypeFromMappedRuntimeType !== columnTypeFromMappedColumnType ||
+                columnTypeFromMappedDeclaredType !== columnTypeFromMappedColumnType);
         };
         if (needsExplicitColumnType()) {
             options.columnType = this.quote(prop.columnTypes[0]);
@@ -741,7 +776,9 @@ export class SourceFile {
                 options[key] = prop[key];
             }
         };
-        if (!options.columnType && (typeof mappedColumnType.getDefaultLength === 'undefined' || mappedColumnType.getDefaultLength(this.platform) !== prop.length)) {
+        if (!options.columnType &&
+            (typeof mappedColumnType.getDefaultLength === 'undefined' ||
+                mappedColumnType.getDefaultLength(this.platform) !== prop.length)) {
             assign('length');
         }
         // those are already included in the `columnType` in most cases, and when that option is present, they would be ignored anyway
@@ -756,11 +793,15 @@ export class SourceFile {
             assign('unsigned');
         }
         if (prop.autoincrement) {
-            if (!prop.primary || !this.platform.isNumericColumn(mappedColumnType) || this.meta.getPrimaryProps().length !== 1) {
+            if (!prop.primary ||
+                !this.platform.isNumericColumn(mappedColumnType) ||
+                this.meta.getPrimaryProps().length !== 1) {
                 options.autoincrement = true;
             }
         }
-        else if (prop.primary && this.platform.isNumericColumn(mappedColumnType) && this.meta.getPrimaryProps().length === 1) {
+        else if (prop.primary &&
+            this.platform.isNumericColumn(mappedColumnType) &&
+            this.meta.getPrimaryProps().length === 1) {
             options.autoincrement = false;
         }
         if (prop.generated) {
@@ -777,7 +818,8 @@ export class SourceFile {
             options.mappedBy = this.quote(prop.mappedBy);
             return;
         }
-        if (prop.pivotTable !== this.namingStrategy.joinTableName(this.meta.collection, prop.type, prop.name, this.meta.tableName)) {
+        if (prop.pivotTable !==
+            this.namingStrategy.joinTableName(this.meta.collection, prop.type, prop.name, this.meta.tableName)) {
             options.pivotTable = this.quote(prop.pivotTable);
         }
         if (prop.pivotEntity && Utils.className(prop.pivotEntity) !== prop.pivotTable) {
@@ -843,7 +885,8 @@ export class SourceFile {
             }
         }
         else {
-            if (prop.fieldNames.length > 1 && prop.fieldNames.some((fieldName, i) => fieldName !== this.namingStrategy.joinKeyColumnName(prop.name, prop.referencedColumnNames[i]))) {
+            if (prop.fieldNames.length > 1 &&
+                prop.fieldNames.some((fieldName, i) => fieldName !== this.namingStrategy.joinKeyColumnName(prop.name, prop.referencedColumnNames[i]))) {
                 options.fieldNames = prop.fieldNames.map(fieldName => this.quote(fieldName));
             }
         }
@@ -896,14 +939,10 @@ export class SourceFile {
     }
     referenceCoreImport(identifier) {
         this.coreImports.add(identifier);
-        return this.options.coreImportsPrefix
-            ? `${this.options.coreImportsPrefix}${identifier}`
-            : identifier;
+        return this.options.coreImportsPrefix ? `${this.options.coreImportsPrefix}${identifier}` : identifier;
     }
     referenceDecoratorImport(identifier) {
         this.decoratorImports.add(identifier);
-        return this.options.coreImportsPrefix
-            ? `${this.options.coreImportsPrefix}${identifier}`
-            : identifier;
+        return this.options.coreImportsPrefix ? `${this.options.coreImportsPrefix}${identifier}` : identifier;
     }
 }

package/package.json

@@ -1,44 +1,44 @@
 {
   "name": "@mikro-orm/entity-generator",
-  "type": "module",
-  "version": "7.0.0-rc.2",
+  "version": "7.0.0-rc.3",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": "./index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
-  },
   "keywords": [
-    "orm",
+    "data-mapper",
+    "ddd",
+    "entity",
+    "identity-map",
+    "javascript",
+    "js",
+    "mariadb",
+    "mikro-orm",
     "mongo",
     "mongodb",
     "mysql",
-    "mariadb",
+    "orm",
     "postgresql",
     "sqlite",
     "sqlite3",
     "ts",
     "typescript",
-    "js",
-    "javascript",
-    "entity",
-    "ddd",
-    "mikro-orm",
-    "unit-of-work",
-    "data-mapper",
-    "identity-map"
+    "unit-of-work"
   ],
-  "author": "Martin Adámek",
-  "license": "MIT",
+  "homepage": "https://mikro-orm.io",
   "bugs": {
     "url": "https://github.com/mikro-orm/mikro-orm/issues"
   },
-  "homepage": "https://mikro-orm.io",
-  "engines": {
-    "node": ">= 22.17.0"
+  "license": "MIT",
+  "author": "Martin Adámek",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
+  },
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./index.js"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "build": "yarn compile && yarn copy",
@@ -46,16 +46,16 @@
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@mikro-orm/sql": "7.0.0-rc.2"
+    "@mikro-orm/sql": "7.0.0-rc.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.6.4"
+    "@mikro-orm/core": "^6.6.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-rc.2"
+    "@mikro-orm/core": "7.0.0-rc.3"
+  },
+  "engines": {
+    "node": ">= 22.17.0"
   }
 }