@typeorm/codemod 1.0.1 → 1.0.3-nightly.20261009

package/dist/transforms/v1/global-functions.js

@@ -25,7 +25,21 @@ const removedGlobals = new Set([
     "getMongoManager",
     "getMongoRepository",
 ]);
-// Simple replacements: getX(args) → dataSource.x(args)
+// Removed globals that have NO automatic rewrite — each call site gets a
+// comment explaining the manual migration path. Without this, the import
+// is stripped but the call remains, producing a ReferenceError at runtime
+// with no trace in the codemod output.
+const manualRemovedGlobals = {
+    createConnection: "`createConnection()` was removed — instantiate a `DataSource` and call `.initialize()` instead: `const dataSource = new DataSource(options); await dataSource.initialize()`",
+    createConnections: "`createConnections()` was removed — instantiate one `DataSource` per configuration and call `.initialize()` on each; multi-connection setups must be managed explicitly",
+    getConnectionManager: "`getConnectionManager()` was removed — the global `ConnectionManager` singleton no longer exists; hold and share `DataSource` instances directly",
+    getConnectionOptions: "`getConnectionOptions()` was removed — load your ormconfig manually and pass the object into `new DataSource(options)`",
+    getSqljsManager: "`getSqljsManager()` was removed — access the sql.js-specific API via `(dataSource.driver as SqljsDriver)` on your initialized DataSource",
+};
+// Simple replacements: `getX()` rewrites to either a property access
+// (`getManager()` → `dataSource.manager`) or a method call
+// (`getRepository(User)` → `dataSource.getRepository(User)`); see
+// `rewriteSimpleCall` for the heuristic that picks the right shape.
 const simpleReplacements = {
     getManager: "dataSource.manager",
     getRepository: "dataSource.getRepository",
@@ -38,6 +52,11 @@ const todoHostTypes = new Set([
     "ExpressionStatement",
     "VariableDeclaration",
     "ReturnStatement",
+    // Class field initializer — `conn = createConnection()` inside a class
+    // body has no enclosing Statement/VariableDeclaration, so the walk
+    // must recognise the property itself as a host.
+    "ClassProperty",
+    "PropertyDefinition",
 ]);
 const rewriteSimpleCall = (j, astPath, replacement) => {
     const parts = replacement.split(".");
@@ -88,32 +107,71 @@ const globalFunctions = (file, api) => {
     }
     const getConnectionLocals = (0, ast_helpers_1.getLocalNamesForImport)(root, j, "typeorm", "getConnection");
     let hasNamedConnection = false;
-    if (callReplacements.size > 0 || getConnectionLocals.size > 0) {
-        root.find(j.CallExpression).forEach((astPath) => {
-            const callee = astPath.node.callee;
-            if (callee.type !== "Identifier")
-                return;
-            // `getConnection()` → `dataSource`. Named connections are gone
-            // in v1 — rewrite `getConnection("name")` to `dataSource` too
-            // (the argument is dropped) and flag so the user knows to
-            // reconfigure for multi-DataSource setups.
-            if (getConnectionLocals.has(callee.name)) {
-                const hadArg = astPath.node.arguments.length > 0;
-                j(astPath).replaceWith(j.identifier("dataSource"));
-                hasChanges = true;
-                if (hadArg)
-                    hasNamedConnection = true;
-                return;
+    // Build lookup: local-name → manual-removal comment message, so aliased
+    // imports like `import { createConnection as cc } from "typeorm"` still
+    // get their call sites flagged.
+    const manualTodos = new Map();
+    for (const [funcName, message] of Object.entries(manualRemovedGlobals)) {
+        for (const localName of (0, ast_helpers_1.getLocalNamesForImport)(root, j, "typeorm", funcName)) {
+            manualTodos.set(localName, message);
+        }
+    }
+    // Rewrites `getConnection()` → `dataSource`, stripping the argument.
+    // Sets `hasNamedConnection` when the call had a named-connection arg.
+    const rewriteGetConnection = (astPath) => {
+        const hadArg = astPath.node.arguments.length > 0;
+        j(astPath).replaceWith(j.identifier("dataSource"));
+        if (hadArg)
+            hasNamedConnection = true;
+        return true;
+    };
+    // Attaches a manual-migration comment to the enclosing statement of
+    // `astPath`. Returns whether anything changed.
+    const attachManualTodo = (astPath, manualMessage) => {
+        let current = astPath;
+        while (current) {
+            const node = current.node;
+            if (todoHostTypes.has(node.type)) {
+                if (!(0, todo_1.hasTodoComment)(node, manualMessage)) {
+                    (0, todo_1.addTodoComment)(node, manualMessage, j);
+                }
+                return true;
             }
-            const replacement = callReplacements.get(callee.name);
-            if (replacement && rewriteSimpleCall(j, astPath, replacement)) {
+            current = current.parent;
+        }
+        return false;
+    };
+    const handleCallSite = (astPath) => {
+        const callee = astPath.node.callee;
+        if (callee.type !== "Identifier")
+            return;
+        if (getConnectionLocals.has(callee.name)) {
+            if (rewriteGetConnection(astPath))
                 hasChanges = true;
-            }
-        });
+            return;
+        }
+        const replacement = callReplacements.get(callee.name);
+        if (replacement && rewriteSimpleCall(j, astPath, replacement)) {
+            hasChanges = true;
+            return;
+        }
+        const manualMessage = manualTodos.get(callee.name);
+        if (manualMessage && attachManualTodo(astPath, manualMessage)) {
+            hasChanges = true;
+        }
+    };
+    if (callReplacements.size > 0 ||
+        getConnectionLocals.size > 0 ||
+        manualTodos.size > 0) {
+        root.find(j.CallExpression).forEach(handleCallSite);
     }
     if ((0, ast_helpers_1.removeImportSpecifiers)(root, j, "typeorm", removedGlobals)) {
         hasChanges = true;
     }
+    // Remove re-exports of deprecated globals (barrel-file pattern)
+    if ((0, ast_helpers_1.removeReExportSpecifiers)(root, j, "typeorm", removedGlobals)) {
+        hasChanges = true;
+    }
     if (hasChanges) {
         annotateFirstDataSourceUsage(root, j, hasNamedConnection);
         stats_1.stats.count.todo(api, exports.name, file);

package/dist/transforms/v1/global-functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"global-functions.js","sourceRoot":"","sources":["../../../src/transforms/v1/global-functions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"global-functions.js","sourceRoot":"","sources":["../../../src/transforms/v1/global-functions.ts"],"names":[],"mappings":"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"}

package/dist/transforms/v1/index.js

@@ -40,6 +40,7 @@ const columnWidthZerofill = __importStar(require("./column-width-zerofill"));
 const connectionManager = __importStar(require("./connection-manager"));
 const connectionOptionsReader = __importStar(require("./connection-options-reader"));
 const connectionToDataSource = __importStar(require("./connection-to-datasource"));
+const datasourceExpo = __importStar(require("./datasource-expo"));
 const datasourceMongodb = __importStar(require("./datasource-mongodb"));
 const datasourceMssql = __importStar(require("./datasource-mssql"));
 const datasourceMysqlConnector = __importStar(require("./datasource-mysql-connector"));
@@ -75,9 +76,13 @@ exports.upgradingGuide = "https://typeorm.io/docs/releases/1.0/upgrading-from-0.
 /**
  * Ordered list of v1 transforms. Order matters — connection renames
  * must run first so subsequent transforms see DataSource, not Connection.
+ * `datasourceName` also runs before `globalFunctions` so it can still see
+ * the `createConnection` import while rewriting `createConnection({ name })`
+ * arguments before the import is stripped.
  */
 exports.transforms = [
     connectionToDataSource,
+    datasourceName,
     globalFunctions,
     repositoryFindByIds,
     repositoryFindOneById,
@@ -99,7 +104,6 @@ exports.transforms = [
     mongodbTypes,
     datasourceMssql,
     datasourceSap,
-    datasourceName,
     columnUnsignedNumeric,
     repositoryAbstract,
     relationCount,
@@ -111,6 +115,7 @@ exports.transforms = [
     findOptionsStringRelations,
     connectionManager,
     connectionOptionsReader,
+    datasourceExpo,
     fileLogger,
 ];
 exports.default = (0, transformer_1.transformer)(exports.transforms);

package/dist/transforms/v1/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transforms/v1/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kEAAmD;AACnD,iFAAkE;AAClE,6EAA8D;AAC9D,wEAAyD;AACzD,qFAAsE;AACtE,mFAAoE;AACpE,wEAAyD;AACzD,oEAAqD;AACrD,uFAAwE;AACxE,kEAAmD;AACnD,gEAAiD;AACjD,qFAAsE;AACtE,+EAAgE;AAChE,0DAA2C;AAC3C,qEAAsD;AACtD,gFAAiE;AACjE,4FAA6E;AAC7E,sFAAuE;AACvE,oEAAqD;AACrD,uEAAwD;AACxD,8DAA+C;AAC/C,8DAA+C;AAC/C,gGAAiF;AACjF,oFAAqE;AACrE,gFAAiE;AACjE,gFAAiE;AACjE,yGAA0F;AAC1F,8FAA+E;AAC/E,iGAAkF;AAClF,gEAAiD;AACjD,0EAA2D;AAC3D,oEAAqD;AACrD,8EAA+D;AAC/D,mFAAoE;AACpE,8DAA+C;AAC/C,gDAA4C;AAE/B,QAAA,WAAW,GAAG,6BAA6B,CAAA;AAC3C,QAAA,cAAc,GACvB,yDAAyD,CAAA;AAE7D;;;GAGG;AACU,QAAA,UAAU,GAAG;IACtB,sBAAsB;IACtB,eAAe;IACf,mBAAmB;IACnB,qBAAqB;IACrB,eAAe;IACf,oBAAoB;IACpB,gBAAgB;IAChB,4BAA4B;IAC5B,2BAA2B;IAC3B,cAAc;IACd,mBAAmB;IACnB,oBAAoB;IACpB,eAAe;IACf,oBAAoB;IACpB,YAAY;IACZ,wBAAwB;IACxB,uBAAuB;IACvB,iBAAiB;IACjB,YAAY;IACZ,YAAY;IACZ,eAAe;IACf,aAAa;IACb,cAAc;IACd,qBAAqB;IACrB,kBAAkB;IAClB,aAAa;IACb,sBAAsB;IACtB,oBAAoB;IACpB,4BAA4B;IAC5B,gCAAgC;IAChC,uBAAuB;IACvB,0BAA0B;IAC1B,iBAAiB;IACjB,uBAAuB;IACvB,UAAU;CACb,CAAA;AAED,kBAAe,IAAA,yBAAW,EAAC,kBAAU,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transforms/v1/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kEAAmD;AACnD,iFAAkE;AAClE,6EAA8D;AAC9D,wEAAyD;AACzD,qFAAsE;AACtE,mFAAoE;AACpE,kEAAmD;AACnD,wEAAyD;AACzD,oEAAqD;AACrD,uFAAwE;AACxE,kEAAmD;AACnD,gEAAiD;AACjD,qFAAsE;AACtE,+EAAgE;AAChE,0DAA2C;AAC3C,qEAAsD;AACtD,gFAAiE;AACjE,4FAA6E;AAC7E,sFAAuE;AACvE,oEAAqD;AACrD,uEAAwD;AACxD,8DAA+C;AAC/C,8DAA+C;AAC/C,gGAAiF;AACjF,oFAAqE;AACrE,gFAAiE;AACjE,gFAAiE;AACjE,yGAA0F;AAC1F,8FAA+E;AAC/E,iGAAkF;AAClF,gEAAiD;AACjD,0EAA2D;AAC3D,oEAAqD;AACrD,8EAA+D;AAC/D,mFAAoE;AACpE,8DAA+C;AAC/C,gDAA4C;AAE/B,QAAA,WAAW,GAAG,6BAA6B,CAAA;AAC3C,QAAA,cAAc,GACvB,yDAAyD,CAAA;AAE7D;;;;;;GAMG;AACU,QAAA,UAAU,GAAG;IACtB,sBAAsB;IACtB,cAAc;IACd,eAAe;IACf,mBAAmB;IACnB,qBAAqB;IACrB,eAAe;IACf,oBAAoB;IACpB,gBAAgB;IAChB,4BAA4B;IAC5B,2BAA2B;IAC3B,cAAc;IACd,mBAAmB;IACnB,oBAAoB;IACpB,eAAe;IACf,oBAAoB;IACpB,YAAY;IACZ,wBAAwB;IACxB,uBAAuB;IACvB,iBAAiB;IACjB,YAAY;IACZ,YAAY;IACZ,eAAe;IACf,aAAa;IACb,qBAAqB;IACrB,kBAAkB;IAClB,aAAa;IACb,sBAAsB;IACtB,oBAAoB;IACpB,4BAA4B;IAC5B,gCAAgC;IAChC,uBAAuB;IACvB,0BAA0B;IAC1B,iBAAiB;IACjB,uBAAuB;IACvB,cAAc;IACd,UAAU;CACb,CAAA;AAED,kBAAe,IAAA,yBAAW,EAAC,kBAAU,CAAC,CAAA"}

package/dist/transforms/v1/mongodb-stats.js

@@ -16,32 +16,39 @@ const mongodbStats = (file, api) => {
     const root = j(file.source);
     if (!(0, ast_helpers_1.fileImportsFrom)(root, j, "typeorm"))
         return undefined;
+    const bindings = (0, ast_helpers_1.collectRepositoryBindings)(root, j);
     let hasChanges = false;
     let hasTodos = false;
     const message = "`stats()` was removed — use the MongoDB driver directly";
-    // Find .stats() calls
     root.find(j.CallExpression, {
         callee: {
             type: "MemberExpression",
             property: { type: "Identifier", name: "stats" },
         },
-    }).forEach((path) => {
-        const parentNode = path.parent.node;
+    }).forEach((callPath) => {
+        const callee = callPath.node.callee;
+        if (callee.type !== "MemberExpression")
+            return;
+        if (!(0, ast_helpers_1.isRepositoryReceiver)(callee.object, bindings))
+            return;
+        // Prefer attaching the comment to the enclosing statement. Comments
+        // on bare CallExpressions are often dropped by recast during printing.
+        let host = callPath.node;
+        const parentNode = callPath.parent.node;
         if (parentNode.type === "ExpressionStatement") {
-            (0, todo_1.addTodoComment)(parentNode, message, j);
+            host = parentNode;
         }
         else if (parentNode.type === "AwaitExpression") {
-            const grandparentNode = path.parent.parent.node;
+            const grandparentNode = callPath.parent.parent.node;
             if (grandparentNode.type === "ExpressionStatement") {
-                (0, todo_1.addTodoComment)(grandparentNode, message, j);
-            }
-            else {
-                (0, todo_1.addTodoComment)(path.node, message, j);
+                host = grandparentNode;
             }
         }
-        else {
-            (0, todo_1.addTodoComment)(path.node, message, j);
+        if ((0, todo_1.hasTodoComment)(host, message)) {
+            hasChanges = true;
+            return;
         }
+        (0, todo_1.addTodoComment)(host, message, j);
         hasChanges = true;
         hasTodos = true;
     });

package/dist/transforms/v1/mongodb-stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongodb-stats.js","sourceRoot":"","sources":["../../../src/transforms/v1/mongodb-stats.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAgD;AAChD,kCAAwC;AACxC,oCAAgC;AAEnB,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GAAG,6CAA6C,CAAA;AAC3D,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,YAAY,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACrD,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE3B,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,OAAO,GAAG,yDAAyD,CAAA;IAEzE,sBAAsB;IACtB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE;QACxB,MAAM,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE;SAClD;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,MAAM,UAAU,GAAS,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QACzC,IAAI,UAAU,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC5C,IAAA,qBAAc,EAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC1C,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAC/C,MAAM,eAAe,GAAS,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAA;YACrD,IAAI,eAAe,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACjD,IAAA,qBAAc,EAAC,eAAe,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;YAC/C,CAAC;iBAAM,CAAC;gBACJ,IAAA,qBAAc,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;YACzC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAA,qBAAc,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QACzC,CAAC;QACD,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,IAAI,QAAQ;QAAE,aAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAI,EAAE,IAAI,CAAC,CAAA;IAE/C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAtCY,QAAA,YAAY,gBAsCxB;AAEY,QAAA,EAAE,GAAG,oBAAY,CAAA;AAC9B,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"mongodb-stats.js","sourceRoot":"","sources":["../../../src/transforms/v1/mongodb-stats.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAIuB;AACvB,kCAAwD;AACxD,oCAAgC;AAEnB,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GAAG,6CAA6C,CAAA;AAC3D,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,YAAY,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACrD,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE3B,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,MAAM,QAAQ,GAAG,IAAA,uCAAyB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAEnD,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,OAAO,GAAG,yDAAyD,CAAA;IAEzE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE;QACxB,MAAM,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE;SAClD;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAA;QACnC,IAAI,MAAM,CAAC,IAAI,KAAK,kBAAkB;YAAE,OAAM;QAC9C,IAAI,CAAC,IAAA,kCAAoB,EAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;YAAE,OAAM;QAE1D,oEAAoE;QACpE,uEAAuE;QACvE,IAAI,IAAI,GAAS,QAAQ,CAAC,IAAI,CAAA;QAC9B,MAAM,UAAU,GAAS,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAA;QAC7C,IAAI,UAAU,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC5C,IAAI,GAAG,UAAU,CAAA;QACrB,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAC/C,MAAM,eAAe,GAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAA;YACzD,IAAI,eAAe,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACjD,IAAI,GAAG,eAAe,CAAA;YAC1B,CAAC;QACL,CAAC;QACD,IAAI,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YAChC,UAAU,GAAG,IAAI,CAAA;YACjB,OAAM;QACV,CAAC;QACD,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAChC,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,IAAI,QAAQ;QAAE,aAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAI,EAAE,IAAI,CAAC,CAAA;IAE/C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AA/CY,QAAA,YAAY,gBA+CxB;AAEY,QAAA,EAAE,GAAG,oBAAY,CAAA;AAC9B,kBAAe,UAAE,CAAA"}

package/dist/transforms/v1/mongodb-types.js

@@ -55,14 +55,12 @@ const mongodbTypes = (file, api) => {
         if (movedSpecifiers.length === 0)
             return;
         hasChanges = true;
-        // Update or remove the typeorm import
         if (remaining?.length === 0) {
             j(importPath).remove();
         }
         else if (remaining) {
             importPath.node.specifiers = remaining;
         }
-        // Check if there's already a mongodb import
         const existingMongoImport = root.find(j.ImportDeclaration, {
             source: { value: "mongodb" },
         });
@@ -76,6 +74,68 @@ const mongodbTypes = (file, api) => {
             createNewImport(j, root, importPath, movedSpecifiers);
         }
     });
+    // Move re-exports from typeorm to mongodb (barrel-file pattern).
+    // `export { ObjectId } from "typeorm"` → `export { ObjectId } from "mongodb"`.
+    root.find(j.ExportNamedDeclaration, {
+        source: { value: "typeorm" },
+    }).forEach((exportPath) => {
+        const moved = [];
+        const remaining = exportPath.node.specifiers?.filter((spec) => {
+            if (spec.type === "ExportSpecifier" &&
+                spec.local?.type === "Identifier" &&
+                movedTypes.has(spec.local.name)) {
+                moved.push(spec);
+                return false;
+            }
+            return true;
+        });
+        if (moved.length === 0)
+            return;
+        hasChanges = true;
+        if (remaining?.length === 0) {
+            j(exportPath).remove();
+        }
+        else if (remaining) {
+            exportPath.node.specifiers = remaining;
+        }
+        // Merge into an existing `export { ... } from "mongodb"` if present —
+        // appending a fresh declaration unconditionally would produce a
+        // duplicate named export and fail at parse time. Skip type-only
+        // declarations (`export type { ... }`) because `ObjectId` is a runtime
+        // value; merging into a type-only export would strip its runtime form.
+        const sourceNode = exportPath.node;
+        const existingMongoExport = root
+            .find(j.ExportNamedDeclaration, {
+            source: { value: "mongodb" },
+        })
+            .filter((p) => p.node.exportKind !== "type");
+        if (existingMongoExport.length > 0) {
+            const existingPath = existingMongoExport.at(0).get();
+            const existingNames = new Set();
+            for (const spec of existingPath.node.specifiers ?? []) {
+                if (spec.type === "ExportSpecifier" &&
+                    spec.local?.type === "Identifier") {
+                    existingNames.add(spec.local.name);
+                }
+            }
+            for (const spec of moved) {
+                if (spec.type === "ExportSpecifier" &&
+                    spec.local?.type === "Identifier" &&
+                    !existingNames.has(spec.local.name)) {
+                    existingPath.node.specifiers?.push(spec);
+                }
+            }
+        }
+        else {
+            const newExport = j.exportNamedDeclaration(null, moved, j.stringLiteral("mongodb"));
+            // Preserve the source declaration's exportKind so moved `export type`
+            // specifiers don't get silently promoted to value exports.
+            if (sourceNode.exportKind) {
+                newExport.exportKind = sourceNode.exportKind;
+            }
+            exportPath.insertAfter(newExport);
+        }
+    });
     return hasChanges ? root.toSource() : undefined;
 };
 exports.mongodbTypes = mongodbTypes;

package/dist/transforms/v1/mongodb-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongodb-types.js","sourceRoot":"","sources":["../../../src/transforms/v1/mongodb-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mongodb-types.js","sourceRoot":"","sources":["../../../src/transforms/v1/mongodb-types.ts"],"names":[],"mappings":"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"}

package/dist/transforms/v1/query-builder-on-conflict.js

@@ -11,6 +11,22 @@ const stats_1 = require("../stats");
 exports.name = node_path_1.default.basename(__filename, node_path_1.default.extname(__filename));
 exports.description = "flag removed `onConflict()` for manual migration to `orIgnore()` / `orUpdate()`";
 exports.manual = true;
+// Walks up from `startPath` and returns the first statement-like ancestor
+// a leading line-comment survives recast printing on. Returns null when no
+// such ancestor is reachable (caller should skip the comment rather than
+// attach it to a CallExpression, where it would be silently dropped).
+const findTodoHost = (startPath) => {
+    let current = startPath.parent;
+    while (current) {
+        const nodeType = current.node.type;
+        if (nodeType.endsWith("Statement") ||
+            nodeType === "VariableDeclaration") {
+            return current.node;
+        }
+        current = current.parent;
+    }
+    return null;
+};
 const queryBuilderOnConflict = (file, api) => {
     const j = api.jscodeshift;
     const root = j(file.source);
@@ -23,29 +39,26 @@ const queryBuilderOnConflict = (file, api) => {
             type: "MemberExpression",
             property: { type: "Identifier", name: "onConflict" },
         },
-    }).forEach((path) => {
-        const arg = path.node.arguments[0];
+    }).forEach((callPath) => {
+        const arg = callPath.node.arguments[0];
         const argValue = arg ? (0, ast_helpers_1.getStringValue)(arg) : null;
         if (argValue && /DO\s+NOTHING/i.test(argValue)) {
-            // Replace .onConflict("DO NOTHING") with .orIgnore()
-            if (path.node.callee.type === "MemberExpression") {
-                path.node.callee.property = j.identifier("orIgnore");
-                path.node.arguments = [];
+            if (callPath.node.callee.type === "MemberExpression") {
+                callPath.node.callee.property = j.identifier("orIgnore");
+                callPath.node.arguments = [];
                 hasChanges = true;
             }
+            return;
         }
-        else {
-            const message = "`onConflict()` was removed — use `orIgnore()` or `orUpdate()` instead";
-            const parentNode = path.parent.node;
-            if (parentNode.type === "ExpressionStatement") {
-                (0, todo_1.addTodoComment)(parentNode, message, j);
-            }
-            else {
-                (0, todo_1.addTodoComment)(path.node, message, j);
-            }
-            hasChanges = true;
-            hasTodos = true;
+        const message = "`onConflict()` was removed — use `orIgnore()` or `orUpdate()` instead";
+        const host = findTodoHost(callPath);
+        if (!host)
+            return;
+        if (!(0, todo_1.hasTodoComment)(host, message)) {
+            (0, todo_1.addTodoComment)(host, message, j);
         }
+        hasChanges = true;
+        hasTodos = true;
     });
     if (hasTodos)
         stats_1.stats.count.todo(api, exports.name, file);

package/dist/transforms/v1/query-builder-on-conflict.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder-on-conflict.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-on-conflict.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAgE;AAChE,kCAAwC;AACxC,oCAAgC;AAEnB,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GACpB,iFAAiF,CAAA;AACxE,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,sBAAsB,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IAC/D,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE3B,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE;QACxB,MAAM,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE;SACvD;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAClC,MAAM,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,IAAA,4BAAc,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAEjD,IAAI,QAAQ,IAAI,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,qDAAqD;YACrD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;gBACpD,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;gBACxB,UAAU,GAAG,IAAI,CAAA;YACrB,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,MAAM,OAAO,GACT,uEAAuE,CAAA;YAC3E,MAAM,UAAU,GAAS,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;YACzC,IAAI,UAAU,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBAC5C,IAAA,qBAAc,EAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;YAC1C,CAAC;iBAAM,CAAC;gBACJ,IAAA,qBAAc,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;YACzC,CAAC;YACD,UAAU,GAAG,IAAI,CAAA;YACjB,QAAQ,GAAG,IAAI,CAAA;QACnB,CAAC;IACL,CAAC,CAAC,CAAA;IAEF,IAAI,QAAQ;QAAE,aAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAI,EAAE,IAAI,CAAC,CAAA;IAE/C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AA1CY,QAAA,sBAAsB,0BA0ClC;AAEY,QAAA,EAAE,GAAG,8BAAsB,CAAA;AACxC,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"query-builder-on-conflict.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-on-conflict.ts"],"names":[],"mappings":"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"}

package/dist/transforms/v1/query-builder-print-sql.js

@@ -24,23 +24,26 @@ const queryBuilderPrintSql = (file, api) => {
             type: "MemberExpression",
             property: { name: "printSql" },
         },
-    }).forEach((path) => {
-        // Walk up to find the enclosing ExpressionStatement
-        let current = path.parent;
+    }).forEach((callPath) => {
+        // Walk up to the enclosing statement (ExpressionStatement or
+        // VariableDeclaration). If we reach the root without finding one,
+        // leave the file untouched — attaching a comment to a non-statement
+        // node is usually dropped by recast, and `hasChanges = true` with no
+        // actual edit would misreport the transform as having emitted a comment.
+        let current = callPath.parent;
         while (current) {
             const node = current.node;
-            if (node.type === "ExpressionStatement") {
-                (0, todo_1.addTodoComment)(node, message, j);
-                break;
-            }
-            if (node.type === "VariableDeclaration") {
-                (0, todo_1.addTodoComment)(node, message, j);
-                break;
+            if (node.type === "ExpressionStatement" ||
+                node.type === "VariableDeclaration") {
+                if (!(0, todo_1.hasTodoComment)(node, message)) {
+                    (0, todo_1.addTodoComment)(node, message, j);
+                }
+                hasChanges = true;
+                hasTodos = true;
+                return;
             }
             current = current.parent;
         }
-        hasChanges = true;
-        hasTodos = true;
     });
     if (hasTodos)
         stats_1.stats.count.todo(api, exports.name, file);

package/dist/transforms/v1/query-builder-print-sql.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder-print-sql.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-print-sql.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAgD;AAChD,kCAAwC;AACxC,oCAAgC;AAEnB,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GACpB,0FAA0F,CAAA;AACjF,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,oBAAoB,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IAC7D,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE3B,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,OAAO,GACT,uFAAuF,CAAA;IAE3F,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE;QACxB,MAAM,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;SACjC;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,oDAAoD;QACpD,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;QACzB,OAAO,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,GAAS,OAAO,CAAC,IAAI,CAAA;YAC/B,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACtC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBAChC,MAAK;YACT,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACtC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBAChC,MAAK;YACT,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,CAAC;QACD,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,IAAI,QAAQ;QAAE,aAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAI,EAAE,IAAI,CAAC,CAAA;IAE/C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAvCY,QAAA,oBAAoB,wBAuChC;AAEY,QAAA,EAAE,GAAG,4BAAoB,CAAA;AACtC,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"query-builder-print-sql.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-print-sql.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAgD;AAChD,kCAAwD;AACxD,oCAAgC;AAEnB,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GACpB,0FAA0F,CAAA;AACjF,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,oBAAoB,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IAC7D,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE3B,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,OAAO,GACT,uFAAuF,CAAA;IAE3F,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE;QACxB,MAAM,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;SACjC;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpB,6DAA6D;QAC7D,kEAAkE;QAClE,oEAAoE;QACpE,qEAAqE;QACrE,yEAAyE;QACzE,IAAI,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC7B,OAAO,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,GAAS,OAAO,CAAC,IAAI,CAAA;YAC/B,IACI,IAAI,CAAC,IAAI,KAAK,qBAAqB;gBACnC,IAAI,CAAC,IAAI,KAAK,qBAAqB,EACrC,CAAC;gBACC,IAAI,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;oBACjC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBACpC,CAAC;gBACD,UAAU,GAAG,IAAI,CAAA;gBACjB,QAAQ,GAAG,IAAI,CAAA;gBACf,OAAM;YACV,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,CAAC;IACL,CAAC,CAAC,CAAA;IAEF,IAAI,QAAQ;QAAE,aAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAI,EAAE,IAAI,CAAC,CAAA;IAE/C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AA5CY,QAAA,oBAAoB,wBA4ChC;AAEY,QAAA,EAAE,GAAG,4BAAoB,CAAA;AACtC,kBAAe,UAAE,CAAA"}

package/dist/transforms/v1/query-builder-replace-property-names.js

@@ -18,23 +18,24 @@ const queryBuilderReplacePropertyNames = (file, api) => {
         return undefined;
     let hasChanges = false;
     let hasTodos = false;
-    // Find method declarations named replacePropertyNames in classes
     const message = "`replacePropertyNames` was removed — property name replacement is now handled internally";
-    root.find(j.ClassMethod, {
-        key: { type: "Identifier", name: "replacePropertyNames" },
-    }).forEach((path) => {
-        (0, todo_1.addTodoComment)(path.node, message, j);
+    const flag = (node) => {
+        if ((0, todo_1.hasTodoComment)(node, message)) {
+            hasChanges = true;
+            return;
+        }
+        (0, todo_1.addTodoComment)(node, message, j);
         hasChanges = true;
         hasTodos = true;
-    });
-    // Also check for MethodDefinition (alternative AST representation)
+    };
+    root.find(j.ClassMethod, {
+        key: { type: "Identifier", name: "replacePropertyNames" },
+    }).forEach((p) => flag(p.node));
+    // MethodDefinition is an alternative AST shape some parsers emit for the
+    // same construct; cover both so the transform is parser-agnostic.
     root.find(j.MethodDefinition, {
         key: { type: "Identifier", name: "replacePropertyNames" },
-    }).forEach((path) => {
-        (0, todo_1.addTodoComment)(path.node, message, j);
-        hasChanges = true;
-        hasTodos = true;
-    });
+    }).forEach((p) => flag(p.node));
     if (hasTodos)
         stats_1.stats.count.todo(api, exports.name, file);
     return hasChanges ? root.toSource() : undefined;

package/dist/transforms/v1/query-builder-replace-property-names.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder-replace-property-names.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-replace-property-names.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAgD;AAChD,kCAAwC;AACxC,oCAAgC;AAEnB,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GACpB,gEAAgE,CAAA;AACvD,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,gCAAgC,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACzE,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE3B,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,iEAAiE;IACjE,MAAM,OAAO,GACT,0FAA0F,CAAA;IAE9F,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE;QACrB,GAAG,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,sBAAsB,EAAE;KAC5D,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,IAAA,qBAAc,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QACrC,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,mEAAmE;IACnE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE;QAC1B,GAAG,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,sBAAsB,EAAE;KAC5D,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,IAAA,qBAAc,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QACrC,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,IAAI,QAAQ;QAAE,aAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAI,EAAE,IAAI,CAAC,CAAA;IAE/C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAjCY,QAAA,gCAAgC,oCAiC5C;AAEY,QAAA,EAAE,GAAG,wCAAgC,CAAA;AAClD,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"query-builder-replace-property-names.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-replace-property-names.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAgD;AAChD,kCAAwD;AACxD,oCAAgC;AAEnB,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GACpB,gEAAgE,CAAA;AACvD,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,gCAAgC,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACzE,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE3B,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,OAAO,GACT,0FAA0F,CAAA;IAE9F,MAAM,IAAI,GAAG,CAAC,IAAU,EAAQ,EAAE;QAC9B,IAAI,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YAChC,UAAU,GAAG,IAAI,CAAA;YACjB,OAAM;QACV,CAAC;QACD,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAChC,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;IACnB,CAAC,CAAA;IAED,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE;QACrB,GAAG,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,sBAAsB,EAAE;KAC5D,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAE/B,yEAAyE;IACzE,kEAAkE;IAClE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE;QAC1B,GAAG,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,sBAAsB,EAAE;KAC5D,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAE/B,IAAI,QAAQ;QAAE,aAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAI,EAAE,IAAI,CAAC,CAAA;IAE/C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAnCY,QAAA,gCAAgC,oCAmC5C;AAEY,QAAA,EAAE,GAAG,wCAAgC,CAAA;AAClD,kBAAe,UAAE,CAAA"}

package/dist/transforms/v1/query-builder-where-expression.js

@@ -5,31 +5,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fn = exports.queryBuilderWhereExpression = exports.description = exports.name = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+const ast_helpers_1 = require("../ast-helpers");
 exports.name = node_path_1.default.basename(__filename, node_path_1.default.extname(__filename));
 exports.description = "rename `WhereExpression` to `WhereExpressionBuilder`";
 const queryBuilderWhereExpression = (file, api) => {
     const j = api.jscodeshift;
     const root = j(file.source);
     let hasChanges = false;
-    // Rename in imports
+    if (!(0, ast_helpers_1.fileImportsFrom)(root, j, "typeorm"))
+        return undefined;
+    // Only rename TS type references that resolve to a TypeORM import —
+    // a local `interface WhereExpression {}` or an import from another
+    // package must not be rewritten.
+    const whereExpressionLocalNames = (0, ast_helpers_1.expandLocalNamesForImports)(root, j, "typeorm", new Set(["WhereExpression"]));
     root.find(j.ImportSpecifier, {
         imported: { name: "WhereExpression" },
-    }).forEach((path) => {
-        path.node.imported.name = "WhereExpressionBuilder";
-        if (path.node.local?.type === "Identifier" &&
-            path.node.local?.name === "WhereExpression") {
-            path.node.local.name = "WhereExpressionBuilder";
+    }).forEach((importPath) => {
+        const parent = importPath.parent.node;
+        if (parent.type !== "ImportDeclaration" ||
+            parent.source.value !== "typeorm") {
+            return;
+        }
+        importPath.node.imported.name = "WhereExpressionBuilder";
+        if (importPath.node.local?.type === "Identifier" &&
+            importPath.node.local?.name === "WhereExpression") {
+            importPath.node.local.name = "WhereExpressionBuilder";
         }
         hasChanges = true;
     });
-    // Rename in type references
+    if ((0, ast_helpers_1.renameReExportSpecifiers)(root, j, "typeorm", {
+        WhereExpression: "WhereExpressionBuilder",
+    })) {
+        hasChanges = true;
+    }
     root.find(j.TSTypeReference, {
         typeName: { name: "WhereExpression" },
-    }).forEach((path) => {
-        if (path.node.typeName.type === "Identifier") {
-            path.node.typeName.name = "WhereExpressionBuilder";
-            hasChanges = true;
-        }
+    }).forEach((refPath) => {
+        if (refPath.node.typeName.type !== "Identifier")
+            return;
+        if (!whereExpressionLocalNames.has(refPath.node.typeName.name))
+            return;
+        refPath.node.typeName.name = "WhereExpressionBuilder";
+        hasChanges = true;
     });
     return hasChanges ? root.toSource() : undefined;
 };