From 59ef15d23d6c0c7f5cab1a06fb0486c677e4cb7d Mon Sep 17 00:00:00 2001
From: galtm <40716346+galtm@users.noreply.github.com>
Date: Thu, 2 Mar 2023 20:59:33 -0500
Subject: [PATCH] Compatibility with Saxon 10 and 11 (#1685)

Replace document-uri with base-uri. Saxon 10 and 11 can
return different values from document-uri() function. For
compatibility and to avoid errors when document-uri() returns
empty with Saxon 11, use base-uri() instead.
---
 src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl  | 6 +++---
 .../resolver-pipeline/oscal-profile-resolve-metadata.xsl    | 2 +-
 .../util/resolver-pipeline/oscal-profile-resolve-modify.xsl | 2 +-
 .../util/resolver-pipeline/oscal-profile-resolve-select.xsl | 3 +--
 src/utils/util/resolver-pipeline/random-util.xsl            | 2 +-
 src/utils/util/resolver-pipeline/select-or-custom-merge.xsl | 2 +-
 .../util/resolver-pipeline/testing/1_selected/select.xspec  | 2 +-
 .../resolver-pipeline/testing/2_metadata/random-util.xspec  | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl b/src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl
index e4ba2066ba..30218c1b7b 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl
@@ -67,7 +67,7 @@
              Each represents a stage in processing.
              The result of each processing step is passed to the next step as its input, until no steps are left. -->
         <xsl:call-template name="alert">
-            <xsl:with-param name="msg" expand-text="yes"> RESOLVING PROFILE { document-uri($source) } </xsl:with-param>
+            <xsl:with-param name="msg" expand-text="yes"> RESOLVING PROFILE { base-uri($source) } </xsl:with-param>
         </xsl:call-template>
         <xsl:iterate select="$transformation-sequence/*">
             <xsl:param name="doc" select="$source" as="document-node()"/>
@@ -98,9 +98,9 @@
         <xsl:variable name="xslt-spec" select="."/>
         <xsl:variable name="runtime-params" as="map(xs:QName,item()*)">
             <xsl:map>
-                <xsl:map-entry key="QName('','profile-origin-uri')" select="document-uri($home)"/>
+                <xsl:map-entry key="QName('','profile-origin-uri')" select="base-uri($home)"/>
                 <xsl:map-entry key="QName('','path-to-source')"     select="$path-to-source"/>
-                <xsl:map-entry key="QName('','uri-stack-in')"       select="($uri-stack, document-uri($home))"/>
+                <xsl:map-entry key="QName('','uri-stack-in')"       select="($uri-stack, base-uri($home))"/>
                 <xsl:apply-templates select="." mode="opr:provide-parameters"/>
             </xsl:map>
         </xsl:variable>
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-resolve-metadata.xsl b/src/utils/util/resolver-pipeline/oscal-profile-resolve-metadata.xsl
index e2eb01e802..2752793f4a 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-resolve-metadata.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-resolve-metadata.xsl
@@ -120,7 +120,7 @@
             </xsl:if>
         </xsl:for-each>
         <!-- Return the version from the source parameter. -->
-        <xsl:value-of select="$source"/>
+        <xsl:sequence select="$source"/>
     </xsl:function>
 
     <!--<xsl:template match="selection" mode="imported-metadata">
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-resolve-modify.xsl b/src/utils/util/resolver-pipeline/oscal-profile-resolve-modify.xsl
index 74d6315a29..26734951d2 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-resolve-modify.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-resolve-modify.xsl
@@ -89,7 +89,7 @@
         <!-- condition not(@by-id != $id) includes any addition without an @by-id, or whose @by-id is the control id -->
         <xsl:variable name="implicit-patches-to-id" select="$modifications/key('alteration-for-control-id',$id,.)/add[not(@by-id != $id)]" as="element(add)*"/>
 
-        <xsl:copy-of select="$patches-to-id-targeting-ancestor[@position = 'before']/*"/><xsl:message>got here! removable is <xsl:sequence select="oscal:removable(./*[1],$modifications)"/></xsl:message>
+        <xsl:copy-of select="$patches-to-id-targeting-ancestor[@position = 'before']/*"/>
         <xsl:if test="not(ancestor::control and oscal:removable(.,$modifications))">
             <xsl:copy>
                 <xsl:copy-of select="@*"/>
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-resolve-select.xsl b/src/utils/util/resolver-pipeline/oscal-profile-resolve-select.xsl
index 52ea10a3b2..8249e43fd8 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-resolve-select.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-resolve-select.xsl
@@ -70,9 +70,8 @@
     </xsl:template>
 
     <xsl:template match="catalog" mode="o:select">
-        <selection opr:src="{document-uri(root())}">
+        <selection opr:src="{base-uri(root())}">
             <xsl:copy-of select="@* except @xsi:*" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
-            <!--<xsl:attribute name="opr:base" select="document-uri(root())"/>-->
             <xsl:apply-templates mode="#current"/>
         </selection>
     </xsl:template>
diff --git a/src/utils/util/resolver-pipeline/random-util.xsl b/src/utils/util/resolver-pipeline/random-util.xsl
index 3fe4bdd665..94a5b823d4 100644
--- a/src/utils/util/resolver-pipeline/random-util.xsl
+++ b/src/utils/util/resolver-pipeline/random-util.xsl
@@ -30,7 +30,7 @@ v4 UUID
     <!-- Set $germ to a string for reproducible outputs of r:make-uuid.
          Pass in a blind value - and don't save it - for irreproducible outputs. -->
 
-    <xsl:param name="germ" select="current-dateTime() || document-uri(/)"/>
+    <xsl:param name="germ" select="current-dateTime() || base-uri(/)"/>
 
     <!-- for testing random number features   -->
     <xsl:template match="/" name="xsl:initial-template" expand-text="true">
diff --git a/src/utils/util/resolver-pipeline/select-or-custom-merge.xsl b/src/utils/util/resolver-pipeline/select-or-custom-merge.xsl
index 62c652ffd3..b7f9c003cc 100644
--- a/src/utils/util/resolver-pipeline/select-or-custom-merge.xsl
+++ b/src/utils/util/resolver-pipeline/select-or-custom-merge.xsl
@@ -91,7 +91,7 @@
 
     <xsl:function name="opr:catalog-identifier" as="xs:string">
         <xsl:param name="catalog" as="element(o:catalog)"/>
-        <xsl:sequence select="$catalog/(@uuid,document-uri(root(.)))[1]"/>
+        <xsl:sequence select="$catalog/(@uuid,base-uri(root(.)))[1]"/>
     </xsl:function>
 
 </xsl:stylesheet>
diff --git a/src/utils/util/resolver-pipeline/testing/1_selected/select.xspec b/src/utils/util/resolver-pipeline/testing/1_selected/select.xspec
index 7f94a578ef..6b49655f13 100644
--- a/src/utils/util/resolver-pipeline/testing/1_selected/select.xspec
+++ b/src/utils/util/resolver-pipeline/testing/1_selected/select.xspec
@@ -673,7 +673,7 @@
             <x:call function="opr:catalog-identifier">
                 <x:param href="catalog-no-uuid.xml" select="/o:catalog"/>
             </x:call>
-            <x:expect label="Returns document URI of catalog" test="ends-with($x:result,'/catalog-no-uuid.xml')"/>
+            <x:expect label="Returns base URI of catalog" test="ends-with($x:result,'/catalog-no-uuid.xml')"/>
         </x:scenario>
     </x:scenario>
 
diff --git a/src/utils/util/resolver-pipeline/testing/2_metadata/random-util.xspec b/src/utils/util/resolver-pipeline/testing/2_metadata/random-util.xspec
index daa5ea4471..de5ddb7ea0 100644
--- a/src/utils/util/resolver-pipeline/testing/2_metadata/random-util.xspec
+++ b/src/utils/util/resolver-pipeline/testing/2_metadata/random-util.xspec
@@ -8,7 +8,7 @@
     xslt-version="3.0">
 
     <!-- For repeatable testing, use a fixed germ. Also, XSpec
-        cannot evaluate document-uri(/) in the default parameter
+        cannot evaluate base-uri(/) in the default parameter
         value from the XSLT. -->
     <x:param name="germ">x</x:param>