Skip to content

Introduce the ability to configure the nesting level of the pattern directory hierarchy. #1138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Introduce the ability to configure the nesting level of the pattern directory hierarchy. #1138

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b15d2d
Introduce the ability to configure the nesting level of the pattern d…
Mar 3, 2020
829d245
Merge branch 'dev' into configurable-nesting-levels
bmuenzenmeyer Apr 3, 2020
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
18 changes: 14 additions & 4 deletions packages/core/src/lib/object_factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,18 @@ const Pattern = function(relPath, data, patternlab) {
info.dir = info.hasDir ? pathObj.dir.split(path.sep).pop() : '';
info.dirLevel = pathObj.dir.split(path.sep).length;

this.maxNestingLevel = this.getMaxNestingLevel(patternlab);
this.relPath = path.normalize(relPath); // '00-atoms/00-global/00-colors.mustache'
this.fileName = pathObj.name; // '00-colors'
this.subdir = pathObj.dir; // '00-atoms/00-global'
if ((this.subdir.match(/\w(?=\\)|\w(?=\/)/g) || []).length > 1) {
this.subdir = this.subdir.split(/\/|\\/, 2).join(path.sep); // '00-atoms/03-controls/00-button' -> '00-atoms/03-controls'
if ((this.subdir.match(/\w(?=\\)|\w(?=\/)/g) || []).length > (this.maxNestingLevel - 1)) {
this.subdir = this.subdir.split(/\/|\\/, this.maxNestingLevel).join(path.sep); // '00-atoms/03-controls/00-button' -> '00-atoms/03-controls'
}
this.fileExtension = pathObj.ext; // '.mustache'

// this is the unique name, subDir + fileName (sans extension)
this.name = '';
if (info.hasDir && info.dirLevel > 2) {
if (info.hasDir && info.dirLevel > this.maxNestingLevel) {
let variant = '';

if (this.fileName.indexOf('~') !== -1) {
Expand Down Expand Up @@ -92,7 +93,7 @@ const Pattern = function(relPath, data, patternlab) {

// the joined pattern group and subgroup directory
this.flatPatternPath =
info.hasDir && info.dirLevel > 2
info.hasDir && info.dirLevel > this.maxNestingLevel
? this.subdir
.replace(/[/\\]/g, '-')
.replace(new RegExp('-' + info.dir + '$'), '')
Expand Down Expand Up @@ -229,6 +230,15 @@ Pattern.prototype = {
return '';
}
},

getMaxNestingLevel: function(patternlab) {
let maxNestingLevel = 2;
// if (typeof patternlab?.config?.maxNestingLevel !== "undefined") {
if (typeof ((patternlab || {}).config || {}).maxNestingLevel !== "undefined") {
maxNestingLevel = patternlab.config.maxNestingLevel;
}
return maxNestingLevel;
},
};

// Pattern static methods
Expand Down