From 00a09ee91427d8eb2bd71e0ec22b018231fcba3f Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Mon, 27 Apr 2020 15:51:53 -0600
Subject: [PATCH 1/8] Library liquid template

---
 input/cql/TestingURL.cql              |   7 ++
 input/examples/Library-example.json   |   1 +
 input/examples/Library-testingid.json |  16 +++
 input/myig.xml                        |   4 +
 templates/liquid/Library.liquid       | 146 ++++++++++++++++++++++++++
 5 files changed, 174 insertions(+)
 create mode 100644 input/cql/TestingURL.cql
 create mode 100644 input/examples/Library-testingid.json
 create mode 100644 templates/liquid/Library.liquid

diff --git a/input/cql/TestingURL.cql b/input/cql/TestingURL.cql
new file mode 100644
index 0000000..330cd09
--- /dev/null
+++ b/input/cql/TestingURL.cql
@@ -0,0 +1,7 @@
+library TestingURL
+
+using FHIR version '4.0.1'
+
+context Patient
+
+define Test: 2 + 2
diff --git a/input/examples/Library-example.json b/input/examples/Library-example.json
index a667928..172e551 100644
--- a/input/examples/Library-example.json
+++ b/input/examples/Library-example.json
@@ -1,5 +1,6 @@
 {
   "resourceType" : "Library",
+  "id": "example",
   "url" : "http://somewhere.org/fhir/uv/myig/Library/example",
   "version" : "1.0.0",
   "status" : "draft",
diff --git a/input/examples/Library-testingid.json b/input/examples/Library-testingid.json
new file mode 100644
index 0000000..37edf28
--- /dev/null
+++ b/input/examples/Library-testingid.json
@@ -0,0 +1,16 @@
+{
+  "resourceType" : "Library",
+  "id": "testingid",
+  "url" : "http://somewhere.org/fhir/uv/myig/Library/TestingURL",
+  "version" : "1.0.0",
+  "status" : "draft",
+  "type" : {
+    "coding" : [{
+      "system" : "http://terminology.hl7.org/CodeSystem/library-type",
+      "code" : "logic-library"
+    }]
+  },
+  "content" : [{
+    "id" : "ig-loader-TestingURL.cql"
+  }]
+}
diff --git a/input/myig.xml b/input/myig.xml
index a4a951e..104b96b 100644
--- a/input/myig.xml
+++ b/input/myig.xml
@@ -111,6 +111,10 @@
       <code value="path-binary"/>
       <value value="input\cql"/>
     </parameter>
+    <parameter>
+      <code value="path-liquid"/>
+      <value value="templates\liquid"/>
+    </parameter>
 <!-- Uncomment one or more of these if you want to limit which syntaxes are supported or want to disable the display of mappings
     <parameter>
       <code value="excludexml"/>
diff --git a/templates/liquid/Library.liquid b/templates/liquid/Library.liquid
new file mode 100644
index 0000000..86d478d
--- /dev/null
+++ b/templates/liquid/Library.liquid
@@ -0,0 +1,146 @@
+<div>
+    <table class="grid dict">
+        {% if Library.id.exists()}
+        <tr>
+            <th scope="row"><b>Id: </b></th>
+            <td style="padding-left: 25px;">{{Library.id}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.version.exists()}
+        <tr>
+            <th scope="row"><b>Version: </b></th>
+            <td style="padding-left: 25px;">{{Library.version}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.name.exists()}
+        <tr>
+            <th scope="row"><b>Name: </b></th>
+            <td style="padding-left: 25px;">{{Library.name}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.title.exists()}
+        <tr>
+            <th scope="row"><b>Title: </b></th>
+            <td style="padding-left: 25px;">{{Library.title}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.status.exists()}
+        <tr>
+            <th scope="row"><b>Status: </b></th>
+            <td style="padding-left: 25px;">{{Library.status.value}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.type.exists()}
+        <tr>
+            <th scope="row"><b>Type: </b></th>
+            <td style="padding-left: 25px;">
+                {% if Library.type.coding.exists() %}
+                    {% loop coding in Library.type.coding %}
+                        {% if coding.system.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>system: </b> <span>{{coding.system}}</span>
+                        </p>
+                        {% endif %}
+                        {% if coding.code.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>code: </b> <span>{{coding.code}}</span>
+                        </p>
+                        {% endif %}
+                        {% if coding.display.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>display: </b> <span>{{coding.display}}</span>
+                        </p>
+                        {% endif %}
+                    {% endloop %}
+                {% elseif Library.type.text.exists() %}
+                    {{Library.type.text}}
+                {% endif %}
+            </td>
+        </tr>
+        {% endif %}
+        {% if Library.publisher.exists()}
+        <tr>
+            <th scope="row"><b>Publisher: </b></th>
+            <td style="padding-left: 25px;">{{Library.publisher}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.description.exists()}
+        <tr>
+            <th scope="row"><b>Description: </b></th>
+            <td style="padding-left: 25px;">{{Library.description}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.purpose.exists()}
+        <tr>
+            <th scope="row"><b>Purpose: </b></th>
+            <td style="padding-left: 25px;">{{Library.purpose}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.usage.exists()}
+        <tr>
+            <th scope="row"><b>Usage: </b></th>
+            <td style="padding-left: 25px;">{{Library.usage}}</td>
+        </tr>
+        {% endif %}
+        {% loop artifact in Library.relatedArtifact %}
+        <tr>
+            <th scope="row"><b>Related Artifact: </b></th>
+            <td style="padding-left: 25px;">
+                {% if artifact.type.exists()}
+                <p style="margin-bottom: 5px;">
+                    <b>type: </b> <span>{{artifact.type.value}}</span>
+                </p>
+                {% endif %}
+                {% if artifact.resource.exists()}
+                <p style="margin-bottom: 5px;">
+                    <b>resource: </b> <span>{{artifact.resource}}</span>
+                </p>
+                {% endif %}
+            </td>
+        </tr>
+        {% endloop %}
+        {% loop requirement in Library.dataRequirement %}
+        <tr>
+            <th scope="row"><b>Data Requirement: </b></th>
+            <td style="padding-left: 25px;">
+                {% if requirement.type.exists()}
+                <p style="margin-bottom: 5px;">
+                    <b>type: </b> <span>{{requirement.type.value}}</span>
+                </p>
+                {% endif %}
+                {% loop profile in requirement.profile}
+                <p style="margin-bottom: 5px;">
+                    <b>profile: </b> <span>{{profile.value}}</span>
+                </p>
+                {% endloop %}
+                {% loop support in requirement.mustSupport}
+                <p style="margin-bottom: 5px;">
+                    <b>mustSupport: </b> <span>{{support}}</span>
+                </p>
+                {% endloop %}
+                {% loop cfilter requirement.codeFilter}
+                <p style="margin-bottom: 5px;">
+                    <b>code filter: </b>
+                    {% if cfilter.path.exists() or cfilter.valueSet.exists()}
+                    <br/>
+                    {% endif %}
+                    {% if cfilter.path.exists()}
+                    <span style="padding-left: 25px;">
+                        <b>path: </b><span>{{cfilter.path}}</span>
+                    </span>
+                    {% if cfilter.valueSet.exists()}
+                    <br/>
+                    {% endif %}
+                    {% endif %}
+                    {% if cfilter.valueSet.exists()}
+                    <span style="padding-left: 25px;">
+                        <b>value set: </b><span>{{cfilter.valueSet.value}}</span>
+                    </span>
+                    {% endif %}
+                </p>
+                {% endloop %}
+            </td>
+        </tr>
+        {% endloop %}
+    </table>
+</div>
\ No newline at end of file

From 1bd6dfec30dbfe2bdf2038466fa3c3077d76dcfa Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Thu, 21 May 2020 18:26:02 -0600
Subject: [PATCH 2/8] Cleaning up for commit

---
 input/cql/TestingURL.cql              |  7 -------
 input/examples/Library-testingid.json | 16 ----------------
 2 files changed, 23 deletions(-)
 delete mode 100644 input/cql/TestingURL.cql
 delete mode 100644 input/examples/Library-testingid.json

diff --git a/input/cql/TestingURL.cql b/input/cql/TestingURL.cql
deleted file mode 100644
index 330cd09..0000000
--- a/input/cql/TestingURL.cql
+++ /dev/null
@@ -1,7 +0,0 @@
-library TestingURL
-
-using FHIR version '4.0.1'
-
-context Patient
-
-define Test: 2 + 2
diff --git a/input/examples/Library-testingid.json b/input/examples/Library-testingid.json
deleted file mode 100644
index 37edf28..0000000
--- a/input/examples/Library-testingid.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "resourceType" : "Library",
-  "id": "testingid",
-  "url" : "http://somewhere.org/fhir/uv/myig/Library/TestingURL",
-  "version" : "1.0.0",
-  "status" : "draft",
-  "type" : {
-    "coding" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/library-type",
-      "code" : "logic-library"
-    }]
-  },
-  "content" : [{
-    "id" : "ig-loader-TestingURL.cql"
-  }]
-}

From 1d9b41913c7fbc943f3c61e07e342992ea566b81 Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Fri, 22 May 2020 10:28:23 -0600
Subject: [PATCH 3/8] Fixed template typos

---
 templates/liquid/Library.liquid | 45 +++++++++++++++++----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/templates/liquid/Library.liquid b/templates/liquid/Library.liquid
index 86d478d..c12770e 100644
--- a/templates/liquid/Library.liquid
+++ b/templates/liquid/Library.liquid
@@ -1,36 +1,36 @@
 <div>
     <table class="grid dict">
-        {% if Library.id.exists()}
+        {% if Library.id.exists() %}
         <tr>
             <th scope="row"><b>Id: </b></th>
             <td style="padding-left: 25px;">{{Library.id}}</td>
         </tr>
         {% endif %}
-        {% if Library.version.exists()}
+        {% if Library.version.exists() %}
         <tr>
             <th scope="row"><b>Version: </b></th>
             <td style="padding-left: 25px;">{{Library.version}}</td>
         </tr>
         {% endif %}
-        {% if Library.name.exists()}
+        {% if Library.name.exists() %}
         <tr>
             <th scope="row"><b>Name: </b></th>
             <td style="padding-left: 25px;">{{Library.name}}</td>
         </tr>
         {% endif %}
-        {% if Library.title.exists()}
+        {% if Library.title.exists() %}
         <tr>
             <th scope="row"><b>Title: </b></th>
             <td style="padding-left: 25px;">{{Library.title}}</td>
         </tr>
         {% endif %}
-        {% if Library.status.exists()}
+        {% if Library.status.exists() %}
         <tr>
             <th scope="row"><b>Status: </b></th>
             <td style="padding-left: 25px;">{{Library.status.value}}</td>
         </tr>
         {% endif %}
-        {% if Library.type.exists()}
+        {% if Library.type.exists() %}
         <tr>
             <th scope="row"><b>Type: </b></th>
             <td style="padding-left: 25px;">
@@ -52,31 +52,32 @@
                         </p>
                         {% endif %}
                     {% endloop %}
-                {% elseif Library.type.text.exists() %}
+                {% endif %}
+                {% if Library.type.coding.exists().not and Library.type.text.exists() %}
                     {{Library.type.text}}
                 {% endif %}
             </td>
         </tr>
         {% endif %}
-        {% if Library.publisher.exists()}
+        {% if Library.publisher.exists() %}
         <tr>
             <th scope="row"><b>Publisher: </b></th>
             <td style="padding-left: 25px;">{{Library.publisher}}</td>
         </tr>
         {% endif %}
-        {% if Library.description.exists()}
+        {% if Library.description.exists() %}
         <tr>
             <th scope="row"><b>Description: </b></th>
             <td style="padding-left: 25px;">{{Library.description}}</td>
         </tr>
         {% endif %}
-        {% if Library.purpose.exists()}
+        {% if Library.purpose.exists() %}
         <tr>
             <th scope="row"><b>Purpose: </b></th>
             <td style="padding-left: 25px;">{{Library.purpose}}</td>
         </tr>
         {% endif %}
-        {% if Library.usage.exists()}
+        {% if Library.usage.exists() %}
         <tr>
             <th scope="row"><b>Usage: </b></th>
             <td style="padding-left: 25px;">{{Library.usage}}</td>
@@ -86,12 +87,12 @@
         <tr>
             <th scope="row"><b>Related Artifact: </b></th>
             <td style="padding-left: 25px;">
-                {% if artifact.type.exists()}
+                {% if artifact.type.exists() %}
                 <p style="margin-bottom: 5px;">
                     <b>type: </b> <span>{{artifact.type.value}}</span>
                 </p>
                 {% endif %}
-                {% if artifact.resource.exists()}
+                {% if artifact.resource.exists() %}
                 <p style="margin-bottom: 5px;">
                     <b>resource: </b> <span>{{artifact.resource}}</span>
                 </p>
@@ -103,36 +104,36 @@
         <tr>
             <th scope="row"><b>Data Requirement: </b></th>
             <td style="padding-left: 25px;">
-                {% if requirement.type.exists()}
+                {% if requirement.type.exists() %}
                 <p style="margin-bottom: 5px;">
                     <b>type: </b> <span>{{requirement.type.value}}</span>
                 </p>
                 {% endif %}
-                {% loop profile in requirement.profile}
+                {% loop profile in requirement.profile %}
                 <p style="margin-bottom: 5px;">
                     <b>profile: </b> <span>{{profile.value}}</span>
                 </p>
                 {% endloop %}
-                {% loop support in requirement.mustSupport}
+                {% loop support in requirement.mustSupport %}
                 <p style="margin-bottom: 5px;">
                     <b>mustSupport: </b> <span>{{support}}</span>
                 </p>
                 {% endloop %}
-                {% loop cfilter requirement.codeFilter}
+                {% loop cfilter in requirement.codeFilter %}
                 <p style="margin-bottom: 5px;">
                     <b>code filter: </b>
-                    {% if cfilter.path.exists() or cfilter.valueSet.exists()}
+                    {% if cfilter.path.exists() or cfilter.valueSet.exists() %}
                     <br/>
                     {% endif %}
-                    {% if cfilter.path.exists()}
+                    {% if cfilter.path.exists() %}
                     <span style="padding-left: 25px;">
                         <b>path: </b><span>{{cfilter.path}}</span>
                     </span>
-                    {% if cfilter.valueSet.exists()}
+                    {% if cfilter.valueSet.exists() %}
                     <br/>
                     {% endif %}
                     {% endif %}
-                    {% if cfilter.valueSet.exists()}
+                    {% if cfilter.valueSet.exists() %}
                     <span style="padding-left: 25px;">
                         <b>value set: </b><span>{{cfilter.valueSet.value}}</span>
                     </span>
@@ -143,4 +144,4 @@
         </tr>
         {% endloop %}
     </table>
-</div>
\ No newline at end of file
+</div>

From dd4580566dbe33cdfa1cbaa4868528fca25e1549 Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Mon, 1 Jun 2020 21:08:21 -0600
Subject: [PATCH 4/8] Updates to Library liquid template

---
 templates/liquid/Library.liquid | 269 +++++++++++++++++++++++++-------
 1 file changed, 211 insertions(+), 58 deletions(-)

diff --git a/templates/liquid/Library.liquid b/templates/liquid/Library.liquid
index c12770e..cbe570e 100644
--- a/templates/liquid/Library.liquid
+++ b/templates/liquid/Library.liquid
@@ -6,12 +6,35 @@
             <td style="padding-left: 25px;">{{Library.id}}</td>
         </tr>
         {% endif %}
+        {% if Library.url.exists() %}
+        <tr>
+            <th scope="row"><b>Url: </b></th>
+            <td style="padding-left: 25px;">{{Library.url}}</td>
+        </tr>
+        {% endif %}
         {% if Library.version.exists() %}
         <tr>
             <th scope="row"><b>Version: </b></th>
             <td style="padding-left: 25px;">{{Library.version}}</td>
         </tr>
         {% endif %}
+        {% for identifier in Library %}
+        <tr>
+            <th scope="row"><b>Identifier: </b></th>
+            <td style="padding-left: 25px;">
+                {% if identifier.type.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>type: </b> <span>{{identifier.type.value}}</span>
+                </p>
+                {% endif %}
+                {% if identifier.value.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>value: </b> <span>{{identifier.value}}</span>
+                </p>
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
         {% if Library.name.exists() %}
         <tr>
             <th scope="row"><b>Name: </b></th>
@@ -24,18 +47,30 @@
             <td style="padding-left: 25px;">{{Library.title}}</td>
         </tr>
         {% endif %}
+        {% if Library.subtitle.exists() %}
+        <tr>
+            <th scope="row"><b>Subtitle: </b></th>
+            <td style="padding-left: 25px;">{{Library.subtitle}}</td>
+        </tr>
+        {% endif %}
         {% if Library.status.exists() %}
         <tr>
             <th scope="row"><b>Status: </b></th>
             <td style="padding-left: 25px;">{{Library.status.value}}</td>
         </tr>
         {% endif %}
+        {% if Library.experimental.exists() %}
+        <tr>
+            <th scope="row"><b>Experimental: </b></th>
+            <td style="padding-left: 25px;">{{Library.experimental.value}}</td>
+        </tr>
+        {% endif %}
         {% if Library.type.exists() %}
         <tr>
             <th scope="row"><b>Type: </b></th>
             <td style="padding-left: 25px;">
                 {% if Library.type.coding.exists() %}
-                    {% loop coding in Library.type.coding %}
+                    {% for coding in Library.type.coding %}
                         {% if coding.system.exists() %}
                         <p style="margin-bottom: 5px;">
                             <b>system: </b> <span>{{coding.system}}</span>
@@ -51,7 +86,7 @@
                             <b>display: </b> <span>{{coding.display}}</span>
                         </p>
                         {% endif %}
-                    {% endloop %}
+                    {% endfor %}
                 {% endif %}
                 {% if Library.type.coding.exists().not and Library.type.text.exists() %}
                     {{Library.type.text}}
@@ -59,6 +94,62 @@
             </td>
         </tr>
         {% endif %}
+        {% if Library.subject.exists() %}
+        <tr>
+            <th scope="row"><b>Type: </b></th>
+            {%if Library.subject is CodeableConcept %}
+            <td style="padding-left: 25px;">
+                {% if Library.subject.coding.exists() %}
+                    {% for coding in Library.subject.coding %}
+                        {% if coding.system.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>system: </b> <span>{{coding.system}}</span>
+                        </p>
+                        {% endif %}
+                        {% if coding.code.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>code: </b> <span>{{coding.code}}</span>
+                        </p>
+                        {% endif %}
+                        {% if coding.display.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>display: </b> <span>{{coding.display}}</span>
+                        </p>
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
+                {% if Library.subject.coding.exists().not and Library.subject.text.exists() %}
+                    {{Library.subject.text}}
+                {% endif %}
+            </td>
+            {% endif %}
+            {% if Library.subject is Reference %}
+            <td style="padding-left: 25px;">
+                {% if Library.subject.reference.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>reference: </b> <span>{{Library.subject.reference}}</span>
+                </p>
+                {% endif %}
+                {% if Library.subject.type.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>type: </b> <span>{{Library.subject.type}}</span>
+                </p>
+                {% endif %}
+                {% if Library.subject.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{Library.subject.display}}</span>
+                </p>
+                {% endif %}
+            </td>
+            {% endif %}
+        </tr>
+        {% endif %}
+        {% if Library.date.exists() %}
+        <tr>
+            <th scope="row"><b>Date: </b></th>
+            <td style="padding-left: 25px;">{{Library.date}}</td>
+        </tr>
+        {% endif %}
         {% if Library.publisher.exists() %}
         <tr>
             <th scope="row"><b>Publisher: </b></th>
@@ -71,6 +162,28 @@
             <td style="padding-left: 25px;">{{Library.description}}</td>
         </tr>
         {% endif %}
+        {% if Library.useContext.exists() %}
+        <tr>
+            <th scope="row"><b>Use Context: </b></th>
+            <td style="padding-left: 25px;">
+                <table class="grid-dict">
+                    <tr><th><b>code</b></th><th><b>value</b></th></tr>
+                    {% for useContext in Library.useContext %}
+                      <tr>
+                        <td>{{useContext.code.code}}</td>
+                        <td>{{(useContext.value as CodeableConcept).coding.first().code}}</td>
+                      </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% endif %}
+        {% if Library.jurisdiction.exists() %}
+        <tr>
+            <th scope="row"><b>Jurisdiction: </b></th>
+            <td style="padding-left: 25px;">{{Library.jurisdiction.first().coding.first().code}}</td>
+        </tr>
+        {% endif %}
         {% if Library.purpose.exists() %}
         <tr>
             <th scope="row"><b>Purpose: </b></th>
@@ -83,65 +196,105 @@
             <td style="padding-left: 25px;">{{Library.usage}}</td>
         </tr>
         {% endif %}
-        {% loop artifact in Library.relatedArtifact %}
+        {% if Library.copyright.exists() %}
         <tr>
-            <th scope="row"><b>Related Artifact: </b></th>
-            <td style="padding-left: 25px;">
-                {% if artifact.type.exists() %}
-                <p style="margin-bottom: 5px;">
-                    <b>type: </b> <span>{{artifact.type.value}}</span>
-                </p>
-                {% endif %}
-                {% if artifact.resource.exists() %}
-                <p style="margin-bottom: 5px;">
-                    <b>resource: </b> <span>{{artifact.resource}}</span>
-                </p>
-                {% endif %}
-            </td>
+            <th scope="row"><b>Copyright: </b></th>
+            <td style="padding-left: 25px;">{{Library.copyright}}</td>
         </tr>
-        {% endloop %}
-        {% loop requirement in Library.dataRequirement %}
+        {% endif %}
+        {% if Library.approvalDate.exists() %}
         <tr>
-            <th scope="row"><b>Data Requirement: </b></th>
-            <td style="padding-left: 25px;">
-                {% if requirement.type.exists() %}
-                <p style="margin-bottom: 5px;">
-                    <b>type: </b> <span>{{requirement.type.value}}</span>
-                </p>
-                {% endif %}
-                {% loop profile in requirement.profile %}
-                <p style="margin-bottom: 5px;">
-                    <b>profile: </b> <span>{{profile.value}}</span>
-                </p>
-                {% endloop %}
-                {% loop support in requirement.mustSupport %}
-                <p style="margin-bottom: 5px;">
-                    <b>mustSupport: </b> <span>{{support}}</span>
-                </p>
-                {% endloop %}
-                {% loop cfilter in requirement.codeFilter %}
-                <p style="margin-bottom: 5px;">
-                    <b>code filter: </b>
-                    {% if cfilter.path.exists() or cfilter.valueSet.exists() %}
-                    <br/>
-                    {% endif %}
-                    {% if cfilter.path.exists() %}
-                    <span style="padding-left: 25px;">
-                        <b>path: </b><span>{{cfilter.path}}</span>
-                    </span>
-                    {% if cfilter.valueSet.exists() %}
-                    <br/>
-                    {% endif %}
-                    {% endif %}
-                    {% if cfilter.valueSet.exists() %}
-                    <span style="padding-left: 25px;">
-                        <b>value set: </b><span>{{cfilter.valueSet.value}}</span>
-                    </span>
-                    {% endif %}
-                </p>
-                {% endloop %}
-            </td>
+            <th scope="row"><b>Approval Date: </b></th>
+            <td style="padding-left: 25px;">{{Library.approvalDate}}</td>
         </tr>
-        {% endloop %}
+        {% endif %}
+        {% if Library.lastReviewDate.exists() %}
+        <tr>
+            <th scope="row"><b>Last Review Date: </b></th>
+            <td style="padding-left: 25px;">{{Library.lastReviewDate}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.effectivePeriod.exists() %}
+        <tr>
+            <th scope="row"><b>Effective Period: </b></th>
+            <td style="padding-left: 25px;">{{Library.effectivePeriod.start}}..{{Library.effectivePeriod.end}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.relatedArtifact.exists() %}
+        <tr>
+          <th scope="row"><b>Related Artifacts: </b></th>
+          <td style="padding-left: 25px;">
+            <table class="grid-dict">
+              <tr><th><b>Type</b></th><th><b>Resource</b></th></tr>
+              {% for artifact in Library.relatedArtifact %}
+                <tr><td>{{artifact.type.value}}</td><td>{{artifact.resource}}</td></tr>
+              {% endfor %}
+            </table>
+          </td>
+        </tr>
+        {% endif %}
+        {% if Library.parameter.exists() %}
+        <tr>
+          <th scope="row"><b>Parameters: </b></th>
+          <td style="padding-left: 25px;">
+            <table class="grid-dict">
+              <tr><th><b>Name</b></th><th><b>Type</b></th><th><b>Min</b></th><th><b>Max</b></th><th><b>In/Out</b></th></tr>
+              {% for param in Library.parameter %}
+                <tr><th>{{param.name}}</th><th>{{param.type}}</th><th>{{param.min}}</th><th>{{param.max}}</th><th>{{param.use}}</th></tr>
+              {% endfor %}
+            </table>
+          </td>
+        </tr>
+        {% endif %}
+        {% if Library.dataRequirement.exists() %}
+        <tr>
+          <th scope="row"><b>Data Requirements:</b></th>
+          <td style="padding-left: 25px;">
+            <table class="grid-dict">
+              <tr><th><b>Type</b></th><th><b>Profile</b></th><th><b>MS</b></th><th><b>Code Filter</b></th></tr>
+              {% for requirement in Library.dataRequirement %}
+                <tr>
+                  <th>{{requirement.type.value}}</th>
+                  <th>{% for profile in requirement.profile %}{{profile.value}}{% endfor %}</th>
+                  <th>{% for support in requirement.mustSupport %}{{mustSupport}};{% endfor %}</th>
+                  <th>
+                    {% for cfilter in requirement.codeFilter %}
+                    <p style="margin-bottom: 5px;">
+                        <b>code filter: </b>
+                        {% if cfilter.path.exists() or cfilter.valueSet.exists() %}
+                        <br/>
+                        {% endif %}
+                        {% if cfilter.path.exists() %}
+                        <span style="padding-left: 25px;">
+                            <b>path: </b><span>{{cfilter.path}}</span>
+                        </span>
+                        {% if cfilter.valueSet.exists() %}
+                        <br/>
+                        {% endif %}
+                        {% endif %}
+                        {% if cfilter.valueSet.exists() %}
+                        <span style="padding-left: 25px;">
+                            <b>value set: </b><span>{{cfilter.valueSet.value}}</span>
+                        </span>
+                        {% endif %}
+                    </p>
+                    {% endfor %}
+                  </th>
+                </tr>
+              {% endfor %}
+            </table>
+          </td>
+        </tr>
+        {% endif %}
+        {% for c in Library.content %}
+        {% if c.contentType = 'text/cql' %}
+        <tr>
+          <table>
+            <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
+            <tr><pre><code>{{c.data.fromBase64()}}</code></pre></tr>
+          </table>
+        </tr>
+        {% endif %}
+        {% endfor %}
     </table>
 </div>

From 64ea0c0bbb118aeded3307c3a616e2c80c06517c Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Mon, 8 Jun 2020 07:45:27 -0600
Subject: [PATCH 5/8] Updates to library template

---
 templates/liquid/Library.liquid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/liquid/Library.liquid b/templates/liquid/Library.liquid
index cbe570e..837f3be 100644
--- a/templates/liquid/Library.liquid
+++ b/templates/liquid/Library.liquid
@@ -291,7 +291,7 @@
         <tr>
           <table>
             <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
-            <tr><pre><code>{{c.data.fromBase64()}}</code></pre></tr>
+            <tr><pre><code>{{c.data.fromBase64().escape('html')}}</code></pre></tr>
           </table>
         </tr>
         {% endif %}

From a37abbda58a7aa79e722ac3a2b993608e23b2dd5 Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Mon, 8 Jun 2020 17:41:26 -0600
Subject: [PATCH 6/8] Replaced use of `fromBase64()` with `decode('base64')`

---
 templates/liquid/Library.liquid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/liquid/Library.liquid b/templates/liquid/Library.liquid
index 837f3be..a0e587b 100644
--- a/templates/liquid/Library.liquid
+++ b/templates/liquid/Library.liquid
@@ -291,7 +291,7 @@
         <tr>
           <table>
             <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
-            <tr><pre><code>{{c.data.fromBase64().escape('html')}}</code></pre></tr>
+            <tr><pre><code>{{c.data.decode('base64').escape('html')}}</code></pre></tr>
           </table>
         </tr>
         {% endif %}

From 837a69e037e32331068db027da4fe08c6f315062 Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Mon, 8 Jun 2020 20:42:17 -0600
Subject: [PATCH 7/8] Additional updates to template and library example

---
 input/examples/Library-example.json |  9 +++++++++
 templates/liquid/Library.liquid     | 12 ++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/input/examples/Library-example.json b/input/examples/Library-example.json
index 172e551..20f4135 100644
--- a/input/examples/Library-example.json
+++ b/input/examples/Library-example.json
@@ -3,13 +3,22 @@
   "id": "example",
   "url" : "http://somewhere.org/fhir/uv/myig/Library/example",
   "version" : "1.0.0",
+  "name": "example",
+  "title": "Example CQL Library",
   "status" : "draft",
+  "experimental": true,
   "type" : {
     "coding" : [{
       "system" : "http://terminology.hl7.org/CodeSystem/library-type",
       "code" : "logic-library"
     }]
   },
+  "subject": {
+    "coding": [{
+      "system": "hl7.org/fhir/resource-types",
+      "code": "Patient"
+    }]
+  },
   "content" : [{
     "id" : "ig-loader-example.cql"
   }]
diff --git a/templates/liquid/Library.liquid b/templates/liquid/Library.liquid
index a0e587b..f9be5ae 100644
--- a/templates/liquid/Library.liquid
+++ b/templates/liquid/Library.liquid
@@ -18,7 +18,7 @@
             <td style="padding-left: 25px;">{{Library.version}}</td>
         </tr>
         {% endif %}
-        {% for identifier in Library %}
+        {% for identifier in Library.identifier %}
         <tr>
             <th scope="row"><b>Identifier: </b></th>
             <td style="padding-left: 25px;">
@@ -291,7 +291,15 @@
         <tr>
           <table>
             <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
-            <tr><pre><code>{{c.data.decode('base64').escape('html')}}</code></pre></tr>
+            <tr><td><pre><code>{{c.data.decode('base64').escape('html')}}</code></pre></td></tr>
+          </table>
+        </tr>
+        {% endif %}
+        {% if c.contentType != 'text/cql' %}
+        <tr>
+          <table>
+            <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
+            <tr><td><pre><code>{{'Encoded data (' + c.data.length().toString() + ' characters)'}}</code></pre></td></tr>
           </table>
         </tr>
         {% endif %}

From 946629148db8a660ea2db121608bdfb3300cade5 Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Mon, 8 Jun 2020 20:45:10 -0600
Subject: [PATCH 8/8] Added example of cql-options.json file

---
 input/cql/cql-options.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 input/cql/cql-options.json

diff --git a/input/cql/cql-options.json b/input/cql/cql-options.json
new file mode 100644
index 0000000..9ef3ba6
--- /dev/null
+++ b/input/cql/cql-options.json
@@ -0,0 +1,17 @@
+{
+   "options":[
+      "EnableAnnotations",
+      "EnableLocators",
+      "DisableListDemotion",
+      "DisableListPromotion"
+
+],
+   "formats":[
+     "XML",
+     "JXSON"
+   ],
+   "validateUnits":true,
+   "verifyOnly":false,
+   "errorLevel":"Info",
+   "signatureLevel":"None"
+}