@mikro-orm/entity-generator 6.3.5-dev.13 → 6.3.5-dev.15

package/README.md

@@ -143,7 +143,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
 - [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
-- [Lifecycle Hooks](https://mikro-orm.io/docs/lifecycle-hooks)
+- [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)
 - [Schema Generator](https://mikro-orm.io/docs/schema-generator)
 - [Entity Generator](https://mikro-orm.io/docs/entity-generator)

package/SourceFile.d.ts

@@ -28,6 +28,8 @@ export declare class SourceFile {
     private getPropertyDecorator;
     protected getPropertyIndexes(prop: EntityProperty, options: Dictionary): string[];
     protected getCommonDecoratorOptions(options: Dictionary, prop: EntityProperty): void;
+    private propTypeBreakdowns;
+    private breakdownOfIType;
     protected getScalarPropertyDecoratorOptions(options: Dictionary, prop: EntityProperty): void;
     protected getManyToManyDecoratorOptions(options: Dictionary, prop: EntityProperty): void;
     protected getOneToManyDecoratorOptions(options: Dictionary, prop: EntityProperty): void;

package/SourceFile.js

@@ -215,31 +215,16 @@ class SourceFile {
                     if (prop.enum) {
                         return prop.runtimeType;
                     }
-                    const mappedDeclaredType = this.platform.getMappedType(prop.type);
-                    const mappedRawType = (prop.customTypes?.[0] ?? ((prop.type !== 'unknown' && mappedDeclaredType instanceof core_1.UnknownType)
-                        ? this.platform.getMappedType(prop.columnTypes[0])
-                        : mappedDeclaredType));
-                    const rawType = mappedRawType.runtimeType;
-                    const serializedType = (prop.customType ?? mappedRawType).runtimeType;
-                    // Add non-lib imports where needed.
-                    for (const typeSpec of [prop.runtimeType, rawType, serializedType]) {
-                        const simplePropType = typeSpec.replace(/\[]+$/, '');
-                        if (!primitivesAndLibs.includes(simplePropType)) {
-                            this.entityImports.add(simplePropType);
-                        }
-                    }
-                    if (prop.runtimeType !== rawType || rawType !== serializedType) {
+                    const breakdownOfIType = this.breakdownOfIType(prop);
+                    if (typeof breakdownOfIType !== 'undefined') {
                         hasITypeWrapper = true;
-                        if (rawType !== serializedType) {
-                            return `${this.referenceCoreImport('IType')}<${prop.runtimeType}, ${rawType}, ${serializedType}>`;
-                        }
-                        return `${this.referenceCoreImport('IType')}<${prop.runtimeType}, ${rawType}>`;
+                        return `${this.referenceCoreImport('IType')}<${breakdownOfIType.join(', ')}>`;
                     }
                     return prop.runtimeType;
                 }
                 return prop.type;
             })();
-        const useDefault = prop.default != null;
+        const useDefault = prop.default != null && (propType !== 'unknown');
         const optional = prop.nullable ? '?' : (useDefault ? '' : '!');
         let ret = `${propName}${optional}: ${prop.ref ? `${this.referenceCoreImport('Ref')}<${propType}>` : `${(this.options.esmImport && !isScalar) ? `${this.referenceCoreImport('Rel')}<${propType}>` : propType}`}`;
         if (prop.array && (prop.kind === core_1.ReferenceKind.EMBEDDED || prop.enum)) {
@@ -249,7 +234,7 @@ class SourceFile {
         if (useDefault || (prop.optional && !prop.nullable)) {
             ret += ` & ${this.referenceCoreImport('Opt')}`;
         }
-        if (!useDefault || hasITypeWrapper) {
+        if (!useDefault || hasITypeWrapper || prop.type === 'unknown') {
             return `${padding}${ret};\n`;
         }
         if (prop.enum && typeof prop.default === 'string') {
@@ -462,15 +447,7 @@ class SourceFile {
                 prop.defaultRaw !== (typeof prop.default === 'string' ? this.quote(prop.default) : `${prop.default}`)) {
                 options.defaultRaw = `\`${prop.defaultRaw}\``;
             }
-            else if (prop.default != null && (prop.ref || (!prop.enum && (typeof prop.kind === 'undefined' || prop.kind === core_1.ReferenceKind.SCALAR) && (() => {
-                const mappedDeclaredType = this.platform.getMappedType(prop.type);
-                const mappedRawType = (prop.customTypes?.[0] ?? ((prop.type !== 'unknown' && mappedDeclaredType instanceof core_1.UnknownType)
-                    ? this.platform.getMappedType(prop.columnTypes[0])
-                    : mappedDeclaredType));
-                const rawType = mappedRawType.runtimeType;
-                const serializedType = (prop.customType ?? mappedRawType).runtimeType;
-                return prop.runtimeType !== rawType || rawType !== serializedType;
-            })()))) {
+            else if (prop.default != null && (prop.ref || (!prop.enum && (typeof prop.kind === 'undefined' || prop.kind === core_1.ReferenceKind.SCALAR) && (prop.type === 'unknown' || typeof this.breakdownOfIType(prop) !== 'undefined')))) {
                 options.default = typeof prop.default === 'string' ? this.quote(prop.default) : prop.default;
             }
         }
@@ -480,6 +457,42 @@ class SourceFile {
         if (prop.deferMode) {
             options.deferMode = `${this.referenceCoreImport('DeferMode')}.INITIALLY_${prop.deferMode.toUpperCase()}`;
         }
+        if (typeof prop.ignoreSchemaChanges !== 'undefined') {
+            options.ignoreSchemaChanges ??= [];
+            options.ignoreSchemaChanges.push(...prop.ignoreSchemaChanges.map(v => this.quote(v)));
+        }
+    }
+    propTypeBreakdowns = new WeakMap();
+    breakdownOfIType(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 core_1.UnknownType)
+            ? this.platform.getMappedType(prop.columnTypes[0])
+            : mappedDeclaredType));
+        const rawType = mappedRawType.runtimeType;
+        const serializedType = (prop.customType ?? mappedRawType).runtimeType;
+        // Add non-lib imports where needed.
+        for (const typeSpec of [prop.runtimeType, rawType, serializedType]) {
+            const simplePropType = typeSpec.replace(/\[]+$/, '');
+            if (!primitivesAndLibs.includes(simplePropType)) {
+                this.entityImports.add(simplePropType);
+            }
+        }
+        if (prop.runtimeType !== rawType || rawType !== serializedType) {
+            if (rawType !== serializedType) {
+                const r = [prop.runtimeType, rawType, serializedType];
+                this.propTypeBreakdowns.set(prop, r);
+                return r;
+            }
+            const r = [prop.runtimeType, rawType];
+            this.propTypeBreakdowns.set(prop, r);
+            return r;
+        }
+        const r = undefined;
+        this.propTypeBreakdowns.set(prop, r);
+        return r;
     }
     getScalarPropertyDecoratorOptions(options, prop) {
         if (prop.fieldNames[0] !== this.namingStrategy.propertyToColumnName(prop.name)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/entity-generator",
-  "version": "6.3.5-dev.13",
+  "version": "6.3.5-dev.15",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -58,13 +58,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.3.5-dev.13",
+    "@mikro-orm/knex": "6.3.5-dev.15",
     "fs-extra": "11.2.0"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.3.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.5-dev.13"
+    "@mikro-orm/core": "6.3.5-dev.15"
   }
 }