commonform-resolve
Advanced tools
Comparing version 2.0.1 to 2.1.0
@@ -0,3 +1,4 @@ | ||
var deepEqual = require('deep-equal') | ||
var has = require('has') | ||
var predicate = require('commonform-predicate') | ||
var deepEqual = require('deep-equal') | ||
var resolve | ||
@@ -22,2 +23,5 @@ | ||
return element | ||
} else if (predicate.component(element)) { | ||
element.numbering = numbering.numbering | ||
return element | ||
} else if (predicate.definition(element)) { | ||
@@ -28,3 +32,3 @@ return element | ||
// Resolvable | ||
if (headings.hasOwnProperty(heading)) { | ||
if (has(headings, heading)) { | ||
var matches = headings[heading] | ||
@@ -31,0 +35,0 @@ // Unambiguous |
var resolveElement = require('./element') | ||
var has = require('has') | ||
@@ -11,4 +12,4 @@ module.exports = function (form, path, values, numberings, headings) { | ||
numberings && | ||
numberings.hasOwnProperty('content') && | ||
numberings.content.hasOwnProperty(index) | ||
has(numberings, 'content') && | ||
has(numberings.content, index) | ||
) | ||
@@ -15,0 +16,0 @@ ? numberings.content[index] |
{ | ||
"name": "commonform-resolve", | ||
"description": "resolve definitions, uses, references, fields, and blanks", | ||
"version": "2.0.1", | ||
"version": "2.1.0", | ||
"author": "Kyle E. Mitchell <kyle@kemitchell.com> (http://kemitchell.com)", | ||
"dependencies": { | ||
"commonform-number": "^1.0.0", | ||
"commonform-number": "^1.1.0", | ||
"commonform-predicate": "^3.0.0", | ||
"deep-equal": "^1.0.1" | ||
"deep-equal": "^1.0.1", | ||
"has": "^1.0.3" | ||
}, | ||
@@ -14,3 +15,3 @@ "devDependencies": { | ||
"replace-require-self": "^1.0.0", | ||
"standard": "^12.0.1" | ||
"standard": "^13.0.2" | ||
}, | ||
@@ -17,0 +18,0 @@ "keywords": [ |
@@ -223,1 +223,38 @@ # commonform-resolve | ||
``` | ||
Attaches numberings to component objects: | ||
```javascript | ||
assert.deepStrictEqual( | ||
resolve( | ||
{ | ||
content: [ | ||
{ | ||
repository: 'commonform.org', | ||
publisher: 'test', | ||
project: 'test', | ||
edition: 'test', | ||
substitutions: { terms: {}, headings: {} } | ||
} | ||
] | ||
}, | ||
{} | ||
) | ||
.content, | ||
[ | ||
{ | ||
repository: 'commonform.org', | ||
publisher: 'test', | ||
project: 'test', | ||
edition: 'test', | ||
substitutions: { terms: {}, headings: {} }, | ||
numbering: [ | ||
{ | ||
series: { number: 1, of: 1 }, | ||
element: { number: 1, of: 1 } | ||
} | ||
] | ||
} | ||
] | ||
) | ||
``` |
9663
126
260
4
+ Addedhas@^1.0.3
+ Addedhas@1.0.4(transitive)
Updatedcommonform-number@^1.1.0