Merge pull request #3 from microsoft/main

Sync Firely fork (main) with MS
microsoft · Jul 28, 2020 · e589344 · e589344
2 parents 9a69013 + 7e60df8
commit e589344
Show file tree

Hide file tree

Showing 45 changed files with 8,128 additions and 437 deletions.
diff --git a/.gitignore b/.gitignore
@@ -377,4 +377,5 @@ msbuild.log
 msbuild.err
 msbuild.wrn
 /generated/r4-test.txt
-/firely
+/firely
+/temp
diff --git a/README.md b/README.md
@@ -10,28 +10,37 @@ Usage:
 
 Options:
   --fhir-spec-directory <fhir-spec-directory>    The full path to the directory where FHIR 
-                                                   specifications are downloaded and cached.
+                                                    specifications are downloaded and cached.
   --output-path <output-path>                    File or directory to write output.
   --verbose                                      Show verbose output.
-  --offline-mode                                 Offline mode.
-                                                   (will not download missing specs).
+  --offline-mode                                 Offline mode .
+                                                    (will not download missing specs)
   --language <language>                          Name of the language to export.
-                                                   (default: Info|TypeScript|CSharpBasic).
+                                                    (default: Info|TypeScript|CSharpBasic)
   --export-keys <export-keys>                    '|' separated list of items to export.
-                                                   (not present to export everything)
+                                                    (not present to export everything)
   --load-r2 <load-r2>                            If FHIR R2 should be loaded, which version.
-                                                   (e.g., 1.0.2 or latest)
+                                                    (e.g., 1.0.2 or latest)
   --load-r3 <load-r3>                            If FHIR R3 should be loaded, which version.
-                                                   (e.g., 3.0.2 or latest)
+                                                    (e.g., 3.0.2 or latest)
   --load-r4 <load-r4>                            If FHIR R4 should be loaded, which version.
-                                                   (e.g., 4.0.1 or latest)
+                                                    (e.g., 4.0.1 or latest).
   --load-r5 <load-r5>                            If FHIR R5 should be loaded, which version.
-                                                   (e.g., 4.4.0 or latest)
+                                                    (e.g., 4.4.0 or latest)
   --language-options <language-options>          Language specific options, see documentation
                                                    for more details.
                                                    (e.g., CSharpBasic|namespace=myorg.fhir)
-  --version                                      Show version information.
-  -?, -h, --help                                 Show help and usage information.
+  --official-expansions-only                     True to restrict value-sets exported to only
+                                                    official expansions.
+                                                    (default: false)
+  --fhir-server-url <fhir-server-url>            FHIR Server URL to pull a CapabilityStatement
+                                                    (or Conformance) from. Only supports
+                                                    application/fhir+json.
+  --include-experimental                         If the output should include structures
+                                                    marked experimental.
+                                                    (default: false)
+  --version                                      Show version information
+  -?, -h, --help                                 Show help and usage information
 ```
 
 ## Examples
@@ -62,10 +71,13 @@ Options:
 
     Basic TypeScript bindings, useful for prototyping and small projects.  Exported classes are able to serialize to and parse from FHIR JSON.
 
-  * CSharpFirely **EXPERIMENTAL**
+  * CSharpFirely
 
     Export base C# classes needed for the Firely-maintained C# API ([FHIR-Net-API](https://github.com/FirelyTeam/fhir-net-api/)).
 
+  * OpenAPI **EXPERIMENTAL**
+
+    Export an OpenAPI 2 or 3 JSON version of the standard.
 
 # Testing
 

diff --git a/THIRDPARTYNOTICES.md b/THIRDPARTYNOTICES.md
@@ -21,6 +21,58 @@ This file is based on or incorporates material from the projects listed below (T
 >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.
 
 
+## Handlebars.Net
+* Component Source: https://github.com/rexm/Handlebars.Net
+* Component Copyright and License:
+>The MIT License (MIT)
+>
+>Copyright (c) 2014 Rex Morgan
+>
+>Permission is hereby granted, free of charge, to any person obtaining a copy
+>of this software and associated documentation files (the "Software"), to deal
+>in the Software without restriction, including without limitation the rights
+>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+>copies of the Software, and to permit persons to whom the Software is
+>furnished to do so, subject to the following conditions:
+>
+>The above copyright notice and this permission notice shall be included in all
+>copies or substantial portions of the Software.
+>
+>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.
+
+
+## Microsoft.OpenApi
+* Component Source: https://github.com/Microsoft/OpenAPI.NET
+* Component Copyright and License:
+>Copyright (c) Microsoft Corporation. All rights reserved.
+>
+>MIT License
+>
+>Permission is hereby granted, free of charge, to any person obtaining a copy
+>of this software and associated documentation files (the "Software"), to deal
+>in the Software without restriction, including without limitation the rights
+>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+>copies of the Software, and to permit persons to whom the Software is
+>furnished to do so, subject to the following conditions:
+>
+>The above copyright notice and this permission notice shall be included in all
+>copies or substantial portions of the Software.
+>
+>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.
+
+
 ## Newtonsoft.Json
 * Component Source: https://github.com/JamesNK/Newtonsoft.Json
 * Component Copyright and License:

diff --git a/docfx/api/index.md b/docfx/api/index.md
@@ -69,13 +69,17 @@ Classes used to export different languages from a loaded version of FHIR.
 
     Basic TypeScript bindings, useful for prototyping and small projects.  Exported classes are able to serialize to and parse from FHIR JSON.
 
-  * [CSharpFirely](Microsoft.Health.Fhir.SpecManager.Language.CSharpFirely.html) **EXPERIMENTAL**
+  * [CSharpFirely](Microsoft.Health.Fhir.SpecManager.Language.CSharpFirely.html)
 
     Export base C# classes needed for the Firely-maintained C# API ([FHIR-Net-API](https://github.com/FirelyTeam/fhir-net-api/)).
 
+  * [OpenAPI](Microsoft.Health.Fhir.SpecManager.Language.LangOpenApi.html) **EXPERIMENTAL**
+
+    Export an OpenAPI version 2 or 3 JSON document for the selected options.
+
 ## Library Namespace: [Microsoft.Health.Fhir.SpecManager.Manager](Microsoft.Health.Fhir.SpecManager.Manager.html)
 
-Classes used to manage FHIR versions.
+Classes used to load and manage FHIR versions.  Includes functionality to connect to a FHIR server and pull metadata.
 
 ## Library Namespace: [Microsoft.Health.Fhir.SpecManager.Models](Microsoft.Health.Fhir.SpecManager.Models.html)
 

diff --git a/docfx/articles/cli.md b/docfx/articles/cli.md
@@ -6,31 +6,40 @@ Usage:
 
 Options:
   --fhir-spec-directory <fhir-spec-directory>    The full path to the directory where FHIR 
-                                                   specifications are downloaded and cached.
+                                                    specifications are downloaded and cached.
   --output-path <output-path>                    File or directory to write output.
   --verbose                                      Show verbose output.
-  --offline-mode                                 Offline mode.
-                                                   (will not download missing specs).
+  --offline-mode                                 Offline mode .
+                                                    (will not download missing specs)
   --language <language>                          Name of the language to export.
-                                                   (default: Info|TypeScript|CSharpBasic).
+                                                    (default: Info|TypeScript|CSharpBasic)
   --export-keys <export-keys>                    '|' separated list of items to export.
-                                                   (not present to export everything)
+                                                    (not present to export everything)
   --load-r2 <load-r2>                            If FHIR R2 should be loaded, which version.
-                                                   (e.g., 1.0.2 or latest)
+                                                    (e.g., 1.0.2 or latest)
   --load-r3 <load-r3>                            If FHIR R3 should be loaded, which version.
-                                                   (e.g., 3.0.2 or latest)
+                                                    (e.g., 3.0.2 or latest)
   --load-r4 <load-r4>                            If FHIR R4 should be loaded, which version.
-                                                   (e.g., 4.0.1 or latest)
+                                                    (e.g., 4.0.1 or latest).
   --load-r5 <load-r5>                            If FHIR R5 should be loaded, which version.
-                                                   (e.g., 4.4.0 or latest)
+                                                    (e.g., 4.4.0 or latest)
   --language-options <language-options>          Language specific options, see documentation
                                                    for more details.
                                                    (e.g., CSharpBasic|namespace=myorg.fhir)
-  --version                                      Show version information.
-  -?, -h, --help                                 Show help and usage information.
-```
-
-## Langauge Information
+  --official-expansions-only                     True to restrict value-sets exported to only
+                                                    official expansions.
+                                                    (default: false)
+  --fhir-server-url <fhir-server-url>            FHIR Server URL to pull a CapabilityStatement
+                                                    (or Conformance) from. Only supports
+                                                    application/fhir+json.
+  --include-experimental                         If the output should include structures
+                                                    marked experimental.
+                                                    (default: false)
+  --version                                      Show version information
+  -?, -h, --help                                 Show help and usage information
+  ```
+
+## Language Information
 
   * Info
 
@@ -44,10 +53,14 @@ Options:
 
     Basic TypeScript bindings, useful for prototyping and small projects.  Exported classes are able to serialize to and parse from FHIR JSON.
 
-  * CSharpFirely **EXPERIMENTAL**
+  * CSharpFirely
 
     Export base C# classes needed for the Firely-maintained C# API ([FHIR-Net-API](https://github.com/FirelyTeam/fhir-net-api/)).
 
+  * OpenAPI **EXPERIMENTAL**
+
+    Export an OpenAPI 2 or 3 JSON version of the standard.
+
 
 ## CLI Examples
 

diff --git a/generated/CSharpBasic_R2.cs b/generated/CSharpBasic_R2.cs
@@ -13782,7 +13782,7 @@ public class ParametersParameter : BackboneElement {
     /// A named part of a parameter. In many implementation context, a set of named parts is known as a "Tuple".
     /// </summary>
     [JsonProperty("part")]
-    public List<OperationDefinitionParameter> Part { get; set; }
+    public List<ParametersParameter> Part { get; set; }
     /// <summary>
     /// If the parameter is a whole resource.
     /// </summary>