input refactoring

src/input.ts

@@ -24,9 +24,6 @@ function getList(name: string): string[] | undefined {
     .split('\n')
     .map((v) => v.trim())
     .filter((v) => v.length > 0);
-  if (values.length <= 0) {
-    return undefined;
-  }
 
   return values;
 }
@@ -82,40 +79,42 @@ function getLevel(): Level {
   return level;
 }
 
-const android = getBoolean('android');
-const debug = getBoolean('debug');
-const disabledRules = getList('disabled_rules');
-const format = getBoolean('format');
-const limit = getNumber('limit');
-const relative = getBoolean('relative');
-const reporter = getList('reporter');
-const ruleset = getString('ruleset');
-const verbose = getBoolean('verbose');
-const editorconfig = getString('editorconfig');
-const experimental = getBoolean('experimental');
-const baseline = getString('baseline');
-const patterns = getList('patterns');
-
-const ktlintVersion = getKtlintVersion();
-const level = getLevel();
-
-const input: Input = {
-  ktlintVersion,
-  level,
-
-  android,
-  debug,
-  disabledRules,
-  format,
-  limit,
-  relative,
-  reporter,
-  ruleset,
-  verbose,
-  editorconfig,
-  experimental,
-  baseline,
-  patterns,
-};
-
-export = input;
+function parseInput(): Input {
+  const android = getBoolean('android');
+  const debug = getBoolean('debug');
+  const disabledRules = getList('disabled_rules');
+  const format = getBoolean('format');
+  const limit = getNumber('limit');
+  const relative = getBoolean('relative');
+  const reporter = getList('reporter');
+  const ruleset = getString('ruleset');
+  const verbose = getBoolean('verbose');
+  const editorconfig = getString('editorconfig');
+  const experimental = getBoolean('experimental');
+  const baseline = getString('baseline');
+  const patterns = getList('patterns');
+
+  const ktlintVersion = getKtlintVersion();
+  const level = getLevel();
+
+  return {
+    ktlintVersion,
+    level,
+
+    android,
+    debug,
+    disabledRules,
+    format,
+    limit,
+    relative,
+    reporter,
+    ruleset,
+    verbose,
+    editorconfig,
+    experimental,
+    baseline,
+    patterns,
+  };
+}
+
+export {parseInput};

src/main.ts

@@ -1,6 +1,6 @@
 import * as core from '@actions/core';
 import {exec} from '@actions/exec';
-import input from './input';
+import {parseInput} from './input';
 import {install as installLinter} from './setup-linter';
 import {install as installReporter} from './setup-reporter';
 import {buildArguments} from './linter';
@@ -26,4 +26,4 @@ async function check(input: Input) {
   await exec('ktlint', args);
 }
 
-check(input).catch(core.setFailed);
+check(parseInput()).catch(core.setFailed);

src/tool-provisioner.ts

@@ -1,5 +1,5 @@
-import * as path from 'path';
 import * as tc from '@actions/tool-cache';
+import * as path from 'path';
 import {Tool} from './types';
 
 function createTool(
@@ -17,19 +17,28 @@ function createTool(
   };
 }
 
-async function getOrDownload(
+async function findOrDownload(
   name: string,
   version: string,
   downloadUrl: string,
   fileName: string,
-): Promise<Tool> {
-  let path = tc.find(name, version);
-
-  if (!path) {
-    const downloadedFile = await tc.downloadTool(downloadUrl);
-    path = await tc.cacheFile(downloadedFile, fileName, name, version);
+): Promise<string> {
+  const path = tc.find(name, version);
+  if (path) {
+    return path;
   }
 
+  const downloadedFile = await tc.downloadTool(downloadUrl);
+  return await tc.cacheFile(downloadedFile, fileName, name, version);
+}
+
+async function getOrDownload(
+  name: string,
+  version: string,
+  downloadUrl: string,
+  fileName: string,
+): Promise<Tool> {
+  const path = await findOrDownload(name, version, downloadUrl, fileName);
   return createTool(name, path, version, fileName);
 }