cleanup and refactor reusable code

Author: davidcavazos

.github/testing/src/affected.ts

@@ -12,28 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Map, List, Set } from 'immutable';
+import {Map, List, Set} from 'immutable';
 
 export type PackageName = string;
 export type TestPath = string;
 export type TestName = string;
 
-export type AffectedTests = Map<TestPath, Set<TestName>>
+export type AffectedTests = Map<TestPath, Set<TestName>>;
 
 export const TestAll = (path: string): Affected => ({
   path: path,
   TestAll: null,
 });
-export const TestSome = (
-  path: string,
-  tests: AffectedTests
-): Affected => ({
+export const TestSome = (path: string, tests: AffectedTests): Affected => ({
   path: path,
   TestSome: tests,
 });
 export type Affected =
-  | { path: string; TestAll: null }
-  | { path: string; TestSome: AffectedTests };
+  | {path: string; TestAll: null}
+  | {path: string; TestSome: AffectedTests};
 
 export function mergeAffected(
   path: string,

.github/testing/src/config.ts

@@ -15,9 +15,9 @@
 import * as fs from 'node:fs';
 import * as git from './git';
 import * as path from 'path';
-import { List, Map, Set } from 'immutable';
-import { minimatch } from 'minimatch'; /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Affected, AffectedTests, TestAll, TestName, TestPath, mergeAffected } from './affected';
+import {List} from 'immutable';
+import {minimatch} from 'minimatch'; /* eslint-disable @typescript-eslint/no-explicit-any */
+import {Affected, AffectedTests, TestAll, mergeAffected} from './affected';
 
 type Args = {
   root: string;
@@ -52,9 +52,9 @@ export class Config {
     this.match = List(match || ['**']);
     this.ignore = List(ignore);
     this.packageFile = List(packageFile);
-    this._lint = lint || (_ => { });
-    this._testAll = testAll || (_ => { });
-    this._testSome = testSome || (_ => { });
+    this._lint = lint || (_ => {});
+    this._testAll = testAll || (_ => {});
+    this._testSome = testSome || (_ => {});
   }
 
   affected = (head: string, main: string): List<Affected> =>
@@ -69,28 +69,26 @@ export class Config {
         .values()
     );
 
-  lint = (affected: Affected) => {
-    const args = { root: git.root(), path: affected.path };
-    const cwd = process.cwd();
-    const dir = path.join(args.root, affected.path);
-    console.log(`> cd ${dir}`);
-    process.chdir(dir);
-    this._lint(args);
-    process.chdir(cwd);
-  };
+  lint = (affected: Affected) =>
+    this.withDir(affected.path, args => this._lint(args));
 
-  test = (affected: Affected) => {
-    const args = { root: git.root(), path: affected.path };
+  test = (affected: Affected) =>
+    this.withDir(affected.path, args => {
+      if ('TestAll' in affected) {
+        this._testAll(args);
+      }
+      if ('TestSome' in affected) {
+        this._testSome(args, affected.TestSome);
+      }
+    });
+
+  withDir = (dir: string, f: (args: Args) => void) => {
+    const args = {root: git.root(), path: dir};
     const cwd = process.cwd();
-    const dir = path.join(args.root, affected.path);
-    console.log(`> cd ${dir}`);
-    process.chdir(dir);
-    if ('TestAll' in affected) {
-      this._testAll(args);
-    }
-    if ('TestSome' in affected) {
-      this._testSome(args, affected.TestSome);
-    }
+    const absDir = path.join(args.root, dir);
+    console.log(`> cd ${absDir}`);
+    process.chdir(absDir);
+    f(args);
     process.chdir(cwd);
   };
 

.github/testing/src/config/python.ts

@@ -14,7 +14,7 @@
 
 import * as path from 'path';
 import * as subprocess from '../subprocess';
-import { Config } from '../config';
+import {Config} from '../config';
 
 export const python = (version = '3.11') =>
   new Config({

.github/testing/src/main.ts

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import * as git from './git';
-import { Config } from './config';
-import { python } from './config/python';
-import { Affected } from './affected';
+import {Config} from './config';
+import {python} from './config/python';
+import {Affected} from './affected';
 
 function getConfig(lang: string): Config {
   switch (lang) {

.github/workflows/test.yaml

@@ -61,7 +61,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
-      - run: pip install nox black
+      - run: pip install nox
       - run: bun install
       - run: bun run ci-lint python AFFECTED
         env: