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: package name selection for application schematics #1803

Merged
merged 3 commits into from Dec 27, 2022
Merged

fix: package name selection for application schematics #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e6bd76
fix: package name option name for 'application' schematics
micalevisk Apr 9, 2022
cacca97
fix: when selecting the package manager
micalevisk Mar 25, 2022
11d551b
refactor: remove dead code on `new` action packages installation
micalevisk Mar 25, 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
50 changes: 21 additions & 29 deletions actions/new.action.ts
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ export class NewAction extends AbstractAction {
const dryRunOption = options.find((option) => option.name === 'dry-run');
const isDryRunEnabled = dryRunOption && dryRunOption.value;

await askForMissingInformation(inputs);
await askForMissingInformation(inputs, options);
await generateApplicationFiles(inputs, options).catch(exit);

const shouldSkipInstall = options.some(
Expand Down Expand Up @@ -68,6 +68,9 @@ export class NewAction extends AbstractAction {
const getApplicationNameInput = (inputs: Input[]) =>
inputs.find((input) => input.name === 'name');

const getPackageManagerInput = (inputs: Input[]) =>
inputs.find((options) => options.name === 'packageManager');

const getProjectDirectory = (
applicationName: Input,
directoryOption?: Input,
Expand All @@ -78,18 +81,25 @@ const getProjectDirectory = (
);
};

const askForMissingInformation = async (inputs: Input[]) => {
const askForMissingInformation = async (inputs: Input[], options: Input[]) => {
console.info(MESSAGES.PROJECT_INFORMATION_START);
console.info();

const prompt: inquirer.PromptModule = inquirer.createPromptModule();

const nameInput = getApplicationNameInput(inputs);
if (!nameInput!.value) {
const message = 'What name would you like to use for the new project?';
const questions = [generateInput('name', message)('nest-app')];
const answers: Answers = await prompt(questions as ReadonlyArray<Question>);
replaceInputMissingInformation(inputs, answers);
}

const packageManagerInput = getPackageManagerInput(options);
if (!packageManagerInput!.value) {
const answers = await askForPackageManager();
replaceInputMissingInformation(options, answers);
}
};

const replaceInputMissingInformation = (
Expand Down Expand Up @@ -120,10 +130,7 @@ const generateApplicationFiles = async (args: Input[], options: Input[]) => {
const mapSchematicOptions = (options: Input[]): SchematicOption[] => {
return options.reduce(
(schematicOptions: SchematicOption[], option: Input) => {
if (
option.name !== 'skip-install' &&
option.value !== 'package-manager'
) {
if (option.name !== 'skip-install') {
schematicOptions.push(new SchematicOption(option.name, option.value));
}
return schematicOptions;
Expand All @@ -137,9 +144,7 @@ const installPackages = async (
dryRunMode: boolean,
installDirectory: string,
) => {
const inputPackageManager: string = options.find(
(option) => option.name === 'package-manager',
)!.value as string;
const inputPackageManager = getPackageManagerInput(options)!.value as string;

let packageManager: AbstractPackageManager;
if (dryRunMode) {
Expand All @@ -148,32 +153,19 @@ const installPackages = async (
console.info();
return;
}
if (inputPackageManager !== undefined) {
try {
packageManager = PackageManagerFactory.create(inputPackageManager);
await packageManager.install(installDirectory, inputPackageManager);
} catch (error) {
if (error && error.message) {
console.error(chalk.red(error.message));
}
try {
packageManager = PackageManagerFactory.create(inputPackageManager);
await packageManager.install(installDirectory, inputPackageManager);
} catch (error) {
if (error && error.message) {
console.error(chalk.red(error.message));
}
} else {
packageManager = await selectPackageManager();
await packageManager.install(
installDirectory,
packageManager.name.toLowerCase(),
);
}
};

const selectPackageManager = async (): Promise<AbstractPackageManager> => {
const answers: Answers = await askForPackageManager();
return PackageManagerFactory.create(answers['package-manager']);
};

const askForPackageManager = async (): Promise<Answers> => {
const questions: Question[] = [
generateSelect('package-manager')(MESSAGES.PACKAGE_MANAGER_QUESTION)([
generateSelect('packageManager')(MESSAGES.PACKAGE_MANAGER_QUESTION)([
PackageManager.NPM,
PackageManager.YARN,
PackageManager.PNPM,
Expand Down
6 changes: 3 additions & 3 deletions commands/new.command.ts
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@ export class NewCommand extends AbstractCommand {
.option('-g, --skip-git', 'Skip git repository initialization.', false)
.option('-s, --skip-install', 'Skip package installation.', false)
.option(
'-p, --package-manager [package-manager]',
'Specify package manager.'
'-p, --package-manager [packageManager]',
'Specify package manager.',
)
.option(
'-l, --language [language]',
Expand All @@ -41,7 +41,7 @@ export class NewCommand extends AbstractCommand {
options.push({ name: 'skip-install', value: command.skipInstall });
options.push({ name: 'strict', value: command.strict });
options.push({
name: 'package-manager',
name: 'packageManager',
value: command.packageManager,
});
options.push({ name: 'collection', value: command.collection });
Expand Down