@mikro-orm/libsql 7.0.0-dev.33 → 7.0.0-dev.330

package/LibSqlConnection.d.ts

@@ -1,9 +1,13 @@
-import { BaseSqliteConnection, type Dictionary } from '@mikro-orm/knex';
+import { BaseSqliteConnection, type Dictionary } from '@mikro-orm/sql';
 import { type Options } from 'libsql';
 import { LibSqlDialect } from './LibSqlDialect.js';
 export declare class LibSqlConnection extends BaseSqliteConnection {
-    connect(): Promise<void>;
     private database;
+    connect(options?: {
+        skipOnConnect?: boolean;
+    }): Promise<void>;
     createKyselyDialect(options: Dictionary & Options): LibSqlDialect;
-    loadFile(path: string): Promise<void>;
+    /** @inheritDoc */
+    executeDump(source: string): Promise<void>;
+    private validateAttachSupport;
 }

package/LibSqlConnection.js

@@ -1,32 +1,35 @@
-import { BaseSqliteConnection, Utils } from '@mikro-orm/knex';
-import { readFile } from 'node:fs/promises';
+import { BaseSqliteConnection } from '@mikro-orm/sql';
 import Database from 'libsql';
 import { LibSqlDialect } from './LibSqlDialect.js';
-import { dirname } from 'node:path';
-import { CompiledQuery } from 'kysely';
 export class LibSqlConnection extends BaseSqliteConnection {
-    async connect() {
-        await super.connect(true);
-        const dbName = this.config.get('dbName');
-        if (dbName && dbName !== ':memory:' && !dirname(dbName).startsWith('libsql:/')) {
-            Utils.ensureDir(dirname(dbName));
-        }
-        await this.client.executeQuery(CompiledQuery.raw('pragma foreign_keys = on'));
-    }
     database;
+    async connect(options) {
+        this.validateAttachSupport();
+        await super.connect(options);
+    }
     createKyselyDialect(options) {
         const dbName = options.url ?? this.config.get('dbName');
         options.authToken ??= this.config.get('password');
         return new LibSqlDialect({
             database: async () => {
-                return this.database = new Database(dbName, options);
+                return (this.database = new Database(dbName, options));
             },
             onCreateConnection: this.options.onCreateConnection ?? this.config.get('onCreateConnection'),
         });
     }
-    /* v8 ignore next 4 */
-    async loadFile(path) {
+    /** @inheritDoc */
+    async executeDump(source) {
         await this.ensureConnection();
-        this.database.exec((await readFile(path)).toString());
+        this.database.exec(source);
+    }
+    validateAttachSupport() {
+        const attachDatabases = this.config.get('attachDatabases');
+        if (!attachDatabases?.length) {
+            return;
+        }
+        const dbName = this.config.get('dbName');
+        if (/^(https?|libsql):\/\//.exec(dbName)) {
+            throw new Error('ATTACH DATABASE is not supported for remote libSQL connections. ' + 'Use local file-based databases only.');
+        }
     }
 }

package/LibSqlDialect.d.ts

@@ -1,27 +1,6 @@
-import { type DatabaseConnection, type QueryResult, type SqliteDatabase, SqliteDialect, type SqliteDialectConfig, SqliteDriver } from 'kysely';
-declare class LibSqlConnection implements DatabaseConnection {
-    private readonly db;
-    private readonly created;
-    memory: boolean;
-    constructor(db: SqliteDatabase);
-    isValid(): boolean;
-    executeQuery<R>(compiledQuery: any): Promise<QueryResult<R>>;
-    streamQuery<R>(compiledQuery: any): AsyncIterableIterator<QueryResult<R>>;
-}
-declare class LibSqlKyselyDriver extends SqliteDriver {
-    private readonly config;
-    private db;
-    private connection;
-    private connectionMutex;
-    constructor(config: SqliteDialectConfig);
-    init(): Promise<void>;
-    acquireConnection(): Promise<LibSqlConnection>;
-    releaseConnection(): Promise<void>;
-    destroy(): Promise<void>;
-}
+import { SqliteDialect, type SqliteDialectConfig, SqliteDriver } from 'kysely';
 export declare class LibSqlDialect extends SqliteDialect {
-    private readonly config;
+    #private;
     constructor(config: SqliteDialectConfig);
-    createDriver(): LibSqlKyselyDriver;
+    createDriver(): SqliteDriver;
 }
-export {};

package/LibSqlDialect.js

@@ -19,25 +19,26 @@ class ConnectionMutex {
     }
 }
 class LibSqlConnection {
-    db;
-    created = Date.now();
+    #created = Date.now();
+    #db;
     constructor(db) {
-        this.db = db;
+        this.#db = db;
     }
     isValid() {
-        return this.memory || this.created > Date.now() - CONNECTION_TIMEOUT;
+        return this.memory || this.#created > Date.now() - CONNECTION_TIMEOUT;
     }
     async executeQuery(compiledQuery) {
         const { sql, parameters } = compiledQuery;
-        const stmt = this.db.prepare(sql);
+        const stmt = this.#db.prepare(sql);
         if (stmt.reader) {
             return {
                 rows: stmt.all(parameters),
             };
         }
         const query = sql.trim().toLowerCase();
-        /* v8 ignore next 5 */
-        if (query.startsWith('select') || ((query.startsWith('insert into') || query.startsWith('update ')) && query.includes(' returning '))) {
+        /* v8 ignore next */
+        if (query.startsWith('select') ||
+            ((query.startsWith('insert into') || query.startsWith('update ')) && query.includes(' returning '))) {
             return {
                 rows: stmt.all(parameters),
             };
@@ -49,10 +50,10 @@ class LibSqlConnection {
             rows: [],
         };
     }
-    /* v8 ignore start */
     async *streamQuery(compiledQuery) {
         const { sql, parameters } = compiledQuery;
-        const stmt = this.db.prepare(sql);
+        const stmt = this.#db.prepare(sql);
+        /* v8 ignore next */
         if (!sql.toLowerCase().startsWith('select')) {
             throw new Error('Sqlite driver only supports streaming of select queries');
         }
@@ -64,45 +65,45 @@ class LibSqlConnection {
     }
 }
 class LibSqlKyselyDriver extends SqliteDriver {
-    config;
-    db;
-    connection;
-    connectionMutex = new ConnectionMutex();
+    #db;
+    #connection;
+    #connectionMutex = new ConnectionMutex();
+    #config;
     constructor(config) {
         super(config);
-        this.config = config;
+        this.#config = config;
     }
     async init() {
-        this.db = await this.config.database();
-        this.connection = new LibSqlConnection(this.db);
-        /* v8 ignore next 3 */
-        if (this.config.onCreateConnection) {
-            await this.config.onCreateConnection(this.connection);
+        this.#db = await this.#config.database();
+        this.#connection = new LibSqlConnection(this.#db);
+        /* v8 ignore next */
+        if (this.#config.onCreateConnection) {
+            await this.#config.onCreateConnection(this.#connection);
         }
     }
     async acquireConnection() {
-        await this.connectionMutex.lock();
-        /* v8 ignore next 4 */
-        if (!this.connection.isValid()) {
+        await this.#connectionMutex.lock();
+        /* v8 ignore next */
+        if (!this.#connection.isValid()) {
             await this.destroy();
             await this.init();
         }
-        return this.connection;
+        return this.#connection;
     }
     async releaseConnection() {
-        this.connectionMutex.unlock();
+        this.#connectionMutex.unlock();
     }
     async destroy() {
-        this.db.close();
+        this.#db.close();
     }
 }
 export class LibSqlDialect extends SqliteDialect {
-    config;
+    #config;
     constructor(config) {
         super(config);
-        this.config = config;
+        this.#config = config;
     }
     createDriver() {
-        return new LibSqlKyselyDriver(this.config);
+        return new LibSqlKyselyDriver(this.#config);
     }
 }

package/LibSqlDriver.d.ts

@@ -1,6 +1,9 @@
-import type { Configuration } from '@mikro-orm/core';
-import { AbstractSqlDriver } from '@mikro-orm/knex';
+import type { Configuration, Constructor } from '@mikro-orm/core';
+import { AbstractSqlDriver } from '@mikro-orm/sql';
 import { LibSqlConnection } from './LibSqlConnection.js';
+import { LibSqlMikroORM } from './LibSqlMikroORM.js';
 export declare class LibSqlDriver extends AbstractSqlDriver<LibSqlConnection> {
     constructor(config: Configuration);
+    /** @inheritDoc */
+    getORMClass(): Constructor<LibSqlMikroORM>;
 }

package/LibSqlDriver.js

@@ -1,8 +1,12 @@
-import { AbstractSqlDriver } from '@mikro-orm/knex';
+import { AbstractSqlDriver, SqlitePlatform } from '@mikro-orm/sql';
 import { LibSqlConnection } from './LibSqlConnection.js';
-import { LibSqlPlatform } from './LibSqlPlatform.js';
+import { LibSqlMikroORM } from './LibSqlMikroORM.js';
 export class LibSqlDriver extends AbstractSqlDriver {
     constructor(config) {
-        super(config, new LibSqlPlatform(), LibSqlConnection, ['kysely', 'libsql']);
+        super(config, new SqlitePlatform(), LibSqlConnection, ['kysely', 'libsql']);
+    }
+    /** @inheritDoc */
+    getORMClass() {
+        return LibSqlMikroORM;
     }
 }

package/LibSqlMikroORM.d.ts

@@ -1,19 +1,18 @@
-import { MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
+import { type AnyEntity, type EntityClass, type EntitySchema, MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
+import type { SqlEntityManager } from '@mikro-orm/sql';
 import { LibSqlDriver } from './LibSqlDriver.js';
-import type { SqlEntityManager } from '@mikro-orm/knex';
+export type LibSqlOptions<EM extends SqlEntityManager<LibSqlDriver> = SqlEntityManager<LibSqlDriver>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> = Partial<Options<LibSqlDriver, EM, Entities>>;
+export declare function defineLibSqlConfig<EM extends SqlEntityManager<LibSqlDriver> = SqlEntityManager<LibSqlDriver>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]>(options: LibSqlOptions<EM, Entities>): LibSqlOptions<EM, Entities>;
 /**
  * @inheritDoc
  */
-export declare class LibSqlMikroORM<EM extends EntityManager = SqlEntityManager> extends MikroORM<LibSqlDriver, EM> {
-    private static DRIVER;
+export declare class LibSqlMikroORM<EM extends SqlEntityManager<LibSqlDriver> = SqlEntityManager<LibSqlDriver>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends MikroORM<LibSqlDriver, EM, Entities> {
     /**
      * @inheritDoc
      */
-    static init<D extends IDatabaseDriver = LibSqlDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager>(options?: Options<D, EM>): Promise<MikroORM<D, EM>>;
+    static init<D extends IDatabaseDriver = LibSqlDriver, EM extends EntityManager<D> = D[typeof EntityManagerType] & EntityManager<D>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]>(options: Partial<Options<D, EM, Entities>>): Promise<MikroORM<D, EM, Entities>>;
     /**
      * @inheritDoc
      */
-    static initSync<D extends IDatabaseDriver = LibSqlDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager>(options: Options<D, EM>): MikroORM<D, EM>;
+    constructor(options: Partial<Options<LibSqlDriver, EM, Entities>>);
 }
-export type LibSqlOptions = Options<LibSqlDriver>;
-export declare function defineLibSqlConfig(options: LibSqlOptions): Options<LibSqlDriver, SqlEntityManager<LibSqlDriver> & EntityManager<IDatabaseDriver<import("@mikro-orm/core").Connection>>>;

package/LibSqlMikroORM.js

@@ -1,24 +1,22 @@
 import { defineConfig, MikroORM, } from '@mikro-orm/core';
 import { LibSqlDriver } from './LibSqlDriver.js';
+export function defineLibSqlConfig(options) {
+    return defineConfig({ driver: LibSqlDriver, ...options });
+}
 /**
  * @inheritDoc
  */
 export class LibSqlMikroORM extends MikroORM {
-    static DRIVER = LibSqlDriver;
     /**
      * @inheritDoc
      */
     static async init(options) {
-        return super.init(options);
+        return super.init(defineLibSqlConfig(options));
     }
     /**
      * @inheritDoc
      */
-    static initSync(options) {
-        return super.initSync(options);
+    constructor(options) {
+        super(defineLibSqlConfig(options));
     }
 }
-/* v8 ignore next 3 */
-export function defineLibSqlConfig(options) {
-    return defineConfig({ driver: LibSqlDriver, ...options });
-}

package/README.md

@@ -2,14 +2,14 @@
   <a href="https://mikro-orm.io"><img src="https://raw.githubusercontent.com/mikro-orm/mikro-orm/master/docs/static/img/logo-readme.svg?sanitize=true" alt="MikroORM" /></a>
 </h1>
 
-TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL and SQLite (including libSQL) databases. 
+TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL, SQLite (including libSQL), MSSQL and Oracle databases. 
 
 > Heavily inspired by [Doctrine](https://www.doctrine-project.org/) and [Hibernate](https://hibernate.org/).
 
-[![NPM version](https://img.shields.io/npm/v/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
-[![NPM dev version](https://img.shields.io/npm/v/@mikro-orm/core/next.svg)](https://www.npmjs.com/package/@mikro-orm/core)
+[![NPM version](https://img.shields.io/npm/v/@mikro-orm/core.svg)](https://npmx.dev/package/@mikro-orm/core)
+[![NPM dev version](https://img.shields.io/npm/v/@mikro-orm/core/next.svg)](https://npmx.dev/package/@mikro-orm/core)
 [![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)
+[![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://npmx.dev/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)
 [![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)
 
@@ -181,6 +181,7 @@ yarn add @mikro-orm/core @mikro-orm/mysql         # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 yarn add @mikro-orm/core @mikro-orm/mssql         # for mssql
+yarn add @mikro-orm/core @mikro-orm/oracledb      # for oracle
 yarn add @mikro-orm/core @mikro-orm/sqlite        # for sqlite
 yarn add @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
@@ -381,6 +382,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,5 +1,4 @@
-export * from '@mikro-orm/knex';
+export * from '@mikro-orm/sql';
 export * from './LibSqlConnection.js';
 export * from './LibSqlDriver.js';
-export * from './LibSqlPlatform.js';
-export { LibSqlMikroORM as MikroORM, LibSqlOptions as Options, defineLibSqlConfig as defineConfig, } from './LibSqlMikroORM.js';
+export { LibSqlMikroORM as MikroORM, type LibSqlOptions as Options, defineLibSqlConfig as defineConfig, } from './LibSqlMikroORM.js';

package/index.js

@@ -1,5 +1,4 @@
-export * from '@mikro-orm/knex';
+export * from '@mikro-orm/sql';
 export * from './LibSqlConnection.js';
 export * from './LibSqlDriver.js';
-export * from './LibSqlPlatform.js';
 export { LibSqlMikroORM as MikroORM, defineLibSqlConfig as defineConfig, } from './LibSqlMikroORM.js';

package/package.json

@@ -1,65 +1,63 @@
 {
   "name": "@mikro-orm/libsql",
-  "type": "module",
-  "version": "7.0.0-dev.33",
+  "version": "7.0.0-dev.330",
   "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.11.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 clean && yarn compile && yarn copy",
+    "build": "yarn compile && yarn copy",
     "clean": "yarn run -T rimraf ./dist",
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@mikro-orm/knex": "7.0.0-dev.33",
-    "libsql": "0.5.22",
-    "sqlstring-sqlite": "0.1.1"
+    "@mikro-orm/sql": "7.0.0-dev.330",
+    "kysely": "0.28.11",
+    "libsql": "0.5.22"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.5.7",
-    "kysely": "0.28.7"
+    "@mikro-orm/core": "^6.6.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.33",
-    "kysely": "*"
+    "@mikro-orm/core": "7.0.0-dev.330"
+  },
+  "engines": {
+    "node": ">= 22.17.0"
   }
 }

package/LibSqlPlatform.d.ts

@@ -1,4 +0,0 @@
-import { BaseSqlitePlatform } from '@mikro-orm/knex';
-export declare class LibSqlPlatform extends BaseSqlitePlatform {
-    escape(value: any): string;
-}

package/LibSqlPlatform.js

@@ -1,8 +0,0 @@
-// @ts-ignore
-import SqlString from 'sqlstring-sqlite';
-import { BaseSqlitePlatform } from '@mikro-orm/knex';
-export class LibSqlPlatform extends BaseSqlitePlatform {
-    escape(value) {
-        return SqlString.escape(value, true, this.timezone);
-    }
-}