uql-orm 0.89.0 → 0.90.0

package/dist/migrate/acquireQuerierForMigrations.d.ts

@@ -1,4 +1,4 @@
-import { type MongoQuerier, type Querier, type QuerierPool, type SqlQuerier } from '../type/index.js';
+import { type Querier, type QuerierPool, type SqlQuerier } from '../type/index.js';
 /**
  * Querier used for schema migrations and the migration journal.
  *
@@ -15,5 +15,5 @@ export declare function acquireQuerierForMigrations(pool: QuerierPool): Promise<
 export declare function withQuerierForMigrations<T>(pool: QuerierPool, task: (querier: Querier) => Promise<T>): Promise<T>;
 /** Same, for the paths that only work against SQL. `requiredBy` names the caller in the error. */
 export declare function withSqlQuerierForMigrations<T>(pool: QuerierPool, requiredBy: string, task: (querier: SqlQuerier) => Promise<T>): Promise<T>;
-/** Same, for the paths that only work against MongoDB. */
-export declare function withMongoQuerierForMigrations<T>(pool: QuerierPool, requiredBy: string, task: (querier: MongoQuerier) => Promise<T>): Promise<T>;
+/** Runs `task` on a migration querier `isKind` accepts, refusing any other with `error`. */
+export declare function withQuerierOfKind<Q extends Querier, T>(pool: QuerierPool, isKind: (querier: Querier) => querier is Q, error: string, task: (querier: Q) => Promise<T>): Promise<T>;

package/dist/migrate/acquireQuerierForMigrations.js

@@ -1,4 +1,4 @@
-import { isMongoQuerier, isSqlQuerier, } from '../type/index.js';
+import { isSqlQuerier } from '../type/index.js';
 import { UqlUsageError } from '../util/uqlError.js';
 /**
  * Querier used for schema migrations and the migration journal.
@@ -28,11 +28,8 @@ export async function withQuerierForMigrations(pool, task) {
 export function withSqlQuerierForMigrations(pool, requiredBy, task) {
     return withQuerierOfKind(pool, isSqlQuerier, `${requiredBy} requires a SQL-based querier`, task);
 }
-/** Same, for the paths that only work against MongoDB. */
-export function withMongoQuerierForMigrations(pool, requiredBy, task) {
-    return withQuerierOfKind(pool, isMongoQuerier, `${requiredBy} requires a MongoDB querier`, task);
-}
-function withQuerierOfKind(pool, isKind, error, task) {
+/** Runs `task` on a migration querier `isKind` accepts, refusing any other with `error`. */
+export function withQuerierOfKind(pool, isKind, error, task) {
     return withQuerierForMigrations(pool, (querier) => {
         if (!isKind(querier)) {
             throw new UqlUsageError(error);

package/dist/migrate/codegen/migrationFile.d.ts

@@ -31,6 +31,8 @@ export declare const EMPTY_MANUAL_MIGRATION_DOWN_INNER = "    // Add your rollba
 /** How a migration on one querier is scaffolded empty, and how a generated statement is spelled in it. */
 export type MigrationSource = {
     readonly querier: MigrationQuerierType;
+    /** The entry exporting that querier's type: a MongoDB one names the driver's `Db`, so only `uql-orm/mongo` has it. */
+    readonly module: string;
     readonly emptyUp: string;
     readonly emptyDown: string;
     emit(statements: string[]): string;
@@ -38,12 +40,14 @@ export type MigrationSource = {
 export declare const migrationSource: {
     SqlQuerier: {
         querier: "SqlQuerier";
+        module: string;
         emptyUp: string;
         emptyDown: string;
         emit: typeof emitSqlRunCalls;
     };
     MongoQuerier: {
         querier: "MongoQuerier";
+        module: string;
         emptyUp: string;
         emptyDown: string;
         emit: typeof emitMongoCommandCalls;

package/dist/migrate/codegen/migrationFile.js

@@ -1,4 +1,4 @@
-import { mongoCommandSource } from '../generator/mongoCommand.js';
+import { mongoCommandSource } from '../../mongo/mongoCommand.js';
 /**
  * Emit one `await querier.run(...)` line for entity-generated migrations.
  * Uses `JSON.stringify` so SQL with backticks (SQLite/LibSQL), quotes, `${`, etc. stays valid TS source.
@@ -27,12 +27,14 @@ export const EMPTY_MANUAL_MIGRATION_DOWN_INNER = `    // Add your rollback logic
 export const migrationSource = {
     SqlQuerier: {
         querier: 'SqlQuerier',
+        module: 'uql-orm/migrate',
         emptyUp: EMPTY_MANUAL_MIGRATION_UP_INNER,
         emptyDown: EMPTY_MANUAL_MIGRATION_DOWN_INNER,
         emit: emitSqlRunCalls,
     },
     MongoQuerier: {
         querier: 'MongoQuerier',
+        module: 'uql-orm/mongo',
         emptyUp: `    // Add your migration logic here, through the database handle.
     // await querier.db.collection('users').updateMany({}, { $set: { active: true } });
 `,
@@ -49,7 +51,7 @@ export function buildMigrationModule(options) {
     const querier = options.querier ?? 'SqlQuerier';
     const iso = options.createdAt.toISOString();
     const extra = options.docExtraLines?.map((line) => `\n * ${line}`).join('') ?? '';
-    return /*ts*/ `import type { ${querier} } from 'uql-orm/migrate';
+    return /*ts*/ `import type { ${querier} } from '${migrationSource[querier].module}';
 
 /**
  * Migration: ${options.migrationName}

package/dist/migrate/index.d.ts

@@ -1,4 +1,4 @@
-export type { Change, ColumnSchema, DialectName, ForeignKeySchema, IndexSchema, Migration, MigrationDefinition, MigrationResult, MigrationStorage, MigratorOptions, MongoQuerier, PrimaryKeySchema, SchemaDiff, SchemaGenerator, SchemaIntrospector, SqlDialectName, SqlQuerier, SqlQueryDialect, SyncOptions, TableSchema, } from '../type/index.js';
+export type { Change, ColumnSchema, DialectName, ForeignKeySchema, IndexSchema, Migration, MigrationDefinition, MigrationResult, MigrationStorage, MigratorOptions, PrimaryKeySchema, SchemaDiff, SchemaGenerator, SchemaIntrospector, SqlDialectName, SqlQuerier, SqlQueryDialect, SyncOptions, TableSchema, } from '../type/index.js';
 export { type Config, isSqlQuerier } from '../type/index.js';
 export { acquireQuerierForMigrations } from './acquireQuerierForMigrations.js';
 export { assertCliConfig } from './assertCliConfig.js';
@@ -14,4 +14,3 @@ export { reverseDiff } from './schemaChange.js';
 export { SqlSchemaGenerator } from './schemaGenerator.js';
 export { DatabaseMigrationStorage } from './storage/databaseStorage.js';
 export { JsonMigrationStorage } from './storage/jsonStorage.js';
-export { MongoMigrationStorage } from './storage/mongoStorage.js';

package/dist/migrate/index.js

@@ -21,5 +21,3 @@ export { SqlSchemaGenerator } from './schemaGenerator.js';
 // Storage implementations
 export { DatabaseMigrationStorage } from './storage/databaseStorage.js';
 export { JsonMigrationStorage } from './storage/jsonStorage.js';
-export { MongoMigrationStorage } from './storage/mongoStorage.js';
-// Schema sync

package/dist/migrate/introspection/index.d.ts

@@ -1,5 +1,4 @@
 export * from './abstractSqlSchemaIntrospector.js';
-export * from './mongoIntrospector.js';
 export * from './mssqlIntrospector.js';
 export { MariadbSchemaIntrospector, MysqlSchemaIntrospector } from './mysqlIntrospector.js';
 export * from './postgresIntrospector.js';

package/dist/migrate/introspection/index.js

@@ -1,5 +1,4 @@
 export * from './abstractSqlSchemaIntrospector.js';
-export * from './mongoIntrospector.js';
 export * from './mssqlIntrospector.js';
 export { MariadbSchemaIntrospector, MysqlSchemaIntrospector } from './mysqlIntrospector.js';
 export * from './postgresIntrospector.js';

package/dist/migrate/introspection/registry.js

@@ -1,4 +1,4 @@
-import { MongoSchemaIntrospector } from './mongoIntrospector.js';
+import { MongoSchemaIntrospector } from '../../mongo/mongoIntrospector.js';
 import { MsSqlSchemaIntrospector } from './mssqlIntrospector.js';
 import { MariadbSchemaIntrospector, MysqlSchemaIntrospector } from './mysqlIntrospector.js';
 import { CockroachSchemaIntrospector, PostgresSchemaIntrospector } from './postgresIntrospector.js';

package/dist/migrate/migrationTarget.js

@@ -1,12 +1,13 @@
-import { isMongoQuerier, isSqlQuerier, } from '../type/index.js';
+import { runMongoCommand } from '../mongo/mongoCommand.js';
+import { MongoMigrationStorage } from '../mongo/mongoMigrationStorage.js';
+import { isMongoQuerier, withMongoQuerierForMigrations } from '../mongo/mongoQuerier.js';
+import { isSqlQuerier, } from '../type/index.js';
 import { UqlUsageError } from '../util/uqlError.js';
-import { withMongoQuerierForMigrations, withSqlQuerierForMigrations } from './acquireQuerierForMigrations.js';
+import { withSqlQuerierForMigrations } from './acquireQuerierForMigrations.js';
 import { MigrationBuilder } from './builder/migrationBuilder.js';
 import { migrationSource } from './codegen/migrationFile.js';
-import { runMongoCommand } from './generator/mongoCommand.js';
 import { SqlSchemaGenerator } from './schemaGenerator.js';
 import { DatabaseMigrationStorage } from './storage/databaseStorage.js';
-import { MongoMigrationStorage } from './storage/mongoStorage.js';
 const sqlSession = (querier) => ({
     querier,
     run: (statement) => querier.run(statement),
@@ -45,7 +46,7 @@ const mongoSession = (querier) => ({
 });
 /** Imported on use, so the optional `mongodb` peer loads only on MongoDB. */
 async function mongoSchemaGenerator(namingStrategy, defaultForeignKeyAction) {
-    const { MongoSchemaGenerator } = await import('./generator/mongoSchemaGenerator.js');
+    const { MongoSchemaGenerator } = await import('../mongo/mongoSchemaGenerator.js');
     return new MongoSchemaGenerator(namingStrategy, defaultForeignKeyAction);
 }
 export function migrationTargetFor(pool, defaultForeignKeyAction) {

package/dist/mongo/index.d.ts

@@ -1,5 +1,8 @@
-export { MongoSchemaGenerator } from '../migrate/generator/mongoSchemaGenerator.js';
 export * from './mongoDialect.js';
 export * from './mongodbQuerier.js';
 export * from './mongodbQuerierPool.js';
+export * from './mongoIntrospector.js';
+export * from './mongoMigrationStorage.js';
+export { isMongoQuerier, type MongoQuerier } from './mongoQuerier.js';
+export * from './mongoSchemaGenerator.js';
 export * from './textLanguage.js';

package/dist/mongo/index.js

@@ -1,5 +1,8 @@
-export { MongoSchemaGenerator } from '../migrate/generator/mongoSchemaGenerator.js';
 export * from './mongoDialect.js';
 export * from './mongodbQuerier.js';
 export * from './mongodbQuerierPool.js';
+export * from './mongoIntrospector.js';
+export * from './mongoMigrationStorage.js';
+export { isMongoQuerier } from './mongoQuerier.js';
+export * from './mongoSchemaGenerator.js';
 export * from './textLanguage.js';

package/dist/{migrate/generator → mongo}/mongoCommand.js

@@ -1,4 +1,4 @@
-import { UqlUsageError } from '../../util/uqlError.js';
+import { UqlUsageError } from '../util/uqlError.js';
 export function serializeMongoCommand(command) {
     return JSON.stringify(command);
 }

package/dist/{migrate/introspection → mongo}/mongoIntrospector.d.ts

@@ -1,6 +1,6 @@
-import type { IndexFacet } from '../../schema/indexDifferences.js';
-import { SchemaAST } from '../../schema/schemaAST.js';
-import { type InstalledTriggers, type QuerierPool, type SchemaIntrospector, type TableSchema } from '../../type/index.js';
+import type { IndexFacet } from '../schema/indexDifferences.js';
+import { SchemaAST } from '../schema/schemaAST.js';
+import type { InstalledTriggers, QuerierPool, SchemaIntrospector, TableSchema } from '../type/index.js';
 /**
  * MongoDB schema introspector.
  * MongoDB doesn't have a fixed schema, so this primarily focuses on collections and indexes.

package/dist/{migrate/introspection → mongo}/mongoIntrospector.js

@@ -1,7 +1,7 @@
-import { textConfigOf } from '../../mongo/textLanguage.js';
-import { createTableNode, SchemaAST } from '../../schema/schemaAST.js';
-import { isMongoQuerier, } from '../../type/index.js';
-import { UqlUsageError } from '../../util/uqlError.js';
+import { createTableNode, SchemaAST } from '../schema/schemaAST.js';
+import { UqlUsageError } from '../util/uqlError.js';
+import { isMongoQuerier } from './mongoQuerier.js';
+import { textConfigOf } from './textLanguage.js';
 /** What a server without Atlas Search answers a search index command with. */
 const SEARCH_NOT_ENABLED = 31082;
 /**

package/dist/{migrate/storage/mongoStorage.d.ts → mongo/mongoMigrationStorage.d.ts}

@@ -1,4 +1,5 @@
-import type { MigrationStorage, MongoQuerier, QuerierPool } from '../../type/index.js';
+import type { MigrationStorage, QuerierPool } from '../type/index.js';
+import { type MongoQuerier } from './mongoQuerier.js';
 /**
  * Stores migration state in a MongoDB collection, named as the SQL table would be.
  */

package/dist/{migrate/storage/mongoStorage.js → mongo/mongoMigrationStorage.js}

@@ -1,5 +1,5 @@
-import { withMongoQuerierForMigrations } from '../acquireQuerierForMigrations.js';
-import { DEFAULT_MIGRATIONS_TABLE } from './databaseStorage.js';
+import { DEFAULT_MIGRATIONS_TABLE } from '../migrate/storage/databaseStorage.js';
+import { withMongoQuerierForMigrations } from './mongoQuerier.js';
 /**
  * Stores migration state in a MongoDB collection, named as the SQL table would be.
  */

package/dist/mongo/mongoQuerier.d.ts

@@ -0,0 +1,18 @@
+import type { Db } from 'mongodb';
+import { type Querier, type QuerierPool } from '../type/index.js';
+/**
+ * Extended querier interface for MongoDB execution.
+ */
+export interface MongoQuerier extends Querier {
+    /**
+     * The MongoDB database instance.
+     */
+    readonly db: Db;
+}
+/**
+ * Type guard for a querier over a MongoDB database. A handle alone does not tell: the SQLite, D1 and
+ * Turso queriers carry a `db` of their own.
+ */
+export declare function isMongoQuerier(querier: Querier): querier is MongoQuerier;
+/** Runs `task` on a migration querier over MongoDB. `requiredBy` names the caller in the error. */
+export declare function withMongoQuerierForMigrations<T>(pool: QuerierPool, requiredBy: string, task: (querier: MongoQuerier) => Promise<T>): Promise<T>;

package/dist/mongo/mongoQuerier.js

@@ -0,0 +1,13 @@
+import { withQuerierOfKind } from '../migrate/acquireQuerierForMigrations.js';
+import { isSqlQuerier } from '../type/index.js';
+/**
+ * Type guard for a querier over a MongoDB database. A handle alone does not tell: the SQLite, D1 and
+ * Turso queriers carry a `db` of their own.
+ */
+export function isMongoQuerier(querier) {
+    return 'db' in querier && !isSqlQuerier(querier);
+}
+/** Runs `task` on a migration querier over MongoDB. `requiredBy` names the caller in the error. */
+export function withMongoQuerierForMigrations(pool, requiredBy, task) {
+    return withQuerierOfKind(pool, isMongoQuerier, `${requiredBy} requires a MongoDB querier`, task);
+}

package/dist/{migrate/generator → mongo}/mongoSchemaGenerator.d.ts

@@ -1,7 +1,7 @@
-import { MongoDialect } from '../../mongo/mongoDialect.js';
-import type { ForeignKeyAction, TableNode } from '../../schema/types.js';
-import { type CreateSchemaOptions, type EntityWhereMeta, type IndexSchema, type NamingStrategy, type SchemaDiff, type SchemaGenerator, type Type } from '../../type/index.js';
-import type { AnyMigrationOperation } from '../builder/types.js';
+import type { AnyMigrationOperation } from '../migrate/builder/types.js';
+import type { ForeignKeyAction, TableNode } from '../schema/types.js';
+import { type CreateSchemaOptions, type EntityWhereMeta, type IndexSchema, type NamingStrategy, type SchemaDiff, type SchemaGenerator, type Type } from '../type/index.js';
+import { MongoDialect } from './mongoDialect.js';
 export declare class MongoSchemaGenerator extends MongoDialect implements SchemaGenerator {
     protected readonly defaultForeignKeyAction?: ForeignKeyAction | undefined;
     constructor(namingStrategy?: NamingStrategy, defaultForeignKeyAction?: ForeignKeyAction | undefined);

package/dist/{migrate/generator → mongo}/mongoSchemaGenerator.js

@@ -1,18 +1,18 @@
-import { getMeta } from '../../entity/index.js';
-import { MongoDialect } from '../../mongo/mongoDialect.js';
-import { textLanguage } from '../../mongo/textLanguage.js';
-import { indexChanges } from '../../schema/indexDifferences.js';
-import { QueryRaw, } from '../../type/index.js';
-import { indexDistance, unsupportedVectorMetric } from '../../type/vector.js';
-import { declaredIndexes, declaredIndexName, renderIndexColumn } from '../../util/ddlExpression.util.js';
-import { fulltextConfig, fulltextWeights } from '../../util/dialect.util.js';
-import { UqlUsageError } from '../../util/uqlError.js';
-import { assertIndexFeatures, assertIndexType } from '../ddl/indexDdl.js';
-import { assertIndexPredicate, refusedIndexPredicate } from '../indexPredicate.js';
-import { sides } from '../schemaChange.js';
-import { renderIndexDefinition } from './definitionToNode.js';
-import { indexNodeToSchema } from './indexNodeToSchema.js';
+import { getMeta } from '../entity/index.js';
+import { assertIndexFeatures, assertIndexType } from '../migrate/ddl/indexDdl.js';
+import { renderIndexDefinition } from '../migrate/generator/definitionToNode.js';
+import { indexNodeToSchema } from '../migrate/generator/indexNodeToSchema.js';
+import { assertIndexPredicate, refusedIndexPredicate } from '../migrate/indexPredicate.js';
+import { sides } from '../migrate/schemaChange.js';
+import { indexChanges } from '../schema/indexDifferences.js';
+import { QueryRaw, } from '../type/index.js';
+import { indexDistance, unsupportedVectorMetric } from '../type/vector.js';
+import { declaredIndexes, declaredIndexName, renderIndexColumn } from '../util/ddlExpression.util.js';
+import { fulltextConfig, fulltextWeights } from '../util/dialect.util.js';
+import { UqlUsageError } from '../util/uqlError.js';
 import { serializeMongoCommand } from './mongoCommand.js';
+import { MongoDialect } from './mongoDialect.js';
+import { textLanguage } from './textLanguage.js';
 /** The index types a key spec can say, a plain key or `'text'`, and Atlas's vector search index. */
 const MONGO_INDEX_TYPES = new Set(['btree', 'fulltext', 'vectorSearch']);
 /** A key spec's one feature beyond its keys: a partial filter. */

package/dist/mongo/mongodbQuerier.d.ts

@@ -2,7 +2,8 @@ import type { Document, MongoClient } from 'mongodb';
 import { AbstractQuerier } from '../querier/index.js';
 import type { EntityData, ExtraOptions, PrimaryKey, Query, QueryAggMap, QueryAggregate, QueryAggregateResult, QueryConflictPaths, QueryPage, QueryGroupMap, QueryOptions, QuerySearch, TransactionOptions, Type, UpdatePayload } from '../type/index.js';
 import type { MongoDialect } from './mongoDialect.js';
-export declare class MongodbQuerier extends AbstractQuerier {
+import type { MongoQuerier } from './mongoQuerier.js';
+export declare class MongodbQuerier extends AbstractQuerier implements MongoQuerier {
     readonly dialect: MongoDialect;
     readonly conn: MongoClient;
     readonly extra?: ExtraOptions | undefined;

package/dist/type/migratorDialect.d.ts

@@ -1,4 +1,9 @@
+import type { AbstractDialect } from '../dialect/abstractDialect.js';
 import type { AbstractSqlDialect } from '../dialect/abstractSqlDialect.js';
-import type { MongoDialect } from '../mongo/mongoDialect.js';
-/** The dialects the migrator runs on, which `dialectName` tells apart: every SQL engine, and MongoDB. */
-export type MigratorDialect = AbstractSqlDialect | MongoDialect;
+/**
+ * The dialects the migrator runs on, which `dialectName` tells apart: every SQL engine, and MongoDB, named
+ * by its `dialectName` alone so these types reach no `mongodb` declaration.
+ */
+export type MigratorDialect = AbstractSqlDialect | (AbstractDialect & {
+    readonly dialectName: 'mongodb';
+});

package/dist/type/querier.d.ts

@@ -1,4 +1,3 @@
-import type { Db } from 'mongodb';
 import type { AbstractSqlDialect } from '../dialect/index.js';
 import type { SqlDialectName } from './dialect.js';
 import type { FieldKey, HookEvent, RelationKey } from './entity.js';
@@ -116,20 +115,6 @@ export interface SqlQuerier extends Querier {
  * Type guard to check if a querier supports raw SQL execution
  */
 export declare function isSqlQuerier(querier: Querier): querier is SqlQuerier;
-/**
- * Extended querier interface for MongoDB execution.
- */
-export interface MongoQuerier extends Querier {
-    /**
-     * The MongoDB database instance.
-     */
-    readonly db: Db;
-}
-/**
- * Type guard for a querier over a MongoDB database. A handle alone does not tell: the SQLite, D1 and
- * Turso queriers carry a `db` of their own.
- */
-export declare function isMongoQuerier(querier: Querier): querier is MongoQuerier;
 /**
  * Context passed to global querier listeners.
  */

package/dist/type/querier.js

@@ -8,10 +8,3 @@ export function isSqlQuerier(querier) {
         q.dialect !== undefined &&
         typeof q.dialect.escapeIdChar === 'string');
 }
-/**
- * Type guard for a querier over a MongoDB database. A handle alone does not tell: the SQLite, D1 and
- * Turso queriers carry a `db` of their own.
- */
-export function isMongoQuerier(querier) {
-    return 'db' in querier && !isSqlQuerier(querier);
-}

package/package.json

@@ -3,7 +3,7 @@
   "homepage": "https://uql-orm.dev",
   "description": "JSON-native TypeScript ORM for Bun, Browsers, Edge, Deno, Node, Workers. Supports PostgreSQL, PGlite, MySQL, MariaDB, SQLite, CockroachDB, SQL Server, Turso, Neon, Cloudflare D1 and MongoDB. Queries are plain JSON, typed to the leaf.",
   "license": "MIT",
-  "version": "0.89.0",
+  "version": "0.90.0",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -156,7 +156,7 @@
     "pg-query-stream": "^4.17.0",
     "rxjs": "^7.8.2",
     "sqlite-vec": "^0.1.9",
-    "ws": "^8.21.3"
+    "ws": "^8.22.0"
   },
   "author": "Roger Padilla",
   "repository": {