Skip to content

Support datetime. #56

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
ejball merged 2 commits into from
Aug 11, 2023
Merged

Support datetime. #56

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
7490199
Support datetime.
ejball Aug 11, 2023
33dffbc
Publish 2.8.0.
ejball Aug 11, 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
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<VersionPrefix>2.7.0</VersionPrefix>
<VersionPrefix>2.8.0</VersionPrefix>
<LangVersion>11.0</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down Expand Up @@ -33,7 +33,7 @@
</PropertyGroup>

<PropertyGroup>
<FacilityVersion>2.10.1</FacilityVersion>
<FacilityVersion>2.11.0</FacilityVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

These are the NuGet package releases. See also [npm Release Notes](ReleaseNotesNpm.md).

## 2.8.0

* Support `datetime`.

## 2.7.0

* Support `extern` data and enum types.
Expand Down
19 changes: 12 additions & 7 deletions conformance/ConformanceApi.fsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,13 @@ service ConformanceApi
int32: int32;
int64: int64;
decimal: decimal;

[validate]
enum: Answer;
[validate] enum: Answer;
datetime: datetime;
}:
{
}

[http(method: GET, path: "/checkPath/{string}/{boolean}/{double}/{int32}/{int64}/{decimal}/{enum}")]
[http(method: GET, path: "/checkPath/{string}/{boolean}/{double}/{int32}/{int64}/{decimal}/{enum}/{datetime}")]
method checkPath
{
string: string;
Expand All @@ -165,9 +164,8 @@ service ConformanceApi
int32: int32;
int64: int64;
decimal: decimal;

[validate]
enum: Answer;
[validate] enum: Answer;
datetime: datetime;
}:
{
}
Expand All @@ -182,6 +180,7 @@ service ConformanceApi
[http(from: header)] int64: int64;
[http(from: header)] decimal: decimal;
[http(from: header)] enum: Answer;
[http(from: header)] datetime: datetime;
}:
{
[http(from: header)] string: string;
Expand All @@ -191,6 +190,7 @@ service ConformanceApi
[http(from: header)] int64: int64;
[http(from: header)] decimal: decimal;
[http(from: header)] enum: Answer;
[http(from: header)] datetime: datetime;
}

[http(path: "/mixed/{path}")]
Expand Down Expand Up @@ -261,6 +261,7 @@ service ConformanceApi
int32: int32;
int64: int64;
decimal: decimal;
datetime: datetime;
bytes: bytes;
object: object;
error: error;
Expand All @@ -280,6 +281,7 @@ service ConformanceApi
int32: int32[];
int64: int64[];
decimal: decimal[];
datetime: datetime[];
bytes: bytes[];
object: object[];
error: error[];
Expand All @@ -299,6 +301,7 @@ service ConformanceApi
int32: map<int32>;
int64: map<int64>;
decimal: map<decimal>;
datetime: map<datetime>;
bytes: map<bytes>;
object: map<object>;
error: map<error>;
Expand All @@ -318,6 +321,7 @@ service ConformanceApi
int32: result<int32>;
int64: result<int64>;
decimal: result<decimal>;
datetime: result<datetime>;
bytes: result<bytes>;
object: result<object>;
error: result<error>;
Expand All @@ -337,6 +341,7 @@ service ConformanceApi
int32: nullable<int32>;
int64: nullable<int64>;
decimal: nullable<decimal>;
datetime: nullable<datetime>;
bytes: nullable<bytes>;
object: nullable<object>;
error: nullable<error>;
Expand Down
46 changes: 34 additions & 12 deletions conformance/ConformanceTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"int32": 42,
"int64": 12345678910,
"decimal": 1.5,
"enum": "yes"
"enum": "yes",
"datetime": "2001-02-03T04:05:06Z"
},
"response": {}
},
Expand All @@ -24,7 +25,8 @@
"int32": 42,
"int64": 12345678910,
"decimal": 1.5,
"enum": "yes"
"enum": "yes",
"datetime": "2001-02-03T04:05:06Z"
},
"response": {}
},
Expand Down Expand Up @@ -205,6 +207,7 @@
"int32": [42, 24],
"int64": [12345678910, -987654321],
"decimal": [1.5, 6.875],
"datetime": ["2001-02-03T04:05:06Z", "2023-08-10T19:41:21Z"],
"bytes": ["aGk=", ""],
"object": [{ "": null, " ": [null] }, {}],
"error": [{ "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } }],
Expand All @@ -227,6 +230,7 @@
"int32": [42, 24],
"int64": [12345678910, -987654321],
"decimal": [1.5, 6.875],
"datetime": ["2001-02-03T04:05:06Z", "2023-08-10T19:41:21Z"],
"bytes": ["aGk=", ""],
"object": [{ "": null, " ": [null] }, {}],
"error": [{ "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } }],
Expand All @@ -252,6 +256,7 @@
"int32": 42,
"int64": 12345678910,
"decimal": 1.5,
"datetime": "2001-02-03T04:05:06Z",
"bytes": "aGk=",
"object": { "": null, " ": [null] },
"error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } },
Expand All @@ -267,6 +272,7 @@
"int32": 42,
"int64": 12345678910,
"decimal": 1.5,
"datetime": "2001-02-03T04:05:06Z",
"bytes": "aGk=",
"object": { "": null, " ": [null] },
"error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } },
Expand All @@ -285,7 +291,8 @@
"int32": 42,
"int64": 12345678910,
"decimal": 1.5,
"enum": "yes"
"enum": "yes",
"datetime": "2001-02-03T04:05:06Z"
},
"response": {
"string": "string",
Expand All @@ -294,7 +301,8 @@
"int32": 42,
"int64": 12345678910,
"decimal": 1.5,
"enum": "yes"
"enum": "yes",
"datetime": "2001-02-03T04:05:06Z"
}
},
{
Expand All @@ -315,6 +323,7 @@
"int32": { "": 42, " ": 24 },
"int64": { "": 12345678910, " ": -987654321 },
"decimal": { "": 1.5, " ": 6.875 },
"datetime": { "": "2001-02-03T04:05:06Z", " ": "2023-08-10T19:41:21Z" },
"bytes": { "": "aGk=", " ": "" },
"object": { "": { "": null, " ": [null] }, " ": {} },
"error": { "": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } }, " ": {} },
Expand All @@ -336,6 +345,7 @@
"int32": { "": 42, " ": 24 },
"int64": { "": 12345678910, " ": -987654321 },
"decimal": { "": 1.5, " ": 6.875 },
"datetime": { "": "2001-02-03T04:05:06Z", " ": "2023-08-10T19:41:21Z" },
"bytes": { "": "aGk=", " ": "" },
"object": { "": { "": null, " ": [null] }, " ": {} },
"error": { "": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } }, " ": {} },
Expand All @@ -361,6 +371,7 @@
"int32": 42,
"int64": 12345678910,
"decimal": 1.5,
"datetime": "2001-02-03T04:05:06Z",
"bytes": "aGk=",
"object": { "": null, " ": [null] },
"error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } },
Expand All @@ -381,6 +392,7 @@
"int32": 42,
"int64": 12345678910,
"decimal": 1.5,
"datetime": "2001-02-03T04:05:06Z",
"bytes": "aGk=",
"object": { "": null, " ": [null] },
"error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } },
Expand Down Expand Up @@ -421,6 +433,7 @@
"int32": null,
"int64": null,
"decimal": null,
"datetime": null,
"bytes": null,
"object": null,
"error": null,
Expand All @@ -441,6 +454,7 @@
"int32": null,
"int64": null,
"decimal": null,
"datetime": null,
"bytes": null,
"object": null,
"error": null,
Expand All @@ -465,6 +479,7 @@
"int32": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"int64": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"decimal": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"datetime": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"bytes": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"object": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"error": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
Expand All @@ -485,6 +500,7 @@
"int32": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"int64": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"decimal": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"datetime": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"bytes": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"object": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
"error": { "error": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
Expand All @@ -509,6 +525,7 @@
"int32": { "value": 42 },
"int64": { "value": 12345678910 },
"decimal": { "value": 1.5 },
"datetime": { "value": "2001-02-03T04:05:06Z" },
"bytes": { "value": "aGk=" },
"object": { "value": { "": null, " ": [null] } },
"error": { "value": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
Expand All @@ -530,6 +547,7 @@
"int32": { "value": 42 },
"int64": { "value": 12345678910 },
"decimal": { "value": 1.5 },
"datetime": { "value": "2001-02-03T04:05:06Z" },
"bytes": { "value": "aGk=" },
"object": { "value": { "": null, " ": [null] } },
"error": { "value": { "code": "code", "message": "message", "innerError": { "code": "code" }, "details": { "": null, " ": [null] } } },
Expand Down Expand Up @@ -767,7 +785,7 @@
"method": "checkPath",
"httpRequest": {
"method": "GET",
"path": "/CHECKPATH/pathCase/true/1.5/3/4/0.625/yes"
"path": "/CHECKPATH/pathCase/true/1.5/3/4/0.625/yes/2001-02-03T04:05:06Z"
},
"request": {
"string": "pathCase",
Expand All @@ -776,7 +794,8 @@
"int32": 3,
"int64": 4,
"decimal": 0.625,
"enum": "yes"
"enum": "yes",
"datetime": "2001-02-03T04:05:06Z"
},
"response": {}
},
Expand All @@ -785,7 +804,7 @@
"method": "checkPath",
"httpRequest": {
"method": "GET",
"path": "/checkPath/booleanCase/TRUE/1.5/3/4/0.625/yes"
"path": "/checkPath/booleanCase/TRUE/1.5/3/4/0.625/yes/2001-02-03T04:05:06Z"
},
"request": {
"string": "booleanCase",
Expand All @@ -794,7 +813,8 @@
"int32": 3,
"int64": 4,
"decimal": 0.625,
"enum": "yes"
"enum": "yes",
"datetime": "2001-02-03T04:05:06Z"
},
"response": {}
},
Expand All @@ -803,7 +823,7 @@
"method": "checkQuery",
"httpRequest": {
"method": "GET",
"path": "/CHECKQUERY?string=pathCase&boolean=true&double=1.5&int32=3&int64=4&decimal=0.625&enum=yes"
"path": "/CHECKQUERY?string=pathCase&boolean=true&double=1.5&int32=3&int64=4&decimal=0.625&enum=yes&datetime=2001-02-03T04:05:06Z"
},
"request": {
"string": "pathCase",
Expand All @@ -812,7 +832,8 @@
"int32": 3,
"int64": 4,
"decimal": 0.625,
"enum": "yes"
"enum": "yes",
"datetime": "2001-02-03T04:05:06Z"
},
"response": {}
},
Expand All @@ -821,7 +842,7 @@
"method": "checkQuery",
"httpRequest": {
"method": "GET",
"path": "/checkQuery?STRING=queryCase&boolean=true&double=1.5&int32=3&int64=4&decimal=0.625&enum=yes"
"path": "/checkQuery?STRING=queryCase&boolean=true&double=1.5&int32=3&int64=4&decimal=0.625&enum=yes&datetime=2001-02-03T04:05:06Z"
},
"request": {
"string": "queryCase",
Expand All @@ -830,7 +851,8 @@
"int32": 3,
"int64": 4,
"decimal": 0.625,
"enum": "yes"
"enum": "yes",
"datetime": "2001-02-03T04:05:06Z"
},
"response": {}
},
Expand Down
14 changes: 13 additions & 1 deletion conformance/ts/src/conformanceApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ class ConformanceApiHttpClient implements IConformanceApi {
request.int64 == null || query.push('int64=' + request.int64.toString());
request.decimal == null || query.push('decimal=' + request.decimal.toString());
request.enum == null || query.push('enum=' + request.enum);
request.datetime == null || query.push('datetime=' + encodeURIComponent(request.datetime));
if (query.length) {
uri = uri + '?' + query.join('&');
}
Expand Down Expand Up @@ -308,7 +309,11 @@ class ConformanceApiHttpClient implements IConformanceApi {
if (!uriPartEnum) {
return Promise.resolve(createRequiredRequestFieldError('enum'));
}
const uri = `checkPath/${uriPartString}/${uriPartBoolean}/${uriPartDouble}/${uriPartInt32}/${uriPartInt64}/${uriPartDecimal}/${uriPartEnum}`;
const uriPartDatetime = request.datetime != null && encodeURIComponent(request.datetime);
if (!uriPartDatetime) {
return Promise.resolve(createRequiredRequestFieldError('datetime'));
}
const uri = `checkPath/${uriPartString}/${uriPartBoolean}/${uriPartDouble}/${uriPartInt32}/${uriPartInt64}/${uriPartDecimal}/${uriPartEnum}/${uriPartDatetime}`;
const fetchRequest: IFetchRequest = {
method: 'GET',
};
Expand Down Expand Up @@ -353,6 +358,9 @@ class ConformanceApiHttpClient implements IConformanceApi {
if (request.enum != null) {
fetchRequest.headers!['enum'] = request.enum;
}
if (request.datetime != null) {
fetchRequest.headers!['datetime'] = request.datetime;
}
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest, context)
.then(result => {
const status = result.response.status;
Expand Down Expand Up @@ -392,6 +400,10 @@ class ConformanceApiHttpClient implements IConformanceApi {
if (headerValue != null) {
value.enum = headerValue as Answer;
}
headerValue = result.response.headers.get('datetime');
if (headerValue != null) {
value.datetime = headerValue;
}
return { value: value };
});
}
Expand Down
Loading