Merge branch 'main' into @satya164/configure-tools

Author: satya164

packages/create-react-native-library/src/input.ts

@@ -196,6 +196,33 @@ export async function createQuestions({
     // Ignore error
   }
 
+  const validateDirectory = (input: string) => {
+    if (!input) {
+      return 'Cannot be empty';
+    }
+
+    const targetPath = path.join(process.cwd(), input);
+
+    if (fs.pathExistsSync(targetPath)) {
+      const stat = fs.statSync(targetPath);
+
+      if (!stat.isDirectory()) {
+        return 'Path exists and is not a directory';
+      }
+
+      const files = fs.readdirSync(targetPath);
+
+      const isEmpty =
+        files.length === 0 || (files.length === 1 && files[0] === '.git');
+
+      if (!isEmpty) {
+        return 'Directory already exists';
+      }
+    }
+
+    return true;
+  };
+
   const questions: Question<keyof PromptAnswers>[] = [
     {
       type:
@@ -209,7 +236,17 @@ export async function createQuestions({
       default: false,
     },
     {
-      type: (_, answers) => (name && !(answers.local ?? local) ? null : 'text'),
+      type: (_, answers) => {
+        if (
+          name &&
+          !(answers.local ?? local) &&
+          validateDirectory(name) === true
+        ) {
+          return null;
+        }
+
+        return 'text';
+      },
       name: 'directory',
       message: `Where do you want to create the library?`,
       initial: (_, answers) => {
@@ -219,32 +256,7 @@ export async function createQuestions({
 
         return name ?? '';
       },
-      validate: (input) => {
-        if (!input) {
-          return 'Cannot be empty';
-        }
-
-        const targetPath = path.join(process.cwd(), input);
-
-        if (fs.pathExistsSync(targetPath)) {
-          const stat = fs.statSync(targetPath);
-
-          if (!stat.isDirectory()) {
-            return 'Path exists and is not a directory';
-          }
-
-          const files = fs.readdirSync(targetPath);
-
-          const isEmpty =
-            files.length === 0 || (files.length === 1 && files[0] === '.git');
-
-          if (!isEmpty) {
-            return 'Directory already exists';
-          }
-        }
-
-        return true;
-      },
+      validate: validateDirectory,
       default: name,
     },
     {

packages/create-react-native-library/src/utils/prompt.ts

@@ -95,8 +95,11 @@ export async function prompt<
         // @ts-expect-error assume the passed value is correct
         defaultAnswers[question.name] = question.default;
 
-        // Don't prompt questions with a default value when not interactive
-        if (!interactive) {
+        // Don't prompt questions with a valid default value when not interactive
+        if (
+          !interactive &&
+          question.validate?.(String(question.default)) !== false
+        ) {
           continue;
         }
       }