optikit 1.2.5 → 1.4.0

package/src/commands/project/setup.ts

@@ -1,21 +1,23 @@
 import fs from "fs";
 import path from "path";
 import { LoggerHelpers } from "../../utils/services/logger.js";
+import { validateFlutterProject } from "../../utils/validators/validation.js";
+import { handleCommandError } from "../../utils/helpers/error.js";
+import { VSCODE_SETTINGS_TEMPLATE, PROJECT_PATHS } from "../../constants.js";
 
 export {
   createVscodeSettings,
 };
 
-/**
- * Creates a .vscode directory (if it doesn't exist) and writes a settings.json file
- * with recommended Flutter configuration. The Flutter SDK path is set to ".fvm/flutter_sdk".
- */
-async function createVscodeSettings(){
+async function createVscodeSettings() {
+  if (!validateFlutterProject()) {
+    process.exit(1);
+  }
+
   try {
-    const vscodeDir = path.join(process.cwd(), ".vscode");
-    const settingsPath = path.join(vscodeDir, "settings.json");
+    const vscodeDir = path.join(process.cwd(), PROJECT_PATHS.VSCODE_DIR);
+    const settingsPath = path.join(process.cwd(), PROJECT_PATHS.VSCODE_SETTINGS);
 
-    // Create the .vscode folder using Node.js fs (cross-platform)
     if (!fs.existsSync(vscodeDir)) {
       fs.mkdirSync(vscodeDir, { recursive: true });
       LoggerHelpers.success("Created .vscode directory.");
@@ -23,28 +25,9 @@ async function createVscodeSettings(){
       LoggerHelpers.info(".vscode directory already exists.");
     }
 
-    // Define the settings object
-    const settings = {
-      "dart.flutterSdkPath": ".fvm/flutter_sdk",
-      "editor.formatOnSave": true,
-      "dart.previewFlutterUiGuides": true,
-      "files.exclude": {
-        "**/.git": true,
-        "**/.DS_Store": true,
-        "**/node_modules": true,
-        "**/build": true
-      }
-    };
-
-    // Write settings.json using Node.js fs
-    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), "utf8");
+    fs.writeFileSync(settingsPath, JSON.stringify(VSCODE_SETTINGS_TEMPLATE, null, 2), "utf8");
     LoggerHelpers.success("Created .vscode/settings.json with Flutter configuration.");
   } catch (error) {
-    if (error instanceof Error) {
-      LoggerHelpers.error(`Error while creating VSCode settings: ${error.message}`);
-    } else {
-      LoggerHelpers.error(`Error while creating VSCode settings: ${error}`);
-    }
-    process.exit(1);
+    handleCommandError(error, "Error creating VSCode settings");
   }
-} 
+}

package/src/commands/project/status.ts

@@ -0,0 +1,72 @@
+import fs from "fs";
+import path from "path";
+import chalk from "chalk";
+import { getCurrentVersion, formatVersion, getCurrentIosBuildNumber } from "../../utils/helpers/version.js";
+import { getConfigPath } from "../../utils/services/config.js";
+import { validateFlutterProject } from "../../utils/validators/validation.js";
+import { PROJECT_PATHS, BACKUP_CONFIG } from "../../constants.js";
+
+export { showStatus };
+
+async function showStatus(): Promise<void> {
+  console.log(chalk.bold("\nOptiKit Status"));
+  console.log(chalk.gray("─".repeat(45)));
+
+  // Version info
+  if (validateFlutterProject(true)) {
+    try {
+      const current = getCurrentVersion();
+      const iosBuild = getCurrentIosBuildNumber();
+      console.log(chalk.cyan("\n  Version:"), chalk.white.bold(formatVersion(current)));
+      console.log(chalk.gray("    Android Build:"), chalk.white(current.buildNumber));
+      console.log(chalk.gray("    iOS Build:"), chalk.white(iosBuild));
+    } catch {
+      console.log(chalk.yellow("\n  Version:"), chalk.gray("Unable to read"));
+    }
+  } else {
+    console.log(chalk.yellow("\n  Version:"), chalk.gray("Not a Flutter project"));
+  }
+
+  // FVM status
+  const fvmPath = path.join(process.cwd(), PROJECT_PATHS.FVM_FLUTTER_SDK);
+  const useFvm = fs.existsSync(fvmPath);
+  console.log(chalk.cyan("  Flutter:"), chalk.white(useFvm ? "FVM" : "Global SDK"));
+
+  // Backup count
+  const backupCount = countBackups(process.cwd());
+  console.log(chalk.cyan("  Backups:"), chalk.white(backupCount > 0 ? `${backupCount} file(s)` : "None"));
+
+  // Config
+  const configPath = getConfigPath();
+  console.log(chalk.cyan("  Config:"), chalk.white(configPath ?? "Not initialized (run: optikit init)"));
+
+  // Project structure
+  const hasIos = fs.existsSync(path.join(process.cwd(), PROJECT_PATHS.IOS_DIR));
+  const hasAndroid = fs.existsSync(path.join(process.cwd(), PROJECT_PATHS.ANDROID_DIR));
+  const platforms = [hasIos ? "iOS" : null, hasAndroid ? "Android" : null].filter(Boolean).join(", ");
+  console.log(chalk.cyan("  Platforms:"), chalk.white(platforms || "None detected"));
+
+  console.log(chalk.gray("\n" + "─".repeat(45) + "\n"));
+}
+
+function countBackups(dir: string): number {
+  let count = 0;
+
+  function search(currentDir: string): void {
+    try {
+      const entries = fs.readdirSync(currentDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory()) {
+          if (entry.name === BACKUP_CONFIG.DIR_NAME) {
+            count += fs.readdirSync(path.join(currentDir, entry.name)).length;
+          } else if (!entry.name.startsWith(".") && entry.name !== "node_modules") {
+            search(path.join(currentDir, entry.name));
+          }
+        }
+      }
+    } catch { /* skip inaccessible dirs */ }
+  }
+
+  search(dir);
+  return count;
+}

package/src/commands/version/bump.ts

@@ -1,3 +1,4 @@
+import { createInterface } from "readline";
 import { validateFlutterProject } from "../../utils/validators/validation.js";
 import { LoggerHelpers } from "../../utils/services/logger.js";
 import {
@@ -7,6 +8,7 @@ import {
   getNextBuildNumber,
   getCurrentIosBuildNumber
 } from "../../utils/helpers/version.js";
+import { handleCommandError } from "../../utils/helpers/error.js";
 import { updateFlutterVersion } from "./update.js";
 import chalk from "chalk";
 
@@ -19,23 +21,65 @@ export {
 };
 
 /**
- * Bumps version with semantic versioning (major, minor, patch)
- * Android build number increments with version
- * iOS build number resets to 1 on version change
- *
- * @param type - Type of version bump (major, minor, patch)
+ * Prompts user for confirmation. Returns true if confirmed.
+ * Skips prompt and returns true if skipConfirm is true (--yes flag).
  */
+function confirmAction(message: string, skipConfirm: boolean): Promise<boolean> {
+  if (skipConfirm) return Promise.resolve(true);
+
+  return new Promise((resolve) => {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(chalk.yellow(`${message} (y/n): `), (answer) => {
+      rl.close();
+      resolve(answer.toLowerCase() === "y");
+    });
+  });
+}
+
+/**
+ * Shows a colored diff preview of what will change.
+ */
+function showDiffPreview(
+  oldVersion: string,
+  newVersion: string,
+  oldAndroidBuild: number,
+  newAndroidBuild: number | string,
+  oldIosBuild: number,
+  newIosBuild: number | string
+) {
+  console.log(chalk.cyan("\nFile changes preview:"));
+
+  if (newAndroidBuild !== "") {
+    console.log(chalk.gray("\n  pubspec.yaml:"));
+    console.log(chalk.red(`    - version: ${oldVersion}+${oldAndroidBuild}`));
+    console.log(chalk.green(`    + version: ${newVersion}+${newAndroidBuild}`));
+  }
+
+  if (newIosBuild !== "") {
+    console.log(chalk.gray("\n  project.pbxproj:"));
+    console.log(chalk.red(`    - MARKETING_VERSION = ${oldVersion};`));
+    console.log(chalk.green(`    + MARKETING_VERSION = ${newVersion};`));
+    console.log(chalk.red(`    - CURRENT_PROJECT_VERSION = ${oldIosBuild};`));
+    console.log(chalk.green(`    + CURRENT_PROJECT_VERSION = ${newIosBuild};`));
+  }
+
+  console.log();
+}
+
 async function bumpVersion(
-  type: 'major' | 'minor' | 'patch'
+  type: 'major' | 'minor' | 'patch',
+  skipConfirm: boolean = false
 ): Promise<void> {
-  // Pre-flight validation
   if (!validateFlutterProject()) {
     process.exit(1);
   }
 
   try {
     const current = getCurrentVersion();
+    const currentIosBuild = getCurrentIosBuildNumber();
     const newVersion = incrementVersion(current, type);
+    const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
+    const newVersionString = `${newVersion.major}.${newVersion.minor}.${newVersion.patch}`;
 
     LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
     LoggerHelpers.info(`Bumping ${type} version...`);
@@ -46,16 +90,20 @@ async function bumpVersion(
 
     console.log(chalk.cyan("\nBuild number strategy:"));
     console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} → ${newVersion.buildNumber} (incremented)`));
-    console.log(chalk.gray("  iOS:"), chalk.white(`${current.buildNumber} → 1 (reset for new version)`));
-    console.log();
+    console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → 1 (reset for new version)`));
+
+    showDiffPreview(currentVersionString, newVersionString, current.buildNumber, newVersion.buildNumber, currentIosBuild, 1);
+
+    const confirmed = await confirmAction("Proceed with version bump?", skipConfirm);
+    if (!confirmed) {
+      LoggerHelpers.info("Bump cancelled.");
+      return;
+    }
 
-    // Update with new version
-    // Android uses the incremented build number from version
-    // iOS gets reset to 1 for new version releases
     await updateFlutterVersion(
-      `${newVersion.major}.${newVersion.minor}.${newVersion.patch}`,
+      newVersionString,
       newVersion.buildNumber.toString(),
-      "1"  // iOS always starts at 1 for new versions
+      "1"
     );
 
     LoggerHelpers.success(`Version bumped to ${formatVersion(newVersion)}`);
@@ -63,24 +111,11 @@ async function bumpVersion(
     console.log(chalk.gray("iOS build:"), chalk.white("1"));
 
   } catch (error) {
-    if (error instanceof Error) {
-      LoggerHelpers.error(`Error bumping version: ${error.message}`);
-    } else {
-      LoggerHelpers.error(`Error bumping version: ${error}`);
-    }
-    process.exit(1);
+    handleCommandError(error, "Error bumping version");
   }
 }
 
-/**
- * Increments ONLY iOS build number (for TestFlight builds)
- * Keeps version and Android build number unchanged
- * Perfect for uploading new iOS builds without changing app version
- *
- * Example: 1.0.2+45 (iOS: 45) → 1.0.2+45 (iOS: 46)
- */
-async function bumpIosBuildOnly(): Promise<void> {
-  // Pre-flight validation
+async function bumpIosBuildOnly(skipConfirm: boolean = false): Promise<void> {
   if (!validateFlutterProject()) {
     process.exit(1);
   }
@@ -88,8 +123,6 @@ async function bumpIosBuildOnly(): Promise<void> {
   try {
     const current = getCurrentVersion();
     const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
-
-    // Read actual iOS build number from project.pbxproj
     const currentIosBuild = getCurrentIosBuildNumber();
     const nextIosBuild = currentIosBuild + 1;
 
@@ -100,35 +133,25 @@ async function bumpIosBuildOnly(): Promise<void> {
     console.log(chalk.gray("  Version:"), chalk.white(`${currentVersionString} (unchanged)`));
     console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} (unchanged)`));
     console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
-    console.log();
 
-    // Update only iOS build number
-    await updateFlutterVersion(
-      currentVersionString,
-      "",  // Empty string means don't update Android
-      nextIosBuild.toString()
-    );
+    showDiffPreview(currentVersionString, currentVersionString, current.buildNumber, "", currentIosBuild, nextIosBuild);
+
+    const confirmed = await confirmAction("Proceed?", skipConfirm);
+    if (!confirmed) {
+      LoggerHelpers.info("Bump cancelled.");
+      return;
+    }
+
+    await updateFlutterVersion(currentVersionString, "", nextIosBuild.toString());
 
     LoggerHelpers.success(`iOS build number incremented to ${nextIosBuild}`);
-    console.log(chalk.gray("\nResult:"), chalk.white(`${currentVersionString}+${current.buildNumber} (iOS: ${nextIosBuild})`));
-    console.log(chalk.gray("Use this for:"), chalk.white("TestFlight uploads without version changes"));
 
   } catch (error) {
-    if (error instanceof Error) {
-      LoggerHelpers.error(`Error incrementing iOS build: ${error.message}`);
-    } else {
-      LoggerHelpers.error(`Error incrementing iOS build: ${error}`);
-    }
-    process.exit(1);
+    handleCommandError(error, "Error incrementing iOS build");
   }
 }
 
-/**
- * Increments ONLY Android build number
- * Keeps version and iOS build number unchanged
- */
-async function bumpAndroidBuildOnly(): Promise<void> {
-  // Pre-flight validation
+async function bumpAndroidBuildOnly(skipConfirm: boolean = false): Promise<void> {
   if (!validateFlutterProject()) {
     process.exit(1);
   }
@@ -136,6 +159,7 @@ async function bumpAndroidBuildOnly(): Promise<void> {
   try {
     const current = getCurrentVersion();
     const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
+    const currentIosBuild = getCurrentIosBuildNumber();
     const nextAndroidBuild = current.buildNumber + 1;
 
     LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
@@ -145,34 +169,25 @@ async function bumpAndroidBuildOnly(): Promise<void> {
     console.log(chalk.gray("  Version:"), chalk.white(`${currentVersionString} (unchanged)`));
     console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} → ${nextAndroidBuild}`), chalk.green("(incremented)"));
     console.log(chalk.gray("  iOS:"), chalk.white("(unchanged)"));
-    console.log();
 
-    // Update only Android build number
-    await updateFlutterVersion(
-      currentVersionString,
-      nextAndroidBuild.toString(),
-      ""  // Empty string means don't update iOS
-    );
+    showDiffPreview(currentVersionString, currentVersionString, current.buildNumber, nextAndroidBuild, currentIosBuild, "");
+
+    const confirmed = await confirmAction("Proceed?", skipConfirm);
+    if (!confirmed) {
+      LoggerHelpers.info("Bump cancelled.");
+      return;
+    }
+
+    await updateFlutterVersion(currentVersionString, nextAndroidBuild.toString(), "");
 
     LoggerHelpers.success(`Android build number incremented to ${nextAndroidBuild}`);
 
   } catch (error) {
-    if (error instanceof Error) {
-      LoggerHelpers.error(`Error incrementing Android build: ${error.message}`);
-    } else {
-      LoggerHelpers.error(`Error incrementing Android build: ${error}`);
-    }
-    process.exit(1);
+    handleCommandError(error, "Error incrementing Android build");
   }
 }
 
-/**
- * Increments BOTH Android and iOS build numbers
- * Keeps version unchanged
- * Perfect for updating both platforms simultaneously
- */
-async function bumpBothBuilds(): Promise<void> {
-  // Pre-flight validation
+async function bumpBothBuilds(skipConfirm: boolean = false): Promise<void> {
   if (!validateFlutterProject()) {
     process.exit(1);
   }
@@ -180,8 +195,6 @@ async function bumpBothBuilds(): Promise<void> {
   try {
     const current = getCurrentVersion();
     const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
-
-    // Read actual iOS build number from project.pbxproj
     const currentIosBuild = getCurrentIosBuildNumber();
     const nextAndroidBuild = current.buildNumber + 1;
     const nextIosBuild = currentIosBuild + 1;
@@ -193,32 +206,24 @@ async function bumpBothBuilds(): Promise<void> {
     console.log(chalk.gray("  Version:"), chalk.white(`${currentVersionString} (unchanged)`));
     console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} → ${nextAndroidBuild}`), chalk.green("(incremented)"));
     console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
-    console.log();
 
-    // Update both Android and iOS build numbers
-    await updateFlutterVersion(
-      currentVersionString,
-      nextAndroidBuild.toString(),
-      nextIosBuild.toString()
-    );
+    showDiffPreview(currentVersionString, currentVersionString, current.buildNumber, nextAndroidBuild, currentIosBuild, nextIosBuild);
+
+    const confirmed = await confirmAction("Proceed?", skipConfirm);
+    if (!confirmed) {
+      LoggerHelpers.info("Bump cancelled.");
+      return;
+    }
+
+    await updateFlutterVersion(currentVersionString, nextAndroidBuild.toString(), nextIosBuild.toString());
 
     LoggerHelpers.success(`Both build numbers incremented successfully`);
-    console.log(chalk.gray("\nResult:"), chalk.white(`${currentVersionString}+${nextAndroidBuild} (iOS: ${nextIosBuild})`));
-    console.log(chalk.gray("Use this for:"), chalk.white("Simultaneous Android and iOS releases"));
 
   } catch (error) {
-    if (error instanceof Error) {
-      LoggerHelpers.error(`Error incrementing build numbers: ${error.message}`);
-    } else {
-      LoggerHelpers.error(`Error incrementing build numbers: ${error}`);
-    }
-    process.exit(1);
+    handleCommandError(error, "Error incrementing build numbers");
   }
 }
 
-/**
- * Shows current version information
- */
 async function showCurrentVersion(): Promise<void> {
   try {
     const current = getCurrentVersion();
@@ -235,23 +240,6 @@ async function showCurrentVersion(): Promise<void> {
     console.log();
 
   } catch (error) {
-    if (error instanceof Error) {
-      LoggerHelpers.error(`Error reading version: ${error.message}`);
-    } else {
-      LoggerHelpers.error(`Error reading version: ${error}`);
-    }
-    process.exit(1);
+    handleCommandError(error, "Error reading version");
   }
 }
-
-/**
- * Helper to get next iOS build number
- * In the future, this could read from Info.plist or project.pbxproj
- * For now, we'll use a simple increment
- */
-async function getNextIosBuildNumber(): Promise<number> {
-  // TODO: Read actual iOS build number from Info.plist or project.pbxproj
-  // For now, we'll just increment based on timestamp or simple counter
-  const current = getCurrentVersion();
-  return current.buildNumber + 1;
-}

package/src/commands/version/commands.ts

@@ -0,0 +1,76 @@
+import type { CommandModule } from "yargs";
+import {
+  bumpVersion,
+  bumpIosBuildOnly,
+  bumpAndroidBuildOnly,
+  bumpBothBuilds,
+  showCurrentVersion,
+} from "./bump.js";
+import { updateFlutterVersion } from "./update.js";
+
+const yesOption = {
+  yes: { alias: "y", type: "boolean" as const, default: false, description: "Skip confirmation prompt" },
+};
+
+export const versionCommands: CommandModule[] = [
+  {
+    command: "bump <type>",
+    describe: "Bump version (major, minor, or patch)",
+    builder: (yargs) => {
+      return yargs
+        .positional("type", {
+          describe: "Version bump type (major, minor, patch)",
+          type: "string" as const,
+          choices: ["major", "minor", "patch"] as const,
+        })
+        .option("yes", yesOption.yes);
+    },
+    handler: async (argv) => {
+      await bumpVersion(argv.type as "major" | "minor" | "patch", argv.yes as boolean);
+    },
+  },
+  {
+    command: "bump-ios",
+    aliases: ["bi"],
+    describe: "Increment iOS build number only (for TestFlight)",
+    builder: yesOption,
+    handler: async (argv) => { await bumpIosBuildOnly(argv.yes as boolean); },
+  },
+  {
+    command: "bump-android",
+    aliases: ["ba"],
+    describe: "Increment Android build number only",
+    builder: yesOption,
+    handler: async (argv) => { await bumpAndroidBuildOnly(argv.yes as boolean); },
+  },
+  {
+    command: "bump-build",
+    aliases: ["bb"],
+    describe: "Increment both Android and iOS build numbers",
+    builder: yesOption,
+    handler: async (argv) => { await bumpBothBuilds(argv.yes as boolean); },
+  },
+  {
+    command: "version",
+    aliases: ["v"],
+    describe: "Show current version information",
+    handler: async () => { await showCurrentVersion(); },
+  },
+  {
+    command: "flutter-update-version",
+    aliases: ["vset"],
+    describe: "Update version and build numbers for both Android and iOS",
+    builder: {
+      "app-version": { type: "string", description: "The version number to set", default: "" },
+      "android-build": { type: "string", description: "The Android build number", default: "" },
+      "ios-build": { type: "string", description: "The iOS build number", default: "" },
+    },
+    handler: async (argv) => {
+      await updateFlutterVersion(
+        argv["app-version"] as string,
+        argv["android-build"] as string,
+        argv["ios-build"] as string
+      );
+    },
+  },
+];