avoid app command coverage tdz

Author: sunnylqm

src/app.ts

@@ -119,40 +119,42 @@ async function selectApp({
   );
 }
 
-export const appCommands = {
-  createApp: async ({
-    options,
-  }: {
-    options: { name: string; downloadUrl: string; platform?: Platform | '' };
-  }) => {
-    const name = options.name || (await question(t('appNameQuestion')));
-    const { downloadUrl } = options;
-    const platform = await getPlatform(options.platform);
-    const { id } = await post('/app/create', { name, platform, downloadUrl });
-    console.log(t('createAppSuccess', { id }));
-    await selectApp({
-      args: [String(id)],
-      options: { platform },
-    });
-  },
-  deleteApp: async ({
-    args,
-    options,
-  }: {
-    args: string[];
-    options: { platform: Platform };
-  }) => {
-    const { platform } = options;
-    const id = args[0] || (await chooseApp(platform)).id;
-    if (!id) {
-      console.log(t('cancelled'));
-    }
-    await doDelete(`/app/${id}`);
-    console.log(t('operationSuccess'));
-  },
-  apps: async ({ options }: { options: { platform?: Platform | '' } }) => {
-    const { platform = '' } = options;
-    await listApp(platform);
-  },
-  selectApp,
-};
+export function getAppCommands() {
+  return {
+    createApp: async ({
+      options,
+    }: {
+      options: { name: string; downloadUrl: string; platform?: Platform | '' };
+    }) => {
+      const name = options.name || (await question(t('appNameQuestion')));
+      const { downloadUrl } = options;
+      const platform = await getPlatform(options.platform);
+      const { id } = await post('/app/create', { name, platform, downloadUrl });
+      console.log(t('createAppSuccess', { id }));
+      await selectApp({
+        args: [String(id)],
+        options: { platform },
+      });
+    },
+    deleteApp: async ({
+      args,
+      options,
+    }: {
+      args: string[];
+      options: { platform: Platform };
+    }) => {
+      const { platform } = options;
+      const id = args[0] || (await chooseApp(platform)).id;
+      if (!id) {
+        console.log(t('cancelled'));
+      }
+      await doDelete(`/app/${id}`);
+      console.log(t('operationSuccess'));
+    },
+    apps: async ({ options }: { options: { platform?: Platform | '' } }) => {
+      const { platform = '' } = options;
+      await listApp(platform);
+    },
+    selectApp,
+  };
+}

src/bin.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { loadSession } from './api';
-import { appCommands } from './app';
+import { getAppCommands } from './app';
 import { bundleCommands } from './bundle';
 import { diffCommands } from './diff';
 import { installCommands } from './install';
@@ -43,7 +43,7 @@ const commandHandlers: Record<string, CliCommandHandler> = {
   ...userCommands,
   ...bundleCommands,
   ...diffCommands,
-  ...appCommands,
+  ...getAppCommands(),
   ...packageCommands,
   ...versionCommands,
   ...installCommands,

src/provider.ts

@@ -171,8 +171,10 @@ export class CLIProviderImpl implements CLIProvider {
     return this.runMessageCommand(
       async () => {
         const resolvedPlatform = await this.getPlatform(platform);
-        const { appCommands } = await import('./app');
-        await appCommands.apps({ options: { platform: resolvedPlatform } });
+        const { getAppCommands } = await import('./app');
+        await getAppCommands().apps({
+          options: { platform: resolvedPlatform },
+        });
       },
       'Unknown error listing apps',
       'Apps listed successfully',
@@ -182,8 +184,8 @@ export class CLIProviderImpl implements CLIProvider {
   async createApp(name: string, platform: Platform): Promise<CommandResult> {
     return this.runMessageCommand(
       async () => {
-        const { appCommands } = await import('./app');
-        await appCommands.createApp({
+        const { getAppCommands } = await import('./app');
+        await getAppCommands().createApp({
           options: {
             name,
             platform,

tests/app.test.ts

@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, spyOn, test } from 'bun:test';
 import fs from 'fs';
 import * as api from '../src/api';
-import { appCommands, assertPlatform, getSelectedApp } from '../src/app';
+import { assertPlatform, getAppCommands, getSelectedApp } from '../src/app';
 
 describe('assertPlatform', () => {
   test('accepts ios', () => {
@@ -133,7 +133,7 @@ describe('appCommands.createApp', () => {
     writeFileSpy = spyOn(fs.promises, 'writeFile').mockResolvedValue();
     consoleLogSpy = spyOn(console, 'log').mockImplementation(() => {});
 
-    const createApp = appCommands.createApp;
+    const createApp = getAppCommands().createApp;
     await createApp({
       options: {
         name: 'SmallWOD',

tests/command-handlers.test.ts

@@ -24,15 +24,6 @@ function findThisUsagesInCommandMaps(filePath: string): string[] {
   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(
@@ -43,9 +34,27 @@ function findThisUsagesInCommandMaps(filePath: string): string[] {
       ts.forEachChild(child, scanForThis);
     }
 
-    if (node.initializer) {
+    if (
+      ts.isVariableDeclaration(node) &&
+      ts.isIdentifier(node.name) &&
+      node.name.text.endsWith('Commands') &&
+      node.initializer
+    ) {
       scanForThis(node.initializer);
+      return;
     }
+
+    if (
+      ts.isFunctionDeclaration(node) &&
+      node.name?.text.startsWith('get') &&
+      node.name.text.endsWith('Commands') &&
+      node.body
+    ) {
+      scanForThis(node.body);
+      return;
+    }
+
+    ts.forEachChild(node, visitCommandMap);
   }
 
   visitCommandMap(sourceFile);