Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from Nov 7, 2022
Merged

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

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0152c0d
fix(core): fix custom workspace-generator options
Roozenboom Oct 25, 2022
53498d6
fix(core): use null coalescing operator to check if property exists
Roozenboom Oct 26, 2022
2d6e4ea
Merge remote-tracking branch 'origin/master' into bugfix/custom-works…
Roozenboom Nov 3, 2022
fb625ee
fix(core): resolve merge conflict and use null coalescing operator fo…
Roozenboom Nov 3, 2022
9ad9cbd
Merge remote-tracking branch 'origin/master' into bugfix/custom-works…
Roozenboom Nov 7, 2022
1fb975b
fix(core): only add null coalescing
Roozenboom Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 20 additions & 20 deletions packages/nx/src/command-line/nx-commands.ts
View file
Open in desktop
Expand Up @@ -784,33 +784,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 }) => {
Expand Down