chore: update gleam to 1.16

jtdowney · jtdowney · commit f65e95be6122 · 2026-04-24T11:28:37.000-05:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: erlef/setup-beam@v1
         with:
           otp-version: "28"
-          gleam-version: "1.15.4"
+          gleam-version: "1.16"
           rebar3-version: "3"
       - run: gleam deps download
       - run: gleam format --check src test
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         otp-version: ["27", "28"]
-        gleam-version: ["1.14.0", "1.15.4"]
+        gleam-version: ["1.15", "1.16"]
     steps:
       - uses: actions/checkout@v6
       - uses: erlef/setup-beam@v1
@@ -43,7 +43,7 @@ jobs:
     strategy:
       matrix:
         node-version: ["22", "24"]
-        gleam-version: ["1.14.0", "1.15.4"]
+        gleam-version: ["1.15", "1.16"]
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-node@v6
diff --git a/src/gose.gleam b/src/gose.gleam
@@ -452,7 +452,9 @@ fn eddsa_public_key_internal(public: eddsa.PublicKey) -> Key(kid) {
   new_key(Edwards(EddsaPublic(key: public, curve:)))
 }
 
-fn rsa_private_key_internal(pair: #(rsa.PrivateKey, rsa.PublicKey)) -> Key(kid) {
+fn rsa_private_key_internal(
+  pair: #(rsa.PrivateKey, rsa.PublicKey),
+) -> Key(kid) {
   let #(private, public) = pair
   new_key(Rsa(RsaPrivate(key: private, public:)))
 }
@@ -819,7 +821,10 @@ pub fn with_key_ops(
 /// the specified use, or if the use is incompatible with the key type per RFC
 /// 8037 (EdDSA keys can only be used for signing, XDH keys can only be used for
 /// encryption).
-pub fn with_key_use(key: Key(kid), use_: KeyUse) -> Result(Key(kid), GoseError) {
+pub fn with_key_use(
+  key: Key(kid),
+  use_: KeyUse,
+) -> Result(Key(kid), GoseError) {
   use _ <- result.try(validate_key_use_ops(option.Some(use_), key.key_ops))
   use _ <- result.try(validate_rfc8037_key_use(key.material, option.Some(use_)))
   Ok(Key(..key, key_use: option.Some(use_)))
diff --git a/src/gose/cose.gleam b/src/gose/cose.gleam
@@ -165,7 +165,9 @@ pub fn headers_from_cbor(
 }
 
 @internal
-pub fn headers_to_cbor(headers: List(Header)) -> List(#(cbor.Value, cbor.Value)) {
+pub fn headers_to_cbor(
+  headers: List(Header),
+) -> List(#(cbor.Value, cbor.Value)) {
   list.map(headers, header_to_cbor)
 }
 
@@ -943,7 +945,9 @@ pub fn signing_alg_to_int(alg: gose.SigningAlg) -> Int {
 }
 
 /// Parse a signing algorithm from its COSE integer identifier.
-pub fn signing_alg_from_int(id: Int) -> Result(gose.SigningAlg, gose.GoseError) {
+pub fn signing_alg_from_int(
+  id: Int,
+) -> Result(gose.SigningAlg, gose.GoseError) {
   case signature_alg_from_int(id) {
     Ok(alg) -> Ok(gose.DigitalSignature(alg))
     Error(_) ->
@@ -1033,7 +1037,9 @@ pub fn content_alg_to_int(alg: gose.ContentAlg) -> Result(Int, gose.GoseError) {
 }
 
 /// Parse a content encryption algorithm from its COSE integer identifier.
-pub fn content_alg_from_int(id: Int) -> Result(gose.ContentAlg, gose.GoseError) {
+pub fn content_alg_from_int(
+  id: Int,
+) -> Result(gose.ContentAlg, gose.GoseError) {
   case id {
     1 -> Ok(gose.AesGcm(gose.Aes128))
     2 -> Ok(gose.AesGcm(gose.Aes192))
diff --git a/src/gose/cose/algorithm.gleam b/src/gose/cose/algorithm.gleam
@@ -35,7 +35,9 @@ pub fn signing_alg_to_int(alg: gose.SigningAlg) -> Int {
 }
 
 @deprecated("use gose/cose.signing_alg_from_int")
-pub fn signing_alg_from_int(id: Int) -> Result(gose.SigningAlg, gose.GoseError) {
+pub fn signing_alg_from_int(
+  id: Int,
+) -> Result(gose.SigningAlg, gose.GoseError) {
   cose.signing_alg_from_int(id)
 }
 
@@ -59,6 +61,8 @@ pub fn content_alg_to_int(alg: gose.ContentAlg) -> Result(Int, gose.GoseError) {
 }
 
 @deprecated("use gose/cose.content_alg_from_int")
-pub fn content_alg_from_int(id: Int) -> Result(gose.ContentAlg, gose.GoseError) {
+pub fn content_alg_from_int(
+  id: Int,
+) -> Result(gose.ContentAlg, gose.GoseError) {
   cose.content_alg_from_int(id)
 }
diff --git a/src/gose/cose/encrypt.gleam b/src/gose/cose/encrypt.gleam
@@ -127,7 +127,9 @@ pub opaque type Decryptor {
 }
 
 /// Create a new COSE_Encrypt message with the given content encryption algorithm.
-pub fn new(enc: gose.ContentAlg) -> Result(Encrypt(Unencrypted), gose.GoseError) {
+pub fn new(
+  enc: gose.ContentAlg,
+) -> Result(Encrypt(Unencrypted), gose.GoseError) {
   use alg_id <- result.try(cose.content_alg_to_int(enc))
   Ok(
     UnencryptedEncrypt(
diff --git a/src/gose/cose/sign1.gleam b/src/gose/cose/sign1.gleam
@@ -280,13 +280,19 @@ pub fn with_detached(message: Sign1(Unsigned)) -> Sign1(Unsigned) {
 }
 
 /// Set external additional authenticated data (AAD) for the signing operation.
-pub fn with_aad(message: Sign1(Unsigned), aad aad: BitArray) -> Sign1(Unsigned) {
+pub fn with_aad(
+  message: Sign1(Unsigned),
+  aad aad: BitArray,
+) -> Sign1(Unsigned) {
   let assert UnsignedSign1(..) = message
   UnsignedSign1(..message, aad:)
 }
 
 /// Add a key ID to the unprotected headers.
-pub fn with_kid(message: Sign1(Unsigned), kid kid: BitArray) -> Sign1(Unsigned) {
+pub fn with_kid(
+  message: Sign1(Unsigned),
+  kid kid: BitArray,
+) -> Sign1(Unsigned) {
   let assert UnsignedSign1(unprotected:, ..) = message
   UnsignedSign1(..message, unprotected: [cose.Kid(kid), ..unprotected])
 }
@@ -359,7 +365,9 @@ fn build_sig_structure(
   )
 }
 
-fn parse_cbor_value(value: cbor.Value) -> Result(Sign1(Signed), gose.GoseError) {
+fn parse_cbor_value(
+  value: cbor.Value,
+) -> Result(Sign1(Signed), gose.GoseError) {
   use items <- result.try(cose_structure.parse_cose_array_value(
     value,
     expected_tag: 18,
diff --git a/src/gose/internal/key_extract.gleam b/src/gose/internal/key_extract.gleam
@@ -13,7 +13,9 @@ pub fn rsa_private_key(
   }
 }
 
-pub fn rsa_public_key(material: gose.KeyMaterial) -> Result(rsa.PublicKey, Nil) {
+pub fn rsa_public_key(
+  material: gose.KeyMaterial,
+) -> Result(rsa.PublicKey, Nil) {
   case material {
     gose.Rsa(gose.RsaPrivate(public:, ..)) -> Ok(public)
     gose.Rsa(gose.RsaPublic(key: public)) -> Ok(public)
diff --git a/src/gose/internal/signing.gleam b/src/gose/internal/signing.gleam
@@ -169,7 +169,9 @@ fn resolve_ecdsa_params(alg: gose.EcdsaAlg) -> #(hash.HashAlgorithm, ec.Curve) {
   }
 }
 
-fn resolve_hmac_params(alg: gose.HmacAlg) -> #(hash.HashAlgorithm, Int, String) {
+fn resolve_hmac_params(
+  alg: gose.HmacAlg,
+) -> #(hash.HashAlgorithm, Int, String) {
   case alg {
     gose.HmacSha256 -> #(hash.Sha256, 32, "HS256")
     gose.HmacSha384 -> #(hash.Sha384, 48, "HS384")
diff --git a/src/gose/internal/utils.gleam b/src/gose/internal/utils.gleam
@@ -41,7 +41,9 @@ pub fn ec_curve_to_string(curve: ec.Curve) -> String {
 }
 
 /// Parse an EdDSA curve from its JWK string representation.
-pub fn eddsa_curve_from_string(s: String) -> Result(eddsa.Curve, gose.GoseError) {
+pub fn eddsa_curve_from_string(
+  s: String,
+) -> Result(eddsa.Curve, gose.GoseError) {
   case s {
     "Ed25519" -> Ok(eddsa.Ed25519)
     "Ed448" -> Ok(eddsa.Ed448)
diff --git a/src/gose/jose/jwe.gleam b/src/gose/jose/jwe.gleam
@@ -1547,7 +1547,10 @@ fn try_keys(
   }
 }
 
-fn header_to_json(header: JweHeader, alg_fields: ResolvedAlgFields) -> BitArray {
+fn header_to_json(
+  header: JweHeader,
+  alg_fields: ResolvedAlgFields,
+) -> BitArray {
   let alg_field = #(
     "alg",
     json.string(jose.key_encryption_alg_to_string(header.alg)),
@@ -2258,7 +2261,9 @@ fn parse_optional_base64(
 /// When unprotected headers are present, includes the `unprotected` and/or `header` fields.
 ///
 /// For multiple recipients, use `gose/jose/jwe_multi`.
-pub fn serialize_json_flattened(jwe: Jwe(Encrypted, family, Built)) -> json.Json {
+pub fn serialize_json_flattened(
+  jwe: Jwe(Encrypted, family, Built),
+) -> json.Json {
   let assert EncryptedJwe(
     protected_b64:,
     encrypted_key:,
diff --git a/src/gose/jose/jwk.gleam b/src/gose/jose/jwk.gleam
@@ -393,7 +393,9 @@ fn parse_key_metadata(
   Ok(#(key_use, key_ops, alg))
 }
 
-fn parse_key_ops(ops: List(String)) -> Result(List(gose.KeyOp), gose.GoseError) {
+fn parse_key_ops(
+  ops: List(String),
+) -> Result(List(gose.KeyOp), gose.GoseError) {
   use <- bool.guard(
     when: list.is_empty(ops),
     return: Error(gose.ParseError("key_ops must not be empty")),
diff --git a/src/gose/jose/jws.gleam b/src/gose/jose/jws.gleam
@@ -263,7 +263,10 @@ pub fn verifier(
 }
 
 /// Set the content type (cty) header parameter.
-pub fn with_cty(jws: Jws(Unsigned, Built), cty: String) -> Jws(Unsigned, Built) {
+pub fn with_cty(
+  jws: Jws(Unsigned, Built),
+  cty: String,
+) -> Jws(Unsigned, Built) {
   map_unsigned_header(jws, fn(h) { JwsHeader(..h, cty: option.Some(cty)) })
 }
 
@@ -314,12 +317,18 @@ pub fn with_header(
 }
 
 /// Set the key ID (kid) header parameter.
-pub fn with_kid(jws: Jws(Unsigned, Built), kid: String) -> Jws(Unsigned, Built) {
+pub fn with_kid(
+  jws: Jws(Unsigned, Built),
+  kid: String,
+) -> Jws(Unsigned, Built) {
   map_unsigned_header(jws, fn(h) { JwsHeader(..h, kid: option.Some(kid)) })
 }
 
 /// Set the type (typ) header parameter (e.g., "JWT").
-pub fn with_typ(jws: Jws(Unsigned, Built), typ: String) -> Jws(Unsigned, Built) {
+pub fn with_typ(
+  jws: Jws(Unsigned, Built),
+  typ: String,
+) -> Jws(Unsigned, Built) {
   map_unsigned_header(jws, fn(h) { JwsHeader(..h, typ: option.Some(typ)) })
 }
 
diff --git a/src/gose/jose/jwt.gleam b/src/gose/jose/jwt.gleam
@@ -544,7 +544,9 @@ pub fn verify_and_validate(
   Ok(jwt)
 }
 
-fn parse_jws(token: String) -> Result(jws.Jws(jws.Signed, jws.Parsed), JwtError) {
+fn parse_jws(
+  token: String,
+) -> Result(jws.Jws(jws.Signed, jws.Parsed), JwtError) {
   jws.parse_compact(token)
   |> result.map_error(gose_error_to_malformed_token_error)
 }
diff --git a/src/gose/key.gleam b/src/gose/key.gleam
@@ -176,7 +176,9 @@ pub fn ec_curve(key: gose.Key(kid)) -> Result(ec.Curve, gose.GoseError) {
 }
 
 @deprecated("use gose.ec_public_key")
-pub fn ec_public_key(key: gose.Key(kid)) -> Result(ec.PublicKey, gose.GoseError) {
+pub fn ec_public_key(
+  key: gose.Key(kid),
+) -> Result(ec.PublicKey, gose.GoseError) {
   gose.ec_public_key(key)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,9 @@ pub fn signing_alg_to_int(alg: gose.SigningAlg) -> Int {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@deprecated("use gose/cose.signing_alg_from_int")`
`38`		`-pub fn signing_alg_from_int(id: Int) -> Result(gose.SigningAlg, gose.GoseError) {`
	`38`	`+pub fn signing_alg_from_int(`
	`39`	`+ id: Int,`
	`40`	`+) -> Result(gose.SigningAlg, gose.GoseError) {`
`39`	`41`	`cose.signing_alg_from_int(id)`
`40`	`42`	`}`
`41`	`43`
`@@ -59,6 +61,8 @@ pub fn content_alg_to_int(alg: gose.ContentAlg) -> Result(Int, gose.GoseError) {`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`@deprecated("use gose/cose.content_alg_from_int")`
`62`		`-pub fn content_alg_from_int(id: Int) -> Result(gose.ContentAlg, gose.GoseError) {`
	`64`	`+pub fn content_alg_from_int(`
	`65`	`+ id: Int,`
	`66`	`+) -> Result(gose.ContentAlg, gose.GoseError) {`
`63`	`67`	`cose.content_alg_from_int(id)`
`64`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,13 +280,19 @@ pub fn with_detached(message: Sign1(Unsigned)) -> Sign1(Unsigned) {`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`/// Set external additional authenticated data (AAD) for the signing operation.`
`283`		`-pub fn with_aad(message: Sign1(Unsigned), aad aad: BitArray) -> Sign1(Unsigned) {`
	`283`	`+pub fn with_aad(`
	`284`	`+ message: Sign1(Unsigned),`
	`285`	`+ aad aad: BitArray,`
	`286`	`+) -> Sign1(Unsigned) {`
`284`	`287`	`let assert UnsignedSign1(..) = message`
`285`	`288`	`UnsignedSign1(..message, aad:)`
`286`	`289`	`}`
`287`	`290`
`288`	`291`	`/// Add a key ID to the unprotected headers.`
`289`		`-pub fn with_kid(message: Sign1(Unsigned), kid kid: BitArray) -> Sign1(Unsigned) {`
	`292`	`+pub fn with_kid(`
	`293`	`+ message: Sign1(Unsigned),`
	`294`	`+ kid kid: BitArray,`
	`295`	`+) -> Sign1(Unsigned) {`
`290`	`296`	`let assert UnsignedSign1(unprotected:, ..) = message`
`291`	`297`	`UnsignedSign1(..message, unprotected: [cose.Kid(kid), ..unprotected])`
`292`	`298`	`}`
`@@ -359,7 +365,9 @@ fn build_sig_structure(`
`359`	`365`	`)`
`360`	`366`	`}`
`361`	`367`
`362`		`-fn parse_cbor_value(value: cbor.Value) -> Result(Sign1(Signed), gose.GoseError) {`
	`368`	`+fn parse_cbor_value(`
	`369`	`+ value: cbor.Value,`
	`370`	`+) -> Result(Sign1(Signed), gose.GoseError) {`
`363`	`371`	`use items <- result.try(cose_structure.parse_cose_array_value(`
`364`	`372`	`value,`
`365`	`373`	`expected_tag: 18,`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ pub fn rsa_private_key(`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-pub fn rsa_public_key(material: gose.KeyMaterial) -> Result(rsa.PublicKey, Nil) {`
	`16`	`+pub fn rsa_public_key(`
	`17`	`+ material: gose.KeyMaterial,`
	`18`	`+) -> Result(rsa.PublicKey, Nil) {`
`17`	`19`	`case material {`
`18`	`20`	`gose.Rsa(gose.RsaPrivate(public:, ..)) -> Ok(public)`
`19`	`21`	`gose.Rsa(gose.RsaPublic(key: public)) -> Ok(public)`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,9 @@ fn resolve_ecdsa_params(alg: gose.EcdsaAlg) -> #(hash.HashAlgorithm, ec.Curve) {`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`172`		`-fn resolve_hmac_params(alg: gose.HmacAlg) -> #(hash.HashAlgorithm, Int, String) {`
	`172`	`+fn resolve_hmac_params(`
	`173`	`+ alg: gose.HmacAlg,`
	`174`	`+) -> #(hash.HashAlgorithm, Int, String) {`
`173`	`175`	`case alg {`
`174`	`176`	`gose.HmacSha256 -> #(hash.Sha256, 32, "HS256")`
`175`	`177`	`gose.HmacSha384 -> #(hash.Sha384, 48, "HS384")`