feat: Added improvements to import and init saving of results

Author: kevinwang5658

src/orchestrators/import.ts

@@ -470,19 +470,15 @@ ${JSON.stringify(unsupportedTypeIds)}`);
   private static async generateNewImportFileName(): Promise<string> {
     const cwd = process.cwd();
 
-    // Save codify to a new folder so it doesn't interfere with the current project
-    const folderPath = path.join(cwd, 'codify-imports')
-    await FileUtils.createFolder(folderPath)
-
-    let fileName = path.join(folderPath, 'import.codify.jsonc')
+    let fileName = path.join(cwd, 'import.codify.jsonc')
     let counter = 1;
 
     while (true) {
       if (!(await FileUtils.fileExists(fileName))) {
         return fileName;
       }
 
-      fileName = path.join(folderPath, `import-${counter}.codify.jsonc`);
+      fileName = path.join(cwd, `import-${counter}.codify.jsonc`);
       counter++;
     }
   }

src/orchestrators/init.ts

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { tildify } from 'codify-plugin-lib';
 import path from 'node:path';
 
 import { PluginInitOrchestrator } from '../common/initialize-plugins.js';
@@ -82,10 +83,11 @@ Enjoy!
 
     while (!isValidSaveLocation) {
       input = (await reporter.promptInput(
-        `Where to save the new Codify configs? ${chalk.grey.dim('(leave blank for ~/codify.jsonc)')}`,
-        error ? `Invalid location: ${input} already exists` : undefined)
+          `Where to save the new Codify configs? ${chalk.grey.dim(`(leave blank for ${tildify(process.cwd())}/codify.jsonc)`)}`,
+          error ? `Invalid location: ${input} already exists` : undefined,
+          `${tildify(process.cwd())}/codify.jsonc`)
       )
-      input = input ? input : '~/codify.jsonc';
+      input = input ?? `${process.cwd()}/codify.jsonc`;
 
       locationToSave = path.resolve(untildify(resolvePathWithVariables(input)));
 

src/ui/components/default-component.tsx

@@ -158,7 +158,7 @@ export function DefaultComponent(props: {
         <Box flexDirection='column'>
           <Text bold>{(renderData as any).prompt}</Text>
           { (renderData as any).error && (<Text color='red'>{(renderData as any).error}</Text>) }
-          <TextInput onSubmit={(result) => emitter.emit(RenderEvent.PROMPT_RESULT, result)} placeholder='~/codify.jsonc' />
+          <TextInput onSubmit={(result) => emitter.emit(RenderEvent.PROMPT_RESULT, result)} placeholder={(renderData as any).placeholder} />
         </Box>
       )
     }

src/ui/reporters/default-reporter.tsx

@@ -69,9 +69,9 @@ export class DefaultReporter implements Reporter {
     )
   }
 
-  async promptInput(prompt: string, error?: string, validation?: () => Promise<boolean>, autoComplete?: (input: string) => string[]): Promise<string> {
+  async promptInput(prompt: string, error?: string, placeholder?: string): Promise<string> {
     return this.updateStateAndAwaitEvent<string>(
-      () => this.updateRenderState(RenderStatus.PROMPT_INPUT, { prompt, error }),
+      () => this.updateRenderState(RenderStatus.PROMPT_INPUT, { prompt, error, placeholder }),
       RenderEvent.PROMPT_RESULT,
     )
   }

src/ui/reporters/plain-reporter.ts

@@ -107,7 +107,7 @@ export class PlainReporter implements Reporter {
 
   async displayProgress(): Promise<void> {}
 
-  async promptInput(prompt: string, error?: string, validation?: () => Promise<boolean>, autoComplete?: (input: string) => string[]): Promise<string> {
+  async promptInput(prompt: string, error?: string): Promise<string> {
     return new Promise((resolve) => {
       this.rl.question(prompt + (error ? chalk.red(`\n${error} `) : ''), (answer) => resolve(answer));
     });

src/ui/reporters/reporter.ts

@@ -53,7 +53,7 @@ export interface Reporter {
 
   promptInitResultSelection(availableTypes: string[]): Promise<string[]>;
 
-  promptInput(prompt: string, error?: string, validation?: () => Promise<boolean>, autoComplete?: (input: string) => string[]): Promise<string>;
+  promptInput(prompt: string, error?: string, placeholder?: string): Promise<string>;
 
   promptConfirmation(message: string): Promise<boolean>
 

test/orchestrator/mocks/reporter.ts

@@ -1,12 +1,12 @@
-import { SpawnStatus, SudoRequestData, SudoRequestResponseData } from 'codify-schemas';
+import { SudoRequestData } from 'codify-schemas';
 
 import { Plan } from '../../../src/entities/plan.js';
 import { ResourceConfig } from '../../../src/entities/resource-config.js';
 import { ResourceInfo } from '../../../src/entities/resource-info.js';
+import { FileModificationResult } from '../../../src/generators/index.js';
 import { ImportResult } from '../../../src/orchestrators/import.js';
 import { prettyFormatPlan } from '../../../src/ui/plan-pretty-printer.js';
 import { PromptType, Reporter } from '../../../src/ui/reporters/reporter.js';
-import { FileModificationResult } from '../../../src/utils/file-modification-calculator.js';
 
 export interface MockReporterConfig {
   validatePlan?: (plan: Plan) => Promise<void> | void;
@@ -15,7 +15,7 @@ export interface MockReporterConfig {
   promptConfirmation?: () => boolean;
   promptOptions?: (message: string, options: string[]) => number;
   promptUserForValues?: (resourceInfo: ResourceInfo[]) => Promise<ResourceConfig[]> | ResourceConfig[];
-  promptInput?: (prompt: string, error?: string | undefined, validation?: (() => Promise<boolean>) | undefined, autoComplete?: ((input: string) => string[]) | undefined) => Promise<string>
+  promptInput?: (prompt: string, error?: string | undefined) => Promise<string>
   promptInitResultSelection?: (availableTypes: string[]) => Promise<string[]> | string[];
   hide?: () => void;
   displayImportResult?: (importResult: ImportResult, showConfigs: boolean) => Promise<void> | void;
@@ -48,8 +48,8 @@ export class MockReporter implements Reporter {
     return (await this.config?.promptInitResultSelection?.(availableTypes)) ?? [];
   }
 
-  async promptInput(prompt: string, error?: string | undefined, validation?: (() => Promise<boolean>) | undefined, autoComplete?: ((input: string) => string[]) | undefined): Promise<string> {
-    return (await this.config?.promptInput?.(prompt, error, validation)) ?? '';
+  async promptInput(prompt: string, error?: string | undefined): Promise<string> {
+    return (await this.config?.promptInput?.(prompt, error)) ?? '';
   }
 
   async promptPressKeyToContinue(message?: string | undefined): Promise<void> {}