🐛 Fix save file calls (#20)

* 🆙 Update dependencies

* 🐛 Fix `saveCSV` & `saveMarkdown` calls

* 🤘 Rename index.js to action.js

* 🤖 Sort scripts alphabetically

Author: stoe

index.js renamed to action.js

@@ -12,7 +12,7 @@ import FindActionUses from '@stoe/action-uses-cli/utils/action-uses'
     const csv = getInput('csv', {required: false}) || ''
     const md = getInput('md', {required: false}) || ''
     const exclude = getBooleanInput('exclude', {required: false}) || false
-    const unique = getInput('unique', {required: false}) || false
+    const _unique = getInput('unique', {required: false}) || false
     const pushToRepo = getBooleanInput('push_results_to_repo', {required: false}) || false
 
     if (!(enterprise || owner)) {
@@ -23,7 +23,7 @@ import FindActionUses from '@stoe/action-uses-cli/utils/action-uses'
       throw new Error('Can only use one of: enterprise, owner')
     }
 
-    const uniqueFlag = unique === 'both' ? 'both' : unique === 'true'
+    const uniqueFlag = _unique === 'both' ? 'both' : _unique === 'true'
     if (![true, false, 'both'].includes(uniqueFlag)) {
       throw new Error('Please provide a valid value for unique: true, false, both')
     }
@@ -46,8 +46,8 @@ import FindActionUses from '@stoe/action-uses-cli/utils/action-uses'
       }
     }
 
-    const fau = new FindActionUses(token, enterprise, owner, null, csv, md, unique, exclude)
-    const actions = await fau.getActionUses(unique)
+    const fau = new FindActionUses(token, enterprise, owner, null, csv, md, uniqueFlag, exclude)
+    const {actions, unique} = await fau.getActionUses(uniqueFlag)
 
     const octokit = await getOctokit(token)
 
@@ -63,61 +63,69 @@ import FindActionUses from '@stoe/action-uses-cli/utils/action-uses'
 
     // Create and save CSV
     if (csv !== '') {
-      const {csv: csvOut, csvUnique: csvUniqueOut} = await fau.saveCsv(actions, unique)
-      const csvPathUnique = `${csv.replace('.csv', '-unique.csv')}`
+      const csvResult = await fau.saveCsv({actions, unique}, uniqueFlag)
 
-      if (pushToRepo) {
-        await pushFileToRepo(octokit, {
-          ...commitOptions,
-          path: csv,
-          message: `Save/Update GitHub Actions usage report (csv)`,
-          content: Buffer.from(csvOut).toString('base64')
-        })
+      if (csvResult !== false) {
+        const {csv: csvOut, csvUnique: csvUniqueOut} = csvResult
+        const csvPathUnique = `${csv.replace('.csv', '-unique.csv')}`
 
-        if (uniqueFlag === 'both') {
+        if (pushToRepo) {
           await pushFileToRepo(octokit, {
             ...commitOptions,
-            path: csvPathUnique,
+            path: csv,
             message: `Save/Update GitHub Actions usage report (csv)`,
-            content: Buffer.from(csvUniqueOut).toString('base64')
+            content: Buffer.from(csvOut).toString('base64')
           })
+
+          if (uniqueFlag === 'both') {
+            await pushFileToRepo(octokit, {
+              ...commitOptions,
+              path: csvPathUnique,
+              message: `Save/Update GitHub Actions usage report (csv)`,
+              content: Buffer.from(csvUniqueOut).toString('base64')
+            })
+          }
         }
-      }
 
-      setOutput('csv_result', csvOut)
+        setOutput('csv_result', csvOut)
 
-      if (uniqueFlag === 'both') {
-        setOutput('csv_resul_unique', csvUniqueOut)
+        if (uniqueFlag === 'both') {
+          setOutput('csv_resul_unique', csvUniqueOut)
+        }
       }
     }
 
     // Create and save markdown
     if (md !== '') {
-      const {md: mdOut, mdUnique: mdUniqueOut} = await fau.saveMarkdown(actions, unique)
-      const mdPathUnique = `${md.replace('.md', '-unique.md')}`
+      const mdResult = await fau.saveMarkdown({actions, unique}, uniqueFlag)
 
-      if (pushToRepo) {
-        await pushFileToRepo(octokit, {
-          ...commitOptions,
-          path: md,
-          message: `Save/Update GitHub Actions usage report (md)`,
-          content: Buffer.from(mdOut).toString('base64')
-        })
+      if (mdResult !== false) {
+        const {md: mdOut, mdUnique: mdUniqueOut} = mdResult
+        const mdPathUnique = `${md.replace('.md', '-unique.md')}`
 
-        if (uniqueFlag === 'both') {
+        if (pushToRepo) {
           await pushFileToRepo(octokit, {
             ...commitOptions,
-            path: mdPathUnique,
+            path: md,
             message: `Save/Update GitHub Actions usage report (md)`,
-            content: Buffer.from(mdUniqueOut).toString('base64')
+            content: Buffer.from(mdOut).toString('base64')
           })
+
+          if (uniqueFlag === 'both') {
+            await pushFileToRepo(octokit, {
+              ...commitOptions,
+              path: mdPathUnique,
+              message: `Save/Update GitHub Actions usage report (md)`,
+              content: Buffer.from(mdUniqueOut).toString('base64')
+            })
+          }
         }
-      }
 
-      setOutput('md_result', mdOut)
+        setOutput('md_result', mdOut)
 
-      if (uniqueFlag === 'both') {
-        setOutput('md_result_unique', mdUniqueOut)
+        if (uniqueFlag === 'both') {
+          setOutput('md_result_unique', mdUniqueOut)
+        }
       }
     }
 

dist/index.js

@@ -21,14 +21,14 @@
     "node": ">=16",
     "npm": ">=8"
   },
-  "main": "index.js",
+  "main": "action.js",
   "scripts": {
-    "build": "npx @vercel/ncc build index.js --out dist --license licenses.txt --quiet --minify",
+    "build": "npx @vercel/ncc build action.js --out dist --license licenses.txt --quiet --minify",
     "format": "npx prettier --config-precedence prefer-file --write . && eslint . --fix",
     "prebuild": "rimraf dist",
+    "prepare": "husky install ./.github/husky",
     "pretest": "npx eslint-config-prettier .eslintrc.json",
-    "test": "eslint .",
-    "prepare": "husky install ./.github/husky"
+    "test": "eslint ."
   },
   "dependencies": {
     "@actions/core": "^1.6.0",