@mikro-orm/entity-generator 7.0.0-dev.33 → 7.0.0-dev.330

package/SourceFile.js

@@ -1,19 +1,20 @@
-import { Cascade, Config, DecimalType, ReferenceKind, SCALAR_TYPES, UnknownType, Utils, } from '@mikro-orm/core';
+import { Cascade, Config, DecimalType, ReferenceKind, SCALAR_TYPES, UnknownType, Utils, inspect, } from '@mikro-orm/core';
 import { parse, relative } from 'node:path';
-import { inspect } from 'node:util';
 import { POSSIBLE_TYPE_IMPORTS } from './CoreImportsHelper.js';
 /**
  * @see https://github.com/tc39/proposal-regexp-unicode-property-escapes#other-examples
  */
 export const identifierRegex = /^(?:[$_\p{ID_Start}])(?:[$\u200C\u200D\p{ID_Continue}])*$/u;
-const primitivesAndLibs = [...SCALAR_TYPES, 'bigint', 'Uint8Array', 'unknown', 'object', 'any'];
+const primitivesAndLibs = [...SCALAR_TYPES, 'unknown', 'object', 'any'];
 export class SourceFile {
     meta;
     namingStrategy;
     platform;
     options;
     coreImports = new Set();
+    decoratorImports = new Set();
     entityImports = new Set();
+    enumImports = new Map();
     constructor(meta, namingStrategy, platform, options) {
         this.meta = meta;
         this.namingStrategy = namingStrategy;
@@ -25,24 +26,24 @@ export class SourceFile {
         if (this.meta.embeddable || this.meta.collection) {
             if (this.meta.embeddable) {
                 const options = this.getEmbeddableDeclOptions();
-                ret += `@${this.referenceCoreImport('Embeddable')}(${Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
+                ret += `@${this.referenceDecoratorImport('Embeddable')}(${Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
             }
             else {
                 const options = this.getEntityDeclOptions();
-                ret += `@${this.referenceCoreImport('Entity')}(${Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
+                ret += `@${this.referenceDecoratorImport('Entity')}(${Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
             }
         }
         for (const index of this.meta.indexes) {
             if (index.properties?.length === 1 && typeof this.meta.properties[index.properties[0]] !== 'undefined') {
                 continue;
             }
-            ret += `@${this.referenceCoreImport('Index')}(${this.serializeObject(this.getIndexOptions(index))})\n`;
+            ret += `@${this.referenceDecoratorImport('Index')}(${this.serializeObject(this.getIndexOptions(index))})\n`;
         }
         for (const index of this.meta.uniques) {
             if (index.properties?.length === 1 && typeof this.meta.properties[index.properties[0]] !== 'undefined') {
                 continue;
             }
-            ret += `@${this.referenceCoreImport('Unique')}(${this.serializeObject(this.getUniqueOptions(index))})\n`;
+            ret += `@${this.referenceDecoratorImport('Unique')}(${this.serializeObject(this.getUniqueOptions(index))})\n`;
         }
         let classHead = '';
         if (this.meta.className === this.options.customBaseEntityName) {
@@ -65,7 +66,10 @@ export class SourceFile {
             classBody += definition;
             classBody += '\n';
             if (prop.enum) {
-                enumDefinitions.push(this.getEnumClassDefinition(prop, 2));
+                const def = this.getEnumClassDefinition(prop, 2);
+                if (def.length) {
+                    enumDefinitions.push(def);
+                }
             }
             if (prop.eager) {
                 eagerProperties.push(prop);
@@ -94,6 +98,30 @@ export class SourceFile {
         }
         return ret;
     }
+    /**
+     * Convert index column options to quoted output format.
+     */
+    getColumnOptions(columns) {
+        if (!columns?.length) {
+            return undefined;
+        }
+        return columns.map(col => {
+            const colOpt = { name: this.quote(col.name) };
+            if (col.sort) {
+                colOpt.sort = this.quote(col.sort.toUpperCase());
+            }
+            if (col.nulls) {
+                colOpt.nulls = this.quote(col.nulls.toUpperCase());
+            }
+            if (col.length != null) {
+                colOpt.length = col.length;
+            }
+            if (col.collation) {
+                colOpt.collation = this.quote(col.collation);
+            }
+            return colOpt;
+        });
+    }
     getIndexOptions(index, isAtEntityLevel = true) {
         const indexOpt = {};
         if (typeof index.name === 'string') {
@@ -108,6 +136,30 @@ export class SourceFile {
         if (isAtEntityLevel && index.properties) {
             indexOpt.properties = Utils.asArray(index.properties).map(prop => this.quote('' + prop));
         }
+        // Index type (e.g., 'fulltext', 'spatial', 'btree', 'hash')
+        if (index.type) {
+            indexOpt.type = this.quote(index.type);
+        }
+        // Advanced index options
+        const columns = this.getColumnOptions(index.columns);
+        if (columns) {
+            indexOpt.columns = columns;
+        }
+        if (index.include) {
+            indexOpt.include = Utils.asArray(index.include).map(prop => this.quote('' + prop));
+        }
+        if (index.fillFactor != null) {
+            indexOpt.fillFactor = index.fillFactor;
+        }
+        if (index.invisible) {
+            indexOpt.invisible = true;
+        }
+        if (index.disabled) {
+            indexOpt.disabled = true;
+        }
+        if (index.clustered) {
+            indexOpt.clustered = true;
+        }
         return indexOpt;
     }
     getUniqueOptions(index, isAtEntityLevel = true) {
@@ -125,53 +177,97 @@ 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) {
+            uniqueOpt.columns = columns;
+        }
+        if (index.include) {
+            uniqueOpt.include = Utils.asArray(index.include).map(prop => this.quote('' + prop));
+        }
+        if (index.fillFactor != null) {
+            uniqueOpt.fillFactor = index.fillFactor;
+        }
+        if (index.disabled) {
+            uniqueOpt.disabled = true;
         }
         return uniqueOpt;
     }
     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 => {
+                let ret = t;
+                if (this.options.coreImportsPrefix) {
+                    const resolvedIdentifier = `${this.options.coreImportsPrefix}${t}`;
+                    ret += ` as ${resolvedIdentifier}`;
+                }
+                return ret;
+            })
+                .join(', ')} } from '@mikro-orm/decorators/${type}';`);
         }
         const extension = this.options.esmImport ? '.js' : '';
         const { dir, base } = parse(`${this.options.path ?? '.'}/${this.getBaseName()}`);
         const basePath = relative(dir, this.options.path ?? '.') || '.';
         (this.options.extraImports?.(basePath, base) ?? []).forEach(v => this.entityImports.add(v));
         const entityImports = [...this.entityImports].filter(e => e !== this.meta.className);
-        entityImports.sort().forEach(entity => {
+        const importMap = new Map();
+        for (const entity of entityImports) {
             const file = this.options.onImport?.(entity, basePath, extension, base) ?? {
                 path: `${basePath}/${this.options.fileName(entity)}${extension}`,
                 name: entity,
             };
             if (file.path === '') {
                 if (file.name === '') {
-                    return;
+                    continue;
                 }
-                imports.add(`import ${this.quote(file.name)};`);
-                return;
+                importMap.set(file.path, `import ${this.quote(file.name)};`);
+                continue;
             }
             if (file.name === '') {
-                imports.add(`import * as ${entity} from ${this.quote(file.path)};`);
-                return;
+                importMap.set(file.path, `import * as ${entity} from ${this.quote(file.path)};`);
+                continue;
             }
             if (file.name === 'default') {
-                imports.add(`import ${entity} from ${this.quote(file.path)};`);
-                return;
+                importMap.set(file.path, `import ${entity} from ${this.quote(file.path)};`);
+                continue;
             }
             if (file.name === entity) {
-                imports.add(`import { ${entity} } from ${this.quote(file.path)};`);
-                return;
+                importMap.set(file.path, `import { ${entity} } from ${this.quote(file.path)};`);
+                continue;
             }
-            imports.add(`import { ${identifierRegex.test(file.name) ? file.name : this.quote(file.name)} as ${entity} } from ${this.quote(file.path)};`);
-        });
+            importMap.set(file.path, `import { ${identifierRegex.test(file.name) ? file.name : this.quote(file.name)} as ${entity} } from ${this.quote(file.path)};`);
+        }
+        if (this.enumImports.size) {
+            for (const [name, exports] of this.enumImports.entries()) {
+                const file = this.options.onImport?.(name, basePath, extension, base) ?? {
+                    path: `${basePath}/${this.options.fileName(name)}${extension}`,
+                    name,
+                };
+                importMap.set(file.path, `import { ${exports.join(', ')} } from ${this.quote(file.path)};`);
+            }
+        }
+        for (const key of [...importMap.keys()].sort()) {
+            imports.add(importMap.get(key));
+        }
         return Array.from(imports.values()).join('\n');
     }
     getEntityClass(classBody) {
@@ -181,8 +277,8 @@ export class SourceFile {
         }
         ret += `class ${this.meta.className}`;
         if (this.meta.extends) {
-            this.entityImports.add(this.meta.extends);
-            ret += ` extends ${this.meta.extends}`;
+            this.entityImports.add(Utils.className(this.meta.extends));
+            ret += ` extends ${Utils.className(this.meta.extends)}`;
         }
         else if (this.options.useCoreBaseEntity) {
             ret += ` extends ${this.referenceCoreImport('BaseEntity')}`;
@@ -201,6 +297,7 @@ export class SourceFile {
     getPropertyDefinition(prop, padLeft) {
         const padding = ' '.repeat(padLeft);
         const propName = identifierRegex.test(prop.name) ? prop.name : this.quote(prop.name);
+        const enumMode = this.options.enumMode;
         let hiddenType = '';
         if (prop.hidden) {
             hiddenType += ` & ${this.referenceCoreImport('Hidden')}`;
@@ -218,7 +315,11 @@ export class SourceFile {
             : (() => {
                 if (isScalar) {
                     if (prop.enum) {
-                        return prop.runtimeType;
+                        const method = enumMode === 'ts-enum' ? 'getEnumClassName' : 'getEnumTypeName';
+                        if (prop.nativeEnumName) {
+                            return this.namingStrategy[method](prop.nativeEnumName, undefined, this.meta.schema);
+                        }
+                        return this.namingStrategy[method](prop.fieldNames[0], this.meta.collection, this.meta.schema);
                     }
                     breakdownOfIType = this.breakdownOfIType(prop);
                     if (typeof breakdownOfIType !== 'undefined') {
@@ -231,30 +332,42 @@ 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) {
             return `${padding}${ret};\n`;
         }
         if (prop.enum && typeof prop.default === 'string') {
+            if (enumMode === 'union-type') {
+                return `${padding}${ret} = ${this.quote(prop.default)};\n`;
+            }
+            const enumClassName = prop.nativeEnumName
+                ? this.namingStrategy.getEnumClassName(prop.nativeEnumName, undefined, this.meta.schema)
+                : this.namingStrategy.getEnumClassName(prop.fieldNames[0], this.meta.collection, this.meta.schema);
             const enumVal = this.namingStrategy.enumValueToEnumProperty(prop.default, prop.fieldNames[0], this.meta.collection, this.meta.schema);
-            return `${padding}${ret} = ${propType}${identifierRegex.test(enumVal) ? `.${enumVal}` : `[${this.quote(enumVal)}]`};\n`;
+            return `${padding}${ret} = ${enumClassName}${identifierRegex.test(enumVal) ? `.${enumVal}` : `[${this.quote(enumVal)}]`};\n`;
         }
         if (prop.fieldNames?.length > 1) {
             // TODO: Composite FKs with default values require additions to default/defaultRaw that are not yet supported.
@@ -270,15 +383,51 @@ export class SourceFile {
         return `${padding}${ret} = ${prop.ref ? this.referenceCoreImport('ref') : this.referenceCoreImport('rel')}(${propType}, ${defaultVal});\n`;
     }
     getEnumClassDefinition(prop, padLeft) {
+        const enumMode = this.options.enumMode;
+        if (prop.nativeEnumName) {
+            const imports = [];
+            if (enumMode !== 'union-type') {
+                imports.push(prop.runtimeType);
+            }
+            if (!this.options.inferEntityType && enumMode !== 'ts-enum') {
+                const enumTypeName = this.namingStrategy.getEnumTypeName(prop.nativeEnumName, undefined, this.meta.schema);
+                imports.push(enumTypeName);
+            }
+            this.enumImports.set(prop.runtimeType, imports);
+            return '';
+        }
         const enumClassName = this.namingStrategy.getEnumClassName(prop.fieldNames[0], this.meta.collection, this.meta.schema);
+        const enumTypeName = this.namingStrategy.getEnumTypeName(prop.fieldNames[0], this.meta.collection, this.meta.schema);
         const padding = ' '.repeat(padLeft);
-        let ret = `export enum ${enumClassName} {\n`;
         const enumValues = prop.items;
+        if (enumMode === 'union-type') {
+            return `export type ${enumTypeName} = ${enumValues.map(item => this.quote(item)).join(' | ')};\n`;
+        }
+        let ret = '';
+        if (enumMode === 'dictionary') {
+            ret += `export const ${enumClassName} = {\n`;
+        }
+        else {
+            ret += `export enum ${enumClassName} {\n`;
+        }
         for (const enumValue of enumValues) {
             const enumName = this.namingStrategy.enumValueToEnumProperty(enumValue, prop.fieldNames[0], this.meta.collection, this.meta.schema);
-            ret += `${padding}${identifierRegex.test(enumName) ? enumName : this.quote(enumName)} = ${this.quote(enumValue)},\n`;
+            if (enumMode === 'dictionary') {
+                ret += `${padding}${identifierRegex.test(enumName) ? enumName : this.quote(enumName)}: ${this.quote(enumValue)},\n`;
+            }
+            else {
+                ret += `${padding}${identifierRegex.test(enumName) ? enumName : this.quote(enumName)} = ${this.quote(enumValue)},\n`;
+            }
+        }
+        if (enumMode === 'dictionary') {
+            ret += '} as const;\n';
+        }
+        else {
+            ret += '}\n';
+        }
+        if (enumMode === 'dictionary') {
+            ret += `\nexport type ${enumTypeName} = (typeof ${enumClassName})[keyof typeof ${enumClassName}];\n`;
         }
-        ret += '}\n';
         return ret;
     }
     serializeObject(options, wordwrap, spaces, level = 0) {
@@ -288,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) {
@@ -308,8 +459,8 @@ export class SourceFile {
     }
     getEntityDeclOptions() {
         const options = {};
-        if (this.meta.collection !== this.namingStrategy.classToTableName(this.meta.className)) {
-            options.tableName = this.quote(this.meta.collection);
+        if (this.meta.tableName !== this.namingStrategy.classToTableName(this.meta.className)) {
+            options.tableName = this.quote(this.meta.tableName);
         }
         if (this.meta.schema && this.meta.schema !== this.platform.getDefaultSchemaName()) {
             options.schema = this.quote(this.meta.schema);
@@ -318,7 +469,7 @@ export class SourceFile {
             options.expression = this.quote(this.meta.expression);
         }
         else if (typeof this.meta.expression === 'function') {
-            options.expression = `${this.meta.expression}`;
+            options.expression = this.meta.expression.toString();
         }
         if (this.meta.repositoryClass) {
             this.entityImports.add(this.meta.repositoryClass);
@@ -337,28 +488,38 @@ export class SourceFile {
     }
     getEmbeddableDeclOptions() {
         const options = {};
-        return this.getCollectionDecl(options);
+        const result = this.getCollectionDecl(options);
+        if (result.discriminatorColumn) {
+            result.discriminator = result.discriminatorColumn;
+            delete result.discriminatorColumn;
+        }
+        return result;
     }
     getCollectionDecl(options) {
         if (this.meta.abstract) {
             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, className]) => [discriminatorValue, this.quote(className)]));
+            options.discriminatorMap = Object.fromEntries(Object.entries(this.meta.discriminatorMap).map(([discriminatorValue, cls]) => [
+                discriminatorValue,
+                this.quote(Utils.className(cls)),
+            ]));
         }
         return options;
     }
     getPropertyDecorator(prop, padLeft) {
         const padding = ' '.repeat(padLeft);
         const options = {};
-        let decorator = `@${this.referenceCoreImport(this.getDecoratorType(prop))}`;
+        let decorator = `@${this.referenceDecoratorImport(this.getDecoratorType(prop))}`;
         if (prop.kind === ReferenceKind.MANY_TO_MANY) {
             this.getManyToManyDecoratorOptions(options, prop);
         }
@@ -379,10 +540,10 @@ export class SourceFile {
         decorator = [...indexes.sort(), decorator].map(d => padding + d).join('\n');
         const decoratorArgs = [];
         if (prop.formula) {
-            decoratorArgs.push(`${prop.formula}`);
+            decoratorArgs.push(prop.formula.toString());
         }
         if (Utils.hasObjectKeys(options)) {
-            decoratorArgs.push(`${this.serializeObject(options)}`);
+            decoratorArgs.push(this.serializeObject(options));
         }
         return `${decorator}(${decoratorArgs.join(', ')})\n`;
     }
@@ -393,7 +554,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,
@@ -408,26 +569,26 @@ export class SourceFile {
         let propIndexIsNonTrivialIndex = false;
         const nonTrivialIndexes = this.meta.indexes.filter(i => i.properties?.length === 1 && i.properties[0] === prop.name);
         for (const i of nonTrivialIndexes) {
-            ret.push(`@${this.referenceCoreImport('Index')}(${this.serializeObject(this.getIndexOptions(i, false))})`);
+            ret.push(`@${this.referenceDecoratorImport('Index')}(${this.serializeObject(this.getIndexOptions(i, false))})`);
             if (prop.index === i.name) {
                 propIndexIsNonTrivialIndex = true;
                 delete options.index;
             }
         }
         if (prop.index && !options.index && !propIndexIsNonTrivialIndex) {
-            ret.push(`@${this.referenceCoreImport('Index')}(${typeof prop.index === 'string' ? `{ name: ${this.quote(prop.index)} }` : ''})`);
+            ret.push(`@${this.referenceDecoratorImport('Index')}(${typeof prop.index === 'string' ? `{ name: ${this.quote(prop.index)} }` : ''})`);
         }
         let propIndexIsNonTrivialUnique = false;
         const nonTrivialUnique = this.meta.uniques.filter(i => i.properties?.length === 1 && i.properties[0] === prop.name);
         for (const i of nonTrivialUnique) {
-            ret.push(`@${this.referenceCoreImport('Unique')}(${this.serializeObject(this.getUniqueOptions(i, false))})`);
+            ret.push(`@${this.referenceDecoratorImport('Unique')}(${this.serializeObject(this.getUniqueOptions(i, false))})`);
             if (prop.unique === i.name) {
                 propIndexIsNonTrivialUnique = true;
                 delete options.unique;
             }
         }
         if (prop.unique && !options.unique && !propIndexIsNonTrivialUnique) {
-            ret.push(`@${this.referenceCoreImport('Unique')}(${typeof prop.unique === 'string' ? `{ name: ${this.quote(prop.unique)} }` : ''})`);
+            ret.push(`@${this.referenceDecoratorImport('Unique')}(${typeof prop.unique === 'string' ? `{ name: ${this.quote(prop.unique)} }` : ''})`);
         }
         return ret;
     }
@@ -438,12 +599,10 @@ export class SourceFile {
         if (prop.primary && (prop.enum || !(typeof prop.kind === 'undefined' || prop.kind === ReferenceKind.SCALAR))) {
             options.primary = true;
         }
-        ['persist', 'hydrate', 'trackChanges']
-            .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);
         }
@@ -452,7 +611,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(', ')}]`;
         }
@@ -461,11 +620,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;
             }
         }
@@ -480,17 +645,18 @@ export class SourceFile {
             options.ignoreSchemaChanges.push(...prop.ignoreSchemaChanges.map(v => this.quote(v)));
         }
     }
-    propTypeBreakdowns = new WeakMap();
+    #propTypeBreakdowns = new WeakMap();
     breakdownOfIType(prop) {
-        if (this.propTypeBreakdowns.has(prop)) {
-            return this.propTypeBreakdowns.get(prop);
+        if (this.#propTypeBreakdowns.has(prop)) {
+            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]) {
@@ -504,10 +670,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) {
@@ -519,7 +687,7 @@ export class SourceFile {
                         r[2] = `(${r[2]}) & ${this.referenceCoreImport('Hidden')}`;
                     }
                 }
-                this.propTypeBreakdowns.set(prop, r);
+                this.#propTypeBreakdowns.set(prop, r);
                 return r;
             }
             const r = [prop.runtimeType, rawType];
@@ -530,19 +698,30 @@ export class SourceFile {
                     }
                 }
             }
-            this.propTypeBreakdowns.set(prop, r);
+            this.#propTypeBreakdowns.set(prop, r);
             return r;
         }
         const r = undefined;
-        this.propTypeBreakdowns.set(prop, r);
+        this.#propTypeBreakdowns.set(prop, r);
         return r;
     }
-    getScalarPropertyDecoratorOptions(options, prop) {
+    getScalarPropertyDecoratorOptions(options, prop, quote = true) {
         if (prop.fieldNames[0] !== this.namingStrategy.propertyToColumnName(prop.name)) {
             options.fieldName = this.quote(prop.fieldNames[0]);
         }
         if (prop.enum) {
-            options.items = `() => ${prop.runtimeType}`;
+            if (this.options.enumMode === 'union-type') {
+                options.items = `[${prop.items.map(item => this.quote(item)).join(', ')}]`;
+            }
+            else if (prop.nativeEnumName) {
+                const enumClassName = this.namingStrategy.getEnumClassName(prop.nativeEnumName, undefined, this.meta.schema);
+                options.items = `() => ${enumClassName}`;
+                options.nativeEnumName = this.quote(prop.nativeEnumName);
+            }
+            else {
+                const enumClassName = this.namingStrategy.getEnumClassName(prop.fieldNames[0], this.meta.collection, this.meta.schema);
+                options.items = `() => ${enumClassName}`;
+            }
         }
         // For enum properties, we don't need a column type
         // or the property length or other information in the decorator.
@@ -561,30 +740,38 @@ 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 = this.quote(prop.type);
+                options.type = quote ? this.quote(prop.type) : prop.type;
             }
         }
         const columnTypeFromMappedRuntimeType = mappedRuntimeType.getColumnType({ ...prop, autoincrement: false }, this.platform);
         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]);
@@ -594,11 +781,13 @@ 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
-        /* v8 ignore next 4 */
+        /* v8 ignore next */
         if (mappedColumnType instanceof DecimalType && !options.columnType) {
             assign('precision');
             assign('scale');
@@ -609,14 +798,16 @@ 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) {
-                options.autoincrement = false;
-            }
+        else if (prop.primary &&
+            this.platform.isNumericColumn(mappedColumnType) &&
+            this.meta.getPrimaryProps().length === 1) {
+            options.autoincrement = false;
         }
         if (prop.generated) {
             options.generated = typeof prop.generated === 'string' ? this.quote(prop.generated) : `${prop.generated}`;
@@ -632,24 +823,25 @@ export class SourceFile {
             options.mappedBy = this.quote(prop.mappedBy);
             return;
         }
-        if (prop.pivotTable !== this.namingStrategy.joinTableName(this.meta.collection, prop.type, prop.name)) {
+        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 && prop.pivotEntity !== prop.pivotTable) {
-            this.entityImports.add(prop.pivotEntity);
-            options.pivotEntity = `() => ${prop.pivotEntity}`;
+        if (prop.pivotEntity && Utils.className(prop.pivotEntity) !== prop.pivotTable) {
+            this.entityImports.add(Utils.className(prop.pivotEntity));
+            options.pivotEntity = `() => ${Utils.className(prop.pivotEntity)}`;
         }
         if (prop.joinColumns.length === 1) {
             options.joinColumn = this.quote(prop.joinColumns[0]);
         }
         else {
-            options.joinColumns = `[${prop.joinColumns.map(this.quote).join(', ')}]`;
+            options.joinColumns = `[${prop.joinColumns.map(c => this.quote(c)).join(', ')}]`;
         }
         if (prop.inverseJoinColumns.length === 1) {
             options.inverseJoinColumn = this.quote(prop.inverseJoinColumns[0]);
         }
         else {
-            options.inverseJoinColumns = `[${prop.inverseJoinColumns.map(this.quote).join(', ')}]`;
+            options.inverseJoinColumns = `[${prop.inverseJoinColumns.map(c => this.quote(c)).join(', ')}]`;
         }
         if (prop.fixedOrder) {
             options.fixedOrder = true;
@@ -672,7 +864,7 @@ export class SourceFile {
         if (prop.array) {
             options.array = true;
         }
-        if (prop.object) {
+        if (prop.object && !prop.array) {
             options.object = true;
         }
         if (prop.prefix === false || typeof prop.prefix === 'string') {
@@ -698,17 +890,18 @@ 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));
             }
         }
         if (prop.ownColumns && prop.ownColumns.length !== prop.fieldNames.length) {
             options.referencedColumnNames = prop.referencedColumnNames.map(fieldName => this.quote(fieldName));
         }
-        if (!['no action', 'restrict'].includes(prop.updateRule.toLowerCase())) {
+        if (prop.updateRule) {
             options.updateRule = this.quote(prop.updateRule);
         }
-        if (!['no action', 'restrict'].includes(prop.deleteRule.toLowerCase())) {
+        if (prop.deleteRule) {
             options.deleteRule = this.quote(prop.deleteRule);
         }
         if (prop.primary) {
@@ -751,8 +944,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;
     }
 }