Skip to content

Commit 9734238

Browse files
did some chores
1 parent f55b5d1 commit 9734238

File tree

8 files changed

+51
-48
lines changed

8 files changed

+51
-48
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
- uses: actions/checkout@v4
1313
- uses: erlef/setup-beam@v1
1414
with:
15-
otp-version: '26'
16-
gleam-version: '1.1'
15+
otp-version: '27'
16+
gleam-version: '1.6'
1717
rebar3-version: '3'
1818

1919
- run: |

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: erlef/setup-beam@v1
1515
with:
16-
otp-version: '26'
17-
gleam-version: '1.1'
16+
otp-version: '27'
17+
gleam-version: '1.6'
1818
rebar3-version: '3'
1919
- run: gleam test
2020
- run: gleam format --check src test

gleam.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "bison"
22
target = "erlang"
3-
version = "1.6.0"
3+
version = "1.7.0"
44

55
description = "BSON encoder and decoder for Gleam"
66
gleam = ">= 0.32.0"
@@ -19,10 +19,12 @@ internal_modules = [
1919
]
2020

2121
[dependencies]
22-
birl = "~> 1.6"
23-
gleam_json = "~> 1.0"
24-
gleam_stdlib = "~> 0.36 or ~> 1.0"
25-
juno = "~> 1.3"
22+
birl = "~> 1.8"
23+
gleam_json = "~> 2.0"
24+
gleam_stdlib = ">= 0.49.0 or < 2.0.0"
25+
juno = "~> 1.4"
26+
gleam_deque = ">= 1.0.0 and < 2.0.0"
27+
gleam_yielder = ">= 1.1.0 and < 2.0.0"
2628

2729
[dev-dependencies]
28-
gleeunit = "~> 1.1"
30+
gleeunit = "~> 1.2"

manifest.toml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@
22
# You typically do not need to edit this file
33

44
packages = [
5-
{ name = "birl", version = "1.6.1", build_tools = ["gleam"], requirements = ["gleam_stdlib", "ranger"], otp_app = "birl", source = "hex", outer_checksum = "976CFF85D34D50F7775896615A71745FBE0C325E50399787088F941B539A0497" },
6-
{ name = "gleam_json", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "thoas"], otp_app = "gleam_json", source = "hex", outer_checksum = "8B197DD5D578EA6AC2C0D4BDC634C71A5BCA8E7DB5F47091C263ECB411A60DF3" },
7-
{ name = "gleam_stdlib", version = "0.36.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "C0D14D807FEC6F8A08A7C9EF8DFDE6AE5C10E40E21325B2B29365965D82EB3D4" },
8-
{ name = "gleeunit", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "72CDC3D3F719478F26C4E2C5FED3E657AC81EC14A47D2D2DEBB8693CA3220C3B" },
9-
{ name = "juno", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_json", "gleam_stdlib"], otp_app = "juno", source = "hex", outer_checksum = "D433F4D4E5DDB7B33473CD0A0CF93EB46F7DF51A0FAF4127A162AB59EEB95C0A" },
10-
{ name = "ranger", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "ranger", source = "hex", outer_checksum = "1566C272B1D141B3BBA38B25CB761EF56E312E79EC0E2DFD4D3C19FB0CC1F98C" },
11-
{ name = "thoas", version = "0.4.1", build_tools = ["rebar3"], requirements = [], otp_app = "thoas", source = "hex", outer_checksum = "4918D50026C073C4AB1388437132C77A6F6F7C8AC43C60C13758CC0ADCE2134E" },
5+
{ name = "birl", version = "1.8.0", build_tools = ["gleam"], requirements = ["gleam_regexp", "gleam_stdlib", "ranger"], otp_app = "birl", source = "hex", outer_checksum = "2AC7BA26F998E3DFADDB657148BD5DDFE966958AD4D6D6957DD0D22E5B56C400" },
6+
{ name = "gleam_deque", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_deque", source = "hex", outer_checksum = "64D77068931338CF0D0CB5D37522C3E3CCA7CB7D6C5BACB41648B519CC0133C7" },
7+
{ name = "gleam_json", version = "2.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "0A57FB5666E695FD2BEE74C0428A98B0FC11A395D2C7B4CDF5E22C5DD32C74C6" },
8+
{ name = "gleam_regexp", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "A3655FDD288571E90EE9C4009B719FEF59FA16AFCDF3952A76A125AF23CF1592" },
9+
{ name = "gleam_stdlib", version = "0.49.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "A7DB09F15738198A87255425FBCE049B4B84C77CC522786DC923DABA73911F13" },
10+
{ name = "gleam_yielder", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_yielder", source = "hex", outer_checksum = "8E4E4ECFA7982859F430C57F549200C7749823C106759F4A19A78AEA6687717A" },
11+
{ name = "gleeunit", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "F7A7228925D3EE7D0813C922E062BFD6D7E9310F0BEE585D3A42F3307E3CFD13" },
12+
{ name = "juno", version = "1.4.0", build_tools = ["gleam"], requirements = ["gleam_json", "gleam_stdlib"], otp_app = "juno", source = "hex", outer_checksum = "D22BE4EB86072AFE791B33898D824A59B9349838487FE8323C1B617ECF44491C" },
13+
{ name = "ranger", version = "1.4.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "gleam_yielder"], otp_app = "ranger", source = "hex", outer_checksum = "C8988E8F8CDBD3E7F4D8F2E663EF76490390899C2B2885A6432E942495B3E854" },
1214
]
1315

1416
[requirements]
15-
birl = { version = "~> 1.6" }
16-
gleam_json = { version = "~> 1.0" }
17-
gleam_stdlib = { version = "~> 0.36 or ~> 1.0" }
18-
gleeunit = { version = "~> 1.1" }
19-
juno = { version = "~> 1.3" }
17+
birl = { version = "~> 1.8" }
18+
gleam_deque = { version = ">= 1.0.0 and < 2.0.0" }
19+
gleam_json = { version = "~> 2.0" }
20+
gleam_stdlib = { version = ">= 0.49.0 or < 2.0.0" }
21+
gleam_yielder = { version = ">= 1.1.0 and < 2.0.0" }
22+
gleeunit = { version = "~> 1.2" }
23+
juno = { version = "~> 1.4" }

src/bison/generic.gleam

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import gleam/bit_array
2+
import gleam/deque
23
import gleam/list
3-
import gleam/queue
44

55
pub opaque type Generic {
66
Generic(BitArray)
@@ -14,7 +14,7 @@ pub fn to_string(generic: Generic) -> Result(String, Nil) {
1414

1515
pub fn to_int_list(generic: Generic) -> List(Int) {
1616
case generic {
17-
Generic(binary) -> to_int_list_internal(binary, queue.new())
17+
Generic(binary) -> to_int_list_internal(binary, deque.new())
1818
}
1919
}
2020

@@ -35,23 +35,20 @@ pub fn from_int_list(binary: List(Int)) -> Generic {
3535
}
3636

3737
pub fn from_bit_array(binary: BitArray) -> Result(Generic, Nil) {
38-
case bit_size(binary) % 8 {
38+
case bit_array.bit_size(binary) % 8 {
3939
0 -> Ok(Generic(binary))
4040
_ -> Error(Nil)
4141
}
4242
}
4343

4444
fn to_int_list_internal(
4545
remaining: BitArray,
46-
storage: queue.Queue(Int),
46+
storage: deque.Deque(Int),
4747
) -> List(Int) {
4848
let assert <<num:8, remaining:bytes>> = remaining
49-
let new_storage = queue.push_back(storage, num)
49+
let new_storage = deque.push_back(storage, num)
5050
case bit_array.byte_size(remaining) == 0 {
51-
True -> queue.to_list(new_storage)
51+
True -> deque.to_list(new_storage)
5252
False -> to_int_list_internal(remaining, new_storage)
5353
}
5454
}
55-
56-
@external(erlang, "erlang", "bit_size")
57-
fn bit_size(a: BitArray) -> Int

src/bison/md5.gleam

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import gleam/bit_array
2+
import gleam/deque
23
import gleam/list
3-
import gleam/queue
44
import gleam/string
55

66
pub opaque type MD5 {
@@ -15,7 +15,7 @@ pub fn to_string(md5: MD5) -> String {
1515

1616
pub fn to_int_list(md5: MD5) -> List(Int) {
1717
case md5 {
18-
MD5(value) -> to_int_list_internal(value, queue.new())
18+
MD5(value) -> to_int_list_internal(value, deque.new())
1919
}
2020
}
2121

@@ -115,12 +115,12 @@ fn to_string_internal(remaining: BitArray, storage: String) -> String {
115115

116116
fn to_int_list_internal(
117117
remaining: BitArray,
118-
storage: queue.Queue(Int),
118+
storage: deque.Deque(Int),
119119
) -> List(Int) {
120120
let assert <<num:8, remaining:bytes>> = remaining
121-
let new_storage = queue.push_back(storage, num)
121+
let new_storage = deque.push_back(storage, num)
122122
case bit_array.byte_size(remaining) {
123-
0 -> queue.to_list(new_storage)
123+
0 -> deque.to_list(new_storage)
124124
_ -> to_int_list_internal(remaining, new_storage)
125125
}
126126
}

src/bison/object_id.gleam

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import gleam/bit_array
2+
import gleam/deque
23
import gleam/int
3-
import gleam/iterator
44
import gleam/list
55
import gleam/option
66
import gleam/order
7-
import gleam/queue
87
import gleam/string
8+
import gleam/yielder
99

1010
import birl
1111
import birl/duration
@@ -53,7 +53,7 @@ pub fn range(
5353
) {
5454
to_datetime(a)
5555
|> birl.range(option.map(b, to_datetime), s)
56-
|> iterator.map(from_datetime)
56+
|> yielder.map(from_datetime)
5757
}
5858

5959
pub fn compare(a: ObjectId, b: ObjectId) -> order.Order {
@@ -89,7 +89,7 @@ pub fn to_string(id: ObjectId) -> String {
8989

9090
pub fn to_int_list(id: ObjectId) -> List(Int) {
9191
case id {
92-
ObjectId(value) -> to_int_list_internal(value, queue.new())
92+
ObjectId(value) -> to_int_list_internal(value, deque.new())
9393
}
9494
}
9595

@@ -189,14 +189,14 @@ fn to_string_internal(remaining: BitArray, storage: String) -> String {
189189

190190
fn to_int_list_internal(
191191
remaining: BitArray,
192-
storage: queue.Queue(Int),
192+
storage: deque.Deque(Int),
193193
) -> List(Int) {
194194
let assert <<num:8, remaining:bytes>> = remaining
195195

196-
let new_storage = queue.push_back(storage, num)
196+
let new_storage = deque.push_back(storage, num)
197197

198198
case bit_array.byte_size(remaining) {
199-
0 -> queue.to_list(new_storage)
199+
0 -> deque.to_list(new_storage)
200200
_ -> to_int_list_internal(remaining, new_storage)
201201
}
202202
}

src/bison/uuid.gleam

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import gleam/bit_array
2+
import gleam/deque
23
import gleam/list
3-
import gleam/queue
44
import gleam/string
55

66
pub opaque type UUID {
@@ -15,7 +15,7 @@ pub fn to_string(uuid: UUID) -> String {
1515

1616
pub fn to_int_list(uuid: UUID) -> List(Int) {
1717
case uuid {
18-
UUID(value) -> to_int_list_internal(value, queue.new())
18+
UUID(value) -> to_int_list_internal(value, deque.new())
1919
}
2020
}
2121

@@ -121,14 +121,14 @@ fn to_string_internal(remaining: BitArray, storage: String) -> String {
121121

122122
fn to_int_list_internal(
123123
remaining: BitArray,
124-
storage: queue.Queue(Int),
124+
storage: deque.Deque(Int),
125125
) -> List(Int) {
126126
let assert <<num:8, remaining:bytes>> = remaining
127127

128-
let new_storage = queue.push_back(storage, num)
128+
let new_storage = deque.push_back(storage, num)
129129

130130
case bit_array.byte_size(remaining) {
131-
0 -> queue.to_list(new_storage)
131+
0 -> deque.to_list(new_storage)
132132
_ -> to_int_list_internal(remaining, new_storage)
133133
}
134134
}

0 commit comments

Comments
 (0)