Issue468 metaschema enhancements

build/ci-cd/validate-metaschema.sh

@@ -108,6 +108,7 @@ if [ $cmd_exitcode -ne 0 ]; then
 fi
 # the following is needed by the compiled template
 cp "${metaschema_lib}/metaschema-compose.xsl" "${SCRATCH_DIR}"
+cp "${metaschema_lib}/oscal-datatypes-check.xsl" "${SCRATCH_DIR}"
 
 exitcode=0
 shopt -s nullglob

build/metaschema/json/json-schema-metamap.xsl

@@ -302,32 +302,37 @@
             <xsl:if test="empty(formal-name | description)">
                 <xsl:apply-templates select="key('definition-by-name',@ref)/(formal-name | description)"/>
             </xsl:if>
-            <xsl:apply-templates select="(valid-values,key('definition-by-name',@ref)/valid-values)[1]"/>    
+            <xsl:apply-templates select="(allowed-values,key('definition-by-name',@ref)/allowed-values)[1]"/>    
         </map>
     </xsl:template>
 
     <!-- No restriction is introduced when allow others is 'yes' -->
-    <xsl:template match="valid-values[@allow-other='yes']"/>
+    <xsl:template match="allowed-values[@allow-other='yes']"/>
 
-    <xsl:template match="valid-values">
+    <xsl:template match="allowed-values">
         <xsl:param name="datatype" as="xs:string">string</xsl:param>
         <array key="enum">
             <xsl:apply-templates/>
         </array>
     </xsl:template>
 
-    <xsl:template match="valid-values/value">
-        <string>
-            <xsl:apply-templates select="@name"/>
-        </string>
+    <xsl:template match="allowed-values/enum">
+        <!-- since the JSON must show enumerated values consistent with the base type notation -->
+        <xsl:variable name="type-declaration">
+            <xsl:apply-templates select="../.." mode="object-type"/>
+        </xsl:variable>
+        <xsl:variable name="base-type" select="$type-declaration/*[@key='type']"/>
+        <xsl:element namespace="http://www.w3.org/2005/xpath-functions" name="{$base-type}">
+            <xsl:apply-templates select="@value"/>
+        </xsl:element>
     </xsl:template>
 
     <!-- irrespective of min-occurs and max-occurs, assemblies and fields designated
          with key flags are represented as objects, never arrays, as the key
          flag serves as a label -->
     <xsl:template mode="declaration" priority="5"
-        match="assembly[group-as/@json-behavior='BY_KEY'][exists(key('definition-by-name',@ref)/json-key)] |
-        field[group-as/@json-behavior='BY_KEY'][exists(key('definition-by-name',@ref)/json-key)]">
+        match="assembly[group-as/@in-json='BY_KEY'][exists(key('definition-by-name',@ref)/json-key)] |
+        field[group-as/@in-json='BY_KEY'][exists(key('definition-by-name',@ref)/json-key)]">
         <xsl:variable name="group-name" select="group-as/@name"/>
         <map key="{ $group-name }">
             <string key="type">object</string>
@@ -361,7 +366,7 @@
     <!-- Otherwise, always an array when min-occurs is greater than 1 or whenever so designated -->
     <xsl:template mode="declaration" priority="3" expand-text="yes"
         match="assembly[number(@min-occurs) &gt; 1 ]     | field[number(@min-occurs) &gt; 1 ] |
-               assembly[group-as/@json-behavior='ARRAY'] | field[group-as/@json-behavior='ARRAY']">
+               assembly[group-as/@in-json='ARRAY'] | field[group-as/@in-json='ARRAY']">
         <map key="{ group-as/@name }">
             <string key="type">array</string>
             <!-- despite @min-occurs = 0, we have a minimum of 1 since the array itself is optional -->
@@ -377,7 +382,7 @@
     </xsl:template>
 
     <!-- Now matching when min-occurs is 1 or less, max-occurs is more than 1,
-         and group-as/@json-behavior is not 'BY-KEY' or 'ARRAY' ... -->
+         and group-as/@in-json is not 'BY-KEY' or 'ARRAY' ... -->
     <xsl:template mode="declaration" match="assembly | field">
         <map key="{ group-as/@name }">
             <array key="anyOf">
@@ -467,7 +472,7 @@
         <number key="minimum">0</number>
     </xsl:template>
 
-    <!--Not supporting float and double--> 
+    <!--Not supporting float or double--> 
 
     <xsl:template priority="2.1" match="*[@as-type = $datatypes/*/@key]" mode="object-type">
         <xsl:copy-of select="key('datatypes-by-name',@as-type,$datatypes)/*"/>
@@ -479,44 +484,52 @@
     <xsl:variable name="datatypes" expand-text="false">
         <map key="decimal">
             <string key="type">number</string>
-            <string key="pattern">(\+|-)?([0-9]+(\.[0-9]*)?|\.[0-9]+)</string>
+            <string key="pattern">^(\+|-)?([0-9]+(\.[0-9]*)?|\.[0-9]+)$</string>
+        </map>
+        <map key="date">
+            <string key="type">string</string>
+            <!--<string key="format">date</string> JQ 'date' implementation does not permit time zone -->
+            <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">
+            <string key="type">string</string>
+            <!--<string key="format">date-time</string> JQ 'date-time' implementation requires time zone -->
+            <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))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})?$</string>
         </map>
-
         <map key="date-with-timezone">
             <string key="type">string</string>
-            <!--<string key="format">date</string>-->
             <!--The xs:date with a required timezone.-->
-            <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>
+            <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>
             <string key="format">date-time</string>
             <!--The xs:dateTime with a required timezone.-->
-            <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))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})</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))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})$</string>
         </map>
         <map key="email">
             <string key="type">string</string>
             <string key="format">email</string>
             <!---->
-            <string key="pattern">.+@.+</string>
+            <string key="pattern">^.+@.+</string>
         </map>
         <map key="ip-v4-address">
             <string key="type">string</string>
             <string key="format">ipv4</string>
             <!--The ip-v4-address type specifies an IPv4 address in dot decimal notation.-->
-            <string key="pattern">((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])</string>
+            <string key="pattern">^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$</string>
         </map>
         <map key="ip-v6-address">
             <string key="type">string</string>
             <string key="format">ipv6</string>
             <!--The ip-v6-address type specifies an IPv6 address represented in 8 hextets separated by colons.This is based on the pattern provided here: https://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses with some customizations.-->
-            <string key="pattern">(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|[fF][eE]80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::([fF]{4}(:0{1,4}){0,1}:){0,1}((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3,3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3,3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]))</string>
+            <string key="pattern">^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|[fF][eE]80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::([fF]{4}(:0{1,4}){0,1}:){0,1}((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3,3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]).){3,3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]))$</string>
         </map>
         <map key="hostname">
             <string key="type">string</string>
             <string key="format">idn-hostname</string>
             <!---->
-            <string key="pattern">.+</string>
+            <string key="pattern">^.+$</string>
         </map>
         <map key="uri">
             <string key="type">string</string>

build/metaschema/json/produce-json-converter.xsl

@@ -31,6 +31,7 @@
     <xsl:import href="../lib/metaschema-compose.xsl"/>
 
     <xsl:template match="/">
+        <!--<xsl:apply-templates select="METASCHEMA"/>-->
         <xsl:apply-templates select="$composed-metaschema/METASCHEMA"/>
     </xsl:template>
 
@@ -128,14 +129,22 @@
     <!-- 'any' keyword not handled  -->
     <xsl:template match="any" priority="10"/>
 
-    <xsl:template match="model | choice" priority="2">
+    <xsl:template match="model | choice" priority="3">
         <xsl:apply-templates/>
     </xsl:template>
 
     <xsl:template match="model//*">
         <XSLT:apply-templates mode="#current" select="*[@key=({string-join((@ref/('''' || . || ''''),group-as/@name/('''' || . || '''')),', ')})]"/>    
     </xsl:template>
 
+    <xsl:template priority="2" match="model//*[group-as/@in-xml='GROUPED']">
+        <XSLT:for-each-group group-by="true()" select="*[@key=({string-join((@ref/('''' || . || ''''),group-as/@name/('''' || . || '''')),', ')})]">
+            <XSLT:element name="{group-as/@name}" namespace="{$target-namespace}">
+                <XSLT:apply-templates mode="#current" select="current-group()"/>    
+            </XSLT:element>
+        </XSLT:for-each-group>
+    </xsl:template>
+
     <!--<xsl:template match="model/prose" priority="2">
         <XSLT:apply-templates mode="#current" select="*[@key='prose']"/>    
     </xsl:template>-->
@@ -168,7 +177,16 @@
 
         <xsl:comment expand-text="yes">{ $field-match }</xsl:comment>
         <XSLT:template match="{$field-match}" priority="5" mode="json2xml">
-            <xsl:apply-templates select="." mode="field-text"/>
+            <xsl:choose>
+                <xsl:when test="key('references-by-name',@name)/@in-xml='UNWRAPPED'">
+                    <xsl:apply-templates select="." mode="field-text"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <XSLT:element name="{@name}" namespace="{$target-namespace}">
+                        <xsl:apply-templates select="." mode="field-text"/>            
+                    </XSLT:element>
+                </xsl:otherwise>
+            </xsl:choose>
         </XSLT:template>
         <xsl:for-each select="json-key | json-value-key">
             <xsl:message expand-text="yes">{ local-name()} is ignored on field { ../@name } of type 'markup-multiline' </xsl:message>"
@@ -240,8 +258,6 @@
                 mode="json2xml">
                 <XSLT:apply-templates/>
             </XSLT:template>
-
-
 
             <!-- Now, a template to match where we want attributes - flags not reserved for the value key ...  -->
             <XSLT:template
@@ -366,13 +382,11 @@
         </XSLT:template>
 
         <xsl:if test="exists($group-names)">
-            <xsl:variable name="group-name-seq" select="string-join($group-names ! ('''' || . || ''''),', ')"/>
             <xsl:for-each select="child::json-key">
-                <xsl:comment> Mapping object with key to element with attribute </xsl:comment>
+                <xsl:variable name="group-name-seq" select="string-join($group-names ! ('''' || . || ''''),', ')"/>
                 <XSLT:template match="map[@key=({ $group-name-seq })]" priority="5" mode="json2xml">
-                   <XSLT:apply-templates mode="json2xml"/>
+                    <XSLT:apply-templates mode="json2xml"/>
                 </XSLT:template>
-
                 <XSLT:template priority="2" match="map[@key=({ $group-name-seq })]/*/@key" mode="as-attribute">
                     <XSLT:attribute name="{@flag-name}">
                         <XSLT:value-of select="."/>
@@ -387,7 +401,7 @@
         </xsl:if>
         <!--<xsl:call-template name="drop-address"/>-->
     </xsl:template>
-    
+
     <xsl:template name="furniture">
 
         <XSLT:output indent="yes"/>