fix cli command dispatch

Author: sunnylqm

README.md

@@ -9,7 +9,6 @@ A React Native Update command line tool for bundling, uploading native packages,
 - Single `pushy` / `cresc` CLI entrypoint
 - Backward-compatible command set
 - Programmatic provider API for build scripts and CI/CD
-- Modular command registration for custom extensions
 - TypeScript type definitions
 
 ## Installation
@@ -32,9 +31,9 @@ npx pushy uploadIpa ./app.ipa
 ## Programmatic Usage
 
 ```typescript
-import { moduleManager } from 'react-native-update-cli';
+import { CLIProviderImpl } from 'react-native-update-cli';
 
-const provider = moduleManager.getProvider();
+const provider = new CLIProviderImpl();
 
 const bundleResult = await provider.bundle({
   platform: 'ios',
@@ -53,56 +52,6 @@ const publishResult = await provider.publish({
 });
 ```
 
-## Custom Modules
-
-```typescript
-import type {
-  CLIModule,
-  CommandContext,
-  CommandResult,
-} from 'react-native-update-cli';
-
-export const myCustomModule: CLIModule = {
-  name: 'my-custom',
-  version: '1.0.0',
-  commands: [
-    {
-      name: 'custom-command',
-      description: 'My custom command',
-      handler: async (
-        context: CommandContext,
-      ): Promise<CommandResult> => {
-        return {
-          success: true,
-          data: { options: context.options },
-        };
-      },
-      options: {
-        param: { hasValue: true, description: 'Custom parameter' },
-      },
-    },
-  ],
-  init: () => {
-    console.log('Custom module initialized');
-  },
-  cleanup: () => {
-    console.log('Custom module cleanup');
-  },
-};
-```
-
-```typescript
-import { moduleManager } from 'react-native-update-cli';
-import { myCustomModule } from './my-custom-module';
-
-moduleManager.registerModule(myCustomModule);
-
-const result = await moduleManager.executeCommand('custom-command', {
-  args: [],
-  options: { param: 'value' },
-});
-```
-
 ## Built-in Commands
 
 ### Bundle

README.zh-CN.md

@@ -9,7 +9,6 @@ React Native Update 命令行工具，用于打包、上传原生包、发布 OT
 - 统一的 `pushy` / `cresc` CLI 入口
 - 保持既有命令兼容
 - 可用于构建脚本和 CI/CD 的 Provider API
-- 支持通过模块注册自定义命令
 - 提供 TypeScript 类型定义
 
 ## 安装
@@ -32,9 +31,9 @@ npx pushy uploadIpa ./app.ipa
 ## 编程调用
 
 ```typescript
-import { moduleManager } from 'react-native-update-cli';
+import { CLIProviderImpl } from 'react-native-update-cli';
 
-const provider = moduleManager.getProvider();
+const provider = new CLIProviderImpl();
 
 const bundleResult = await provider.bundle({
   platform: 'ios',
@@ -53,56 +52,6 @@ const publishResult = await provider.publish({
 });
 ```
 
-## 自定义模块
-
-```typescript
-import type {
-  CLIModule,
-  CommandContext,
-  CommandResult,
-} from 'react-native-update-cli';
-
-export const myCustomModule: CLIModule = {
-  name: 'my-custom',
-  version: '1.0.0',
-  commands: [
-    {
-      name: 'custom-command',
-      description: 'My custom command',
-      handler: async (
-        context: CommandContext,
-      ): Promise<CommandResult> => {
-        return {
-          success: true,
-          data: { options: context.options },
-        };
-      },
-      options: {
-        param: { hasValue: true, description: 'Custom parameter' },
-      },
-    },
-  ],
-  init: () => {
-    console.log('Custom module initialized');
-  },
-  cleanup: () => {
-    console.log('Custom module cleanup');
-  },
-};
-```
-
-```typescript
-import { moduleManager } from 'react-native-update-cli';
-import { myCustomModule } from './my-custom-module';
-
-moduleManager.registerModule(myCustomModule);
-
-const result = await moduleManager.executeCommand('custom-command', {
-  args: [],
-  options: { param: 'value' },
-});
-```
-
 ## 内置命令
 
 ### Bundle

cli.json

@@ -331,13 +331,8 @@
       }
     },
     "list": {
-      "description": "List all bundles",
-      "options": {
-        "output": {
-          "default": "${tempDir}/output/list",
-          "hasValue": true
-        }
-      }
+      "description": "List all available commands",
+      "options": {}
     },
     "install": {
       "description": "Install optional dependencies to the CLI",

src/index.ts

@@ -5,48 +5,26 @@ import { appCommands } from './app';
 import { bundleCommands } from './bundle';
 import { diffCommands } from './diff';
 import { installCommands } from './install';
-import { moduleManager } from './module-manager';
-import { builtinModules } from './modules';
 import { packageCommands } from './package';
-import type { CommandContext } from './types';
 import { userCommands } from './user';
 import { printVersionCommand } from './utils';
 import { t } from './utils/i18n';
 import { versionCommands } from './versions';
 
-type LegacyCommandHandler = (argv: any) => Promise<unknown> | unknown;
+type CliCommandHandler = (argv: any) => Promise<unknown> | unknown;
 
 interface CliArgv {
   command: string;
   args: string[];
   options: Record<string, any>;
 }
 
-function registerBuiltinModules() {
-  for (const module of builtinModules) {
-    try {
-      moduleManager.registerModule(module);
-    } catch (error) {
-      console.error(`Failed to register module ${module.name}:`, error);
-    }
-  }
-}
-
-function printUsage() {
+function printUsage(exitCode = 1) {
   console.log('React Native Update CLI');
   console.log('');
-  console.log('Traditional commands:');
-  for (const name of Object.keys(legacyCommands)) {
-    console.log(`  ${name}: Legacy command`);
-  }
-
-  console.log('');
-  console.log('Modular commands:');
-  const commands = moduleManager.listCommands();
-  for (const command of commands) {
-    console.log(
-      `  ${command.name}: ${command.description || 'No description'}`,
-    );
+  console.log('Commands:');
+  for (const name of Object.keys(commandHandlers)) {
+    console.log(`  ${name}`);
   }
 
   console.log('');
@@ -58,10 +36,10 @@ function printUsage() {
   console.log(
     'Visit `https://github.com/reactnativecn/react-native-update` for document.',
   );
-  process.exit(1);
+  process.exit(exitCode);
 }
 
-const legacyCommands: Record<string, LegacyCommandHandler> = {
+const commandHandlers: Record<string, CliCommandHandler> = {
   ...userCommands,
   ...bundleCommands,
   ...diffCommands,
@@ -78,41 +56,22 @@ async function run() {
     process.exit();
   }
 
-  // Register builtin modules for modular functionality
-  registerBuiltinModules();
-
   const argv: CliArgv = require('cli-arguments').parse(require('../cli.json'));
   global.NO_INTERACTIVE = argv.options['no-interactive'];
   global.USE_ACC_OSS = argv.options.acc;
 
-  const context: CommandContext = {
-    args: argv.args || [],
-    options: argv.options || {},
-  };
-
   try {
     await loadSession();
-    context.session = require('./api').getSession();
 
-    // Handle special modular commands first
     if (argv.command === 'help') {
-      printUsage();
+      printUsage(0);
     } else if (argv.command === 'list') {
-      moduleManager.listAll();
-    }
-    // Try legacy commands first for backward compatibility
-    else if (legacyCommands[argv.command]) {
-      const legacyHandler = legacyCommands[argv.command];
-      await legacyHandler(argv);
-    }
-    // Fall back to modular commands
-    else {
-      const result = await moduleManager.executeCommand(argv.command, context);
-      if (!result.success) {
-        console.error('Command execution failed:', result.error);
-        process.exit(1);
-      }
-      console.log('Command completed successfully:', result.data);
+      printUsage(0);
+    } else if (commandHandlers[argv.command]) {
+      const handler = commandHandlers[argv.command];
+      await handler(argv);
+    } else {
+      throw new Error(`Unknown command: ${argv.command}`);
     }
   } catch (err: any) {
     if (err.status === 401) {
@@ -124,12 +83,12 @@ async function run() {
   }
 }
 
+export { moduleManager } from './module-manager';
 export { CLIProviderImpl } from './provider';
 export type {
   CLIModule,
   CLIProvider,
   CommandDefinition,
 } from './types';
-export { moduleManager };
 
 run();

src/versions.ts

@@ -403,13 +403,13 @@ export const bindVersionToPackages = async ({
 };
 
 export const versionCommands = {
-  publish: async function ({
+  publish: async ({
     args,
     options,
   }: {
     args: string[];
     options: VersionCommandOptions;
-  }) {
+  }) => {
     const fn = args[0];
     const { name, description, metaInfo } = options;
 
@@ -454,7 +454,7 @@ export const versionCommands = {
       minPackageVersion ||
       maxPackageVersion
     ) {
-      await this.update({
+      await versionCommands.update({
         options: {
           versionId: id,
           platform,
@@ -472,7 +472,7 @@ export const versionCommands = {
     } else {
       const q = await question(t('updateNativePackageQuestion'));
       if (q.toLowerCase() === 'y') {
-        await this.update({
+        await versionCommands.update({
           options: {
             versionId: id,
             platform,

tests/command-handlers.test.ts

@@ -0,0 +1,64 @@
+import { describe, expect, test } from 'bun:test';
+import fs from 'fs';
+import path from 'path';
+import ts from 'typescript';
+
+const commandFiles = [
+  'src/app.ts',
+  'src/bundle.ts',
+  'src/diff.ts',
+  'src/install.ts',
+  'src/package.ts',
+  'src/user.ts',
+  'src/versions.ts',
+];
+
+function findThisUsagesInCommandMaps(filePath: string): string[] {
+  const sourceText = fs.readFileSync(filePath, 'utf8');
+  const sourceFile = ts.createSourceFile(
+    filePath,
+    sourceText,
+    ts.ScriptTarget.Latest,
+    true,
+  );
+  const errors: string[] = [];
+
+  function visitCommandMap(node: ts.Node): void {
+    if (!ts.isVariableDeclaration(node)) {
+      ts.forEachChild(node, visitCommandMap);
+      return;
+    }
+
+    if (!ts.isIdentifier(node.name) || !node.name.text.endsWith('Commands')) {
+      return;
+    }
+
+    function scanForThis(child: ts.Node): void {
+      if (child.kind === ts.SyntaxKind.ThisKeyword) {
+        const { line, character } = sourceFile.getLineAndCharacterOfPosition(
+          child.getStart(sourceFile),
+        );
+        errors.push(`${filePath}:${line + 1}:${character + 1}`);
+      }
+      ts.forEachChild(child, scanForThis);
+    }
+
+    if (node.initializer) {
+      scanForThis(node.initializer);
+    }
+  }
+
+  visitCommandMap(sourceFile);
+  return errors;
+}
+
+describe('cli command maps', () => {
+  test('do not depend on receiver this binding', () => {
+    const projectRoot = path.resolve(import.meta.dir, '..');
+    const thisUsages = commandFiles.flatMap((file) =>
+      findThisUsagesInCommandMaps(path.join(projectRoot, file)),
+    );
+
+    expect(thisUsages).toEqual([]);
+  });
+});