Skip to content

Commit dec6b0f

Browse files
authored
fix: parse ISO8601 type as 'Date' (#17)
1 parent ba8874c commit dec6b0f

File tree

8 files changed

+28
-22
lines changed

8 files changed

+28
-22
lines changed

Resume/Award.dhall

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{ Type =
22
{ title : Optional Text
3-
, date : Optional Text
3+
, date : Optional Date
44
, awarder : Optional Text
55
, summary : Optional Text
66
}
77
, default =
88
{ title = None Text
9-
, date = None Text
9+
, date = None Date
1010
, awarder = None Text
1111
, summary = None Text
1212
}

Resume/Education.dhall

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
, url : Optional Text
44
, area : Optional Text
55
, studyType : Optional Text
6-
, startDate : Optional Text
7-
, endDate : Optional Text
6+
, startDate : Optional Date
7+
, endDate : Optional Date
88
, score : Optional Text
99
, courses : Optional (List Text)
1010
}
@@ -13,8 +13,8 @@
1313
, url = None Text
1414
, area = None Text
1515
, studyType = None Text
16-
, startDate = None Text
17-
, endDate = None Text
16+
, startDate = None Date
17+
, endDate = None Date
1818
, score = None Text
1919
, courses = None (List Text)
2020
}

Resume/Project.dhall

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
, description : Optional Text
44
, highlights : Optional (List Text)
55
, keywords : Optional (List Text)
6-
, startDate : Optional Text
7-
, endDate : Optional Text
6+
, startDate : Optional Date
7+
, endDate : Optional Date
88
, url : Optional Text
99
, roles : Optional (List Text)
1010
, entity : Optional Text
@@ -15,8 +15,8 @@
1515
, description = None Text
1616
, highlights = None (List Text)
1717
, keywords = None (List Text)
18-
, startDate = None Text
19-
, endDate = None Text
18+
, startDate = None Date
19+
, endDate = None Date
2020
, url = None Text
2121
, roles = None (List Text)
2222
, entity = None Text

Resume/Publication.dhall

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{ Type =
22
{ name : Optional Text
33
, publisher : Optional Text
4-
, releaseDate : Optional Text
4+
, releaseDate : Optional Date
55
, url : Optional Text
66
, summary : Optional Text
77
}
88
, default =
99
{ name = None Text
1010
, publisher = None Text
11-
, releaseDate = None Text
11+
, releaseDate = None Date
1212
, url = None Text
1313
, summary = None Text
1414
}

Resume/Volunteer.dhall

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
{ organization : Optional Text
33
, position : Optional Text
44
, url : Optional Text
5-
, startDate : Optional Text
6-
, endDate : Optional Text
5+
, startDate : Optional Date
6+
, endDate : Optional Date
77
, summary : Optional Text
88
, highlights : Optional (List Text)
99
}
1010
, default =
1111
{ organization = None Text
1212
, position = None Text
1313
, url = None Text
14-
, startDate = None Text
15-
, endDate = None Text
14+
, startDate = None Date
15+
, endDate = None Date
1616
, summary = None Text
1717
, highlights = None (List Text)
1818
}

Resume/Work.dhall

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
, description : Optional Text
55
, position : Optional Text
66
, url : Optional Text
7-
, startDate : Optional Text
8-
, endDate : Optional Text
7+
, startDate : Optional Date
8+
, endDate : Optional Date
99
, summary : Optional Text
1010
, highlights : Optional (List Text)
1111
, skills : Optional (List Text)
@@ -17,8 +17,8 @@
1717
, description = None Text
1818
, position = None Text
1919
, url = None Text
20-
, startDate = None Text
21-
, endDate = None Text
20+
, startDate = None Date
21+
, endDate = None Date
2222
, summary = None Text
2323
, highlights = None (List Text)
2424
, skills = None (List Text)

examples/demo.dhall

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ in Resume.Basic::{
1010
Resume.Work::{
1111
, name = Some "Foo"
1212
, location = Some "Earth"
13+
, startDate = Some 2024-01-27
1314
, salaries = Some [
1415
Resume.Salary::{
1516
amount = 2000
1617
}
1718
]
1819
}
1920
]
20-
}
21+
}

scripts/schemastore-to-dhall.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ def dhall_type(value: Property, name: str, types: Types, defs: Defs) -> Optional
6060
value['type'] = [value['type']]
6161
if value.get("$ref"):
6262
ref = value['$ref'].split('/')[-1]
63-
return dhall_type(defs[ref], ref, types, defs)
63+
# This is not full-ISO8601, but a 'Date' should be sufficient
64+
# for resume purposes
65+
if ref == "iso8601":
66+
_type = 'Date'
67+
else:
68+
return dhall_type(defs[ref], ref, types, defs)
6469
elif "object" in value["type"]:
6570
if all(map(lambda k: not value.get(k), ["properties", "patternProperties", "additionalProperties"])):
6671
return None

0 commit comments

Comments
 (0)