Skip to content

Commit e589344

Browse files
ewoutkramerewoutkramer
authored
Merge pull request #3 from microsoft/main
Sync Firely fork (main) with MS
2 parents 9a69013 + 7e60df8 commit e589344

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+8128
-437
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,4 +377,5 @@ msbuild.log
377377
msbuild.err
378378
msbuild.wrn
379379
/generated/r4-test.txt
380-
/firely
380+
/firely
381+
/temp

‎README.md

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,37 @@ Usage:
1010
1111
Options:
1212
--fhir-spec-directory <fhir-spec-directory> The full path to the directory where FHIR
13-
specifications are downloaded and cached.
13+
specifications are downloaded and cached.
1414
--output-path <output-path> File or directory to write output.
1515
--verbose Show verbose output.
16-
--offline-mode Offline mode.
17-
(will not download missing specs).
16+
--offline-mode Offline mode .
17+
(will not download missing specs)
1818
--language <language> Name of the language to export.
19-
(default: Info|TypeScript|CSharpBasic).
19+
(default: Info|TypeScript|CSharpBasic)
2020
--export-keys <export-keys> '|' separated list of items to export.
21-
(not present to export everything)
21+
(not present to export everything)
2222
--load-r2 <load-r2> If FHIR R2 should be loaded, which version.
23-
(e.g., 1.0.2 or latest)
23+
(e.g., 1.0.2 or latest)
2424
--load-r3 <load-r3> If FHIR R3 should be loaded, which version.
25-
(e.g., 3.0.2 or latest)
25+
(e.g., 3.0.2 or latest)
2626
--load-r4 <load-r4> If FHIR R4 should be loaded, which version.
27-
(e.g., 4.0.1 or latest)
27+
(e.g., 4.0.1 or latest).
2828
--load-r5 <load-r5> If FHIR R5 should be loaded, which version.
29-
(e.g., 4.4.0 or latest)
29+
(e.g., 4.4.0 or latest)
3030
--language-options <language-options> Language specific options, see documentation
3131
for more details.
3232
(e.g., CSharpBasic|namespace=myorg.fhir)
33-
--version Show version information.
34-
-?, -h, --help Show help and usage information.
33+
--official-expansions-only True to restrict value-sets exported to only
34+
official expansions.
35+
(default: false)
36+
--fhir-server-url <fhir-server-url> FHIR Server URL to pull a CapabilityStatement
37+
(or Conformance) from. Only supports
38+
application/fhir+json.
39+
--include-experimental If the output should include structures
40+
marked experimental.
41+
(default: false)
42+
--version Show version information
43+
-?, -h, --help Show help and usage information
3544
```
3645

3746
## Examples
@@ -62,10 +71,13 @@ Options:
6271

6372
Basic TypeScript bindings, useful for prototyping and small projects. Exported classes are able to serialize to and parse from FHIR JSON.
6473

65-
* CSharpFirely **EXPERIMENTAL**
74+
* CSharpFirely
6675

6776
Export base C# classes needed for the Firely-maintained C# API ([FHIR-Net-API](https://github.com/FirelyTeam/fhir-net-api/)).
6877

78+
* OpenAPI **EXPERIMENTAL**
79+
80+
Export an OpenAPI 2 or 3 JSON version of the standard.
6981

7082
# Testing
7183

‎THIRDPARTYNOTICES.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,58 @@ This file is based on or incorporates material from the projects listed below (T
2121
>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
2323

24+
## Handlebars.Net
25+
* Component Source: https://github.com/rexm/Handlebars.Net
26+
* Component Copyright and License:
27+
>The MIT License (MIT)
28+
>
29+
>Copyright (c) 2014 Rex Morgan
30+
>
31+
>Permission is hereby granted, free of charge, to any person obtaining a copy
32+
>of this software and associated documentation files (the "Software"), to deal
33+
>in the Software without restriction, including without limitation the rights
34+
>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
35+
>copies of the Software, and to permit persons to whom the Software is
36+
>furnished to do so, subject to the following conditions:
37+
>
38+
>The above copyright notice and this permission notice shall be included in all
39+
>copies or substantial portions of the Software.
40+
>
41+
>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
42+
>IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
43+
>FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
44+
>AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
45+
>LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
46+
>OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
47+
>SOFTWARE.
48+
49+
50+
## Microsoft.OpenApi
51+
* Component Source: https://github.com/Microsoft/OpenAPI.NET
52+
* Component Copyright and License:
53+
>Copyright (c) Microsoft Corporation. All rights reserved.
54+
>
55+
>MIT License
56+
>
57+
>Permission is hereby granted, free of charge, to any person obtaining a copy
58+
>of this software and associated documentation files (the "Software"), to deal
59+
>in the Software without restriction, including without limitation the rights
60+
>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
61+
>copies of the Software, and to permit persons to whom the Software is
62+
>furnished to do so, subject to the following conditions:
63+
>
64+
>The above copyright notice and this permission notice shall be included in all
65+
>copies or substantial portions of the Software.
66+
>
67+
>THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
68+
>IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
69+
>FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
70+
>AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
71+
>LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
72+
>OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
73+
>SOFTWARE.
74+
75+
2476
## Newtonsoft.Json
2577
* Component Source: https://github.com/JamesNK/Newtonsoft.Json
2678
* Component Copyright and License:

‎docfx/api/index.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,17 @@ Classes used to export different languages from a loaded version of FHIR.
6969

7070
Basic TypeScript bindings, useful for prototyping and small projects. Exported classes are able to serialize to and parse from FHIR JSON.
7171

72-
* [CSharpFirely](Microsoft.Health.Fhir.SpecManager.Language.CSharpFirely.html) **EXPERIMENTAL**
72+
* [CSharpFirely](Microsoft.Health.Fhir.SpecManager.Language.CSharpFirely.html)
7373

7474
Export base C# classes needed for the Firely-maintained C# API ([FHIR-Net-API](https://github.com/FirelyTeam/fhir-net-api/)).
7575

76+
* [OpenAPI](Microsoft.Health.Fhir.SpecManager.Language.LangOpenApi.html) **EXPERIMENTAL**
77+
78+
Export an OpenAPI version 2 or 3 JSON document for the selected options.
79+
7680
## Library Namespace: [Microsoft.Health.Fhir.SpecManager.Manager](Microsoft.Health.Fhir.SpecManager.Manager.html)
7781

78-
Classes used to manage FHIR versions.
82+
Classes used to load and manage FHIR versions. Includes functionality to connect to a FHIR server and pull metadata.
7983

8084
## Library Namespace: [Microsoft.Health.Fhir.SpecManager.Models](Microsoft.Health.Fhir.SpecManager.Models.html)
8185

‎docfx/articles/cli.md

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,40 @@ Usage:
66
77
Options:
88
--fhir-spec-directory <fhir-spec-directory> The full path to the directory where FHIR
9-
specifications are downloaded and cached.
9+
specifications are downloaded and cached.
1010
--output-path <output-path> File or directory to write output.
1111
--verbose Show verbose output.
12-
--offline-mode Offline mode.
13-
(will not download missing specs).
12+
--offline-mode Offline mode .
13+
(will not download missing specs)
1414
--language <language> Name of the language to export.
15-
(default: Info|TypeScript|CSharpBasic).
15+
(default: Info|TypeScript|CSharpBasic)
1616
--export-keys <export-keys> '|' separated list of items to export.
17-
(not present to export everything)
17+
(not present to export everything)
1818
--load-r2 <load-r2> If FHIR R2 should be loaded, which version.
19-
(e.g., 1.0.2 or latest)
19+
(e.g., 1.0.2 or latest)
2020
--load-r3 <load-r3> If FHIR R3 should be loaded, which version.
21-
(e.g., 3.0.2 or latest)
21+
(e.g., 3.0.2 or latest)
2222
--load-r4 <load-r4> If FHIR R4 should be loaded, which version.
23-
(e.g., 4.0.1 or latest)
23+
(e.g., 4.0.1 or latest).
2424
--load-r5 <load-r5> If FHIR R5 should be loaded, which version.
25-
(e.g., 4.4.0 or latest)
25+
(e.g., 4.4.0 or latest)
2626
--language-options <language-options> Language specific options, see documentation
2727
for more details.
2828
(e.g., CSharpBasic|namespace=myorg.fhir)
29-
--version Show version information.
30-
-?, -h, --help Show help and usage information.
31-
```
32-
33-
## Langauge Information
29+
--official-expansions-only True to restrict value-sets exported to only
30+
official expansions.
31+
(default: false)
32+
--fhir-server-url <fhir-server-url> FHIR Server URL to pull a CapabilityStatement
33+
(or Conformance) from. Only supports
34+
application/fhir+json.
35+
--include-experimental If the output should include structures
36+
marked experimental.
37+
(default: false)
38+
--version Show version information
39+
-?, -h, --help Show help and usage information
40+
```
41+
42+
## Language Information
3443

3544
* Info
3645

@@ -44,10 +53,14 @@ Options:
4453

4554
Basic TypeScript bindings, useful for prototyping and small projects. Exported classes are able to serialize to and parse from FHIR JSON.
4655

47-
* CSharpFirely **EXPERIMENTAL**
56+
* CSharpFirely
4857

4958
Export base C# classes needed for the Firely-maintained C# API ([FHIR-Net-API](https://github.com/FirelyTeam/fhir-net-api/)).
5059

60+
* OpenAPI **EXPERIMENTAL**
61+
62+
Export an OpenAPI 2 or 3 JSON version of the standard.
63+
5164

5265
## CLI Examples
5366

‎generated/CSharpBasic_R2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13782,7 +13782,7 @@ public class ParametersParameter : BackboneElement {
1378213782
/// A named part of a parameter. In many implementation context, a set of named parts is known as a "Tuple".
1378313783
/// </summary>
1378413784
[JsonProperty("part")]
13785-
public List<OperationDefinitionParameter> Part { get; set; }
13785+
public List<ParametersParameter> Part { get; set; }
1378613786
/// <summary>
1378713787
/// If the parameter is a whole resource.
1378813788
/// </summary>

0 commit comments

Comments
 (0)