Skip to content

Move ldh:view block injection client-side under Saxon-JS #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
namedgraph merged 2 commits into from
May 10, 2026
Merged

Move ldh:view block injection client-side under Saxon-JS #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
181f60f
Move ldh:view block injection client-side under Saxon-JS
namedgraph May 10, 2026
2a6cd77
Comment
namedgraph May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 155 additions & 2 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<!ENTITY sd "http://www.w3.org/ns/sparql-service-description#">
<!ENTITY sioc "http://rdfs.org/sioc/ns#">
<!ENTITY sp "http://spinrdf.org/sp#">
<!ENTITY srx "http://www.w3.org/2005/sparql-results#">
<!ENTITY spin "http://spinrdf.org/spin#">
<!ENTITY dct "http://purl.org/dc/terms/">
<!ENTITY nfo "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#">
Expand All @@ -37,6 +38,7 @@ xmlns:ldt="&ldt;"
xmlns:sioc="&sioc;"
xmlns:sd="&sd;"
xmlns:sp="&sp;"
xmlns:srx="&srx;"
xmlns:spin="&spin;"
xmlns:dct="&dct;"
xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2"
Expand Down Expand Up @@ -111,6 +113,32 @@ exclude-result-prefixes="#all"
]]>
</xsl:variable>

<!-- combined forward + inverse view-block lookup; substitutes VALUES ?type { ... } from the resource's rdf:types -->
<xsl:variable name="view-query" as="xs:string">
<![CDATA[
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX ldh: <https://w3id.org/atomgraph/linkeddatahub#>

SELECT DISTINCT ?block
WHERE {
{
?property ldh:view ?block .
{ ?property rdfs:domain ?type }
UNION
{ ?property rdfs:subPropertyOf+/rdfs:domain ?type }
}
UNION
{
?property ldh:inverseView ?block .
{ ?property rdfs:range ?type }
UNION
{ ?property rdfs:subPropertyOf+/rdfs:range ?type }
}
}
]]>
<!-- VALUES ?type goes here -->
</xsl:variable>

<xsl:key name="element-by-about" match="*[@about]" use="@about"/>

<!-- TEMPLATES -->
Expand All @@ -124,9 +152,34 @@ exclude-result-prefixes="#all"
</xsl:template>

<!-- render row -->

<xsl:template match="*" mode="ldh:RenderRow" as="(function(item()?) as map(*))*">
<xsl:apply-templates mode="#current"/>

<!--
inject ontology-driven view blocks for any Saxon-JS wrapper produced by resource.xsl:
outer div.block[@about] whose div.span12 child contains the inner typed resource block
(class='row-fluid block').

Typed-block wrappers (Object/View/Query/Chart from resource.xsl:463) are excluded
automatically: the wrapper template no longer matches those types, and even if
RenderRow visits their resource.xsl:463-produced wrapper, the inner
[contains-token(@class, 'block')] predicate excludes their inner (class='row-fluid'
from resource.xsl:518).
-->
<xsl:for-each select="self::div[contains-token(@class, 'block')][@about]/div[contains-token(@class, 'span12')]/div[contains-token(@class, 'block')][@typeof]">
<xsl:variable name="typeof-uris" select="tokenize(@typeof, ' ') ! xs:anyURI(.)" as="xs:anyURI*"/>
<xsl:variable name="values-clause" select="' VALUES ?type { ' || string-join(for $t in $typeof-uris return '&lt;' || $t || '&gt;', ' ') || ' }'" as="xs:string"/>
<xsl:variable name="request-uri" select="ldh:href(ac:build-uri(resolve-uri('ns', ldt:base()), map{ 'query': $view-query || $values-clause }), map{})" as="xs:anyURI"/>
<xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/sparql-results+xml' } }" as="map(*)"/>
<xsl:variable name="context" as="map(*)" select="
map{
'request': $request,
'container': ../..,
'base-uri': ac:absolute-path(ldh:base-uri(.))
}"/>
<xsl:sequence select="ldh:load-block#3($context, ldh:view-blocks-self-thunk#1, ?)"/>
</xsl:for-each>
</xsl:template>

<xsl:template match="text()" mode="ldh:RenderRow" as="(function(item()?) as map(*))*"/>
Expand Down Expand Up @@ -470,7 +523,107 @@ exclude-result-prefixes="#all"
)
"/>
</xsl:function>


<!-- view-block injection: ontology query → per-URI RDF fetch → render via bs2:Row → insert + hydrate -->

<xsl:function name="ldh:view-blocks-self-thunk" as="item()*" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>

<xsl:message>ldh:view-blocks-self-thunk</xsl:message>

<xsl:sequence select="
ixsl:resolve($context) =>
ixsl:then(ldh:view-blocks-query-thunk#1)
"/>
</xsl:function>

<xsl:function name="ldh:view-blocks-query-thunk" as="item()*" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>

<xsl:message>ldh:view-blocks-query-thunk</xsl:message>

<xsl:sequence select="
ixsl:http-request($context('request')) =>
ixsl:then(ldh:rethread-response($context, ?)) =>
ixsl:then(ldh:handle-response#1) =>
ixsl:then(ldh:view-blocks-fetch-thunk#1)
"/>
</xsl:function>

<!-- handle SPARQL XML response: fan out one HTTP fetch per view URI -->
<xsl:function name="ldh:view-blocks-fetch-thunk" as="map(*)" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>
<xsl:variable name="response" select="$context('response')" as="map(*)"/>

<xsl:message>ldh:view-blocks-fetch-thunk</xsl:message>

<xsl:if test="$response?status = 200 and $response?media-type = 'application/sparql-results+xml'">
<xsl:variable name="results" select="$response?body" as="document-node()"/>
<xsl:variable name="view-uris" select="distinct-values($results/srx:sparql/srx:results/srx:result/srx:binding[@name = 'block']/srx:uri/xs:anyURI(.))" as="xs:anyURI*"/>

<xsl:for-each select="$view-uris">
<xsl:variable name="view-uri" select="xs:anyURI(.)" as="xs:anyURI"/>
<xsl:variable name="view-request-uri" select="ldh:href(ac:document-uri($view-uri), map{})" as="xs:anyURI"/>
<xsl:variable name="view-request" select="map{ 'method': 'GET', 'href': $view-request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
<xsl:variable name="view-context" as="map(*)" select="map:merge(($context, map{ 'request': $view-request, 'view-uri': $view-uri }))"/>

<ixsl:promise select="
ixsl:http-request($view-request) =>
ixsl:then(ldh:rethread-response($view-context, ?)) =>
ixsl:then(ldh:handle-response#1) =>
ixsl:then(ldh:view-blocks-render-thunk#1)
"
on-failure="ldh:promise-failure#1"/>
</xsl:for-each>
</xsl:if>

<xsl:sequence select="$context"/>
</xsl:function>

<!-- render one view block from its loaded RDF, append into the wrapper's .span12 alongside the typed resource block, hydrate via existing ldh:RenderRow chain -->
<xsl:function name="ldh:view-blocks-render-thunk" as="map(*)" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>
<xsl:variable name="response" select="$context('response')" as="map(*)"/>
<xsl:variable name="container" select="$context('container')" as="element()"/>
<xsl:variable name="span12" select="$container/div[contains-token(@class, 'span12')]" as="element()"/>
<xsl:variable name="view-uri" select="$context('view-uri')" as="xs:anyURI"/>
<xsl:variable name="base-uri" select="$context('base-uri')" as="xs:anyURI"/>

<xsl:message>ldh:view-blocks-render-thunk</xsl:message>

<xsl:if test="$response?status = 200 and $response?media-type = 'application/rdf+xml'">
<xsl:variable name="view-rdf" select="$response?body" as="document-node()"/>
<xsl:variable name="view-resource" select="key('resources', $view-uri, $view-rdf)" as="element()?"/>

<xsl:if test="$view-resource">
<xsl:variable name="id" select="'id' || ac:uuid()" as="xs:string"/>
<xsl:variable name="view-block-html" as="element()">
<xsl:apply-templates select="$view-resource" mode="bs2:Row">
<xsl:with-param name="about" select="xs:anyURI($base-uri || $id)"/>
<xsl:with-param name="id" select="$id"/>
</xsl:apply-templates>
</xsl:variable>

<!-- append into the wrapper's .span12 so the new block's ancestor::*[@about][1] is the outer #this with @about ending in #this -->
<xsl:sequence select="ixsl:call($span12, 'append', [ $view-block-html ])[current-date() lt xs:date('2000-01-01')]"/>

<!-- hydrate the freshly-injected wrapper via the existing view.xsl:62 RenderRow handler -->
<xsl:variable name="injected" select="$span12/*[last()]" as="element()?"/>
<xsl:if test="$injected">
<xsl:variable name="factories" as="(function(item()?) as item()*)*">
<xsl:apply-templates select="$injected" mode="ldh:RenderRow"/>
</xsl:variable>
<xsl:for-each select="$factories">
<xsl:variable name="factory" select="."/>
<ixsl:promise select="$factory(())" on-failure="ldh:promise-failure#1"/>
</xsl:for-each>
</xsl:if>
</xsl:if>
</xsl:if>

<xsl:sequence select="$context"/>
</xsl:function>

<xsl:function name="ldh:hide-block-progress-bar" as="map(*)" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>
<xsl:param name="ignored" as="item()?"/>
Expand Down
32 changes: 0 additions & 32 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,38 +160,6 @@ exclude-result-prefixes="#all">
]]>
</xsl:variable>
<xsl:variable name="app-request-uri" select="ac:build-uri(sd:endpoint(), map{ 'query': $app-query })" as="xs:anyURI"/>
<xsl:variable name="forward-view-query" as="xs:string">
<![CDATA[
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX ldh: <https://w3id.org/atomgraph/linkeddatahub#>

SELECT DISTINCT ?block
WHERE
{
?property ldh:view ?block .
{ ?property rdfs:domain $domain }
UNION
{ ?property rdfs:subPropertyOf+/rdfs:domain $domain }
}
]]>
<!-- VALUES $domain goes here -->
</xsl:variable>
<xsl:variable name="inverse-view-query" as="xs:string">
<![CDATA[
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX ldh: <https://w3id.org/atomgraph/linkeddatahub#>

SELECT DISTINCT ?block
WHERE
{
?property ldh:inverseView ?block .
{ ?property rdfs:range $range }
UNION
{ ?property rdfs:subPropertyOf+/rdfs:range $range }
}
]]>
<!-- VALUES $range goes here -->
</xsl:variable>
<xsl:variable name="constraint-query" as="xs:string">
<![CDATA[
PREFIX ldh: <https://w3id.org/atomgraph/linkeddatahub#>
Expand Down
77 changes: 19 additions & 58 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,77 +601,38 @@ extension-element-prefixes="ixsl"
<!-- hide instances of system classes -->
<xsl:template match="*[not($ldh:renderSystemResources)][@rdf:about = ac:absolute-path(ldh:base-uri(.)) and rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]" mode="bs2:Row" priority="1"/>

<!-- overriding template used to inject ldh:view blocks (server-side only) -->
<xsl:template match="*[*][@rdf:about][not(rdf:type/@rdf:resource = '&http;Response')] | *[*][@rdf:nodeID][not(rdf:type/@rdf:resource = '&http;Response')]" mode="bs2:Row" priority="0.7" use-when="system-property('xsl:product-name') = 'SAXON'">
<!-- TO-DO: use ldh:request-uri() to resolve URIs server-side -->
<!-- Saxon-JS bs2:Row wrapper: outer div + inner div.span12 around next-match output, mirroring the deleted SAXON-only wrapper at resource.xsl:605 minus the synchronous view-block injection (which now happens client-side in client/block.xsl). Excludes the typed block types handled by resource.xsl:463 since those have their own wrapper structure (progress bar etc.) and the unconditional wrapping here would inject two spurious div levels into their next-match chain. -->
<!-- TO-DO: replace with fully client-side wrapper in ldh:RenderRow in block.xsl -->
<xsl:template match="*[*][@rdf:about][not(rdf:type/@rdf:resource = ('&http;Response', '&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart', '&sp;Describe', '&sp;Construct', '&sp;Ask', '&sp;Select'))] | *[*][@rdf:nodeID][not(rdf:type/@rdf:resource = ('&http;Response', '&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart', '&sp;Describe', '&sp;Construct', '&sp;Ask', '&sp;Select'))]" mode="bs2:Row" priority="0.7" use-when="system-property('xsl:product-name') eq 'SaxonJS'">
<xsl:param name="id" select="if (contains(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#')) then substring-after(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#') else generate-id()" as="xs:string?"/>
<xsl:param name="class" select="'row-fluid block'" as="xs:string?"/>
<xsl:param name="about" select="@rdf:about" as="xs:anyURI?"/>
<xsl:param name="typeof" select="rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
<xsl:param name="mode" as="xs:anyURI?"/>
<xsl:param name="style" as="xs:string?"/>
<!-- query ontology for forward blocks where rdfs:domain matches instance types (check direct domain and inherited via rdfs:subPropertyOf) -->
<xsl:variable name="forward-view-values" select="if (exists($typeof) and doc-available(resolve-uri('ns?query=ASK%20%7B%7D', $ldt:base))) then ldh:query-result(resolve-uri('ns', $ldt:base), $forward-view-query || ' VALUES $domain { ' || string-join(for $type in $typeof return '&lt;' || $type || '&gt;', ' ') || ' }')//srx:binding[@name = 'block']/srx:uri/xs:anyURI(.) else ()" as="xs:anyURI*" use-when="system-property('xsl:product-name') = 'SAXON'"/>
<!-- query ontology for inverse blocks where rdfs:range matches instance types (check direct range and inherited via rdfs:subPropertyOf) -->
<xsl:variable name="inverse-view-values" select="if (exists($typeof) and doc-available(resolve-uri('ns?query=ASK%20%7B%7D', $ldt:base))) then ldh:query-result(resolve-uri('ns', $ldt:base), $inverse-view-query || ' VALUES $range { ' || string-join(for $type in $typeof return '&lt;' || $type || '&gt;', ' ') || ' }')//srx:binding[@name = 'block']/srx:uri/xs:anyURI(.) else ()" as="xs:anyURI*" use-when="system-property('xsl:product-name') = 'SAXON'"/>
<!-- combine both forward and inverse blocks -->
<xsl:variable name="view-values" select="($forward-view-values, $inverse-view-values)" as="xs:anyURI*" use-when="system-property('xsl:product-name') = 'SAXON'"/>

<xsl:choose>
<xsl:when test="exists($view-values)">
<div>
<xsl:if test="$id">
<xsl:attribute name="id" select="$id"/>
</xsl:if>
<xsl:if test="$class">
<xsl:attribute name="class" select="$class"/>
</xsl:if>
<xsl:if test="$about">
<xsl:attribute name="about" select="$about"/>
</xsl:if>
<!-- <xsl:if test="exists($typeof)">
<xsl:attribute name="typeof" select="string-join($typeof, ' ')"/>
</xsl:if>-->
<!-- <xsl:if test="$draggable = true()">
<xsl:attribute name="draggable" select="'true'"/>
</xsl:if>
-->

<div class="span12">
<xsl:next-match>
<xsl:with-param name="id" select="()"/> <!-- unset @id -->
<xsl:with-param name="class" select="$class"/>
<xsl:with-param name="about" select="$about"/>
<xsl:with-param name="typeof" select="$typeof"/>
<xsl:with-param name="mode" select="$mode"/>
<xsl:with-param name="style" select="$style"/>
</xsl:next-match>

<xsl:variable name="base-uri" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
<!-- render blocks applicable to this resource's types (forward blocks via rdfs:domain, inverse blocks via rdfs:range) -->
<xsl:for-each select="$view-values" use-when="system-property('xsl:product-name') = 'SAXON'">
<xsl:if test="doc-available(ac:document-uri(.))">
<xsl:variable name="id" select="'id' || ac:uuid()" as="xs:string"/>
<xsl:apply-templates select="key('resources', ., document(ac:document-uri(.)))" mode="bs2:Row">
<xsl:with-param name="about" select="xs:anyURI($base-uri || $id)"/> <!-- set a unique @about -->
<xsl:with-param name="id" select="$id"/>
</xsl:apply-templates>
</xsl:if>
</xsl:for-each>
</div>
</div>
</xsl:when>
<xsl:otherwise>

<div>
<xsl:if test="$id">
<xsl:attribute name="id" select="$id"/>
</xsl:if>
<xsl:if test="$class">
<xsl:attribute name="class" select="$class"/>
</xsl:if>
<xsl:if test="$about">
<xsl:attribute name="about" select="$about"/>
</xsl:if>

<div class="span12">
<xsl:next-match>
<xsl:with-param name="id" select="$id"/>
<xsl:with-param name="id" select="()"/> <!-- only the wrapper carries @id -->
<xsl:with-param name="class" select="$class"/>
<xsl:with-param name="about" select="$about"/>
<xsl:with-param name="typeof" select="$typeof"/>
<xsl:with-param name="mode" select="$mode"/>
<xsl:with-param name="style" select="$style"/>
</xsl:next-match>
</xsl:otherwise>
</xsl:choose>
</div>
</div>
</xsl:template>

<xsl:template match="*[*][@rdf:about] | *[*][@rdf:nodeID]" mode="bs2:Row">
Expand Down
Loading