Skip to content

Feature/pseudohunter add yml #981

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

Merged
merged 4 commits into from
Feb 2, 2019
Merged

Feature/pseudohunter add yml #981

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78633fb
Add yml/yaml to glob pattern for pseudo pattern hunting.
bryce-gilhome Jan 10, 2019
7ed0c99
Allow the pseudo data read code to handle yaml. Get the pseudo data f…
bryce-gilhome Jan 10, 2019
79166e3
Linting fixes.
bryce-gilhome Jan 10, 2019
8658a53
Couple more linting fixes.
bryce-gilhome Jan 10, 2019
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/pseudopattern_hunter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const logger = require('./log');
const readDocumentation = require('./readDocumentation');
const lineage_hunter = new lh();
const changes_hunter = new ch();
const yaml = require('js-yaml');

const pseudopattern_hunter = function() {};

Expand All @@ -22,9 +23,12 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function(
const paths = patternlab.config.paths;

//look for a pseudo pattern by checking if there is a file containing same
//name, with ~ in it, ending in .json
//name, with ~ in it, ending in .json, .yml or .yaml
const needle =
currentPattern.subdir + '/' + currentPattern.fileName + '~*.json';
currentPattern.subdir +
'/' +
currentPattern.fileName +
'~*.{json,yml,yaml}';
const pseudoPatterns = glob.sync(needle, {
cwd: paths.source.patterns,
debug: false,
Expand All @@ -45,7 +49,9 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function(
paths.source.patterns,
pseudoPatterns[i]
);
variantFileData = fs.readJSONSync(variantFileFullPath);
variantFileData = yaml.safeLoad(
fs.readFileSync(variantFileFullPath, 'utf8')
);
} catch (err) {
logger.warning(
`There was an error parsing pseudopattern JSON for ${
Expand All @@ -65,9 +71,13 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function(
const variantName = pseudoPatterns[i]
.substring(pseudoPatterns[i].indexOf('~') + 1)
.split('.')[0];
const variantExtension = pseudoPatterns[i]
.split('.')
.slice(-1)
.pop();
const variantFilePath = path.join(
currentPattern.subdir,
currentPattern.fileName + '~' + variantName + '.json'
currentPattern.fileName + '~' + variantName + '.' + variantExtension
);
const lm = fs.statSync(variantFileFullPath);
const patternVariant = Pattern.create(
Expand Down