If blocks (#4)
* Adding {#if} test case
* Expression evaluation based on ses Compartments
* New Compartment usage
* split template filling tests
* passing tests except the if one
* in progress
* Refactoring: extracting extractBlockContent method
* test if qui passe
* Move tree preparation to its own function so it's done ony once
* if in a single text node works
This commit is contained in:
David Bruant
GitHub
parent
3da7f29cb0
commit
c9284343e8
35
package-lock.json
generated
35
package-lock.json
generated
@ -1,15 +1,16 @@
|
||||
{
|
||||
"name": "ods-xlsx",
|
||||
"name": "@odfjs/odfjs",
|
||||
"version": "0.16.0",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "ods-xlsx",
|
||||
"name": "@odfjs/odfjs",
|
||||
"version": "0.16.0",
|
||||
"dependencies": {
|
||||
"@xmldom/xmldom": "^0.9.8",
|
||||
"@zip.js/zip.js": "^2.7.57"
|
||||
"@zip.js/zip.js": "^2.7.57",
|
||||
"ses": "^1.12.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@rollup/plugin-commonjs": "^25.0.7",
|
||||
@ -40,6 +41,12 @@
|
||||
"node": ">=6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@endo/env-options": {
|
||||
"version": "1.1.8",
|
||||
"resolved": "https://registry.npmjs.org/@endo/env-options/-/env-options-1.1.8.tgz",
|
||||
"integrity": "sha512-Xtxw9n33I4guo8q0sDyZiRuxlfaopM454AKiELgU7l3tqsylCut6IBZ0fPy4ltSHsBib7M3yF7OEMoIuLwzWVg==",
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
"node_modules/@jridgewell/gen-mapping": {
|
||||
"version": "0.3.2",
|
||||
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
|
||||
@ -3607,6 +3614,15 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/ses": {
|
||||
"version": "1.12.0",
|
||||
"resolved": "https://registry.npmjs.org/ses/-/ses-1.12.0.tgz",
|
||||
"integrity": "sha512-jvmwXE2lFxIIY1j76hFjewIIhYMR9Slo3ynWZGtGl5M7VUCw3EA0wetS+JCIbl2UcSQjAT0yGAHkyxPJreuC9w==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@endo/env-options": "^1.1.8"
|
||||
}
|
||||
},
|
||||
"node_modules/set-blocking": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
|
||||
@ -4555,6 +4571,11 @@
|
||||
"@jridgewell/trace-mapping": "^0.3.9"
|
||||
}
|
||||
},
|
||||
"@endo/env-options": {
|
||||
"version": "1.1.8",
|
||||
"resolved": "https://registry.npmjs.org/@endo/env-options/-/env-options-1.1.8.tgz",
|
||||
"integrity": "sha512-Xtxw9n33I4guo8q0sDyZiRuxlfaopM454AKiELgU7l3tqsylCut6IBZ0fPy4ltSHsBib7M3yF7OEMoIuLwzWVg=="
|
||||
},
|
||||
"@jridgewell/gen-mapping": {
|
||||
"version": "0.3.2",
|
||||
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
|
||||
@ -7116,6 +7137,14 @@
|
||||
"type-fest": "^0.13.1"
|
||||
}
|
||||
},
|
||||
"ses": {
|
||||
"version": "1.12.0",
|
||||
"resolved": "https://registry.npmjs.org/ses/-/ses-1.12.0.tgz",
|
||||
"integrity": "sha512-jvmwXE2lFxIIY1j76hFjewIIhYMR9Slo3ynWZGtGl5M7VUCw3EA0wetS+JCIbl2UcSQjAT0yGAHkyxPJreuC9w==",
|
||||
"requires": {
|
||||
"@endo/env-options": "^1.1.8"
|
||||
}
|
||||
},
|
||||
"set-blocking": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@xmldom/xmldom": "^0.9.8",
|
||||
"@zip.js/zip.js": "^2.7.57"
|
||||
"@zip.js/zip.js": "^2.7.57",
|
||||
"ses": "^1.12.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,6 +3,11 @@ import { ZipReader, ZipWriter, BlobReader, BlobWriter, TextReader, Uint8ArrayRea
|
||||
import {traverse, parseXML, serializeToString, Node} from '../DOMUtils.js'
|
||||
import {makeManifestFile, getManifestFileData} from './manifest.js';
|
||||
|
||||
import 'ses'
|
||||
|
||||
lockdown();
|
||||
|
||||
|
||||
/** @import {Reader, ZipWriterAddDataOptions} from '@zip.js/zip.js' */
|
||||
/** @import {ODFManifest} from './manifest.js' */
|
||||
|
||||
@ -18,41 +23,17 @@ const ODTMimetype = 'application/vnd.oasis.opendocument.text'
|
||||
/**
|
||||
* @typedef TextPlaceToFill
|
||||
* @property { {expression: string, replacedString:string}[] } expressions
|
||||
* @property {(values: any) => void} fill
|
||||
* @property {() => void} fill
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* PPP : for now, expression is expected to be only an object property name or a dot-path
|
||||
* in the future, it will certainly be a JavaScript expression
|
||||
* securely evaluated within an hardernedJS Compartment https://hardenedjs.org/#compartment
|
||||
* @param {string} expression
|
||||
* @param {any} context - data / global object
|
||||
* @return {any}
|
||||
*/
|
||||
function evaluateTemplateExpression(expression, context){
|
||||
const parts = expression.trim().split('.')
|
||||
|
||||
let value = context;
|
||||
|
||||
for(const part of parts){
|
||||
if(!value){
|
||||
return undefined
|
||||
}
|
||||
else{
|
||||
value = value[part]
|
||||
}
|
||||
}
|
||||
|
||||
return value
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param {string} str
|
||||
* @param {Compartment} compartment
|
||||
* @returns {TextPlaceToFill | undefined}
|
||||
*/
|
||||
function findPlacesToFillInString(str) {
|
||||
function findPlacesToFillInString(str, compartment) {
|
||||
const matches = str.matchAll(/\{([^{#\/]+?)\}/g)
|
||||
|
||||
/** @type {TextPlaceToFill['expressions']} */
|
||||
@ -75,8 +56,7 @@ function findPlacesToFillInString(str) {
|
||||
if (fixedPart.length >= 1)
|
||||
parts.push(fixedPart)
|
||||
|
||||
|
||||
parts.push(data => evaluateTemplateExpression(expression, data))
|
||||
parts.push(() => compartment.evaluate(expression))
|
||||
|
||||
remaining = newRemaining
|
||||
}
|
||||
@ -110,26 +90,25 @@ function findPlacesToFillInString(str) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Content between blockStartNode and blockEndNode is extracted to a documentFragment
|
||||
* The original document is modified because nodes are removed from it to be part of the returned documentFragment
|
||||
*
|
||||
* @param {Node} startNode
|
||||
* @param {string} iterableExpression
|
||||
* @param {string} itemExpression
|
||||
* @param {Node} endNode
|
||||
* @param {any} data
|
||||
* @param {typeof Node} Node
|
||||
* startChild and endChild are ancestors of, respectively, blockStartNode and blockEndNode
|
||||
* and startChild.parentNode === endChild.parentNode
|
||||
*
|
||||
* @precondition blockStartNode needs to be before blockEndNode in document order
|
||||
*
|
||||
* @param {Node} blockStartNode
|
||||
* @param {Node} blockEndNode
|
||||
* @returns {{startChild: Node, endChild:Node, content: DocumentFragment}}
|
||||
*/
|
||||
function fillEachBlock(startNode, iterableExpression, itemExpression, endNode, data, Node){
|
||||
//console.log('fillEachBlock', iterableExpression, itemExpression)
|
||||
//console.log('startNode', startNode.nodeType, startNode.nodeName)
|
||||
//console.log('endNode', endNode.nodeType, endNode.nodeName)
|
||||
|
||||
// find common ancestor
|
||||
function extractBlockContent(blockStartNode, blockEndNode){
|
||||
// find common ancestor of blockStartNode and blockEndNode
|
||||
let commonAncestor
|
||||
|
||||
let startAncestor = startNode
|
||||
let endAncestor = endNode
|
||||
let startAncestor = blockStartNode
|
||||
let endAncestor = blockEndNode
|
||||
|
||||
const startAncestry = new Set([startAncestor])
|
||||
const endAncestry = new Set([endAncestor])
|
||||
@ -152,23 +131,14 @@ function fillEachBlock(startNode, iterableExpression, itemExpression, endNode, d
|
||||
commonAncestor = startAncestor
|
||||
}
|
||||
|
||||
|
||||
//console.log('commonAncestor', commonAncestor.tagName)
|
||||
//console.log('startAncestry', startAncestry.size, [...startAncestry].indexOf(commonAncestor))
|
||||
//console.log('endAncestry', endAncestry.size, [...endAncestry].indexOf(commonAncestor))
|
||||
|
||||
const startAncestryToCommonAncestor = [...startAncestry].slice(0, [...startAncestry].indexOf(commonAncestor))
|
||||
const endAncestryToCommonAncestor = [...endAncestry].slice(0, [...endAncestry].indexOf(commonAncestor))
|
||||
|
||||
const startChild = startAncestryToCommonAncestor.at(-1)
|
||||
const endChild = endAncestryToCommonAncestor.at(-1)
|
||||
|
||||
//console.log('startChild', startChild.tagName)
|
||||
//console.log('endChild', endChild.tagName)
|
||||
|
||||
// Find repeatable pattern and extract it in a documentFragment
|
||||
// @ts-ignore
|
||||
const repeatedFragment = startNode.ownerDocument.createDocumentFragment()
|
||||
// Extract DOM content in a documentFragment
|
||||
const contentFragment = blockStartNode.ownerDocument.createDocumentFragment()
|
||||
|
||||
/** @type {Element[]} */
|
||||
const repeatedPatternArray = []
|
||||
@ -179,17 +149,115 @@ function fillEachBlock(startNode, iterableExpression, itemExpression, endNode, d
|
||||
sibling = sibling.nextSibling;
|
||||
}
|
||||
|
||||
|
||||
//console.log('repeatedPatternArray', repeatedPatternArray.length)
|
||||
|
||||
for(const sibling of repeatedPatternArray){
|
||||
sibling.parentNode?.removeChild(sibling)
|
||||
repeatedFragment.appendChild(sibling)
|
||||
contentFragment.appendChild(sibling)
|
||||
}
|
||||
|
||||
return {
|
||||
startChild,
|
||||
endChild,
|
||||
content: contentFragment
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {Node} ifOpeningMarkerNode
|
||||
* @param {Node | undefined} ifElseMarkerNode
|
||||
* @param {Node} ifClosingMarkerNode
|
||||
* @param {string} ifBlockConditionExpression
|
||||
* @param {Compartment} compartment
|
||||
*/
|
||||
function fillIfBlock(ifOpeningMarkerNode, ifElseMarkerNode, ifClosingMarkerNode, ifBlockConditionExpression, compartment){
|
||||
const conditionValue = compartment.evaluate(ifBlockConditionExpression)
|
||||
|
||||
let startChild
|
||||
let endChild
|
||||
|
||||
let markerNodes = new Set()
|
||||
|
||||
let chosenFragment
|
||||
|
||||
if(ifElseMarkerNode){
|
||||
const {
|
||||
startChild: startIfThenChild,
|
||||
endChild: endIfThenChild,
|
||||
content: thenFragment
|
||||
} = extractBlockContent(ifOpeningMarkerNode, ifElseMarkerNode)
|
||||
|
||||
const {
|
||||
startChild: startIfElseChild,
|
||||
endChild: endIfElseChild,
|
||||
content: elseFragment
|
||||
} = extractBlockContent(ifElseMarkerNode, ifClosingMarkerNode)
|
||||
|
||||
chosenFragment = conditionValue ? thenFragment : elseFragment
|
||||
startChild = startIfThenChild
|
||||
endChild = endIfElseChild
|
||||
|
||||
markerNodes
|
||||
.add(startIfThenChild).add(endIfThenChild)
|
||||
.add(startIfElseChild).add(endIfElseChild)
|
||||
}
|
||||
else{
|
||||
const {
|
||||
startChild: startIfThenChild,
|
||||
endChild: endIfThenChild,
|
||||
content: thenFragment
|
||||
} = extractBlockContent(ifOpeningMarkerNode, ifClosingMarkerNode)
|
||||
|
||||
chosenFragment = conditionValue ? thenFragment : undefined
|
||||
startChild = startIfThenChild
|
||||
endChild = endIfThenChild
|
||||
|
||||
markerNodes
|
||||
.add(startIfThenChild).add(endIfThenChild)
|
||||
}
|
||||
|
||||
|
||||
if(chosenFragment){
|
||||
fillTemplatedOdtElement(
|
||||
chosenFragment,
|
||||
compartment
|
||||
)
|
||||
|
||||
endChild.parentNode.insertBefore(chosenFragment, endChild)
|
||||
}
|
||||
|
||||
for(const markerNode of markerNodes){
|
||||
try{
|
||||
// may throw if node already out of tree
|
||||
// might happen if
|
||||
markerNode.parentNode.removeChild(markerNode)
|
||||
}
|
||||
catch(e){}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {Node} startNode
|
||||
* @param {string} iterableExpression
|
||||
* @param {string} itemExpression
|
||||
* @param {Node} endNode
|
||||
* @param {Compartment} compartment
|
||||
*/
|
||||
function fillEachBlock(startNode, iterableExpression, itemExpression, endNode, compartment){
|
||||
//console.log('fillEachBlock', iterableExpression, itemExpression)
|
||||
//console.log('startNode', startNode.nodeType, startNode.nodeName)
|
||||
//console.log('endNode', endNode.nodeType, endNode.nodeName)
|
||||
|
||||
const {startChild, endChild, content: repeatedFragment} = extractBlockContent(startNode, endNode)
|
||||
|
||||
// Find the iterable in the data
|
||||
// PPP eventually, evaluate the expression as a JS expression
|
||||
let iterable = evaluateTemplateExpression(iterableExpression, data)
|
||||
let iterable = compartment.evaluate(iterableExpression)
|
||||
if(!iterable || typeof iterable[Symbol.iterator] !== 'function'){
|
||||
// when there is no iterable, silently replace with empty array
|
||||
iterable = []
|
||||
@ -202,60 +270,305 @@ function fillEachBlock(startNode, iterableExpression, itemExpression, endNode, d
|
||||
// @ts-ignore
|
||||
const itemFragment = repeatedFragment.cloneNode(true)
|
||||
|
||||
let insideCompartment = new Compartment({
|
||||
globals: Object.assign({}, compartment.globalThis, {[itemExpression]: item}),
|
||||
__options__: true
|
||||
})
|
||||
|
||||
// recursive call to fillTemplatedOdtElement on itemFragment
|
||||
fillTemplatedOdtElement(
|
||||
itemFragment,
|
||||
Object.assign({}, data, {[itemExpression]: item}),
|
||||
Node
|
||||
insideCompartment
|
||||
)
|
||||
// @ts-ignore
|
||||
commonAncestor.insertBefore(itemFragment, endChild)
|
||||
|
||||
endChild.parentNode.insertBefore(itemFragment, endChild)
|
||||
}
|
||||
|
||||
// remove block marker elements
|
||||
startChild.parentNode.removeChild(startChild)
|
||||
endChild.parentNode.removeChild(endChild)
|
||||
}
|
||||
|
||||
|
||||
const IF = 'IF'
|
||||
const EACH = 'EACH'
|
||||
|
||||
// the regexps below are shared, so they shoudn't have state (no 'g' flag)
|
||||
const ifStartRegex = /{#if\s+([^}]+?)\s*}/;
|
||||
const elseMarker = '{:else}'
|
||||
const closingIfMarker = '{/if}'
|
||||
|
||||
const eachStartMarkerRegex = /{#each\s+([^}]+?)\s+as\s+([^}]+?)\s*}/;
|
||||
const eachClosingBlockString = '{/each}'
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {Element | DocumentFragment | Document} rootElement
|
||||
* @param {Compartment} compartment
|
||||
* @returns {void}
|
||||
*/
|
||||
function fillTemplatedOdtElement(rootElement, compartment){
|
||||
//console.log('fillTemplatedOdtElement', rootElement.nodeType, rootElement.nodeName)
|
||||
|
||||
let currentlyOpenBlocks = []
|
||||
|
||||
/** @type {Node | undefined} */
|
||||
let eachOpeningMarkerNode
|
||||
/** @type {Node | undefined} */
|
||||
let eachClosingMarkerNode
|
||||
|
||||
let eachBlockIterableExpression, eachBlockItemExpression;
|
||||
|
||||
|
||||
/** @type {Node | undefined} */
|
||||
let ifOpeningMarkerNode
|
||||
/** @type {Node | undefined} */
|
||||
let ifElseMarkerNode
|
||||
/** @type {Node | undefined} */
|
||||
let ifClosingMarkerNode
|
||||
|
||||
let ifBlockConditionExpression
|
||||
// Traverse "in document order"
|
||||
|
||||
// @ts-ignore
|
||||
traverse(rootElement, currentNode => {
|
||||
//console.log('currentlyUnclosedBlocks', currentlyUnclosedBlocks)
|
||||
const insideAnOpenBlock = currentlyOpenBlocks.length >= 1
|
||||
|
||||
if(currentNode.nodeType === Node.TEXT_NODE){
|
||||
const text = currentNode.textContent || ''
|
||||
|
||||
/**
|
||||
* looking for {#each x as y}
|
||||
*/
|
||||
const eachStartMatch = text.match(eachStartMarkerRegex);
|
||||
|
||||
if(eachStartMatch){
|
||||
//console.log('startMatch', startMatch)
|
||||
|
||||
currentlyOpenBlocks.push(EACH)
|
||||
|
||||
if(insideAnOpenBlock){
|
||||
// do nothing
|
||||
}
|
||||
else{
|
||||
let [_, _iterableExpression, _itemExpression] = eachStartMatch
|
||||
|
||||
eachBlockIterableExpression = _iterableExpression
|
||||
eachBlockItemExpression = _itemExpression
|
||||
eachOpeningMarkerNode = currentNode
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Looking for {/each}
|
||||
*/
|
||||
const isEachClosingBlock = text.includes(eachClosingBlockString)
|
||||
|
||||
if(isEachClosingBlock){
|
||||
|
||||
//console.log('isEachClosingBlock', isEachClosingBlock)
|
||||
|
||||
if(!eachOpeningMarkerNode)
|
||||
throw new Error(`{/each} found without corresponding opening {#each x as y}`)
|
||||
|
||||
if(currentlyOpenBlocks.at(-1) !== EACH)
|
||||
throw new Error(`{/each} found while the last opened block was not an opening {#each x as y}`)
|
||||
|
||||
if(currentlyOpenBlocks.length === 1){
|
||||
eachClosingMarkerNode = currentNode
|
||||
|
||||
// found an {#each} and its corresponding {/each}
|
||||
// execute replacement loop
|
||||
fillEachBlock(eachOpeningMarkerNode, eachBlockIterableExpression, eachBlockItemExpression, eachClosingMarkerNode, compartment)
|
||||
|
||||
eachOpeningMarkerNode = undefined
|
||||
eachBlockIterableExpression = undefined
|
||||
eachBlockItemExpression = undefined
|
||||
eachClosingMarkerNode = undefined
|
||||
}
|
||||
else{
|
||||
// ignore because it will be treated as part of the outer {#each}
|
||||
}
|
||||
|
||||
currentlyOpenBlocks.pop()
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Looking for {#if ...}
|
||||
*/
|
||||
const ifStartMatch = text.match(ifStartRegex);
|
||||
|
||||
if(ifStartMatch){
|
||||
currentlyOpenBlocks.push(IF)
|
||||
|
||||
if(insideAnOpenBlock){
|
||||
// do nothing because the marker is too deep
|
||||
}
|
||||
else{
|
||||
let [_, _ifBlockConditionExpression] = ifStartMatch
|
||||
|
||||
ifBlockConditionExpression = _ifBlockConditionExpression
|
||||
ifOpeningMarkerNode = currentNode
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Looking for {:else}
|
||||
*/
|
||||
const hasElseMarker = text.includes(elseMarker);
|
||||
|
||||
if(hasElseMarker){
|
||||
if(!insideAnOpenBlock)
|
||||
throw new Error('{:else} without a corresponding {#if}')
|
||||
|
||||
if(currentlyOpenBlocks.length === 1){
|
||||
if(currentlyOpenBlocks[0] === IF){
|
||||
ifElseMarkerNode = currentNode
|
||||
}
|
||||
else
|
||||
throw new Error('{:else} inside an {#each} but without a corresponding {#if}')
|
||||
}
|
||||
else{
|
||||
// do nothing because the marker is too deep
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Looking for {/if}
|
||||
*/
|
||||
const hasClosingMarker = text.includes(closingIfMarker);
|
||||
|
||||
if(hasClosingMarker){
|
||||
if(!insideAnOpenBlock)
|
||||
throw new Error('{/if} without a corresponding {#if}')
|
||||
|
||||
if(currentlyOpenBlocks.length === 1){
|
||||
if(currentlyOpenBlocks[0] === IF){
|
||||
ifClosingMarkerNode = currentNode
|
||||
|
||||
// found an {#if} and its corresponding {/if}
|
||||
// execute replacement loop
|
||||
fillIfBlock(ifOpeningMarkerNode, ifElseMarkerNode, ifClosingMarkerNode, ifBlockConditionExpression, compartment)
|
||||
|
||||
ifOpeningMarkerNode = undefined
|
||||
ifElseMarkerNode = undefined
|
||||
ifClosingMarkerNode = undefined
|
||||
ifBlockConditionExpression = undefined
|
||||
}
|
||||
else
|
||||
throw new Error('{/if} inside an {#each} but without a corresponding {#if}')
|
||||
}
|
||||
else{
|
||||
// do nothing because the marker is too deep
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Looking for variables for substitutions
|
||||
*/
|
||||
if(!insideAnOpenBlock){
|
||||
// @ts-ignore
|
||||
if (currentNode.data) {
|
||||
// @ts-ignore
|
||||
const placesToFill = findPlacesToFillInString(currentNode.data, compartment)
|
||||
|
||||
if(placesToFill){
|
||||
const newText = placesToFill.fill()
|
||||
// @ts-ignore
|
||||
const newTextNode = currentNode.ownerDocument?.createTextNode(newText)
|
||||
// @ts-ignore
|
||||
currentNode.parentNode?.replaceChild(newTextNode, currentNode)
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
// ignore because it will be treated as part of the outer {#each} block
|
||||
}
|
||||
}
|
||||
|
||||
if(currentNode.nodeType === Node.ATTRIBUTE_NODE){
|
||||
// Looking for variables for substitutions
|
||||
if(!insideAnOpenBlock){
|
||||
// @ts-ignore
|
||||
if (currentNode.value) {
|
||||
// @ts-ignore
|
||||
const placesToFill = findPlacesToFillInString(currentNode.value, compartment)
|
||||
if(placesToFill){
|
||||
// @ts-ignore
|
||||
currentNode.value = placesToFill.fill()
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
// ignore because it will be treated as part of the {#each} block
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {Element | DocumentFragment} rootElement
|
||||
* @param {any} data
|
||||
* @param {typeof Node} Node
|
||||
* @param {Document} document
|
||||
* @param {Compartment} compartment
|
||||
* @returns {void}
|
||||
*/
|
||||
function fillTemplatedOdtElement(rootElement, data, Node){
|
||||
//console.log('fillTemplatedOdtElement', rootElement.nodeType, rootElement.nodeName)
|
||||
function fillTemplatedOdtDocument(document, compartment){
|
||||
|
||||
// prepare tree to be used as template
|
||||
// Perform a first traverse to split textnodes when they contain several block markers
|
||||
traverse(rootElement, currentNode => {
|
||||
traverse(document, currentNode => {
|
||||
if(currentNode.nodeType === Node.TEXT_NODE){
|
||||
// trouver tous les débuts et fin de each et découper le textNode
|
||||
|
||||
let remainingText = currentNode.textContent || ''
|
||||
|
||||
while(remainingText.length >= 1){
|
||||
let match;
|
||||
let matchText;
|
||||
let matchIndex;
|
||||
|
||||
// looking for opening {#each ...} block
|
||||
const eachBlockOpeningRegex = /{#each\s+([^}]+?)\s+as\s+([^}]+?)\s*}/;
|
||||
const eachBlockClosingRegex = /{\/each}/;
|
||||
// looking for a block marker
|
||||
for(const marker of [ifStartRegex, elseMarker, closingIfMarker, eachStartMarkerRegex, eachClosingBlockString]){
|
||||
if(typeof marker === 'string'){
|
||||
const index = remainingText.indexOf(marker)
|
||||
|
||||
for(const regexp of [eachBlockOpeningRegex, eachBlockClosingRegex]){
|
||||
let thisMatch = remainingText.match(regexp)
|
||||
if(index !== -1){
|
||||
matchText = marker
|
||||
matchIndex = index
|
||||
|
||||
// trying to find only the first match in remainingText string
|
||||
if(thisMatch && (!match || match.index > thisMatch.index)){
|
||||
match = thisMatch
|
||||
// found the first match
|
||||
break; // get out of loop
|
||||
}
|
||||
}
|
||||
else{
|
||||
// marker is a RegExp
|
||||
const match = remainingText.match(marker)
|
||||
|
||||
if(match){
|
||||
matchText = match[0]
|
||||
matchIndex = match.index
|
||||
|
||||
// found the first match
|
||||
break; // get out of loop
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(match){
|
||||
if(matchText){
|
||||
// split 3-way : before-match, match and after-match
|
||||
|
||||
if(match[0].length < remainingText.length){
|
||||
let afterMatchTextNode = currentNode.splitText(match.index + match[0].length)
|
||||
if(matchText.length < remainingText.length){
|
||||
// @ts-ignore
|
||||
let afterMatchTextNode = currentNode.splitText(matchIndex + matchText.length)
|
||||
if(afterMatchTextNode.textContent && afterMatchTextNode.textContent.length >= 1){
|
||||
remainingText = afterMatchTextNode.textContent
|
||||
}
|
||||
@ -265,8 +578,10 @@ function fillTemplatedOdtElement(rootElement, data, Node){
|
||||
|
||||
// per spec, currentNode now contains before-match and match text
|
||||
|
||||
if(match.index > 0){
|
||||
currentNode.splitText(match.index)
|
||||
// @ts-ignore
|
||||
if(matchIndex > 0){
|
||||
// @ts-ignore
|
||||
currentNode.splitText(matchIndex)
|
||||
}
|
||||
|
||||
if(afterMatchTextNode){
|
||||
@ -290,107 +605,12 @@ function fillTemplatedOdtElement(rootElement, data, Node){
|
||||
|
||||
// now, each Node contains at most one block marker
|
||||
|
||||
|
||||
|
||||
/** @type {Node | undefined} */
|
||||
let eachBlockStartNode
|
||||
/** @type {Node | undefined} */
|
||||
let eachBlockEndNode
|
||||
|
||||
let nestedEach = 0
|
||||
|
||||
let iterableExpression, itemExpression;
|
||||
|
||||
// Traverse "in document order"
|
||||
|
||||
// @ts-ignore
|
||||
traverse(rootElement, currentNode => {
|
||||
const insideAnEachBlock = !!eachBlockStartNode
|
||||
|
||||
if(currentNode.nodeType === Node.TEXT_NODE){
|
||||
const text = currentNode.textContent || ''
|
||||
|
||||
// looking for {#each x as y}
|
||||
const eachStartRegex = /{#each\s+([^}]+?)\s+as\s+([^}]+?)\s*}/;
|
||||
const startMatch = text.match(eachStartRegex);
|
||||
|
||||
if(startMatch){
|
||||
if(insideAnEachBlock){
|
||||
nestedEach = nestedEach + 1
|
||||
}
|
||||
else{
|
||||
let [_, _iterableExpression, _itemExpression] = startMatch
|
||||
|
||||
iterableExpression = _iterableExpression
|
||||
itemExpression = _itemExpression
|
||||
eachBlockStartNode = currentNode
|
||||
}
|
||||
}
|
||||
|
||||
// trying to find an {/each}
|
||||
const eachEndRegex = /{\/each}/
|
||||
const endMatch = text.match(eachEndRegex)
|
||||
|
||||
if(endMatch){
|
||||
if(!eachBlockStartNode)
|
||||
throw new TypeError(`{/each} found without corresponding opening {#each x as y}`)
|
||||
|
||||
if(nestedEach >= 1){
|
||||
// ignore because it will be treated as part of the outer {#each}
|
||||
nestedEach = nestedEach - 1
|
||||
}
|
||||
else{
|
||||
eachBlockEndNode = currentNode
|
||||
|
||||
// found an #each and its corresponding /each
|
||||
// execute replacement loop
|
||||
fillEachBlock(eachBlockStartNode, iterableExpression, itemExpression, eachBlockEndNode, data, Node)
|
||||
|
||||
eachBlockStartNode = undefined
|
||||
iterableExpression = undefined
|
||||
itemExpression = undefined
|
||||
eachBlockEndNode = undefined
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Looking for variables for substitutions
|
||||
if(!insideAnEachBlock){
|
||||
if (currentNode.data) {
|
||||
const placesToFill = findPlacesToFillInString(currentNode.data)
|
||||
|
||||
if(placesToFill){
|
||||
const newText = placesToFill.fill(data)
|
||||
const newTextNode = currentNode.ownerDocument?.createTextNode(newText)
|
||||
currentNode.parentNode?.replaceChild(newTextNode, currentNode)
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
// ignore because it will be treated as part of the {#each} block
|
||||
}
|
||||
}
|
||||
|
||||
if(currentNode.nodeType === Node.ATTRIBUTE_NODE){
|
||||
// Looking for variables for substitutions
|
||||
if(!insideAnEachBlock){
|
||||
if (currentNode.value) {
|
||||
const placesToFill = findPlacesToFillInString(currentNode.value)
|
||||
if(placesToFill){
|
||||
currentNode.value = placesToFill.fill(data)
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
// ignore because it will be treated as part of the {#each} block
|
||||
}
|
||||
}
|
||||
})
|
||||
fillTemplatedOdtElement(document, compartment)
|
||||
}
|
||||
|
||||
|
||||
const keptFiles = new Set(['content.xml', 'styles.xml', 'mimetype', 'META-INF/manifest.xml'])
|
||||
|
||||
const keptFiles = new Set(['content.xml', 'styles.xml', 'mimetype', 'META-INF/manifest.xml'])
|
||||
|
||||
/**
|
||||
*
|
||||
@ -454,7 +674,14 @@ export default async function fillOdtTemplate(odtTemplate, data) {
|
||||
// @ts-ignore
|
||||
const contentXml = await entry.getData(new TextWriter());
|
||||
const contentDocument = parseXML(contentXml);
|
||||
fillTemplatedOdtElement(contentDocument, data, Node)
|
||||
|
||||
const compartment = new Compartment({
|
||||
globals: data,
|
||||
__options__: true
|
||||
})
|
||||
|
||||
fillTemplatedOdtDocument(contentDocument, compartment)
|
||||
|
||||
const updatedContentXml = serializeToString(contentDocument)
|
||||
|
||||
content = new TextReader(updatedContentXml)
|
||||
|
||||
36
tests/fill-odt-template/basic.js
Normal file
36
tests/fill-odt-template/basic.js
Normal file
@ -0,0 +1,36 @@
|
||||
import test from 'ava';
|
||||
import {join} from 'node:path';
|
||||
|
||||
import {getOdtTemplate} from '../../scripts/odf/odtTemplate-forNode.js'
|
||||
|
||||
import {fillOdtTemplate, getOdtTextContent} from '../../exports.js'
|
||||
|
||||
|
||||
test('basic template filling with variable substitution', async t => {
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/template-anniversaire.odt')
|
||||
const templateContent = `Yo {nom} !
|
||||
Tu es né.e le {dateNaissance}
|
||||
|
||||
Bonjoir ☀️
|
||||
`
|
||||
|
||||
const data = {
|
||||
nom: 'David Bruant',
|
||||
dateNaissance: '8 mars 1987'
|
||||
}
|
||||
|
||||
const odtTemplate = await getOdtTemplate(templatePath)
|
||||
const templateTextContent = await getOdtTextContent(odtTemplate)
|
||||
t.deepEqual(templateTextContent, templateContent, 'reconnaissance du template')
|
||||
|
||||
const odtResult = await fillOdtTemplate(odtTemplate, data)
|
||||
|
||||
const odtResultTextContent = await getOdtTextContent(odtResult)
|
||||
t.deepEqual(odtResultTextContent, `Yo David Bruant !
|
||||
Tu es né.e le 8 mars 1987
|
||||
|
||||
Bonjoir ☀️
|
||||
`)
|
||||
|
||||
});
|
||||
|
||||
@ -1,43 +1,13 @@
|
||||
import test from 'ava';
|
||||
import {join} from 'node:path';
|
||||
|
||||
import {getOdtTemplate} from '../scripts/odf/odtTemplate-forNode.js'
|
||||
import {getOdtTemplate} from '../../scripts/odf/odtTemplate-forNode.js'
|
||||
|
||||
import {fillOdtTemplate, getOdtTextContent} from '../exports.js'
|
||||
import { listZipEntries } from './helpers/zip-analysis.js';
|
||||
|
||||
|
||||
test('basic template filling with variable substitution', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/template-anniversaire.odt')
|
||||
const templateContent = `Yo {nom} !
|
||||
Tu es né.e le {dateNaissance}
|
||||
|
||||
Bonjoir ☀️
|
||||
`
|
||||
|
||||
const data = {
|
||||
nom: 'David Bruant',
|
||||
dateNaissance: '8 mars 1987'
|
||||
}
|
||||
|
||||
const odtTemplate = await getOdtTemplate(templatePath)
|
||||
const templateTextContent = await getOdtTextContent(odtTemplate)
|
||||
t.deepEqual(templateTextContent, templateContent, 'reconnaissance du template')
|
||||
|
||||
const odtResult = await fillOdtTemplate(odtTemplate, data)
|
||||
|
||||
const odtResultTextContent = await getOdtTextContent(odtResult)
|
||||
t.deepEqual(odtResultTextContent, `Yo David Bruant !
|
||||
Tu es né.e le 8 mars 1987
|
||||
|
||||
Bonjoir ☀️
|
||||
`)
|
||||
|
||||
});
|
||||
import {fillOdtTemplate, getOdtTextContent} from '../../exports.js'
|
||||
|
||||
|
||||
test('basic template filling with {#each}', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/enum-courses.odt')
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/enum-courses.odt')
|
||||
const templateContent = `🧺 La liste de courses incroyable 🧺
|
||||
|
||||
{#each listeCourses as élément}
|
||||
@ -74,7 +44,7 @@ Pâtes à lasagne (fraîches !)
|
||||
|
||||
|
||||
test('Filling with {#each} and non-iterable value results in no error and empty result', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/enum-courses.odt')
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/enum-courses.odt')
|
||||
const templateContent = `🧺 La liste de courses incroyable 🧺
|
||||
|
||||
{#each listeCourses as élément}
|
||||
@ -104,7 +74,7 @@ test('Filling with {#each} and non-iterable value results in no error and empty
|
||||
|
||||
|
||||
test('template filling with {#each} generating a list', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/liste-courses.odt')
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/liste-courses.odt')
|
||||
const templateContent = `🧺 La liste de courses incroyable 🧺
|
||||
|
||||
- {#each listeCourses as élément}
|
||||
@ -141,7 +111,7 @@ test('template filling with {#each} generating a list', async t => {
|
||||
|
||||
|
||||
test('template filling with 2 sequential {#each}', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/liste-fruits-et-légumes.odt')
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/liste-fruits-et-légumes.odt')
|
||||
const templateContent = `Liste de fruits et légumes
|
||||
|
||||
Fruits
|
||||
@ -193,7 +163,7 @@ Poivron 🫑
|
||||
|
||||
|
||||
test('template filling with nested {#each}s', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/légumes-de-saison.odt')
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/légumes-de-saison.odt')
|
||||
const templateContent = `Légumes de saison
|
||||
|
||||
{#each légumesSaison as saisonLégumes}
|
||||
@ -277,36 +247,8 @@ Hiver
|
||||
});
|
||||
|
||||
|
||||
test('template filling {#each ...}{/each} within a single text node', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/liste-nombres.odt')
|
||||
const templateContent = `Liste de nombres
|
||||
|
||||
Les nombres : {#each nombres as n}{n} {/each} !!
|
||||
`
|
||||
|
||||
const data = {
|
||||
nombres : [1,1,2,3,5,8,13,21]
|
||||
}
|
||||
|
||||
const odtTemplate = await getOdtTemplate(templatePath)
|
||||
|
||||
const templateTextContent = await getOdtTextContent(odtTemplate)
|
||||
t.deepEqual(templateTextContent, templateContent, 'reconnaissance du template')
|
||||
|
||||
const odtResult = await fillOdtTemplate(odtTemplate, data)
|
||||
|
||||
const odtResultTextContent = await getOdtTextContent(odtResult)
|
||||
t.deepEqual(odtResultTextContent, `Liste de nombres
|
||||
|
||||
Les nombres : 1 1 2 3 5 8 13 21 !!
|
||||
`)
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
test('template filling of a table', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/tableau-simple.odt')
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/tableau-simple.odt')
|
||||
const templateContent = `Évolution énergie en kWh par personne en France
|
||||
|
||||
Année
|
||||
@ -364,34 +306,3 @@ Année
|
||||
`.trim())
|
||||
|
||||
});
|
||||
|
||||
|
||||
test('template filling preserves images', async t => {
|
||||
const templatePath = join(import.meta.dirname, './fixtures/template-avec-image.odt')
|
||||
|
||||
const data = {
|
||||
commentaire : `J'adooooooore 🤩 West covinaaaaaaaaaaa 🎶`
|
||||
}
|
||||
|
||||
const odtTemplate = await getOdtTemplate(templatePath)
|
||||
const templateEntries = await listZipEntries(odtTemplate)
|
||||
|
||||
//console.log('templateEntries', templateEntries.map(({filename, directory}) => ({filename, directory})))
|
||||
|
||||
t.assert(
|
||||
templateEntries.find(entry => entry.filename.startsWith('Pictures/')),
|
||||
`One zip entry of the template is expected to have a name that starts with 'Pictures/'`
|
||||
)
|
||||
|
||||
const odtResult = await fillOdtTemplate(odtTemplate, data)
|
||||
const resultEntries = await listZipEntries(odtResult)
|
||||
|
||||
//console.log('resultEntries', resultEntries.map(({filename, directory}) => ({filename, directory})))
|
||||
|
||||
|
||||
t.assert(
|
||||
resultEntries.find(entry => entry.filename.startsWith('Pictures/')),
|
||||
`One zip entry of the result is expected to have a name that starts with 'Pictures/'`
|
||||
)
|
||||
|
||||
})
|
||||
42
tests/fill-odt-template/if.js
Normal file
42
tests/fill-odt-template/if.js
Normal file
@ -0,0 +1,42 @@
|
||||
import test from 'ava';
|
||||
import {join} from 'node:path';
|
||||
|
||||
import {getOdtTemplate} from '../../scripts/odf/odtTemplate-forNode.js'
|
||||
|
||||
import {fillOdtTemplate, getOdtTextContent} from '../../exports.js'
|
||||
|
||||
|
||||
test('basic template filling with {#if}', async t => {
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/description-nombre.odt')
|
||||
const templateContent = `Description du nombre {n}
|
||||
|
||||
{#if n<5}
|
||||
n est un petit nombre
|
||||
{:else}
|
||||
n est un grand nombre
|
||||
{/if}
|
||||
`
|
||||
|
||||
const odtTemplate = await getOdtTemplate(templatePath)
|
||||
const templateTextContent = await getOdtTextContent(odtTemplate)
|
||||
t.deepEqual(templateTextContent, templateContent, 'reconnaissance du template')
|
||||
|
||||
// then branch
|
||||
const odtResult3 = await fillOdtTemplate(odtTemplate, {n: 3})
|
||||
const odtResult3TextContent = await getOdtTextContent(odtResult3)
|
||||
t.deepEqual(odtResult3TextContent, `Description du nombre 3
|
||||
|
||||
n est un petit nombre
|
||||
`)
|
||||
|
||||
// else branch
|
||||
const odtResult8 = await fillOdtTemplate(odtTemplate, {n: 8})
|
||||
const odtResult8TextContent = await getOdtTextContent(odtResult8)
|
||||
t.deepEqual(odtResult8TextContent, `Description du nombre 8
|
||||
|
||||
n est un grand nombre
|
||||
`)
|
||||
|
||||
|
||||
});
|
||||
|
||||
38
tests/fill-odt-template/image.js
Normal file
38
tests/fill-odt-template/image.js
Normal file
@ -0,0 +1,38 @@
|
||||
import test from 'ava';
|
||||
import {join} from 'node:path';
|
||||
|
||||
import {getOdtTemplate} from '../../scripts/odf/odtTemplate-forNode.js'
|
||||
|
||||
import {fillOdtTemplate} from '../../exports.js'
|
||||
import { listZipEntries } from '../helpers/zip-analysis.js';
|
||||
|
||||
|
||||
test('template filling preserves images', async t => {
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/template-avec-image.odt')
|
||||
|
||||
const data = {
|
||||
commentaire : `J'adooooooore 🤩 West covinaaaaaaaaaaa 🎶`
|
||||
}
|
||||
|
||||
const odtTemplate = await getOdtTemplate(templatePath)
|
||||
const templateEntries = await listZipEntries(odtTemplate)
|
||||
|
||||
//console.log('templateEntries', templateEntries.map(({filename, directory}) => ({filename, directory})))
|
||||
|
||||
t.assert(
|
||||
templateEntries.find(entry => entry.filename.startsWith('Pictures/')),
|
||||
`One zip entry of the template is expected to have a name that starts with 'Pictures/'`
|
||||
)
|
||||
|
||||
const odtResult = await fillOdtTemplate(odtTemplate, data)
|
||||
const resultEntries = await listZipEntries(odtResult)
|
||||
|
||||
//console.log('resultEntries', resultEntries.map(({filename, directory}) => ({filename, directory})))
|
||||
|
||||
|
||||
t.assert(
|
||||
resultEntries.find(entry => entry.filename.startsWith('Pictures/')),
|
||||
`One zip entry of the result is expected to have a name that starts with 'Pictures/'`
|
||||
)
|
||||
|
||||
})
|
||||
65
tests/fill-odt-template/in-text-node.js
Normal file
65
tests/fill-odt-template/in-text-node.js
Normal file
@ -0,0 +1,65 @@
|
||||
import test from 'ava';
|
||||
import {join} from 'node:path';
|
||||
|
||||
import {getOdtTemplate} from '../../scripts/odf/odtTemplate-forNode.js'
|
||||
|
||||
import {fillOdtTemplate, getOdtTextContent} from '../../exports.js'
|
||||
|
||||
|
||||
test('template filling {#if ...}{/if} within a single text node', async t => {
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/inline-if-nombres.odt')
|
||||
const templateContent = `Taille de nombre
|
||||
|
||||
Le nombre {n} est {#if n<5}petit{:else}grand{/if}.
|
||||
`
|
||||
|
||||
const odtTemplate = await getOdtTemplate(templatePath)
|
||||
|
||||
const templateTextContent = await getOdtTextContent(odtTemplate)
|
||||
t.deepEqual(templateTextContent, templateContent, 'reconnaissance du template')
|
||||
|
||||
const odtResult3 = await fillOdtTemplate(odtTemplate, {n : 3})
|
||||
|
||||
const odtResult3TextContent = await getOdtTextContent(odtResult3)
|
||||
t.deepEqual(odtResult3TextContent, `Taille de nombre
|
||||
|
||||
Le nombre 3 est petit.
|
||||
`)
|
||||
|
||||
const odtResult9 = await fillOdtTemplate(odtTemplate, {n : 9})
|
||||
|
||||
const odtResult9TextContent = await getOdtTextContent(odtResult9)
|
||||
t.deepEqual(odtResult9TextContent, `Taille de nombre
|
||||
|
||||
Le nombre 9 est grand.
|
||||
`)
|
||||
|
||||
});
|
||||
|
||||
|
||||
test('template filling {#each ...}{/each} within a single text node', async t => {
|
||||
const templatePath = join(import.meta.dirname, '../fixtures/liste-nombres.odt')
|
||||
const templateContent = `Liste de nombres
|
||||
|
||||
Les nombres : {#each nombres as n}{n} {/each} !!
|
||||
`
|
||||
|
||||
const data = {
|
||||
nombres : [1,1,2,3,5,8,13,21]
|
||||
}
|
||||
|
||||
const odtTemplate = await getOdtTemplate(templatePath)
|
||||
|
||||
const templateTextContent = await getOdtTextContent(odtTemplate)
|
||||
t.deepEqual(templateTextContent, templateContent, 'reconnaissance du template')
|
||||
|
||||
const odtResult = await fillOdtTemplate(odtTemplate, data)
|
||||
|
||||
const odtResultTextContent = await getOdtTextContent(odtResult)
|
||||
t.deepEqual(odtResultTextContent, `Liste de nombres
|
||||
|
||||
Les nombres : 1 1 2 3 5 8 13 21 !!
|
||||
`)
|
||||
|
||||
});
|
||||
|
||||
BIN
tests/fixtures/description-nombre.odt
vendored
Normal file
BIN
tests/fixtures/description-nombre.odt
vendored
Normal file
Binary file not shown.
BIN
tests/fixtures/inline-if-nombres.odt
vendored
Normal file
BIN
tests/fixtures/inline-if-nombres.odt
vendored
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user