Skip to content
Closed
Changes from all commits
Commits
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
18 changes: 8 additions & 10 deletions packages/typegpu-cli/src/utils/inputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ function isValidPackageName(packageName: string) {
return /^(?:@[a-z\d][a-z\d\-._]*\/)?[a-z\d][a-z\d\-._]*$/.test(packageName.trim());
}

export async function getProjectDirectory(initialValue: string) {
export async function getProjectDirectory(defaultValue: string) {
let projectDir = await p.text({
message: 'Project directory:',
placeholder: initialValue,
initialValue,
placeholder: defaultValue,
validate: (value) => {
return value && !isValidProjectDirectory(value) ? 'Invalid project directory.' : undefined;
},
Expand All @@ -23,23 +22,22 @@ export async function getProjectDirectory(initialValue: string) {
cancelExit();
}

projectDir ??= '.';
return projectDir.trim();
projectDir = projectDir?.trim() || defaultValue;
return projectDir;
}

export async function getPackageName(initialValue: string) {
export async function getPackageName(defaultValue: string) {
const packageName = await p.text({
message: 'Package name:',
placeholder: initialValue,
initialValue,
placeholder: defaultValue,
validate: (value) => {
return !value || !isValidPackageName(value) ? 'Invalid package name.' : undefined;
return value && !isValidPackageName(value) ? 'Invalid package name.' : undefined;
},
Comment on lines 31 to 35
});

if (p.isCancel(packageName)) {
cancelExit();
}

return packageName.trim();
return packageName?.trim() || defaultValue;
}
Loading