@@ -8,6 +8,7 @@ const parameter_hunter = function () {
8
8
const smh = require ( './style_modifier_hunter' ) ;
9
9
const style_modifier_hunter = new smh ( ) ;
10
10
const pattern_assembler = new pa ( ) ;
11
+ const logger = require ( './log' ) ;
11
12
12
13
/**
13
14
* This function is really to accommodate the lax JSON-like syntax allowed by
@@ -49,10 +50,9 @@ const parameter_hunter = function () {
49
50
* * Return paramStringWellFormed.
50
51
*
51
52
* @param {string } pString
52
- * @param {object } patternlab
53
53
* @returns {string } paramStringWellFormed
54
54
*/
55
- function paramToJson ( pString , patternlab ) {
55
+ function paramToJson ( pString ) {
56
56
let colonPos = - 1 ;
57
57
const keys = [ ] ;
58
58
let paramString = pString ; // to not reassign param
@@ -67,10 +67,7 @@ const parameter_hunter = function () {
67
67
paramStringWellFormed = JSON . stringify ( JSON . parse ( pString ) ) ;
68
68
return paramStringWellFormed ;
69
69
} 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...` ) ;
74
71
}
75
72
76
73
//replace all escaped double-quotes with escaped unicode
@@ -256,15 +253,13 @@ const parameter_hunter = function () {
256
253
//if we retrieved a pattern we should make sure that its extendedTemplate is reset. looks to fix #190
257
254
partialPattern . extendedTemplate = partialPattern . template ;
258
255
259
- if ( patternlab . config . debug ) {
260
- console . log ( 'found patternParameters for ' + partialName ) ;
261
- }
256
+ logger . debug ( `found patternParameters for ${ partialName } ` ) ;
262
257
263
258
//strip out the additional data, convert string to JSON.
264
259
const leftParen = pMatch . indexOf ( '(' ) ;
265
260
const rightParen = pMatch . lastIndexOf ( ')' ) ;
266
261
const paramString = '{' + pMatch . substring ( leftParen + 1 , rightParen ) + '}' ;
267
- const paramStringWellFormed = paramToJson ( paramString , patternlab ) ;
262
+ const paramStringWellFormed = paramToJson ( paramString ) ;
268
263
269
264
let paramData = { } ;
270
265
let globalData = { } ;
@@ -275,8 +270,8 @@ const parameter_hunter = function () {
275
270
globalData = jsonCopy ( patternlab . data , 'config.paths.source.data global data' ) ;
276
271
localData = jsonCopy ( pattern . jsonFileData || { } , `pattern ${ pattern . patternPartial } data` ) ;
277
272
} 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 ) ;
280
275
}
281
276
282
277
// resolve any pattern links that might be present
0 commit comments