From 7f0f2c493a34fdd116697cfd58c74ca994553ef5 Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Thu, 15 Aug 2019 16:07:33 -0400
Subject: [PATCH 1/4] Several small corrections and enhancements to schema docs

---
 build/metaschema/lib/metaschema-check.sch          | 14 ++++++++------
 build/metaschema/lib/metaschema-docs-util.xsl      |  8 ++++----
 .../lib/metaschema-jsondocs-jekyll-uswds.xsl       |  6 +++---
 build/metaschema/lib/metaschema-jsonobject-map.xsl |  1 -
 .../lib/metaschema-xmldocs-jekyll-uswds.xsl        |  7 +++----
 .../xml/produce-and-run-either-documentor.xsl      |  3 +++
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/build/metaschema/lib/metaschema-check.sch b/build/metaschema/lib/metaschema-check.sch
index 481d9daa86..b991fa5d41 100644
--- a/build/metaschema/lib/metaschema-check.sch
+++ b/build/metaschema/lib/metaschema-check.sch
@@ -18,6 +18,8 @@
 
     <xsl:key name="definition-by-name" match="m:define-assembly | m:define-field | m:define-flag" use="@name"/>
     <xsl:key name="invocation-by-ref" match="m:assembly[exists(@ref)] | m:field[exists(@ref)] | m:flag[exists(@ref)]" use="@ref"/>
+    <xsl:key name="flags-by-name" match="m:define-flag | m:flag[@name]" use="@name"/>
+    
     
     <sch:ns uri="http://csrc.nist.gov/ns/oscal/metaschema/1.0" prefix="m"/>
     
@@ -41,10 +43,11 @@
             <sch:assert test="exists(m:formal-name)">formal-name missing from <sch:name/></sch:assert>
             <sch:assert test="exists(m:description)">description missing from <sch:name/></sch:assert>
             <sch:assert test="empty(self::m:define-assembly) or exists(m:model)">model missing from <sch:name/></sch:assert>
-            <sch:assert test="empty(@address) or m:flag/@name=@address">Definition set to address by '<sch:value-of select="@address"/>', but no flag with that name is declared.</sch:assert>
             <sch:assert test="not(@as-type='boolean') or empty(m:flag)">Property defined as boolean may not have flags.</sch:assert>
             <sch:assert test="not(key('invocation-by-ref',@name)/m:group-as/@json-behavior='BY_KEY') or exists(m:json-key)"><sch:value-of select="substring-after(local-name(),
             'define-')"/> is assigned a json key, but no 'json-key' is given</sch:assert>
+            <sch:report test="@name=('RICHTEXT','STRVALUE','PROSE')">Names "STRVALUE", "RICHTEXT" or "PROSE" (reserved names)</sch:report>
+            
         </sch:rule>
 
         <sch:rule context="m:json-key">
@@ -84,12 +87,10 @@
             <sch:assert test="empty(@ref) or exists($decl)" role="warning">No definition found for '<sch:value-of select="@ref"/>' <sch:value-of select="local-name()"/></sch:assert>
             <sch:assert test="empty(@ref) or empty($decl) or empty(@datatype) or (@datatype = $decl/@datatype)" role="warning">Flag data type doesn't match: the definition has '<sch:value-of select="$decl/@datatype"/>'</sch:assert>
             <sch:report test="@name=('RICHTEXT','STRVALUE','PROSE')">Flag should not be named "STRVALUE", "RICHTEXT" or "PROSE" (reserved names)</sch:report>
+            <sch:report test="@as-type != key('flags-by-name',@name)/@as-type,$composed-metaschema">Flag is declared with datatype '<sch:value-of select="@as-type"/>' while other flags with that name show datatype
+                <sch:value-of select="string-join(((key('flags-by-name',@name) except .)/@as-type ! ('''' || . || '''')),', ')"/></sch:report>
         </sch:rule>
         
-        <sch:rule context="m:prose">
-            <sch:assert test="count(../m:prose) eq 1">Prose may not appear in more than once in a model</sch:assert>
-        </sch:rule>
-
         <!-- 'choice' is not subjected to rules for other elements inside 'model' -->
         <sch:rule context="m:choice"/>
 
@@ -118,7 +119,8 @@
                 <sqf:add target="group-as" node-type="element"><group-as name="{ $group-name }"/></sqf:add>
                 
             </sqf:fix>-->
-           
+            <sch:assert test="not(@as-type='markup-multiline') or not(preceding-sibling/*/@as-type='markup-multiline')">Only one field may be marked
+            as 'markup-multiline' (without xml wrapping) within a model.</sch:assert>
         </sch:rule>
 
         <sch:rule context="m:group-as">
diff --git a/build/metaschema/lib/metaschema-docs-util.xsl b/build/metaschema/lib/metaschema-docs-util.xsl
index b7aced3db7..f0a09dc06e 100644
--- a/build/metaschema/lib/metaschema-docs-util.xsl
+++ b/build/metaschema/lib/metaschema-docs-util.xsl
@@ -91,17 +91,17 @@ function switch_view(who,flag) {
                 <!--<pre style="float:left">
                <xsl:value-of select="serialize($pruned-tree, $serialization-settings/* )"/>
             </pre>-->
-                <!--<pre>
+                <pre>
                <xsl:value-of select="serialize($surrogate-tree, $serialization-settings/* )"/>
-            </pre>-->
+            </pre>
                 
                 
                 <xsl:variable name="html-rendering">
                     <xsl:apply-templates mode="html-render" select="$surrogate-tree"/>
                 </xsl:variable>
-                <div class="OM-map" style="float:left; width:40%">
+                <!--<div class="OM-map" style="float:left; width:40%">
                     <xsl:copy-of select="$html-rendering"/>
-                </div>
+                </div>-->
                 <div class="OM-map" style="float:right; width:40%">
                     <xsl:apply-templates select="$html-rendering/*" mode="elaborate"/>
                 </div>
diff --git a/build/metaschema/lib/metaschema-jsondocs-jekyll-uswds.xsl b/build/metaschema/lib/metaschema-jsondocs-jekyll-uswds.xsl
index 25820325c7..07665bba4b 100644
--- a/build/metaschema/lib/metaschema-jsondocs-jekyll-uswds.xsl
+++ b/build/metaschema/lib/metaschema-jsondocs-jekyll-uswds.xsl
@@ -112,9 +112,9 @@
       <xsl:variable name="alt-schema" select="replace($metaschema-code,'-json$','-xml')"/>
       <div style="float:right">
          <a href="/OSCAL/docs/schemas/{ $alt-schema }/#{ $alt-schema }_{ @name}">
-            <button class="button-xml-on">XML</button>
+            <button class="button-xml-on">Switch to XML</button>
          </a>
-         <button  class="button-json-off" disabled="disabled">JSON</button>
+         <!--<button  class="button-json-off" disabled="disabled">JSON</button>-->
       </div>
    </xsl:template>
 
@@ -339,7 +339,7 @@
       <li>
          <xsl:apply-templates mode="link-here" select="key('definitions',@ref)"/>
          <xsl:if test="empty(@ref)">
-            <xsl:apply-templates select="@name"/>
+            <a id="{../@name}-{@name}"><xsl:apply-templates select="@name"/></a><xsl:apply-templates select="@name"/>
          </xsl:if>
          <xsl:text> property </xsl:text>
          <xsl:apply-templates select="@as-type"/>
diff --git a/build/metaschema/lib/metaschema-jsonobject-map.xsl b/build/metaschema/lib/metaschema-jsonobject-map.xsl
index 46019d746e..b01dcdfe90 100644
--- a/build/metaschema/lib/metaschema-jsonobject-map.xsl
+++ b/build/metaschema/lib/metaschema-jsonobject-map.xsl
@@ -22,7 +22,6 @@
    
    <!--<xsl:variable name="home" select="/"/>-->
    
-   
    <!--<xsl:template name="jekyll-template">
       <xsl:text>-\-\-&#xA;</xsl:text>
       <xsl:text>title: Schema map test&#xA;</xsl:text>
diff --git a/build/metaschema/lib/metaschema-xmldocs-jekyll-uswds.xsl b/build/metaschema/lib/metaschema-xmldocs-jekyll-uswds.xsl
index 216412e11c..b767df6fbf 100644
--- a/build/metaschema/lib/metaschema-xmldocs-jekyll-uswds.xsl
+++ b/build/metaschema/lib/metaschema-xmldocs-jekyll-uswds.xsl
@@ -123,9 +123,9 @@
    <xsl:template name="cross-links">
       <xsl:variable name="alt-schema" select="replace($metaschema-code,'-xml$','-json')"/>
       <div style="float:right">
-         <button disabled="disabled" class="button-xml-off">XML</button>
+         <!--<button disabled="disabled" class="button-xml-off">XML</button>-->
          <a href="/OSCAL/docs/schemas/{ $alt-schema }/#{ $alt-schema }_{ @name}">
-            <button class="button-json-on">JSON</button>
+            <button class="button-json-on">Switch to JSON</button>
          </a>
       </div>
    </xsl:template>
@@ -232,8 +232,7 @@
       <li>
          <xsl:apply-templates mode="link-here" select="key('definitions',@ref)"/>
          <xsl:if test="empty(@ref)">
-            <xsl:apply-templates select="@name"/>
-         </xsl:if>
+           <a id="{../@name}-{@name}"><xsl:apply-templates select="@name"/></a><xsl:apply-templates select="@name"/>
          <xsl:text> attribute </xsl:text>
          <xsl:apply-templates select="@required"/>
          <xsl:if test="empty(@required)"> (<i>optional</i>)</xsl:if>
diff --git a/build/metaschema/xml/produce-and-run-either-documentor.xsl b/build/metaschema/xml/produce-and-run-either-documentor.xsl
index 383aa7898d..c820a35049 100644
--- a/build/metaschema/xml/produce-and-run-either-documentor.xsl
+++ b/build/metaschema/xml/produce-and-run-either-documentor.xsl
@@ -117,6 +117,7 @@
                 <xsl:call-template name="yaml-header">
                     <xsl:with-param name="tagname" select="string(@id)"/>
                     <xsl:with-param name="root"    select="starts-with(html:h5[1],(@id || ' is the root' ))"/>
+                    <xsl:with-param name="model-type" select="tokenize(@class,'\s+')[starts-with(.,'define-')] ! replace(.,'^define-','')"/>
                 </xsl:call-template>
                 <xsl:apply-templates select="." mode="cleanup"/>
             </xsl:result-document>
@@ -127,6 +128,7 @@
         <xsl:param name="tagname"  select="()"/>
         <xsl:param name="root"     as="xs:boolean" select="false()"/>
         <xsl:param name="overview" as="xs:boolean" select="false()"/>
+        <xsl:param name="model-type" as="xs:string"/>
         <xsl:text>---&#xA;</xsl:text>
         <xsl:text expand-text="true">title: Schema Documentation - { $metaschema-code }{ $tagname ! (' - ' || .) }&#xA;</xsl:text>
         <xsl:text expand-text="true">description: { $metaschema-code } schema documentation{ $tagname ! (' - ' || .) }&#xA;</xsl:text>
@@ -139,6 +141,7 @@
         <xsl:text expand-text="true">model: { $metaschema-code }-{ $target-format }&#xA;</xsl:text>
         <xsl:if test="$root">root: true&#xA;</xsl:if>
         <xsl:if test="$overview">overview: true&#xA;</xsl:if>
+        <xsl:if test="boolean($model-type)" expand-text="yes">model-type: { $model-type }</xsl:if>
         <xsl:text>---&#xA;</xsl:text>
     </xsl:template>
     

From 5f6f1e3e65b65ddcc7b8692e0369f50579785b8f Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Thu, 15 Aug 2019 16:35:25 -0400
Subject: [PATCH 2/4] Corrected erroneous error check in Schematron

---
 build/metaschema/lib/metaschema-check.sch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/metaschema/lib/metaschema-check.sch b/build/metaschema/lib/metaschema-check.sch
index b991fa5d41..e07aef8f91 100644
--- a/build/metaschema/lib/metaschema-check.sch
+++ b/build/metaschema/lib/metaschema-check.sch
@@ -87,7 +87,7 @@
             <sch:assert test="empty(@ref) or exists($decl)" role="warning">No definition found for '<sch:value-of select="@ref"/>' <sch:value-of select="local-name()"/></sch:assert>
             <sch:assert test="empty(@ref) or empty($decl) or empty(@datatype) or (@datatype = $decl/@datatype)" role="warning">Flag data type doesn't match: the definition has '<sch:value-of select="$decl/@datatype"/>'</sch:assert>
             <sch:report test="@name=('RICHTEXT','STRVALUE','PROSE')">Flag should not be named "STRVALUE", "RICHTEXT" or "PROSE" (reserved names)</sch:report>
-            <sch:report test="@as-type != key('flags-by-name',@name)/@as-type,$composed-metaschema">Flag is declared with datatype '<sch:value-of select="@as-type"/>' while other flags with that name show datatype
+            <sch:report test="@as-type != key('flags-by-name',@name,$composed-metaschema)/@as-type">Flag is declared with datatype '<sch:value-of select="@as-type"/>' while other flags with that name show datatype
                 <sch:value-of select="string-join(((key('flags-by-name',@name) except .)/@as-type ! ('''' || . || '''')),', ')"/></sch:report>
         </sch:rule>
         

From f5788a10de945067eaf0f20e33bf88def8082680 Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Fri, 16 Aug 2019 15:39:07 -0400
Subject: [PATCH 3/4] Corrections to unit tests

---
 .../datatypes-prose_json-schema.json          | 50 ++++++++-----------
 .../datatypes-prose_test-valid-PASS.json      |  8 +--
 .../flag/flag-basic_json-schema.json          |  2 +-
 .../flag/flag-basic_metaschema.xml            |  2 +-
 .../group-as-by-key_test_valid_PASS.json      |  2 +-
 5 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/build/metaschema/unit-testing/datatypes/datatypes-prose_json-schema.json b/build/metaschema/unit-testing/datatypes/datatypes-prose_json-schema.json
index 264e19e554..29266484ec 100644
--- a/build/metaschema/unit-testing/datatypes/datatypes-prose_json-schema.json
+++ b/build/metaschema/unit-testing/datatypes/datatypes-prose_json-schema.json
@@ -37,17 +37,19 @@
             "title": "Plain text",
             "description": "plain text, no markup",
             "$id": "#/definitions/field-flag-plaintext",
+            "type": "object",
             "properties": {
                 "length": {
                     "title": "Length",
                     "description": "The length.",
                     "type": "integer",
-                    "minimum": 1
+                    "minimum": 1,
+                    "multipleOf": 1.0
                 },
-                "STRVALUE": {
-                   "type": "string"
-                }
-            }
+                "STRVALUE": {"type": "string"}
+            },
+            "required": ["STRVALUE"],
+            "additionalProperties": false
         },
         "field-richtext": {
             "title": "Rich text",
@@ -59,56 +61,46 @@
             "title": "Rich text",
             "description": "Rich text supports markup",
             "$id": "#/definitions/field-flag-richtext",
+            "type": "object",
             "properties": {
                 "length": {
                     "title": "Length",
                     "description": "The length.",
                     "type": "integer",
+                    "multipleOf": 1.0,
                     "minimum": 1
                 },
-                "RICHTEXT": {
-                   "type": "string"
-                }
-            }
+                "RICHTEXT": {"type": "string"}
+            },
+            "required": ["RICHTEXT"],
+            "additionalProperties": false
         },
         "field-prose": {
             "title": "Prose",
             "description": "Prose permits multiple paragraphs, lists, tables etc.",
             "$id": "#/definitions/field-prose",
-            "oneOf": [
-                {"type": "string"},
-                {
-                    "type": "array",
-                    "items": {"type": "string"},
-                    "minItems": 2
-                }
-            ]
+            "type": "string"
         },
         "field-flag-prose": {
             "title": "Prose",
             "description": "Prose permits multiple paragraphs, lists, tables etc.",
             "$id": "#/definitions/field-flag-prose",
+            "type" : "object",
             "properties": {
                 "length": {
                     "title": "Length",
                     "description": "The length.",
                     "type": "integer",
+                    "multipleOf": 1.0,
                     "minimum": 1
                 },
-                "PROSE": {
-                    "oneOf": [
-                        {"type": "string"},
-                        {
-                            "type": "array",
-                            "items": {"type": "string"},
-                            "minItems": 2
-                        }
-                    ]
-                }
-            }
+                "PROSE": {"type": "string"}                
+            },
+            "required": ["PROSE"],
+            "additionalProperties": false
         }
     },
     "properties": {
         "parent": {"$ref": "#/definitions/parent"}
     }
-}
+}
\ No newline at end of file
diff --git a/build/metaschema/unit-testing/datatypes/datatypes-prose_test-valid-PASS.json b/build/metaschema/unit-testing/datatypes/datatypes-prose_test-valid-PASS.json
index 4f01abbb37..33f2d30750 100644
--- a/build/metaschema/unit-testing/datatypes/datatypes-prose_test-valid-PASS.json
+++ b/build/metaschema/unit-testing/datatypes/datatypes-prose_test-valid-PASS.json
@@ -1,8 +1,8 @@
 {
     "parent": {
-        "date": "2019-07-08TZ",
-        "plaintext": "Some *plain* text",
-        "richtext": "Some *rich* text",
-        "prose": [ "Here's some *extra prose*" ]
+        "field-date": "2019-07-08TZ",
+        "field-plaintext": "Some *plain* text",
+        "field-richtext": "Some *rich* text",
+        "field-prose": "Here's some *extra prose*"
     }
 }
\ No newline at end of file
diff --git a/build/metaschema/unit-testing/flag/flag-basic_json-schema.json b/build/metaschema/unit-testing/flag/flag-basic_json-schema.json
index 0f96aedfc3..2b29163d56 100644
--- a/build/metaschema/unit-testing/flag/flag-basic_json-schema.json
+++ b/build/metaschema/unit-testing/flag/flag-basic_json-schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "http://csrc.nist.gov/ns/oscal/unit-testing/flag-basic-schema.json",
-    "$comment": "Metaschema Unit Test: flag: basic flag",
+    "$comment": "Metaschema Unit Test: flag: basic flag: JSON Schema",
     "type": "object",
     "definitions": {
         "parent": {
diff --git a/build/metaschema/unit-testing/flag/flag-basic_metaschema.xml b/build/metaschema/unit-testing/flag/flag-basic_metaschema.xml
index 91765282ee..087aaeef4f 100644
--- a/build/metaschema/unit-testing/flag/flag-basic_metaschema.xml
+++ b/build/metaschema/unit-testing/flag/flag-basic_metaschema.xml
@@ -8,7 +8,7 @@
  xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
  xmlns:o="http://csrc.nist.gov/ns/oscal/example"
  root="parent">
-  <schema-name>Metaschema Unit Test: group-as</schema-name>
+  <schema-name>Metaschema Unit Test: flag: basic flag</schema-name>
   <schema-version>1.0-milestone1</schema-version>
   <short-name>metaschema-group-as</short-name>
   <namespace>http://csrc.nist.gov/ns/oscal/unit-testing/flag-basic</namespace>
diff --git a/build/metaschema/unit-testing/group-as/group-as-by-key_test_valid_PASS.json b/build/metaschema/unit-testing/group-as/group-as-by-key_test_valid_PASS.json
index 34aa7736b7..f0b784ed32 100644
--- a/build/metaschema/unit-testing/group-as/group-as-by-key_test_valid_PASS.json
+++ b/build/metaschema/unit-testing/group-as/group-as-by-key_test_valid_PASS.json
@@ -2,7 +2,7 @@
   "parent": {
     "props": {
       "id3": {"STRVALUE": "test3"},
-      "id3": {"STRVALUE": ""},
+      "id2": {"STRVALUE": ""},
       "id1": {"STRVALUE": "test1"}
     }
   }

From e269a1c8f441a37075d4f21687e1b423c6096c03 Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Fri, 16 Aug 2019 15:39:49 -0400
Subject: [PATCH 4/4] Corrections to JSON Schema production now correct to
 current unit tests

---
 build/metaschema/json/json-schema-metamap.xsl | 80 ++++++++++++++++---
 build/metaschema/json/pull-datatypes.xsl      |  6 ++
 2 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/build/metaschema/json/json-schema-metamap.xsl b/build/metaschema/json/json-schema-metamap.xsl
index 460b039366..7119cd3402 100644
--- a/build/metaschema/json/json-schema-metamap.xsl
+++ b/build/metaschema/json/json-schema-metamap.xsl
@@ -37,7 +37,7 @@
     <xsl:template match="/METASCHEMA" expand-text="true">
         <map>
             <string key="$schema">http://json-schema.org/draft-07/schema#</string>
-            <string key="$id">http://csrc.nist.gov/ns/oscal/{ $composed-metaschema/METASCHEMA/schema-version }/{ short-name }-schema.json</string>
+            <string key="$id">{ $composed-metaschema/METASCHEMA/namespace }-schema.json</string>
             <xsl:for-each select="schema-name">
               <string key="$comment">{ . }: JSON Schema</string>
             </xsl:for-each>
@@ -66,6 +66,39 @@
         </map>
     </xsl:template>
     
+<!-- Template entry point skipping the Metaschema composition step   -->
+    <xsl:template mode="debug" match="/METASCHEMA" expand-text="true">
+        <map>
+            <string key="$schema">http://json-schema.org/draft-07/schema#</string>
+            <string key="$id">{ namespace }-schema.json</string>
+            <xsl:for-each select="schema-name">
+                <string key="$comment">{ . }: JSON Schema</string>
+            </xsl:for-each>
+            
+            <xsl:apply-templates select="schema-version"/>
+            <string key="type">object</string>
+            <map key="definitions">
+                <xsl:apply-templates select="*"/>
+                
+                <!--<map key="prose">
+                    <xsl:call-template name="string-or-array-of-strings"/>
+                </map>-->
+            </map>           
+            <map key="properties">
+                <!--<xsl:apply-templates mode="properties"/>-->
+                <map key="{@root}">
+                    <string key="$ref">#/definitions/{ @root }</string>
+                </map>
+            </map>
+            <!--<map key="propertyNames">
+                <array key="enum">
+                    <string>
+                        <xsl:apply-templates mode="property-names"/></string>
+                </array>
+            </map>-->
+        </map>
+    </xsl:template>
+    
     <!--<xsl:template name="string-or-array-of-strings">
         <array key="anyOf">
             <map>
@@ -127,8 +160,16 @@
     </xsl:template>
     
     <xsl:template name="required-properties">
-        <!-- A value string is never required even on elements not empty -->
         <xsl:variable name="requirements" as="element()*">
+            <!-- A value string is always required except on empty fields -->
+            <xsl:variable name="value-property">
+              <xsl:apply-templates select="self::define-field" mode="value-key"/>
+            </xsl:variable>
+            <xsl:for-each select="$value-property[matches(.,'\S')]">
+                <string>
+                    <xsl:apply-templates/>
+                </string>
+            </xsl:for-each>
             <xsl:apply-templates mode="property-name"
                 select="flag[@required = 'yes'][not((@name|@ref) = ../(json-key | json-value-key)/@flag-name)] |
                 model//*[@min-occurs &gt; 0]"/>
@@ -220,18 +261,18 @@
         </string>
     </xsl:template>
     
-    <xsl:template match="flag[exists(@name)]" mode="property-name">
+    <!--<xsl:template match="flag[exists(@name)]" mode="property-name">
         <string>
             <xsl:value-of select="@name"/>
         </string>
-    </xsl:template>
+    </xsl:template>-->
     
 <!-- Not yet implemented -->
     <xsl:template match="any" mode="property-name"/>
     
-    <xsl:template match="prose" mode="property-name">
+    <!--<xsl:template match="prose" mode="property-name">
         <string>prose</string>
-    </xsl:template>
+    </xsl:template>-->
     
     <xsl:template match="model | choice" priority="2" mode="property-name">
         <xsl:apply-templates mode="#current"/>
@@ -245,8 +286,6 @@
         <xsl:if test="matches($this-key, '\S')">
             <map key="{$this-key}">
                 <string key="type">string</string>
-                <!--                
-                <xsl:call-template name="string-or-array-of-strings"/>-->
             </map>
         </xsl:if>
     </xsl:template>
@@ -314,7 +353,7 @@
         match="assembly[empty(@max-occurs) or number(@max-occurs) = 1 ] |
         field[empty(@max-occurs) or number(@max-occurs)= 1 ]">
         <map key="{@ref}">
-            <xsl:apply-templates select="key('definition-by-name', @ref)" mode="object-type"/>
+            <!--<xsl:apply-templates select="key('definition-by-name', @ref)" mode="object-type"/>-->
             <string key="$ref">#/definitions/{ @ref }</string>
         </map>
     </xsl:template>
@@ -376,6 +415,23 @@
         <string key="type">string</string>
     </xsl:template>
     
+    <xsl:template name="string-or-array-of-strings">
+        <array key="oneOf">
+            <map>
+            <string key="type">string</string>
+            </map>
+            <map>
+            <string key="type">array</string>
+                <array key="items">
+                    <map>
+                      <string key="type">string</string>
+                    </map>
+                </array>
+                <string key="minItems">2</string>
+            </map>
+        </array>
+    </xsl:template>
+    
     <xsl:template match="field | flag" priority="3" mode="object-type">
         <xsl:choose>
             <xsl:when test="exists(@as-type)">
@@ -397,7 +453,7 @@
     
     <xsl:template priority="2" match="*[@as-type='integer']" mode="object-type">
         <string key="type">integer</string>
-        <number key="multipleOf">1.0</number>
+        <!--<number key="multipleOf">1.0</number>-->
     </xsl:template>
 
     <xsl:template priority="2" match="*[@as-type='positiveInteger']" mode="object-type">
@@ -434,9 +490,9 @@
     <xsl:variable name="datatypes" expand-text="false">
         <map key="date-with-timezone">
             <string key="type">string</string>
-            <string key="format">date</string>
+            <!--<string key="format">date</string>-->
             <!--The xs:date with a required timezone.-->
-            <!--<string key="pattern">.+[:Z].*</string>-->
+            <string key="pattern">((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))(Z|[+-][0-9]{2}:[0-9]{2})</string>
         </map>
         <map key="dateTime-with-timezone">
             <string key="type">string</string>
diff --git a/build/metaschema/json/pull-datatypes.xsl b/build/metaschema/json/pull-datatypes.xsl
index 5f7f22b2af..76e78f5d49 100644
--- a/build/metaschema/json/pull-datatypes.xsl
+++ b/build/metaschema/json/pull-datatypes.xsl
@@ -11,6 +11,8 @@
     <xsl:strip-space elements="*"/>
     
     <xsl:preserve-space elements="documentation"/>
+    
+    <!-- Utility XSLT -->
     <!-- converts XSD from ../xml/oscal-datatypes.xsd into JSON Schema notation-->
     
     <xsl:template match="schema">
@@ -68,4 +70,8 @@
     <xsl:template match="pattern">
         <string key="pattern">{ @value }</string>
     </xsl:template>
+    
+    <!--<xsl:template match="simpleType[@name=$known-types]" mode="cast-type">
+        <string key="pattern">((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))(Z|[+-][0-9]{2}:[0-9]{2})</string>
+    </xsl:template>-->
 </xsl:stylesheet>
\ No newline at end of file