fix: command to recreate

Author: riderx

src/init.ts

@@ -18,7 +18,7 @@ import { getRepoStarStatus, isRepoStarredInSession, starAllRepositories, starRep
 import { createKeyInternal } from './key'
 import { doLoginExists, loginInternal } from './login'
 import { showReplicationProgress } from './replicationProgress'
-import { createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findRoot, findSavedKey, formatError, getAllPackagesDependencies, getAppId, getBundleVersion, getConfig, getInstalledVersion, getLocalConfig, getOrganization, getPackageScripts, getPMAndCommand, PACKNAME, projectIsMonorepo, updateConfigbyKey, updateConfigUpdater, validateIosUpdaterSync, verifyUser } from './utils'
+import { createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findRoot, findSavedKey, formatError, getAllPackagesDependencies, getAppId, getBundleVersion, getConfig, getInstalledVersion, getLocalConfig, getNativeProjectResetAdvice, getOrganization, getPackageScripts, getPMAndCommand, PACKNAME, projectIsMonorepo, updateConfigbyKey, updateConfigUpdater, validateIosUpdaterSync, verifyUser } from './utils'
 
 interface SuperOptions extends Options {
   local: boolean
@@ -188,13 +188,14 @@ async function saveAppIdToCapacitorConfig(appId: string) {
 }
 
 function stopForBrokenIosSync(platformRunner: string, details: string[]): never {
+  const resetAdvice = getNativeProjectResetAdvice(platformRunner, 'ios')
   pLog.error('Capgo iOS dependency sync verification failed.')
   for (const detail of details) {
     pLog.error(detail)
   }
   pLog.error('Stop here to avoid testing on a broken native iOS project.')
-  pLog.warn('Best fix: run this in your terminal to reset iOS and sync again.')
-  pLog.info(`${platformRunner} cap rm ios && ${platformRunner} cap add ios && ${platformRunner} cap sync ios`)
+  pLog.warn(resetAdvice.summary)
+  pLog.info(resetAdvice.command)
   pOutro('After reset, run the same `capgo init ...` command to resume onboarding from where you left off (no need to redo previous steps).')
   exit(1)
 }

src/utils.ts

@@ -1550,6 +1550,14 @@ export function getPMAndCommand() {
   return { pm, command: pmCommand, installCommand: `${pm} ${pmCommand}`, runner: pmRunner }
 }
 
+export function getNativeProjectResetAdvice(platformRunner: string, nativePlatform: 'ios' | 'android') {
+  const nativeLabel = nativePlatform === 'ios' ? 'iOS' : 'Android'
+  return {
+    summary: `Best fix: recreate and sync ${nativeLabel} with this one-line command.`,
+    command: `rm -rf ${nativePlatform} && ${platformRunner} cap add ${nativePlatform} && ${platformRunner} cap sync ${nativePlatform}`,
+  }
+}
+
 function readDirRecursively(dir: string): string[] {
   const entries = readdirSync(dir, { withFileTypes: true })
   const files = entries.flatMap((entry) => {
@@ -2264,15 +2272,16 @@ export async function promptAndSyncCapacitor(
     if (options?.validateIosUpdater) {
       const syncValidation = validateIosUpdaterSync(cwd(), options.packageJsonPath)
       if (syncValidation.shouldCheck && !syncValidation.valid) {
+        const resetAdvice = getNativeProjectResetAdvice(pm.runner, 'ios')
         s.stop('iOS sync check failed ❌')
         log.error('Capgo iOS dependency sync verification failed.')
         for (const detail of syncValidation.details) {
           log.error(detail)
         }
         log.error('Stop here to avoid testing on a broken native iOS project.')
-        log.warn('Best fix: run this in your terminal to reset iOS and sync again.')
-        log.info(`${pm.runner} cap rm ios && ${pm.runner} cap add ios && ${pm.runner} cap sync ios`)
-        throw new Error('iOS sync validation failed. Reset your iOS folder with the one-line command above and retry.')
+        log.warn(resetAdvice.summary)
+        log.info(resetAdvice.command)
+        throw new Error('iOS sync validation failed. Delete your iOS folder, then rerun the add and sync commands above and retry.')
       }
     }