Skip to content

Call template text node #85

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
merged 2 commits into from
Jan 29, 2024
Merged

Call template text node #85

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ef1cfd
Attaching text nodes to the output when the output is a document frag…
leonelsanchesdasilva Jan 29, 2024
29529cb
- Always considering the output as being set, but this time we check …
leonelsanchesdasilva Jan 29, 2024
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
45 changes: 28 additions & 17 deletions src/xslt/xslt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export class Xslt {
}
}

this.xsltProcessContext(expressionContext, stylesheet);
this.xsltProcessContext(expressionContext, stylesheet, this.outputDocument);
const transformedOutputXml = xmlTransformedText(outputDocument, {
cData: false,
escape: this.options.escape,
Expand Down Expand Up @@ -209,7 +209,7 @@ export class Xslt {
if (modifiedContext.nodeList[j].nodeType === DOM_TEXT_NODE) {
const textNodeContext = context.clone([modifiedContext.nodeList[j]], undefined, 0, undefined);
// TODO: verify if it is okay to pass the own text node as template.
this.commonLogicTextNode(textNodeContext, modifiedContext.nodeList[j]);
this.commonLogicTextNode(textNodeContext, modifiedContext.nodeList[j], output);
} else {
const clonedContext = modifiedContext.clone(
[modifiedContext.nodeList[j]],
Expand All @@ -236,7 +236,8 @@ export class Xslt {
const documentFragment = domCreateDocumentFragment(this.outputDocument);
this.xsltChildNodes(context, template, documentFragment);
value = xmlValue2(documentFragment);
if (output !== null && output !== undefined) {

if (output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
domSetTransformedAttribute(output, name, value);
} else {
let sourceNode = context.nodeList[context.position];
Expand Down Expand Up @@ -270,6 +271,10 @@ export class Xslt {
parentSourceNode = newRootNode;
}

// If the parent transformation is something like `xsl:element`, we should
// add a copy of the attribute to this element.
domSetTransformedAttribute(output, name, value);

// Some operations start by the tag attributes, and not by the tag itself.
// When this is the case, the output node is not set yet, so
// we add the transformed attributes into the original tag.
Expand Down Expand Up @@ -457,7 +462,8 @@ export class Xslt {
value = attribute.stringValue();
node = domCreateTransformedTextNode(this.outputDocument, value);
node.siblingPosition = context.nodeList[context.position].siblingPosition;
if (output !== null && output !== undefined) {

if (output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
output.appendTransformedChild(node);
} else {
context.outputNodeList[context.outputPosition].appendTransformedChild(node);
Expand Down Expand Up @@ -720,18 +726,23 @@ export class Xslt {
* @param context The Expression Context.
* @param template The template, that contains the node value to be written.
*/
private commonLogicTextNode(context: ExprContext, template: XNode) {
const textNodeList = context.outputNodeList[context.outputPosition].transformedChildNodes.filter(
(n) => n.nodeType === DOM_TEXT_NODE
);

if (textNodeList.length > 0) {
let node = textNodeList[0];
node.transformedNodeValue = template.nodeValue;
} else {
private commonLogicTextNode(context: ExprContext, template: XNode, output: XNode) {
if (output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
let node = domCreateTransformedTextNode(this.outputDocument, template.nodeValue);
node.transformedParentNode = context.outputNodeList[context.outputPosition];
domAppendTransformedChild(context.outputNodeList[context.outputPosition], node);
domAppendTransformedChild(output, node);
} else {
const textNodeList = context.outputNodeList[context.outputPosition].transformedChildNodes.filter(
(n) => n.nodeType === DOM_TEXT_NODE
);

if (textNodeList.length > 0) {
let node = textNodeList[0];
node.transformedNodeValue = template.nodeValue;
} else {
let node = domCreateTransformedTextNode(this.outputDocument, template.nodeValue);
node.transformedParentNode = context.outputNodeList[context.outputPosition];
domAppendTransformedChild(context.outputNodeList[context.outputPosition], node);
}
}
}

Expand All @@ -747,7 +758,7 @@ export class Xslt {
protected xsltPassThrough(context: ExprContext, template: XNode, output: XNode) {
if (template.nodeType == DOM_TEXT_NODE) {
if (this.xsltPassText(template)) {
this.commonLogicTextNode(context, template);
this.commonLogicTextNode(context, template, output);
}
} else if (template.nodeType == DOM_ELEMENT_NODE) {
let node: XNode;
Expand Down Expand Up @@ -795,7 +806,7 @@ export class Xslt {
outputNode.transformedChildNodes.length - 1,
++elementContext.outputDepth
);
this.xsltChildNodes(clonedContext, template);
this.xsltChildNodes(clonedContext, template, output);
} else {
// This applies also to the DOCUMENT_NODE of the XSL stylesheet,
// so we don't have to treat it specially.
Expand Down