Skip to content

Commit 5021384

Browse files
committed
feat(logs): Refactor logs for parameter_hunter
1 parent 41a61c2 commit 5021384

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

core/lib/parameter_hunter.js

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const parameter_hunter = function () {
88
const smh = require('./style_modifier_hunter');
99
const style_modifier_hunter = new smh();
1010
const pattern_assembler = new pa();
11+
const logger = require('./log');
1112

1213
/**
1314
* This function is really to accommodate the lax JSON-like syntax allowed by
@@ -49,10 +50,9 @@ const parameter_hunter = function () {
4950
* * Return paramStringWellFormed.
5051
*
5152
* @param {string} pString
52-
* @param {object} patternlab
5353
* @returns {string} paramStringWellFormed
5454
*/
55-
function paramToJson(pString, patternlab) {
55+
function paramToJson(pString) {
5656
let colonPos = -1;
5757
const keys = [];
5858
let paramString = pString; // to not reassign param
@@ -67,10 +67,7 @@ const parameter_hunter = function () {
6767
paramStringWellFormed = JSON.stringify(JSON.parse(pString));
6868
return paramStringWellFormed;
6969
} catch (err) {
70-
//todo this might be a good candidate for a different log level, should we implement that someday
71-
if (patternlab.config.debug) {
72-
console.log(`Not valid JSON found for passed pattern parameter ${pString} will attempt to parse manually...`);
73-
}
70+
logger.debug(`Not valid JSON found for passed pattern parameter ${pString} will attempt to parse manually...`);
7471
}
7572

7673
//replace all escaped double-quotes with escaped unicode
@@ -256,15 +253,13 @@ const parameter_hunter = function () {
256253
//if we retrieved a pattern we should make sure that its extendedTemplate is reset. looks to fix #190
257254
partialPattern.extendedTemplate = partialPattern.template;
258255

259-
if (patternlab.config.debug) {
260-
console.log('found patternParameters for ' + partialName);
261-
}
256+
logger.debug(`found patternParameters for ${partialName}`);
262257

263258
//strip out the additional data, convert string to JSON.
264259
const leftParen = pMatch.indexOf('(');
265260
const rightParen = pMatch.lastIndexOf(')');
266261
const paramString = '{' + pMatch.substring(leftParen + 1, rightParen) + '}';
267-
const paramStringWellFormed = paramToJson(paramString, patternlab);
262+
const paramStringWellFormed = paramToJson(paramString);
268263

269264
let paramData = {};
270265
let globalData = {};
@@ -275,8 +270,8 @@ const parameter_hunter = function () {
275270
globalData = jsonCopy(patternlab.data, 'config.paths.source.data global data');
276271
localData = jsonCopy(pattern.jsonFileData || {}, `pattern ${pattern.patternPartial} data`);
277272
} catch (err) {
278-
console.log('There was an error parsing JSON for ' + pattern.relPath);
279-
console.log(err);
273+
logger.warning(`There was an error parsing JSON for ${pattern.relPath}`);
274+
logger.warning(err);
280275
}
281276

282277
// resolve any pattern links that might be present

0 commit comments

Comments
 (0)