update from feedback

Co-Authored-By: Bruno Rodrigues <[email protected]>

Author: AugustinMauroy

utils/src/ast-grep/package-json.test.ts

@@ -14,15 +14,15 @@ describe("package-json utilities", () => {
 			const input = dedent`
 				{
 					"scripts": {
-						"test": "echo \\"Error: no test specified\\" && exit 1"
+						"test": "echo \"Error: no test specified\" && exit 1"
 					}
 				}
 			`;
 
 			const result = getScriptsNode(parse('json', input));
 
 			assert(result);
-			assert.strictEqual(result.children().length, 3); // curly braces + pair + curly braces
+			assert.strictEqual(result.length, 1); // Number of children in the scripts node
 		});
 
 		it("should return empty array if any scripts is present", () => {
@@ -37,23 +37,6 @@ describe("package-json utilities", () => {
 
 			assert.strictEqual(result.length, 0);
 		});
-
-		it("should throw an error if multiple scripts nodes are found", () => {
-			const input = dedent`
-				{
-					"scripts": {
-						"test": "echo \\"Error: no test specified\\" && exit 1"
-					},
-					"scripts": {
-						"start": "node index.js"
-					}
-				}
-			`;
-
-			assert.throws(() => getScriptsNode(parse('json', input)), {
-				message: /Multiple "scripts" fields found/
-			});
-		});
 	});
 
 	describe("getNodeJsUsage", () => {
@@ -62,7 +45,7 @@ describe("package-json utilities", () => {
 				{
 					"scripts": {
 						"start": "node script.js",
-						"test": "echo \\"Error: no test specified\\" && exit 1"
+						"test": "echo \"Error: no test specified\" && exit 1"
 					}
 				}
 			`;
@@ -94,7 +77,7 @@ describe("package-json utilities", () => {
 				{
 					"scripts": {
 						"start": "node.exe script.js",
-						"test": "echo \\"Error: no test specified\\" && exit 1"
+						"test": "echo \"Error: no test specified\" && exit 1"
 					}
 				}
 			`;
@@ -110,7 +93,7 @@ describe("package-json utilities", () => {
 				{
 					"scripts": {
 						"start": "npm run build",
-						"test": "echo \\"Error: no test specified\\" && exit 1"
+						"test": "echo \"Error: no test specified\" && exit 1"
 					}
 				}
 			`;

utils/src/ast-grep/package-json.ts

@@ -5,28 +5,26 @@ import type { SgRoot, Edit } from "@codemod.com/jssg-types/main";
  * @param packageJsonRootNode The root node of the package.json AST.
  * @returns The "scripts" node, or null if not found.
  */
-export const getScriptsNode = (packageJsonRootNode: SgRoot) => {
-	const scriptsNodes = packageJsonRootNode
-		.root()
-		.findAll({
-			rule: {
-				kind: "pair",
-				has: {
-					field: "key",
-					kind: "string",
+export const getScriptsNode = (packageJsonRootNode: SgRoot) =>
+	packageJsonRootNode.root().findAll({
+		rule: {
+			kind: "pair",
+			inside: {
+				kind: "object",
+				inside: {
+					kind: "pair",
 					has: {
-						kind: "string_content",
-						regex: "scripts"
-					}
-				}
-			}
-		});
-
-	if (scriptsNodes.length > 1)
-		throw new Error(`Multiple "scripts" fields found in ${packageJsonRootNode.filename()}`);
-
-	return scriptsNodes[0] ?? null;
-};
+						field: "key",
+						kind: "string",
+						has: {
+							kind: "string_content",
+							regex: "scripts",
+						},
+					},
+				},
+			},
+		},
+	});
 
 /**
  * Get all usage of Node.js in the "scripts" node of a package.json AST.
@@ -38,8 +36,8 @@ export const getNodeJsUsage = (packageJsonRootNode: SgRoot) => {
 
 	if (!scriptsNode) return [];
 
-	return scriptsNode
-		.findAll({
+	return scriptsNode.flatMap((node) =>
+		node.findAll({
 			rule: {
 				kind: "string_content",
 				regex: "\\bnode(\\.exe)?\\b",
@@ -50,7 +48,8 @@ export const getNodeJsUsage = (packageJsonRootNode: SgRoot) => {
 					}
 				}
 			}
-		});
+		})
+	);
 };
 
 /**