New Case Study:See how Anthropic automated 95% of dependency reviews with Socket.Learn More →
commonform-resolve
Advanced tools
commonform-resolve - npm Package Compare versions
Comparing version 0.1.2 to 0.2.1
| { | ||
| "name": "commonform-resolve", | ||
| "description": "resolve Common Form content objects", | ||
| "version": "0.1.2", | ||
| "version": "0.2.1", | ||
| "author": { | ||
@@ -11,4 +11,5 @@ "name": "Kyle E. Mitchell", | ||
| "dependencies": { | ||
| "commonform-group-series": "0.1.x", | ||
| "commonform-validate": "0.1.x" | ||
| "commonform-group-series": "0.2.x", | ||
| "commonform-predicate": "^0.1.0", | ||
| "immutable": "^3.6.2" | ||
| }, | ||
@@ -18,2 +19,3 @@ "devDependencies": { | ||
| "check-versions": "0.0.1", | ||
| "commonform-number": "^0.2.1", | ||
| "istanbul": "^0.3.5", | ||
@@ -20,0 +22,0 @@ "jscs": "^1.8.1", |
@@ -1,165 +0,12 @@ | ||
| var validate = require('commonform-validate'); | ||
| var group = require('commonform-group-series'); | ||
| var resolveForm = require('./form'); | ||
| var string = function(argument) { | ||
| return typeof argument === 'string'; | ||
| module.exports = function(form, values, numberings) { | ||
| return resolveForm( | ||
| form, | ||
| values, | ||
| numberings.get('form'), | ||
| numberings.get('summaries') | ||
| ); | ||
| }; | ||
| var subForm = function(argument) { | ||
| return argument.hasOwnProperty('form'); | ||
| }; | ||
| var compileContent; | ||
| var compileElement = function(element, values, summaryNumberings) { | ||
| /* istanbul ignore else */ | ||
| // String | ||
| if (typeof element === 'string') { | ||
| return element; | ||
| // Term use | ||
| } else if (validate.use(element)) { | ||
| return element.use; | ||
| // Sub-form | ||
| } else if (subForm(element)) { | ||
| element.form.content = compileContent( | ||
| element.form.content, values, summaryNumberings | ||
| ); | ||
| return element; | ||
| // Definition | ||
| } else if (validate.definition(element)) { | ||
| return element; | ||
| // Reference | ||
| } else if (validate.reference(element)) { | ||
| var summary = element.reference; | ||
| // Resolvable | ||
| if (summaryNumberings.hasOwnProperty(summary)) { | ||
| var numberings = summaryNumberings[summary]; | ||
| // Unambiguous | ||
| if (numberings.length === 1) { | ||
| return { | ||
| reference: summaryNumberings[summary][0] | ||
| }; | ||
| // Ambiguous | ||
| } else { | ||
| return { | ||
| ambiguous: true, | ||
| numberings: numberings, | ||
| reference: summary | ||
| }; | ||
| } | ||
| // Broken | ||
| } else { | ||
| element.broken = true; | ||
| return element; | ||
| } | ||
| // Field | ||
| } else if (validate.field(element)) { | ||
| var field = element.field; | ||
| if (values.hasOwnProperty(field)) { | ||
| return values[field]; | ||
| } else { | ||
| return { | ||
| blank: field | ||
| }; | ||
| } | ||
| } else { | ||
| throw new Error('Invalid content: ' + JSON.stringify(element)); | ||
| } | ||
| }; | ||
| compileContent = function(content, values, summaryNumberings) { | ||
| return content | ||
| // Compile content | ||
| .reduce(function(content, e) { | ||
| var compiled = compileElement(e, values, summaryNumberings); | ||
| return content.concat(compiled); | ||
| }, []) | ||
| // Concatenate contiguous strings. | ||
| .reduce(function(content, element, index) { | ||
| var length = content.length; | ||
| var last = content[length - 1]; | ||
| if (index > 0 && string(element) && string(last)) { | ||
| content[length - 1] = last + element; | ||
| return content; | ||
| } else { | ||
| return content.concat(element); | ||
| } | ||
| }, []); | ||
| }; | ||
| var number = function(form, summaryNumberings, parentNumbering) { | ||
| var seriesNumber = 0; | ||
| var elementCounts = [null]; | ||
| group(form) | ||
| .filter(function(group) { | ||
| return group.type === 'series'; | ||
| }) | ||
| .forEach(function(series, seriesIndex) { | ||
| seriesNumber = seriesIndex + 1; | ||
| elementCounts.push(0); | ||
| series.content.forEach(function(subForm, subFormIndex) { | ||
| ++elementCounts[seriesNumber]; | ||
| var newNumbering = parentNumbering.concat({ | ||
| series: {number: seriesNumber}, | ||
| element: {number: subFormIndex + 1} | ||
| }); | ||
| subForm.numbering = newNumbering; | ||
| // Save summary-to-numbering mapping | ||
| if (subForm.hasOwnProperty('summary')) { | ||
| var summary = subForm.summary; | ||
| if (!(summary in summaryNumberings)) { | ||
| summaryNumberings[summary] = [newNumbering]; | ||
| } else { | ||
| summaryNumberings[summary].push(newNumbering); | ||
| } | ||
| } | ||
| number(subForm.form, summaryNumberings, newNumbering); | ||
| }); | ||
| }); | ||
| // Add .of to .series and .element | ||
| form.content.forEach(function(element) { | ||
| if (element.hasOwnProperty('numbering')) { | ||
| var numbering = element.numbering; | ||
| var last = numbering[numbering.length - 1]; | ||
| var series = last.series.number; | ||
| last.series.of = seriesNumber; | ||
| last.element.of = elementCounts[series]; | ||
| } | ||
| }); | ||
| return summaryNumberings; | ||
| }; | ||
| module.exports = function(project) { | ||
| if (!validate.project(project)) { | ||
| throw new Error('Invalid project'); | ||
| } | ||
| var values = project.values; | ||
| var topContent = project.form.content; | ||
| // Number sub-forms and compile a map from summary to numbering. | ||
| var numberings = number(project.form, {}, []); | ||
| // Compile content. | ||
| project.form.content = compileContent(topContent, values, numberings); | ||
| return project; | ||
| }; | ||
| module.exports.version = '0.1.2'; | ||
| module.exports.version = '0.2.1'; |
New alerts
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Improved metrics
- Total package byte prevSize
- increased by21.03%
6629
- Number of package files
- increased by100%
6
- Lines of code
- increased by24.09%
170
Worsened metrics
- Dependency count
- increased by50%
3
- Dev dependency count
- increased by16.67%
7
- Number of medium supply chain risk alerts
- increased byInfinity%
1
Dependency changes
+ Addedcommonform-predicate@^0.1.0
+ Addedimmutable@^3.6.2
+ Addedcommonform-group-series@0.2.0(transitive)
+ Addedcommonform-predicate@0.1.0(transitive)
+ Addedimmutable@3.8.2(transitive)
- Removedcommonform-validate@0.1.x
- Removedcommonform-group-series@0.1.0(transitive)
- Removedcommonform-validate@0.1.3(transitive)
- Removedowasp-password-strength-test@1.3.0(transitive)
- Removedsemver@4.3.6(transitive)