@typeorm/codemod 1.0.0 → 1.0.2

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;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"query-builder-where-expression.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-where-expression.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAGf,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GACpB,sDAAsD,CAAA;AAEnD,MAAM,2BAA2B,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACpE,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3B,IAAI,UAAU,GAAG,KAAK,CAAA;IAEtB,oBAAoB;IACpB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,EAAE;QACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE;KACxC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,wBAAwB,CAAA;QAClD,IACI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,YAAY;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,iBAAiB,EAC7C,CAAC;YACC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,wBAAwB,CAAA;QACnD,CAAC;QACD,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC,CAAC,CAAA;IAEF,4BAA4B;IAC5B,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,EAAE;QACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE;KACxC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,wBAAwB,CAAA;YAClD,UAAU,GAAG,IAAI,CAAA;QACrB,CAAC;IACL,CAAC,CAAC,CAAA;IAEF,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AA9BY,QAAA,2BAA2B,+BA8BvC;AAEY,QAAA,EAAE,GAAG,mCAA2B,CAAA;AAC7C,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"query-builder-where-expression.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-where-expression.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAIuB;AAEV,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GACpB,sDAAsD,CAAA;AAEnD,MAAM,2BAA2B,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACpE,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3B,IAAI,UAAU,GAAG,KAAK,CAAA;IAEtB,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,oEAAoE;IACpE,mEAAmE;IACnE,iCAAiC;IACjC,MAAM,yBAAyB,GAAG,IAAA,wCAA0B,EACxD,IAAI,EACJ,CAAC,EACD,SAAS,EACT,IAAI,GAAG,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAC/B,CAAA;IAED,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,EAAE;QACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE;KACxC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACtB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAA;QACrC,IACI,MAAM,CAAC,IAAI,KAAK,mBAAmB;YACnC,MAAM,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,EACnC,CAAC;YACC,OAAM;QACV,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,wBAAwB,CAAA;QACxD,IACI,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,YAAY;YAC5C,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,iBAAiB,EACnD,CAAC;YACC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,wBAAwB,CAAA;QACzD,CAAC;QACD,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC,CAAC,CAAA;IAEF,IACI,IAAA,sCAAwB,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE;QACzC,eAAe,EAAE,wBAAwB;KAC5C,CAAC,EACJ,CAAC;QACC,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,EAAE;QACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE;KACxC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACnB,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;YAAE,OAAM;QACvD,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAM;QACtE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,wBAAwB,CAAA;QACrD,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC,CAAC,CAAA;IAEF,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAvDY,QAAA,2BAA2B,+BAuDvC;AAEY,QAAA,EAAE,GAAG,mCAA2B,CAAA;AAC7C,kBAAe,UAAE,CAAA"}

package/dist/transforms/v1/query-runner-loaded-tables-views.js

@@ -22,7 +22,6 @@ const queryRunnerLoadedTablesViews = (file, api) => {
         if (!removedProps.has(path.node.property.name))
             return;
         const propName = path.node.property.name;
-        // Find the containing statement to add a comment
         let current = path;
         while (current.parent && current.parent.node.type !== "Program") {
             if (current.parent.node.type === "ExpressionStatement" ||
@@ -30,11 +29,7 @@ const queryRunnerLoadedTablesViews = (file, api) => {
                 current.parent.node.type === "ReturnStatement") {
                 const stmt = current.parent.node;
                 const message = `\`${propName}\` was removed — use \`getTables()\` / \`getViews()\` instead`;
-                // Avoid duplicate comments
-                const commentValue = ` TODO(typeorm-v1): ${message}`;
-                const comments = (stmt.comments = stmt.comments || []);
-                const hasSameComment = comments.some((c) => c.value === commentValue);
-                if (!hasSameComment) {
+                if (!(0, todo_1.hasTodoComment)(stmt, message)) {
                     (0, todo_1.addTodoComment)(stmt, message, j);
                     hasTodos = true;
                 }

package/dist/transforms/v1/query-runner-loaded-tables-views.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-runner-loaded-tables-views.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-runner-loaded-tables-views.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,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,oGAAoG,CAAA;AAC3F,QAAA,MAAM,GAAG,IAAI,CAAA;AAWnB,MAAM,4BAA4B,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACrE,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3B,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAA;IAE7D,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;YAAE,OAAM;QACpD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAM;QAEtD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAA;QAExC,iDAAiD;QACjD,IAAI,OAAO,GAAkB,IAAI,CAAA;QACjC,OAAO,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9D,IACI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,qBAAqB;gBAClD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,qBAAqB;gBAClD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAChD,CAAC;gBACC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAA;gBAChC,MAAM,OAAO,GAAG,KAAK,QAAQ,+DAA+D,CAAA;gBAE5F,2BAA2B;gBAC3B,MAAM,YAAY,GAAG,sBAAsB,OAAO,EAAE,CAAA;gBACpD,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;gBACtD,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAChC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,YAAY,CAClC,CAAA;gBACD,IAAI,CAAC,cAAc,EAAE,CAAC;oBAClB,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBAChC,QAAQ,GAAG,IAAI,CAAA;gBACnB,CAAC;gBACD,UAAU,GAAG,IAAI,CAAA;gBACjB,MAAK;YACT,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;AA7CY,QAAA,4BAA4B,gCA6CxC;AAEY,QAAA,EAAE,GAAG,oCAA4B,CAAA;AAC9C,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"query-runner-loaded-tables-views.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-runner-loaded-tables-views.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,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,oGAAoG,CAAA;AAC3F,QAAA,MAAM,GAAG,IAAI,CAAA;AAWnB,MAAM,4BAA4B,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACrE,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3B,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAA;IAE7D,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;YAAE,OAAM;QACpD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAM;QAEtD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAA;QAExC,IAAI,OAAO,GAAkB,IAAI,CAAA;QACjC,OAAO,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9D,IACI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,qBAAqB;gBAClD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,qBAAqB;gBAClD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAChD,CAAC;gBACC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAA;gBAChC,MAAM,OAAO,GAAG,KAAK,QAAQ,+DAA+D,CAAA;gBAC5F,IAAI,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;oBACjC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBAChC,QAAQ,GAAG,IAAI,CAAA;gBACnB,CAAC;gBACD,UAAU,GAAG,IAAI,CAAA;gBACjB,MAAK;YACT,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;AArCY,QAAA,4BAA4B,gCAqCxC;AAEY,QAAA,EAAE,GAAG,oCAA4B,CAAA;AAC9C,kBAAe,UAAE,CAAA"}

package/dist/transforms/v1/relation-count.js

@@ -9,28 +9,94 @@ const ast_helpers_1 = require("../ast-helpers");
 const todo_1 = require("../todo");
 const stats_1 = require("../stats");
 exports.name = node_path_1.default.basename(__filename, node_path_1.default.extname(__filename));
-exports.description = "flag removed `@RelationCount` decorator for manual migration";
+exports.description = "flag removed `@RelationCount` decorator and `loadRelationCountAndMap()` for manual migration";
 exports.manual = true;
+const MIGRATION_HINT = "use `@VirtualColumn` with a sub-query instead";
+// Node types on which a leading line-comment survives jscodeshift/recast
+// printing — walking up to one of these keeps the comment visible above
+// the enclosing statement or declaration.
+const isTodoHost = (type) => type.endsWith("Statement") ||
+    type === "VariableDeclaration" ||
+    type === "ExportDefaultDeclaration" ||
+    type === "ExportNamedDeclaration" ||
+    type === "ClassProperty" ||
+    type === "PropertyDefinition";
 const relationCount = (file, api) => {
     const j = api.jscodeshift;
     const root = j(file.source);
+    // No `fileImportsFrom` guard at the top: `.loadRelationCountAndMap()` call
+    // sites can appear in files that only receive a `QueryBuilder` via a helper
+    // and never import from "typeorm" directly. The decorator and import-
+    // removal blocks below self-gate via `getLocalNamesForImport` /
+    // `removeImportSpecifiers`, which are no-ops when typeorm is absent.
     let hasChanges = false;
     let hasTodos = false;
-    // Find @RelationCount decorators and add TODO
-    root.find(j.Decorator, {
-        expression: {
-            type: "CallExpression",
-            callee: { type: "Identifier", name: "RelationCount" },
-        },
-    }).forEach((path) => {
-        (0, todo_1.addTodoComment)(path.node, "`@RelationCount` was removed — use `QueryBuilder` with `loadRelationCountAndMap()` instead", j);
-        hasChanges = true;
-        hasTodos = true;
+    // Collect local names bound to `RelationCount` from typeorm — including aliases:
+    //   import { RelationCount } from "typeorm"          → "RelationCount"
+    //   import { RelationCount as RC } from "typeorm"    → "RC"
+    const localNames = (0, ast_helpers_1.getLocalNamesForImport)(root, j, "typeorm", "RelationCount");
+    if (localNames.size > 0) {
+        // Decorators live on `ClassProperty.decorators` but jscodeshift's
+        // default visitor does not descend into that array, so
+        // `root.find(j.Decorator)` is a no-op with the `tsx` parser. Walk the
+        // class properties explicitly instead and attach the comment to the
+        // property itself (decorator-attached comments are dropped by recast).
+        const message = `\`@RelationCount\` was removed — ${MIGRATION_HINT}`;
+        root.find(j.ClassProperty).forEach((propertyPath) => {
+            const node = propertyPath.node;
+            const matches = node.decorators?.some((decorator) => {
+                const expr = decorator.expression;
+                return (expr.type === "CallExpression" &&
+                    expr.callee.type === "Identifier" &&
+                    localNames.has(expr.callee.name));
+            });
+            if (!matches)
+                return;
+            if ((0, todo_1.hasTodoComment)(node, message))
+                return;
+            (0, todo_1.addTodoComment)(node, message, j);
+            hasChanges = true;
+            hasTodos = true;
+        });
+    }
+    // Find .loadRelationCountAndMap() call sites — attach the comment above the enclosing statement.
+    // Multiple chained calls on one statement resolve to the same host, so the
+    // `hasTodoComment` guard keeps the transform idempotent.
+    const callMessage = `\`loadRelationCountAndMap()\` was removed — ${MIGRATION_HINT}`;
+    // Match both dot access (`qb.loadRelationCountAndMap()`) and computed
+    // access (`qb["loadRelationCountAndMap"]()`). Use a post-filter rather
+    // than a find-pattern so the computed-key branch is visited too.
+    root.find(j.CallExpression).forEach((callPath) => {
+        const callee = callPath.node.callee;
+        if (callee.type !== "MemberExpression")
+            return;
+        const prop = callee.property;
+        const matches = (prop.type === "Identifier" &&
+            prop.name === "loadRelationCountAndMap") ||
+            (callee.computed &&
+                (0, ast_helpers_1.getStringValue)(prop) === "loadRelationCountAndMap");
+        if (!matches)
+            return;
+        let current = callPath.parent;
+        while (current) {
+            const node = current.node;
+            if (isTodoHost(node.type)) {
+                if (!(0, todo_1.hasTodoComment)(node, callMessage)) {
+                    (0, todo_1.addTodoComment)(node, callMessage, j);
+                    hasChanges = true;
+                    hasTodos = true;
+                }
+                break;
+            }
+            current = current.parent;
+        }
     });
-    // Remove RelationCount import from typeorm
     if ((0, ast_helpers_1.removeImportSpecifiers)(root, j, "typeorm", new Set(["RelationCount"]))) {
         hasChanges = true;
     }
+    if ((0, ast_helpers_1.removeReExportSpecifiers)(root, j, "typeorm", new Set(["RelationCount"]))) {
+        hasChanges = true;
+    }
     if (hasTodos)
         stats_1.stats.count.todo(api, exports.name, file);
     return hasChanges ? root.toSource() : undefined;

package/dist/transforms/v1/relation-count.js.map

@@ -1 +1 @@
-{"version":3,"file":"relation-count.js","sourceRoot":"","sources":["../../../src/transforms/v1/relation-count.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAuD;AACvD,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,8DAA8D,CAAA;AACrD,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,aAAa,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACtD,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3B,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,8CAA8C;IAC9C,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE;QACnB,UAAU,EAAE;YACR,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE;SACxD;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,IAAA,qBAAc,EACV,IAAI,CAAC,IAAI,EACT,4FAA4F,EAC5F,CAAC,CACJ,CAAA;QACD,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,2CAA2C;IAC3C,IACI,IAAA,oCAAsB,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EACxE,CAAC;QACC,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC;IAED,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;AAhCY,QAAA,aAAa,iBAgCzB;AAEY,QAAA,EAAE,GAAG,qBAAa,CAAA;AAC/B,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"relation-count.js","sourceRoot":"","sources":["../../../src/transforms/v1/relation-count.ts"],"names":[],"mappings":"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"}

package/dist/transforms/v1/repository-abstract.js

@@ -14,63 +14,177 @@ exports.manual = true;
 const repositoryAbstract = (file, api) => {
     const j = api.jscodeshift;
     const root = j(file.source);
+    if (!(0, ast_helpers_1.fileImportsFrom)(root, j, "typeorm"))
+        return undefined;
     let hasChanges = false;
     let hasTodos = false;
-    // Find @EntityRepository decorators and add TODO
-    root.find(j.Decorator, {
-        expression: {
-            type: "CallExpression",
-            callee: { type: "Identifier", name: "EntityRepository" },
-        },
-    }).forEach((path) => {
-        (0, todo_1.addTodoComment)(path.node, "`@EntityRepository` was removed — use a custom service class with `dataSource.getRepository()`", j);
+    // Resolve alias-aware local names so aliased imports like
+    // `import { getCustomRepository as gcr } from "typeorm"` still get
+    // their call-sites flagged before the import is removed.
+    const entityRepositoryNames = (0, ast_helpers_1.getLocalNamesForImport)(root, j, "typeorm", "EntityRepository");
+    const abstractRepositoryNames = (0, ast_helpers_1.getLocalNamesForImport)(root, j, "typeorm", "AbstractRepository");
+    const getCustomRepositoryNames = (0, ast_helpers_1.getLocalNamesForImport)(root, j, "typeorm", "getCustomRepository");
+    // Track which symbols were successfully flagged; we only strip imports
+    // for symbols whose usages got a comment — dropping an import while a
+    // type reference or conditional use survives would leave the user with
+    // a dangling reference and no signal.
+    const flaggedSymbols = new Set();
+    // Namespace bindings for `import * as typeorm from "typeorm"` and the
+    // matching CommonJS form — used below to match `typeorm.AbstractRepository`
+    // / `typeorm.EntityRepository` / `typeorm.getCustomRepository` references.
+    const typeormNamespaces = (0, ast_helpers_1.getNamespaceLocalNames)(root, j, "typeorm");
+    const isTypeormNamespaceMember = (expr, memberName) => {
+        if (expr.type !== "MemberExpression")
+            return false;
+        const member = expr;
+        return (member.object.type === "Identifier" &&
+            typeormNamespaces.has(member.object.name) &&
+            member.property.type === "Identifier" &&
+            member.property.name === memberName);
+    };
+    // Find @EntityRepository decorators (including aliased names and
+    // `@typeorm.EntityRepository()` namespace-access form)
+    root.find(j.ClassDeclaration)
+        .filter((classPath) => {
+        const decorators = classPath.node
+            .decorators;
+        if (!decorators)
+            return false;
+        for (const decorator of decorators) {
+            const expr = decorator.expression;
+            if (expr.type !== "CallExpression")
+                continue;
+            if (expr.callee.type === "Identifier" &&
+                entityRepositoryNames.has(expr.callee.name)) {
+                return true;
+            }
+            if (isTypeormNamespaceMember(expr.callee, "EntityRepository")) {
+                return true;
+            }
+        }
+        return false;
+    })
+        .forEach((classPath) => {
+        const message = "`@EntityRepository` was removed — use a custom service class with `dataSource.getRepository()`";
+        if (!(0, todo_1.hasTodoComment)(classPath.node, message)) {
+            (0, todo_1.addTodoComment)(classPath.node, message, j);
+        }
         hasChanges = true;
         hasTodos = true;
+        flaggedSymbols.add("EntityRepository");
     });
-    // Find classes extending AbstractRepository and add TODO
-    root.find(j.ClassDeclaration).forEach((path) => {
-        const superClass = path.node.superClass;
+    // Find classes extending AbstractRepository — covers:
+    //   class X extends AbstractRepository {}           (named/aliased import)
+    //   class X extends typeorm.AbstractRepository {}   (namespace import)
+    root.find(j.ClassDeclaration).forEach((classPath) => {
+        const superClass = classPath.node.superClass;
         if (!superClass)
             return;
-        let name = null;
-        if (superClass.type === "Identifier") {
-            name = superClass.name;
-        }
-        else if (superClass.type === "MemberExpression" &&
-            superClass.property.type === "Identifier") {
-            name = superClass.property.name;
-        }
-        if (name !== "AbstractRepository")
+        const matches = (superClass.type === "Identifier" &&
+            abstractRepositoryNames.has(superClass.name)) ||
+            isTypeormNamespaceMember(superClass, "AbstractRepository");
+        if (!matches)
             return;
-        (0, todo_1.addTodoComment)(path.node, "`AbstractRepository` was removed — use a custom service class with `dataSource.getRepository()`", j);
+        const message = "`AbstractRepository` was removed — use a custom service class with `dataSource.getRepository()`";
+        if (!(0, todo_1.hasTodoComment)(classPath.node, message)) {
+            (0, todo_1.addTodoComment)(classPath.node, message, j);
+        }
         hasChanges = true;
         hasTodos = true;
+        flaggedSymbols.add("AbstractRepository");
     });
-    // Find getCustomRepository() calls and add TODO
-    const addGetCustomRepoTodo = (path) => {
+    // TS type-reference usages (e.g. `extends AbstractRepository<User>` in
+    // a generic signature, or `T extends EntityRepository`). Without this,
+    // a file that only uses the symbol as a type would have its import
+    // silently stripped and be left with a dangling reference.
+    const flagTypeReference = (names, symbolName, message) => {
+        root.find(j.TSTypeReference)
+            .filter((p) => {
+            const typeName = p.node.typeName;
+            return (typeName.type === "Identifier" &&
+                names.has(typeName.name));
+        })
+            .forEach((p) => {
+            let current = p.parent;
+            while (current) {
+                const node = current.node;
+                if (node.type.endsWith("Statement") ||
+                    node.type === "VariableDeclaration" ||
+                    node.type === "ClassDeclaration" ||
+                    node.type === "ClassExpression" ||
+                    node.type === "ExportDefaultDeclaration" ||
+                    node.type === "ExportNamedDeclaration") {
+                    if (!(0, todo_1.hasTodoComment)(node, message)) {
+                        (0, todo_1.addTodoComment)(node, message, j);
+                    }
+                    hasChanges = true;
+                    hasTodos = true;
+                    flaggedSymbols.add(symbolName);
+                    return;
+                }
+                current = current.parent;
+            }
+        });
+    };
+    flagTypeReference(entityRepositoryNames, "EntityRepository", "`@EntityRepository` was removed — use a custom service class with `dataSource.getRepository()`");
+    flagTypeReference(abstractRepositoryNames, "AbstractRepository", "`AbstractRepository` was removed — use a custom service class with `dataSource.getRepository()`");
+    const addGetCustomRepoTodo = (callPath) => {
         const message = "`getCustomRepository()` was removed — use a custom service class with `dataSource.getRepository()`";
-        const parentNode = path.parent.node;
-        if (parentNode.type === "ExpressionStatement") {
-            (0, todo_1.addTodoComment)(parentNode, message, j);
+        // Walk up to the enclosing statement — comments attached to a bare
+        // `CallExpression` are commonly dropped by recast during printing.
+        let current = callPath;
+        let host = null;
+        while (current) {
+            const t = current.node.type;
+            if (t.endsWith("Statement") || t === "VariableDeclaration") {
+                host = current.node;
+                break;
+            }
+            current = current.parent;
         }
-        else {
-            (0, todo_1.addTodoComment)(path.node, message, j);
+        if (!host)
+            return;
+        if (!(0, todo_1.hasTodoComment)(host, message)) {
+            (0, todo_1.addTodoComment)(host, message, j);
         }
         hasChanges = true;
         hasTodos = true;
+        flaggedSymbols.add("getCustomRepository");
     };
+    // Member-expression form: `something.getCustomRepository(...)` — not
+    // alias-dependent, matches property name directly. This also covers the
+    // namespace-access form `typeorm.getCustomRepository(...)` since the
+    // property name is the same.
     root.find(j.CallExpression, {
         callee: {
             type: "MemberExpression",
             property: { type: "Identifier", name: "getCustomRepository" },
         },
     }).forEach(addGetCustomRepoTodo);
-    // Also find standalone getCustomRepository() calls
-    root.find(j.CallExpression, {
-        callee: { type: "Identifier", name: "getCustomRepository" },
-    }).forEach(addGetCustomRepoTodo);
-    // Remove imports
-    if ((0, ast_helpers_1.removeImportSpecifiers)(root, j, "typeorm", new Set(["EntityRepository", "AbstractRepository"]))) {
+    // Standalone form: `getCustomRepository(...)` — also handles aliased
+    // imports by looking up local names against the import scan.
+    root.find(j.CallExpression)
+        .filter((callPath) => {
+        const callee = callPath.node.callee;
+        return (callee.type === "Identifier" &&
+            getCustomRepositoryNames.has(callee.name));
+    })
+        .forEach(addGetCustomRepoTodo);
+    // Only strip imports/re-exports of symbols whose usages we successfully
+    // flagged. A surviving reference (e.g. inside a conditional type or a
+    // generic signature we didn't walk) + missing import = silently broken
+    // file. Re-exports are always safe to strip since no runtime usage
+    // depends on them.
+    if (flaggedSymbols.size > 0) {
+        if ((0, ast_helpers_1.removeImportSpecifiers)(root, j, "typeorm", flaggedSymbols)) {
+            hasChanges = true;
+        }
+    }
+    if ((0, ast_helpers_1.removeReExportSpecifiers)(root, j, "typeorm", new Set([
+        "EntityRepository",
+        "AbstractRepository",
+        "getCustomRepository",
+    ]))) {
         hasChanges = true;
     }
     if (hasTodos)

package/dist/transforms/v1/repository-abstract.js.map

@@ -1 +1 @@
-{"version":3,"file":"repository-abstract.js","sourceRoot":"","sources":["../../../src/transforms/v1/repository-abstract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"repository-abstract.js","sourceRoot":"","sources":["../../../src/transforms/v1/repository-abstract.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAS5B,gDAMuB;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,GACpB,gFAAgF,CAAA;AACvE,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,kBAAkB,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IAC3D,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,0DAA0D;IAC1D,mEAAmE;IACnE,yDAAyD;IACzD,MAAM,qBAAqB,GAAG,IAAA,oCAAsB,EAChD,IAAI,EACJ,CAAC,EACD,SAAS,EACT,kBAAkB,CACrB,CAAA;IACD,MAAM,uBAAuB,GAAG,IAAA,oCAAsB,EAClD,IAAI,EACJ,CAAC,EACD,SAAS,EACT,oBAAoB,CACvB,CAAA;IACD,MAAM,wBAAwB,GAAG,IAAA,oCAAsB,EACnD,IAAI,EACJ,CAAC,EACD,SAAS,EACT,qBAAqB,CACxB,CAAA;IAED,uEAAuE;IACvE,sEAAsE;IACtE,uEAAuE;IACvE,sCAAsC;IACtC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAA;IAExC,sEAAsE;IACtE,4EAA4E;IAC5E,2EAA2E;IAC3E,MAAM,iBAAiB,GAAG,IAAA,oCAAsB,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,CAAA;IAEpE,MAAM,wBAAwB,GAAG,CAC7B,IAAU,EACV,UAAkB,EACX,EAAE;QACT,IAAI,IAAI,CAAC,IAAI,KAAK,kBAAkB;YAAE,OAAO,KAAK,CAAA;QAClD,MAAM,MAAM,GAAG,IAAwB,CAAA;QACvC,OAAO,CACH,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;YACnC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;YACzC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;YACrC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU,CACtC,CAAA;IACL,CAAC,CAAA;IAED,iEAAiE;IACjE,uDAAuD;IACvD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC;SACxB,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QAClB,MAAM,UAAU,GAAI,SAAS,CAAC,IAAqC;aAC9D,UAAU,CAAA;QACf,IAAI,CAAC,UAAU;YAAE,OAAO,KAAK,CAAA;QAE7B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAA;YACjC,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB;gBAAE,SAAQ;YAC5C,IACI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;gBACjC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAC7C,CAAC;gBACC,OAAO,IAAI,CAAA;YACf,CAAC;YACD,IAAI,wBAAwB,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAAE,CAAC;gBAC5D,OAAO,IAAI,CAAA;YACf,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC,CAAC;SACD,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACnB,MAAM,OAAO,GACT,gGAAgG,CAAA;QACpG,IAAI,CAAC,IAAA,qBAAc,EAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3C,IAAA,qBAAc,EAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC9C,CAAC;QACD,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;QACf,cAAc,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IAEN,sDAAsD;IACtD,2EAA2E;IAC3E,uEAAuE;IACvE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAChD,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,UAAU,CAAA;QAC5C,IAAI,CAAC,UAAU;YAAE,OAAM;QAEvB,MAAM,OAAO,GACT,CAAC,UAAU,CAAC,IAAI,KAAK,YAAY;YAC7B,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACjD,wBAAwB,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAA;QAE9D,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,MAAM,OAAO,GACT,iGAAiG,CAAA;QACrG,IAAI,CAAC,IAAA,qBAAc,EAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3C,IAAA,qBAAc,EAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC9C,CAAC;QACD,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;QACf,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;IAC5C,CAAC,CAAC,CAAA;IAEF,uEAAuE;IACvE,uEAAuE;IACvE,mEAAmE;IACnE,2DAA2D;IAC3D,MAAM,iBAAiB,GAAG,CACtB,KAA0B,EAC1B,UAAkB,EAClB,OAAe,EACX,EAAE;QACN,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC;aACvB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACV,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAA;YAChC,OAAO,CACH,QAAQ,CAAC,IAAI,KAAK,YAAY;gBAC9B,KAAK,CAAC,GAAG,CAAE,QAA6B,CAAC,IAAI,CAAC,CACjD,CAAA;QACL,CAAC,CAAC;aACD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,OAAO,GAAG,CAAC,CAAC,MAAM,CAAA;YACtB,OAAO,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,GAAS,OAAO,CAAC,IAAI,CAAA;gBAC/B,IACI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;oBAC/B,IAAI,CAAC,IAAI,KAAK,qBAAqB;oBACnC,IAAI,CAAC,IAAI,KAAK,kBAAkB;oBAChC,IAAI,CAAC,IAAI,KAAK,iBAAiB;oBAC/B,IAAI,CAAC,IAAI,KAAK,0BAA0B;oBACxC,IAAI,CAAC,IAAI,KAAK,wBAAwB,EACxC,CAAC;oBACC,IAAI,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;wBACjC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBACpC,CAAC;oBACD,UAAU,GAAG,IAAI,CAAA;oBACjB,QAAQ,GAAG,IAAI,CAAA;oBACf,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;oBAC9B,OAAM;gBACV,CAAC;gBACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAA;YAC5B,CAAC;QACL,CAAC,CAAC,CAAA;IACV,CAAC,CAAA;IACD,iBAAiB,CACb,qBAAqB,EACrB,kBAAkB,EAClB,gGAAgG,CACnG,CAAA;IACD,iBAAiB,CACb,uBAAuB,EACvB,oBAAoB,EACpB,iGAAiG,CACpG,CAAA;IAED,MAAM,oBAAoB,GAAG,CAAC,QAAiB,EAAE,EAAE;QAC/C,MAAM,OAAO,GACT,oGAAoG,CAAA;QACxG,mEAAmE;QACnE,mEAAmE;QACnE,IAAI,OAAO,GAA2C,QAGrD,CAAA;QACD,IAAI,IAAI,GAAgB,IAAI,CAAA;QAC5B,OAAO,OAAO,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAA;YAC3B,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,qBAAqB,EAAE,CAAC;gBACzD,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;gBACnB,MAAK;YACT,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,MAAgD,CAAA;QACtE,CAAC;QACD,IAAI,CAAC,IAAI;YAAE,OAAM;QACjB,IAAI,CAAC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YACjC,IAAA,qBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QACpC,CAAC;QACD,UAAU,GAAG,IAAI,CAAA;QACjB,QAAQ,GAAG,IAAI,CAAA;QACf,cAAc,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;IAC7C,CAAC,CAAA;IAED,qEAAqE;IACrE,wEAAwE;IACxE,qEAAqE;IACrE,6BAA6B;IAC7B,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,qBAAqB,EAAE;SAChE;KACJ,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;IAEhC,qEAAqE;IACrE,6DAA6D;IAC7D,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC;SACtB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;QACjB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAA;QACnC,OAAO,CACH,MAAM,CAAC,IAAI,KAAK,YAAY;YAC5B,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAC5C,CAAA;IACL,CAAC,CAAC;SACD,OAAO,CAAC,oBAAoB,CAAC,CAAA;IAElC,wEAAwE;IACxE,sEAAsE;IACtE,uEAAuE;IACvE,mEAAmE;IACnE,mBAAmB;IACnB,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC1B,IAAI,IAAA,oCAAsB,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC;YAC7D,UAAU,GAAG,IAAI,CAAA;QACrB,CAAC;IACL,CAAC;IACD,IACI,IAAA,sCAAwB,EACpB,IAAI,EACJ,CAAC,EACD,SAAS,EACT,IAAI,GAAG,CAAC;QACJ,kBAAkB;QAClB,oBAAoB;QACpB,qBAAqB;KACxB,CAAC,CACL,EACH,CAAC;QACC,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC;IAED,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;AApPY,QAAA,kBAAkB,sBAoP9B;AAEY,QAAA,EAAE,GAAG,0BAAkB,CAAA;AACpC,kBAAe,UAAE,CAAA"}

package/dist/transforms/v1/repository-exist.js

@@ -11,7 +11,26 @@ exports.description = "rename `Repository.exist()` to `exists()`";
 const repositoryExist = (file, api) => {
     const j = api.jscodeshift;
     const root = j(file.source);
-    const hasChanges = (0, ast_helpers_1.renameMemberMethod)(root, j, "exist", "exists");
+    if (!(0, ast_helpers_1.fileImportsFrom)(root, j, "typeorm"))
+        return undefined;
+    const bindings = (0, ast_helpers_1.collectRepositoryBindings)(root, j);
+    let hasChanges = false;
+    root.find(j.CallExpression, {
+        callee: {
+            type: "MemberExpression",
+            property: { type: "Identifier", name: "exist" },
+        },
+    }).forEach((callPath) => {
+        const callee = callPath.node.callee;
+        if (callee.type !== "MemberExpression")
+            return;
+        if (callee.property.type !== "Identifier")
+            return;
+        if (!(0, ast_helpers_1.isRepositoryReceiver)(callee.object, bindings))
+            return;
+        callee.property.name = "exists";
+        hasChanges = true;
+    });
     return hasChanges ? root.toSource() : undefined;
 };
 exports.repositoryExist = repositoryExist;

package/dist/transforms/v1/repository-exist.js.map

@@ -1 +1 @@
-{"version":3,"file":"repository-exist.js","sourceRoot":"","sources":["../../../src/transforms/v1/repository-exist.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAmD;AAEtC,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GAAG,2CAA2C,CAAA;AAE/D,MAAM,eAAe,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACxD,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAA;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAE3B,MAAM,UAAU,GAAG,IAAA,gCAAkB,EAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAEjE,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAPY,QAAA,eAAe,mBAO3B;AAEY,QAAA,EAAE,GAAG,uBAAe,CAAA;AACjC,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"repository-exist.js","sourceRoot":"","sources":["../../../src/transforms/v1/repository-exist.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAIuB;AAEV,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GAAG,2CAA2C,CAAA;AAE/D,MAAM,eAAe,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACxD,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;IAEtB,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,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;YAAE,OAAM;QACjD,IAAI,CAAC,IAAA,kCAAoB,EAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;YAAE,OAAM;QAC1D,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAA;QAC/B,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC,CAAC,CAAA;IAEF,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAzBY,QAAA,eAAe,mBAyB3B;AAEY,QAAA,EAAE,GAAG,uBAAe,CAAA;AACjC,kBAAe,UAAE,CAAA"}

package/dist/transforms/v1/repository-find-by-ids.js

@@ -6,6 +6,69 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fn = exports.repositoryFindByIds = exports.description = exports.name = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const ast_helpers_1 = require("../ast-helpers");
+// A typeorm import declaration that we can safely augment with a new named
+// value specifier. Rejects:
+//   - `import type { ... } from "typeorm"` (declaration-level type-only)
+//   - `import "typeorm"` (side-effect only, no specifiers)
+//   - `import * as typeorm from "typeorm"` (namespace only — pushing a named
+//     specifier would produce `import * as typeorm, { In }` which is invalid)
+//   - `import typeorm from "typeorm"` (default only — same issue)
+// Only a decl that already carries at least one value-level ImportSpecifier
+// (named import) is considered augmentable.
+const canAcceptNamedValueSpecifier = (node) => {
+    if (node.importKind === "type")
+        return false;
+    const specifiers = node.specifiers ?? [];
+    if (specifiers.length === 0)
+        return false;
+    return specifiers.some((s) => s.type === "ImportSpecifier" && s.importKind !== "type");
+};
+// `In` is used as a VALUE (`In([...])`) — it must not be added to a
+// `import type { ... } from "typeorm"` declaration, and the per-specifier
+// form `import { type In }` is equally unusable. Find the first existing
+// value-level `In` binding or an augmentable value-level typeorm import;
+// fall back to emitting a fresh `import { In } from "typeorm"` line.
+const ensureInValueImport = (root, j) => {
+    const typeormImports = root.find(j.ImportDeclaration, {
+        source: { value: "typeorm" },
+    });
+    let hasInValueImport = false;
+    typeormImports.forEach((p) => {
+        const declTypeOnly = p.node.importKind === "type";
+        p.node.specifiers?.forEach((spec) => {
+            if (spec.type === "ImportSpecifier" &&
+                spec.imported.type === "Identifier" &&
+                spec.imported.name === "In") {
+                const specTypeOnly = spec.importKind === "type";
+                if (!declTypeOnly && !specTypeOnly)
+                    hasInValueImport = true;
+            }
+        });
+    });
+    if (hasInValueImport)
+        return;
+    let augmented = false;
+    typeormImports.forEach((p) => {
+        if (augmented)
+            return;
+        if (!canAcceptNamedValueSpecifier(p.node))
+            return;
+        p.node.specifiers?.push(j.importSpecifier(j.identifier("In")));
+        augmented = true;
+    });
+    if (augmented)
+        return;
+    const newImport = j.importDeclaration([j.importSpecifier(j.identifier("In"))], j.literal("typeorm"));
+    const allImports = root.find(j.ImportDeclaration);
+    if (allImports.length > 0) {
+        allImports.at(-1).insertAfter(newImport);
+    }
+    else {
+        root.find(j.Program).forEach((p) => {
+            p.node.body.unshift(newImport);
+        });
+    }
+};
 exports.name = node_path_1.default.basename(__filename, node_path_1.default.extname(__filename));
 exports.description = "replace `findByIds()` with `findBy()` and `In` operator";
 const repositoryFindByIds = (file, api) => {
@@ -16,6 +79,7 @@ const repositoryFindByIds = (file, api) => {
     if (!(0, ast_helpers_1.fileImportsFrom)(root, j, "typeorm")) {
         return undefined;
     }
+    const bindings = (0, ast_helpers_1.collectRepositoryBindings)(root, j);
     root.find(j.CallExpression, {
         callee: {
             type: "MemberExpression",
@@ -26,6 +90,8 @@ const repositoryFindByIds = (file, api) => {
             path.node.arguments.length !== 1) {
             return;
         }
+        if (!(0, ast_helpers_1.isRepositoryReceiver)(path.node.callee.object, bindings))
+            return;
         const idsArg = path.node.arguments[0];
         // Replace .findByIds(ids) with .findBy({ id: In(ids) })
         path.node.callee.property = j.identifier("findBy");
@@ -37,34 +103,8 @@ const repositoryFindByIds = (file, api) => {
         hasChanges = true;
         needsInImport = true;
     });
-    // Add In import if needed
     if (needsInImport) {
-        const typeormImports = root.find(j.ImportDeclaration, {
-            source: { value: "typeorm" },
-        });
-        let hasInImport = false;
-        typeormImports.forEach((path) => {
-            path.node.specifiers?.forEach((spec) => {
-                if (spec.type === "ImportSpecifier" &&
-                    spec.imported.type === "Identifier" &&
-                    spec.imported.name === "In") {
-                    hasInImport = true;
-                }
-            });
-        });
-        if (!hasInImport) {
-            if (typeormImports.length > 0) {
-                // Add to existing typeorm import
-                typeormImports.at(0).forEach((path) => {
-                    path.node.specifiers?.push(j.importSpecifier(j.identifier("In")));
-                });
-            }
-            else {
-                // Create new import
-                const newImport = j.importDeclaration([j.importSpecifier(j.identifier("In"))], j.literal("typeorm"));
-                root.find(j.ImportDeclaration).at(-1).insertAfter(newImport);
-            }
-        }
+        ensureInValueImport(root, j);
     }
     return hasChanges ? root.toSource() : undefined;
 };