Skip to content
This repository has been archived by the owner on Nov 29, 2023. It is now read-only.

Commit

Permalink
Prepare to release 2.1.4 (#151)
Browse files Browse the repository at this point in the history
  • Loading branch information
@eyelidlessness
eyelidlessness committed May 4, 2022
1 parent c6dbb45 commit 7976c11
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 51 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [2.1.4] - 2022-05-04

##### Changed

- Fixed mangling of markdown-produced HTML next to top-level text nodes when a mediamap is provided (#150)

## [2.1.3] - 2022-04-21

##### Changed
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![coverage-shield-badge-1](https://img.shields.io/badge/coverage-97.85%25-brightgreen.svg)
![coverage-shield-badge-1](https://img.shields.io/badge/coverage-98.31%25-brightgreen.svg)
[![npm version](https://badge.fury.io/js/enketo-transformer.svg)](http://badge.fury.io/js/enketo-transformer) [![Build Status](https://travis-ci.org/enketo/enketo-transformer.svg?branch=master)](https://travis-ci.org/enketo/enketo-transformer) [![Dependency Status](https://david-dm.org/enketo/enketo-transformer.svg)](https://david-dm.org/enketo/enketo-transformer)

# Enketo Transformer
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h3> </h3>


<section class="readme usertext">
<article><p><img src="https://img.shields.io/badge/coverage-97.85%25-brightgreen.svg" alt="coverage-shield-badge-1">
<article><p><img src="https://img.shields.io/badge/coverage-98.31%25-brightgreen.svg" alt="coverage-shield-badge-1">
<a href="http://badge.fury.io/js/enketo-transformer"><img src="https://badge.fury.io/js/enketo-transformer.svg" alt="npm version"></a> <a href="https://travis-ci.org/enketo/enketo-transformer"><img src="https://travis-ci.org/enketo/enketo-transformer.svg?branch=master" alt="Build Status"></a> <a href="https://david-dm.org/enketo/enketo-transformer"><img src="https://david-dm.org/enketo/enketo-transformer.svg" alt="Dependency Status"></a></p>
<h1 id="enketo-transformer">Enketo Transformer</h1>
<p>NodeJS library that transforms OpenRosa/ODK XForms into a format the Enketo understands. It works both as a library module, as well as a standalone app.</p>
Expand Down
26 changes: 13 additions & 13 deletions docs/module-transformer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ <h4 class="name" id="~_addInstanceIdNodeIfMissing"><span class="type-signature">

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line430">line 430</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line434">line 434</a>
</li></ul></dd>


Expand Down Expand Up @@ -566,7 +566,7 @@ <h4 class="name" id="~_correctAction"><span class="type-signature">(inner) </spa

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line205">line 205</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line209">line 209</a>
</li></ul></dd>


Expand Down Expand Up @@ -763,7 +763,7 @@ <h4 class="name" id="~_docToString"><span class="type-signature">(inner) </span>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line536">line 536</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line543">line 543</a>
</li></ul></dd>


Expand Down Expand Up @@ -917,7 +917,7 @@ <h4 class="name" id="~_getLanguageSampleText"><span class="type-signature">(inne

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line407">line 407</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line411">line 411</a>
</li></ul></dd>


Expand Down Expand Up @@ -1098,7 +1098,7 @@ <h4 class="name" id="~_getVersion"><span class="type-signature">(inner) </span>_

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line546">line 546</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line553">line 553</a>
</li></ul></dd>


Expand Down Expand Up @@ -1207,7 +1207,7 @@ <h4 class="name" id="~_md5"><span class="type-signature">(inner) </span>_md5<spa

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line556">line 556</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line563">line 563</a>
</li></ul></dd>


Expand Down Expand Up @@ -1368,7 +1368,7 @@ <h4 class="name" id="~_parseXml"><span class="type-signature">(inner) </span>_pa

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line251">line 251</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line255">line 255</a>
</li></ul></dd>


Expand Down Expand Up @@ -1526,7 +1526,7 @@ <h4 class="name" id="~_processBinaryDefaults"><span class="type-signature">(inne

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line166">line 166</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line170">line 170</a>
</li></ul></dd>


Expand Down Expand Up @@ -1723,7 +1723,7 @@ <h4 class="name" id="~_renderMarkdown"><span class="type-signature">(inner) </sp

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line464">line 464</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line468">line 468</a>
</li></ul></dd>


Expand Down Expand Up @@ -1924,7 +1924,7 @@ <h4 class="name" id="~_replaceLanguageTags"><span class="type-signature">(inner)

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line333">line 333</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line337">line 337</a>
</li></ul></dd>


Expand Down Expand Up @@ -2113,7 +2113,7 @@ <h4 class="name" id="~_replaceMediaSources"><span class="type-signature">(inner)

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line297">line 297</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line301">line 301</a>
</li></ul></dd>


Expand Down Expand Up @@ -2314,7 +2314,7 @@ <h4 class="name" id="~_replaceTheme"><span class="type-signature">(inner) </span

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line271">line 271</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line275">line 275</a>
</li></ul></dd>


Expand Down Expand Up @@ -2495,7 +2495,7 @@ <h4 class="name" id="~_transform"><span class="type-signature">(inner) </span>_t

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line141">line 141</a>
<a href="transformer.js.html">transformer.js</a>, <a href="transformer.js.html#line145">line 145</a>
</li></ul></dd>


Expand Down
29 changes: 18 additions & 11 deletions docs/transformer.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,15 @@ <h1 class="page-title">transformer.js</h1>
}
: {};

const mediaMap = Object.fromEntries(
Object.entries(survey.media || {}).map((entry) =>
entry.map(escapeURLPath)
)
);
let mediaMap = null;

if (survey.media) {
mediaMap = Object.fromEntries(
Object.entries(survey.media).map((entry) =>
entry.map(escapeURLPath)
)
);
}

return _parseXml(survey.xform)
.then((doc) => {
Expand Down Expand Up @@ -547,12 +551,15 @@ <h1 class="page-title">transformer.js</h1>

if (original !== rendered) {
if (mediaMap != null) {
const fragment = libxmljs.parseHtmlFragment(rendered);

rendered = _replaceMediaSources(
fragment,
mediaMap
).toString(false);
const fragment = libxmljs.parseHtmlFragment(
`&lt;div class="temporary-root">${rendered}&lt;/div>`
);

rendered = _replaceMediaSources(fragment, mediaMap)
.root()
.childNodes()
.map((node) => node.toString(false))
.join('');
}

key = `$$$${index}`;
Expand Down
38 changes: 16 additions & 22 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "enketo-transformer",
"version": "2.1.3",
"version": "2.1.4",
"description": "Library/app that transforms ODK-compliant XForms into a format that Enketo can consume",
"license": "Apache-2.0",
"main": "src/transformer.js",
Expand Down Expand Up @@ -62,7 +62,7 @@
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.4.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-unicorn": "^36.0.0",
"grunt": "^1.5.2",
"http-server": "^13.1.0",
Expand All @@ -71,7 +71,7 @@
"jsdoc-plugin-typescript": "^2.0.7",
"markdown-eslint-parser": "^1.2.1",
"mocha": "^9.2.2",
"nodemon": "^2.0.15",
"nodemon": "^2.0.16",
"nyc": "^15.1.0",
"prettier": "^2.6.2",
"rimraf": "^3.0.2"
Expand Down

0 comments on commit 7976c11

Please sign in to comment.