finish work

es-tooling · Jul 30, 2024 · 4a26a2d · 4a26a2d
1 parent ca92fd5
commit 4a26a2d
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 48 deletions.
diff --git a/codemods/shared.js b/codemods/shared.js
@@ -89,41 +89,49 @@ export function removeImport(name, root, j) {
  */
 export function insertAfterImports(code, root, j) {
 	const importDeclarations = root.find(j.ImportDeclaration);
-
-	if (importDeclarations.length) {
-		const lastItem = importDeclarations.at(-1).get();
-		j(lastItem).insertAfter(code);
-		return;
-	}
-
 	const requireDeclarations = root.find(j.VariableDeclarator, {
 		init: {
 			callee: {
 				name: 'require',
 			},
 		}
 	});
-
-	if (requireDeclarations.length) {
-		const lastItem = requireDeclarations.at(-1).get();
-		j(lastItem).insertAfter(code);
-		return;
-	}
-
 	const requireAssignments = root.find(j.AssignmentExpression, {
 		operator: '=',
 		right: {
 			callee: {
 				name: 'require',
 			},
 		},
-	}).length;
+	});
+
+		// Side effect requires statements like `require("error-cause/auto");`
+		const sideEffectRequireExpression = root.find(j.ExpressionStatement, {
+			expression: {
+				callee: {
+					name: 'require',
+				}
+			},
+		});
 
-	if (requireAssignments) {
-		const lastItem = requireAssignments.at(-1).get();
-		j(lastItem).insertAfter(code);
+	const allNodes = [
+		...importDeclarations.nodes(),
+		...requireDeclarations.nodes(),
+		...requireAssignments.nodes(),
+		...sideEffectRequireExpression.nodes(),
+	];
+
+	if (allNodes.length === 0) {
 		return;
 	}
+
+	const sortedNodes = allNodes.sort((a, b) => {
+		return a.loc.start.line - b.loc.start.line;
+	});
+
+	const bottomMostNode = sortedNodes[sortedNodes.length - 1];
+	const node = getAncestorOnLine(bottomMostNode.loc.end.line, root, j);
+	j(node).insertAfter(code);
 }
 
 export const DEFAULT_IMPORT = Symbol('DEFAULT_IMPORT');
@@ -509,14 +517,25 @@ export function replaceRequireMemberExpression(importName, value, root, j) {
  * @param {import("jscodeshift").Collection} root 
  * @param {import("jscodeshift").JSCodeshift} j 
  */
-export function insertCommentAboveNode(comment, startLine, root, j) {
-	const node = root.find(j.Node, {
+export function getAncestorOnLine(line, root, j) {
+	return root.find(j.Node, {
 		loc: {
 			start: {
-				line: startLine,
+				line,
 			}
 		}
 	}).at(0).get()
+}
+
+/**
+ * 
+ * @param {import("jscodeshift").CommentBlock} comment 
+ * @param {number} startLine
+ * @param {import("jscodeshift").Collection} root 
+ * @param {import("jscodeshift").JSCodeshift} j 
+ */
+export function insertCommentAboveNode(comment, startLine, root, j) {
+	const node = getAncestorOnLine(startLine, root, j);
 
 	node.value.comments = node.value.comments || [];
 	node.value.comments.push(comment);

diff --git a/test/fixtures/define-properties/case-2/after.js b/test/fixtures/define-properties/case-2/after.js
@@ -1,5 +1,6 @@
 const assert = require('assert');
 
+
 const $define = function (object, map) {
   let propKeys = Object.keys(map);
   propKeys = propKeys.concat(Object.getOwnPropertySymbols(map));
@@ -51,10 +52,9 @@ assert.deepEqual(Object.getOwnPropertyDescriptor(res1, 'c'), {
   writable: false
 });
 
-
 const object2 = { a: 1, b: 2 };
 
-const res2 = $define(object2, {
+$define(object2, {
   c: 30
 })
 

diff --git a/test/fixtures/define-properties/case-2/result.js b/test/fixtures/define-properties/case-2/result.js
@@ -1,27 +1,28 @@
-const assert = require('assert'),
-
-      const $define = function (object, map) {
-        let propKeys = Object.keys(map);
-        propKeys = propKeys.concat(Object.getOwnPropertySymbols(map));
-
-        for (var i = 0; i < propKeys.length; i += 1) {
-          const propKey = propKeys[i];
-          const value = map[propKey];
-
-          if (propKey in object) {
-            continue;
-          }
-
-          Object.defineProperty(object, propKey, {
-            value,
-            configurable: true,
-            enumerable: false,
-            writable: false,
-          })
-        }
-
-        return object;
-      };;
+const assert = require('assert');
+
+
+const $define = function (object, map) {
+  let propKeys = Object.keys(map);
+  propKeys = propKeys.concat(Object.getOwnPropertySymbols(map));
+
+  for (var i = 0; i < propKeys.length; i += 1) {
+    const propKey = propKeys[i];
+    const value = map[propKey];
+
+    if (propKey in object) {
+      continue;
+    }
+
+    Object.defineProperty(object, propKey, {
+      value,
+      configurable: true,
+      enumerable: false,
+      writable: false,
+    })
+  }
+
+  return object;
+};
 
 const object1 = { a: 1, b: 2 };
 

diff --git a/test/fixtures/define-properties/case-4/after.js b/test/fixtures/define-properties/case-4/after.js
@@ -1,7 +1,33 @@
 const define = require('define-properties');
 const assert = require('assert');
 
-define({ a: 1, b: 2 }, {
+require("fake/auto");
+import fake from "fake";
+
+const $define = function (object, map) {
+  let propKeys = Object.keys(map);
+  propKeys = propKeys.concat(Object.getOwnPropertySymbols(map));
+
+  for (var i = 0; i < propKeys.length; i += 1) {
+    const propKey = propKeys[i];
+    const value = map[propKey];
+
+    if (propKey in object) {
+      continue;
+    }
+
+    Object.defineProperty(object, propKey, {
+      value,
+      configurable: true,
+      enumerable: false,
+      writable: false,
+    })
+  }
+
+  return object;
+};
+
+$define({ a: 1, b: 2 }, {
   a: 10,
   b: 20,
   c: 30,

diff --git a/test/fixtures/define-properties/case-4/before.js b/test/fixtures/define-properties/case-4/before.js
@@ -1,6 +1,9 @@
 const define = require('define-properties');
 const assert = require('assert');
 
+require("fake/auto");
+import fake from "fake";
+
 const $define = function (object, map) {
   let propKeys = Object.keys(map);
   propKeys = propKeys.concat(Object.getOwnPropertySymbols(map));

diff --git a/test/fixtures/define-properties/case-4/result.js b/test/fixtures/define-properties/case-4/result.js
@@ -1,6 +1,9 @@
 const define = require('define-properties');
 const assert = require('assert');
 
+require("fake/auto");
+import fake from "fake";
+
 const $define = function (object, map) {
   let propKeys = Object.keys(map);
   propKeys = propKeys.concat(Object.getOwnPropertySymbols(map));