@typeorm/codemod 1.0.0 → 1.0.2

package/dist/transforms/v1/index.js

@@ -33,11 +33,14 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transforms = exports.migrationGuide = exports.description = void 0;
+exports.transforms = exports.upgradingGuide = exports.description = void 0;
 const columnReadonly = __importStar(require("./column-readonly"));
 const columnUnsignedNumeric = __importStar(require("./column-unsigned-numeric"));
 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"));
@@ -45,6 +48,8 @@ const datasourceName = __importStar(require("./datasource-name"));
 const datasourceSap = __importStar(require("./datasource-sap"));
 const datasourceSqliteOptions = __importStar(require("./datasource-sqlite-options"));
 const datasourceSqliteType = __importStar(require("./datasource-sqlite-type"));
+const fileLogger = __importStar(require("./file-logger"));
+const findOptionsJoin = __importStar(require("./find-options-join"));
 const findOptionsLockModes = __importStar(require("./find-options-lock-modes"));
 const findOptionsStringRelations = __importStar(require("./find-options-string-relations"));
 const findOptionsStringSelect = __importStar(require("./find-options-string-select"));
@@ -67,13 +72,17 @@ const repositoryFindOneById = __importStar(require("./repository-find-one-by-id"
 const useContainer = __importStar(require("./use-container"));
 const transformer_1 = require("../transformer");
 exports.description = "Migrate from v0.3.x to v1.0";
-exports.migrationGuide = "https://typeorm.io/docs/guides/migration-v1";
+exports.upgradingGuide = "https://typeorm.io/docs/releases/1.0/upgrading-from-0.3";
 /**
  * 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,
@@ -85,6 +94,7 @@ exports.transforms = [
     columnReadonly,
     columnWidthZerofill,
     datasourceSqliteType,
+    findOptionsJoin,
     findOptionsLockModes,
     useContainer,
     datasourceMysqlConnector,
@@ -94,7 +104,6 @@ exports.transforms = [
     mongodbTypes,
     datasourceMssql,
     datasourceSap,
-    datasourceName,
     columnUnsignedNumeric,
     repositoryAbstract,
     relationCount,
@@ -104,6 +113,10 @@ exports.transforms = [
     queryBuilderReplacePropertyNames,
     findOptionsStringSelect,
     findOptionsStringRelations,
+    connectionManager,
+    connectionOptionsReader,
+    datasourceExpo,
+    fileLogger,
 ];
 exports.default = (0, transformer_1.transformer)(exports.transforms);
 //# sourceMappingURL=index.js.map

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,mFAAoE;AACpE,wEAAyD;AACzD,oEAAqD;AACrD,uFAAwE;AACxE,kEAAmD;AACnD,gEAAiD;AACjD,qFAAsE;AACtE,+EAAgE;AAChE,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,GAAG,6CAA6C,CAAA;AAE3E;;;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,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;CAC7B,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/migrations-get-all.js

@@ -10,26 +10,42 @@ const stats_1 = require("../stats");
 exports.name = node_path_1.default.basename(__filename, node_path_1.default.extname(__filename));
 exports.description = "flag removed `getAllMigrations()` for manual migration";
 exports.manual = true;
+const MESSAGE = "`getAllMigrations()` was removed — use `getPendingMigrations()`, `getExecutedMigrations()`, or `dataSource.migrations` 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 migrationsGetAll = (file, api) => {
     const j = api.jscodeshift;
     const root = j(file.source);
     let hasChanges = false;
+    let hasTodos = false;
     root.find(j.CallExpression, {
         callee: {
             type: "MemberExpression",
             property: { name: "getAllMigrations" },
         },
-    }).forEach((path) => {
-        // Add a TODO comment before the statement
-        const statement = j(path).closest(j.ExpressionStatement);
-        if (statement.length > 0) {
-            statement.forEach((stmtPath) => {
-                (0, todo_1.addTodoComment)(stmtPath.node, "`getAllMigrations()` was removed — use `getPendingMigrations()`, `getExecutedMigrations()`, or `dataSource.migrations` instead", j);
-            });
-        }
+    }).forEach((callPath) => {
         hasChanges = true;
+        let current = callPath.parent;
+        while (current) {
+            const node = current.node;
+            if (isTodoHost(node.type)) {
+                if (!(0, todo_1.hasTodoComment)(node, MESSAGE)) {
+                    (0, todo_1.addTodoComment)(node, MESSAGE, j);
+                    hasTodos = true;
+                }
+                return;
+            }
+            current = current.parent;
+        }
     });
-    if (hasChanges)
+    if (hasTodos)
         stats_1.stats.count.todo(api, exports.name, file);
     return hasChanges ? root.toSource() : undefined;
 };

package/dist/transforms/v1/migrations-get-all.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrations-get-all.js","sourceRoot":"","sources":["../../../src/transforms/v1/migrations-get-all.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,wDAAwD,CAAA;AAC/C,QAAA,MAAM,GAAG,IAAI,CAAA;AAEnB,MAAM,gBAAgB,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACzD,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,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE;QACxB,MAAM,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;SACzC;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,0CAA0C;QAC1C,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAA;QACxD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAC3B,IAAA,qBAAc,EACV,QAAQ,CAAC,IAAI,EACb,gIAAgI,EAChI,CAAC,CACJ,CAAA;YACL,CAAC,CAAC,CAAA;QACN,CAAC;QACD,UAAU,GAAG,IAAI,CAAA;IACrB,CAAC,CAAC,CAAA;IAEF,IAAI,UAAU;QAAE,aAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAI,EAAE,IAAI,CAAC,CAAA;IAEjD,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AA5BY,QAAA,gBAAgB,oBA4B5B;AAEY,QAAA,EAAE,GAAG,wBAAgB,CAAA;AAClC,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"migrations-get-all.js","sourceRoot":"","sources":["../../../src/transforms/v1/migrations-get-all.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,wDAAwD,CAAA;AAC/C,QAAA,MAAM,GAAG,IAAI,CAAA;AAE1B,MAAM,OAAO,GACT,gIAAgI,CAAA;AAEpI,yEAAyE;AACzE,wEAAwE;AACxE,0CAA0C;AAC1C,MAAM,UAAU,GAAG,CAAC,IAAY,EAAW,EAAE,CACzC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC1B,IAAI,KAAK,qBAAqB;IAC9B,IAAI,KAAK,0BAA0B;IACnC,IAAI,KAAK,wBAAwB;IACjC,IAAI,KAAK,eAAe;IACxB,IAAI,KAAK,oBAAoB,CAAA;AAE1B,MAAM,gBAAgB,GAAG,CAAC,IAAc,EAAE,GAAQ,EAAE,EAAE;IACzD,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,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE;QACxB,MAAM,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;SACzC;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpB,UAAU,GAAG,IAAI,CAAA;QACjB,IAAI,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC7B,OAAO,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,GAAS,OAAO,CAAC,IAAI,CAAA;YAC/B,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,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,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;AA9BY,QAAA,gBAAgB,oBA8B5B;AAEY,QAAA,EAAE,GAAG,wBAAgB,CAAA;AAClC,kBAAe,UAAE,CAAA"}

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fn = exports.mongodbStats = exports.manual = exports.description = exports.name = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+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));
@@ -13,32 +14,41 @@ exports.manual = true;
 const mongodbStats = (file, api) => {
     const j = api.jscodeshift;
     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,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;IAC3B,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;AAnCY,QAAA,YAAY,gBAmCxB;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,65 @@ 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(existingPath.node.specifiers
+                ?.filter((s) => s.type === "ExportSpecifier" &&
+                s.local?.type === "Identifier")
+                .map((s) => s.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-native-parameters.js

@@ -11,6 +11,8 @@ exports.description = "rename `setNativeParameters()` to `setParameters()`";
 const queryBuilderNativeParameters = (file, api) => {
     const j = api.jscodeshift;
     const root = j(file.source);
+    if (!(0, ast_helpers_1.fileImportsFrom)(root, j, "typeorm"))
+        return undefined;
     const hasChanges = (0, ast_helpers_1.renameMemberMethod)(root, j, "setNativeParameters", "setParameters");
     return hasChanges ? root.toSource() : undefined;
 };

package/dist/transforms/v1/query-builder-native-parameters.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder-native-parameters.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-native-parameters.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,qDAAqD,CAAA;AAEzE,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;IAE3B,MAAM,UAAU,GAAG,IAAA,gCAAkB,EACjC,IAAI,EACJ,CAAC,EACD,qBAAqB,EACrB,eAAe,CAClB,CAAA;IAED,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAZY,QAAA,4BAA4B,gCAYxC;AAEY,QAAA,EAAE,GAAG,oCAA4B,CAAA;AAC9C,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"query-builder-native-parameters.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-native-parameters.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAoE;AAEvD,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GAAG,qDAAqD,CAAA;AAEzE,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;IAE3B,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE1D,MAAM,UAAU,GAAG,IAAA,gCAAkB,EACjC,IAAI,EACJ,CAAC,EACD,qBAAqB,EACrB,eAAe,CAClB,CAAA;IAED,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACnD,CAAC,CAAA;AAdY,QAAA,4BAA4B,gCAcxC;AAEY,QAAA,EAAE,GAAG,oCAA4B,CAAA;AAC9C,kBAAe,UAAE,CAAA"}

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

@@ -11,9 +11,27 @@ 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);
+    if (!(0, ast_helpers_1.fileImportsFrom)(root, j, "typeorm"))
+        return undefined;
     let hasChanges = false;
     let hasTodos = false;
     root.find(j.CallExpression, {
@@ -21,30 +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 {
-            // Add a TODO comment
-            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,gDAA+C;AAC/C,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;IAC3B,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,qBAAqB;YACrB,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;AAxCY,QAAA,sBAAsB,0BAwClC;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-or-update.js

@@ -5,11 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fn = exports.queryBuilderOrUpdate = 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 = "replace object-style `orUpdate()` with array-style signature";
 const queryBuilderOrUpdate = (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;
     // Find .orUpdate({ conflict_target: [...], overwrite: [...] })
     root.find(j.CallExpression, {
@@ -29,12 +32,13 @@ const queryBuilderOrUpdate = (file, api) => {
         for (const prop of arg.properties) {
             if (prop.type !== "ObjectProperty")
                 continue;
-            if (prop.key.type !== "Identifier")
-                continue;
-            if (prop.key.name === "conflict_target") {
+            const keyName = prop.key.type === "Identifier"
+                ? prop.key.name
+                : (0, ast_helpers_1.getStringValue)(prop.key);
+            if (keyName === "conflict_target") {
                 conflictTarget = prop.value;
             }
-            else if (prop.key.name === "overwrite") {
+            else if (keyName === "overwrite") {
                 overwrite = prop.value;
             }
         }

package/dist/transforms/v1/query-builder-or-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder-or-update.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-or-update.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,8DAA8D,CAAA;AAE3D,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;IAC3B,IAAI,UAAU,GAAG,KAAK,CAAA;IAEtB,+DAA+D;IAC/D,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,UAAU,EAAE;SACrD;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAA;QAChC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAE7B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB;YAAE,OAAM;QAE3C,IAAI,cAAc,GAAmC,IAAI,CAAA;QACzD,IAAI,SAAS,GAAmC,IAAI,CAAA;QAEpD,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB;gBAAE,SAAQ;YAC5C,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY;gBAAE,SAAQ;YAE5C,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBACtC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAA;YAC/B,CAAC;iBAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACvC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAA;YAC1B,CAAC;QACL,CAAC;QAED,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS;YAAE,OAAM;QAEzC,yDAAyD;QACzD,mFAAmF;QACnF,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG;YAClB,SAAS;YACT,cAAc;SACa,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;AA5CY,QAAA,oBAAoB,wBA4ChC;AAEY,QAAA,EAAE,GAAG,4BAAoB,CAAA;AACtC,kBAAe,UAAE,CAAA"}
+{"version":3,"file":"query-builder-or-update.js","sourceRoot":"","sources":["../../../src/transforms/v1/query-builder-or-update.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,gDAAgE;AAEnD,QAAA,IAAI,GAAG,mBAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;AAC1D,QAAA,WAAW,GACpB,8DAA8D,CAAA;AAE3D,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;IAEtB,+DAA+D;IAC/D,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,UAAU,EAAE;SACrD;KACJ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAA;QAChC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAE7B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB;YAAE,OAAM;QAE3C,IAAI,cAAc,GAAmC,IAAI,CAAA;QACzD,IAAI,SAAS,GAAmC,IAAI,CAAA;QAEpD,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB;gBAAE,SAAQ;YAE5C,MAAM,OAAO,GACT,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY;gBAC1B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;gBACf,CAAC,CAAC,IAAA,4BAAc,EAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAElC,IAAI,OAAO,KAAK,iBAAiB,EAAE,CAAC;gBAChC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAA;YAC/B,CAAC;iBAAM,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;gBACjC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAA;YAC1B,CAAC;QACL,CAAC;QAED,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS;YAAE,OAAM;QAEzC,yDAAyD;QACzD,mFAAmF;QACnF,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG;YAClB,SAAS;YACT,cAAc;SACa,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;AAnDY,QAAA,oBAAoB,wBAmDhC;AAEY,QAAA,EAAE,GAAG,4BAAoB,CAAA;AACtC,kBAAe,UAAE,CAAA"}

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fn = exports.queryBuilderPrintSql = exports.manual = exports.description = exports.name = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+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));
@@ -13,6 +14,8 @@ exports.manual = true;
 const queryBuilderPrintSql = (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;
     const message = "`printSql()` was removed — use `getSql()` or `getQueryAndParameters()` to inspect SQL";
@@ -21,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,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;IAC3B,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;AApCY,QAAA,oBAAoB,wBAoChC;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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fn = exports.queryBuilderReplacePropertyNames = exports.manual = exports.description = exports.name = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+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));
@@ -13,25 +14,28 @@ exports.manual = true;
 const queryBuilderReplacePropertyNames = (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 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,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;IAC3B,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;AA9BY,QAAA,gCAAgC,oCA8B5C;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"}