@mikro-orm/entity-generator 7.0.0-dev.3 → 7.0.0-dev.31

package/README.md

@@ -11,7 +11,6 @@ TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-or
 [![Chat on discord](https://img.shields.io/discord/1214904142443839538?label=discord&color=blue)](https://discord.gg/w8bjxFHS7X)
 [![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
-[![Maintainability](https://api.codeclimate.com/v1/badges/27999651d3adc47cfa40/maintainability)](https://codeclimate.com/github/mikro-orm/mikro-orm/maintainability)
 [![Build Status](https://github.com/mikro-orm/mikro-orm/workflows/tests/badge.svg?branch=master)](https://github.com/mikro-orm/mikro-orm/actions?workflow=tests)
 
 ## 🤔 Unit of What?
@@ -141,7 +140,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys)
 - [Filters](https://mikro-orm.io/docs/filters)
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
-- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
+- [Populating relations](https://mikro-orm.io/docs/populating-relations)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
 - [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)

package/SourceFile.d.ts

@@ -12,8 +12,8 @@ export declare class SourceFile {
     protected readonly entityImports: Set<string>;
     constructor(meta: EntityMetadata, namingStrategy: NamingStrategy, platform: Platform, options: GenerateOptions);
     generate(): string;
-    protected getIndexOptions(index: EntityMetadata['indexes'][number], isAtEntityLevel?: boolean): IndexOptions<Dictionary>;
-    protected getUniqueOptions(index: EntityMetadata['uniques'][number], isAtEntityLevel?: boolean): UniqueOptions<Dictionary>;
+    protected getIndexOptions(index: EntityMetadata['indexes'][number], isAtEntityLevel?: boolean): IndexOptions<Dictionary, string>;
+    protected getUniqueOptions(index: EntityMetadata['uniques'][number], isAtEntityLevel?: boolean): UniqueOptions<Dictionary, string>;
     protected generateImports(): string;
     protected getEntityClass(classBody: string): string;
     getBaseName(extension?: string): string;
@@ -23,7 +23,7 @@ export declare class SourceFile {
     protected serializeObject(options: {}, wordwrap?: number, spaces?: number, level?: number): string;
     protected serializeValue(val: unknown, wordwrap?: number, spaces?: number, level?: number): unknown;
     protected getEntityDeclOptions(): EntityOptions<unknown>;
-    protected getEmbeddableDeclOptions(): EmbeddableOptions;
+    protected getEmbeddableDeclOptions(): EmbeddableOptions<unknown>;
     private getCollectionDecl;
     private getPropertyDecorator;
     protected getPropertyIndexes(prop: EntityProperty, options: Dictionary): string[];

package/SourceFile.js

@@ -1,5 +1,6 @@
 import { Cascade, Config, DecimalType, ReferenceKind, SCALAR_TYPES, UnknownType, Utils, } 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
@@ -98,9 +99,12 @@ export class SourceFile {
         if (typeof index.name === 'string') {
             indexOpt.name = this.quote(index.name);
         }
-        if (index.expression) {
+        if (typeof index.expression === 'string') {
             indexOpt.expression = this.quote(index.expression);
         }
+        else if (typeof index.expression === 'function') {
+            indexOpt.expression = `${index.expression}`.replace(')=>`', ') => `');
+        }
         if (isAtEntityLevel && index.properties) {
             indexOpt.properties = Utils.asArray(index.properties).map(prop => this.quote('' + prop));
         }
@@ -111,9 +115,12 @@ export class SourceFile {
         if (typeof index.name === 'string') {
             uniqueOpt.name = this.quote(index.name);
         }
-        if (index.expression) {
+        if (typeof index.expression === 'string') {
             uniqueOpt.expression = this.quote(index.expression);
         }
+        else if (typeof index.expression === 'function') {
+            uniqueOpt.expression = `${index.expression}`.replace(')=>`', ') => `');
+        }
         if (isAtEntityLevel && index.properties) {
             uniqueOpt.properties = Utils.asArray(index.properties).map(prop => this.quote('' + prop));
         }
@@ -618,6 +625,9 @@ export class SourceFile {
     getManyToManyDecoratorOptions(options, prop) {
         this.entityImports.add(prop.type);
         options.entity = `() => ${prop.type}`;
+        if (prop.orderBy) {
+            options.orderBy = inspect(prop.orderBy);
+        }
         if (prop.mappedBy) {
             options.mappedBy = this.quote(prop.mappedBy);
             return;
@@ -652,6 +662,9 @@ export class SourceFile {
         this.entityImports.add(prop.type);
         options.entity = `() => ${prop.type}`;
         options.mappedBy = this.quote(prop.mappedBy);
+        if (prop.orderBy) {
+            options.orderBy = inspect(prop.orderBy);
+        }
     }
     getEmbeddedPropertyDeclarationOptions(options, prop) {
         this.entityImports.add(prop.type);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/entity-generator",
   "type": "module",
-  "version": "7.0.0-dev.3",
+  "version": "7.0.0-dev.31",
   "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",
@@ -50,12 +50,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "7.0.0-dev.3"
+    "@mikro-orm/knex": "7.0.0-dev.31"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5"
+    "@mikro-orm/core": "^6.5.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.3"
+    "@mikro-orm/core": "7.0.0-dev.31"
   }
 }