Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
- name: Run tests
run: npm test

- name: Publish preview package
if: github.event_name == 'pull_request'
run: npx pkg-pr-new publish --bin

- name: Pack (includes rescript build)
run: npm pack

Expand Down
21 changes: 15 additions & 6 deletions src/NewProject.res
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ let packageNameRegExp = /^[a-z0-9-]+$/

let validateProjectName = projectName =>
if projectName->String.trim->String.length === 0 {
Some("Project name must not be empty.")
Error("Project name must not be empty.")
} else if !(packageNameRegExp->RegExp.test(projectName)) {
Some("Project name may only contain lower case letters, numbers and hyphens.")
Error("Project name may only contain lower case letters, numbers and hyphens.")
} else if Fs.existsSync(Path.join2(Process.cwd(), projectName)) {
Some(`The folder ${projectName} already exist in the current directory.`)
Error(`The folder ${projectName} already exist in the current directory.`)
} else {
None
Ok()
}

let updatePackageJson = async (~projectName, ~versions) =>
Expand Down Expand Up @@ -117,14 +117,23 @@ let createNewProject = async () => {
let useDefaultVersions = Option.isSome(commandLineArguments.templateName)

let projectName = switch commandLineArguments.projectName {
| Some(projectName) if useDefaultVersions => projectName->validateProjectName->Option.getOrThrow
| Some(projectName) if useDefaultVersions =>
// Note this throws in the some case, which is why we cannot use Option.getOrThrow here.
switch validateProjectName(projectName) {
| Error(message) => JsError.throwWithMessage(message)
| Ok() => projectName
}

| initialValue =>
await P.text({
message: "What is the name of your new ReScript project?",
placeholder: "my-rescript-app",
?initialValue,
validate: validateProjectName,
validate: projectName =>
switch validateProjectName(projectName) {
| Ok() => None
| Error(error) => Some(error)
},
})->P.resultOrRaise
}

Expand Down
Loading