Skip to content

Commit

Permalink
refactor date to any-ref; ABI 0.0.9 ; tag 0.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiye
tiye committed May 19, 2024
1 parent 33e6e4d commit 727d7d9
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 2,330 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: calcit-lang/[email protected]
with:
version: "0.8.51"
version: "0.8.52"

- run: cargo build --release

Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "calcit_std"
version = "0.2.3"
version = "0.2.4"
authors = ["jiyinyiyong <[email protected]>"]
edition = "2021"

Expand All @@ -17,7 +17,7 @@ crate-type = ["dylib"] # Creates dynamic lib
serde = { version = "1.0.202", features = ["derive"] }
serde_json = "1.0.117"
chrono = "0.4.38"
cirru_edn = "0.6.5"
cirru_edn = "0.6.6"
cirru_parser = "0.1.29"
nanoid = "0.4.0"
rand = "0.8.5"
Expand Down
2,265 changes: 8 additions & 2,257 deletions calcit.cirru
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions compact.cirru
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{} (:package |calcit.std)
:configs $ {} (:init-fn |calcit.std.test/main!) (:reload-fn |calcit.std.test/reload!) (:version |0.2.3)
:configs $ {} (:init-fn |calcit.std.test/main!) (:reload-fn |calcit.std.test/reload!) (:version |0.2.4)
:modules $ []
:entries $ {}
:files $ {}
Expand Down Expand Up @@ -217,7 +217,7 @@
defn main! () (run-tests) (try-demos)
|reload! $ %{} :CodeEntry (:doc |)
:code $ quote
defn reload! () $ println "\"reload not handled yet"
defn reload! () (run-tests) (println "\"reload not handled yet")
|run-tests $ %{} :CodeEntry (:doc |)
:code $ quote
defn run-tests () (fs/main!) (json/main!) (date/main!) (random/main!) (test-path)
Expand Down Expand Up @@ -254,8 +254,8 @@
:defs $ {}
|main! $ %{} :CodeEntry (:doc |)
:code $ quote
defn main! () (println "\"%%%% test date")
println $ get-time!
defn main! () (println &newline "\"%%%% test date")
println "\"GET TIME" $ get-time!
echo |time: $ format-time (get-time!) "|%Y-%m-%d %H:%M:%S %z"
assert= 1417176009000 $ get-timestamp (parse-time "|2014-11-28 21:00:09 +09:00" "|%Y-%m-%d %H:%M:%S %z")
; assert= "|2014-11-28 12:00:09 +0000" $ format-time (%:: Date :date 1417176009000) "|%Y-%m-%d %H:%M:%S %z"
Expand Down
141 changes: 79 additions & 62 deletions src/date.rs
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
//! TODO, need to store offset as well,
//! currently lack of offset, prefer using Local time
use std::{collections::HashMap, sync::Arc};
use std::{
collections::HashMap,
sync::{Arc, RwLock},
};

use chrono::{DateTime, Datelike, Duration, Local, LocalResult, NaiveDate, TimeZone, Timelike, Utc, Weekday};
use cirru_edn::{Edn, EdnTupleView};
use chrono::{DateTime, Datelike, Duration, FixedOffset, Local, LocalResult, NaiveDate, TimeZone, Timelike, Weekday};
use cirru_edn::{Edn, EdnAnyRef, EdnTupleView};
use std::ops::Add;

/// an alias generating Edn from DateTime
/// DateTime<FixedOffset> is used to store time internally
fn date_to_edn<T: TimeZone>(d: &DateTime<T>) -> Edn {
Edn::AnyRef(EdnAnyRef(Arc::new(RwLock::new(d.fixed_offset()))))
}

/// calcit represents DateTime in f64
/// nil for no format
#[no_mangle]
pub fn parse_time(args: Vec<Edn>) -> Result<Edn, String> {
if args.len() == 2 {
match (&args[0], &args[1]) {
(Edn::Str(s), Edn::Nil) => match DateTime::parse_from_rfc3339(s) {
Ok(time) => Ok(Edn::Number(time.timestamp_millis() as f64)),
Ok(time) => Ok(date_to_edn(&time)),
Err(e) => Err(format!("parse-time failed, {e}")),
},
(Edn::Str(s), Edn::Str(f)) => match DateTime::parse_from_str(s, f) {
Ok(time) => Ok(Edn::Number(time.timestamp_millis() as f64)),
Ok(time) => Ok(date_to_edn(&time)),
Err(e) => Err(format!("parse-time failed, {s} {f} {e}")),
},
(_, _) => Err(format!("parse-time expected 2 arguments, got: {args:?}")),
Expand All @@ -30,14 +39,24 @@ pub fn parse_time(args: Vec<Edn>) -> Result<Edn, String> {

#[no_mangle]
pub fn now_bang(_args: Vec<Edn>) -> Result<Edn, String> {
Ok(Edn::Number(Utc::now().timestamp_millis() as f64))
Ok(date_to_edn(&Local::now()))
}

/// TODO currently only return self, no offset involved yet
#[no_mangle]
pub fn get_timestamp(args: Vec<Edn>) -> Result<Edn, String> {
if args.len() == 1 {
Ok(args[0].to_owned())
match &args[0] {
Edn::AnyRef(r) => {
let v = r.0.read().unwrap();
if let Some(time) = v.downcast_ref::<DateTime<FixedOffset>>() {
Ok((time.timestamp_millis() as f64).into())
} else {
Err(format!("get-timestamp expected DateTime, got: {v:?}"))
}
}
_ => Err(format!("get-timestamp expected any-ref, got: {args:?}")),
}
} else {
Err(format!("expected 1 arguments: {args:?}"))
}
Expand All @@ -47,18 +66,20 @@ pub fn get_timestamp(args: Vec<Edn>) -> Result<Edn, String> {
#[no_mangle]
pub fn format_time(args: Vec<Edn>) -> Result<Edn, String> {
if args.len() == 2 {
match (&args[0], &args[1]) {
(Edn::Number(n), Edn::Nil) => match Local.timestamp_opt((n.floor() / 1000.0) as i64, (n.fract() * 1_000_000.0) as u32) {
LocalResult::Single(time) => Ok(Edn::Str(time.to_rfc3339().into())),
LocalResult::Ambiguous(min_time, max_time) => Err(format!("format-time failed, ambiguous: {min_time} {max_time}")),
LocalResult::None => Err(format!("format-time out of range: {n}")),
},
(Edn::Number(n), Edn::Str(f)) => match Local.timestamp_opt((n.floor() / 1000.0) as i64, (n.fract() * 1_000_000.0) as u32) {
LocalResult::Single(time) => Ok(Edn::Str(time.format(f).to_string().into())),
LocalResult::None => Err(format!("format-time out of range: {n} {f}")),
LocalResult::Ambiguous(min_time, max_time) => Err(format!("format-time ambiguous: {min_time} {max_time}")),
},
(_, _) => Err(format!("format-time expected f64 and string, got: {args:?}")),
match &args[0] {
Edn::AnyRef(r) => {
let v = r.0.read().unwrap();
if let Some(time) = v.downcast_ref::<DateTime<FixedOffset>>() {
match &args[1] {
Edn::Nil => Ok(Edn::Str(time.to_rfc3339().into())),
Edn::Str(f) => Ok(Edn::Str(time.format(f).to_string().into())),
_ => Err(format!("format-time expected string, got: {args:?}")),
}
} else {
Err(format!("format-time expected DateTime, got: {v:?}"))
}
}
_ => Err(format!("format-time expected any-ref, got: {args:?}")),
}
} else {
Err(format!("format-time expected 2 args, got: {args:?}"))
Expand All @@ -70,30 +91,30 @@ pub fn format_time(args: Vec<Edn>) -> Result<Edn, String> {
pub fn extract_time(args: Vec<Edn>) -> Result<Edn, String> {
if args.len() == 1 {
match &args[0] {
Edn::Number(n) => {
let time = match Local.timestamp_opt((n.floor() / 1000.0) as i64, (n.fract() * 1_000_000.0) as u32) {
LocalResult::Single(time) => time,
LocalResult::Ambiguous(min_time, max_time) => return Err(format!("extract-time failed, ambiguous: {min_time} {max_time}")),
LocalResult::None => return Err(format!("extract-time out of range: {n}")),
};
Edn::AnyRef(r) => {
let v = r.0.read().unwrap();
if let Some(time) = v.downcast_ref::<DateTime<FixedOffset>>() {
let mut data: HashMap<Edn, Edn> = HashMap::new();
data.insert(Edn::tag("year"), Edn::Number(time.date_naive().year() as f64));
data.insert(Edn::tag("month"), Edn::Number(time.date_naive().month() as f64));
data.insert(Edn::tag("month0"), Edn::Number(time.date_naive().month0() as f64));
data.insert(Edn::tag("day"), Edn::Number(time.date_naive().day() as f64));
data.insert(Edn::tag("hour"), Edn::Number(time.time().hour() as f64));
data.insert(Edn::tag("minute"), Edn::Number(time.time().minute() as f64));
data.insert(Edn::tag("second"), Edn::Number(time.time().second() as f64));
data.insert(
Edn::tag("weekday"),
Edn::Number(time.date_naive().weekday().num_days_from_sunday() as f64),
);
data.insert(Edn::tag("week"), Edn::Number(time.date_naive().iso_week().week() as f64));
data.insert(Edn::tag("week0"), Edn::Number(time.date_naive().iso_week().week0() as f64));

let mut data: HashMap<Edn, Edn> = HashMap::new();
data.insert(Edn::tag("year"), Edn::Number(time.date_naive().year() as f64));
data.insert(Edn::tag("month"), Edn::Number(time.date_naive().month() as f64));
data.insert(Edn::tag("month0"), Edn::Number(time.date_naive().month0() as f64));
data.insert(Edn::tag("day"), Edn::Number(time.date_naive().day() as f64));
data.insert(Edn::tag("hour"), Edn::Number(time.hour() as f64));
data.insert(Edn::tag("minute"), Edn::Number(time.minute() as f64));
data.insert(Edn::tag("second"), Edn::Number(time.second() as f64));
data.insert(
Edn::tag("weekday"),
Edn::Number(time.date_naive().weekday().num_days_from_sunday() as f64),
);
data.insert(Edn::tag("week"), Edn::Number(time.date_naive().iso_week().week() as f64));
data.insert(Edn::tag("week0"), Edn::Number(time.date_naive().iso_week().week0() as f64));

Ok(Edn::from(data))
Ok(Edn::from(data))
} else {
Err(format!("extract-time expected DateTime, got: {v:?}"))
}
}
// }
_ => Err(format!("extract-time expected f64 and string, got: {args:?}")),
}
} else {
Expand All @@ -120,11 +141,11 @@ pub fn from_ymd(args: Vec<Edn>) -> Result<Edn, String> {
})),
LocalResult::Single(d) => Ok(Edn::Tuple(EdnTupleView {
tag: Arc::new(Edn::tag("single")),
extra: vec![Edn::Number(d.timestamp_millis() as f64)],
extra: vec![date_to_edn(&d)],
})),
LocalResult::Ambiguous(d, d2) => Ok(Edn::Tuple(EdnTupleView {
tag: Arc::new(Edn::tag("ambiguous")),
extra: vec![Edn::Number(d.timestamp_millis() as f64), Edn::Number(d2.timestamp_millis() as f64)],
extra: vec![date_to_edn(&d), date_to_edn(&d2)],
})),
}
}
Expand Down Expand Up @@ -164,11 +185,11 @@ pub fn from_ywd(args: Vec<Edn>) -> Result<Edn, String> {
})),
LocalResult::Single(d) => Ok(Edn::Tuple(EdnTupleView {
tag: Arc::new(Edn::tag("single")),
extra: vec![Edn::Number(d.timestamp_millis() as f64)],
extra: vec![date_to_edn(&d)],
})),
LocalResult::Ambiguous(d, d2) => Ok(Edn::Tuple(EdnTupleView {
tag: Arc::new(Edn::tag("single")),
extra: vec![Edn::Number(d.timestamp_millis() as f64), Edn::Number(d2.timestamp_millis() as f64)],
extra: vec![date_to_edn(&d), date_to_edn(&d2)],
})),
},
None => Err(format!("from-ywd got invalid args: {y} {w} {weekday}")),
Expand All @@ -185,26 +206,22 @@ pub fn from_ywd(args: Vec<Edn>) -> Result<Edn, String> {
pub fn add_duration(args: Vec<Edn>) -> Result<Edn, String> {
if args.len() == 3 {
match (&args[0], &args[1], &args[2]) {
(Edn::Number(d), Edn::Number(n), Edn::Tag(k)) => {
let time = match Local.timestamp_opt((d.floor() / 1000.0) as i64, (d.fract() * 1_000_000.0) as u32) {
LocalResult::Single(d) => d,
LocalResult::None => return Err(format!("add-duration out of range: {d}")),
LocalResult::Ambiguous(min_time, max_time) => return Err(format!("add-duration ambiguous: {min_time} {max_time}")),
};

match k.ref_str() {
"week" | "weeks" => Ok(Edn::Number(time.add(Duration::weeks(*n as i64)).timestamp_millis() as f64)),
"day" | "days" => Ok(Edn::Number(time.add(Duration::days(*n as i64)).timestamp_millis() as f64)),
"h" | "hour" | "hours" => Ok(Edn::Number(time.add(Duration::hours(*n as i64)).timestamp_millis() as f64)),
"min" | "minute" | "minutes" => Ok(Edn::Number(time.add(Duration::minutes(*n as i64)).timestamp_millis() as f64)),
"second" | "seconds" => Ok(Edn::Number(time.add(Duration::seconds(*n as i64)).timestamp_millis() as f64)),
"milli" | "millisecond" | "milliseconds" => {
Ok(Edn::Number(time.add(Duration::milliseconds(*n as i64)).timestamp_millis() as f64))
(Edn::AnyRef(d), Edn::Number(n), Edn::Tag(k)) => {
if let Some(time) = d.0.read().unwrap().downcast_ref::<DateTime<FixedOffset>>() {
match k.ref_str() {
"week" | "weeks" => Ok(date_to_edn(&time.add(Duration::weeks(*n as i64)))),
"day" | "days" => Ok(date_to_edn(&time.add(Duration::days(*n as i64)))),
"h" | "hour" | "hours" => Ok(date_to_edn(&time.add(Duration::hours(*n as i64)))),
"min" | "minute" | "minutes" => Ok(date_to_edn(&time.add(Duration::minutes(*n as i64)))),
"second" | "seconds" => Ok(date_to_edn(&time.add(Duration::seconds(*n as i64)))),
"milli" | "millisecond" | "milliseconds" => Ok(date_to_edn(&time.add(Duration::milliseconds(*n as i64)))),
a => Err(format!("unknown duration unit: {a}")),
}
a => Err(format!("unknown duration unit: {a}")),
} else {
Err(format!("add-duration expected any-ref, got: {d:?}"))
}
}
(a, b, c) => Err(format!("add-duration expected date, numner, keyword: {a} {b} {c}")),
(a, b, c) => Err(format!("add-duration expected date, any-ref, keyword: {a} {b} {c}")),
}
} else {
Err(format!("add-duration expected date, number and keyword, {args:?}"))
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ pub use time::{set_interval, set_timeout};

#[no_mangle]
pub fn abi_version() -> String {
String::from("0.0.8")
String::from("0.0.9")
}

0 comments on commit 727d7d9

Please sign in to comment.