Merge pull request #62 from advayDev1/patch-1

Link to correct context file

.eslintrc.yml

@@ -0,0 +1,13 @@
+root: true
+parser: '@typescript-eslint/parser'
+plugins: ['@typescript-eslint']
+extends:
+  - eslint:recommended
+  - plugin:@typescript-eslint/eslint-recommended
+  - plugin:@typescript-eslint/recommended
+  - prettier/@typescript-eslint
+rules:
+  # '@typescript-eslint/explicit-function-return-type': 0
+  '@typescript-eslint/no-use-before-define':
+    - 2
+    - functions: false

.github/workflows/ci.yml

@@ -15,4 +15,5 @@ jobs:
           key: ${{runner.os}}-npm-${{hashFiles('**/package-lock.json')}}
           restore-keys: ${{runner.os}}-npm-
       - run: npm ci
+      - run: npm run style:check
       - run: npm test

.github/workflows/integration.yml

@@ -8,9 +8,10 @@ jobs:
       - id: output-set
         uses: actions/github-script@master
         with:
-          script: return 'test'
+          script: return core.getInput('input-value')
           result-encoding: string
+          input-value: output
       - run: |
-          if [[ "${{steps.output-set.outputs.result}}" != "test" ]]; then
+          if [[ "${{steps.output-set.outputs.result}}" != "output" ]]; then
             exit 1
           fi

.github/workflows/pull-request-test.yml

@@ -0,0 +1,39 @@
+on:
+  pull_request:
+    branches: master
+    types: [opened, synchronize]
+
+jobs:
+  pull-request-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./
+        with:
+          script: |
+            // Get the existing comments.
+            const {data: comments} = await github.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.number,
+            })
+
+            // Find any comment already made by the bot.
+            const botComment = comments.find(comment => comment.user.id === 41898282)
+            const commentBody = "Hello from actions/github-script! (${{ github.sha }})"
+
+            if (botComment) {
+              await github.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: botComment.id,
+                body: commentBody
+              })
+            } else {
+              await github.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.payload.number,
+                body: commentBody
+              })
+            }

.gitignore

@@ -1 +1,2 @@
-node_modules
+/node_modules/
+!/.vscode/

.prettierrc.yml

@@ -0,0 +1,5 @@
+arrowParens: avoid
+bracketSpacing: false
+semi: false
+singleQuote: true
+trailingComma: none

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": true
+  },
+  "files.exclude": {
+    "**/dist": true,
+    "**/node_modules": true
+  }
+}

README.md

@@ -4,13 +4,15 @@ This action makes it easy to quickly write a script in your workflow that
 uses the GitHub API and the workflow run context.
 
 In order to use this action, a `script` input is provided. The value of that
-input should be the body of an asynchronous function call. Two arguments will
+input should be the body of an asynchronous function call. The following
-be provided:
+arguments will be provided:
 
 - `github` A pre-authenticated
   [octokit/rest.js](https://github.com/octokit/rest.js) client
 - `context` An object containing the [context of the workflow
-  run](https://github.com/actions/toolkit/tree/master/packages/github)
+  run](https://github.com/actions/toolkit/blob/master/packages/github/src/context.ts)
+- `core` A reference to the [@actions/core](https://github.com/actions/toolkit/tree/master/packages/core) package
+- `io` A reference to the [@actions/io](https://github.com/actions/toolkit/tree/master/packages/io) package
 
 Since the `script` is just a function body, these values will already be
 defined, so you don't have to (see examples below).
@@ -19,12 +21,45 @@ See [octokit/rest.js](https://octokit.github.io/rest.js/) for the API client
 documentation.
 
 **Note** This action is still a bit of an experiment—the API may change in
-*future versions. 🙂
+future versions. 🙂
 
 ## Development
 
 See [development.md](/docs/development.md).
 
+## Reading step results
+
+The return value of the script will be in the step's outputs under the
+"result" key.
+
+```yaml
+- uses: actions/github-script@v2
+  id: set-result
+  with:
+    script: return "Hello!"
+    result-encoding: string
+- name: Get result
+  run: echo "${{steps.set-result.outputs.result}}"
+```
+
+See ["Result encoding"](#result-encoding) for details on how the encoding of
+these outputs can be changed.
+
+## Result encoding
+
+By default, the JSON-encoded return value of the function is set as the "result" in the
+output of a github-script step. For some workflows, string encoding is preferred. This option can be set using the
+`result-encoding` input:
+
+```yaml
+- uses: actions/github-script@v2
+  id: my-script
+  with:
+    github-token: ${{secrets.GITHUB_TOKEN}}
+    result-encoding: string
+    script: return "I will be string (not JSON) encoded!"
+```
+
 ## Examples
 
 Note that `github-token` is optional in this action, and the input is there
@@ -36,13 +71,14 @@ By default, github-script will use the token provided to your workflow.
 
 ```yaml
 on:
-  issues: {types: opened}
+  issues:
+    types: [opened]
 
 jobs:
   comment:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@0.6.0
+      - uses: actions/github-script@v2
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -58,13 +94,14 @@ jobs:
 
 ```yaml
 on:
-  issues: {types: opened}
+  issues:
+    types: [opened]
 
 jobs:
   apply-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@0.6.0
+      - uses: actions/github-script@v2
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -85,7 +122,7 @@ jobs:
   welcome:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@0.6.0
+      - uses: actions/github-script@v2
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -123,14 +160,13 @@ You can use the `github` object to access the Octokit API. For
 instance, `github.request`
 
 ```yaml
-on:
+on: pull_request
-  pull_request
 
 jobs:
   diff:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@0.6.0
+      - uses: actions/github-script@v2
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -139,21 +175,49 @@ jobs:
             console.log(result)
 ```
 
+_(Note that this particular example only works for a public URL, where the
+diff URL is publicly accessible. Getting the diff for a private URL requires
+using the API.)_
+
 This will print the full diff object in the screen; `result.data` will
 contain the actual diff text.
 
-### Result encoding
+### Run a separate file
-
-By default, the JSON-encoded return value of the function is set as the "result" in the
-output of a github-script step. For some workflows, string encoding is preferred. This option can be set using the
-`result-encoding` input:
 
+If you don't want to inline your entire script that you want to run, you can
+use a separate JavaScript module in your repository like so:
 
 ```yaml
-- uses: actions/github-script@0.6.0
+on: push
-  with:
+
-    github-token: ${{secrets.GITHUB_TOKEN}}
+jobs:
-    result-encoding: string
+  echo-input:
-    script: |
+    runs-on: ubuntu-latest
-      return "I will be string (not JSON) encoded!"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/github-script@v2
+        with:
+          script: |
+            const path = require('path')
+            const scriptPath = path.resolve('./path/to/script.js')
+            console.log(require(scriptPath)({context}))
 ```
+
+And then export a function from your module:
+
+```javascript
+module.exports = ({context}) => {
+  return context.payload.client_payload.value
+}
+```
+
+You can also use async functions in this manner, as long as you `await` it in
+the inline script.
+
+Note that because you can't `require` things like the GitHub context or
+Actions Toolkit libraries, you'll want to pass them as arguments to your
+external function.
+
+Additionally, you'll want to use the [checkout
+action](https://github.com/actions/checkout) to make sure your script file is
+available.

__test__/async-function.test.ts

@@ -1,8 +1,10 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 import {callAsyncFunction} from '../src/async-function'
 
 describe('callAsyncFunction', () => {
   test('calls the function with its arguments', async () => {
-    const result = await callAsyncFunction({foo: 'bar'}, 'return foo')
+    const result = await callAsyncFunction({foo: 'bar'} as any, 'return foo')
     expect(result).toEqual('bar')
   })
 
@@ -10,17 +12,17 @@ describe('callAsyncFunction', () => {
     expect.assertions(1)
 
     try {
-      await callAsyncFunction({}, 'proces')
+      await callAsyncFunction({} as any, 'proces')
     } catch (err) {
       expect(err).toBeInstanceOf(ReferenceError)
     }
   })
 
   test('can access process', async () => {
-    await callAsyncFunction({}, 'process')
+    await callAsyncFunction({} as any, 'process')
   })
 
   test('can access console', async () => {
-    await callAsyncFunction({}, 'console')
+    await callAsyncFunction({} as any, 'console')
   })
 })

docs/development.md

@@ -15,7 +15,8 @@ bash> npm run build
 
 It also has a pre-commit hook configured via
 [husky](https://www.npmjs.com/package/husky) that should run the build script
-before each commit.
+before each commit. Additionally, this hook formats code and lints it, as
+well.
 
 ## Releasing
 

package.json

@@ -1,23 +1,24 @@
 {
   "name": "github-script",
   "description": "A GitHub action for executing a simple script",
-  "version": "0.6.0",
+  "version": "2.0.0",
   "author": "GitHub",
-  "dependencies": {
+  "license": "MIT",
-    "@actions/core": "^1.2.2",
+  "main": "dist/index.js",
-    "@actions/github": "^2.1.1"
+  "private": true,
-  },
+  "scripts": {
-  "devDependencies": {
+    "build": "ncc build src/main.ts",
-    "@types/jest": "^25.1.3",
+    "format:check": "prettier --check src __test__",
-    "@zeit/ncc": "^0.21.1",
+    "format:write": "prettier --write src __test__",
-    "husky": "^4.2.3",
+    "lint": "eslint src __test__",
-    "jest": "^25.1.0",
+    "style:check": "run-p --continue-on-error --aggregate-output format:check lint",
-    "ts-jest": "^25.2.1",
+    "style:write": "run-p --continue-on-error --aggregate-output format:write lint",
-    "typescript": "^3.8.2"
+    "pre-commit": "run-s style:write test build",
+    "test": "jest"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "npm run build && git add dist/"
+      "pre-commit": "npm run pre-commit && git add dist/"
     }
   },
   "jest": {
@@ -33,11 +34,26 @@
       }
     }
   },
-  "license": "MIT",
+  "dependencies": {
-  "main": "dist/index.js",
+    "@actions/core": "^1.2.4",
-  "private": true,
+    "@actions/github": "^3.0.0",
-  "scripts": {
+    "@actions/io": "^1.0.2",
-    "build": "ncc build src/main.ts",
+    "@octokit/core": "^2.5.3",
-    "test": "jest"
+    "@octokit/plugin-paginate-rest": "^2.2.1",
+    "@octokit/plugin-rest-endpoint-methods": "^3.17.0"
+  },
+  "devDependencies": {
+    "@types/jest": "^25.1.4",
+    "@typescript-eslint/eslint-plugin": "^2.33.0",
+    "@typescript-eslint/parser": "^2.33.0",
+    "@zeit/ncc": "^0.22.0",
+    "eslint": "^7.0.0",
+    "eslint-config-prettier": "^6.11.0",
+    "husky": "^4.2.5",
+    "jest": "^25.1.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.0.5",
+    "ts-jest": "^25.2.1",
+    "typescript": "^3.8.3"
   }
 }

src/async-function.ts

@@ -1,11 +1,22 @@
-const AsyncFunction = Object.getPrototypeOf(async () => {}).constructor
+import * as core from '@actions/core'
+import {Context} from '@actions/github/lib/context'
+import {GitHub} from '@actions/github/lib/utils'
+import * as io from '@actions/io'
 
-type AsyncFunctionArguments = {[key: string]: any}
+const AsyncFunction = Object.getPrototypeOf(async () => null).constructor
 
-export function callAsyncFunction(
+type AsyncFunctionArguments = {
+  context: Context
+  core: typeof core
+  github: InstanceType<typeof GitHub>
+  io: typeof io
+  require: NodeRequire
+}
+
+export function callAsyncFunction<T>(
   args: AsyncFunctionArguments,
   source: string
-): Promise<any> {
+): Promise<T> {
   const fn = new AsyncFunction(...Object.keys(args), source)
   return fn(...Object.values(args))
 }

src/main.ts

@@ -1,25 +1,34 @@
 import * as core from '@actions/core'
-import {context, GitHub} from '@actions/github'
+import {context, getOctokit} from '@actions/github'
+import * as io from '@actions/io'
 import {callAsyncFunction} from './async-function'
 
 process.on('unhandledRejection', handleError)
 main().catch(handleError)
 
-async function main() {
+type Options = {
+  log?: Console
+  userAgent?: string
+  previews?: string[]
+}
+
+async function main(): Promise<void> {
   const token = core.getInput('github-token', {required: true})
   const debug = core.getInput('debug')
   const userAgent = core.getInput('user-agent')
   const previews = core.getInput('previews')
-  const opts: {[key: string]: any} = {}
+
+  const opts: Options = {}
   if (debug === 'true') opts.log = console
   if (userAgent != null) opts.userAgent = userAgent
   if (previews != null) opts.previews = previews.split(',')
-  const github = new GitHub(token, opts)
+
+  const github = getOctokit(token, opts)
   const script = core.getInput('script', {required: true})
 
-  // Using property/value shorthand on `require` (e.g. `{require}`) causes compilatin errors.
+  // Using property/value shorthand on `require` (e.g. `{require}`) causes compilation errors.
   const result = await callAsyncFunction(
-    {require: require, github, context},
+    {require: require, github, context, core, io},
     script
   )
 
@@ -42,12 +51,8 @@ async function main() {
   core.setOutput('result', output)
 }
 
-function handleError(err: any) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function handleError(err: any): void {
   console.error(err)
-
+  core.setFailed(`Unhandled error: ${err}`)
-  if (err && err.message) {
-    core.setFailed(err.message)
-  } else {
-    core.setFailed(`Unhandled error: ${err}`)
-  }
 }