optikit 1.4.0 → 1.4.2

package/CHANGELOG.md

@@ -12,6 +12,22 @@ We follow **Semantic Versioning (SemVer)**:
 
 ---
 
+### 🛠 [1.4.2] - Fix bump-ios Overwriting Manually Set iOS Version
+
+- 🔴 Fixed `bump-ios` / `tf` overwriting a manually set `MARKETING_VERSION` in `project.pbxproj` with the stale version from `pubspec.yaml`
+- 🆕 Added `getCurrentIosMarketingVersion()` helper that reads `MARKETING_VERSION` directly from `project.pbxproj` (falls back to `pubspec.yaml` if iOS file is missing)
+- 🔄 `bumpIosBuildOnly()` now uses the iOS marketing version as source of truth instead of `pubspec.yaml`, so calling `flutter-update-version --app-version X --ios-build N` followed by `bump-ios` / `tf` correctly preserves the manually set version
+
+---
+
+### 🛠 [1.4.1] - Fix Generate Module Command
+
+- 🔴 Fixed `generate module` routing to repo handler instead of module handler
+- 🔄 Restructured `generate` as parent command with `module` and `repo` subcommands
+- 🧹 Removed stale `repo/` directory from module scaffolding structure
+
+---
+
 ### 🌟 [1.4.0] - Interactive Repo Picker & Module Cleanup
 
 - 📂 Interactive arrow-key directory picker for `gen repo` — browse, open, go back, or create folders

package/dist/commands/project/commands.js

@@ -6,30 +6,38 @@ import { runDoctor } from "./doctor.js";
 import { showStatus } from "./status.js";
 export const projectCommands = [
     {
-        command: "generate module <moduleName>",
-        aliases: ["gen module"],
-        describe: "Generate a module with structure",
+        command: "generate",
+        aliases: ["gen"],
+        describe: "Generate module or repository scaffolding",
         builder: (yargs) => {
             return yargs
-                .positional("moduleName", { describe: "The name of the module to generate", type: "string" })
-                .option("with-route", { alias: "r", type: "boolean", default: false, description: "Also register a route in app_router.dart" });
+                .command({
+                command: "module <moduleName>",
+                describe: "Generate a module with full BLoC structure",
+                builder: (y) => {
+                    return y
+                        .positional("moduleName", { describe: "The name of the module to generate", type: "string" })
+                        .option("with-route", { alias: "r", type: "boolean", default: false, description: "Also register a route in app_router.dart" });
+                },
+                handler: (argv) => {
+                    const moduleName = argv.moduleName;
+                    generateModule(moduleName);
+                    if (argv.withRoute) {
+                        addRoute(moduleName);
+                    }
+                },
+            })
+                .command({
+                command: "repo <moduleName>",
+                describe: "Generate a repository file for an existing module",
+                builder: (y) => {
+                    return y.positional("moduleName", { describe: "The module name", type: "string" });
+                },
+                handler: async (argv) => { await generateRepoModule(argv.moduleName); },
+            })
+                .demandCommand(1, "Specify a subcommand: module or repo");
         },
-        handler: (argv) => {
-            const moduleName = argv.moduleName;
-            generateModule(moduleName);
-            if (argv.withRoute) {
-                addRoute(moduleName);
-            }
-        },
-    },
-    {
-        command: "generate repo <moduleName>",
-        aliases: ["gen repo"],
-        describe: "Generate a repository file for an existing module",
-        builder: (yargs) => {
-            return yargs.positional("moduleName", { describe: "The module name", type: "string" });
-        },
-        handler: async (argv) => { await generateRepoModule(argv.moduleName); },
+        handler: () => { },
     },
     {
         command: "add-route <moduleName>",

package/dist/commands/version/bump.js

@@ -1,7 +1,7 @@
 import { createInterface } from "readline";
 import { validateFlutterProject } from "../../utils/validators/validation.js";
 import { LoggerHelpers } from "../../utils/services/logger.js";
-import { getCurrentVersion, incrementVersion, formatVersion, getCurrentIosBuildNumber } from "../../utils/helpers/version.js";
+import { getCurrentVersion, incrementVersion, formatVersion, getCurrentIosBuildNumber, getCurrentIosMarketingVersion } from "../../utils/helpers/version.js";
 import { handleCommandError } from "../../utils/helpers/error.js";
 import { updateFlutterVersion } from "./update.js";
 import chalk from "chalk";
@@ -79,22 +79,22 @@ async function bumpIosBuildOnly(skipConfirm = false) {
     }
     try {
         const current = getCurrentVersion();
-        const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
+        const iosVersionString = getCurrentIosMarketingVersion();
         const currentIosBuild = getCurrentIosBuildNumber();
         const nextIosBuild = currentIosBuild + 1;
-        LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
+        LoggerHelpers.info(`Current iOS version: ${iosVersionString} (build ${currentIosBuild})`);
         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("  Version:"), chalk.white(`${iosVersionString} (unchanged)`));
         console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} (unchanged)`));
         console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
-        showDiffPreview(currentVersionString, currentVersionString, current.buildNumber, "", currentIosBuild, nextIosBuild);
+        showDiffPreview(iosVersionString, iosVersionString, current.buildNumber, "", currentIosBuild, nextIosBuild);
         const confirmed = await confirmAction("Proceed?", skipConfirm);
         if (!confirmed) {
             LoggerHelpers.info("Bump cancelled.");
             return;
         }
-        await updateFlutterVersion(currentVersionString, "", nextIosBuild.toString());
+        await updateFlutterVersion(iosVersionString, "", nextIosBuild.toString());
         LoggerHelpers.success(`iOS build number incremented to ${nextIosBuild}`);
     }
     catch (error) {

package/dist/constants.js

@@ -44,7 +44,7 @@ export const BACKUP_CONFIG = {
 };
 // Module generation
 export const MODULE_STRUCTURE = {
-    DIRECTORIES: ["bloc", "event", "state", "screen", "import", "factory", "repo"],
+    DIRECTORIES: ["bloc", "event", "state", "screen", "import", "factory"],
     NAME_PATTERN: /^[a-z0-9_]+$/,
 };
 // Flutter commands

package/dist/utils/helpers/version.js

@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import { LoggerHelpers } from "../services/logger.js";
 import { PROJECT_PATHS } from "../../constants.js";
-export { parseVersion, incrementVersion, getCurrentVersion, getCurrentIosBuildNumber };
+export { parseVersion, incrementVersion, getCurrentVersion, getCurrentIosBuildNumber, getCurrentIosMarketingVersion };
 /**
  * Parses a version string in format "X.Y.Z+B"
  * @param versionString - Version string (e.g., "1.2.3+45")
@@ -80,6 +80,31 @@ export function getNextBuildNumber() {
     const current = getCurrentVersion();
     return current.buildNumber + 1;
 }
+/**
+ * Gets the current iOS marketing version (MARKETING_VERSION) from project.pbxproj.
+ * Falls back to pubspec.yaml version when the iOS file is not found.
+ */
+function getCurrentIosMarketingVersion() {
+    try {
+        const projectPbxProjPath = path.join(process.cwd(), PROJECT_PATHS.IOS_PROJECT_PBXPROJ);
+        if (!fs.existsSync(projectPbxProjPath)) {
+            const fallback = getCurrentVersion();
+            return `${fallback.major}.${fallback.minor}.${fallback.patch}`;
+        }
+        const projectContent = fs.readFileSync(projectPbxProjPath, 'utf8');
+        const match = projectContent.match(/MARKETING_VERSION\s*=\s*([^;]+);/);
+        if (!match) {
+            const fallback = getCurrentVersion();
+            return `${fallback.major}.${fallback.minor}.${fallback.patch}`;
+        }
+        return match[1].trim();
+    }
+    catch (error) {
+        LoggerHelpers.warning(`Error reading iOS marketing version: ${error instanceof Error ? error.message : error}. Falling back to pubspec.yaml.`);
+        const fallback = getCurrentVersion();
+        return `${fallback.major}.${fallback.minor}.${fallback.patch}`;
+    }
+}
 /**
  * Gets the current iOS build number from project.pbxproj
  * @returns Current iOS build number, or 1 if not found

package/package.json

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

package/src/commands/project/commands.ts

@@ -8,28 +8,36 @@ import { showStatus } from "./status.js";
 
 export const projectCommands: CommandModule[] = [
   {
-    command: "generate module <moduleName>",
-    aliases: ["gen module"],
-    describe: "Generate a module with structure",
+    command: "generate",
+    aliases: ["gen"],
+    describe: "Generate module or repository scaffolding",
     builder: (yargs) => {
       return yargs
-        .positional("moduleName", { describe: "The name of the module to generate", type: "string" as const })
-        .option("with-route", { alias: "r", type: "boolean", default: false, description: "Also register a route in app_router.dart" });
+        .command({
+          command: "module <moduleName>",
+          describe: "Generate a module with full BLoC structure",
+          builder: (y) => {
+            return y
+              .positional("moduleName", { describe: "The name of the module to generate", type: "string" as const })
+              .option("with-route", { alias: "r", type: "boolean", default: false, description: "Also register a route in app_router.dart" });
+          },
+          handler: (argv) => {
+            const moduleName = argv.moduleName as string;
+            generateModule(moduleName);
+            if (argv.withRoute) { addRoute(moduleName); }
+          },
+        })
+        .command({
+          command: "repo <moduleName>",
+          describe: "Generate a repository file for an existing module",
+          builder: (y) => {
+            return y.positional("moduleName", { describe: "The module name", type: "string" as const });
+          },
+          handler: async (argv) => { await generateRepoModule(argv.moduleName as string); },
+        })
+        .demandCommand(1, "Specify a subcommand: module or repo");
     },
-    handler: (argv) => {
-      const moduleName = argv.moduleName as string;
-      generateModule(moduleName);
-      if (argv.withRoute) { addRoute(moduleName); }
-    },
-  },
-  {
-    command: "generate repo <moduleName>",
-    aliases: ["gen repo"],
-    describe: "Generate a repository file for an existing module",
-    builder: (yargs) => {
-      return yargs.positional("moduleName", { describe: "The module name", type: "string" as const });
-    },
-    handler: async (argv) => { await generateRepoModule(argv.moduleName as string); },
+    handler: () => { /* handled by subcommands */ },
   },
   {
     command: "add-route <moduleName>",

package/src/commands/version/bump.ts

@@ -6,7 +6,8 @@ import {
   incrementVersion,
   formatVersion,
   getNextBuildNumber,
-  getCurrentIosBuildNumber
+  getCurrentIosBuildNumber,
+  getCurrentIosMarketingVersion
 } from "../../utils/helpers/version.js";
 import { handleCommandError } from "../../utils/helpers/error.js";
 import { updateFlutterVersion } from "./update.js";
@@ -122,19 +123,19 @@ async function bumpIosBuildOnly(skipConfirm: boolean = false): Promise<void> {
 
   try {
     const current = getCurrentVersion();
-    const currentVersionString = `${current.major}.${current.minor}.${current.patch}`;
+    const iosVersionString = getCurrentIosMarketingVersion();
     const currentIosBuild = getCurrentIosBuildNumber();
     const nextIosBuild = currentIosBuild + 1;
 
-    LoggerHelpers.info(`Current version: ${formatVersion(current)}`);
+    LoggerHelpers.info(`Current iOS version: ${iosVersionString} (build ${currentIosBuild})`);
     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("  Version:"), chalk.white(`${iosVersionString} (unchanged)`));
     console.log(chalk.gray("  Android:"), chalk.white(`${current.buildNumber} (unchanged)`));
     console.log(chalk.gray("  iOS:"), chalk.white(`${currentIosBuild} → ${nextIosBuild}`), chalk.green("(incremented)"));
 
-    showDiffPreview(currentVersionString, currentVersionString, current.buildNumber, "", currentIosBuild, nextIosBuild);
+    showDiffPreview(iosVersionString, iosVersionString, current.buildNumber, "", currentIosBuild, nextIosBuild);
 
     const confirmed = await confirmAction("Proceed?", skipConfirm);
     if (!confirmed) {
@@ -142,7 +143,7 @@ async function bumpIosBuildOnly(skipConfirm: boolean = false): Promise<void> {
       return;
     }
 
-    await updateFlutterVersion(currentVersionString, "", nextIosBuild.toString());
+    await updateFlutterVersion(iosVersionString, "", nextIosBuild.toString());
 
     LoggerHelpers.success(`iOS build number incremented to ${nextIosBuild}`);
 

package/src/constants.ts

@@ -48,7 +48,7 @@ export const BACKUP_CONFIG = {
 
 // Module generation
 export const MODULE_STRUCTURE = {
-  DIRECTORIES: ["bloc", "event", "state", "screen", "import", "factory", "repo"],
+  DIRECTORIES: ["bloc", "event", "state", "screen", "import", "factory"],
   NAME_PATTERN: /^[a-z0-9_]+$/,
 } as const;
 

package/src/utils/helpers/version.ts

@@ -3,7 +3,7 @@ import path from "path";
 import { LoggerHelpers } from "../services/logger.js";
 import { PROJECT_PATHS } from "../../constants.js";
 
-export { parseVersion, incrementVersion, getCurrentVersion, getCurrentIosBuildNumber, VersionInfo };
+export { parseVersion, incrementVersion, getCurrentVersion, getCurrentIosBuildNumber, getCurrentIosMarketingVersion, VersionInfo };
 
 /**
  * Version information structure
@@ -109,6 +109,35 @@ export function getNextBuildNumber(): number {
   return current.buildNumber + 1;
 }
 
+/**
+ * Gets the current iOS marketing version (MARKETING_VERSION) from project.pbxproj.
+ * Falls back to pubspec.yaml version when the iOS file is not found.
+ */
+function getCurrentIosMarketingVersion(): string {
+  try {
+    const projectPbxProjPath = path.join(process.cwd(), PROJECT_PATHS.IOS_PROJECT_PBXPROJ);
+
+    if (!fs.existsSync(projectPbxProjPath)) {
+      const fallback = getCurrentVersion();
+      return `${fallback.major}.${fallback.minor}.${fallback.patch}`;
+    }
+
+    const projectContent = fs.readFileSync(projectPbxProjPath, 'utf8');
+    const match = projectContent.match(/MARKETING_VERSION\s*=\s*([^;]+);/);
+
+    if (!match) {
+      const fallback = getCurrentVersion();
+      return `${fallback.major}.${fallback.minor}.${fallback.patch}`;
+    }
+
+    return match[1].trim();
+  } catch (error) {
+    LoggerHelpers.warning(`Error reading iOS marketing version: ${error instanceof Error ? error.message : error}. Falling back to pubspec.yaml.`);
+    const fallback = getCurrentVersion();
+    return `${fallback.major}.${fallback.minor}.${fallback.patch}`;
+  }
+}
+
 /**
  * Gets the current iOS build number from project.pbxproj
  * @returns Current iOS build number, or 1 if not found