fix kie/act-js types

Expensify · Jun 13, 2024 · 04fcd4b · 04fcd4b
1 parent 64ca929
commit 04fcd4b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
@@ -16967,7 +16967,7 @@ async function detectReactComponentInFile(filename) {
         owner: CONST_1.default.GITHUB_OWNER,
         repo: CONST_1.default.APP_REPO,
         path: filename,
-        ref: github.context.payload.pull_request?.head.ref,
+        ref: github.context.payload?.pull_request?.head.ref,
     };
     try {
         const { data } = await GithubUtils_1.default.octokit.repos.getContent(params);

diff --git a/src/types/modules/act.d.ts b/src/types/modules/act.d.ts
@@ -1,15 +1,14 @@
-import type {StepIdentifier} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
+import type {StepIdentifier as ActStepIdentifier} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
 
 declare module '@kie/act-js' {
-    type StepIdentifierCustom = {
+    // eslint-disable-next-line rulesdir/no-inline-named-export
+    export declare type StepIdentifier = {
         id?: string;
         name: string;
         run?: string;
         mockWith?: string;
         with?: string;
         envs?: string[];
         inputs?: string[];
-    } & Omit<StepIdentifier, 'name' | 'id' | 'run' | 'mockWith'>;
-
-    export type {StepIdentifier, StepIdentifierCustom};
+    } & Omit<ActStepIdentifier, 'name' | 'id' | 'run' | 'mockWith'>;
 }
diff --git a/workflow_tests/utils/JobMocker.ts b/workflow_tests/utils/JobMocker.ts
@@ -1,4 +1,4 @@
-import type {StepIdentifierCustom} from '@kie/act-js';
+import type {StepIdentifier} from '@kie/act-js';
 import type {PathOrFileDescriptor} from 'fs';
 import fs from 'fs';
 import path from 'path';
@@ -12,7 +12,7 @@ type YamlWorkflow = {
 };
 
 type MockJob = {
-    steps: StepIdentifierCustom[];
+    steps: StepIdentifier[];
     uses?: string;
     secrets?: string[];
     with?: string;
@@ -50,8 +50,8 @@ class JobMocker {
                     jobWith = job.with;
                     delete job.with;
                 }
-                job.steps = mockJob.steps.map((step): StepIdentifierCustom => {
-                    const mockStep: StepIdentifierCustom = {
+                job.steps = mockJob.steps.map((step): StepIdentifier => {
+                    const mockStep: StepIdentifier = {
                         name: step.name,
                         run: step.mockWith,
                     };

diff --git a/workflow_tests/utils/preGenerateTest.ts b/workflow_tests/utils/preGenerateTest.ts
@@ -1,5 +1,5 @@
 /* eslint no-console: ["error", { allow: ["warn", "log"] }] */
-import type {StepIdentifierCustom} from '@kie/act-js';
+import type {StepIdentifier} from '@kie/act-js';
 import type {PathLike} from 'fs';
 import fs from 'fs';
 import path from 'path';
@@ -92,7 +92,7 @@ describe('test workflow ${workflowName}', () => {
 });
 `;
 
-const mockStepTemplate = (stepMockName: string, step: StepIdentifierCustom, jobId: string | undefined) => `
+const mockStepTemplate = (stepMockName: string, step: StepIdentifier, jobId: string | undefined) => `
 const ${stepMockName} = utils.createMockStep(
     '${step.name ?? ''}',
     '${step.name ?? ''}',
@@ -199,7 +199,7 @@ const parseWorkflowFile = (workflow: YamlWorkflow) => {
         workflowJobs[jobId] = {
             steps: [],
         };
-        job.steps.forEach((step: StepIdentifierCustom) => {
+        job.steps.forEach((step: StepIdentifier) => {
             const workflowStep = {
                 name: step.name,
                 inputs: Object.keys(step.with ?? {}),
@@ -243,7 +243,7 @@ const getAssertionsFileContent = (jobs: Record<string, YamlMockJob>): string =>
 
     Object.entries(jobs).forEach(([jobId, job]) => {
         let stepAssertionsContent = '';
-        job.steps.forEach((step: StepIdentifierCustom) => {
+        job.steps.forEach((step: StepIdentifier) => {
             stepAssertionsContent += stepAssertionTemplate(step.name, jobId.toUpperCase(), step.name, step.inputs, step.envs);
         });
         const jobAssertionName = `assert${jobId.charAt(0).toUpperCase() + jobId.slice(1)}JobExecuted`;