@mikro-orm/postgresql 7.0.0-dev.1 → 7.0.0-dev.100

package/PostgreSqlSchemaHelper.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PostgreSqlSchemaHelper = void 0;
-const core_1 = require("@mikro-orm/core");
-const knex_1 = require("@mikro-orm/knex");
-class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
+import { EnumType, Type, Utils, DeferMode } from '@mikro-orm/core';
+import { SchemaHelper, } from '@mikro-orm/sql';
+export class PostgreSqlSchemaHelper extends SchemaHelper {
     static DEFAULT_VALUES = {
         'now()': ['now()', 'current_timestamp'],
         'current_timestamp(?)': ['current_timestamp(?)'],
@@ -40,11 +37,11 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         return res.map(row => row.schema_name);
     }
     getIgnoredNamespacesConditionSQL(column = 'schema_name') {
-        /* istanbul ignore next */
         const ignored = [
             'information_schema',
             'tiger',
             'topology',
+            /* v8 ignore next */
             ...this.platform.getConfig().get('schemaGenerator').ignoreSchema ?? [],
         ].map(s => this.platform.quoteValue(s)).join(', ');
         const ignoredPrefixes = [
@@ -71,7 +68,9 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             const table = schema.addTable(t.table_name, t.schema_name, t.table_comment);
             const pks = await this.getPrimaryKeys(connection, indexes[key], table.name, table.schema);
             const enums = this.getEnumDefinitions(checks[key] ?? []);
-            table.init(columns[key], indexes[key], checks[key], pks, fks[key], enums);
+            if (columns[key]) {
+                table.init(columns[key], indexes[key], checks[key], pks, fks[key], enums);
+            }
         }
     }
     async getAllIndexes(connection, tables) {
@@ -91,13 +90,13 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
                 primary: index.primary,
             };
             if (index.condeferrable) {
-                indexDef.deferMode = index.condeferred ? core_1.DeferMode.INITIALLY_DEFERRED : core_1.DeferMode.INITIALLY_IMMEDIATE;
+                indexDef.deferMode = index.condeferred ? DeferMode.INITIALLY_DEFERRED : DeferMode.INITIALLY_IMMEDIATE;
             }
             if (index.index_def.some((col) => col.match(/[(): ,"'`]/)) || index.expression?.match(/ where /i)) {
                 indexDef.expression = index.expression;
             }
             if (index.deferrable) {
-                indexDef.deferMode = index.initially_deferred ? core_1.DeferMode.INITIALLY_DEFERRED : core_1.DeferMode.INITIALLY_IMMEDIATE;
+                indexDef.deferMode = index.initially_deferred ? DeferMode.INITIALLY_DEFERRED : DeferMode.INITIALLY_IMMEDIATE;
             }
             ret[key] ??= [];
             ret[key].push(indexDef);
@@ -166,7 +165,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
                 comment: col.column_comment,
             };
             if (nativeEnums?.[column.type]) {
-                column.mappedType = core_1.Type.getType(core_1.EnumType);
+                column.mappedType = Type.getType(EnumType);
                 column.nativeEnumName = column.type;
                 column.enumItems = nativeEnums[column.type]?.items;
             }
@@ -214,7 +213,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             if (match) {
                 return match[1];
             }
-            /* istanbul ignore next */
+            /* v8 ignore next */
             switch (value) {
                 case 'r': return 'RESTRICT';
                 case 'c': return 'CASCADE';
@@ -228,7 +227,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             fk.update_rule = mapReferentialIntegrity(fk.update_rule, fk.constraint_def);
             fk.delete_rule = mapReferentialIntegrity(fk.delete_rule, fk.constraint_def);
             if (fk.condeferrable) {
-                fk.defer_mode = fk.condeferred ? core_1.DeferMode.INITIALLY_DEFERRED : core_1.DeferMode.INITIALLY_IMMEDIATE;
+                fk.defer_mode = fk.condeferred ? DeferMode.INITIALLY_DEFERRED : DeferMode.INITIALLY_IMMEDIATE;
             }
             const key = this.getTableKey(fk);
             ret[key] ??= [];
@@ -241,7 +240,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         return ret;
     }
     async getNativeEnumDefinitions(connection, schemas) {
-        const uniqueSchemas = core_1.Utils.unique(schemas);
+        const uniqueSchemas = Utils.unique(schemas);
         const res = await connection.execute(`select t.typname as enum_name, n.nspname as schema_name, array_agg(e.enumlabel order by e.enumsortorder) as enum_value
         from pg_type t
         join pg_enum e on t.oid = e.enumtypid
@@ -253,10 +252,14 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             if (row.schema_name && row.schema_name !== this.platform.getDefaultSchemaName()) {
                 name = row.schema_name + '.' + name;
             }
+            let items = row.enum_value;
+            if (!Array.isArray(items)) {
+                items = this.platform.unmarshallArray(row.enum_value);
+            }
             o[name] = {
                 name: row.enum_name,
                 schema: row.schema_name,
-                items: this.platform.unmarshallArray(row.enum_value),
+                items,
             };
             return o;
         }, {});
@@ -302,7 +305,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             if (item.columnName && m1 && m2) {
                 const m3 = m2[1].match(/('[^']*'::text)/g);
                 let items;
-                /* istanbul ignore else */
+                /* v8 ignore next */
                 if (m3) {
                     items = m3.map((item) => item.trim().match(/^\(?'(.*)'/)?.[1]);
                 }
@@ -320,7 +323,8 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         }, {});
     }
     createTableColumn(column, table) {
-        const compositePK = table.getPrimaryKey()?.composite;
+        const pk = table.getPrimaryKey();
+        const compositePK = pk?.composite;
         const primaryKey = !this.hasNonDefaultPrimaryKeyName(table);
         const col = [this.quote(column.name)];
         if (column.autoincrement && !column.generated && !compositePK) {
@@ -347,14 +351,14 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
                 columnType += ` generated always as ${column.generated}`;
             }
             col.push(columnType);
-            core_1.Utils.runIfNotEmpty(() => col.push('null'), column.nullable);
-            core_1.Utils.runIfNotEmpty(() => col.push('not null'), !column.nullable);
+            Utils.runIfNotEmpty(() => col.push('null'), column.nullable);
+            Utils.runIfNotEmpty(() => col.push('not null'), !column.nullable);
         }
-        if (column.autoincrement && !column.generated && !compositePK) {
-            core_1.Utils.runIfNotEmpty(() => col.push('primary key'), primaryKey && column.primary);
+        if (column.autoincrement && !compositePK) {
+            Utils.runIfNotEmpty(() => col.push('primary key'), primaryKey && column.primary);
         }
         const useDefault = column.default != null && column.default !== 'null' && !column.autoincrement;
-        core_1.Utils.runIfNotEmpty(() => col.push(`default ${column.default}`), useDefault);
+        Utils.runIfNotEmpty(() => col.push(`default ${column.default}`), useDefault);
         return col.join(' ');
     }
     getPreAlterTable(tableDiff, safe) {
@@ -362,11 +366,11 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         const parts = tableDiff.name.split('.');
         const tableName = parts.pop();
         const schemaName = parts.pop();
-        /* istanbul ignore next */
+        /* v8 ignore next */
         const name = (schemaName && schemaName !== this.platform.getDefaultSchemaName() ? schemaName + '.' : '') + tableName;
         const quotedName = this.quote(name);
         // detect that the column was an enum before and remove the check constraint in such case here
-        const changedEnums = Object.values(tableDiff.changedColumns).filter(col => col.fromColumn.mappedType instanceof core_1.EnumType);
+        const changedEnums = Object.values(tableDiff.changedColumns).filter(col => col.fromColumn.mappedType instanceof EnumType);
         for (const col of changedEnums) {
             if (!col.fromColumn.nativeEnumName && col.column.nativeEnumName && col.fromColumn.default) {
                 ret.push(`alter table ${quotedName} alter column "${col.column.name}" drop default`);
@@ -401,11 +405,11 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         const parts = tableDiff.name.split('.');
         const tableName = parts.pop();
         const schemaName = parts.pop();
-        /* istanbul ignore next */
+        /* v8 ignore next */
         const name = (schemaName && schemaName !== this.platform.getDefaultSchemaName() ? schemaName + '.' : '') + tableName;
         const quotedName = this.quote(name);
         // detect that the column was an enum before and remove the check constraint in such a case here
-        const changedEnums = Object.values(tableDiff.changedColumns).filter(col => col.fromColumn.mappedType instanceof core_1.EnumType);
+        const changedEnums = Object.values(tableDiff.changedColumns).filter(col => col.fromColumn.mappedType instanceof EnumType);
         for (const col of changedEnums) {
             if (!col.fromColumn.nativeEnumName && col.column.nativeEnumName && col.column.default) {
                 ret.push(`alter table ${quotedName} alter column "${col.column.name}" set default ${col.column.default}`);
@@ -421,9 +425,8 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
     }
     getAlterColumnAutoincrement(tableName, column, schemaName) {
         const ret = [];
-        /* istanbul ignore next */
+        /* v8 ignore next */
         const name = (schemaName && schemaName !== this.platform.getDefaultSchemaName() ? schemaName + '.' : '') + tableName;
-        /* istanbul ignore else */
         if (column.autoincrement) {
             const seqName = this.platform.getIndexName(tableName, [column.name], 'sequence');
             ret.push(`create sequence if not exists ${this.quote(seqName)}`);
@@ -543,4 +546,3 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         return +match[2];
     }
 }
-exports.PostgreSqlSchemaHelper = PostgreSqlSchemaHelper;

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)
@@ -382,6 +381,8 @@ See also the list of contributors who [participated](https://github.com/mikro-or
 
 Please ⭐️ this repository if this project helped you!
 
+> If you'd like to support my open-source work, consider sponsoring me directly at [github.com/sponsors/b4nan](https://github.com/sponsors/b4nan).
+
 ## 📝 License
 
 Copyright © 2018 [Martin Adámek](https://github.com/b4nan).

package/index.d.ts

@@ -1,8 +1,9 @@
-export * from '@mikro-orm/knex';
-export * from './PostgreSqlConnection';
-export * from './PostgreSqlDriver';
-export * from './PostgreSqlPlatform';
-export * from './PostgreSqlSchemaHelper';
-export * from './PostgreSqlExceptionConverter';
-export * from './types';
-export { PostgreSqlMikroORM as MikroORM, PostgreSqlOptions as Options, definePostgreSqlConfig as defineConfig, } from './PostgreSqlMikroORM';
+export * from '@mikro-orm/sql';
+export * from './PostgreSqlConnection.js';
+export * from './PostgreSqlDriver.js';
+export * from './PostgreSqlPlatform.js';
+export * from './PostgreSqlSchemaHelper.js';
+export * from './PostgreSqlExceptionConverter.js';
+export * from './types/index.js';
+export { PostgreSqlMikroORM as MikroORM, type PostgreSqlOptions as Options, definePostgreSqlConfig as defineConfig, } from './PostgreSqlMikroORM.js';
+export { raw } from './raw.js';

package/index.js

@@ -1,28 +1,9 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineConfig = exports.MikroORM = void 0;
-/* istanbul ignore file */
-__exportStar(require("@mikro-orm/knex"), exports);
-__exportStar(require("./PostgreSqlConnection"), exports);
-__exportStar(require("./PostgreSqlDriver"), exports);
-__exportStar(require("./PostgreSqlPlatform"), exports);
-__exportStar(require("./PostgreSqlSchemaHelper"), exports);
-__exportStar(require("./PostgreSqlExceptionConverter"), exports);
-__exportStar(require("./types"), exports);
-var PostgreSqlMikroORM_1 = require("./PostgreSqlMikroORM");
-Object.defineProperty(exports, "MikroORM", { enumerable: true, get: function () { return PostgreSqlMikroORM_1.PostgreSqlMikroORM; } });
-Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return PostgreSqlMikroORM_1.definePostgreSqlConfig; } });
+export * from '@mikro-orm/sql';
+export * from './PostgreSqlConnection.js';
+export * from './PostgreSqlDriver.js';
+export * from './PostgreSqlPlatform.js';
+export * from './PostgreSqlSchemaHelper.js';
+export * from './PostgreSqlExceptionConverter.js';
+export * from './types/index.js';
+export { PostgreSqlMikroORM as MikroORM, definePostgreSqlConfig as defineConfig, } from './PostgreSqlMikroORM.js';
+export { raw } from './raw.js';

package/package.json

@@ -1,19 +1,11 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "7.0.0-dev.1",
+  "type": "module",
+  "version": "7.0.0-dev.100",
   "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",
-  "typings": "index.d.ts",
   "exports": {
     "./package.json": "./package.json",
-    ".": {
-      "import": {
-        "types": "./index.d.ts",
-        "default": "./index.mjs"
-      },
-      "require": "./index.js"
-    }
+    ".": "./index.js"
   },
   "repository": {
     "type": "git",
@@ -46,10 +38,10 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 22.11.0"
+    "node": ">= 22.17.0"
   },
   "scripts": {
-    "build": "yarn clean && yarn compile && yarn copy && yarn run -T gen-esm-wrapper index.js index.mjs",
+    "build": "yarn clean && yarn compile && yarn copy",
     "clean": "yarn run -T rimraf ./dist",
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
@@ -58,18 +50,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "7.0.0-dev.1",
-    "pg": "8.13.1",
-    "postgres-array": "3.0.2",
+    "@mikro-orm/sql": "7.0.0-dev.100",
+    "pg": "8.16.3",
+    "pg-cursor": "2.15.3",
+    "postgres-array": "3.0.4",
     "postgres-date": "2.1.0",
     "postgres-interval": "4.0.2"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5",
-    "kysely": "https://pkg.pr.new/kysely-org/kysely/kysely@2b7007e"
+    "@mikro-orm/core": "^6.6.2",
+    "kysely": "0.28.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.1",
+    "@mikro-orm/core": "7.0.0-dev.100",
     "kysely": "*"
   }
 }

package/raw.d.ts

@@ -0,0 +1,58 @@
+import { type AnyString, type Dictionary, type EntityKey, type RawQueryFragment, type QueryBuilder } from '@mikro-orm/sql';
+import type { SelectQueryBuilder } from 'kysely';
+/**
+ * Creates raw SQL query fragment that can be assigned to a property or part of a filter. This fragment is represented
+ * by `RawQueryFragment` class instance that can be serialized to a string, so it can be used both as an object value
+ * and key. When serialized, the fragment key gets cached and only such cached key will be recognized by the ORM.
+ * This adds a runtime safety to the raw query fragments.
+ *
+ * > **`raw()` helper is required since v6 to use a raw fragment in your query, both through EntityManager and QueryBuilder.**
+ *
+ * ```ts
+ * // as a value
+ * await em.find(User, { time: raw('now()') });
+ *
+ * // as a key
+ * await em.find(User, { [raw('lower(name)')]: name.toLowerCase() });
+ *
+ * // value can be empty array
+ * await em.find(User, { [raw('(select 1 = 1)')]: [] });
+ * ```
+ *
+ * The `raw` helper supports several signatures, you can pass in a callback that receives the current property alias:
+ *
+ * ```ts
+ * await em.find(User, { [raw(alias => `lower(${alias}.name)`)]: name.toLowerCase() });
+ * ```
+ *
+ * You can also use the `sql` tagged template function, which works the same, but supports only the simple string signature:
+ *
+ * ```ts
+ * await em.find(User, { [sql`lower(name)`]: name.toLowerCase() });
+ * ```
+ *
+ * When using inside filters, you might have to use a callback signature to create new raw instance for every filter usage.
+ *
+ * ```ts
+ * @Filter({ name: 'long', cond: () => ({ [raw('length(perex)')]: { $gt: 10000 } }) })
+ * ```
+ *
+ * The `raw` helper can be used within indexes and uniques to write database-agnostic SQL expressions. In that case, you can use `'??'` to tag your database identifiers (table name, column names, index name, ...) inside your expression, and pass those identifiers as a second parameter to the `raw` helper. Internally, those will automatically be quoted according to the database in use:
+ *
+ * ```ts
+ * // On postgres, will produce: create index "index custom_idx_on_name" on "library.author" ("country")
+ * // On mysql, will produce: create index `index custom_idx_on_name` on `library.author` (`country`)
+ * @Index({ name: 'custom_idx_on_name', expression: (table, columns) => raw(`create index ?? on ?? (??)`, ['custom_idx_on_name', table, columns.name]) })
+ * @Entity({ schema: 'library' })
+ * export class Author { ... }
+ * ```
+ *
+ * You can also use the `quote` tag function to write database-agnostic SQL expressions. The end-result is the same as using the `raw` function regarding database identifiers quoting, only to have a more elegant expression syntax:
+ *
+ * ```ts
+ * @Index({ name: 'custom_idx_on_name', expression: (table, columns) => quote`create index ${'custom_idx_on_name'} on ${table} (${columns.name})` })
+ * @Entity({ schema: 'library' })
+ * export class Author { ... }
+ * ```
+ */
+export declare function raw<T extends object = any, R = any>(sql: SelectQueryBuilder<any, any, any> | QueryBuilder<T> | EntityKey<T> | EntityKey<T>[] | AnyString | ((alias: string) => string) | RawQueryFragment, params?: readonly unknown[] | Dictionary<unknown>): NoInfer<R>;

package/raw.js

@@ -0,0 +1,64 @@
+import { raw as raw_, Utils } from '@mikro-orm/sql';
+/**
+ * Creates raw SQL query fragment that can be assigned to a property or part of a filter. This fragment is represented
+ * by `RawQueryFragment` class instance that can be serialized to a string, so it can be used both as an object value
+ * and key. When serialized, the fragment key gets cached and only such cached key will be recognized by the ORM.
+ * This adds a runtime safety to the raw query fragments.
+ *
+ * > **`raw()` helper is required since v6 to use a raw fragment in your query, both through EntityManager and QueryBuilder.**
+ *
+ * ```ts
+ * // as a value
+ * await em.find(User, { time: raw('now()') });
+ *
+ * // as a key
+ * await em.find(User, { [raw('lower(name)')]: name.toLowerCase() });
+ *
+ * // value can be empty array
+ * await em.find(User, { [raw('(select 1 = 1)')]: [] });
+ * ```
+ *
+ * The `raw` helper supports several signatures, you can pass in a callback that receives the current property alias:
+ *
+ * ```ts
+ * await em.find(User, { [raw(alias => `lower(${alias}.name)`)]: name.toLowerCase() });
+ * ```
+ *
+ * You can also use the `sql` tagged template function, which works the same, but supports only the simple string signature:
+ *
+ * ```ts
+ * await em.find(User, { [sql`lower(name)`]: name.toLowerCase() });
+ * ```
+ *
+ * When using inside filters, you might have to use a callback signature to create new raw instance for every filter usage.
+ *
+ * ```ts
+ * @Filter({ name: 'long', cond: () => ({ [raw('length(perex)')]: { $gt: 10000 } }) })
+ * ```
+ *
+ * The `raw` helper can be used within indexes and uniques to write database-agnostic SQL expressions. In that case, you can use `'??'` to tag your database identifiers (table name, column names, index name, ...) inside your expression, and pass those identifiers as a second parameter to the `raw` helper. Internally, those will automatically be quoted according to the database in use:
+ *
+ * ```ts
+ * // On postgres, will produce: create index "index custom_idx_on_name" on "library.author" ("country")
+ * // On mysql, will produce: create index `index custom_idx_on_name` on `library.author` (`country`)
+ * @Index({ name: 'custom_idx_on_name', expression: (table, columns) => raw(`create index ?? on ?? (??)`, ['custom_idx_on_name', table, columns.name]) })
+ * @Entity({ schema: 'library' })
+ * export class Author { ... }
+ * ```
+ *
+ * You can also use the `quote` tag function to write database-agnostic SQL expressions. The end-result is the same as using the `raw` function regarding database identifiers quoting, only to have a more elegant expression syntax:
+ *
+ * ```ts
+ * @Index({ name: 'custom_idx_on_name', expression: (table, columns) => quote`create index ${'custom_idx_on_name'} on ${table} (${columns.name})` })
+ * @Entity({ schema: 'library' })
+ * export class Author { ... }
+ * ```
+ */
+export function raw(sql, params) {
+    if (Utils.isObject(sql) && 'compile' in sql) {
+        const query = sql.compile();
+        const processed = query.sql.replaceAll(/\$\d+/g, '?');
+        return raw_(processed, query.parameters);
+    }
+    return raw_(sql, params);
+}

package/types/FullTextType.d.ts

@@ -1,5 +1,5 @@
 import { Type, type TransformContext, type RawQueryFragment } from '@mikro-orm/core';
-import type { PostgreSqlPlatform } from '../PostgreSqlPlatform';
+import type { PostgreSqlPlatform } from '../PostgreSqlPlatform.js';
 type FullTextWeight = 'A' | 'B' | 'C' | 'D';
 export type WeightedFullTextValue = {
     [K in FullTextWeight]?: string | null;

package/types/FullTextType.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FullTextType = void 0;
-const core_1 = require("@mikro-orm/core");
-class FullTextType extends core_1.Type {
+import { raw, Type } from '@mikro-orm/core';
+export class FullTextType extends Type {
     regconfig;
     constructor(regconfig = 'simple') {
         super();
@@ -54,10 +51,9 @@ class FullTextType extends core_1.Type {
                 return null;
             }
             // Join all the `setweight` parts using the PostgreSQL tsvector `||` concatenation operator
-            return (0, core_1.raw)(sqlParts.join(' || '), bindings);
+            return raw(sqlParts.join(' || '), bindings);
         }
         // if it's not an object, it is expected to be string which does not have to be wrapped in setweight.
-        return (0, core_1.raw)('to_tsvector(?, ?)', [this.regconfig, value]);
+        return raw('to_tsvector(?, ?)', [this.regconfig, value]);
     }
 }
-exports.FullTextType = FullTextType;

package/types/index.d.ts

@@ -1 +1 @@
-export * from './FullTextType';
+export * from './FullTextType.js';

package/types/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./FullTextType"), exports);
+export * from './FullTextType.js';