more-css - npm Package Compare versions

Comparing version 0.4.14 to 0.4.15

package.json

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

server/lexer/rule/CssRule.js

@@ -102,5 +102,5 @@ var Rule = require('./Rule'),
 		KEYWORDS: 'appearance ascent aspect-ratio azimuth backface-visibility 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-top-left-radius border-bottom-left-radius border-top-right-radius border-bottom-right-radius 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 transform-origin 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 ease-in ease-out ease-in-out embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed flipouttoleft flipouttoright flipouttotop flipouttobottom 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 rotate rotateX rotateY rtl run-in scale 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(' '),
+		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 ease-in ease-out ease-in-out embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed flipouttoleft flipouttoright flipouttotop flipouttobottom format fuchsia gray grayscale 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 rotate rotateX rotateY rtl run-in scale 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

@@ -482,3 +482,3 @@ var CssLexer = require('./lexer/CssLexer'),
 	});
-	var cur = file.replace(/\w+\.css$/, '');
+	var cur = file.replace(/[\w-]+\.(less|css)$/, '');
 	s = module.exports.parse(s, buildHash[file]);
@@ -492,3 +492,6 @@ if(!noImport) {
 				if(impt.charAt(0) == '.') {
-					impt = cur + impt.replace(/\w+\/\.\.\\/g, '').replace(/\.\//g, '');
+					impt = cur + impt.replace(/[\w-]+\.\css$/g, '');
+					while(impt.indexOf('../') > 0)
+						impt = impt.replace(/[\w-.]+[\\/]\.\.\//, '');
+					impt = impt.replace(/\.\//g, '');
 				}
@@ -510,3 +513,6 @@ else {
 				else {
-					impt = cur + impt.replace(/\w+\/\.\.\\/g, '').replace(/\.\//g, '');
+					impt = cur + impt.replace(/[\w-]+\.\css$/g, '');
+					while(impt.indexOf('../') > 0)
+						impt = impt.replace(/[\w-.]+[\\/]\.\.\//, '');
+					impt = impt.replace(/\.\//g, '');
 				}
@@ -513,0 +519,0 @@ }

server/parser/Node.js

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

server/parser/Parser.js

@@ -364,2 +364,5 @@ var Class = require('../util/Class'),
 							}
+							else if(token.content() == ';' || token.content() == '}') {
+								node.add(this.extend(true));
+							}
 							else {
@@ -394,5 +397,10 @@ node.add(this.styleset());
 		},
-		extend: function() {
+		extend: function(miss) {
 			var node = new Node(Node.EXTEND);
-			node.add(this.match());
+			if(!miss) {
+				node.add(this.match());
+			}
+			else {
+				node.add(new Node(Node.TOKEN, new Token(Token.VIRTUAL, '@extend')));
+			}
 			node.add(this.selectors());
@@ -399,0 +407,0 @@ node.add(this.match(';'));

web/lexer/rule/CssRule.js

@@ -103,3 +103,3 @@ define(function(require, exports, module) {
 			KEYWORDS: 'appearance ascent aspect-ratio azimuth backface-visibility 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-top-left-radius border-bottom-left-radius border-top-right-radius border-bottom-right-radius 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 transform-origin 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 ease-in ease-out ease-in-out embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed flipouttoleft flipouttoright flipouttotop flipouttobottom 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 rotate rotateX rotateY rtl run-in scale 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(' '),
+			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 ease-in ease-out ease-in-out embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed flipouttoleft flipouttoright flipouttotop flipouttobottom format fuchsia gray grayscale 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 rotate rotateX rotateY rtl run-in scale 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(' ')
@@ -106,0 +106,0 @@ });

web/more.js

@@ -483,3 +483,3 @@ define(function(require, exports) {
 		});
-		var cur = file.replace(/\w+\.css$/, '');
+		var cur = file.replace(/[\w-]+\.(less|css)$/, '');
 		s = module.exports.parse(s, buildHash[file]);
@@ -493,3 +493,6 @@ if(!noImport) {
 					if(impt.charAt(0) == '.') {
-						impt = cur + impt.replace(/\w+\/\.\.\\/g, '').replace(/\.\//g, '');
+						impt = cur + impt.replace(/[\w-]+\.\css$/g, '');
+						while(impt.indexOf('../') > 0)
+							impt = impt.replace(/[\w-.]+[\\/]\.\.\//, '');
+						impt = impt.replace(/\.\//g, '');
 					}
@@ -511,3 +514,6 @@ else {
 					else {
-						impt = cur + impt.replace(/\w+\/\.\.\\/g, '').replace(/\.\//g, '');
+						impt = cur + impt.replace(/[\w-]+\.\css$/g, '');
+						while(impt.indexOf('../') > 0)
+							impt = impt.replace(/[\w-.]+[\\/]\.\.\//, '');
+						impt = impt.replace(/\.\//g, '');
 					}
@@ -514,0 +520,0 @@ }

web/parser/Node.js

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

web/parser/Parser.js

@@ -365,2 +365,5 @@ define(function(require, exports, module) {
 								}
+								else if(token.content() == ';' || token.content() == '}') {
+									node.add(this.extend(true));
+								}
 								else {
@@ -395,5 +398,10 @@ node.add(this.styleset());
 			},
-			extend: function() {
+			extend: function(miss) {
 				var node = new Node(Node.EXTEND);
-				node.add(this.match());
+				if(!miss) {
+					node.add(this.match());
+				}
+				else {
+					node.add(new Node(Node.TOKEN, new Token(Token.VIRTUAL, '@extend')));
+				}
 				node.add(this.selectors());
@@ -400,0 +408,0 @@ node.add(this.match(';'));

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

426133

increased by0.26%

Number of package files

76

increased by1.33%

Lines of code

9965

increased by0.26%

No dependency changes