@kamaalio/codemod-kit 0.0.22 → 0.0.24

package/dist/codemods/types.d.ts

@@ -1,4 +1,4 @@
-import type { Rule, SgNode, SgRoot } from '@ast-grep/napi';
+import type { Edit, Rule, SgNode, SgRoot } from '@ast-grep/napi';
 import type { NapiLang } from '@ast-grep/napi/types/lang.js';
 import type { Kinds, TypesMap } from '@ast-grep/napi/types/staticTypes.js';
 import type { Optional } from '../utils/type-utils.js';
@@ -19,5 +19,5 @@ export type Modifications = {
 };
 export type FindAndReplaceConfig = {
     rule: Rule<TypesMap>;
-    transformer: ((node: SgNode<TypesMap, Kinds<TypesMap>>, rule: Rule<TypesMap>) => Optional<string>) | string;
+    transformer: ((node: SgNode<TypesMap, Kinds<TypesMap>>, rule: Rule<TypesMap>) => Optional<string> | Array<Edit | string>) | string;
 };

package/dist/index.cjs

@@ -166,10 +166,17 @@ function findAndReplaceEdits(content, rule, transformer) {
     return kamaal_namespaceObject.arrays.compactMap(nodes, (node)=>{
         const transformed = 'string' == typeof transformer ? transformer : transformer(node, rule);
         if (null == transformed) return null;
-        const transformedValueWithMetaVariablesReplaced = Object.values(extractMetaVariables(node, rule)).reduce((acc, { original, value })=>acc.replaceAll(original, value), transformed);
-        if (transformedValueWithMetaVariablesReplaced === node.text()) return null;
-        return node.replace(transformedValueWithMetaVariablesReplaced);
-    });
+        const edits = [];
+        const valuesToTransform = [];
+        if (Array.isArray(transformed)) for (const item of transformed)if ('string' == typeof item) valuesToTransform.push(item);
+        else edits.push(item);
+        else valuesToTransform.push(transformed);
+        const metaVariables = Object.values(extractMetaVariables(node, rule));
+        return kamaal_namespaceObject.arrays.compactMap(valuesToTransform.map((transformedValue)=>metaVariables.reduce((acc, { original, value })=>acc.replaceAll(original, value), transformedValue)), (transformedValueWithMetaVariablesReplaced)=>{
+            if (transformedValueWithMetaVariablesReplaced === node.text()) return null;
+            return node.replace(transformedValueWithMetaVariablesReplaced);
+        }).concat(edits);
+    }).flat(1);
 }
 function extractMetaVariables(node, rule) {
     const pattern = rule.pattern?.toString();

package/dist/index.js

@@ -120,10 +120,17 @@ function findAndReplaceEdits(content, rule, transformer) {
     return arrays.compactMap(nodes, (node)=>{
         const transformed = 'string' == typeof transformer ? transformer : transformer(node, rule);
         if (null == transformed) return null;
-        const transformedValueWithMetaVariablesReplaced = Object.values(extractMetaVariables(node, rule)).reduce((acc, { original, value })=>acc.replaceAll(original, value), transformed);
-        if (transformedValueWithMetaVariablesReplaced === node.text()) return null;
-        return node.replace(transformedValueWithMetaVariablesReplaced);
-    });
+        const edits = [];
+        const valuesToTransform = [];
+        if (Array.isArray(transformed)) for (const item of transformed)if ('string' == typeof item) valuesToTransform.push(item);
+        else edits.push(item);
+        else valuesToTransform.push(transformed);
+        const metaVariables = Object.values(extractMetaVariables(node, rule));
+        return arrays.compactMap(valuesToTransform.map((transformedValue)=>metaVariables.reduce((acc, { original, value })=>acc.replaceAll(original, value), transformedValue)), (transformedValueWithMetaVariablesReplaced)=>{
+            if (transformedValueWithMetaVariablesReplaced === node.text()) return null;
+            return node.replace(transformedValueWithMetaVariablesReplaced);
+        }).concat(edits);
+    }).flat(1);
 }
 function extractMetaVariables(node, rule) {
     const pattern = rule.pattern?.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamaalio/codemod-kit",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "type": "module",
   "author": "Kamaal Farah",
   "license": "MIT",