Skip to content

Commit cc3c4dd

Browse files
Francisco Budaszewski Zanattalpil
authored andcommitted
chore: rename base64 FFI functions
1 parent e5ba465 commit cc3c4dd

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

src/gleam/bit_array.gleam

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ pub fn concat(bit_arrays: List(BitArray)) -> BitArray
113113
/// If the bit array does not contain a whole number of bytes then it is padded
114114
/// with zero bits prior to being encoded.
115115
///
116-
@external(erlang, "gleam_stdlib", "bit_array_base64_encode")
117-
@external(javascript, "../gleam_stdlib.mjs", "encode64")
116+
@external(erlang, "gleam_stdlib", "base64_encode")
117+
@external(javascript, "../gleam_stdlib.mjs", "base64_encode")
118118
pub fn base64_encode(input: BitArray, padding: Bool) -> String
119119

120120
/// Decodes a base 64 encoded string into a `BitArray`.
@@ -127,8 +127,8 @@ pub fn base64_decode(encoded: String) -> Result(BitArray, Nil) {
127127
decode64(padded)
128128
}
129129

130-
@external(erlang, "gleam_stdlib", "base_decode64")
131-
@external(javascript, "../gleam_stdlib.mjs", "decode64")
130+
@external(erlang, "gleam_stdlib", "base64_decode")
131+
@external(javascript, "../gleam_stdlib.mjs", "base64_decode")
132132
fn decode64(a: String) -> Result(BitArray, Nil)
133133

134134
/// Encodes a `BitArray` into a base 64 encoded string with URL and filename

src/gleam_stdlib.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
less_than/2, string_pop_grapheme/1, string_pop_codeunit/1,
66
string_starts_with/2, wrap_list/1, string_ends_with/2, string_pad/4,
77
uri_parse/1, bit_array_slice/3, percent_encode/1, percent_decode/1,
8-
base_decode64/1, parse_query/1, bit_array_concat/1,
9-
bit_array_base64_encode/2, tuple_get/2, classify_dynamic/1, print/1,
8+
base64_decode/1, parse_query/1, bit_array_concat/1,
9+
base64_encode/2, tuple_get/2, classify_dynamic/1, print/1,
1010
println/1, print_error/1, println_error/1, inspect/1, float_to_string/1,
1111
int_from_base_string/2, utf_codepoint_list_to_string/1, contains_string/2,
1212
crop_string/2, base16_encode/1, base16_decode/1, string_replace/3, slice/3,
@@ -141,11 +141,11 @@ bit_array_concat(BitArrays) ->
141141
list_to_bitstring(BitArrays).
142142

143143
-if(?OTP_RELEASE >= 26).
144-
bit_array_base64_encode(Bin, Padding) ->
144+
base64_encode(Bin, Padding) ->
145145
PaddedBin = bit_array_pad_to_bytes(Bin),
146146
base64:encode(PaddedBin, #{padding => Padding}).
147147
-else.
148-
bit_array_base64_encode(_Bin, _Padding) ->
148+
base64_encode(_Bin, _Padding) ->
149149
erlang:error(<<"Erlang OTP/26 or higher is required to use base64:encode">>).
150150
-endif.
151151

@@ -154,7 +154,7 @@ bit_array_slice(Bin, Pos, Len) ->
154154
catch error:badarg -> {error, nil}
155155
end.
156156

157-
base_decode64(S) ->
157+
base64_decode(S) ->
158158
try {ok, base64:decode(S)}
159159
catch error:_ -> {error, nil}
160160
end.

src/gleam_stdlib.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ const b64EncodeLookup = [
542542
let b64TextDecoder;
543543

544544
// Implementation based on https://github.com/mitschabaude/fast-base64/blob/main/js.js
545-
export function encode64(bit_array, padding) {
545+
export function base64_encode(bit_array, padding) {
546546
b64TextDecoder ??= new TextDecoder();
547547

548548
bit_array = bit_array_pad_to_bytes(bit_array);
@@ -579,7 +579,7 @@ export function encode64(bit_array, padding) {
579579
}
580580

581581
// From https://developer.mozilla.org/en-US/docs/Glossary/Base64
582-
export function decode64(sBase64) {
582+
export function base64_decode(sBase64) {
583583
try {
584584
const binString = atob(sBase64);
585585
const length = binString.length;

test/gleam/bit_array_test.gleam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ pub fn base64_url_decode_test() {
207207
assert bit_array.base64_url_decode(")!") == Error(Nil)
208208
}
209209

210-
pub fn decode64_crash_regression_1_test() {
210+
pub fn base64_decode_crash_regression_1_test() {
211211
assert bit_array.base64_decode("aGktdGhlcmU.uWUWvrAleKQ2jsWcU97H-RPJ5qRRcE_s")
212212
== Error(Nil)
213213
}

0 commit comments

Comments
 (0)