@_nazmiforreal/flutter-ota 0.1.25 → 0.1.27

package/bin/flutter-ota.js

@@ -55,31 +55,32 @@ if (fs.existsSync(binPath)) {
   chmodIfNeeded(binPath);
   run(binPath, process.argv.slice(2));
 } else if (
-  spawnSync('dart', ['--version'], { stdio: 'ignore' }).status === 0 &&
+  spawnSync('flutter', ['--version'], { stdio: 'ignore' }).status === 0 &&
   fs.existsSync(sourceEntry)
 ) {
-  // Ensure dependencies are resolved before running from source. We only run
-  // `dart pub get` when the package config is missing, so repeated invocations
-  // don't re-resolve dependencies on every command.
+  // Fallback for platforms/arches without a shipped prebuilt binary.
+  // Since v0.2.0 the CLI depends on the `flutter_ota_kit` Flutter package, so
+  // dependency resolution needs `flutter pub get` (not `dart pub get`). The CLI
+  // entrypoint itself only touches pure-Dart backend code, so `dart run` of the
+  // resolved package still works.
   const configPath = path.join(cliDir, '.dart_tool', 'package_config.json');
   if (!fs.existsSync(configPath)) {
-    const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
+    const getRes = spawnSync('flutter', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
     if (getRes.status !== 0) {
       console.error(
-        'flutter-ota: `dart pub get` failed. Install dependencies or build ' +
-          `a prebuilt manually:\n  cd ${cliDir} && dart compile exe ` +
-          `bin/flutter_ota_kit.dart -o ${binPath}`,
+        'flutter-ota: `flutter pub get` failed. Install the Flutter SDK or ' +
+          `build a prebuilt manually:\n  cd ${cliDir} && flutter pub get && ` +
+          `dart compile exe bin/flutter_ota_kit.dart -o ${binPath}`,
       );
       process.exit(1);
     }
   }
-  chmodIfNeeded(binPath);
   run('dart', [sourceEntry, ...process.argv.slice(2)]);
 } else {
   console.error(
     `flutter-ota: no prebuilt binary for ${platformName}-${archName} and ` +
-      'the Dart SDK was not found. Install Dart (https://dart.dev) or use a ' +
-      'platform/arch with a shipped prebuilt binary.',
+      'the Flutter SDK was not found. Install Flutter (https://flutter.dev) or ' +
+      'use a platform/arch with a shipped prebuilt binary.',
   );
   process.exit(1);
 }

package/dart-src/packages/cli-tools/lib/flutter_ota_kit_cli.dart

@@ -22,7 +22,7 @@ export 'src/util.dart';
 
 // Re-export the PocketBase client so CLI commands can probe PB health
 // without pulling the plugin in separately.
-export 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart'
+export 'package:flutter_ota_kit/src/pkg/pocketbase/flutter_ota_kit_pocketbase.dart'
     show PocketBaseClient;
 
 export 'src/commands/init.dart';
@@ -85,13 +85,15 @@ Future<int> run(List<String> args) async {
     final msg = e.message;
 
     // Missing subcommand → show the command's own help + suggestions.
+    // Handles nested paths too (e.g. "flutter-ota pocketbase records"), not
+    // just single-word commands.
     if (msg.startsWith('Missing subcommand')) {
-      final match = RegExp(r'"flutter-ota (\w+)"').firstMatch(msg);
+      final match = RegExp(r'"flutter-ota ([^"]+)"').firstMatch(msg);
       if (match != null) {
-        final cmd = runner.commands[match.group(1)];
+        final cmd = _resolveCommandPath(runner, match.group(1)!.split(' '));
         if (cmd != null) {
           _printMissingSubcommand(cmd);
-          return 0;
+          return 64;
         }
       }
     }
@@ -103,7 +105,7 @@ Future<int> run(List<String> args) async {
     }
 
     // Unknown command → fuzzy-match and suggest.
-    final unknownMatch = RegExp(r'Could not find a command named "?(\w+)"?')
+    final unknownMatch = RegExp(r'Could not find a command named "?([\w-]+)"?')
         .firstMatch(msg);
     if (unknownMatch != null) {
       final typed = unknownMatch.group(1)!;
@@ -111,14 +113,15 @@ Future<int> run(List<String> args) async {
       return 64;
     }
 
-    // Unknown subcommand → suggest closest subcommand.
+    // Unknown subcommand → suggest closest subcommand. Handles nested parents
+    // (e.g. "... named "nope" for "flutter-ota pocketbase records"").
     final subMatch = RegExp(
-      r'Could not find a subcommand named "?(\w+)"? for "?flutter-ota (\w+)"?',
+      r'Could not find a subcommand named "?([\w-]+)"? for "?flutter-ota ([^"]+)"?',
     ).firstMatch(msg);
     if (subMatch != null) {
       final subTyped = subMatch.group(1)!;
-      final parentName = subMatch.group(2)!;
-      final parentCmd = runner.commands[parentName];
+      final parentPath = subMatch.group(2)!.trim().split(' ');
+      final parentCmd = _resolveCommandPath(runner, parentPath);
       if (parentCmd != null) {
         _printUnknownSubcommand(parentCmd, subTyped);
         return 64;
@@ -133,6 +136,22 @@ Future<int> run(List<String> args) async {
   }
 }
 
+/// Walk a space-separated command path (e.g. `["pocketbase", "records"]`)
+/// from the runner down through nested subcommands. Returns the resolved
+/// [Command], or null if any segment is unknown.
+Command<int>? _resolveCommandPath(
+  FlutterPatcherRunner runner,
+  List<String> path,
+) {
+  if (path.isEmpty) return null;
+  Command<int>? cmd = runner.commands[path.first];
+  for (final segment in path.skip(1)) {
+    if (cmd == null) return null;
+    cmd = cmd.subcommands[segment];
+  }
+  return cmd;
+}
+
 /// Show a helpful "unknown command" message with fuzzy-match suggestions.
 void _printUnknownCommand(FlutterPatcherRunner runner, String typed) {
   final commands = runner.commands.keys.toList();
@@ -213,6 +232,7 @@ void _printUnknownCommand(FlutterPatcherRunner runner, String typed) {
 /// Show a helpful "unknown subcommand" message with suggestions.
 void _printUnknownSubcommand(Command<int> parent, String typed) {
   final subNames = parent.subcommands.keys.toList();
+  final parentPath = _commandPath(parent);
 
   // Find closest subcommands.
   final suggestions = subNames
@@ -221,14 +241,14 @@ void _printUnknownSubcommand(Command<int> parent, String typed) {
 
   stderr.writeln('');
   stderr.writeln(
-    '  ${_red('✗')} Unknown subcommand: ${_red(typed)} for ${_cyan('flutter-ota ${parent.name}')}',
+    '  ${_red('✗')} Unknown subcommand: ${_red(typed)} for ${_cyan('flutter-ota $parentPath')}',
   );
   stderr.writeln('');
 
   if (suggestions.isNotEmpty) {
     stderr.writeln('  ${_cyan('Did you mean?')}');
     for (final s in suggestions.take(3)) {
-      stderr.writeln('    ${_green(s)}');
+      stderr.writeln('    ${_green('$parentPath $s')}');
     }
     stderr.writeln('');
   }
@@ -239,17 +259,18 @@ void _printUnknownSubcommand(Command<int> parent, String typed) {
 /// Show a helpful "missing subcommand" message with all subcommand suggestions.
 void _printMissingSubcommand(Command<int> parent) {
   final subNames = parent.subcommands.keys.toList()..sort();
+  final parentPath = _commandPath(parent);
 
   stderr.writeln('');
   stderr.writeln(
-    '  ${_red('✗')} Missing subcommand for ${_cyan('flutter-ota ${parent.name}')}',
+    '  ${_red('✗')} Missing subcommand for ${_cyan('flutter-ota $parentPath')}',
   );
   stderr.writeln('');
 
   if (subNames.isNotEmpty) {
     stderr.writeln('  ${_cyan('Available subcommands:')}');
     for (final s in subNames) {
-      stderr.writeln('    ${_green('${parent.name} $s')}');
+      stderr.writeln('    ${_green('$parentPath $s')}');
     }
     stderr.writeln('');
   }
@@ -257,6 +278,18 @@ void _printMissingSubcommand(Command<int> parent) {
   parent.printUsage();
 }
 
+/// Full space-separated path of a command (e.g. `pocketbase records`),
+/// walking up the `parent` chain. The runner itself has no name in the chain.
+String _commandPath(Command<int> command) {
+  final parts = <String>[command.name];
+  var p = command.parent;
+  while (p != null) {
+    parts.insert(0, p.name);
+    p = p.parent;
+  }
+  return parts.join(' ');
+}
+
 // ── Minimal Levenshtein distance ──────────────────────────────────────────────
 
 int _levenshtein(String a, String b) {

package/dart-src/packages/cli-tools/lib/src/backend.dart

@@ -1,9 +1,9 @@
-import 'package:flutter_ota_kit_aws/flutter_ota_kit_aws.dart';
-import 'package:flutter_ota_kit_cloudflare/flutter_ota_kit_cloudflare.dart';
-import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart';
-import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
-import 'package:flutter_ota_kit_postgres/flutter_ota_kit_postgres.dart';
-import 'package:flutter_ota_kit_supabase/flutter_ota_kit_supabase.dart';
+import 'package:flutter_ota_kit/src/pkg/aws/flutter_ota_kit_aws.dart';
+import 'package:flutter_ota_kit/src/pkg/cloudflare/flutter_ota_kit_cloudflare.dart';
+import 'package:flutter_ota_kit/src/pkg/plugin_core/flutter_ota_kit_plugin_core.dart';
+import 'package:flutter_ota_kit/src/pkg/pocketbase/flutter_ota_kit_pocketbase.dart';
+import 'package:flutter_ota_kit/src/pkg/postgres/flutter_ota_kit_postgres.dart';
+import 'package:flutter_ota_kit/src/pkg/supabase/flutter_ota_kit_supabase.dart';
 
 import 'config.dart';
 

package/dart-src/packages/cli-tools/lib/src/commands/build.dart

@@ -17,10 +17,12 @@ class BuildCommand extends FlutterPatcherCommand {
       )
       ..addMultiOption(
         'assets',
+        abbr: 'A',
         help: 'Asset keys to include as overlay updates (repeatable).',
       )
       ..addOption(
         'version',
+        abbr: 'V',
         help: 'Patch version string (stored in manifest.version).',
       )
       ..addOption(

package/dart-src/packages/cli-tools/lib/src/commands/bundle.dart

@@ -151,7 +151,7 @@ class BundleShowCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
   }
 
   final FlutterPatcherConfig? config;
@@ -201,7 +201,7 @@ class BundleDeleteCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
     argParser.addFlag(
       'keep-storage',
       help: 'Do not delete the storage object.',
@@ -252,7 +252,7 @@ class BundleDisableCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
   }
 
   final FlutterPatcherConfig? config;
@@ -290,7 +290,7 @@ class BundleEnableCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
   }
 
   final FlutterPatcherConfig? config;
@@ -328,7 +328,7 @@ class BundleForceCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
     argParser.addFlag(
       'off',
       help: 'Clear the force-update flag instead of setting it.',
@@ -377,7 +377,7 @@ class BundlePromoteCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
     argParser.addOption('channel', abbr: 'c', help: 'Target channel.');
   }
 
@@ -426,7 +426,7 @@ class BundleUpdateCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
     argParser.addOption('message', abbr: 'm', help: 'New release message.');
     argParser.addOption(
       'target-version',

package/dart-src/packages/cli-tools/lib/src/commands/deploy.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
+import 'package:flutter_ota_kit/src/pkg/core/flutter_ota_kit_core.dart';
 
 import '../backend.dart';
 import '../cli_base.dart';
@@ -37,10 +37,12 @@ class DeployCommand extends FlutterPatcherCommand {
     argParser.addFlag('force', abbr: 'f', help: 'Force the update on clients.');
     argParser.addOption(
       'target-app-version',
+      abbr: 't',
       help: 'Semver range target (XOR with fingerprint-hash).',
     );
     argParser.addOption(
       'fingerprint-hash',
+      abbr: 'F',
       help: 'Fingerprint hash target (XOR with target-app-version).',
     );
     argParser.addOption(
@@ -50,6 +52,7 @@ class DeployCommand extends FlutterPatcherCommand {
     );
     argParser.addOption(
       'git-commit-hash',
+      abbr: 'g',
       help: 'Git commit hash (auto-detected).',
     );
     argParser.addOption(

package/dart-src/packages/cli-tools/lib/src/commands/pocketbase.dart

@@ -6,7 +6,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
+import 'package:flutter_ota_kit/src/pkg/pocketbase/flutter_ota_kit_pocketbase.dart';
 import 'package:path/path.dart' as p;
 
 import '../cli_base.dart';

package/dart-src/packages/cli-tools/lib/src/commands/rollback.dart

@@ -1,5 +1,5 @@
 import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
-import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
+import 'package:flutter_ota_kit/src/pkg/core/flutter_ota_kit_core.dart';
 
 import '../ui/ui.dart';
 

package/dart-src/packages/cli-tools/lib/src/config.dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:flutter_ota_kit_aws/flutter_ota_kit_aws.dart';
+import 'package:flutter_ota_kit/src/pkg/aws/flutter_ota_kit_aws.dart';
 import 'package:postgres/postgres.dart';
-import 'package:flutter_ota_kit_cloudflare/flutter_ota_kit_cloudflare.dart';
-import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
-import 'package:flutter_ota_kit_postgres/flutter_ota_kit_postgres.dart';
+import 'package:flutter_ota_kit/src/pkg/cloudflare/flutter_ota_kit_cloudflare.dart';
+import 'package:flutter_ota_kit/src/pkg/pocketbase/flutter_ota_kit_pocketbase.dart';
+import 'package:flutter_ota_kit/src/pkg/postgres/flutter_ota_kit_postgres.dart';
 
-import 'package:flutter_ota_kit_supabase/flutter_ota_kit_supabase.dart';
+import 'package:flutter_ota_kit/src/pkg/supabase/flutter_ota_kit_supabase.dart';
 import 'package:path/path.dart' as p;
 
 /// Resolved configuration for the flutter_ota_kit CLI.

package/dart-src/packages/cli-tools/lib/src/operations.dart

@@ -2,8 +2,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:crypto/crypto.dart';
-import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
-import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart';
+import 'package:flutter_ota_kit/src/pkg/core/flutter_ota_kit_core.dart';
+import 'package:flutter_ota_kit/src/pkg/plugin_core/flutter_ota_kit_plugin_core.dart';
 
 import 'backend.dart';
 import 'sign.dart';

package/dart-src/packages/cli-tools/pubspec.yaml

@@ -8,6 +8,7 @@ publish_to: none
 
 environment:
   sdk: '>=3.13.2 <4.0.0'
+  flutter: '>=3.47.2'
 
 dependencies:
   args: '>=2.4.0 <3.0.0'
@@ -17,13 +18,11 @@ dependencies:
   collection: ^1.18.0
   cryptography: ^2.7.0
   postgres: ^3.4.0
-  flutter_ota_kit_core: ^0.1.6
-  flutter_ota_kit_plugin_core: ^0.0.8
-  flutter_ota_kit_supabase: ^0.1.8
-  flutter_ota_kit_postgres: ^0.1.7
-  flutter_ota_kit_cloudflare: ^0.1.7
-  flutter_ota_kit_aws: ^0.1.7
-  flutter_ota_kit_pocketbase: ^0.1.4
+  # All former sub-packages (core, plugin-core, backends) now live inside the
+  # merged `flutter_ota_kit` package under lib/src/pkg/. The CLI depends on the
+  # single package instead of eight. NOTE: `flutter_ota_kit` is a Flutter plugin,
+  # so building the CLI now requires the Flutter SDK (not just the Dart SDK).
+  flutter_ota_kit: ^0.2.0
   http: ^1.2.0
   shelf: ^1.4.0
 
@@ -31,17 +30,5 @@ dev_dependencies:
   test: ^1.25.0
 
 dependency_overrides:
-  flutter_ota_kit_core:
-    path: ../core
-  flutter_ota_kit_plugin_core:
-    path: ../../plugins/plugin-core
-  flutter_ota_kit_supabase:
-    path: ../../plugins/supabase
-  flutter_ota_kit_postgres:
-    path: ../../plugins/postgres
-  flutter_ota_kit_cloudflare:
-    path: ../../plugins/cloudflare
-  flutter_ota_kit_aws:
-    path: ../../plugins/aws
-  flutter_ota_kit_pocketbase:
-    path: ../../plugins/pocketbase
+  flutter_ota_kit:
+    path: ../../root

package/dart-src/packages/cli-tools/test/backends_test.dart

@@ -1,9 +1,9 @@
 import 'dart:io';
 
-import 'package:flutter_ota_kit_aws/flutter_ota_kit_aws.dart';
+import 'package:flutter_ota_kit/src/pkg/aws/flutter_ota_kit_aws.dart';
 import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
-import 'package:flutter_ota_kit_cloudflare/flutter_ota_kit_cloudflare.dart';
-import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart';
+import 'package:flutter_ota_kit/src/pkg/cloudflare/flutter_ota_kit_cloudflare.dart';
+import 'package:flutter_ota_kit/src/pkg/plugin_core/flutter_ota_kit_plugin_core.dart';
 import 'package:test/test.dart';
 
 import 'mocks/mock_aws_s3_client.dart' as aws;

package/dart-src/packages/cli-tools/test/cli_test.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
-import 'package:flutter_ota_kit_supabase/src/supabase_client_adapter.dart';
+import 'package:flutter_ota_kit/src/pkg/supabase/src/supabase_client_adapter.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 

package/dart-src/packages/cli-tools/test/mocks/mock_aws_s3_client.dart

@@ -1,9 +1,9 @@
 import 'dart:convert' show utf8;
 
-import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart'
+import 'package:flutter_ota_kit/src/pkg/plugin_core/flutter_ota_kit_plugin_core.dart'
     show StorageObject;
 
-import 'package:flutter_ota_kit_aws/flutter_ota_kit_aws.dart'
+import 'package:flutter_ota_kit/src/pkg/aws/flutter_ota_kit_aws.dart'
     show AwsS3ClientLike, AwsS3StorageConfig;
 
 /// In-memory store backing [MockAwsS3Client].

package/dart-src/packages/cli-tools/test/mocks/mock_d1_client.dart

@@ -1,13 +1,13 @@
 import 'dart:convert' show jsonDecode;
 
-import 'package:flutter_ota_kit_cloudflare/flutter_ota_kit_cloudflare.dart'
+import 'package:flutter_ota_kit/src/pkg/cloudflare/flutter_ota_kit_cloudflare.dart'
     show
         CloudflareWorkerDatabaseConfig,
         D1ClientLike,
         D1DatabaseConfig,
         cloudflareWorkerDatabase,
         d1Database;
-import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart'
+import 'package:flutter_ota_kit/src/pkg/plugin_core/flutter_ota_kit_plugin_core.dart'
     show DatabasePlugin;
 
 /// In-memory store backing [MockD1Client], mirroring the D1 tables.

package/dart-src/packages/cli-tools/test/mocks/mock_pocketbase_client.dart

@@ -5,7 +5,7 @@
 /// `backends_test.dart`.
 library;
 
-import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
+import 'package:flutter_ota_kit/src/pkg/pocketbase/flutter_ota_kit_pocketbase.dart';
 import 'package:http/http.dart' as http;
 
 class MockPocketBaseClient implements PocketBaseClient {
@@ -18,6 +18,9 @@ class MockPocketBaseClient implements PocketBaseClient {
   String? _email;
   String? _password;
 
+  @override
+  String get authToken => (_email != null && _password != null) ? 'mock-token' : '';
+
   @override
   void adminCredentials(String email, String password) {
     _email = email;

package/dart-src/packages/cli-tools/test/mocks/mock_postgres_client.dart

@@ -1,8 +1,8 @@
 import 'dart:typed_data';
 
-import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart';
+import 'package:flutter_ota_kit/src/pkg/plugin_core/flutter_ota_kit_plugin_core.dart';
 
-import 'package:flutter_ota_kit_postgres/flutter_ota_kit_postgres.dart';
+import 'package:flutter_ota_kit/src/pkg/postgres/flutter_ota_kit_postgres.dart';
 
 /// In-memory store backing [MockPostgresClient]. Mirrors the `bundles` and
 /// `bundle_patches` tables (snake_case row maps).

package/dart-src/packages/cli-tools/test/pocketbase_smoke_test.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
+import 'package:flutter_ota_kit/src/pkg/pocketbase/flutter_ota_kit_pocketbase.dart';
 import 'package:test/test.dart';
 
 import 'mocks/mock_pocketbase_client.dart' as pb;