uql-codemod 0.41.0 → 0.42.0

package/README.md

@@ -32,7 +32,7 @@ Only `--flag=value` is read, and anything unrecognised is an error. It exits `0`
 - A partial-index `where` string to `raw`, importing it, on entities and in the migration builder.
 - `col('cost')` to the ref it names, ``(product) => raw`${product.cost}` `` in a `computed` and `refs(Item).cost` in a statement, and `$lock: { wait: 'skip' }` to `{ $wait: 'skip' }`, or to `true` for `{}` and a `'block'` wait.
 - An aggregate's `$agg` to `$select`, and each field it or `$text`'s `$fields` names to a key: `{ $sum: { amount: true } }`.
-- Renamed exports, at the import and every use: `QueryWhereMap` to `QueryWhere`, `RelationKeyMap` to `KeyMap`, `FilterCondition` to `FilterWhere`, `SqlMigrationModuleOptions` to `MigrationModuleOptions`, `buildSqlQuerierMigrationModule` to `buildMigrationModule`, `QueryDialect` to `SqlQueryDialect`, `EngineFeatures` to `DialectFeatures`, `KnownMigratorDialect` to `DialectName`, `D1Preparer`/`D1Database` to `D1Queryable`, and the removed driver classes to the one each extended: `PgDialect`/`NeonDialect`/`PgliteDialect` to `PostgresDialect`, `CrdbQuerier`/`NeonQuerier` to `PgQuerier`, `LibsqlQuerier`/`TursoQuerier` to `HranaQuerier`, `TursoLocalQuerier` to `SqliteQuerier` and `TursoDatabase` to `SqliteDatabase`, `MySql2Dialect` to `MySqlDialect`, `MongodbNativeDialect` to `MongoDialect`, moving the import to the entry that exports it.
+- Renamed exports, at the import and every use: `QueryWhereMap` to `QueryWhere`, `RelationKeyMap` to `KeyMap`, `FilterCondition` to `FilterWhere`, `SqlMigrationModuleOptions` to `MigrationModuleOptions`, `buildSqlQuerierMigrationModule` to `buildMigrationModule`, `QueryDialect` to `SqlQueryDialect`, `EngineFeatures` to `DialectFeatures`, `KnownMigratorDialect` to `DialectName`, `D1Preparer`/`D1Database` to `D1Queryable`, and the removed driver classes to the one each extended: `PgDialect`/`NeonDialect`/`PgliteDialect` to `PostgresDialect`, `CrdbQuerier`/`NeonQuerier` to `PgQuerier`, `LibsqlQuerier`/`TursoQuerier` to `HranaQuerier`, `TursoLocalQuerier` to `SqliteQuerier` and `TursoDatabase` to `SqliteDatabase`, `MySql2Dialect` to `MySqlDialect`, `MongodbNativeDialect` to `MongoDialect`, moving the import to the entry that exports it; and `MongoQuerier`, `isMongoQuerier`, `MongoMigrationStorage` and `MongoSchemaIntrospector` to `uql-orm/mongo`.
 - The `[idKey]?: '...'` brand, and its import, on a key not called `id`, `_id` or `uuid` and on every composite.
 - `import 'reflect-metadata'`, and `experimentalDecorators`/`emitDecoratorMetadata` in `tsconfig.json`, comments and formatting kept.
 

package/dist/transform.js

@@ -61,8 +61,8 @@ const REMOVED_EXPORTS = new Map([
     ['createSchemaGenerator', 'use `new SqlSchemaGenerator(dialect)`, or `migrator.getSchemaGenerator()`'],
 ]);
 /**
- * Exports renamed and nothing else - the driver classes were empty subclasses - so the import and every
- * use follow, the import moving to `from` where the new name lives in another entry.
+ * Exports renamed or moved and nothing else - the driver classes were empty subclasses - so the import and
+ * every use follow, the import moving to `from` where the name lives in another entry.
  */
 const RENAMED_EXPORTS = new Map([
     ['QueryWhereMap', { to: 'QueryWhere' }],
@@ -86,6 +86,10 @@ const RENAMED_EXPORTS = new Map([
     ['KnownMigratorDialect', { to: 'DialectName', from: 'uql-orm' }],
     ['D1Preparer', { to: 'D1Queryable' }],
     ['D1Database', { to: 'D1Queryable', from: 'uql-orm/d1' }],
+    ['MongoQuerier', { to: 'MongoQuerier', from: 'uql-orm/mongo' }],
+    ['isMongoQuerier', { to: 'isMongoQuerier', from: 'uql-orm/mongo' }],
+    ['MongoMigrationStorage', { to: 'MongoMigrationStorage', from: 'uql-orm/mongo' }],
+    ['MongoSchemaIntrospector', { to: 'MongoSchemaIntrospector', from: 'uql-orm/mongo' }],
 ]);
 /** A node's decorators, or none where it is a kind that cannot carry them. */
 function decoratorsOf(node) {
@@ -785,16 +789,16 @@ function reportRemovedExports(source, ctx) {
  */
 function renameExports(source, dead, ctx) {
     const imports = uqlImportDeclarations(source, true);
-    const kept = imports.flatMap(({ elements }) => elements).filter((element) => !renamedTo(element));
+    const kept = imports.flatMap(({ entry, elements }) => elements.filter((element) => !renamedTo(element, entry)));
     const bound = new Set(kept.map((element) => element.name.text));
     const rewritten = new Set();
     for (const { declaration, entry, elements } of imports) {
-        if (!elements.some(renamedTo)) {
+        if (!elements.some((element) => renamedTo(element, entry))) {
             continue;
         }
         const byEntry = new Map([[entry, []]]);
         for (const element of elements.filter(({ name }) => !dead.has(name.text))) {
-            const rename = renamedTo(element);
+            const rename = renamedTo(element, entry);
             const local = element.propertyName || !rename ? element.name.text : rename.to;
             if (rename && !element.propertyName) {
                 ctx.edits.push(...usesOf(source, element.name, ctx.checker).map((use) => replaced(use, rename.to)));
@@ -820,8 +824,11 @@ function renameExports(source, dead, ctx) {
     }
     return rewritten;
 }
-function renamedTo(element) {
-    return RENAMED_EXPORTS.get(importedName(element));
+/** The rename `element` still needs, none where it already names the export at its entry. */
+function renamedTo(element, entry) {
+    const name = importedName(element);
+    const rename = RENAMED_EXPORTS.get(name);
+    return rename?.to === name && (rename.from ?? entry) === entry ? undefined : rename;
 }
 /** Every identifier in the file bound to the same symbol as `name`, besides `name` itself. */
 function usesOf(source, name, checker) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "uql-codemod",
   "description": "Upgrade uql-orm across versions that introduce breaking changes",
   "license": "MIT",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "type": "module",
   "engines": {
     "node": ">=24"