fix(nxls): take default options into account when prefilling as-provi…

…ded options (nrwl#1943)
work933k · Nov 20, 2023 · 73662b2 · 73662b2
1 parent 2637fc3
commit 73662b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/libs/shared/nx-console-plugins/src/lib/internal-plugins/name-and-directory.plugin.ts b/libs/shared/nx-console-plugins/src/lib/internal-plugins/name-and-directory.plugin.ts
@@ -15,6 +15,9 @@ export const nameAndDirectoryProcessor: SchemaProcessor = (
     return schema;
   }
 
+  const nadfDefault = schema.options.find(
+    (opt) => opt.name === 'nameAndDirectoryFormat'
+  )?.default;
   return {
     ...schema,
     options: schema.options.map((option) => {
@@ -47,7 +50,7 @@ export const nameAndDirectoryProcessor: SchemaProcessor = (
       ...schema.context,
       prefillValues: {
         ...(schema.context?.prefillValues ?? {}),
-        nameAndDirectoryFormat: 'as-provided',
+        nameAndDirectoryFormat: `${nadfDefault}` ?? 'as-provided',
       },
     },
   };

diff --git a/libs/shared/nx-console-plugins/src/lib/internal-plugins/project-name-and-root-plugin.ts b/libs/shared/nx-console-plugins/src/lib/internal-plugins/project-name-and-root-plugin.ts
@@ -36,6 +36,9 @@ export const projectNameAndRootProcessor: SchemaProcessor = (
     };
   }
 
+  const pnarfDefault = schema.options.find(
+    (opt) => opt.name === 'projectNameAndRootFormat'
+  )?.default;
   return {
     ...schema,
     options: schema.options.map((option) => {
@@ -60,7 +63,7 @@ export const projectNameAndRootProcessor: SchemaProcessor = (
       ...schema.context,
       prefillValues: {
         ...(schema.context?.prefillValues ?? {}),
-        projectNameAndRootFormat: 'as-provided',
+        projectNameAndRootFormat: `${pnarfDefault}` ?? 'as-provided',
       },
     },
   };