optikit 1.2.2 → 1.2.4

package/USAGE.md

@@ -40,7 +40,7 @@ optikit init
 ```json
 {
   "backupRetentionCount": 5,
-  "useFvmByDefault": false,
+  "useFvmByDefault": true,
   "autoBackup": true,
   "verbose": false
 }

package/dist/commands/config/init.js

@@ -20,7 +20,7 @@ async function initializeProject() {
         // Create default configuration
         const defaultConfig = {
             backupRetentionCount: 5,
-            useFvmByDefault: false,
+            useFvmByDefault: true,
             autoBackup: true,
             verbose: false,
         };

package/dist/commands/version/bump.js

@@ -1,6 +1,6 @@
 import { validateFlutterProject } from "../../utils/validators/validation.js";
 import { LoggerHelpers } from "../../utils/services/logger.js";
-import { getCurrentVersion, incrementVersion, formatVersion } from "../../utils/helpers/version.js";
+import { getCurrentVersion, incrementVersion, formatVersion, getCurrentIosBuildNumber } from "../../utils/helpers/version.js";
 import { updateFlutterVersion } from "./update.js";
 import chalk from "chalk";
 export { bumpVersion, bumpIosBuildOnly, bumpAndroidBuildOnly, showCurrentVersion };
@@ -62,14 +62,15 @@ async function bumpIosBuildOnly() {
     try {
         const current = getCurrentVersion();
         const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
-        // iOS build number increments from current Android build number
-        const nextIosBuild = current.buildNumber + 1;
+        // Read actual iOS build number from project.pbxproj
+        const currentIosBuild = getCurrentIosBuildNumber();
+        const nextIosBuild = currentIosBuild + 1;
         LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
         LoggerHelpers.info("Incrementing iOS build number only (for TestFlight)...");
         console.log(chalk.cyan("\nBuild number changes:"));
         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(`${current.buildNumber} → ${nextIosBuild}`), chalk.green("(incremented)"));
+        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
@@ -130,12 +131,14 @@ async function showCurrentVersion() {
     try {
         const current = getCurrentVersion();
         const versionString = formatVersion(current);
+        const currentIosBuild = getCurrentIosBuildNumber();
         console.log(chalk.bold("\n📱 Current Version Information\n"));
         console.log(chalk.cyan("Version:"), chalk.white.bold(versionString));
         console.log(chalk.gray("  Major:"), chalk.white(current.major));
         console.log(chalk.gray("  Minor:"), chalk.white(current.minor));
         console.log(chalk.gray("  Patch:"), chalk.white(current.patch));
-        console.log(chalk.gray("  Build:"), chalk.white(current.buildNumber));
+        console.log(chalk.gray("  Android Build:"), chalk.white(current.buildNumber));
+        console.log(chalk.gray("  iOS Build:"), chalk.white(currentIosBuild));
         console.log();
     }
     catch (error) {

package/dist/utils/helpers/version.js

@@ -1,6 +1,7 @@
 import fs from "fs";
 import path from "path";
-export { parseVersion, incrementVersion, getCurrentVersion };
+import { LoggerHelpers } from "../services/logger.js";
+export { parseVersion, incrementVersion, getCurrentVersion, getCurrentIosBuildNumber };
 /**
  * Parses a version string in format "X.Y.Z+B"
  * @param versionString - Version string (e.g., "1.2.3+45")
@@ -78,3 +79,28 @@ export function getNextBuildNumber() {
     const current = getCurrentVersion();
     return current.buildNumber + 1;
 }
+/**
+ * Gets the current iOS build number from project.pbxproj
+ * @returns Current iOS build number, or 1 if not found
+ */
+function getCurrentIosBuildNumber() {
+    try {
+        const projectPbxProjPath = path.join(process.cwd(), "ios/Runner.xcodeproj/project.pbxproj");
+        if (!fs.existsSync(projectPbxProjPath)) {
+            LoggerHelpers.warning("iOS project.pbxproj not found. Defaulting to build number 1.");
+            return 1;
+        }
+        const projectContent = fs.readFileSync(projectPbxProjPath, 'utf8');
+        // Match CURRENT_PROJECT_VERSION = <number>;
+        const buildMatch = projectContent.match(/CURRENT_PROJECT_VERSION\s*=\s*(\d+);/);
+        if (!buildMatch) {
+            LoggerHelpers.warning("CURRENT_PROJECT_VERSION not found in project.pbxproj. Defaulting to build number 1.");
+            return 1;
+        }
+        return parseInt(buildMatch[1], 10);
+    }
+    catch (error) {
+        LoggerHelpers.warning(`Error reading iOS build number: ${error instanceof Error ? error.message : error}. Defaulting to 1.`);
+        return 1;
+    }
+}

package/dist/utils/services/exec.js

@@ -57,6 +57,30 @@ export async function execCommand(command) {
         });
     });
 }
+export async function execCommandSilent(command) {
+    return new Promise((resolve, reject) => {
+        const fullCommand = `${command}`;
+        const process = spawn(fullCommand, { shell: true });
+        let output = "";
+        process.stdout.on("data", (data) => {
+            output += data.toString();
+        });
+        process.stderr.on("data", (data) => {
+            output += data.toString();
+        });
+        process.on("close", (code) => {
+            if (code !== 0) {
+                reject(new Error(`Command failed with exit code ${code}`));
+            }
+            else {
+                resolve(output);
+            }
+        });
+        process.on("error", (err) => {
+            reject(new Error(`Failed to start subprocess: ${err.message}`));
+        });
+    });
+}
 export async function execInIos(command) {
     return new Promise((resolve, reject) => {
         const fullCommand = `cd "${iosDirectory}" && ${command}`;

package/dist/utils/validators/validation.js

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { execCommand } from "../services/exec.js";
+import { execCommandSilent } from "../services/exec.js";
 import { LoggerHelpers } from "../services/logger.js";
 export { validateFlutterProject, validateFlutterSdk, validateIosProject, validateAndroidProject, checkFileExists, };
 /**
@@ -36,12 +36,12 @@ async function validateFlutterSdk(useFvm = false) {
                 return false;
             }
             // Check if fvm command is available
-            await execCommand("fvm --version");
+            await execCommandSilent("fvm --version");
             return true;
         }
         else {
             // Check if global Flutter is available
-            await execCommand("flutter --version");
+            await execCommandSilent("flutter --version");
             return true;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optikit",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "OptiKit CLI",
   "main": "src/cli.ts",
   "type": "module",

package/src/commands/config/init.ts

@@ -25,7 +25,7 @@ async function initializeProject(): Promise<void> {
     // Create default configuration
     const defaultConfig = {
       backupRetentionCount: 5,
-      useFvmByDefault: false,
+      useFvmByDefault: true,
       autoBackup: true,
       verbose: false,
     };

package/src/commands/version/bump.ts

@@ -4,7 +4,8 @@ import {
   getCurrentVersion,
   incrementVersion,
   formatVersion,
-  getNextBuildNumber
+  getNextBuildNumber,
+  getCurrentIosBuildNumber
 } from "../../utils/helpers/version.js";
 import { updateFlutterVersion } from "./update.js";
 import chalk from "chalk";
@@ -87,8 +88,9 @@ async function bumpIosBuildOnly(): Promise<void> {
     const current = getCurrentVersion();
     const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
 
-    // iOS build number increments from current Android build number
-    const nextIosBuild = current.buildNumber + 1;
+    // Read actual iOS build number from project.pbxproj
+    const currentIosBuild = getCurrentIosBuildNumber();
+    const nextIosBuild = currentIosBuild + 1;
 
     LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
     LoggerHelpers.info("Incrementing iOS build number only (for TestFlight)...");
@@ -96,7 +98,7 @@ async function bumpIosBuildOnly(): Promise<void> {
     console.log(chalk.cyan("\nBuild number changes:"));
     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(`${current.buildNumber} → ${nextIosBuild}`), chalk.green("(incremented)"));
+    console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
     console.log();
 
     // Update only iOS build number
@@ -170,13 +172,15 @@ async function showCurrentVersion(): Promise<void> {
   try {
     const current = getCurrentVersion();
     const versionString = formatVersion(current);
+    const currentIosBuild = getCurrentIosBuildNumber();
 
     console.log(chalk.bold("\n📱 Current Version Information\n"));
     console.log(chalk.cyan("Version:"), chalk.white.bold(versionString));
     console.log(chalk.gray("  Major:"), chalk.white(current.major));
     console.log(chalk.gray("  Minor:"), chalk.white(current.minor));
     console.log(chalk.gray("  Patch:"), chalk.white(current.patch));
-    console.log(chalk.gray("  Build:"), chalk.white(current.buildNumber));
+    console.log(chalk.gray("  Android Build:"), chalk.white(current.buildNumber));
+    console.log(chalk.gray("  iOS Build:"), chalk.white(currentIosBuild));
     console.log();
 
   } catch (error) {

package/src/utils/helpers/version.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import { LoggerHelpers } from "../services/logger.js";
 
-export { parseVersion, incrementVersion, getCurrentVersion, VersionInfo };
+export { parseVersion, incrementVersion, getCurrentVersion, getCurrentIosBuildNumber, VersionInfo };
 
 /**
  * Version information structure
@@ -107,3 +107,33 @@ export function getNextBuildNumber(): number {
   const current = getCurrentVersion();
   return current.buildNumber + 1;
 }
+
+/**
+ * Gets the current iOS build number from project.pbxproj
+ * @returns Current iOS build number, or 1 if not found
+ */
+function getCurrentIosBuildNumber(): number {
+  try {
+    const projectPbxProjPath = path.join(process.cwd(), "ios/Runner.xcodeproj/project.pbxproj");
+
+    if (!fs.existsSync(projectPbxProjPath)) {
+      LoggerHelpers.warning("iOS project.pbxproj not found. Defaulting to build number 1.");
+      return 1;
+    }
+
+    const projectContent = fs.readFileSync(projectPbxProjPath, 'utf8');
+
+    // Match CURRENT_PROJECT_VERSION = <number>;
+    const buildMatch = projectContent.match(/CURRENT_PROJECT_VERSION\s*=\s*(\d+);/);
+
+    if (!buildMatch) {
+      LoggerHelpers.warning("CURRENT_PROJECT_VERSION not found in project.pbxproj. Defaulting to build number 1.");
+      return 1;
+    }
+
+    return parseInt(buildMatch[1], 10);
+  } catch (error) {
+    LoggerHelpers.warning(`Error reading iOS build number: ${error instanceof Error ? error.message : error}. Defaulting to 1.`);
+    return 1;
+  }
+}

package/src/utils/services/exec.ts

@@ -73,6 +73,35 @@ export async function execCommand(command: string): Promise<string> {
   });
 }
 
+export async function execCommandSilent(command: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const fullCommand = `${command}`;
+    const process = spawn(fullCommand, { shell: true });
+
+    let output = "";
+
+    process.stdout.on("data", (data) => {
+      output += data.toString();
+    });
+
+    process.stderr.on("data", (data) => {
+      output += data.toString();
+    });
+
+    process.on("close", (code) => {
+      if (code !== 0) {
+        reject(new Error(`Command failed with exit code ${code}`));
+      } else {
+        resolve(output);
+      }
+    });
+
+    process.on("error", (err) => {
+      reject(new Error(`Failed to start subprocess: ${err.message}`));
+    });
+  });
+}
+
 export async function execInIos(command: string): Promise<string> {
   return new Promise((resolve, reject) => {
     const fullCommand = `cd "${iosDirectory}" && ${command}`;

package/src/utils/validators/validation.ts

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { execCommand } from "../services/exec.js";
+import { execCommandSilent } from "../services/exec.js";
 import { LoggerHelpers } from "../services/logger.js";
 
 export {
@@ -49,11 +49,11 @@ async function validateFlutterSdk(useFvm: boolean = false): Promise<boolean> {
       }
 
       // Check if fvm command is available
-      await execCommand("fvm --version");
+      await execCommandSilent("fvm --version");
       return true;
     } else {
       // Check if global Flutter is available
-      await execCommand("flutter --version");
+      await execCommandSilent("flutter --version");
       return true;
     }
   } catch (error) {