Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/lib/parameter_hunter.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,9 @@ var parameter_hunter = function () {
var allData = plutils.mergeData(globalData, localData);
allData = plutils.mergeData(allData, paramData);

//if the partial has pattern parameters itself, we need to handle those
findparameters(partialPattern, patternlab);

//if partial has style modifier data, replace the styleModifier value
if (pattern.stylePartials && pattern.stylePartials.length > 0) {
style_modifier_hunter.consume_style_modifier(partialPattern, pMatch, patternlab);
Expand Down
4 changes: 4 additions & 0 deletions test/files/_patterns/00-test/539-a.mustache
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<b>a</b>
{{ #a }}
<i>a!</i>
{{ /a }}
5 changes: 5 additions & 0 deletions test/files/_patterns/00-test/539-b.mustache
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<b>b</b>
{{ #b }}
<i>b!</i>
{{ /b }}
{{> test-a(a: true) }}
2 changes: 2 additions & 0 deletions test/files/_patterns/00-test/539-c.mustache
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<b>c</b>
{{> test-b(b: true) }}
64 changes: 62 additions & 2 deletions test/parameter_hunter_tests.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
"use strict";

var tap = require('tap');
var pa = require('../core/lib/pattern_assembler');
var Pattern = require('../core/lib/object_factory').Pattern;
var CompileState = require('../core/lib/object_factory').CompileState;
var PatternGraph = require('../core/lib/pattern_graph').PatternGraph;

var fs = require('fs-extra');

var ph = require('../core/lib/parameter_hunter');


//setup current pattern from what we would have during execution
function currentPatternClosure() {
return {
Expand Down Expand Up @@ -48,9 +55,11 @@ function patternlabClosure() {
debug: false
},
data: {
description: 'Not a quote from a smart man'
description: 'Not a quote from a smart man',
link: {}
},
partials: {}
partials: {},
graph: PatternGraph.empty()
}
};

Expand All @@ -65,6 +74,57 @@ tap.test('parameter hunter finds and extends templates', function(test) {
test.end();
});

tap.test('parameter hunter finds partials with their own parameters and renders them too', function(test) {
//arrange

var pattern_assembler = new pa();
var patterns_dir = './test/files/_patterns/';

var pl = patternlabClosure();


var aPattern = new Pattern('00-test/539-a.mustache');
aPattern.template = fs.readFileSync(patterns_dir + '00-test/539-a.mustache', 'utf8');
aPattern.extendedTemplate = aPattern.template;
aPattern.stylePartials = pattern_assembler.find_pattern_partials_with_style_modifiers(aPattern);
aPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(aPattern);

var bPattern = new Pattern('00-test/539-b.mustache');
bPattern.template = fs.readFileSync(patterns_dir + '00-test/539-b.mustache', 'utf8');
bPattern.extendedTemplate = bPattern.template;
bPattern.stylePartials = pattern_assembler.find_pattern_partials_with_style_modifiers(bPattern);
bPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(bPattern);

var cPattern = new Pattern('00-test/539-c.mustache');
cPattern.template = fs.readFileSync(patterns_dir + '00-test/539-c.mustache', 'utf8');
cPattern.extendedTemplate = cPattern.template;
cPattern.stylePartials = pattern_assembler.find_pattern_partials_with_style_modifiers(cPattern);
cPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(cPattern);

pattern_assembler.addPattern(aPattern, pl);
pattern_assembler.addPattern(bPattern, pl);
pattern_assembler.addPattern(cPattern, pl);

var currentPattern = cPattern;
var parameter_hunter = new ph();

//act
parameter_hunter.find_parameters(currentPattern, pl);

//assert
test.equals(currentPattern.extendedTemplate,
`<b>c</b>
<b>b</b>
<i>b!</i>
<b>a</b>
<i>a!</i>


`);

test.end();
});

tap.test('parameter hunter finds and extends templates with mixed parameter and global data', function(test) {
var currentPattern = currentPatternClosure();
var patternlab = patternlabClosure();
Expand Down