code cleanup

Author: davidcavazos

.github/testing/src/affected.ts

@@ -12,26 +12,28 @@
 // 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 const TestAll = (path: string): Affected => ({
   path: path,
   TestAll: null,
 });
 export const TestSome = (
   path: string,
-  tests: Map<TestPath, Set<TestName>>
+  tests: AffectedTests
 ): Affected => ({
   path: path,
   TestSome: tests,
 });
 export type Affected =
-  | {path: string; TestAll: null}
-  | {path: string; TestSome: Map<TestPath, Set<TestName>>};
+  | { path: string; TestAll: null }
+  | { path: string; TestSome: AffectedTests };
 
 export function mergeAffected(
   path: string,

.github/testing/src/config.ts

@@ -15,30 +15,24 @@
 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, TestAll, TestName, TestPath, mergeAffected} from './affected';
+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';
 
 type Args = {
   root: string;
   path: string;
 };
 
-type ArgsTestSome = {
-  root: string;
-  path: string;
-  tests: Map<TestPath, Set<TestName>>;
-};
-
 const IGNORE_GLOBAL = ['README.md'];
 
 export class Config {
   match: List<string>;
   ignore: List<string>;
   packageFile: List<string>;
-  _lint: (_: Args) => void;
-  _testAll: (_: Args) => void;
-  _testSome: (_: ArgsTestSome) => void;
+  _lint: (args: Args) => void;
+  _testAll: (args: Args) => void;
+  _testSome: (args: Args, tests: AffectedTests) => void;
 
   constructor({
     match,
@@ -51,16 +45,16 @@ export class Config {
     match?: string[];
     ignore?: string[];
     packageFile?: string[];
-    lint?: (_: Args) => void;
-    testAll?: (_: Args) => void;
-    testSome?: (_: ArgsTestSome) => void;
+    lint?: (args: Args) => void;
+    testAll?: (args: Args) => void;
+    testSome?: (args: Args, tests: AffectedTests) => void;
   }) {
     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> =>
@@ -76,30 +70,26 @@ export class Config {
     );
 
   lint = (affected: Affected) => {
+    const args = { root: git.root(), path: affected.path };
     const cwd = process.cwd();
-    const root = git.root();
-    const dir = path.join(root, affected.path);
+    const dir = path.join(args.root, affected.path);
     console.log(`> cd ${dir}`);
     process.chdir(dir);
-    this._lint({root: root, path: affected.path});
+    this._lint(args);
     process.chdir(cwd);
   };
 
   test = (affected: Affected) => {
+    const args = { root: git.root(), path: affected.path };
     const cwd = process.cwd();
-    const root = git.root();
-    const dir = path.join(root, affected.path);
+    const dir = path.join(args.root, affected.path);
     console.log(`> cd ${dir}`);
     process.chdir(dir);
     if ('TestAll' in affected) {
-      this._testAll({root: root, path: affected.path});
+      this._testAll(args);
     }
     if ('TestSome' in affected) {
-      this._testSome({
-        root: root,
-        path: affected.path,
-        tests: affected.TestSome,
-      });
+      this._testSome(args, affected.TestSome);
     }
     process.chdir(cwd);
   };

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

@@ -38,7 +38,7 @@ export const python = (version = '3.11') =>
       subprocess.run('cp', [noxfile, 'noxfile.py']);
       subprocess.run('nox', ['-s', `py-${version}`]);
     },
-    testSome: args => {
+    testSome: (args, tests) => {
       const noxfile = path.join(args.root, 'noxfile-template.py');
       subprocess.run('cp', [noxfile, 'noxfile.py']);
       throw `TODO: config/python.ts testSome ${JSON.stringify(args)}`;

.github/testing/tsconfig.json

@@ -6,7 +6,6 @@
   },
   "include": [
     "src/**/*.ts",
-    "test/**/*.ts",
-    "src/diffs.ts"
+    "test/**/*.ts"
   ]
 }