From 74a7d6de7ee2e7610d6eed070d66564201e24b1f Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Wed, 29 Apr 2020 17:46:50 -0400
Subject: [PATCH] Initial cut at XSLT to produce XML->supermodel converter XSLT
 see #51; also more worked examples / problem cases

---
 support/lib/metaschema-supermodel.xsd         | 66 +++++++++++++
 .../allowed-values-confusion-metaschema.xml   | 20 ++--
 ...d-values-confusion-metaschema_METATRON.sch | 19 ++++
 ...s-confusion-metaschema_declaration-map.xml |  4 +-
 .../models-definition-map.xml                 | 92 +++++++++++++++++++
 .../everything-metaschema/models-testdata.xml | 89 ++++++++++++++++++
 .../models_metaschema.xml                     | 16 +++-
 .../models_metaschema_JSON-SCHEMA.json        | 10 +-
 .../models_metaschema_XML-SCHEMA.xsd          | 37 +++++---
 .../xslt-proto-v04/compose/make-model-map.xsl | 54 ++++++++---
 .../xslt-proto-v04/compose/reduce-map.xsl     |  4 +-
 .../make-metaschema-model-maps.xpl            |  8 +-
 .../schema_gen/make-metaschema-metatron.xsl   |  3 +-
 .../validate/metaschema-check.sch             |  6 +-
 14 files changed, 373 insertions(+), 55 deletions(-)
 create mode 100644 support/lib/metaschema-supermodel.xsd
 create mode 100644 test-suite/worked-examples/everything-metaschema/models-definition-map.xml
 create mode 100644 test-suite/worked-examples/everything-metaschema/models-testdata.xml

diff --git a/support/lib/metaschema-supermodel.xsd b/support/lib/metaschema-supermodel.xsd
new file mode 100644
index 000000000..4dfaff3dc
--- /dev/null
+++ b/support/lib/metaschema-supermodel.xsd
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0" xmlns:metaschema="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
+  <xs:element name="map">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="metaschema:assembly"/>
+      </xs:sequence>
+      <xs:attribute name="namespace" use="required" type="xs:anyURI"/>
+      <xs:attribute name="prefix" use="required" type="xs:NCName"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="assembly">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="metaschema:assembly"/>
+        <xs:element ref="metaschema:field"/>
+        <xs:element ref="metaschema:flag"/>
+        <xs:element ref="metaschema:group"/>
+      </xs:choice>
+      <xs:attribute name="gi" use="required" type="xs:NCName"/>
+      <xs:attribute name="group-xml" type="xs:NCName"/>
+      <xs:attribute name="json-key-flag" type="xs:NCName"/>
+      <xs:attribute name="key" type="xs:NCName"/>
+      <xs:attribute name="scope" use="required" type="xs:NCName"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="group">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="metaschema:assembly"/>
+        <xs:element minOccurs="0" ref="metaschema:field"/>
+      </xs:sequence>
+      <xs:attribute name="gi" type="xs:NCName"/>
+      <xs:attribute name="json-key-flag" type="xs:NCName"/>
+      <xs:attribute name="key" use="required" type="xs:NCName"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="flag">
+    <xs:complexType>
+      <xs:attribute name="as-type" use="required" type="xs:NCName"/>
+      <xs:attribute name="gi" use="required" type="xs:NCName"/>
+      <xs:attribute name="key" use="required" type="xs:NCName"/>
+      <xs:attribute name="scope" use="required" type="xs:NCName"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="field">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="metaschema:flag"/>
+        <xs:element ref="metaschema:value"/>
+      </xs:sequence>
+      <xs:attribute name="gi" use="required" type="xs:NCName"/>
+      <xs:attribute name="group-xml" type="xs:NCName"/>
+      <xs:attribute name="json-key-flag" type="xs:NCName"/>
+      <xs:attribute name="key" type="xs:NCName"/>
+      <xs:attribute name="scope" use="required" type="xs:NCName"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="value">
+    <xs:complexType mixed="true">
+      <xs:attribute name="as-type" use="required" type="xs:NCName"/>
+      <xs:attribute name="key" type="xs:NCName"/>
+      <xs:attribute name="key-flag" type="xs:NCName"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/test-suite/broken/allowed-values-confusion-metaschema.xml b/test-suite/broken/allowed-values-confusion-metaschema.xml
index 0b3bd4769..063ad1427 100644
--- a/test-suite/broken/allowed-values-confusion-metaschema.xml
+++ b/test-suite/broken/allowed-values-confusion-metaschema.xml
@@ -73,17 +73,14 @@
                 <enum value="Ö">o umlaut</enum>
                 <enum value="Ü">u umlaut</enum>
             </allowed-values>
-            <!--
-                This rule overrides not the global definition but a local
-                (doesn't it?) - implement when we have path resolution support 
-                
-                <allowed-values target=".//subsequence//item" extends="yes">
-                <!-\- which nodes will this rule apply to? Any? note that subsequence/item is defined locally.
-                     If this rule applies, what are the respective sets for subsequence/item[@type='color']-\->
-                <enum value="pink">a umlaut</enum>
-                <enum value="orange">o umlaut</enum>
-                <enum value="purple">u umlaut</enum>
-            </allowed-values>-->
+            
+            <allowed-values target=".//subsequence//item" extends="yes">
+                <!-- which 'allowed-values' will this extend? Any? note that subsequence/item is defined locally.
+                     If this rule applies, what are the respective sets for subsequence/item[@type='color']-->
+                <enum value="pink">pink</enum>
+                <enum value="orange">orange</enum>
+                <enum value="purple">purple</enum>
+            </allowed-values>
         </constraint>
     </define-assembly>
     
@@ -112,7 +109,6 @@
         </model>
     </define-assembly>
     
-    
     <define-flag name="type">
         <formal-name>Item type</formal-name>
         <description>Characterizes the type of item</description>
diff --git a/test-suite/broken/allowed-values-confusion-metaschema_METATRON.sch b/test-suite/broken/allowed-values-confusion-metaschema_METATRON.sch
index 48d7edb80..9225389d4 100644
--- a/test-suite/broken/allowed-values-confusion-metaschema_METATRON.sch
+++ b/test-suite/broken/allowed-values-confusion-metaschema_METATRON.sch
@@ -7,7 +7,15 @@
    <ns prefix="m" uri="http://csrc.nist.gov/ns/oscal/metaschema/1.0"/>
    <ns prefix="anthology" uri="http://csrc.nist.gov/metaschema/ns/test"/>
    <let name="silence-warnings" value="true()"/>
+   <!-- INDEX DEFINITIONS AS KEY DECLARATIONS -->
+   <xsl:key name="item-uniqueness" match="anthology:item" use="@id"/>
+   <!-- RULES -->
    <pattern>
+      <rule context="anthology:item">
+               <!-- when @type='hex',  should match regex '[\dabcdef]+'-->
+         <assert test="not(@type='hex') or matches(., '^[\dabcdef]+$')">Where @type='hex', <name/> is expected to match regular expression '^[\dabcdef]+$'
+            </assert>
+      </rule>
       <rule context="anthology:sequence//anthology:item">
          <!-- when exists(self::anthology:item[@type='number']), allowed-values on .//anthology:item[@type='number']: 1, 2, 3-->
          <assert test="not(exists(self::anthology:item[@type='number'])) or ($silence-warnings or . = ( '1', '2', '3' ))"
@@ -19,6 +27,11 @@
          <assert test="not(exists(self::anthology:item[@type='german'])) or (. = ( 'Ä', 'Ö', 'Ü' ))">Where exists(self::anthology:item[@type='german']), <name/> is expected to be (one of) 'Ä', 'Ö', 'Ü', not '<value-of select="."/>'
             </assert>
       </rule>
+      <rule context="anthology:sequence//anthology:subsequence//anthology:item">
+         <!-- when exists(self::anthology:item/ancestor::anthology:subsequence), allowed-values on .//anthology:subsequence//anthology:item: pink, orange, purple-->
+         <assert test="not(exists(self::anthology:item/ancestor::anthology:subsequence)) or (. = ( 'pink', 'orange', 'purple' ))">Where exists(self::anthology:item/ancestor::anthology:subsequence), <name/> is expected to be (one of) 'pink', 'orange', 'purple', not '<value-of select="."/>'
+            </assert>
+      </rule>
       <rule context="anthology:subsequence/anthology:item">
          <!--allowed-values on : red, blue, green-->
          <assert test="(. = ( 'red', 'blue', 'green' ))"
@@ -32,5 +45,11 @@
             <name/> is expected to be (one of) 'A', 'B', 'C', not '<value-of select="."/>'
             [[See id#global-item-allowed-values]]</assert>
       </rule>
+      <rule context="anthology:item">
+        <!-- is unique-->
+         <assert test="count(key('item-uniqueness',@id))=1">
+            <name/> is expected to be unique.
+            </assert>
+      </rule>
    </pattern>
 </schema>
diff --git a/test-suite/broken/allowed-values-confusion-metaschema_declaration-map.xml b/test-suite/broken/allowed-values-confusion-metaschema_declaration-map.xml
index 16bc1b01e..85ca429ab 100644
--- a/test-suite/broken/allowed-values-confusion-metaschema_declaration-map.xml
+++ b/test-suite/broken/allowed-values-confusion-metaschema_declaration-map.xml
@@ -6,7 +6,7 @@
                <field as-type="string" gi="item">
                   <flag as-type="string" key="type" gi="type"/>
                   <flag as-type="string" key="id" gi="id"/>
-                  <constraint scope="global">
+                  <constraint>
                      <allowed-values target="." allow-other="no" id="global-item-allowed-values">
                         <enum value="A">a</enum>
                         <enum value="B">b</enum>
@@ -39,7 +39,7 @@
                   </group>
                </assembly>
             </group>
-            <constraint scope="global">
+            <constraint>
                <allowed-values target=".//item[@type='number']" allow-other="yes">
                   <enum value="1">one</enum>
                   <enum value="2">two</enum>
diff --git a/test-suite/worked-examples/everything-metaschema/models-definition-map.xml b/test-suite/worked-examples/everything-metaschema/models-definition-map.xml
new file mode 100644
index 000000000..e03ca98b2
--- /dev/null
+++ b/test-suite/worked-examples/everything-metaschema/models-definition-map.xml
@@ -0,0 +1,92 @@
+<map xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+     namespace="http://csrc.nist.gov/metaschema/ns/everything"
+     prefix="http://csrc.nist.gov/metaschema/ns/everything">
+   <assembly scope="global" key="EVERYTHING" gi="EVERYTHING">
+      <flag as-type="string" scope="global" key="id" gi="id"/>
+      <field scope="global" key="field-1only" gi="field-1only">
+         <value as-type="string" key="STRVALUE"/>
+      </field>
+      <field scope="global" key="field-base64" gi="field-base64">
+         <value as-type="base64Binary" key="STRVALUE"/>
+      </field>
+      <field scope="global" key="field-named-value" gi="field-named-value">
+         <flag as-type="string" scope="global" key="id" gi="id"/>
+         <value as-type="string" key="CUSTOM-VALUE-KEY"/>
+      </field>
+      <group key="groupable-fields" gi="groupable-fields">
+         <field scope="global" gi="field-groupable">
+            <value as-type="string" key="STRVALUE"/>
+         </field>
+      </group>
+      <group key="wrapped-fields" gi="wrapped-fields">
+         <field scope="global" gi="field-wrappable">
+            <value as-type="string" key="STRVALUE"/>
+         </field>
+      </group>
+      <group key="keyed-fields" gi="keyed-fields" json-key-flag="id">
+         <field scope="global" gi="field-by-key" json-key-flag="id">
+            <flag as-type="string" scope="global" key="id" gi="id"/>
+            <value as-type="string" key="STRVALUE"/>
+         </field>
+      </group>
+      <group key="dynamic-value-key-fields" gi="dynamic-value-key-fields">
+         <field scope="global" gi="field-dynamic-value-key">
+            <flag as-type="string" scope="global" key="id" gi="id"/>
+            <value as-type="string" key-flag="id"/>
+         </field>
+      </group>
+      <field scope="global" key="wrapped-prose" gi="wrapped-prose">
+         <value as-type="markup-multiline" key="PROSE"/>
+      </field>
+      <field scope="global" key="loose-prose">
+         <value as-type="markup-multiline" key="PROSE"/>
+      </field>
+      <assembly scope="global" key="assembly-1only" gi="assembly-1only">
+         <field scope="global" key="field-1only" gi="field-1only">
+            <value as-type="string" key="STRVALUE"/>
+         </field>
+         <assembly scope="global" key="assembly-1only" gi="assembly-1only"/>
+      </assembly>
+      <group key="groupable-assemblies" gi="groupable-assemblies">
+         <assembly scope="global" gi="assembly-groupable">
+            <group key="groupable-fields" gi="groupable-fields">
+               <field scope="global" gi="field-groupable">
+                  <value as-type="string" key="STRVALUE"/>
+               </field>
+            </group>
+            <group key="groupable-assemblies" gi="groupable-assemblies">
+               <assembly scope="global" gi="assembly-groupable"/>
+            </group>
+         </assembly>
+      </group>
+      <group key="wrapped-assemblies" gi="wrapped-assemblies">
+         <assembly scope="global" gi="assembly-wrappable">
+            <group key="wrapped-fields" gi="wrapped-fields">
+               <field scope="global" gi="field-wrappable">
+                  <value as-type="string" key="STRVALUE"/>
+               </field>
+            </group>
+            <group key="wrapped-assemblies" gi="wrapped-assemblies">
+               <assembly scope="global" gi="assembly-wrappable"/>
+            </group>
+         </assembly>
+      </group>
+      <group key="keyed-assemblies" gi="keyed-assemblies" json-key-flag="id">
+         <assembly scope="global" gi="assembly-by-key" json-key-flag="id">
+            <flag as-type="string" scope="global" key="id" gi="id"/>
+            <group key="keyed-fields" gi="keyed-fields" json-key-flag="id">
+               <field scope="global" gi="field-by-key" json-key-flag="id">
+                  <flag as-type="string" scope="global" key="id" gi="id"/>
+                  <value as-type="string" key="STRVALUE"/>
+               </field>
+            </group>
+            <group key="keyed-assemblies" gi="keyed-assemblies" json-key-flag="id">
+               <assembly scope="global" gi="assembly-by-key" json-key-flag="id"/>
+            </group>
+         </assembly>
+      </group>
+      <group key="everything-recursive" gi="everything-recursive">
+         <assembly scope="global" gi="EVERYTHING"/>
+      </group>
+   </assembly>
+</map>
diff --git a/test-suite/worked-examples/everything-metaschema/models-testdata.xml b/test-suite/worked-examples/everything-metaschema/models-testdata.xml
new file mode 100644
index 000000000..da66e2185
--- /dev/null
+++ b/test-suite/worked-examples/everything-metaschema/models-testdata.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EVERYTHING xmlns="http://csrc.nist.gov/metaschema/ns/everything"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://csrc.nist.gov/metaschema/ns/everything file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/worked-examples/everything-metaschema/models_metaschema_XML-SCHEMA.xsd">
+    
+    <field-1only>FIELD-1-ONLY</field-1only>
+    <field-base64>1234abcd</field-base64>
+    <field-named-value id="fnv1">FIELD-NAMED-VALUE</field-named-value>
+    <field-groupable>field-groupable 1</field-groupable>
+    <field-groupable>field-groupable 2</field-groupable>
+    <field-groupable>field-groupable 3</field-groupable>
+    <wrapped-fields>
+        <field-wrappable>field-wrappable 1</field-wrappable>
+        <field-wrappable>field-wrappable 2</field-wrappable>
+        <field-wrappable>field-wrappable 3</field-wrappable>
+    </wrapped-fields>
+    <field-by-key id="fbk1">field-by-key 1</field-by-key>
+    <field-by-key id="fbk2">field-by-key 2</field-by-key>
+    <field-by-key id="fbk3">field-by-key 3</field-by-key>
+    <field-dynamic-value-key id="fdvk1">field-dynamic-value-key 1</field-dynamic-value-key>
+    <field-dynamic-value-key id="fdvk2">field-dynamic-value-key 2</field-dynamic-value-key>
+    <field-dynamic-value-key id="fdvk3">field-dynamic-value-key 3</field-dynamic-value-key>
+    
+    <wrapped-prose>
+        <h1>Wrapped up prose</h1>
+        <p>This is prose. All wrapped up.</p>
+    </wrapped-prose>
+    <h1>Unwrapped prose</h1>
+    <p>Here we have unwrapped prose....</p>
+    <assembly-1only>
+        <field-1only>ASSEMBLY-1-ONLY / FIELD-1-ONLY</field-1only>
+    </assembly-1only>
+    <assembly-groupable>
+        <field-groupable>assembly-groupable 1 / field-groupable 1</field-groupable>
+        <field-groupable>assembly-groupable 1 / field-groupable 2</field-groupable>
+        <field-groupable>assembly-groupable 1 / field-groupable 3</field-groupable>
+    </assembly-groupable>
+    <assembly-groupable>
+        <field-groupable>assembly-groupable 2 / field-groupable 1</field-groupable>
+        <field-groupable>assembly-groupable 2 / field-groupable 2</field-groupable>
+        <field-groupable>assembly-groupable 2 / field-groupable 3</field-groupable>
+    </assembly-groupable>
+    <assembly-groupable>
+        <field-groupable>assembly-groupable 3 / field-groupable 1</field-groupable>
+        <field-groupable>assembly-groupable 3 / field-groupable 2</field-groupable>
+        <field-groupable>assembly-groupable 3 / field-groupable 3</field-groupable>
+    </assembly-groupable>
+    <wrapped-assemblies>
+        <assembly-wrappable>
+            <wrapped-fields>
+                <field-wrappable>assembly-wrappable 1 / field-wrappable 1</field-wrappable>
+            <field-wrappable>assembly-wrappable 1 / field-wrappable 2</field-wrappable>
+            <field-wrappable>assembly-wrappable 1 / field-wrappable 3</field-wrappable>
+            </wrapped-fields>
+        </assembly-wrappable>
+        <assembly-wrappable>
+            <wrapped-fields>
+                <field-wrappable>assembly-wrappable 2 / field-wrappable 1</field-wrappable>
+                <field-wrappable>assembly-wrappable 2 / field-wrappable 2</field-wrappable>
+                <field-wrappable>assembly-wrappable 2 / field-wrappable 3</field-wrappable>
+            </wrapped-fields>
+        </assembly-wrappable>
+        <assembly-wrappable>
+            <wrapped-fields>
+                <field-wrappable>assembly-wrappable 3 / field-wrappable 1</field-wrappable>
+                <field-wrappable>assembly-wrappable 3 / field-wrappable 2</field-wrappable>
+                <field-wrappable>assembly-wrappable 3 / field-wrappable 3</field-wrappable>
+            </wrapped-fields>
+        </assembly-wrappable>
+    </wrapped-assemblies>
+    <assembly-by-key id="abk1">
+        <field-by-key id="abk1.fbk1">assembly-by-key 1 / field-by-key 1</field-by-key>
+        <field-by-key id="abk1.fbk2">assembly-by-key 1 / field-by-key 2</field-by-key>
+        <field-by-key id="abk1.fbk3">assembly-by-key 1 / field-by-key 3</field-by-key>
+    </assembly-by-key>
+    <assembly-by-key id="abk2">
+        <field-by-key id="abk2.fbk1">assembly-by-key 1 / field-by-key 1</field-by-key>
+        <field-by-key id="abk2.fbk2">assembly-by-key 1 / field-by-key 2</field-by-key>
+        <field-by-key id="abk2.fbk3">assembly-by-key 1 / field-by-key 3</field-by-key>
+    </assembly-by-key>
+    <assembly-by-key id="abk3">
+        <field-by-key id="abk3.fbk1">assembly-by-key 1 / field-by-key 1</field-by-key>
+        <field-by-key id="abk3.fbk2">assembly-by-key 1 / field-by-key 2</field-by-key>
+        <field-by-key id="abk3.fbk3">assembly-by-key 1 / field-by-key 3</field-by-key>
+    </assembly-by-key>
+    <everything>
+        <field-1only>nested FIELD-1-ONLY</field-1only>
+    </everything>
+</EVERYTHING>
\ No newline at end of file
diff --git a/test-suite/worked-examples/everything-metaschema/models_metaschema.xml b/test-suite/worked-examples/everything-metaschema/models_metaschema.xml
index 3994b5f73..0c5c43a8a 100644
--- a/test-suite/worked-examples/everything-metaschema/models_metaschema.xml
+++ b/test-suite/worked-examples/everything-metaschema/models_metaschema.xml
@@ -11,9 +11,11 @@
 
     <remarks>
         <p>A mini metaschema produced for <em>conversion</em> testing purposes.</p>
-        <p>Exercises Metaschema modeling with global declarations. Does not exercise
+        <p>This metaschema exercises modeling with global definitions. It does not exercise
             datatypes, constraints, or cardinality except as reflected in models (where grouping
             must be explicit).</p>
+        <p>When this is stable and working, extend to include local definitions.</p>
+        <p>Also cover <code>use-name</code> as appropriate.</p>
     </remarks>
 
     <define-flag name="id">
@@ -29,6 +31,7 @@
         <flag ref="id"/>
         <model>
             <field ref="field-1only"/>
+            <field ref="field-base64"/>
             <field ref="field-named-value"/>
             <field ref="field-groupable" max-occurs="unbounded">
                 <group-as name="groupable-fields"/>
@@ -44,7 +47,7 @@
             </field>
             
             <field ref="wrapped-prose" in-xml="WITH_WRAPPER"/>
-            <field ref="loose-prose"/>
+            <field ref="loose-prose"   in-xml="UNWRAPPED"/>
             
             <assembly ref="assembly-1only"/>
             <assembly ref="assembly-groupable" max-occurs="unbounded">
@@ -67,6 +70,11 @@
         <description/>
     </define-field>
     
+    <define-field name="field-base64" as-type="base64Binary">
+        <formal-name/>
+        <description/>
+    </define-field>
+    
     <define-field name="field-groupable">
         <formal-name/>
         <description/>
@@ -81,13 +89,13 @@
         <formal-name/>
         <description/>
         <json-key flag-name="id"/>
-        <flag ref="id"/>
+        <flag ref="id" required="yes"/>
     </define-field>
     
     <define-field name="field-named-value">
         <formal-name/>
         <description/>
-        <json-value-key>VALUE</json-value-key>
+        <json-value-key>CUSTOM-VALUE-KEY</json-value-key>
         <flag ref="id" required="yes"/>
     </define-field>
     
diff --git a/test-suite/worked-examples/everything-metaschema/models_metaschema_JSON-SCHEMA.json b/test-suite/worked-examples/everything-metaschema/models_metaschema_JSON-SCHEMA.json
index 1de2d15b0..2917ee1d4 100644
--- a/test-suite/worked-examples/everything-metaschema/models_metaschema_JSON-SCHEMA.json
+++ b/test-suite/worked-examples/everything-metaschema/models_metaschema_JSON-SCHEMA.json
@@ -15,6 +15,8 @@
             "type" : "string" },
           "field-1only" : 
           { "$ref" : "#/definitions/field-1only" },
+          "field-base64" : 
+          { "$ref" : "#/definitions/field-base64" },
           "field-named-value" : 
           { "$ref" : "#/definitions/field-named-value" },
           "groupable-fields" : 
@@ -101,6 +103,10 @@
                 { "$ref" : "#/definitions/EVERYTHING" } } ] } },
         "additionalProperties" : false },
       "field-1only" : 
+      { "title" : "",
+        "description" : "",
+        "type" : "string" },
+      "field-base64" : 
       { "title" : "",
         "description" : "",
         "type" : "string" },
@@ -131,10 +137,10 @@
           { "title" : "",
             "description" : "",
             "type" : "string" },
-          "VALUE" : 
+          "CUSTOM-VALUE-KEY" : 
           { "type" : "string" } },
         "required" : 
-        [ "VALUE",
+        [ "CUSTOM-VALUE-KEY",
           "id" ],
         "additionalProperties" : false },
       "field-dynamic-value-key" : 
diff --git a/test-suite/worked-examples/everything-metaschema/models_metaschema_XML-SCHEMA.xsd b/test-suite/worked-examples/everything-metaschema/models_metaschema_XML-SCHEMA.xsd
index 920f70866..c1a349b9b 100644
--- a/test-suite/worked-examples/everything-metaschema/models_metaschema_XML-SCHEMA.xsd
+++ b/test-suite/worked-examples/everything-metaschema/models_metaschema_XML-SCHEMA.xsd
@@ -13,7 +13,9 @@
          <m:short-name>everything</m:short-name>
          <m:remarks>
             <p>A mini metaschema produced for <em>conversion</em> testing purposes.</p>
-            <p>Exercises Metaschema modeling with global declarations. Does not exercise datatypes, constraints, or cardinality except as reflected in models (where grouping must be explicit).</p>
+            <p>This metaschema exercises modeling with global definitions. It does not exercise datatypes, constraints, or cardinality except as reflected in models (where grouping must be explicit).</p>
+            <p>When this is stable and working, extend to include local definitions.</p>
+            <p>Also cover <code>use-name</code> as appropriate.</p>
          </m:remarks>
          <m:root>EVERYTHING</m:root>
       </xs:appinfo>
@@ -33,6 +35,10 @@
                      type="everything:field-1only-FIELD"
                      minOccurs="0"
                      maxOccurs="1"/>
+         <xs:element name="field-base64"
+                     type="everything:field-base64-FIELD"
+                     minOccurs="0"
+                     maxOccurs="1"/>
          <xs:element name="field-named-value"
                      type="everything:field-named-value-FIELD"
                      minOccurs="0"
@@ -72,19 +78,7 @@
                <xs:group ref="everything:PROSE" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
-         <xs:element name="loose-prose" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name/>
-                  <m:description/>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b/>: </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="everything:PROSE" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
+         <xs:group ref="everything:PROSE" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="assembly-1only"
                      type="everything:assembly-1only-ASSEMBLY"
                      minOccurs="0"
@@ -136,6 +130,19 @@
          <xs:extension base="xs:string"/>
       </xs:simpleContent>
    </xs:complexType>
+   <xs:complexType name="field-base64-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name/>
+            <m:description/>
+         </xs:appinfo>
+         <xs:documentation>
+            <b/>: </xs:documentation>
+      </xs:annotation>
+      <xs:simpleContent>
+         <xs:extension base="xs:base64Binary"/>
+      </xs:simpleContent>
+   </xs:complexType>
    <xs:complexType name="field-groupable-FIELD">
       <xs:annotation>
          <xs:appinfo>
@@ -173,7 +180,7 @@
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="xs:string">
-            <xs:attribute name="id" type="xs:string">
+            <xs:attribute name="id" use="required" type="xs:string">
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name/>
diff --git a/toolchains/xslt-proto-v04/compose/make-model-map.xsl b/toolchains/xslt-proto-v04/compose/make-model-map.xsl
index b843a5536..2e4116f11 100644
--- a/toolchains/xslt-proto-v04/compose/make-model-map.xsl
+++ b/toolchains/xslt-proto-v04/compose/make-model-map.xsl
@@ -12,7 +12,8 @@
     <xsl:mode on-no-match="shallow-copy"/>
     
     <xsl:template match="/METASCHEMA">
-        <map>
+        <map namespace="{child::namespace ! normalize-space(.) }"
+            prefix="{child::namespace ! normalize-space(.) }">
             <xsl:apply-templates select="child::*[exists(root-name)]" mode="build"/>
         </map>
     </xsl:template>
@@ -32,9 +33,7 @@
         <xsl:variable name="type" select="replace(local-name(),'^define\-','')"/>
         
         <xsl:element name="{ $type }" namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-            <xsl:for-each select="self::define-field">
-              <xsl:attribute name="as-type">string</xsl:attribute>
-            </xsl:for-each>
+            <xsl:attribute name="scope" select="if (exists(parent::METASCHEMA)) then 'global' else 'local'"/>
             <xsl:apply-templates select="@*" mode="build"/>
             <xsl:attribute name="min-occurs" select="$minOccurs"/>
             <xsl:attribute name="max-occurs" select="$maxOccurs"/>
@@ -47,11 +46,10 @@
             <xsl:for-each select="$group-json"><!-- ARRAY (default), SINGLETON_OR_ARRAY, BY_KEY --> 
                 <xsl:attribute name="group-json" select="."/>
             </xsl:for-each>
-            <xsl:for-each select="root-name | use-name">
+            <xsl:for-each select="root-name | ($use-name, child::use-name)[1]">
                 <xsl:attribute name="{ local-name() }" select="."/>
             </xsl:for-each>
-            
-            <xsl:apply-templates select="json-key, json-value-key" mode="build"/>
+            <xsl:apply-templates select="json-key" mode="build"/>
             <xsl:for-each select="$group-name">
                 <xsl:attribute name="group-name" select="."/>
             </xsl:for-each>
@@ -60,6 +58,11 @@
                 <xsl:apply-templates select="model" mode="build">
                     <xsl:with-param name="visited" tunnel="true" select="$visited, string(@name)"/>
                 </xsl:apply-templates>
+                <xsl:for-each select="self::define-field">
+                    <value as-type="{(@as-type,'string')[1]}">
+                        <xsl:apply-templates select="." mode="value-key"/>
+                    </value>
+                </xsl:for-each>
             </xsl:if>
             <xsl:apply-templates select="constraint" mode="build"/>
         </xsl:element>
@@ -69,9 +72,9 @@
         <xsl:attribute name="json-value-flag" select="@flag-name"/>
     </xsl:template>
     
-    <xsl:template mode="build" match="json-value-key">
+    <!--<xsl:template mode="build" match="json-value-key">
         <xsl:attribute name="{ local-name() }" select="."/>
-    </xsl:template>
+    </xsl:template>-->
     
     <xsl:template mode="build" match="json-key">
         <xsl:attribute name="json-key-flag" select="@flag-name"/>
@@ -83,6 +86,9 @@
         <xsl:copy-of select="."/>
     </xsl:template>
     
+    <!-- dropped in build mode b/c picked up by calling template -->
+    <xsl:template match="define-field/@as-type" mode="build"/>
+    
     <xsl:template match="choice" mode="build">
         <choice>
             <xsl:apply-templates mode="#current"/>
@@ -113,6 +119,9 @@
     
     <xsl:template match="flag | define-flag" mode="build">
         <flag max-occurs="1" min-occurs="{if (@required='yes') then 1 else 0}" as-type="string">
+            <xsl:for-each select="self::flag">
+                <xsl:attribute name="scope">global</xsl:attribute>
+            </xsl:for-each>
             <xsl:attribute name="name" select="(@name,@ref)[1]"/>
             <xsl:attribute name="link" select="(@ref,../@name)[1]"/>
             <xsl:attribute name="as-type">string</xsl:attribute>
@@ -124,13 +133,34 @@
     <xsl:template match="constraint" mode="build">
         <xsl:copy>
             <xsl:copy-of select="@*"/>
-            <xsl:if test="exists(../parent::METASCHEMA)">
-                <xsl:attribute name="scope">global</xsl:attribute>
-            </xsl:if>
             <xsl:copy-of select="*"/>
         </xsl:copy>
     </xsl:template>
     
     <xsl:template match="text()" mode="build"/>
     
+    <xsl:variable name="string-value-label">STRVALUE</xsl:variable>
+    <xsl:variable name="markdown-value-label">RICHTEXT</xsl:variable>
+    <xsl:variable name="markdown-multiline-label">PROSE</xsl:variable>
+
+    <xsl:template priority="3" match="define-field[exists(json-value-key/@flag-name)]" mode="value-key">
+        <xsl:attribute name="key-flag" select="json-value-key/@flag-name"/>
+    </xsl:template>
+    
+    <xsl:template priority="2" match="define-field[exists(json-value-key)]" mode="value-key">
+        <xsl:attribute name="key" select="json-value-key"/>
+    </xsl:template>
+    
+    <xsl:template match="define-field[@as-type='markup-line']" mode="value-key">
+        <xsl:attribute name="key" select="$markdown-value-label"/>
+    </xsl:template>
+    
+    <xsl:template match="define-field[@as-type='markup-multiline']" mode="value-key">
+        <xsl:attribute name="key" select="$markdown-multiline-label"/>
+    </xsl:template>
+    
+    <xsl:template match="define-field" mode="value-key">
+        <xsl:attribute name="key" select="$string-value-label"/>
+    </xsl:template>
+    
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/toolchains/xslt-proto-v04/compose/reduce-map.xsl b/toolchains/xslt-proto-v04/compose/reduce-map.xsl
index c9fa7a6b9..bdfaff72b 100644
--- a/toolchains/xslt-proto-v04/compose/reduce-map.xsl
+++ b/toolchains/xslt-proto-v04/compose/reduce-map.xsl
@@ -11,14 +11,14 @@
     
     <xsl:mode on-no-match="shallow-copy"/>
     
-    <xsl:template match="@group-name | @group-json | @in-xml | @link | @root-name | @use-name"/>
+    <xsl:template match="@group-name | @group-json | @group-xml | @in-xml | @link | @root-name | @use-name"/>
     
     
     <xsl:template match="@name">
         <xsl:if test="empty(../parent::group)">
             <xsl:attribute name="key" select="(../@root-name,../@use-name,.)[1]"/>
         </xsl:if>
-        <xsl:if test="not(../@in-xml='HIDDEN')">
+        <xsl:if test="not(../@in-xml=('UNWRAPPED','HIDDEN'))">
             <xsl:attribute name="gi"  select="(../@root-name,../@use-name,.)[1]"/>
         </xsl:if>
     </xsl:template>
diff --git a/toolchains/xslt-proto-v04/make-metaschema-model-maps.xpl b/toolchains/xslt-proto-v04/make-metaschema-model-maps.xpl
index 147863a37..ffb292927 100644
--- a/toolchains/xslt-proto-v04/make-metaschema-model-maps.xpl
+++ b/toolchains/xslt-proto-v04/make-metaschema-model-maps.xpl
@@ -31,9 +31,9 @@
     <p:pipe        port="result"               step="unfold-model-map"/>
   </p:output>
   
-  <p:serialization port="E.declaration-map" indent="true"/>
-  <p:output        port="E.declaration-map" primary="false">
-    <p:pipe        port="result"        step="declaration-map"/>
+  <p:serialization port="E.definition-map" indent="true"/>
+  <p:output        port="E.definition-map" primary="false">
+    <p:pipe        port="result"        step="definition-map"/>
   </p:output>
   
   <p:serialization port="X1.xml-element-tree" indent="true"/>
@@ -86,7 +86,7 @@
     </p:input>
   </p:xslt>
   
-  <p:xslt name="declaration-map">
+  <p:xslt name="definition-map">
     <p:input port="source">
       <p:pipe port="result" step="unfold-model-map"/>
     </p:input>
diff --git a/toolchains/xslt-proto-v04/schema_gen/make-metaschema-metatron.xsl b/toolchains/xslt-proto-v04/schema_gen/make-metaschema-metatron.xsl
index 002ba6f63..011572595 100644
--- a/toolchains/xslt-proto-v04/schema_gen/make-metaschema-metatron.xsl
+++ b/toolchains/xslt-proto-v04/schema_gen/make-metaschema-metatron.xsl
@@ -58,6 +58,7 @@
             
             <ns prefix="m" uri="http://csrc.nist.gov/ns/oscal/metaschema/1.0"/>
             <ns prefix="{ $declaration-prefix }" uri="{ $target-namespace }"/>
+            <let name="silence-warnings" value="{ $produce-warnings = ('no','false','false()') }()"/>
             
             <!--<pattern>
                 <rule context="/*">
@@ -71,6 +72,7 @@
             </xsl:for-each-group>
             
             <!--<xsl:apply-templates select="//constraint"/>-->
+            <xsl:comment> RULES </xsl:comment>
             <xsl:variable name="rules" as="element()*">
               <xsl:apply-templates select="//constraint//(* except require)">
 <!-- Sort into descending order by constraint definition depth
@@ -79,7 +81,6 @@
               </xsl:apply-templates>
             </xsl:variable>
             
-            <let name="silence-warnings" value="{ $produce-warnings = ('no','false','false()') }()"/>
             
             <!--<debug> <xsl:copy-of select="$rules"/> </debug>-->
             <pattern>
diff --git a/toolchains/xslt-proto-v04/validate/metaschema-check.sch b/toolchains/xslt-proto-v04/validate/metaschema-check.sch
index 721a382ba..577963d1a 100644
--- a/toolchains/xslt-proto-v04/validate/metaschema-check.sch
+++ b/toolchains/xslt-proto-v04/validate/metaschema-check.sch
@@ -110,13 +110,17 @@
 
             <sch:assert
                 test="not((@name | @ref) = ../m:json-value-key/@flag-name) or @required = 'yes'">A flag declared as a value key must be required (@required='yes')</sch:assert>
+            <sch:assert
+                test="not((@name | @ref) = ../m:json-key/@flag-name) or @required = 'yes'">A flag declared as a key must be required (@required='yes')</sch:assert>
             
             <sch:assert test="not(parent::m:define-field[@as-type='markup-multiline']/nm:references-to-definition(.)/@in-xml='UNWRAPPED')">Multiline markup fields must have no flags, unless always used with a wrapper - put your flags on an assembly with an unwrapped multiline field</sch:assert>
             
         </sch:rule>
         
         <sch:rule context="m:json-key">
-            <sch:assert test="@flag-name = (../m:flag/@ref|../m:define-flag/@name)">JSON key indicates no flag on this <sch:value-of select="substring-after(local-name(..),'define-')"/> <xsl:if test="exists(../m:flag | ../m:define-flag)">Should be (one of) <xsl:value-of select="../m:flag/@ref | ../m:define-flag/@name" separator=", "/></xsl:if></sch:assert>
+            <sch:let name="json-key-flag-name" value="@flag-name"/>
+            <sch:let name="json-key-flag" value="../m:flag[@ref=$json-key-flag-name] |../m:define-flag[@name=$json-key-flag-name]"/>
+            <sch:assert test="exists($json-key-flag)">JSON key indicates no flag on this <sch:value-of select="substring-after(local-name(..),'define-')"/> <xsl:if test="exists(../m:flag | ../m:define-flag)">Should be (one of) <xsl:value-of select="../m:flag/@ref | ../m:define-flag/@name" separator=", "/></xsl:if></sch:assert>
         </sch:rule>
         
         <sch:rule context="m:json-value-key">