atmn 0.0.7 → 0.0.8

package/dist/cli.cjs

@@ -2,24 +2,26 @@
 'use strict';
 
 var commander = require('commander');
-var chalk7 = require('chalk');
+var chalk6 = require('chalk');
 var axios = require('axios');
 var fs = require('fs');
+var prompts = require('@inquirer/prompts');
 var path = require('path');
 var createJiti = require('jiti');
 var url = require('url');
 var child_process = require('child_process');
-var prompts = require('@inquirer/prompts');
 var open = require('open');
+var yoctoSpinner = require('yocto-spinner');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var chalk7__default = /*#__PURE__*/_interopDefault(chalk7);
+var chalk6__default = /*#__PURE__*/_interopDefault(chalk6);
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
 var createJiti__default = /*#__PURE__*/_interopDefault(createJiti);
 var open__default = /*#__PURE__*/_interopDefault(open);
+var yoctoSpinner__default = /*#__PURE__*/_interopDefault(yoctoSpinner);
 
 // ../node_modules/.pnpm/tsup@8.5.0_jiti@2.4.2_postcss@8.5.6_tsx@4.20.3_typescript@5.8.3_yaml@2.8.0/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
@@ -87,27 +89,60 @@ function snakeCaseToCamelCase(value) {
 function idToVar(id) {
   return id.replace(/[-_](.)/g, (_, letter) => letter.toUpperCase()).replace(/^[^a-zA-Z_$]/, "_").replace(/[^a-zA-Z0-9_$]/g, "");
 }
+async function upsertEnvVar(filePath, varName, newValue) {
+  const content = fs__default.default.readFileSync(filePath, "utf-8");
+  const lines = content.split("\n");
+  let found = false;
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i]?.startsWith(`${varName}=`)) {
+      const shouldOverwrite = await prompts.confirm({
+        message: `${varName} already exists in .env. Overwrite?`,
+        default: false
+      });
+      if (shouldOverwrite) {
+        lines[i] = `${varName}=${newValue}`;
+        found = true;
+        break;
+      }
+    }
+  }
+  if (!found) {
+    lines.push(`${varName}=${newValue}`);
+  }
+  fs__default.default.writeFileSync(filePath, lines.join("\n"));
+}
 function storeToEnv(prodKey, sandboxKey) {
   const envPath = `${process.cwd()}/.env`;
-  const envVars = `# AUTUMN_SECRET_KEY=${prodKey}
+  const envLocalPath = `${process.cwd()}/.env.local`;
+  const envVars = `AUTUMN_PROD_SECRET_KEY=${prodKey}
 AUTUMN_SECRET_KEY=${sandboxKey}
 `;
   if (fs__default.default.existsSync(envPath)) {
-    fs__default.default.appendFileSync(envPath, envVars);
-    console.log(chalk7__default.default.green(".env file found. Appended keys."));
+    upsertEnvVar(envPath, "AUTUMN_PROD_SECRET_KEY", prodKey);
+    upsertEnvVar(envPath, "AUTUMN_SECRET_KEY", sandboxKey);
+    console.log(chalk6__default.default.green(".env file found. Updated keys."));
+  } else if (fs__default.default.existsSync(envLocalPath)) {
+    fs__default.default.writeFileSync(envPath, envVars);
+    console.log(chalk6__default.default.green(".env.local found but .env not found. Created new .env file and wrote keys."));
   } else {
     fs__default.default.writeFileSync(envPath, envVars);
-    console.log(chalk7__default.default.green(".env file not found. Created new .env file and wrote keys."));
+    console.log(chalk6__default.default.green("No .env or .env.local file found. Created new .env file and wrote keys."));
   }
 }
 function readFromEnv() {
   const envPath = `${process.cwd()}/.env`;
-  if (!fs__default.default.existsSync(envPath)) {
-    return void 0;
+  const envLocalPath = `${process.cwd()}/.env.local`;
+  if (fs__default.default.existsSync(envPath)) {
+    const envContent = fs__default.default.readFileSync(envPath, "utf-8");
+    const match = envContent.match(/^AUTUMN_SECRET_KEY=(.*)$/m);
+    if (match) return match[1];
   }
-  const envContent = fs__default.default.readFileSync(envPath, "utf-8");
-  const match = envContent.match(/^AUTUMN_SECRET_KEY=(.*)$/m);
-  return match ? match[1] : void 0;
+  if (fs__default.default.existsSync(envLocalPath)) {
+    const envLocalContent = fs__default.default.readFileSync(envLocalPath, "utf-8");
+    const match = envLocalContent.match(/^AUTUMN_SECRET_KEY=(.*)$/m);
+    if (match) return match[1];
+  }
+  return void 0;
 }
 
 // source/core/api.ts
@@ -140,8 +175,8 @@ async function request({
       throw error;
     }
     console.error(
-      chalk7__default.default.red("Error occured when making API request:"),
-      chalk7__default.default.red(error.response.data.message || error.response.data.error)
+      chalk6__default.default.red("Error occured when making API request:"),
+      chalk6__default.default.red(error.response.data.message || error.response.data.error)
     );
     process.exit(1);
   }
@@ -327,7 +362,7 @@ async function installAtmn() {
     default: true
   });
   if (!shouldInstall) {
-    console.log(chalk7__default.default.yellow("Skipping installation. You can install atmn manually with your preferred package manager."));
+    console.log(chalk6__default.default.yellow("Skipping installation. You can install atmn manually with your preferred package manager."));
     return false;
   }
   const packageManager = await prompts.select({
@@ -340,13 +375,13 @@ async function installAtmn() {
     default: "npm"
   });
   try {
-    console.log(chalk7__default.default.blue(`Installing atmn with ${packageManager}...`));
+    console.log(chalk6__default.default.blue(`Installing atmn with ${packageManager}...`));
     const installCommand = packageManager === "npm" ? "npm install atmn" : packageManager === "pnpm" ? "pnpm add atmn" : "bun add atmn";
     child_process.execSync(installCommand, { stdio: "inherit" });
-    console.log(chalk7__default.default.green("atmn installed successfully!"));
+    console.log(chalk6__default.default.green("atmn installed successfully!"));
     return true;
   } catch (error) {
-    console.error(chalk7__default.default.red("Failed to install atmn:"), error);
+    console.error(chalk6__default.default.red("Failed to install atmn:"), error);
     return false;
   }
 }
@@ -382,7 +417,7 @@ function writeConfig(config) {
 
 // source/commands/pull.ts
 async function Pull({ config }) {
-  console.log(chalk7__default.default.green("Pulling products and features from Autumn..."));
+  console.log(chalk6__default.default.green("Pulling products and features from Autumn..."));
   const products = await getAllProducts();
   const features = await getFeatures();
   const productSnippets = products.map(
@@ -407,7 +442,7 @@ ${exportBuilder(
   )}
 	`;
   writeConfig(autumnConfig);
-  console.log(chalk7__default.default.green("Success! Config has been updated."));
+  console.log(chalk6__default.default.green("Success! Config has been updated."));
 }
 
 // source/core/auth.ts
@@ -423,14 +458,14 @@ async function getOTP(otp) {
 var passwordTheme = {
   style: {
     answer: (text) => {
-      return chalk7__default.default.magenta("*".repeat(text.length));
+      return chalk6__default.default.magenta("*".repeat(text.length));
     }
   }
 };
 var inputTheme = {
   style: {
     answer: (text) => {
-      return chalk7__default.default.magenta(text);
+      return chalk6__default.default.magenta(text);
     }
   }
 };
@@ -468,7 +503,7 @@ async function AuthCommand() {
       );
     } else {
       console.log(
-        chalk7__default.default.yellow(
+        chalk6__default.default.yellow(
           "Okay, no worries. Go to the Autumn dashboard when you're ready!"
         )
       );
@@ -476,7 +511,7 @@ async function AuthCommand() {
   }
   storeToEnv(keyInfo.prodKey, keyInfo.sandboxKey);
   console.log(
-    chalk7__default.default.green(
+    chalk6__default.default.green(
       "Success! Keys have been stored locally. You may now use the CLI."
     )
   );
@@ -486,19 +521,19 @@ async function AuthCommand() {
 async function Init({ config }) {
   let apiKey = readFromEnv();
   if (apiKey) {
-    console.log(chalk7__default.default.green("API key found. Pulling latest config..."));
+    console.log(chalk6__default.default.green("API key found. Pulling latest config..."));
     await Pull({ config });
-    console.log(chalk7__default.default.green("Project initialized and config pulled successfully!"));
+    console.log(chalk6__default.default.green("Project initialized and config pulled successfully!"));
     return;
   }
-  console.log(chalk7__default.default.yellow("No API key found. Running authentication..."));
+  console.log(chalk6__default.default.yellow("No API key found. Running authentication..."));
   await AuthCommand();
   apiKey = readFromEnv();
   if (apiKey) {
     await Pull({ config });
-    console.log(chalk7__default.default.green("Project initialized! You are now authenticated and config has been pulled."));
+    console.log(chalk6__default.default.green("Project initialized! You are now authenticated and config has been pulled."));
   } else {
-    console.log(chalk7__default.default.red("Authentication did not yield an API key. Please check your setup."));
+    console.log(chalk6__default.default.red("Authentication did not yield an API key. Please check your setup."));
   }
 }
 
@@ -570,6 +605,13 @@ async function upsertProduct(product) {
 }
 
 // source/commands/push.ts
+var spinner = (message) => {
+  const spinner2 = yoctoSpinner__default.default({
+    text: message
+  });
+  spinner2.start();
+  return spinner2;
+};
 async function Push({
   config,
   yes,
@@ -585,42 +627,44 @@ async function Push({
       message: `Delete product [${productId}]?`
     });
     if (shouldDelete) {
+      const s = spinner(`Deleting product [${productId}]`);
       await deleteProduct(productId);
-      console.log(chalk7__default.default.green(`Product [${productId}] deleted successfully!`));
+      s.success(`Product [${productId}] deleted successfully!`);
     }
   }
   for (let feature of features) {
-    console.log(chalk7__default.default.green(`Pushing feature [${feature.id}]`));
+    const s = spinner(`Pushing feature [${feature.id}]`);
     await upsertFeature(feature);
-    console.log(chalk7__default.default.green(`Pushed feature [${feature.id}]`));
+    s.success(`Pushed feature [${feature.id}]`);
   }
   for (let product of products) {
-    console.log(chalk7__default.default.green(`Pushing product [${product.id}]`));
+    const s = spinner(`Pushing product [${product.id}]`);
     await upsertProduct(product);
-    console.log(chalk7__default.default.green(`Pushed product [${product.id}]`));
+    s.success(`Pushed product [${product.id}]`);
   }
   for (let featureId of featuresToDelete) {
     let shouldDelete = yes || await prompts.confirm({
       message: `Delete feature [${featureId}]?`
     });
     if (shouldDelete) {
+      const s = spinner(`Deleting feature [${featureId}]`);
       await deleteFeature(featureId);
-      console.log(chalk7__default.default.green(`Feature [${featureId}] deleted successfully!`));
+      s.success(`Feature [${featureId}] deleted successfully!`);
     }
   }
   const env = prod ? "prod" : "sandbox";
   console.log(
-    chalk7__default.default.magentaBright(`Success! Changes have been pushed to ${env}.`)
+    chalk6__default.default.magentaBright(`Success! Changes have been pushed to ${env}.`)
   );
   if (prod) {
     console.log(
-      chalk7__default.default.magentaBright(
+      chalk6__default.default.magentaBright(
         `You can view the products at ${FRONTEND_URL}/products`
       )
     );
   } else {
     console.log(
-      chalk7__default.default.magentaBright(
+      chalk6__default.default.magentaBright(
         `You can view the products at ${FRONTEND_URL}/sandbox/products`
       )
     );
@@ -647,6 +691,6 @@ commander.program.command("dashboard").description("Open the Autumn dashboard in
   open__default.default(`${FRONTEND_URL}`);
 });
 commander.program.command("version").description("Show the version of Autumn").action(() => {
-  console.log(chalk7__default.default.green(`Autumn v${VERSION}`));
+  console.log(chalk6__default.default.green(`Autumn v${VERSION}`));
 });
 commander.program.parse();

package/dist/cli.js

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
 import { program } from 'commander';
-import chalk7 from 'chalk';
+import chalk6 from 'chalk';
 import axios from 'axios';
 import fs from 'fs';
+import { confirm, input, password, select } from '@inquirer/prompts';
 import path, { resolve } from 'path';
 import createJiti from 'jiti';
 import { pathToFileURL } from 'url';
 import { execSync } from 'child_process';
-import { confirm, input, password, select } from '@inquirer/prompts';
 import open from 'open';
+import yoctoSpinner from 'yocto-spinner';
 
 // source/constants.ts
 var FRONTEND_URL = "http://app.useautumn.com";
@@ -72,27 +73,60 @@ function snakeCaseToCamelCase(value) {
 function idToVar(id) {
   return id.replace(/[-_](.)/g, (_, letter) => letter.toUpperCase()).replace(/^[^a-zA-Z_$]/, "_").replace(/[^a-zA-Z0-9_$]/g, "");
 }
+async function upsertEnvVar(filePath, varName, newValue) {
+  const content = fs.readFileSync(filePath, "utf-8");
+  const lines = content.split("\n");
+  let found = false;
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i]?.startsWith(`${varName}=`)) {
+      const shouldOverwrite = await confirm({
+        message: `${varName} already exists in .env. Overwrite?`,
+        default: false
+      });
+      if (shouldOverwrite) {
+        lines[i] = `${varName}=${newValue}`;
+        found = true;
+        break;
+      }
+    }
+  }
+  if (!found) {
+    lines.push(`${varName}=${newValue}`);
+  }
+  fs.writeFileSync(filePath, lines.join("\n"));
+}
 function storeToEnv(prodKey, sandboxKey) {
   const envPath = `${process.cwd()}/.env`;
-  const envVars = `# AUTUMN_SECRET_KEY=${prodKey}
+  const envLocalPath = `${process.cwd()}/.env.local`;
+  const envVars = `AUTUMN_PROD_SECRET_KEY=${prodKey}
 AUTUMN_SECRET_KEY=${sandboxKey}
 `;
   if (fs.existsSync(envPath)) {
-    fs.appendFileSync(envPath, envVars);
-    console.log(chalk7.green(".env file found. Appended keys."));
+    upsertEnvVar(envPath, "AUTUMN_PROD_SECRET_KEY", prodKey);
+    upsertEnvVar(envPath, "AUTUMN_SECRET_KEY", sandboxKey);
+    console.log(chalk6.green(".env file found. Updated keys."));
+  } else if (fs.existsSync(envLocalPath)) {
+    fs.writeFileSync(envPath, envVars);
+    console.log(chalk6.green(".env.local found but .env not found. Created new .env file and wrote keys."));
   } else {
     fs.writeFileSync(envPath, envVars);
-    console.log(chalk7.green(".env file not found. Created new .env file and wrote keys."));
+    console.log(chalk6.green("No .env or .env.local file found. Created new .env file and wrote keys."));
   }
 }
 function readFromEnv() {
   const envPath = `${process.cwd()}/.env`;
-  if (!fs.existsSync(envPath)) {
-    return void 0;
+  const envLocalPath = `${process.cwd()}/.env.local`;
+  if (fs.existsSync(envPath)) {
+    const envContent = fs.readFileSync(envPath, "utf-8");
+    const match = envContent.match(/^AUTUMN_SECRET_KEY=(.*)$/m);
+    if (match) return match[1];
   }
-  const envContent = fs.readFileSync(envPath, "utf-8");
-  const match = envContent.match(/^AUTUMN_SECRET_KEY=(.*)$/m);
-  return match ? match[1] : void 0;
+  if (fs.existsSync(envLocalPath)) {
+    const envLocalContent = fs.readFileSync(envLocalPath, "utf-8");
+    const match = envLocalContent.match(/^AUTUMN_SECRET_KEY=(.*)$/m);
+    if (match) return match[1];
+  }
+  return void 0;
 }
 
 // source/core/api.ts
@@ -125,8 +159,8 @@ async function request({
       throw error;
     }
     console.error(
-      chalk7.red("Error occured when making API request:"),
-      chalk7.red(error.response.data.message || error.response.data.error)
+      chalk6.red("Error occured when making API request:"),
+      chalk6.red(error.response.data.message || error.response.data.error)
     );
     process.exit(1);
   }
@@ -312,7 +346,7 @@ async function installAtmn() {
     default: true
   });
   if (!shouldInstall) {
-    console.log(chalk7.yellow("Skipping installation. You can install atmn manually with your preferred package manager."));
+    console.log(chalk6.yellow("Skipping installation. You can install atmn manually with your preferred package manager."));
     return false;
   }
   const packageManager = await select({
@@ -325,13 +359,13 @@ async function installAtmn() {
     default: "npm"
   });
   try {
-    console.log(chalk7.blue(`Installing atmn with ${packageManager}...`));
+    console.log(chalk6.blue(`Installing atmn with ${packageManager}...`));
     const installCommand = packageManager === "npm" ? "npm install atmn" : packageManager === "pnpm" ? "pnpm add atmn" : "bun add atmn";
     execSync(installCommand, { stdio: "inherit" });
-    console.log(chalk7.green("atmn installed successfully!"));
+    console.log(chalk6.green("atmn installed successfully!"));
     return true;
   } catch (error) {
-    console.error(chalk7.red("Failed to install atmn:"), error);
+    console.error(chalk6.red("Failed to install atmn:"), error);
     return false;
   }
 }
@@ -367,7 +401,7 @@ function writeConfig(config) {
 
 // source/commands/pull.ts
 async function Pull({ config }) {
-  console.log(chalk7.green("Pulling products and features from Autumn..."));
+  console.log(chalk6.green("Pulling products and features from Autumn..."));
   const products = await getAllProducts();
   const features = await getFeatures();
   const productSnippets = products.map(
@@ -392,7 +426,7 @@ ${exportBuilder(
   )}
 	`;
   writeConfig(autumnConfig);
-  console.log(chalk7.green("Success! Config has been updated."));
+  console.log(chalk6.green("Success! Config has been updated."));
 }
 
 // source/core/auth.ts
@@ -408,14 +442,14 @@ async function getOTP(otp) {
 var passwordTheme = {
   style: {
     answer: (text) => {
-      return chalk7.magenta("*".repeat(text.length));
+      return chalk6.magenta("*".repeat(text.length));
     }
   }
 };
 var inputTheme = {
   style: {
     answer: (text) => {
-      return chalk7.magenta(text);
+      return chalk6.magenta(text);
     }
   }
 };
@@ -453,7 +487,7 @@ async function AuthCommand() {
       );
     } else {
       console.log(
-        chalk7.yellow(
+        chalk6.yellow(
           "Okay, no worries. Go to the Autumn dashboard when you're ready!"
         )
       );
@@ -461,7 +495,7 @@ async function AuthCommand() {
   }
   storeToEnv(keyInfo.prodKey, keyInfo.sandboxKey);
   console.log(
-    chalk7.green(
+    chalk6.green(
       "Success! Keys have been stored locally. You may now use the CLI."
     )
   );
@@ -471,19 +505,19 @@ async function AuthCommand() {
 async function Init({ config }) {
   let apiKey = readFromEnv();
   if (apiKey) {
-    console.log(chalk7.green("API key found. Pulling latest config..."));
+    console.log(chalk6.green("API key found. Pulling latest config..."));
     await Pull({ config });
-    console.log(chalk7.green("Project initialized and config pulled successfully!"));
+    console.log(chalk6.green("Project initialized and config pulled successfully!"));
     return;
   }
-  console.log(chalk7.yellow("No API key found. Running authentication..."));
+  console.log(chalk6.yellow("No API key found. Running authentication..."));
   await AuthCommand();
   apiKey = readFromEnv();
   if (apiKey) {
     await Pull({ config });
-    console.log(chalk7.green("Project initialized! You are now authenticated and config has been pulled."));
+    console.log(chalk6.green("Project initialized! You are now authenticated and config has been pulled."));
   } else {
-    console.log(chalk7.red("Authentication did not yield an API key. Please check your setup."));
+    console.log(chalk6.red("Authentication did not yield an API key. Please check your setup."));
   }
 }
 
@@ -555,6 +589,13 @@ async function upsertProduct(product) {
 }
 
 // source/commands/push.ts
+var spinner = (message) => {
+  const spinner2 = yoctoSpinner({
+    text: message
+  });
+  spinner2.start();
+  return spinner2;
+};
 async function Push({
   config,
   yes,
@@ -570,42 +611,44 @@ async function Push({
       message: `Delete product [${productId}]?`
     });
     if (shouldDelete) {
+      const s = spinner(`Deleting product [${productId}]`);
       await deleteProduct(productId);
-      console.log(chalk7.green(`Product [${productId}] deleted successfully!`));
+      s.success(`Product [${productId}] deleted successfully!`);
     }
   }
   for (let feature of features) {
-    console.log(chalk7.green(`Pushing feature [${feature.id}]`));
+    const s = spinner(`Pushing feature [${feature.id}]`);
     await upsertFeature(feature);
-    console.log(chalk7.green(`Pushed feature [${feature.id}]`));
+    s.success(`Pushed feature [${feature.id}]`);
   }
   for (let product of products) {
-    console.log(chalk7.green(`Pushing product [${product.id}]`));
+    const s = spinner(`Pushing product [${product.id}]`);
     await upsertProduct(product);
-    console.log(chalk7.green(`Pushed product [${product.id}]`));
+    s.success(`Pushed product [${product.id}]`);
   }
   for (let featureId of featuresToDelete) {
     let shouldDelete = yes || await confirm({
       message: `Delete feature [${featureId}]?`
     });
     if (shouldDelete) {
+      const s = spinner(`Deleting feature [${featureId}]`);
       await deleteFeature(featureId);
-      console.log(chalk7.green(`Feature [${featureId}] deleted successfully!`));
+      s.success(`Feature [${featureId}] deleted successfully!`);
     }
   }
   const env = prod ? "prod" : "sandbox";
   console.log(
-    chalk7.magentaBright(`Success! Changes have been pushed to ${env}.`)
+    chalk6.magentaBright(`Success! Changes have been pushed to ${env}.`)
   );
   if (prod) {
     console.log(
-      chalk7.magentaBright(
+      chalk6.magentaBright(
         `You can view the products at ${FRONTEND_URL}/products`
       )
     );
   } else {
     console.log(
-      chalk7.magentaBright(
+      chalk6.magentaBright(
         `You can view the products at ${FRONTEND_URL}/sandbox/products`
       )
     );
@@ -632,6 +675,6 @@ program.command("dashboard").description("Open the Autumn dashboard in your brow
   open(`${FRONTEND_URL}`);
 });
 program.command("version").description("Show the version of Autumn").action(() => {
-  console.log(chalk7.green(`Autumn v${VERSION}`));
+  console.log(chalk6.green(`Autumn v${VERSION}`));
 });
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "atmn",
-	"version": "0.0.7",
+	"version": "0.0.8",
 	"license": "MIT",
 	"bin": "dist/cli.js",
 	"main": "dist/index.js",
@@ -28,7 +28,8 @@
 		"dotenv": "^17.2.0",
 		"inquirer": "^12.7.0",
 		"jiti": "^2.4.2",
-		"open": "^10.1.2"
+		"open": "^10.1.2",
+		"yocto-spinner": "^1.0.0"
 	},
 	"devDependencies": {
 		"@sindresorhus/tsconfig": "^3.0.1",
@@ -42,7 +43,7 @@
 		"ink-testing-library": "^3.0.0",
 		"prettier": "^2.8.7",
 		"ts-node": "^10.9.1",
-		"tsup": "^8.4.0",
+		"tsup": "^8.5.0",
 		"typescript": "^5.0.3",
 		"xo": "^0.53.1",
 		"zod": "^3.24.1"