@tanagram/cli 0.1.20 → 0.1.21

package/install.js

@@ -6,48 +6,87 @@ const path = require('path');
 const os = require('os');
 
 const GO_VERSION = '1.21.0';
+const GO_CACHE_DIR = path.join(os.homedir(), '.tanagram', `go-${GO_VERSION}`);
 
-// Build binary using go-bin
-async function buildWithGoBin() {
-  const platform = os.platform();
-  const arch = os.arch();
-  const goos = platform === 'win32' ? 'windows' : platform;
-  const goarch = arch === 'x64' ? 'amd64' : arch === 'arm64' ? 'arm64' : arch;
-  const binaryName = platform === 'win32' ? 'tanagram.exe' : 'tanagram';
-  const binaryPath = path.join(__dirname, 'bin', binaryName);
+// Check if Go is already installed locally
+function checkLocalGo() {
+  try {
+    const version = execSync('go version', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] });
+    console.log(`✓ Found local Go: ${version.trim()}`);
+    return 'go';
+  } catch (error) {
+    return null;
+  }
+}
 
-  const binDir = path.join(__dirname, 'bin');
-  if (!fs.existsSync(binDir)) {
-    fs.mkdirSync(binDir, { recursive: true });
+// Check if go-bin was previously cached
+function checkCachedGo() {
+  const cachedGoPath = path.join(GO_CACHE_DIR, 'bin', 'go');
+  if (fs.existsSync(cachedGoPath)) {
+    console.log(`✓ Using cached Go from ${GO_CACHE_DIR}`);
+    return cachedGoPath;
   }
+  return null;
+}
 
-  console.log('📦 Installing Go compiler via npm...');
+// Download and cache Go using go-bin
+async function downloadGo() {
+  console.log('📦 Downloading Go compiler via npm...');
 
   try {
-    // Install Go using go-bin
-    // Use require.resolve to find go-bin in node_modules
+    // Load go-bin
     let goBin;
     try {
       goBin = require('go-bin');
     } catch (err) {
-      // Fallback: try to require from parent node_modules
       const parentPath = path.join(__dirname, '..', '..', 'go-bin');
       goBin = require(parentPath);
     }
-    const goDir = await goBin({ version: GO_VERSION, dir: __dirname });
-    const goPath = path.join(goDir, 'bin', 'go');
 
-    console.log('🔧 Building Tanagram CLI...');
+    // Create cache directory
+    const cacheParent = path.dirname(GO_CACHE_DIR);
+    if (!fs.existsSync(cacheParent)) {
+      fs.mkdirSync(cacheParent, { recursive: true });
+    }
+
+    // Download Go to cache
+    const goDir = await goBin({
+      version: GO_VERSION,
+      dir: cacheParent,
+      includeTag: true
+    });
+
+    console.log(`✓ Go cached at ${goDir}`);
+    return path.join(goDir, 'bin', 'go');
+  } catch (error) {
+    throw new Error(`Failed to download Go: ${error.message}`);
+  }
+}
 
-    // Build the binary using the downloaded Go
-    execSync(`"${goPath}" build -o "${binaryPath}" .`, {
+// Build the binary
+function buildBinary(goCommand) {
+  const platform = os.platform();
+  const arch = os.arch();
+  const goos = platform === 'win32' ? 'windows' : platform;
+  const goarch = arch === 'x64' ? 'amd64' : arch === 'arm64' ? 'arm64' : arch;
+  const binaryName = platform === 'win32' ? 'tanagram.exe' : 'tanagram';
+  const binaryPath = path.join(__dirname, 'bin', binaryName);
+
+  const binDir = path.join(__dirname, 'bin');
+  if (!fs.existsSync(binDir)) {
+    fs.mkdirSync(binDir, { recursive: true });
+  }
+
+  console.log('🔧 Building Tanagram CLI...');
+
+  try {
+    execSync(`"${goCommand}" build -o "${binaryPath}" .`, {
       cwd: __dirname,
       stdio: 'inherit',
       env: {
         ...process.env,
         GOOS: goos,
-        GOARCH: goarch,
-        GOROOT: goDir
+        GOARCH: goarch
       }
     });
 
@@ -55,29 +94,35 @@ async function buildWithGoBin() {
       fs.chmodSync(binaryPath, '755');
     }
 
-    // Clean up Go installation
-    console.log('🧹 Cleaning up...');
-    fs.rmSync(goDir, { recursive: true, force: true });
-
     console.log('✓ Tanagram CLI installed successfully');
     return true;
   } catch (error) {
-    console.error('Failed to build with go-bin:', error.message);
-    return false;
+    throw new Error(`Build failed: ${error.message}`);
   }
 }
 
 // Main installation flow
 (async () => {
   try {
-    const built = await buildWithGoBin();
-    if (!built) {
-      console.error('\n❌ Installation failed');
-      process.exit(1);
+    // 1. Check if Go is already installed locally
+    let goCommand = checkLocalGo();
+
+    // 2. If not, check if we have a cached go-bin download
+    if (!goCommand) {
+      goCommand = checkCachedGo();
+    }
+
+    // 3. If still no Go, download via go-bin and cache it
+    if (!goCommand) {
+      goCommand = await downloadGo();
     }
+
+    // 4. Build the binary
+    buildBinary(goCommand);
+
     process.exit(0);
   } catch (error) {
-    console.error('Installation error:', error.message);
+    console.error('\n❌ Installation failed:', error.message);
     process.exit(1);
   }
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanagram/cli",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Tanagram - Catch sloppy code before it ships",
   "main": "index.js",
   "bin": {