From 8d6680dd8a20bbce13432f32250f9d77789d2964 Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Tue, 16 Mar 2021 16:44:37 -0400
Subject: [PATCH] Addresses usnistgov/OSCAL#844

---
 .../xslt-M4/compose/metaschema-collect.xsl    | 26 +++++++++++++++----
 toolchains/xslt-M4/metaschema-compose.xpl     |  4 +--
 .../schema-gen/make-json-schema-metamap.xsl   | 10 +++++--
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/toolchains/xslt-M4/compose/metaschema-collect.xsl b/toolchains/xslt-M4/compose/metaschema-collect.xsl
index ad3e385a8..e8d5bb9ce 100644
--- a/toolchains/xslt-M4/compose/metaschema-collect.xsl
+++ b/toolchains/xslt-M4/compose/metaschema-collect.xsl
@@ -80,12 +80,28 @@
  <!-- Same at the other end - references to module-local definitions are relabeled correspondingly
       (to disambiguate from others of the same name in other modules) -->
     
-    <xsl:key name="top-level-local-definition-by-name" use="@name"
-        match="METASCHEMA/define-assembly[@scope='local'] |
-               METASCHEMA/define-field[@scope='local']    |
-               METASCHEMA/define-flag[@scope='local']" />
+    <xsl:key name="top-level-local-assembly-definition-by-name" use="@name"
+        match="METASCHEMA/define-assembly[@scope='local']" />
+    
+    <xsl:key name="top-level-local-field-definition-by-name" use="@name"
+        match="METASCHEMA/define-field[@scope='local']" />
+    
+    <xsl:key name="top-level-local-flag-definition-by-name" use="@name"
+        match="METASCHEMA/define-flag[@scope='local']" />
+    
+    <xsl:template mode="acquire" match="assembly[exists( key('top-level-local-assembly-definition-by-name',@ref) )]">
+        <xsl:call-template name="rewrite-local-reference"/>
+    </xsl:template>
+    
+    <xsl:template mode="acquire" match="field[exists( key('top-level-local-field-definition-by-name',@ref) )]">
+        <xsl:call-template name="rewrite-local-reference"/>
+    </xsl:template>
+    
+    <xsl:template mode="acquire" match="flag[exists( key('top-level-local-flag-definition-by-name',@ref) )]">
+        <xsl:call-template name="rewrite-local-reference"/>
+    </xsl:template>
     
-    <xsl:template mode="acquire" match="model//*[exists( key('top-level-local-definition-by-name',@ref) )]">
+    <xsl:template name="rewrite-local-reference">
         <xsl:copy>
             <xsl:copy-of select="@*"/>
             <xsl:attribute name="ref" expand-text="true">{ ancestor::METASCHEMA[1]/short-name }-{ @ref }</xsl:attribute>
diff --git a/toolchains/xslt-M4/metaschema-compose.xpl b/toolchains/xslt-M4/metaschema-compose.xpl
index 00f45d0ec..6407d5fd1 100644
--- a/toolchains/xslt-M4/metaschema-compose.xpl
+++ b/toolchains/xslt-M4/metaschema-compose.xpl
@@ -30,8 +30,8 @@
     <p:pipe port="result" step="reduce2"/>
   </p:output>
 
-  <p:serialization port="_3_digested" indent="true"/>
-  <p:output port="_3_digested" primary="false">
+  <p:serialization port="_4_digested" indent="true"/>
+  <p:output port="_4_digested" primary="false">
     <p:pipe port="result" step="digest"/>
   </p:output>
   
diff --git a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
index 5850d8f85..03eb1f75d 100644
--- a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
+++ b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
@@ -116,8 +116,14 @@
         <xsl:text>#/definitions/{ $lineage => string-join('-') }</xsl:text>
     </xsl:template>
 
-    <xsl:template priority="100" match="METASCHEMA/define-assembly | METASCHEMA/define-field">
-        <map key="{ @name }">
+    <xsl:template priority="100" match="METASCHEMA/define-assembly">
+        <map key="{ $composed-metaschema/*/short-name }-{ @name }">
+            <xsl:next-match/>
+        </map>
+    </xsl:template>
+    
+    <xsl:template priority="100" match="METASCHEMA/define-field">
+        <map key="{ $composed-metaschema/*/short-name }-{ @name }">
             <xsl:next-match/>
         </map>
     </xsl:template>