From f4295a4d434d1bc01b4ffd3ca6ba24077dcfa80b Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Thu, 1 Dec 2022 11:11:03 -0500 Subject: [PATCH 1/3] Update references to `Job` and `Step` --- actions-languageservice/src/context/workflow-context.ts | 8 ++++---- actions-languageservice/src/value-providers/needs.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/actions-languageservice/src/context/workflow-context.ts b/actions-languageservice/src/context/workflow-context.ts index 264f799..e7a7894 100644 --- a/actions-languageservice/src/context/workflow-context.ts +++ b/actions-languageservice/src/context/workflow-context.ts @@ -1,5 +1,5 @@ import {WorkflowTemplate} from "@github/actions-workflow-parser"; -import {JobConfig, StepConfig} from "@github/actions-workflow-parser/model/workflow-template"; +import {Job, Step} from "@github/actions-workflow-parser/model/workflow-template"; import {StringToken} from "@github/actions-workflow-parser/templates/tokens/string-token"; import {TemplateToken} from "@github/actions-workflow-parser/templates/tokens/template-token"; @@ -9,10 +9,10 @@ export interface WorkflowContext { template: WorkflowTemplate | undefined; /** If the context is for a position within a job, this will be the job */ - job?: JobConfig; + job?: Job; /** If the context is for a position within a step, this will be the step */ - step?: StepConfig; + step?: Step; } export function getWorkflowContext( @@ -30,7 +30,7 @@ export function getWorkflowContext( switch (token.definition?.key) { case "job-id": { const jobID = (token as StringToken).value; - context.job = template.jobs.find(job => job.id === jobID); + context.job = template.jobs.find(job => job.id.value === jobID); } } } diff --git a/actions-languageservice/src/value-providers/needs.ts b/actions-languageservice/src/value-providers/needs.ts index 8c886b0..d37c22b 100644 --- a/actions-languageservice/src/value-providers/needs.ts +++ b/actions-languageservice/src/value-providers/needs.ts @@ -8,6 +8,6 @@ export async function needs(context: WorkflowContext): Promise { const uniquejobIDs = new Set(context.template.jobs.map(j => j.id)).values(); return Array.from(uniquejobIDs) - .filter(x => x !== context.job?.id) - .map(x => ({label: x})); + .filter(x => x.value !== context.job?.id.value) + .map(x => ({label: x.value})); } From c6ef2b8bb1ecab0c286f8000d612603cc2b7059d Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Thu, 1 Dec 2022 12:42:18 -0500 Subject: [PATCH 2/3] Update workflow parser package version --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index eed1d88..ddf3517 100644 --- a/package-lock.json +++ b/package-lock.json @@ -665,9 +665,9 @@ "link": true }, "node_modules/@github/actions-workflow-parser": { - "version": "0.0.20", - "resolved": "https://npm.pkg.github.com/download/@github/actions-workflow-parser/0.0.20/cfba09f790505ad7f811d3ba63981f9a22562b82", - "integrity": "sha512-85C1iony9CclubBCGFNY3wcvDE+FeGHZ92bEYd5XdseFEtAU5UjAF85nBAd55mEzEh+f/mJq8RK3s0rMLqv5pQ==", + "version": "0.0.22", + "resolved": "https://npm.pkg.github.com/download/@github/actions-workflow-parser/0.0.22/2bee5d6f70ee4a88996a7ae3ec201dca0127d249", + "integrity": "sha512-xZTeoUqvB9oX6++m7zjBStrXHHEUSt/U/sbxbPn61D9vrGhodbXC3rMib0C/waO/I0BYrYKyvt99BzmNbjKnkQ==", "license": "MIT", "dependencies": { "@github/actions-expressions": "*", @@ -10927,9 +10927,9 @@ } }, "@github/actions-workflow-parser": { - "version": "0.0.20", - "resolved": "https://npm.pkg.github.com/download/@github/actions-workflow-parser/0.0.20/cfba09f790505ad7f811d3ba63981f9a22562b82", - "integrity": "sha512-85C1iony9CclubBCGFNY3wcvDE+FeGHZ92bEYd5XdseFEtAU5UjAF85nBAd55mEzEh+f/mJq8RK3s0rMLqv5pQ==", + "version": "0.0.22", + "resolved": "https://npm.pkg.github.com/download/@github/actions-workflow-parser/0.0.22/2bee5d6f70ee4a88996a7ae3ec201dca0127d249", + "integrity": "sha512-xZTeoUqvB9oX6++m7zjBStrXHHEUSt/U/sbxbPn61D9vrGhodbXC3rMib0C/waO/I0BYrYKyvt99BzmNbjKnkQ==", "requires": { "@github/actions-expressions": "*", "yaml": "^2.0.0-8" From 3c07353eedc09d97ff27c64b6b4eb28197258c24 Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Thu, 1 Dec 2022 14:38:54 -0500 Subject: [PATCH 3/3] Update workflow parser package version --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ddf3517..7ce4e09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -665,9 +665,9 @@ "link": true }, "node_modules/@github/actions-workflow-parser": { - "version": "0.0.22", - "resolved": "https://npm.pkg.github.com/download/@github/actions-workflow-parser/0.0.22/2bee5d6f70ee4a88996a7ae3ec201dca0127d249", - "integrity": "sha512-xZTeoUqvB9oX6++m7zjBStrXHHEUSt/U/sbxbPn61D9vrGhodbXC3rMib0C/waO/I0BYrYKyvt99BzmNbjKnkQ==", + "version": "0.0.23", + "resolved": "https://npm.pkg.github.com/download/@github/actions-workflow-parser/0.0.23/4fe24783761ab3ae620f6a4199c27f6d1bd2da03", + "integrity": "sha512-oYV5pKB9jryDM8BKzR0amuL96Xhq/aCswffv/ugQntogmKPQloYFJQv1Rpe9WMFQvM4Ws2KpYvpBsVwS3rwZyw==", "license": "MIT", "dependencies": { "@github/actions-expressions": "*", @@ -10927,9 +10927,9 @@ } }, "@github/actions-workflow-parser": { - "version": "0.0.22", - "resolved": "https://npm.pkg.github.com/download/@github/actions-workflow-parser/0.0.22/2bee5d6f70ee4a88996a7ae3ec201dca0127d249", - "integrity": "sha512-xZTeoUqvB9oX6++m7zjBStrXHHEUSt/U/sbxbPn61D9vrGhodbXC3rMib0C/waO/I0BYrYKyvt99BzmNbjKnkQ==", + "version": "0.0.23", + "resolved": "https://npm.pkg.github.com/download/@github/actions-workflow-parser/0.0.23/4fe24783761ab3ae620f6a4199c27f6d1bd2da03", + "integrity": "sha512-oYV5pKB9jryDM8BKzR0amuL96Xhq/aCswffv/ugQntogmKPQloYFJQv1Rpe9WMFQvM4Ws2KpYvpBsVwS3rwZyw==", "requires": { "@github/actions-expressions": "*", "yaml": "^2.0.0-8"