fix(core): fix custom workspace-generator options (#12821)

Closes: #12677 (cherry picked from commit 8abc405)
nrwl · Nov 7, 2022 · 8ba21f3 · 8ba21f3
1 parent 23fcf58
commit 8ba21f3
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/packages/nx/src/command-line/nx-commands.ts b/packages/nx/src/command-line/nx-commands.ts
@@ -777,33 +777,33 @@ async function withCustomGeneratorOptions(
   const options = [];
   const positionals = [];
 
-  Object.entries(schema.properties as WorkspaceGeneratorProperties).forEach(
-    ([name, prop]) => {
-      const option: { name: string; definition: OptionArgumentDefinition } = {
+  Object.entries(
+    (schema.properties ?? {}) as WorkspaceGeneratorProperties
+  ).forEach(([name, prop]) => {
+    const option: { name: string; definition: OptionArgumentDefinition } = {
+      name,
+      definition: {
+        describe: prop.description,
+        type: prop.type,
+        default: prop.default,
+        choices: prop.enum,
+      },
+    };
+    if (schema.required && schema.required.includes(name)) {
+      option.definition.demandOption = true;
+    }
+    options.push(option);
+    if (isPositionalProperty(prop)) {
+      positionals.push({
         name,
         definition: {
           describe: prop.description,
           type: prop.type,
-          default: prop.default,
           choices: prop.enum,
         },
-      };
-      if (schema.required && schema.required.includes(name)) {
-        option.definition.demandOption = true;
-      }
-      options.push(option);
-      if (isPositionalProperty(prop)) {
-        positionals.push({
-          name,
-          definition: {
-            describe: prop.description,
-            type: prop.type,
-            choices: prop.enum,
-          },
-        });
-      }
+      });
     }
-  );
+  });
 
   let command = generatorName;
   positionals.forEach(({ name }) => {