Merge pull request #10 from inoas/improve-gleam-toml-add-version

Author: MystPi

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## v1.0.6 - 2025-07-05
+
+### Fixed
+
+- Upgraded dependencies to fix recent `gleam_stdlib` compatibility.
+
 ## v1.0.5 - 2025-04-03
 
 ### Fixed

gleam.toml

@@ -1,5 +1,5 @@
 name = "pprint"
-version = "1.0.5"
+version = "1.0.6"
 description = "Pretty print values with style!"
 licences = ["Apache-2.0"]
 repository = { type = "github", user = "MystPi", repo = "pprint" }
@@ -8,8 +8,8 @@ internal_modules = ["pprint/decoder"]
 
 [dependencies]
 gleam_stdlib = ">= 0.50.0 and < 2.0.0"
-glam = "~> 2.0"
+glam = ">= 2.0.0 and < 3.0.0"
 
 [dev-dependencies]
-gleeunit = "~> 1.0"
-birdie = "~> 1.0"
+birdie = ">= 1.3.1 and < 2.0.0"
+gleeunit = ">= 1.0.0 and < 2.0.0"

manifest.toml

@@ -3,28 +3,27 @@
 
 packages = [
   { name = "argv", version = "1.0.2", build_tools = ["gleam"], requirements = [], otp_app = "argv", source = "hex", outer_checksum = "BA1FF0929525DEBA1CE67256E5ADF77A7CDDFE729E3E3F57A5BDCAA031DED09D" },
-  { name = "birdie", version = "1.2.6", build_tools = ["gleam"], requirements = ["argv", "edit_distance", "filepath", "glance", "gleam_community_ansi", "gleam_erlang", "gleam_stdlib", "justin", "rank", "simplifile", "term_size", "trie_again"], otp_app = "birdie", source = "hex", outer_checksum = "1363F4C7E7433A4A8350CC682BCDDBA5BBC6F66C94EFC63BC43025F796C4F6D0" },
+  { name = "birdie", version = "1.3.1", build_tools = ["gleam"], requirements = ["argv", "edit_distance", "filepath", "glance", "gleam_community_ansi", "gleam_stdlib", "justin", "rank", "simplifile", "term_size", "trie_again"], otp_app = "birdie", source = "hex", outer_checksum = "F811C9EDAF920EF48597A26E788907AAF80D9239A5E8C8CCFBD0DD1BB10184D7" },
   { name = "edit_distance", version = "2.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "edit_distance", source = "hex", outer_checksum = "A1E485C69A70210223E46E63985FA1008B8B2DDA9848B7897469171B29020C05" },
-  { name = "filepath", version = "1.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "65F51013BCF78A603AFFD7992EF1CC6ECA96C74038EB48887F656DE44DBC1902" },
+  { name = "filepath", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "B06A9AF0BF10E51401D64B98E4B627F1D2E48C154967DA7AF4D0914780A6D40A" },
   { name = "glam", version = "2.0.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glam", source = "hex", outer_checksum = "4932A2D139AB0389E149396407F89654928D7B815E212BB02F13C66F53B1BBA1" },
-  { name = "glance", version = "2.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib", "glexer"], otp_app = "glance", source = "hex", outer_checksum = "106111453AE9BA959184302B7DADF2E8CF322B27A7CB68EE78F3EE43FEACCE2C" },
+  { name = "glance", version = "5.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "glexer"], otp_app = "glance", source = "hex", outer_checksum = "FAA3DAC74AF71D47C67D88EB32CE629075169F878D148BB1FF225439BE30070A" },
   { name = "gleam_community_ansi", version = "1.4.3", build_tools = ["gleam"], requirements = ["gleam_community_colour", "gleam_regexp", "gleam_stdlib"], otp_app = "gleam_community_ansi", source = "hex", outer_checksum = "8A62AE9CC6EA65BEA630D95016D6C07E4F9973565FA3D0DE68DC4200D8E0DD27" },
-  { name = "gleam_community_colour", version = "2.0.0", build_tools = ["gleam"], requirements = ["gleam_json", "gleam_stdlib"], otp_app = "gleam_community_colour", source = "hex", outer_checksum = "FDD6AC62C6EC8506C005949A4FCEF032038191D5EAAEC3C9A203CD53AE956ACA" },
-  { name = "gleam_erlang", version = "0.34.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "0C38F2A128BAA0CEF17C3000BD2097EB80634E239CE31A86400C4416A5D0FDCC" },
-  { name = "gleam_json", version = "2.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "C55C5C2B318533A8072D221C5E06E5A75711C129E420DD1CE463342106012E5D" },
-  { name = "gleam_regexp", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "7F5E0C0BBEB3C58E57C9CB05FA9002F970C85AD4A63BA1E55CBCB35C15809179" },
-  { name = "gleam_stdlib", version = "0.58.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "091F2D2C4A3A4E2047986C47E2C2C9D728A4E068ABB31FDA17B0D347E6248467" },
-  { name = "gleeunit", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "0E6C83834BA65EDCAAF4FE4FB94AC697D9262D83E6F58A750D63C9F6C8A9D9FF" },
+  { name = "gleam_community_colour", version = "2.0.2", build_tools = ["gleam"], requirements = ["gleam_json", "gleam_stdlib"], otp_app = "gleam_community_colour", source = "hex", outer_checksum = "E34DD2C896AC3792151EDA939DA435FF3B69922F33415ED3C4406C932FBE9634" },
+  { name = "gleam_json", version = "3.0.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "874FA3C3BB6E22DD2BB111966BD40B3759E9094E05257899A7C08F5DE77EC049" },
+  { name = "gleam_regexp", version = "1.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "9C215C6CA84A5B35BB934A9B61A9A306EC743153BE2B0425A0D032E477B062A9" },
+  { name = "gleam_stdlib", version = "0.61.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "3DC407D6EDA98FCE089150C11F3AD892B6F4C3CA77C87A97BAE8D5AB5E41F331" },
+  { name = "gleeunit", version = "1.6.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "63022D81C12C17B7F1A60E029964E830A4CBD846BBC6740004FC1F1031AE0326" },
   { name = "glexer", version = "2.2.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glexer", source = "hex", outer_checksum = "5C235CBDF4DA5203AD5EAB1D6D8B456ED8162C5424FE2309CFFB7EF438B7C269" },
   { name = "justin", version = "1.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "justin", source = "hex", outer_checksum = "7FA0C6DB78640C6DC5FBFD59BF3456009F3F8B485BF6825E97E1EB44E9A1E2CD" },
   { name = "rank", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "rank", source = "hex", outer_checksum = "5660E361F0E49CBB714CC57CC4C89C63415D8986F05B2DA0C719D5642FAD91C9" },
-  { name = "simplifile", version = "2.2.1", build_tools = ["gleam"], requirements = ["filepath", "gleam_stdlib"], otp_app = "simplifile", source = "hex", outer_checksum = "C88E0EE2D509F6D86EB55161D631657675AA7684DAB83822F7E59EB93D9A60E3" },
+  { name = "simplifile", version = "2.3.0", build_tools = ["gleam"], requirements = ["filepath", "gleam_stdlib"], otp_app = "simplifile", source = "hex", outer_checksum = "0A868DAC6063D9E983477981839810DC2E553285AB4588B87E3E9C96A7FB4CB4" },
   { name = "term_size", version = "1.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "term_size", source = "hex", outer_checksum = "D00BD2BC8FB3EBB7E6AE076F3F1FF2AC9D5ED1805F004D0896C784D06C6645F1" },
-  { name = "trie_again", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "trie_again", source = "hex", outer_checksum = "5B19176F52B1BD98831B57FDC97BD1F88C8A403D6D8C63471407E78598E27184" },
+  { name = "trie_again", version = "1.1.3", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "trie_again", source = "hex", outer_checksum = "365FE609649F3A098D1D7FC7EA5222EE422F0B3745587BF2AB03352357CA70BB" },
 ]
 
 [requirements]
-birdie = { version = "~> 1.0" }
-glam = { version = "~> 2.0" }
+birdie = { version = ">= 1.3.1 and < 2.0.0" }
+glam = { version = ">= 2.0.0 and < 3.0.0" }
 gleam_stdlib = { version = ">= 0.50.0 and < 2.0.0" }
-gleeunit = { version = "~> 1.0" }
+gleeunit = { version = ">= 1.0.0 and < 2.0.0" }

src/pprint.gleam

@@ -119,6 +119,10 @@ pub fn styled(value: a) -> String {
   with_config(value, Config(Styled, BitArraysAsString, NoLabels))
 }
 
+@external(erlang, "pprint_ffi", "from")
+@external(javascript, "./pprint_ffi.mjs", "from")
+pub fn from(value: a) -> Dynamic
+
 /// Pretty print a value as a string with a custom config.
 ///
 /// # Examples
@@ -130,7 +134,7 @@ pub fn styled(value: a) -> String {
 ///
 pub fn with_config(value: a, config: Config) -> String {
   value
-  |> dynamic.from
+  |> from
   |> pretty_dynamic(config)
   |> doc.to_string(max_width)
 }

src/pprint_ffi.erl

@@ -1,10 +1,13 @@
 -module(pprint_ffi).
--export([decode_nil/1, decode_tuple/1, decode_custom_type/1]).
+-export([decode_nil/1, decode_tuple/1, decode_custom_type/1, from/1]).
 
 -define(is_digit_char(X), (X > 47 andalso X < 58)).
 -define(is_lowercase_char(X), (X > 96 andalso X < 123)).
 -define(is_underscore_char(X), (X == 95)).
 
+from(X) ->
+    X.
+
 decode_nil(X) ->
     case X of
         nil -> {ok, nil};
@@ -58,11 +61,10 @@ inspect_maybe_gleam_atom(<<"_", _Rest/binary>>, none, _) ->
     {error, nil};
 inspect_maybe_gleam_atom(<<"_">>, _PrevChar, _Acc) ->
     {error, nil};
-inspect_maybe_gleam_atom(<<"_", _Rest/binary>>, $_, _Acc) ->
+inspect_maybe_gleam_atom(<<"_",  _Rest/binary>>, $_, _Acc) ->
     {error, nil};
-inspect_maybe_gleam_atom(<<First, _Rest/binary>>, _PrevChar, _Acc) when
-    not (?is_lowercase_char(First) orelse ?is_underscore_char(First) orelse ?is_digit_char(First))
-->
+inspect_maybe_gleam_atom(<<First, _Rest/binary>>, _PrevChar, _Acc)
+    when not (?is_lowercase_char(First) orelse ?is_underscore_char(First) orelse ?is_digit_char(First)) ->
     {error, nil};
 inspect_maybe_gleam_atom(<<First, Rest/binary>>, none, Acc) ->
     inspect_maybe_gleam_atom(Rest, First, <<Acc/binary, (uppercase(First))>>);
@@ -74,7 +76,8 @@ inspect_maybe_gleam_atom(<<First, Rest/binary>>, _PrevChar, Acc) ->
     inspect_maybe_gleam_atom(Rest, First, <<Acc/binary, First>>);
 inspect_maybe_gleam_atom(<<>>, _PrevChar, Acc) ->
     {ok, Acc};
-inspect_maybe_gleam_atom(_, _, _) ->
+% The following function body is different from the stdlib:
+inspect_maybe_gleam_atom(_First, _Rest, _Acc) ->
     {error, nil}.
 
 uppercase(X) -> X - 32.

src/pprint_ffi.mjs

@@ -1,5 +1,5 @@
-import * as $gleam from './gleam.mjs';
-import * as $decoder from './pprint/decoder.mjs';
+import * as $gleam from "./gleam.mjs";
+import * as $decoder from "./pprint/decoder.mjs";
 
 export function decode_custom_type(value) {
   if (value instanceof $gleam.CustomType) {
@@ -25,3 +25,7 @@ export function decode_nil(value) {
   if (value === undefined) return new $gleam.Ok(undefined);
   return new $gleam.Error(undefined);
 }
+
+export function from(value) {
+  return value;
+}

test/pprint_test.gleam

@@ -1,6 +1,5 @@
 import birdie
 import gleam/dict
-import gleam/dynamic
 import gleam/option.{None}
 import gleam/set
 import gleeunit
@@ -20,7 +19,7 @@ pub fn main() {
 // https://github.com/MystPi/pprint/issues/2
 pub fn custom_type_with_no_fields_decoding_test() {
   Wibble
-  |> dynamic.from
+  |> pprint.from
   |> decoder.classify
   |> should.equal(decoder.TCustom("Wibble", []))
 }