more-css - npm Package Compare versions

Comparing version 0.3.1 to 0.3.2

package.json

 {
   "name": "more-css",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "a css pre-compiler & agressive compressor",
@@ -5,0 +5,0 @@ "maintainers": [

README.md

@@ -57,2 +57,6 @@ ##A css pre-compiler by javascript
 
+more.suffix(s:String):String
+
+设置css文件的后缀名，默认为css，它影响构建@import的文件后缀名。
+
 more.build(file:String, noImport:Boolean = false):String
@@ -59,0 +63,0 @@

server/lexer/CssLexer.js

@@ -35,3 +35,2 @@ var Lexer = require('./Lexer'),
 								this.parenthese = false;
-								this.isUrl = false;
 							}
@@ -113,9 +112,3 @@ else {
 						}
-						if(token.content() == 'url') {
-							this.isUrl = true;
-						}
-						else if([Token.BLANK, Token.TAB, Token.ENTER, Token.LINE, Token.COMMENT].indexOf(token.type()) != -1) {
-							this.isUrl = false;
-						}
-						this.isUrl = token.content() == 'url';
+						this.isUrl = token.content() == 'url' || token.content() == 'format';
 						temp.push(token);
@@ -170,3 +163,3 @@ this.tokenList.push(token);
 					this.colMax = Math.max(this.colMax, this.colNum + i);
-					this.colNum = match.content().length - j;
+					this.colNum = token.content().length - j;
 				}
@@ -195,3 +188,3 @@ else {
 				this.colMax = Math.max(this.colMax, this.colNum + i);
-				this.colNum = match.content().length - j;
+				this.colNum = token.content().length - j;
 			}
@@ -198,0 +191,0 @@ else {

server/lexer/rule/CssRule.js

@@ -97,6 +97,6 @@ var Rule = require('./Rule'),
 	}).statics({
-		KEYWORDS: 'appearance ascent aspect-ratio azimuth background-attachment background-clip background-color background-image background-origin background-position background-repeat background-size background baseline bbox border-collapse border-color border-image border-radius border-spacing border-style border-top border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width border-bottom-width border-left-width border-width border bottom box-shadow box-sizing cap-height caption-side centerline clear clip color color-index content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent device-aspect-ratio device-height device-width direction display elevation empty-cells filter float font-size-adjust font-family font-size font-stretch font-style font-variant font-weight font grid height interpolation-mode left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top margin-right margin-bottom margin-left margin marker-offset marks mathline max-aspect-ratio max-device-width max-height max-width min-aspect-ratio min-device-width min-height min-width monochrome nav-down nav-left nav-right nav-up opacity orphans outline-color outline-style outline-width orientation outline overflow-x overflow-y overflow padding-top padding-right padding-bottom padding-left padding page page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position quotes resize resolution right richness scan size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress table-layout text-align top text-decoration text-indent text-justify text-overflow text-shadow text-transform transform transition transition-property unicode-bidi unicode-range units-per-em vertical-align visibility voice-family volume white-space widows width widths word-break word-spacing word-wrap x-height z-index zoom'.split(' '),
-		VALUES: 'above absolute all alpha always aqua armenian attr aural auto avoid background baseline behind below bicubic bidi-override black blink block blue bold bolder border-box both bottom break-all break-word braille capitalize caption center center-left center-right circle close-quote code collapse color compact condensed content-box continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero default digits disc dotted double ease embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside inter-ideograph invert italic justify landscape large larger left-side leftwards level lighter lime linear-gradient linear line-through list-item local loud lower-alpha lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once opacity open-quote outset outside overline padding-box pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal text-bottom text-top text thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin upper-roman url visible wait white wider width w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow'.split(' '),
+		KEYWORDS: 'appearance ascent aspect-ratio azimuth background-attachment background-clip background-color background-image background-origin background-position background-repeat background-size background baseline bbox border-collapse border-color border-image border-radius border-spacing border-style border-top border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width border-bottom-width border-left-width border-width border bottom box-shadow box-sizing cap-height caption-side centerline clear clip color color-index content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent device-aspect-ratio device-height device-width direction display elevation empty-cells filter float font-size-adjust font-smoothing font-family font-size font-stretch font-style font-variant font-weight font grid height interpolation-mode left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top margin-right margin-bottom margin-left margin marker-offset marks mathline max-aspect-ratio max-device-width max-height max-width min-aspect-ratio min-device-width min-height min-width monochrome nav-down nav-left nav-right nav-up opacity orphans outline-color outline-style outline-width orientation outline overflow-x overflow-y overflow padding-top padding-right padding-bottom padding-left padding page page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position quotes resize resolution right richness scan size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress table-layout text-align top text-decoration text-indent text-justify text-overflow text-shadow text-transform transform transition transition-property unicode-bidi unicode-range units-per-em vertical-align visibility voice-family volume white-space widows width widths word-break word-spacing word-wrap x-height z-index zoom'.split(' '),
+		VALUES: 'above absolute all alpha always antialiased aqua armenian attr aural auto avoid background baseline behind below bicubic bidi-override black blink block blue bold bolder border-box both bottom break-all break-word braille capitalize caption center center-left center-right circle close-quote code collapse color compact condensed content-box continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero default digits disc dotted double ease embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside inter-ideograph invert italic justify landscape large larger left-side leftwards level lighter lime linear-gradient linear line-through list-item local loud lower-alpha lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once opacity open-quote outset outside overline padding-box pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal text-bottom text-top text thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin upper-roman url visible wait white wider width w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow'.split(' '),
 		COLORS: 'black silver gray white maroon red purple fuchsia green lime olive yellow navy blue teal aqua'.split(' ')
 	});
 module.exports = CssRule;

server/more.js

@@ -10,2 +10,3 @@ var CssLexer = require('./lexer/CssLexer'),
 	fs = require('fs'),
+	suffix = 'css',
 	res,
@@ -100,6 +101,9 @@ node,
 				if(isImport && token.type() == Token.STRING) {
-					imports.push(token.val().replace(/\?.*$/, ''));
-					if(s.indexOf('.css') == -1 && !/\.\w+$/.test(s)) {
+					if(!/\.css['"]?$/.test(s)) {
 						s = s.replace(/(['"]?)$/, '.css$1');
+						imports.push(token.val() + '.css');
 					}
+					else {
+						imports.push(token.val());
+					}
 				}
@@ -375,2 +379,8 @@ res += s;
 };
+exports.suffix = function(s) {
+	if(s) {
+		suffix = s;
+	}
+	return suffix;
+};
 function removeImport(s) {
@@ -416,2 +426,5 @@ //0��ʼ��1�ַ���
 function build(file, res, noImport) {
+	if(suffix != 'css') {
+		file = file.replace(/\.css$/, '.' + file);
+	}
 	var s = fs.readFileSync(file, {
@@ -418,0 +431,0 @@ encoding: 'utf-8'

server/parser/Node.js

@@ -61,4 +61,5 @@ var Class = require('../util/Class'),
 		VARS: 'vars',
-		EXTEND: 'extend'
+		EXTEND: 'extend',
+		FORMAT: 'format'
 	});
 module.exports = Node;

server/parser/Parser.js

@@ -165,3 +165,8 @@ var Class = require('../util/Class'),
 			style.add(this.match(':'));
-			value.add(this.match(Token.ID));
+			if(this.look.type() == Token.STRING) {
+				value.add(this.match());
+			}
+			else {
+				value.add(this.match(Token.ID));
+			}
 			style.add(value);
@@ -177,5 +182,40 @@ style.add(this.match(';'));
 			value.add(this.url());
+			if(this.look && this.look.content() == 'format') {
+				value.add(this.format());
+			}
+			while(this.look && this.look.content() == ',') {
+				value.add(this.match());
+				value.add(this.url());
+				if(this.look && this.look.content() == 'format') {
+					value.add(this.format());
+				}
+			}
 			style.add(value);
 			style.add(this.match(';'));
 			node2.add(style);
+			while(this.look && this.look.content() == 'src') {
+				style = new Node(Node.STYLE);
+				key = new Node(Node.KEY);
+				value = new Node(Node.VALUE);
+				key.add(this.match('src'));
+				style.add(key);
+				style.add(this.match(':'));
+				value.add(this.url());
+				if(this.look && this.look.content() == 'format') {
+					value.add(this.format());
+				}
+				while(this.look && this.look.content() == ',') {
+					value.add(this.match());
+					value.add(this.url());
+					if(this.look && this.look.content() == 'format') {
+						value.add(this.format());
+					}
+				}
+				style.add(value);
+				style.add(this.match(';'));
+				node2.add(style);
+			}
+			while(this.look && this.look.content() != '}') {
+				node2.add(this.style());
+			}
 			node2.add(this.match('}'));
@@ -356,2 +396,10 @@ node.add(node2);
 		},
+		format: function() {
+			var node = new Node(Node.FORMAT);
+			node.add(this.match());
+			node.add(this.match('('));
+			node.add(this.match(Token.STRING));
+			node.add(this.match(')'));
+			return node;
+		},
 		match: function(type, msg) {
@@ -358,0 +406,0 @@ //�������

web/lexer/CssLexer.js

@@ -36,3 +36,2 @@ define(function(require, exports, module) {
 									this.parenthese = false;
-									this.isUrl = false;
 								}
@@ -114,9 +113,3 @@ else {
 							}
-							if(token.content() == 'url') {
-								this.isUrl = true;
-							}
-							else if([Token.BLANK, Token.TAB, Token.ENTER, Token.LINE, Token.COMMENT].indexOf(token.type()) != -1) {
-								this.isUrl = false;
-							}
-							this.isUrl = token.content() == 'url';
+							this.isUrl = token.content() == 'url' || token.content() == 'format';
 							temp.push(token);
@@ -171,3 +164,3 @@ this.tokenList.push(token);
 						this.colMax = Math.max(this.colMax, this.colNum + i);
-						this.colNum = match.content().length - j;
+						this.colNum = token.content().length - j;
 					}
@@ -196,3 +189,3 @@ else {
 					this.colMax = Math.max(this.colMax, this.colNum + i);
-					this.colNum = match.content().length - j;
+					this.colNum = token.content().length - j;
 				}
@@ -199,0 +192,0 @@ else {

web/lexer/rule/CssRule.js

@@ -98,4 +98,4 @@ define(function(require, exports, module) {
 		}).statics({
-			KEYWORDS: 'appearance ascent aspect-ratio azimuth background-attachment background-clip background-color background-image background-origin background-position background-repeat background-size background baseline bbox border-collapse border-color border-image border-radius border-spacing border-style border-top border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width border-bottom-width border-left-width border-width border bottom box-shadow box-sizing cap-height caption-side centerline clear clip color color-index content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent device-aspect-ratio device-height device-width direction display elevation empty-cells filter float font-size-adjust font-family font-size font-stretch font-style font-variant font-weight font grid height interpolation-mode left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top margin-right margin-bottom margin-left margin marker-offset marks mathline max-aspect-ratio max-device-width max-height max-width min-aspect-ratio min-device-width min-height min-width monochrome nav-down nav-left nav-right nav-up opacity orphans outline-color outline-style outline-width orientation outline overflow-x overflow-y overflow padding-top padding-right padding-bottom padding-left padding page page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position quotes resize resolution right richness scan size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress table-layout text-align top text-decoration text-indent text-justify text-overflow text-shadow text-transform transform transition transition-property unicode-bidi unicode-range units-per-em vertical-align visibility voice-family volume white-space widows width widths word-break word-spacing word-wrap x-height z-index zoom'.split(' '),
-			VALUES: 'above absolute all alpha always aqua armenian attr aural auto avoid background baseline behind below bicubic bidi-override black blink block blue bold bolder border-box both bottom break-all break-word braille capitalize caption center center-left center-right circle close-quote code collapse color compact condensed content-box continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero default digits disc dotted double ease embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside inter-ideograph invert italic justify landscape large larger left-side leftwards level lighter lime linear-gradient linear line-through list-item local loud lower-alpha lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once opacity open-quote outset outside overline padding-box pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal text-bottom text-top text thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin upper-roman url visible wait white wider width w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow'.split(' '),
+			KEYWORDS: 'appearance ascent aspect-ratio azimuth background-attachment background-clip background-color background-image background-origin background-position background-repeat background-size background baseline bbox border-collapse border-color border-image border-radius border-spacing border-style border-top border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width border-bottom-width border-left-width border-width border bottom box-shadow box-sizing cap-height caption-side centerline clear clip color color-index content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent device-aspect-ratio device-height device-width direction display elevation empty-cells filter float font-size-adjust font-smoothing font-family font-size font-stretch font-style font-variant font-weight font grid height interpolation-mode left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top margin-right margin-bottom margin-left margin marker-offset marks mathline max-aspect-ratio max-device-width max-height max-width min-aspect-ratio min-device-width min-height min-width monochrome nav-down nav-left nav-right nav-up opacity orphans outline-color outline-style outline-width orientation outline overflow-x overflow-y overflow padding-top padding-right padding-bottom padding-left padding page page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position quotes resize resolution right richness scan size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress table-layout text-align top text-decoration text-indent text-justify text-overflow text-shadow text-transform transform transition transition-property unicode-bidi unicode-range units-per-em vertical-align visibility voice-family volume white-space widows width widths word-break word-spacing word-wrap x-height z-index zoom'.split(' '),
+			VALUES: 'above absolute all alpha always antialiased aqua armenian attr aural auto avoid background baseline behind below bicubic bidi-override black blink block blue bold bolder border-box both bottom break-all break-word braille capitalize caption center center-left center-right circle close-quote code collapse color compact condensed content-box continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero default digits disc dotted double ease embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside inter-ideograph invert italic justify landscape large larger left-side leftwards level lighter lime linear-gradient linear line-through list-item local loud lower-alpha lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once opacity open-quote outset outside overline padding-box pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal text-bottom text-top text thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin upper-roman url visible wait white wider width w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow'.split(' '),
 			COLORS: 'black silver gray white maroon red purple fuchsia green lime olive yellow navy blue teal aqua'.split(' ')
@@ -102,0 +102,0 @@ });

web/more.js

@@ -11,2 +11,3 @@ define(function(require, exports) {
 		fs = require('fs'),
+		suffix = 'css',
 		res,
@@ -101,6 +102,9 @@ node,
 					if(isImport && token.type() == Token.STRING) {
-						imports.push(token.val().replace(/\?.*$/, ''));
-						if(s.indexOf('.css') == -1 && !/\.\w+$/.test(s)) {
+						if(!/\.css['"]?$/.test(s)) {
 							s = s.replace(/(['"]?)$/, '.css$1');
+							imports.push(token.val() + '.css');
 						}
+						else {
+							imports.push(token.val());
+						}
 					}
@@ -376,2 +380,8 @@ res += s;
 	};
+	exports.suffix = function(s) {
+		if(s) {
+			suffix = s;
+		}
+		return suffix;
+	};
 	function removeImport(s) {
@@ -417,2 +427,5 @@ //0��ʼ��1�ַ���
 	function build(file, res, noImport) {
+		if(suffix != 'css') {
+			file = file.replace(/\.css$/, '.' + file);
+		}
 		var s = fs.readFileSync(file, {
@@ -419,0 +432,0 @@ encoding: 'utf-8'

web/parser/Node.js

@@ -62,5 +62,6 @@ define(function(require, exports, module) {
 			VARS: 'vars',
-			EXTEND: 'extend'
+			EXTEND: 'extend',
+			FORMAT: 'format'
 		});
 	module.exports = Node;
 });

web/parser/Parser.js

@@ -166,3 +166,8 @@ define(function(require, exports, module) {
 				style.add(this.match(':'));
-				value.add(this.match(Token.ID));
+				if(this.look.type() == Token.STRING) {
+					value.add(this.match());
+				}
+				else {
+					value.add(this.match(Token.ID));
+				}
 				style.add(value);
@@ -178,5 +183,40 @@ style.add(this.match(';'));
 				value.add(this.url());
+				if(this.look && this.look.content() == 'format') {
+					value.add(this.format());
+				}
+				while(this.look && this.look.content() == ',') {
+					value.add(this.match());
+					value.add(this.url());
+					if(this.look && this.look.content() == 'format') {
+						value.add(this.format());
+					}
+				}
 				style.add(value);
 				style.add(this.match(';'));
 				node2.add(style);
+				while(this.look && this.look.content() == 'src') {
+					style = new Node(Node.STYLE);
+					key = new Node(Node.KEY);
+					value = new Node(Node.VALUE);
+					key.add(this.match('src'));
+					style.add(key);
+					style.add(this.match(':'));
+					value.add(this.url());
+					if(this.look && this.look.content() == 'format') {
+						value.add(this.format());
+					}
+					while(this.look && this.look.content() == ',') {
+						value.add(this.match());
+						value.add(this.url());
+						if(this.look && this.look.content() == 'format') {
+							value.add(this.format());
+						}
+					}
+					style.add(value);
+					style.add(this.match(';'));
+					node2.add(style);
+				}
+				while(this.look && this.look.content() != '}') {
+					node2.add(this.style());
+				}
 				node2.add(this.match('}'));
@@ -357,2 +397,10 @@ node.add(node2);
 			},
+			format: function() {
+				var node = new Node(Node.FORMAT);
+				node.add(this.match());
+				node.add(this.match('('));
+				node.add(this.match(Token.STRING));
+				node.add(this.match(')'));
+				return node;
+			},
 			match: function(type, msg) {
@@ -359,0 +407,0 @@ //�������

New alerts

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Fixed alerts

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

414152

increased by0.87%

Lines of code

9563

increased by1.16%

Number of lines in readme file

67

increased by6.35%

No dependency changes