Skip to content

Specify format: 'date-time' for date properties #322

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 12 commits into from
Apr 27, 2023
Merged

Specify format: 'date-time' for date properties #322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0eac661
Specify format: 'date-time' for date properties
duncanmak Apr 25, 2023
a5b7b49
Remove JTD-specific option
duncanmak Apr 25, 2023
dfd65cb
Update ajv-formats to 3.0.0-rc.0 to get date-time fixes
duncanmak Apr 25, 2023
3391b46
Don't include ajv-formats and inline the date-time format regex
duncanmak Apr 26, 2023
59cc6ba
Update tests to make dateCreated validate
duncanmak Apr 26, 2023
2189fd3
Inline the date strings
duncanmak Apr 26, 2023
f425557
Use toTemporalInstant instead of hardcoding the datetime strings
duncanmak Apr 26, 2023
9c1ef77
Introduce createDateString helper function instead of modifying Date.…
duncanmak Apr 26, 2023
ff935e0
updated regex and moved it into definitions.json
thehenrytsai Apr 27, 2023
2683801
added tests
thehenrytsai Apr 27, 2023
301f22f
Merge branch 'main' into date-time-in-json-schema
thehenrytsai Apr 27, 2023
ce9ec7c
addressed review comments
thehenrytsai Apr 27, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Decentralized Web Node (DWN) SDK

Code Coverage
![Statements](https://img.shields.io/badge/statements-93.99%25-brightgreen.svg?style=flat) ![Branches](https://img.shields.io/badge/branches-93.5%25-brightgreen.svg?style=flat) ![Functions](https://img.shields.io/badge/functions-91.72%25-brightgreen.svg?style=flat) ![Lines](https://img.shields.io/badge/lines-93.99%25-brightgreen.svg?style=flat)
![Statements](https://img.shields.io/badge/statements-93.99%25-brightgreen.svg?style=flat) ![Branches](https://img.shields.io/badge/branches-93.51%25-brightgreen.svg?style=flat) ![Functions](https://img.shields.io/badge/functions-91.72%25-brightgreen.svg?style=flat) ![Lines](https://img.shields.io/badge/lines-93.99%25-brightgreen.svg?style=flat)

## Introduction

Expand Down
1 change: 0 additions & 1 deletion build/compile-validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ const schemas = {
};

const ajv = new Ajv({ code: { source: true, esm: true } });
ajv.addFormat('date-time', /^\d\d\d\d-[0-1]\d-[0-3]\dt(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)$/i);

for (const schemaName in schemas) {
ajv.addSchema(schemas[schemaName], schemaName);
Expand Down
6 changes: 5 additions & 1 deletion json-schemas/definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"did": {
"type": "string",
"pattern": "^did:([a-z0-9]+):((?:(?:[a-zA-Z0-9._-]|(?:%[0-9a-fA-F]{2}))*:)*((?:[a-zA-Z0-9._-]|(?:%[0-9a-fA-F]{2}))+))((;[a-zA-Z0-9_.:%-]+=[a-zA-Z0-9_.:%-]*)*)(\/[^#?]*)?([?][^#]*)?(#.*)?$"
},
"date-time": {
"type": "string",
"pattern": "^[0-9]{4}-[0-1]\\d-[0-3]\\dT([0-2]\\d:[0-5]\\d:[0-5]\\d|23:59:60)\\.[0-9]{6}Z$"
}
}
}
}
3 changes: 1 addition & 2 deletions json-schemas/hooks/hooks-write.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
"type": "string"
},
"dateCreated": {
"type": "string",
"format": "date-time"
"$ref": "https://identity.foundation/dwn/json-schemas/defs.json#/definitions/date-time"
},
"schema": {
"type": "string"
Expand Down
9 changes: 3 additions & 6 deletions json-schemas/records/records-query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
"type": "string"
},
"dateCreated": {
"type": "string",
"format": "date-time"
"$ref": "https://identity.foundation/dwn/json-schemas/defs.json#/definitions/date-time"
},
"filter": {
"type": "object",
Expand Down Expand Up @@ -72,12 +71,10 @@
"additionalProperties": false,
"properties": {
"from": {
"type": "string",
"format": "date-time"
"$ref": "https://identity.foundation/dwn/json-schemas/defs.json#/definitions/date-time"
},
"to": {
"type": "string",
"format": "date-time"
"$ref": "https://identity.foundation/dwn/json-schemas/defs.json#/definitions/date-time"
}
}
}
Expand Down
9 changes: 3 additions & 6 deletions json-schemas/records/records-write.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,19 +121,16 @@
"type": "number"
},
"dateCreated": {
"type": "string",
"format": "date-time"
"$ref": "https://identity.foundation/dwn/json-schemas/defs.json#/definitions/date-time"
},
"dateModified": {
"type": "string",
"format": "date-time"
"$ref": "https://identity.foundation/dwn/json-schemas/defs.json#/definitions/date-time"
},
"published": {
"type": "boolean"
},
"datePublished": {
"type": "string",
"format": "date-time"
"$ref": "https://identity.foundation/dwn/json-schemas/defs.json#/definitions/date-time"
},
"dataFormat": {
"type": "string"
Expand Down