atmn 0.0.7-beta.1 → 0.0.8

package/dist/cli.cjs

@@ -5,11 +5,13 @@ var commander = require('commander');
 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 open = require('open');
-var prompts = require('@inquirer/prompts');
+var yoctoSpinner = require('yocto-spinner');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -19,6 +21,7 @@ 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;
@@ -86,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(chalk6__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(chalk6__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
@@ -307,10 +343,58 @@ export const ${idToVar(feature.id)} = feature({
 })`;
   return snippet;
 }
+function checkAtmnInstalled() {
+  try {
+    const packageJsonPath = path__default.default.join(process.cwd(), "package.json");
+    if (fs__default.default.existsSync(packageJsonPath)) {
+      const packageJson = JSON.parse(fs__default.default.readFileSync(packageJsonPath, "utf-8"));
+      return !!(packageJson.dependencies?.atmn || packageJson.devDependencies?.atmn);
+    }
+    child_process.execSync(`node -e "require.resolve('atmn')"`, { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function installAtmn() {
+  const shouldInstall = await prompts.confirm({
+    message: "The atmn package is not installed. Would you like to install it now?",
+    default: true
+  });
+  if (!shouldInstall) {
+    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({
+    message: "Which package manager would you like to use?",
+    choices: [
+      { name: "npm", value: "npm" },
+      { name: "pnpm", value: "pnpm" },
+      { name: "bun", value: "bun" }
+    ],
+    default: "npm"
+  });
+  try {
+    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(chalk6__default.default.green("atmn installed successfully!"));
+    return true;
+  } catch (error) {
+    console.error(chalk6__default.default.red("Failed to install atmn:"), error);
+    return false;
+  }
+}
 async function loadAutumnConfigFile() {
   const configPath = path__default.default.join(process.cwd(), "autumn.config.ts");
   const absolutePath = path.resolve(configPath);
   const fileUrl = url.pathToFileURL(absolutePath).href;
+  if (!checkAtmnInstalled()) {
+    const installed = await installAtmn();
+    if (!installed) {
+      throw new Error("atmn package is required but not installed. Please install it manually.");
+    }
+  }
   const jiti = createJiti__default.default(importMetaUrl);
   const mod = await jiti.import(fileUrl);
   const def = mod.default || mod;
@@ -521,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,
@@ -536,27 +627,29 @@ async function Push({
       message: `Delete product [${productId}]?`
     });
     if (shouldDelete) {
+      const s = spinner(`Deleting product [${productId}]`);
       await deleteProduct(productId);
-      console.log(chalk6__default.default.green(`Product [${productId}] deleted successfully!`));
+      s.success(`Product [${productId}] deleted successfully!`);
     }
   }
   for (let feature of features) {
-    console.log(chalk6__default.default.green(`Pushing feature [${feature.id}]`));
+    const s = spinner(`Pushing feature [${feature.id}]`);
     await upsertFeature(feature);
-    console.log(chalk6__default.default.green(`Pushed feature [${feature.id}]`));
+    s.success(`Pushed feature [${feature.id}]`);
   }
   for (let product of products) {
-    console.log(chalk6__default.default.green(`Pushing product [${product.id}]`));
+    const s = spinner(`Pushing product [${product.id}]`);
     await upsertProduct(product);
-    console.log(chalk6__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(chalk6__default.default.green(`Feature [${featureId}] deleted successfully!`));
+      s.success(`Feature [${featureId}] deleted successfully!`);
     }
   }
   const env = prod ? "prod" : "sandbox";

package/dist/cli.js

@@ -3,11 +3,13 @@ import { program } from 'commander';
 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 open from 'open';
-import { confirm, input, password } from '@inquirer/prompts';
+import yoctoSpinner from 'yocto-spinner';
 
 // source/constants.ts
 var FRONTEND_URL = "http://app.useautumn.com";
@@ -71,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(chalk6.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(chalk6.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];
+  }
+  if (fs.existsSync(envLocalPath)) {
+    const envLocalContent = fs.readFileSync(envLocalPath, "utf-8");
+    const match = envLocalContent.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;
+  return void 0;
 }
 
 // source/core/api.ts
@@ -292,10 +327,58 @@ export const ${idToVar(feature.id)} = feature({
 })`;
   return snippet;
 }
+function checkAtmnInstalled() {
+  try {
+    const packageJsonPath = path.join(process.cwd(), "package.json");
+    if (fs.existsSync(packageJsonPath)) {
+      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+      return !!(packageJson.dependencies?.atmn || packageJson.devDependencies?.atmn);
+    }
+    execSync(`node -e "require.resolve('atmn')"`, { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function installAtmn() {
+  const shouldInstall = await confirm({
+    message: "The atmn package is not installed. Would you like to install it now?",
+    default: true
+  });
+  if (!shouldInstall) {
+    console.log(chalk6.yellow("Skipping installation. You can install atmn manually with your preferred package manager."));
+    return false;
+  }
+  const packageManager = await select({
+    message: "Which package manager would you like to use?",
+    choices: [
+      { name: "npm", value: "npm" },
+      { name: "pnpm", value: "pnpm" },
+      { name: "bun", value: "bun" }
+    ],
+    default: "npm"
+  });
+  try {
+    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(chalk6.green("atmn installed successfully!"));
+    return true;
+  } catch (error) {
+    console.error(chalk6.red("Failed to install atmn:"), error);
+    return false;
+  }
+}
 async function loadAutumnConfigFile() {
   const configPath = path.join(process.cwd(), "autumn.config.ts");
   const absolutePath = resolve(configPath);
   const fileUrl = pathToFileURL(absolutePath).href;
+  if (!checkAtmnInstalled()) {
+    const installed = await installAtmn();
+    if (!installed) {
+      throw new Error("atmn package is required but not installed. Please install it manually.");
+    }
+  }
   const jiti = createJiti(import.meta.url);
   const mod = await jiti.import(fileUrl);
   const def = mod.default || mod;
@@ -506,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,
@@ -521,27 +611,29 @@ async function Push({
       message: `Delete product [${productId}]?`
     });
     if (shouldDelete) {
+      const s = spinner(`Deleting product [${productId}]`);
       await deleteProduct(productId);
-      console.log(chalk6.green(`Product [${productId}] deleted successfully!`));
+      s.success(`Product [${productId}] deleted successfully!`);
     }
   }
   for (let feature of features) {
-    console.log(chalk6.green(`Pushing feature [${feature.id}]`));
+    const s = spinner(`Pushing feature [${feature.id}]`);
     await upsertFeature(feature);
-    console.log(chalk6.green(`Pushed feature [${feature.id}]`));
+    s.success(`Pushed feature [${feature.id}]`);
   }
   for (let product of products) {
-    console.log(chalk6.green(`Pushing product [${product.id}]`));
+    const s = spinner(`Pushing product [${product.id}]`);
     await upsertProduct(product);
-    console.log(chalk6.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(chalk6.green(`Feature [${featureId}] deleted successfully!`));
+      s.success(`Feature [${featureId}] deleted successfully!`);
     }
   }
   const env = prod ? "prod" : "sandbox";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "atmn",
-	"version": "0.0.7-beta.1",
+	"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"