@kamaalio/codemod-kit 0.0.24 → 0.0.26

package/dist/codemods/index.d.ts

@@ -1,2 +1,2 @@
-export { runCodemods, runCodemod, commitEditModifications, findAndReplace, findAndReplaceEdits, findAndReplaceConfig, findAndReplaceConfigModifications, } from './utils.js';
+export { runCodemods, runCodemod, commitEditModifications, findAndReplace, findAndReplaceEdits, findAndReplaceConfig, findAndReplaceConfigModifications, traverseUp, } from './utils.js';
 export type { Codemod, Modifications, FindAndReplaceConfig } from './types.js';

package/dist/codemods/types.d.ts

@@ -19,5 +19,5 @@ export type Modifications = {
 };
 export type FindAndReplaceConfig = {
     rule: Rule<TypesMap>;
-    transformer: ((node: SgNode<TypesMap, Kinds<TypesMap>>, rule: Rule<TypesMap>) => Optional<string> | Array<Edit | string>) | string;
+    transformer: ((node: SgNode<TypesMap, Kinds<TypesMap>>, rule: Rule<TypesMap>) => Optional<Edit | string> | Array<Edit | string>) | string;
 };

package/dist/codemods/utils.d.ts

@@ -1,7 +1,8 @@
 import { type Result } from 'neverthrow';
-import { type Edit, type SgRoot } from '@ast-grep/napi';
-import type { TypesMap } from '@ast-grep/napi/types/staticTypes.js';
+import { type Edit, type SgRoot, type SgNode } from '@ast-grep/napi';
+import type { Kinds, TypesMap } from '@ast-grep/napi/types/staticTypes.js';
 import type { NapiLang } from '@ast-grep/napi/types/lang.js';
+import { type types } from '@kamaalio/kamaal';
 import type { Codemod, FindAndReplaceConfig, Modifications } from './types.js';
 type RunCodemodHooks<C extends Codemod> = {
     targetFiltering?: (filepath: string, codemod: C) => boolean;
@@ -21,6 +22,7 @@ export declare function runCodemod<C extends Codemod>(codemod: C, transformation
     hasChanges: boolean;
     content: string;
 }, Error>>>;
+export declare function traverseUp(node: SgNode<TypesMap, Kinds<TypesMap>>, until: (node: SgNode<TypesMap, Kinds<TypesMap>>) => boolean): types.Optional<SgNode<TypesMap, Kinds<TypesMap>>>;
 export declare function findAndReplaceConfigModifications(modifications: Modifications, config: Array<FindAndReplaceConfig>): Promise<Modifications>;
 export declare function findAndReplaceConfig(content: SgRoot<TypesMap>, lang: NapiLang, config: Array<FindAndReplaceConfig>): Promise<string>;
 export declare function findAndReplaceEdits(content: SgRoot<TypesMap>, rule: FindAndReplaceConfig['rule'], transformer: FindAndReplaceConfig['transformer']): Array<Edit>;

package/dist/index.cjs

@@ -33,13 +33,14 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    findAndReplace: ()=>findAndReplace,
+    findAndReplaceConfig: ()=>findAndReplaceConfig,
     commitEditModifications: ()=>commitEditModifications,
-    runCodemods: ()=>runCodemods,
     runCodemod: ()=>runCodemod,
-    findAndReplace: ()=>findAndReplace,
     findAndReplaceConfigModifications: ()=>findAndReplaceConfigModifications,
     findAndReplaceEdits: ()=>findAndReplaceEdits,
-    findAndReplaceConfig: ()=>findAndReplaceConfig
+    runCodemods: ()=>runCodemods,
+    traverseUp: ()=>traverseUp
 });
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
@@ -131,6 +132,21 @@ async function runCodemod(codemod, transformationPath, options) {
         }
     }));
 }
+function traverseUp(node, until) {
+    let current = node.parent();
+    if (null == current) return null;
+    while(null != current){
+        const next = current.parent();
+        if (null == next) break;
+        if (until(next)) {
+            current = next;
+            break;
+        }
+        current = next;
+    }
+    if (!until(current)) return null;
+    return current;
+}
 async function findAndReplaceConfigModifications(modifications, config) {
     let currentModifications = {
         ...modifications
@@ -170,9 +186,11 @@ function findAndReplaceEdits(content, rule, transformer) {
         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);
+        else if ('string' == typeof transformed) valuesToTransform.push(transformed);
+        else edits.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)=>{
+        const transformedValuesWithMetaVariablesReplaced = valuesToTransform.map((transformedValue)=>metaVariables.reduce((acc, { original, value })=>acc.replaceAll(original, value), transformedValue));
+        return kamaal_namespaceObject.arrays.compactMap(transformedValuesWithMetaVariablesReplaced, (transformedValueWithMetaVariablesReplaced)=>{
             if (transformedValueWithMetaVariablesReplaced === node.text()) return null;
             return node.replace(transformedValueWithMetaVariablesReplaced);
         }).concat(edits);
@@ -264,6 +282,7 @@ exports.findAndReplaceConfigModifications = __webpack_exports__.findAndReplaceCo
 exports.findAndReplaceEdits = __webpack_exports__.findAndReplaceEdits;
 exports.runCodemod = __webpack_exports__.runCodemod;
 exports.runCodemods = __webpack_exports__.runCodemods;
+exports.traverseUp = __webpack_exports__.traverseUp;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "commitEditModifications",
     "findAndReplace",
@@ -271,7 +290,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "findAndReplaceConfigModifications",
     "findAndReplaceEdits",
     "runCodemod",
-    "runCodemods"
+    "runCodemods",
+    "traverseUp"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/index.d.ts

@@ -1 +1 @@
-export { runCodemods, runCodemod, commitEditModifications, findAndReplace, findAndReplaceEdits, findAndReplaceConfig, findAndReplaceConfigModifications, type Codemod, type Modifications, type FindAndReplaceConfig, } from './codemods/index.js';
+export { runCodemods, runCodemod, commitEditModifications, findAndReplace, findAndReplaceEdits, findAndReplaceConfig, findAndReplaceConfigModifications, traverseUp, type Codemod, type Modifications, type FindAndReplaceConfig, } from './codemods/index.js';

package/dist/index.js

@@ -85,6 +85,21 @@ async function runCodemod(codemod, transformationPath, options) {
         }
     }));
 }
+function traverseUp(node, until) {
+    let current = node.parent();
+    if (null == current) return null;
+    while(null != current){
+        const next = current.parent();
+        if (null == next) break;
+        if (until(next)) {
+            current = next;
+            break;
+        }
+        current = next;
+    }
+    if (!until(current)) return null;
+    return current;
+}
 async function findAndReplaceConfigModifications(modifications, config) {
     let currentModifications = {
         ...modifications
@@ -124,9 +139,11 @@ function findAndReplaceEdits(content, rule, transformer) {
         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);
+        else if ('string' == typeof transformed) valuesToTransform.push(transformed);
+        else edits.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)=>{
+        const transformedValuesWithMetaVariablesReplaced = valuesToTransform.map((transformedValue)=>metaVariables.reduce((acc, { original, value })=>acc.replaceAll(original, value), transformedValue));
+        return arrays.compactMap(transformedValuesWithMetaVariablesReplaced, (transformedValueWithMetaVariablesReplaced)=>{
             if (transformedValueWithMetaVariablesReplaced === node.text()) return null;
             return node.replace(transformedValueWithMetaVariablesReplaced);
         }).concat(edits);
@@ -211,4 +228,4 @@ function defaultedHooks(hooks) {
         preCodemodRun
     };
 }
-export { commitEditModifications, findAndReplace, findAndReplaceConfig, findAndReplaceConfigModifications, findAndReplaceEdits, runCodemod, runCodemods };
+export { commitEditModifications, findAndReplace, findAndReplaceConfig, findAndReplaceConfigModifications, findAndReplaceEdits, runCodemod, runCodemods, traverseUp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamaalio/codemod-kit",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "type": "module",
   "author": "Kamaal Farah",
   "license": "MIT",
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "@ast-grep/napi": "^0.38.5",
-    "@kamaalio/kamaal": "^0.7.6",
+    "@kamaalio/kamaal": "^0.7.8",
     "fast-glob": "^3.3.3",
     "neverthrow": "^8.2.0"
   },