Move main into separate file

KyleMayes · Apr 1, 2024 · 4d97c22 · 4d97c22
1 parent 672fbb5
commit 4d97c22
Show file tree

Hide file tree

Showing 7 changed files with 6,479 additions and 6,556 deletions.
diff --git a/action.yml b/action.yml
@@ -37,4 +37,4 @@ outputs:
 
 runs:
   using: "node20"
-  main: "dist/index.js"
+  main: "dist/main.js"
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/index.js → dist/main.js b/dist/index.js → dist/main.js
diff --git a/dist/main.js.map b/dist/main.js.map
diff --git a/index.ts b/index.ts
@@ -18,7 +18,7 @@ export interface Options {
   env: boolean;
 }
 
-function getOptions(): Options {
+export function getOptions(): Options {
   return {
     version: core.getInput("version"),
     arch: core.getInput("arch"),
@@ -62,7 +62,7 @@ export function getAsset(os: string, options: Options): Asset {
     return { specificVersion: options.version, url: options.forceUrl };
   }
 
-  const arch = options.arch ?? process.arch;
+  const arch = (options.arch ?? process.arch) || "x64";
   console.log(`Checking known assets (os=${os}, arch=${arch}, version=${options.version})...`);
 
   const assets = ASSETS[os]?.[arch];
@@ -120,7 +120,7 @@ async function install(options: Options): Promise<void> {
   core.info(`Install location: ${options.directory}`);
 }
 
-async function run(options: Options): Promise<void> {
+export async function run(options: Options): Promise<void> {
   if (!options.directory) {
     options.directory = process.platform === "win32" ? DEFAULT_WIN32_DIRECTORY : DEFAULT_NIX_DIRECTORY;
   }
@@ -150,16 +150,3 @@ async function run(options: Options): Promise<void> {
     core.exportVariable("CXX", path.join(options.directory, "bin", "clang++"));
   }
 }
-
-async function main() {
-  try {
-    await run(getOptions());
-  } catch (error: any) {
-    console.error(error.stack);
-    core.setFailed(error.message);
-  }
-}
-
-if (require.main === module) {
-  main();
-}
diff --git a/main.ts b/main.ts
@@ -0,0 +1,15 @@
+import * as core from "@actions/core";
+
+import { getOptions, run } from "./index";
+
+async function main() {
+  try {
+    await run(getOptions());
+  } catch (error: any) {
+    console.error(error.stack);
+    core.setFailed(error.message);
+  }
+}
+
+console.log("hello");
+main();
diff --git a/package.json b/package.json
@@ -4,11 +4,11 @@
   "description": "A GitHub Action for downloading and installing LLVM and Clang binaries.",
   "author": "Kyle Mayes <kyle@mayeses.com>",
   "license": "Apache-2.0",
-  "main": "dist/index.js",
+  "main": "dist/main.js",
   "scripts": {
     "format": "prettier --write *.ts",
     "generate": "ts-node generate.ts",
-    "build": "parcel build index.ts",
+    "build": "parcel build main.ts",
     "test": "ts-node test.ts test"
   },
   "dependencies": {