Skip to content

Dk use iodata in iso 8601 and json serialization #14131

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 31, 2024
Merged

Dk use iodata in iso 8601 and json serialization #14131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc45abe
refcator datetime modules
dkuku Dec 31, 2024
b32d7e2
move guards to top level'
dkuku Dec 31, 2024
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
81 changes: 56 additions & 25 deletions lib/elixir/lib/calendar/datetime.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,8 +1092,21 @@ defmodule DateTime do
@spec to_iso8601(Calendar.datetime(), :basic | :extended, nil | integer()) :: String.t()
def to_iso8601(datetime, format \\ :extended, offset \\ nil)

def to_iso8601(%{calendar: Calendar.ISO} = datetime, format, nil)
def to_iso8601(%{calendar: Calendar.ISO} = datetime, format, offset)
when format in [:extended, :basic] do
datetime
|> to_iso8601_iodata(format, offset)
|> IO.iodata_to_binary()
end

def to_iso8601(%{calendar: _} = datetime, format, offset)
when format in [:extended, :basic] do
datetime
|> convert!(Calendar.ISO)
|> to_iso8601(format, offset)
end

defp to_iso8601_iodata(datetime, format, nil) do
%{
year: year,
month: month,
Expand All @@ -1107,35 +1120,51 @@ defmodule DateTime do
std_offset: std_offset
} = datetime

datetime_to_string(year, month, day, hour, minute, second, microsecond, format) <>
Calendar.ISO.offset_to_string(utc_offset, std_offset, time_zone, format)
[
datetime_to_iodata(year, month, day, hour, minute, second, microsecond, format),
Calendar.ISO.offset_to_iodata(utc_offset, std_offset, time_zone, format)
]
end

def to_iso8601(
%{calendar: Calendar.ISO, microsecond: {_, precision}, time_zone: "Etc/UTC"} = datetime,
format,
0
)
when format in [:extended, :basic] do
defp to_iso8601_iodata(
%{microsecond: {_, precision}, time_zone: "Etc/UTC"} = datetime,
format,
0
) do
{year, month, day, hour, minute, second, {microsecond, _}} = shift_by_offset(datetime, 0)

datetime_to_string(year, month, day, hour, minute, second, {microsecond, precision}, format) <>
"Z"
[
datetime_to_iodata(
year,
month,
day,
hour,
minute,
second,
{microsecond, precision},
format
),
?Z
]
end

def to_iso8601(%{calendar: Calendar.ISO} = datetime, format, offset)
when format in [:extended, :basic] do
defp to_iso8601_iodata(datetime, format, offset) do
{_, precision} = datetime.microsecond
{year, month, day, hour, minute, second, {microsecond, _}} = shift_by_offset(datetime, offset)

datetime_to_string(year, month, day, hour, minute, second, {microsecond, precision}, format) <>
Calendar.ISO.offset_to_string(offset, 0, nil, format)
end

def to_iso8601(%{calendar: _} = datetime, format, offset) when format in [:extended, :basic] do
datetime
|> convert!(Calendar.ISO)
|> to_iso8601(format, offset)
[
datetime_to_iodata(
year,
month,
day,
hour,
minute,
second,
{microsecond, precision},
format
),
Calendar.ISO.offset_to_iodata(offset, 0, nil, format)
]
end

defp shift_by_offset(%{calendar: calendar} = datetime, offset) do
Expand All @@ -1148,10 +1177,12 @@ defmodule DateTime do
|> calendar.naive_datetime_from_iso_days()
end

defp datetime_to_string(year, month, day, hour, minute, second, microsecond, format) do
Calendar.ISO.date_to_string(year, month, day, format) <>
"T" <>
Calendar.ISO.time_to_string(hour, minute, second, microsecond, format)
defp datetime_to_iodata(year, month, day, hour, minute, second, microsecond, format) do
[
Calendar.ISO.date_to_iodata(year, month, day, format),
?T,
Calendar.ISO.time_to_iodata(hour, minute, second, microsecond, format)
]
end

@doc """
Expand Down
26 changes: 18 additions & 8 deletions lib/elixir/lib/calendar/naive_datetime.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,19 @@ defmodule NaiveDateTime do

def to_iso8601(%{calendar: Calendar.ISO} = naive_datetime, format)
when format in [:basic, :extended] do
naive_datetime
|> to_iso8601_iodata(format)
|> IO.iodata_to_binary()
end

def to_iso8601(%{calendar: _} = naive_datetime, format)
when format in [:basic, :extended] do
naive_datetime
|> convert!(Calendar.ISO)
|> to_iso8601(format)
end

defp to_iso8601_iodata(naive_datetime, format) do
%{
year: year,
month: month,
Expand All @@ -940,14 +953,11 @@ defmodule NaiveDateTime do
microsecond: microsecond
} = naive_datetime

Calendar.ISO.date_to_string(year, month, day, format) <>
"T" <> Calendar.ISO.time_to_string(hour, minute, second, microsecond, format)
end

def to_iso8601(%{calendar: _} = naive_datetime, format) when format in [:basic, :extended] do
naive_datetime
|> convert!(Calendar.ISO)
|> to_iso8601(format)
[
Calendar.ISO.date_to_iodata(year, month, day, format),
?T,
Calendar.ISO.time_to_iodata(hour, minute, second, microsecond, format)
]
end

@doc """
Expand Down
Loading