incorporate feedback

Author: craigmichaelmartin

packages/app/src/cli/commands/app/init.ts

@@ -73,8 +73,7 @@ export default class Init extends AppCommand {
     validateFlavorValue(flags.template, flags.flavor)
 
     const inferredPackageManager = inferPackageManager(flags['package-manager'])
-    const name =
-      flags.name ?? (await generateRandomNameForSubdirectory({suffix: 'app', directory: flags.path, isValidName}))
+    const name = flags.name ?? (await getAppName(flags.path))
 
     // Force user authentication before prompting.
     let developerPlatformClient = selectDeveloperPlatformClient()
@@ -128,6 +127,15 @@ export default class Init extends AppCommand {
   }
 }
 
+async function getAppName(directory: string): Promise<string> {
+  for (let i = 0; i < 3; i++) {
+    // eslint-disable-next-line no-await-in-loop
+    const name = await generateRandomNameForSubdirectory({suffix: 'app', directory})
+    if (isValidName(name)) return name
+  }
+  return ''
+}
+
 export type SelectAppOrNewAppNameResult =
   | {
       result: 'new'

packages/cli-kit/src/public/common/string.ts

@@ -110,7 +110,6 @@ const SAFE_RANDOM_BUSINESS_NOUNS = [
   'franchise',
   'subsidiary',
   'logistics',
-  'infrastructure',
   'sponsorship',
   'partnership',
   'tax',

packages/cli-kit/src/public/node/fs.test.ts

@@ -218,73 +218,6 @@ describe('makeDirectoryWithRandomName', () => {
       expect(takeRandomFromArray).toHaveBeenCalledTimes(4)
     })
   })
-
-  test('returns an empty string if unable to generate an available name', async () => {
-    await inTemporaryDirectory(async (tmpDir) => {
-      // Given
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('taken')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('directory')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('taken')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('directory')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('taken')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('directory')
-
-      const content = 'test'
-      const filePath = joinPath(tmpDir, 'taken-directory-app')
-      await writeFile(filePath, content)
-
-      // When
-      const got = await generateRandomNameForSubdirectory({suffix: 'app', directory: tmpDir})
-
-      // Then
-      expect(got).toEqual('')
-      expect(takeRandomFromArray).toHaveBeenCalledTimes(6)
-    })
-  })
-
-  test('rerolls the name if an invalid name is produced', async () => {
-    await inTemporaryDirectory(async (tmpDir) => {
-      // Given
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('invalid')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('name')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('valid')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('name')
-
-      // When
-      const got = await generateRandomNameForSubdirectory({
-        suffix: 'app',
-        directory: tmpDir,
-        isValidName: (name: string) => name !== 'invalid-name-app',
-      })
-
-      // Then
-      expect(got).toEqual('valid-name-app')
-      expect(takeRandomFromArray).toHaveBeenCalledTimes(4)
-    })
-  })
-
-  test('returns an empty string if unable to generate a valid name', async () => {
-    await inTemporaryDirectory(async (tmpDir) => {
-      // Given
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('invalid')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('name')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('invalid')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('name')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('invalid')
-      vi.mocked(takeRandomFromArray).mockReturnValueOnce('name')
-
-      // When
-      const got = await generateRandomNameForSubdirectory({
-        suffix: 'app',
-        directory: tmpDir,
-        isValidName: (name: string) => name !== 'invalid-name-app',
-      })
-
-      // Then
-      expect(got).toEqual('')
-      expect(takeRandomFromArray).toHaveBeenCalledTimes(6)
-    })
-  })
 })
 
 describe('readFileSync', () => {

packages/cli-kit/src/public/node/fs.ts

@@ -468,16 +468,8 @@ interface GenerateRandomDirectoryOptions {
 
   /** Type of word to use for random name. */
   family?: RandomNameFamily
-
-  /** Used to to track how many attempts have been made to generate the name. */
-  attempts?: number
-
-  /** Predicate for validating the generated name. */
-  isValidName?: (name: string) => boolean
 }
 
-const defaultIsValidName = () => true
-
 /**
  * It generates a random directory directory name for a sub-directory.
  * It ensures that the returned directory name doesn't exist.
@@ -486,19 +478,15 @@ const defaultIsValidName = () => true
  * @returns It returns the name of the directory.
  */
 export async function generateRandomNameForSubdirectory(options: GenerateRandomDirectoryOptions): Promise<string> {
-  options.attempts = (options.attempts || 0) + 1
-  if (options.attempts > 3) return ''
-
   const generated = `${getRandomName(options.family ?? 'business')}-${options.suffix}`
-
-  const validName = (options.isValidName ?? defaultIsValidName)(generated)
-  if (!validName) return generateRandomNameForSubdirectory(options)
-
   const randomDirectoryPath = joinPath(options.directory, generated)
   const isAppDirectoryTaken = await fileExists(randomDirectoryPath)
-  if (isAppDirectoryTaken) return generateRandomNameForSubdirectory(options)
 
-  return generated
+  if (isAppDirectoryTaken) {
+    return generateRandomNameForSubdirectory(options)
+  } else {
+    return generated
+  }
 }
 
 /**