@@ -418,6 +418,55 @@ module.exports.callbackPromise = (resolve, reject) =>
418418 }
419419 } ;
420420
421+ module . exports . parseDataURI = uri => {
422+ let input = uri ;
423+ let commaPos = input . indexOf ( ',' ) ;
424+ if ( ! commaPos ) {
425+ return uri ;
426+ }
427+
428+ let data = input . substring ( commaPos + 1 ) ;
429+ let metaStr = input . substring ( 'data:' . length , commaPos ) ;
430+
431+ let encoding ;
432+
433+ let metaEntries = metaStr . split ( ';' ) ;
434+ let lastMetaEntry = metaEntries . length > 1 ? metaEntries [ metaEntries . length - 1 ] : false ;
435+ if ( lastMetaEntry && lastMetaEntry . indexOf ( '=' ) < 0 ) {
436+ encoding = lastMetaEntry . toLowerCase ( ) ;
437+ metaEntries . pop ( ) ;
438+ }
439+
440+ let contentType = metaEntries . shift ( ) || 'application/octet-stream' ;
441+ let params = { } ;
442+ for ( let entry of metaEntries ) {
443+ let sep = entry . indexOf ( '=' ) ;
444+ if ( sep >= 0 ) {
445+ let key = entry . substring ( 0 , sep ) ;
446+ let value = entry . substring ( sep + 1 ) ;
447+ params [ key ] = value ;
448+ }
449+ }
450+
451+ switch ( encoding ) {
452+ case 'base64' :
453+ data = Buffer . from ( data , 'base64' ) ;
454+ break ;
455+ case 'utf8' :
456+ data = Buffer . from ( data ) ;
457+ break ;
458+ default :
459+ try {
460+ data = Buffer . from ( decodeURIComponent ( data ) ) ;
461+ } catch ( err ) {
462+ data = Buffer . from ( data ) ;
463+ }
464+ data = Buffer . from ( data ) ;
465+ }
466+
467+ return { data, encoding, contentType, params } ;
468+ } ;
469+
421470/**
422471 * Resolves a String or a Buffer value for content value. Useful if the value
423472 * is a Stream or a file or an URL. If the value is a Stream, overwrites
@@ -470,11 +519,12 @@ module.exports.resolveContent = (data, key, callback) => {
470519 contentStream = nmfetch ( content . path || content . href ) ;
471520 return resolveStream ( contentStream , callback ) ;
472521 } else if ( / ^ d a t a : / i. test ( content . path || content . href ) ) {
473- let parts = ( content . path || content . href ) . match ( / ^ d a t a : ( (?: [ ^ ; ] * ; ) * (?: [ ^ , ] * ) ) , ( .* ) $ / i) ;
474- if ( ! parts ) {
522+ let parsedDataUri = module . exports . parseDataURI ( content . path || content . href ) ;
523+
524+ if ( ! parsedDataUri || ! parsedDataUri . data ) {
475525 return callback ( null , Buffer . from ( 0 ) ) ;
476526 }
477- return callback ( null , / \b b a s e 6 4 $ / i . test ( parts [ 1 ] ) ? Buffer . from ( parts [ 2 ] , 'base64' ) : Buffer . from ( decodeURIComponent ( parts [ 2 ] ) ) ) ;
527+ return callback ( null , parsedDataUri . data ) ;
478528 } else if ( content . path ) {
479529 return resolveStream ( fs . createReadStream ( content . path ) , callback ) ;
480530 }
0 commit comments