commonform-docx 9.1.1 → 9.3.0

package/lint.log

@@ -0,0 +1,4 @@
+
+> commonform-docx@9.1.1 lint
+> standard
+

package/outdated.log

@@ -1,2 +0,0 @@
-Package             Current  Wanted  Latest  Location                         Depended by
-commonform-flatten    2.1.0   2.1.0   3.0.0  node_modules/commonform-flatten  commonform-docx

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "commonform-docx",
   "description": "render Common Forms in Office Open XML (Microsoft Word .docx format)",
-  "version": "9.1.1",
+  "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,7 +85,7 @@ module.exports = function run (element, conspicuous, options) {
       )
     }
   } else if (has(element, 'link')) {
-    text = element.link
+    return hyperlink(options, element.link)
   } else {
     throw new Error('Invalid type: ' + JSON.stringify(element, null, 2))
   }

package/test.log

@@ -0,0 +1,98 @@
+
+> commonform-docx@9.2.0 pretest
+> npm run prepublishOnly
+
+
+> commonform-docx@9.2.0 prepublishOnly
+> node build/scaffold.js data/scaffold.docx > data/scaffold.json
+
+
+> commonform-docx@9.2.0 test
+> tape test.js
+
+TAP version 13
+# renders text
+ok 1 no render error
+ok 2 no textract error
+ok 3 text appears in output
+# renders definitions
+ok 4 no render error
+ok 5 no textract error
+ok 6 defined term appears in output
+# renders uses
+ok 7 no render error
+ok 8 no textract error
+ok 9 term appears in output
+# renders references
+ok 10 no render error
+ok 11 no textract error
+ok 12 reference appears in output
+# handles components without headings
+ok 13 no render error
+# handles components with substitutions
+ok 14 no render error
+# omits period after heading ending w/ period
+ok 15 no render error
+ok 16 no textract error
+ok 17 double period does not appear in output
+# adds space between heading and defined term
+ok 18 no render error
+ok 19 no textract error
+ok 20 space between heading and term
+# adds space between heading and text
+ok 21 no render error
+ok 22 no textract error
+ok 23 space between heading and text
+# renders broken references
+ok 24 no render error
+ok 25 no textract error
+ok 26 reference appears in output
+# fills blanks
+ok 27 no render error
+ok 28 no textract error
+ok 29 value appears in output
+# custom blank text
+ok 30 no render error
+ok 31 no textract error
+ok 32 value appears in output
+# renders empty blank placeholders
+ok 33 no render error
+ok 34 no textract error
+ok 35 placeholder appears in output
+# renders custom empty blank placeholders
+ok 36 no render error
+ok 37 no textract error
+ok 38 placeholder appears in output
+# renders custom empty blank placeholders
+ok 39 no render error
+ok 40 no textract error
+ok 41 placeholder appears in output
+# renders conspicuous text
+ok 42 no render error
+ok 43 no textract error
+ok 44 conspicuous text appears in output
+# renders titles
+ok 45 no render error
+ok 46 no textract error
+ok 47 title appears in output
+# renders centered titles
+ok 48 no render error
+ok 49 no textract error
+ok 50 title appears in output
+# renders versions
+ok 51 no render error
+ok 52 no textract error
+ok 53 version appears in output
+# renders hashes
+ok 54 no render error
+ok 55 no textract error
+ok 56 hash symbol appears in output
+# throws for invalid content
+ok 57 throw an error
+
+1..57
+# tests 57
+# pass  57
+
+# ok
+