Skip to content

Switch to minify-xml for xmlmin #27

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

Open
kristian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to minify-xml for xmlmin #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
19 changes: 11 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,21 @@
"type": "git",
"url": "http://github.com/vkiryukhin/pretty-data.git"
},
"main":"./pretty-data",
"main": "./pretty-data",
"keywords": [
"pretty print",
"beautify",
"minify",
"XML",
"JSON",
"CSS",
"SQL"
"pretty print",
"beautify",
"minify",
"XML",
"JSON",
"CSS",
"SQL"
],
"license": "MIT",
"engine": {
"node": ">=0.4.9"
},
"dependencies": {
"minify-xml": "^2.1.0"
}
}
27 changes: 14 additions & 13 deletions pretty-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,26 @@
* pd.css(data ) - pretty print CSS;
* pd.sql(data) - pretty print SQL;
*
* pd.xmlmin(data [, preserveComments] ) - minify XML;
* pd.jsonmin(data) - minify JSON;
* pd.cssmin(data [, preserveComments] ) - minify CSS;
* pd.sqlmin(data) - minify SQL;
* pd.xmlmin(data [, preserveComments, options] ) - minify XML;
* pd.jsonmin(data) - minify JSON;
* pd.cssmin(data [, preserveComments] ) - minify CSS;
* pd.sqlmin(data) - minify SQL;
*
* PARAMETERS:
*
* @data - String; XML, JSON, CSS or SQL text to beautify;
* @preserveComments - Bool (optional, used in minxml and mincss only);
* Set this flag to true to prevent removing comments from @text;
* @Return - String;
* @data - String; XML, JSON, CSS or SQL text to beautify;
* @preserveComments - Bool (optional, used in xmlmin and cssmin only);
* Set this flag to true to prevent removing comments from @data;
* @options - Object (optional, used in xmlmin only);
* Use this object to set additional flags flags;
* @Return - String;
*
* USAGE:
*
* var pd = require('pretty-data').pd;
*
* var xml_pp = pd.xml(xml_text);
* var xml_min = pd.xmlmin(xml_text [,true]);
* var xml_min = pd.xmlmin(xml_text [, true, { removeWhitespaceBetweenTags: false }]);
* var json_pp = pd.json(json_text);
* var json_min = pd.jsonmin(json_text);
* var css_pp = pd.css(css_text);
Expand Down Expand Up @@ -285,11 +287,10 @@ pp.prototype.sql = function(text) {

// ----------------------- min section ----------------------------------------------------

const minifyXml = require("minify-xml").minify;
pp.prototype.xmlmin = function(text, preserveComments) {

var str = preserveComments ? text
: text.replace(/\<![ \r\n\t]*(--([^\-]|[\r\n]|-[^\-])*--[ \r\n\t]*)\>/g,"");
return str.replace(/>\s{0,}</g,"><");
return minifyXml(text, typeof preserveComments === "boolean" ?
{ removeComments: !preserveComments } : preserveComments);
};

pp.prototype.jsonmin = function(text) {
Expand Down