SaxonJS upgraded to 3.x (#206)

* Saxon 2.7 upgraded to 3.0 beta

Refactoring named template callbacks as XPath functions

* Fixed command name

* Refactoring named templates as functions

* More named template callbacks converted to functions

* Moved generic HTTP promises to functions.xsl

* Cleanup

Author: namedgraph

generate-sef.sh

@@ -8,4 +8,4 @@ find ./target/ROOT/static/com/atomgraph  -type f -name "*.xsl" -exec sh -c 'xmls
 
 # compile client.xsl to SEF. The output path is mounted in docker-compose.override.yml
 
-npx xslt3 -t -xsl:./target/ROOT/static/com/atomgraph/linkeddatahub/xsl/client.xsl -export:./target/ROOT/static/com/atomgraph/linkeddatahub/xsl/client.xsl.sef.json -nogo -ns:##html5 -relocate:on
+npx xslt3-he -t -xsl:./target/ROOT/static/com/atomgraph/linkeddatahub/xsl/client.xsl -export:./target/ROOT/static/com/atomgraph/linkeddatahub/xsl/client.xsl.sef.json -nogo -ns:##html5 -relocate:on

pom.xml

@@ -346,7 +346,7 @@
                         </goals>
                         <phase>package</phase>
                         <configuration>
-                            <arguments>xslt3 -t -xsl:${project.build.directory}/${build.warName}${saxon-js.stylesheet} -export:${project.build.directory}/${build.warName}${saxon-js.stylesheet}.sef.json -nogo -ns:##html5 -relocate:on</arguments>
+                            <arguments>xslt3-he -t -xsl:${project.build.directory}/${build.warName}${saxon-js.stylesheet} -export:${project.build.directory}/${build.warName}${saxon-js.stylesheet}.sef.json -nogo -ns:##html5 -relocate:on</arguments>
                         </configuration>
                     </execution>
                 </executions>

src/main/webapp/static/com/atomgraph/linkeddatahub/js/saxon-js/LICENSE.txt

@@ -1,8 +1,8 @@
-      Version 1.0, June 2020
+      Version 2.0, December 2024
 
-      Software: This license applies to the packages "xslt3" and "saxon-js"
-      distributed via npm (https://www.npmjs.com) and to the modules SaxonJS2.js
-      and SaxonJS2.rt.js available for download from the Saxonica web site
+      Software: This license applies to the packages "xslt3-he" and "saxonjs-he"
+      distributed via npm (https://www.npmjs.com) and to the modules SaxonJS3.js
+      and SaxonJS3.rt.js available for download from the Saxonica web site
       (https://www.saxonica.com/).
 
       Copyright: The copyright in the Software belongs to Saxonica Ltd, except

src/main/webapp/static/com/atomgraph/linkeddatahub/js/saxon-js/SaxonJS2.js

@@ -443,10 +443,53 @@ exclude-result-prefixes="#all"
             </json:map>
         </xsl:variable>
         <xsl:variable name="update-json-string" select="xml-to-json($update-xml)" as="xs:string"/>
-<xsl:message>
-    <xsl:value-of select="$update-json-string"/>
-</xsl:message>
         <xsl:variable name="update-json" select="ixsl:call(ixsl:get(ixsl:window(), 'JSON'), 'parse', [ $update-json-string ])"/>
         <xsl:sequence select="ixsl:call($sparql-generator, 'stringify', [ $update-json ])"/>
     </xsl:function>
+    
+    <!-- generic HTTP client promises (SaxonJS 3) -->
+    
+    <xsl:function name="ldh:send-request" ixsl:updating="yes">
+        <xsl:param name="request" as="map(*)"/>
+        <xsl:param name="sleep-result" as="item()?"/> <!-- not used but has to be declared: https://saxonica.plan.io/issues/6727 -->
+
+        <ixsl:promise 
+            select="ixsl:http-request($request)" 
+            on-completion="ldh:handle-response($request, ?)" 
+            on-failure="ldh:fail#1"/>
+    </xsl:function>
+
+    <xsl:function name="ldh:handle-response" ixsl:updating="yes">
+        <xsl:param name="request" as="map(*)"/>
+        <xsl:param name="response" as="map(*)"/>
+        <xsl:variable name="default-retry-after" select="1" as="xs:integer"/>
+
+        <xsl:choose>
+            <xsl:when test="$response?status = 429">
+                <xsl:variable name="retry-after" select="
+                  if (map:contains($response?headers, 'Retry-After')) 
+                  then xs:integer($response?headers('Retry-After')) 
+                  else $default-retry-after"/>
+                <ixsl:promise 
+                  select="ixsl:sleep($retry-after * 1000)" 
+                  on-completion="ldh:send-request($request, ?)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <!-- Dynamically invoke the callback function -->
+                <xsl:variable name="callback-name" select="$request('ldh:on-success-function')" as="xs:QName"/>
+                <xsl:variable name="callback-func" select="function-lookup($callback-name, 2)"/>
+
+                <xsl:message>Callback function: <xsl:value-of select="string($callback-name)"/></xsl:message>
+
+                <xsl:sequence select="$callback-func($request, $response)"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
+    <xsl:function name="ldh:fail">
+        <xsl:param name="error" as="map(*)"/>
+
+        <xsl:message>ldh:fail $error: <xsl:value-of select="serialize($error, map{ 'method': 'json' })"/></xsl:message>
+    </xsl:function>
+    
 </xsl:stylesheet>

src/main/webapp/static/com/atomgraph/linkeddatahub/js/saxon-js/SaxonJS2.rt.js

@@ -389,7 +389,7 @@ LIMIT   100
             <script src="{resolve-uri('static/js/yasqe.js', $ac:contextUri)}" type="text/javascript"></script>
         </xsl:if>
         <xsl:if test="$load-saxon-js">
-            <script type="text/javascript" src="{resolve-uri('static/com/atomgraph/linkeddatahub/js/saxon-js/SaxonJS2.rt.js', $ac:contextUri)}" defer="defer"></script>
+            <script type="text/javascript" src="{resolve-uri('static/com/atomgraph/linkeddatahub/js/saxon-js/SaxonJS3.rt.js', $ac:contextUri)}" defer="defer"></script>
             <script type="text/javascript">
                 <xsl:text disable-output-escaping="yes">
                   //&lt;![CDATA[