commonform-docx 9.2.0 → 9.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "commonform-docx",
   "description": "render Common Forms in Office Open XML (Microsoft Word .docx format)",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "author": "Kyle E. Mitchell <kyle@kemitchell.com> (http://kemitchell.com)",
   "bin": "bin.js",
   "dependencies": {

package/templates/hyperlink.js

@@ -0,0 +1,6 @@
+const escape = require('../escape')
+
+module.exports = (options, url) => {
+  const rId = options.rIdForHREF(url)
+  return `<w:hyperlink r:id="${rId}"><w:r><w:rPr><w:color w:val="0000EE"/><w:u w:val="single"/></w:rPr><w:t>${escape(url)}</w:t></w:r></w:hyperlink>`
+}

package/templates/paragraph.js

@@ -1,5 +1,6 @@
 const escape = require('../escape')
 const has = require('has')
+const hyperlink = require('./hyperlink')
 const numberToWords = require('number-to-words-en')
 const run = require('./run')
 const tag = require('./tag')
@@ -113,8 +114,7 @@ module.exports = (element, options) => {
   function componentReference (component, meta) {
     const href = component.component + '/' + component.version
     const returned = [makeRun(options.incorporateComponentText + ' ')]
-    const rId = options.rIdForHREF(href)
-    const link = '<w:hyperlink r:id="' + rId + '" w:history="1"><w:r><w:rPr><w:color w:val="0000EE"/><w:u w:val="single"/></w:rPr><w:t>' + escape(href) + '</w:t></w:r></w:hyperlink>'
+    const link = hyperlink(options, href)
     if (meta) {
       returned.push(
         makeRun(meta.publisher + ' ' + meta.name + ' Version ' + meta.version + ' ('),

package/templates/run.js

@@ -1,5 +1,6 @@
 const escape = require('../escape')
 const has = require('has')
+const hyperlink = require('./hyperlink')
 const tag = require('./tag')
 
 const defaults = {
@@ -84,9 +85,7 @@ module.exports = function run (element, conspicuous, options) {
       )
     }
   } else if (has(element, 'link')) {
-    const url = element.link
-    const rId = options.rIdForHREF(url)
-    return '<w:hyperlink r:id="' + rId + '"><w:r><w:rPr><w:rStyle w:val="Hyperlink"/></w:rPr><w:t>' + escape(url) + '</w:t></w:r></w:hyperlink>'
+    return hyperlink(options, element.link)
   } else {
     throw new Error('Invalid type: ' + JSON.stringify(element, null, 2))
   }

package/test.log

@@ -1,13 +1,13 @@
 
-> commonform-docx@9.1.1 pretest
+> commonform-docx@9.2.0 pretest
 > npm run prepublishOnly
 
 
-> commonform-docx@9.1.1 prepublishOnly
+> commonform-docx@9.2.0 prepublishOnly
 > node build/scaffold.js data/scaffold.docx > data/scaffold.json
 
 
-> commonform-docx@9.1.1 test
+> commonform-docx@9.2.0 test
 > tape test.js
 
 TAP version 13