Skip to content

refactor(cli): simplify and clean up new command option mapping #3102

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor(cli): simplify and clean up new command option mapping #3102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 33 additions & 41 deletions commands/new.command.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ 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 [packageManager]',
'Specify package manager.',
)
.option('-p, --package-manager [packageManager]', 'Specify package manager.')
.option(
'-l, --language [language]',
'Programming language to be used (TypeScript or JavaScript)',
Expand All @@ -33,46 +30,41 @@ export class NewCommand extends AbstractCommand {
)
.option('--strict', 'Enables strict mode in TypeScript.', false)
.action(async (name: string, command: Command) => {
const options: Input[] = [];
const availableLanguages = ['js', 'ts', 'javascript', 'typescript'];
options.push({ name: 'directory', value: command.directory });
options.push({ name: 'dry-run', value: command.dryRun });
options.push({ name: 'skip-git', value: command.skipGit });
options.push({ name: 'skip-install', value: command.skipInstall });
options.push({ name: 'strict', value: command.strict });
options.push({
name: 'packageManager',
value: command.packageManager,
});
options.push({ name: 'collection', value: command.collection });
const langInput = command.language?.toLowerCase();
const langMap: Record<string, string> = {
javascript: 'js',
typescript: 'ts',
};

if (!!command.language) {
const lowercasedLanguage = command.language.toLowerCase();
const langMatch = availableLanguages.includes(lowercasedLanguage);
if (!langMatch) {
throw new Error(
`Invalid language "${command.language}" selected. Available languages are "typescript" or "javascript"`,
);
}
switch (lowercasedLanguage) {
case 'javascript':
command.language = 'js';
break;
case 'typescript':
command.language = 'ts';
break;
default:
command.language = lowercasedLanguage;
break;
}
if (langInput && !['js', 'ts', 'javascript', 'typescript'].includes(langInput)) {
throw new Error(
`Invalid language "${command.language}" selected. Available languages are "typescript" or "javascript".`,
);
}
options.push({
name: 'language',
value: command.language,
});

const inputs: Input[] = [];
inputs.push({ name: 'name', value: name });
command.language = langMap[langInput] || langInput;

const cliKeys: Record<string, string> = {
dryRun: 'dry-run',
skipGit: 'skip-git',
skipInstall: 'skip-install',
};

const options: Input[] = [
'directory',
'dryRun',
'skipGit',
'skipInstall',
'strict',
'packageManager',
'collection',
'language',
].map((key) => ({
name: cliKeys[key] ?? key,
value: command[key],
}));

const inputs: Input[] = [{ name: 'name', value: name }];

await this.action.handle(inputs, options);
});
Expand Down