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.

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

Update rescript version. Breaking changes - uncurried mode. #16

Merged
merged 1 commit into from
May 28, 2024
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
20 changes: 10 additions & 10 deletions __tests__/bem_cl_test.res
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ describe("Bc tests 2", () => {
let blockName = "some-block"
let b = Bc.make(blockName)

test("block name", () => expect(b()) |> toBe(blockName))
test("block name", () => expect(b())->toBe(blockName))

test("add element", () => {
let elem = "element"
expect(b(~elem, ())) |> toBe(blockName ++ "__" ++ elem)
expect(b(~elem))->toBe(blockName ++ "__" ++ elem)
})

test("add bool modifier - true", () => {
let mod1 = "mod"
expect(b(~mods=[Bc.Bool(mod1, true)], ())) |> toBe(blockName ++ " " ++ blockName ++ "_" ++ mod1)
expect(b(~mods=[Bc.Bool(mod1, true)]))->toBe(blockName ++ " " ++ blockName ++ "_" ++ mod1)
})

test("add bool modifier - false", () => {
let mod1 = "mod"
expect(b(~mods=[Bc.Bool(mod1, false)], ())) |> toBe(blockName)
expect(b(~mods=[Bc.Bool(mod1, false)]))->toBe(blockName)
})

test("add key value modifier", () => {
let key = "key"
let value = "value"
expect(b(~mods=[Bc.KeyValue(key, value)], ())) |> toBe(
expect(b(~mods=[Bc.KeyValue(key, value)]))->toBe(
blockName ++ " " ++ blockName ++ "_" ++ key ++ "_" ++ value,
)
})
Expand All @@ -35,31 +35,31 @@ describe("Bc tests 2", () => {
let elem = "element"
let key = "key"
let value = "value"
expect(b(~elem, ~mods=[Bc.KeyValue(key, value)], ())) |> toBe(
expect(b(~elem, ~mods=[Bc.KeyValue(key, value)]))->toBe(
blockName ++ "__" ++ elem ++ " " ++ blockName ++ "__" ++ elem ++ "_" ++ key ++ "_" ++ value,
)
})

test("add element and bool modifier - true", () => {
let elem = "element"
let mod_ = "mod"
expect(b(~elem, ~mods=[Bc.Bool(mod_, true)], ())) |> toBe(
expect(b(~elem, ~mods=[Bc.Bool(mod_, true)]))->toBe(
blockName ++ "__" ++ elem ++ " " ++ blockName ++ "__" ++ elem ++ "_" ++ mod_,
)
})

test("add element and bool modifier - fasle", () => {
let elem = "element"
let mod_ = "mod"
expect(b(~elem, ~mods=[Bc.Bool(mod_, false)], ())) |> toBe(blockName ++ "__" ++ elem)
expect(b(~elem, ~mods=[Bc.Bool(mod_, false)]))->toBe(blockName ++ "__" ++ elem)
})

test("add element and modifiers", () => {
let elem = "element"
let mod_ = "mod"
let key = "key"
let value = "value"
expect(b(~elem, ~mods=[Bc.KeyValue(key, value), Bc.Bool(mod_, true)], ())) |> toBe(
expect(b(~elem, ~mods=[Bc.KeyValue(key, value), Bc.Bool(mod_, true)]))->toBe(
blockName ++
"__" ++
elem ++
Expand All @@ -84,6 +84,6 @@ describe("Bc tests 2", () => {
let someClass = "some__class"
let elem = "elem"

expect(b(~elem, ())->Bc.mix(someClass)) |> toBe(blockName ++ "__" ++ elem ++ " " ++ someClass)
expect(b(~elem)->Bc.mix(someClass))->toBe(blockName ++ "__" ++ elem ++ " " ++ someClass)
})
})
2 changes: 1 addition & 1 deletion bsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"suffix": ".bs.js",
"bs-dev-dependencies": [
"@glennsl/bs-jest"
"@glennsl/rescript-jest"
],
"bsc-flags": [
"-bs-super-errors"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bs-bem-cl",
"version": "4.0.0",
"version": "5.0.0",
"description": "Simple reimplementation of BEM class name generator in ReScript",
"main": "src/Bc.re",
"author": "Anton Tuzhik <[email protected]>",
Expand Down Expand Up @@ -30,10 +30,10 @@
},
"license": "MIT",
"peerDependencies": {
"rescript": "^9.0.0 || ^10.0.0"
"rescript": "^11.0.0"
},
"devDependencies": {
"@glennsl/bs-jest": "0.7.0",
"rescript": "^10.1.2"
"@glennsl/rescript-jest": "0.11.0",
"rescript": "^11.1.0"
}
}
4 changes: 2 additions & 2 deletions src/Bc.res
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ let formatModifiers = (block, ~elem=?, ~mods, ()) => {
acc.contents
}

let bemCl = (block, ~elem=?, ~mods=?, ()) =>
let bemCl = (block, ~elem=?, ~mods=?) =>
switch (elem, mods) {
| (None, None) => block
| (Some(elem), None) => block ++ elemDivider ++ elem
Expand All @@ -34,6 +34,6 @@ let bemCl = (block, ~elem=?, ~mods=?, ()) =>
block ++ elemDivider ++ elem ++ formatModifiers(block, ~elem, ~mods, ())
}

let make = block => bemCl(block)
let make = block => bemCl(block, ...)

let mix = (firstClass, secondClass) => firstClass ++ " " ++ secondClass
2 changes: 1 addition & 1 deletion src/Bc.resi
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ type modifier =
| KeyValue(string, string)
type modifiers = array<modifier>

let make: (string, ~elem: string=?, ~mods: array<modifier>=?, unit) => string
let make: string => (~elem: string=?, ~mods: array<modifier>=?) => string
let mix: (string, string) => string
Loading
Loading