Skip to content

Commit 8f9f6c9

Browse files
bmuenzenmeyerbmuenzenmeyer
committed
code cleanup and eslinting
1 parent f900f90 commit 8f9f6c9

File tree

2 files changed

+44
-100
lines changed

2 files changed

+44
-100
lines changed

‎core/lib/pattern_assembler.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ var pattern_assembler = function () {
132132

133133
function addSubtypePattern(subtypePattern, patternlab) {
134134
patternlab.subtypePatterns[subtypePattern.patternPartial] = subtypePattern;
135-
//console.log(55, patternlab.subtypePatterns[subtypePattern.patternPartial]);
136135
}
137136

138137
// Render a pattern on request. Long-term, this should probably go away.
@@ -216,10 +215,8 @@ var pattern_assembler = function () {
216215
subTypePattern.patternLink = subTypePattern.name + '/index.html';
217216
subTypePattern.patternDesc = subTypeMarkdown.markdown;
218217
subTypePattern.flatPatternPath = subTypePattern.flatPatternPath + '-' + subTypePattern.fileName;
219-
//experiment
220-
//subTypePattern.patternPartial = function(){ return 'viewall-' + subTypePattern.patternPartial; };
221218
subTypePattern.isPattern = false;
222-
//subTypePattern.engine = null;
219+
subTypePattern.engine = null;
223220

224221
addSubtypePattern(subTypePattern, patternlab)
225222
return subTypePattern;

‎core/lib/ui_builder.js

Lines changed: 43 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ var _ = require('lodash');
1313
var ui_builder = function () {
1414

1515
function addToPatternPaths(patternlab, pattern) {
16-
17-
//console.log('adding',pattern.patternPartial, pattern.patternGroup, pattern.patternBaseName, pattern.name, 'to paths');
18-
1916
if (!patternlab.patternPaths) {
2017
patternlab.patternPaths = {};
2118
}
@@ -24,15 +21,12 @@ var ui_builder = function () {
2421
patternlab.patternPaths[pattern.patternGroup] = {};
2522
}
2623

27-
if (pattern.isPattern && !pattern.isDocPattern){
24+
if (pattern.isPattern && !pattern.isDocPattern) {
2825
patternlab.patternPaths[pattern.patternGroup][pattern.patternBaseName] = pattern.name;
2926
}
3027
}
3128

3229
function addToViewAllPaths(patternlab, pattern) {
33-
34-
//console.log('6 adding',pattern.patternPartial, pattern.patternGroup, pattern.patternSubGroup, pattern.flatPatternPath, 'to viewallpaths');
35-
3630
if (!patternlab.viewAllPaths) {
3731
patternlab.viewAllPaths = {};
3832
}
@@ -45,14 +39,10 @@ var ui_builder = function () {
4539
patternlab.viewAllPaths[pattern.patternGroup][pattern.patternSubGroup] = {};
4640
}
4741

48-
49-
//console.log('0000<><><><>><>>><>', pattern.patternPartial);
50-
5142
patternlab.viewAllPaths[pattern.patternGroup][pattern.patternSubGroup] = pattern.patternType + '-' + pattern.patternSubType;
5243

53-
54-
if (!patternlab.viewAllPaths[pattern.patternGroup]['all']) {
55-
patternlab.viewAllPaths[pattern.patternGroup]['all'] = pattern.patternType ;
44+
if (!patternlab.viewAllPaths[pattern.patternGroup].all) {
45+
patternlab.viewAllPaths[pattern.patternGroup].all = pattern.patternType ;
5646
}
5747
}
5848

@@ -109,33 +99,24 @@ var ui_builder = function () {
10999
* take the given pattern, fina and construct the view-all pattern block for the group
110100
*/
111101
function injectDocumentationBlock(pattern, patternlab, isSubtypePattern) {
112-
113-
114-
writeFile('./subtypePatternsNow.json', JSON.stringify(patternlab.subtypePatterns));
115-
116102
var docPattern = patternlab.subtypePatterns[pattern.patternGroup + (isSubtypePattern ? '-' + pattern.patternSubGroup : '')];
117103

118104
if (docPattern) {
119105
docPattern.isDocPattern = true;
120-
console.log(99, 'returning doc pattern for', pattern.patternGroup + (isSubtypePattern ? '-' + pattern.patternSubGroup : ''));
121-
console.log(99, docPattern.patternDesc);
122106
return docPattern;
123107
}
124108

125-
console.log(100, 'creating empty doc pattern for', pattern.patternGroup + (isSubtypePattern ? '-' + pattern.patternSubGroup : ''));
126109
var docPattern = new Pattern.createEmpty(
127110
{
128111
name: pattern.flatPatternPath,
129-
patternName: isSubtypePattern ? pattern.patternSubGroup : pattern.patternGroup,
112+
patternName: isSubtypePattern ? pattern.patternSubGroup : pattern.patternGroup,
130113
patternDesc: '',
131114
patternPartial: 'viewall-' + pattern.patternGroup + (isSubtypePattern ? '-' + pattern.patternSubGroup : ''),
132115
patternSectionSubtype : isSubtypePattern,
133116
patternLink: pattern.flatPatternPath + path.sep + 'index.html',
134117
isPattern: false,
135-
engine: pattern.engine,
136-
137-
//todo this might be broken yet
138-
flatPatternPath: pattern.flatPatternPath, // + (isSubtypePattern ? '-' + pattern.patternSubGroup : ''),
118+
engine: null,
119+
flatPatternPath: pattern.flatPatternPath,
139120
isDocPattern: true
140121
}
141122
);
@@ -159,7 +140,7 @@ var ui_builder = function () {
159140

160141
var patternType = _.find(patternlab.patternTypes, ['patternType', pattern.patternType]);
161142

162-
if(!patternType) {
143+
if (!patternType) {
163144
console.log('something went wrong looking for patternType');
164145
process.exit(1);
165146
}
@@ -169,14 +150,14 @@ var ui_builder = function () {
169150
function getPatternSubType(patternlab, pattern) {
170151
var patternType = getPatternType(patternlab, pattern);
171152

172-
if(!patternType) {
153+
if (!patternType) {
173154
console.log('something went wrong looking for patternType');
174155
process.exit(1);
175156
}
176157

177158
var patternSubType = _.find(patternType.patternTypeItems, ['patternSubtype', pattern.patternSubType]);
178159

179-
if(!patternSubType) {
160+
if (!patternSubType) {
180161
console.log('something went wrong looking for patternSubType', pattern.patternType, '-', pattern.patternSubType);
181162
process.exit(1);
182163
}
@@ -211,8 +192,7 @@ var ui_builder = function () {
211192

212193
function addPatternSubTypeItem(patternlab, pattern, createViewAllVariant) {
213194
var patternSubType = getPatternSubType(patternlab, pattern);
214-
215-
if(createViewAllVariant) {
195+
if (createViewAllVariant) {
216196
patternSubType.patternSubtypeItems.push(
217197
{
218198
patternPartial: 'viewall-' + pattern.patternGroup + '-' + pattern.patternSubGroup,
@@ -223,19 +203,14 @@ var ui_builder = function () {
223203
}
224204
);
225205
} else {
226-
227-
console.log(111, pattern.patternPartial);
228-
229206
patternSubType.patternSubtypeItems.push(
230207
createPatternSubTypeItem(pattern)
231208
);
232209
}
233-
234210
}
235211

236212
function addPatternItem(patternlab, pattern) {
237213
var patternType = getPatternType(patternlab, pattern);
238-
239214
if (!patternType) {
240215
console.log('something went wrong looking for patternType', pattern.patternType);
241216
process.exit(1);
@@ -249,6 +224,29 @@ var ui_builder = function () {
249224

250225
}
251226

227+
// function getPatternItems(patternlab, patternType) {
228+
// var patternType = _.find(patternlab.patternTypes, ['patternTypeLC', patternType]);
229+
// if (patternType) {
230+
// return patternType.patternItems;
231+
// }
232+
// return [];
233+
// }
234+
235+
function sortPatterns(patternsArray) {
236+
return patternsArray.sort(function (a, b) {
237+
238+
if (a.name > b.name) {
239+
return 1;
240+
}
241+
if (a.name < b.name) {
242+
return -1;
243+
}
244+
245+
// a must be equal to b
246+
return 0;
247+
});
248+
}
249+
252250
/*
253251
* groupPatterns
254252
* returns an object representing how the front end styleguide and navigation is structured
@@ -258,26 +256,21 @@ var ui_builder = function () {
258256
patternGroups: {}
259257
};
260258

261-
if(!patternlab.patternTypes){
259+
if (!patternlab.patternTypes) {
262260
patternlab.patternTypes = [];
263261
}
264262

265263
_.forEach(sortPatterns(patternlab.patterns), function (pattern) {
266264

267265
pattern.omitFromStyleguide = isPatternExcluded(pattern, patternlab);
268-
269-
//console.log('sorting', pattern.patternPartial, 'into group', pattern.patternGroup, 'and subtype', pattern.patternSubGroup);
270-
271266
if (pattern.omitFromStyleguide) { return; }
272267

273268
if (!groupedPatterns.patternGroups[pattern.patternGroup]) {
274269
pattern.isSubtypePattern = false;
275-
276270
groupedPatterns.patternGroups[pattern.patternGroup] = {};
277-
278271
addPatternType(patternlab, pattern);
279272

280-
//todo: test this
273+
//todo: Pattern Type View All and Documentation
281274
//groupedPatterns.patternGroups[pattern.patternGroup]['viewall-' + pattern.patternGroup] = injectDocumentationBlock(pattern, patternlab, false);
282275
}
283276

@@ -293,29 +286,17 @@ var ui_builder = function () {
293286
groupedPatterns.patternGroups[pattern.patternGroup][pattern.patternSubGroup]['viewall-' + pattern.patternGroup + '-' + pattern.patternSubGroup] = injectDocumentationBlock(pattern, patternlab, true);
294287

295288
addToViewAllPaths(patternlab, pattern);
296-
297-
console.log(77, pattern.patternGroup, pattern.patternSubGroup);
298-
299289
addPatternSubTypeItem(patternlab, pattern, true);
300290

301291
}
302292
groupedPatterns.patternGroups[pattern.patternGroup][pattern.patternSubGroup][pattern.patternBaseName] = pattern;
303293

304294
addToPatternPaths(patternlab, pattern);
305-
//console.log(12, 'about to create patternsubtypeitem derived from', pattern.patternPartial, pattern.patternGroup, pattern.patternSubGroup);
306295
addPatternSubTypeItem(patternlab, pattern);
307-
308296
} else {
309-
310297
addPatternItem(patternlab, pattern);
311298
addToPatternPaths(patternlab, pattern);
312-
313299
}
314-
315-
316-
317-
318-
319300
});
320301
return groupedPatterns;
321302
}
@@ -335,9 +316,6 @@ var ui_builder = function () {
335316
}
336317

337318
function buildViewAllHTML(patternlab, patterns, patternPartial) {
338-
339-
//console.log(343, 'building viewall HTML for', patternPartial);
340-
341319
var viewAllHTML = pattern_assembler.renderPattern(patternlab.viewAll,
342320
{
343321
partials: patterns,
@@ -358,19 +336,14 @@ var ui_builder = function () {
358336
//loop through the grouped styleguide patterns, building at each level
359337
_.forEach(styleguidePatterns.patternGroups, function (patternTypeObj, patternType) {
360338

361-
//console.log(1, patternType);
362-
363339
var p;
364340
var typePatterns = [];
365341

366342
_.forOwn(patternTypeObj, function (patternSubtypes, patternSubtype) {
367343

368-
//console.log(2, patternSubtype);
369-
370344
var patternPartial = patternType + '-' + patternSubtype;
371-
console.log(380, patternPartial);
372345

373-
if(patternType === patternSubtype) {
346+
if (patternType === patternSubtype) {
374347
writeViewAllFile = false;
375348
return false;
376349
}
@@ -383,24 +356,14 @@ var ui_builder = function () {
383356

384357
//determine if we should write at this time by checking if these are flat patterns or grouped patterns
385358
p = _.find(subtypePatterns, function (pat) {
386-
console.log(394, pat.patternPartial, pat.isFlatPattern, pat.patternGroup, pat.patternSubGroup);
387359
return pat.isDocPattern;
388360
});
389361

390362
typePatterns = typePatterns.concat(subtypePatterns);
391363

392-
console.log(400);
393-
394364
var viewAllHTML = buildViewAllHTML(patternlab, subtypePatterns, patternPartial);
395-
396-
console.log(4, 'about to write view all file to patterns/', p.flatPatternPath, p.patternGroup, p.patternSubGroup);
397-
writeFile(paths.public.patterns + p.flatPatternPath + '/subtypePatterns.json', JSON.stringify(subtypePatterns));
398-
399-
console.log(5, '------');
400-
//todo review this conditional
401-
//if(p.patternGroup && p.patternSubGroup){
402-
writeFile(paths.public.patterns + p.flatPatternPath + '/index.html', mainPageHeadHtml + viewAllHTML + footerHTML);
403-
//}
365+
writeFile(paths.public.patterns + p.flatPatternPath + '/index.html', mainPageHeadHtml + viewAllHTML + footerHTML);
366+
return true; //stop yelling at us eslint we know we know
404367
});
405368

406369

@@ -411,37 +374,21 @@ var ui_builder = function () {
411374
//render the footer needed for the viewall template
412375
var footerHTML = buildFooterHTML(patternlab, patternType);
413376

377+
//add any flat patterns
378+
//todo this isn't quite working yet
379+
//typePatterns = typePatterns.concat(getPatternItems(patternlab, patternType));
380+
414381
//render the viewall template
415382
var viewAllHTML = buildViewAllHTML(patternlab, typePatterns, patternType);
416-
417-
writeFile(paths.public.patterns + p.subdir + '/index.json', JSON.stringify(typePatterns));
418-
console.log(5, 'trying to write view all file to patterns/', p.subdir);
419-
420383
writeFile(paths.public.patterns + p.subdir + '/index.html', mainPageHeadHtml + viewAllHTML + footerHTML);
421384

422385
patterns = patterns.concat(typePatterns);
423-
386+
return true; //stop yelling at us eslint we know we know
424387
});
425-
426-
writeFile(paths.public.patterns + '/patterns.json', JSON.stringify(patterns));
427-
428388
return patterns;
429389
}
430390

431-
function sortPatterns(patternsArray) {
432-
return patternsArray.sort(function (a, b) {
433-
434-
if (a.name > b.name) {
435-
return 1;
436-
}
437-
if (a.name < b.name) {
438-
return -1;
439-
}
440391

441-
// a must be equal to b
442-
return 0;
443-
});
444-
}
445392

446393
function exportData(patternlab) {
447394
var annotation_exporter = new ae(patternlab);

0 commit comments

Comments
 (0)