@@ -42,58 +42,12 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function (currentPattern, p
42
42
}
43
43
44
44
//extend any existing data with variant data
45
- variantFileData = _ . merge ( currentPattern . jsonFileData , variantFileData ) ;
45
+ variantFileData = _ . merge ( { } , currentPattern . jsonFileData , variantFileData ) ;
46
46
47
- let variantName = pseudoPatterns [ i ] . substring ( pseudoPatterns [ i ] . indexOf ( '~' ) + 1 ) . split ( '.' ) [ 0 ] ;
48
- let variantFilePath = path . join ( currentPattern . subdir , currentPattern . fileName + '~' + variantName + '.json' ) ;
49
- let lm = fs . statSync ( variantFileFullPath ) ;
50
- let patternVariant = Pattern . create ( variantFilePath , variantFileData , {
51
- //use the same template as the non-variant
52
- template : currentPattern . template ,
53
- fileExtension : currentPattern . fileExtension ,
54
- extendedTemplate : currentPattern . extendedTemplate ,
55
- isPseudoPattern : true ,
56
- basePattern : currentPattern ,
57
- stylePartials : currentPattern . stylePartials ,
58
- parameteredPartials : currentPattern . parameteredPartials ,
59
-
60
- // Only regular patterns are discovered during iterative walks
61
- // Need to recompile on data change or template change
62
- lastModified : Math . max ( currentPattern . lastModified , lm . mtime ) ,
63
-
64
- // use the same template engine as the non-variant
65
- engine : currentPattern . engine
66
- } , patternlab ) ;
67
-
68
- changes_hunter . checkBuildState ( patternVariant , patternlab ) ;
69
- patternlab . graph . add ( patternVariant ) ;
70
- patternlab . graph . link ( patternVariant , currentPattern ) ;
71
-
72
- //process the companion markdown file if it exists
73
- pattern_assembler . parse_pattern_markdown ( patternVariant , patternlab ) ;
74
-
75
- //find pattern lineage
76
- lineage_hunter . find_lineage ( patternVariant , patternlab ) ;
77
-
78
- //add to patternlab object so we can look these up later.
79
- pattern_assembler . addPattern ( patternVariant , patternlab ) ;
80
-
81
- //we want to do everything we normally would here, except instead read the pseudoPattern data
82
- try {
83
- var variantFileFullPath = path . resolve ( paths . source . patterns , pseudoPatterns [ i ] ) ;
84
- var variantFileData = fs . readJSONSync ( variantFileFullPath ) ;
85
- } catch ( err ) {
86
- logger . warning ( `There was an error parsing pseudopattern JSON for ${ currentPattern . relPath } ` ) ;
87
- logger . warning ( err ) ;
88
- }
89
-
90
- //extend any existing data with variant data
91
- variantFileData = _ . merge ( currentPattern . jsonFileData , variantFileData ) ;
92
-
93
- variantName = pseudoPatterns [ i ] . substring ( pseudoPatterns [ i ] . indexOf ( '~' ) + 1 ) . split ( '.' ) [ 0 ] ;
94
- variantFilePath = path . join ( currentPattern . subdir , currentPattern . fileName + '~' + variantName + '.json' ) ;
95
- lm = fs . statSync ( variantFileFullPath ) ;
96
- patternVariant = Pattern . create ( variantFilePath , variantFileData , {
47
+ const variantName = pseudoPatterns [ i ] . substring ( pseudoPatterns [ i ] . indexOf ( '~' ) + 1 ) . split ( '.' ) [ 0 ] ;
48
+ const variantFilePath = path . join ( currentPattern . subdir , currentPattern . fileName + '~' + variantName + '.json' ) ;
49
+ const lm = fs . statSync ( variantFileFullPath ) ;
50
+ const patternVariant = Pattern . create ( variantFilePath , variantFileData , {
97
51
//use the same template as the non-variant
98
52
template : currentPattern . template ,
99
53
fileExtension : currentPattern . fileExtension ,
0 commit comments