From a827cb754605a5a6505b0528ddcf0fdfbc51c35c Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Fri, 28 Jun 2019 14:24:56 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02226:=20Upgrade=20ScssPHP=20to=20v1.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/utils.inc.php | 4 +- lib/scssphp/LICENSE.md | 2 +- lib/scssphp/README.md | 8 +- lib/scssphp/bin/pscss | 29 +- lib/scssphp/scss.inc.php | 18 +- lib/scssphp/src/Base/Range.php | 9 +- lib/scssphp/src/Block.php | 26 +- lib/scssphp/src/Colors.php | 159 +- lib/scssphp/src/Compiler.php | 4142 ++++++++++++++--- lib/scssphp/src/Compiler/Environment.php | 19 +- .../src/Exception/CompilerException.php | 7 +- lib/scssphp/src/Exception/ParserException.php | 7 +- lib/scssphp/src/Exception/ServerException.php | 7 +- lib/scssphp/src/Formatter.php | 143 +- lib/scssphp/src/Formatter/Compact.php | 15 +- lib/scssphp/src/Formatter/Compressed.php | 42 +- lib/scssphp/src/Formatter/Crunched.php | 42 +- lib/scssphp/src/Formatter/Debug.php | 48 +- lib/scssphp/src/Formatter/Expanded.php | 29 +- lib/scssphp/src/Formatter/Nested.php | 85 +- lib/scssphp/src/Formatter/OutputBlock.php | 29 +- lib/scssphp/src/Node.php | 10 +- lib/scssphp/src/Node/Number.php | 145 +- lib/scssphp/src/Parser.php | Bin 57759 -> 71077 bytes lib/scssphp/src/Server.php | 364 -- lib/scssphp/src/Type.php | 7 +- lib/scssphp/src/Util.php | 45 +- lib/scssphp/src/Version.php | 9 +- setup/licenses/community-licences.xml | 4 +- 29 files changed, 4152 insertions(+), 1302 deletions(-) mode change 100644 => 100755 lib/scssphp/bin/pscss delete mode 100644 lib/scssphp/src/Server.php diff --git a/application/utils.inc.php b/application/utils.inc.php index 5ed9f79ff..7e370e5a1 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -1,6 +1,6 @@ setImportPaths($aImportPaths); - $oScss->setFormatter('Leafo\\ScssPhp\\Formatter\\Expanded'); + $oScss->setFormatter('ScssPhp\\ScssPhp\\Formatter\\Expanded'); // Temporary disabling max exec time while compiling $iCurrentMaxExecTime = (int) ini_get('max_execution_time'); set_time_limit(0); diff --git a/lib/scssphp/LICENSE.md b/lib/scssphp/LICENSE.md index 2f5412f9b..afcfdfb26 100644 --- a/lib/scssphp/LICENSE.md +++ b/lib/scssphp/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2015 Leaf Corcoran, http://leafo.github.io/scssphp +Copyright (c) 2015 Leaf Corcoran, http://scssphp.github.io/scssphp Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/lib/scssphp/README.md b/lib/scssphp/README.md index 53a4c7a41..d08b31b2a 100644 --- a/lib/scssphp/README.md +++ b/lib/scssphp/README.md @@ -1,12 +1,12 @@ # scssphp -### +### -[![Build](https://travis-ci.org/leafo/scssphp.svg?branch=master)](http://travis-ci.org/leafo/scssphp) -[![License](https://poser.pugx.org/leafo/scssphp/license.svg)](https://packagist.org/packages/leafo/scssphp) +[![Build](https://travis-ci.org/scssphp/scssphp.svg?branch=master)](http://travis-ci.org/scssphp/scssphp) +[![License](https://poser.pugx.org/scssphp/scssphp/license.svg)](https://packagist.org/packages/scssphp/scssphp) `scssphp` is a compiler for SCSS written in PHP. -Checkout the homepage, , for directions on how to use. +Checkout the homepage, , for directions on how to use. ## Running Tests diff --git a/lib/scssphp/bin/pscss b/lib/scssphp/bin/pscss old mode 100644 new mode 100755 index 3175ea0b6..811f8cbe5 --- a/lib/scssphp/bin/pscss +++ b/lib/scssphp/bin/pscss @@ -3,11 +3,11 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ error_reporting(E_ALL); @@ -18,9 +18,9 @@ if (version_compare(PHP_VERSION, '5.4') < 0) { include __DIR__ . '/../scss.inc.php'; -use Leafo\ScssPhp\Compiler; -use Leafo\ScssPhp\Parser; -use Leafo\ScssPhp\Version; +use ScssPhp\ScssPhp\Compiler; +use ScssPhp\ScssPhp\Parser; +use ScssPhp\ScssPhp\Version; $style = null; $loadPaths = null; @@ -32,6 +32,7 @@ $debugInfo = false; $lineNumbers = false; $ignoreErrors = false; $encoding = false; +$sourceMap = false; /** * Parse argument @@ -76,7 +77,8 @@ Options include: -i=path Set import path --iso8859-1 Use iso8859-1 encoding instead of utf-8 (default utf-8) --line-numbers Annotate selectors with comments referring to the source file and line number - -p=precision Set decimal number precision (default 5) + -p=precision Set decimal number precision (default 10) + --sourcemap Create source map file -T Dump formatted parse tree -v, --version Print the version @@ -108,6 +110,11 @@ EOT; continue; } + if ($argv[$i] === '--sourcemap') { + $sourceMap = true; + continue; + } + if ($argv[$i] === '-T') { $dumpTree = true; continue; @@ -169,11 +176,11 @@ if ($dumpTree) { $scss = new Compiler(); -if ($debugInfo && $inputFile) { +if ($debugInfo) { $scss->setLineNumberStyle(Compiler::DEBUG_INFO); } -if ($lineNumbers && $inputFile) { +if ($lineNumbers) { $scss->setLineNumberStyle(Compiler::LINE_COMMENTS); } @@ -190,7 +197,11 @@ if ($precision) { } if ($style) { - $scss->setFormatter('Leafo\\ScssPhp\\Formatter\\' . ucfirst($style)); + $scss->setFormatter('ScssPhp\\ScssPhp\\Formatter\\' . ucfirst($style)); +} + +if ($sourceMap) { + $scss->setSourceMap(Compiler::SOURCE_MAP_INLINE); } if ($encoding) { diff --git a/lib/scssphp/scss.inc.php b/lib/scssphp/scss.inc.php index 018f0965d..e4ec7f181 100644 --- a/lib/scssphp/scss.inc.php +++ b/lib/scssphp/scss.inc.php @@ -1,20 +1,18 @@ first = $first; $this->last = $last; } + /** * Test for inclusion in range * diff --git a/lib/scssphp/src/Block.php b/lib/scssphp/src/Block.php index 2862a64df..bb1afdd4b 100644 --- a/lib/scssphp/src/Block.php +++ b/lib/scssphp/src/Block.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp; + +namespace ScssPhp\ScssPhp; /** * Block @@ -21,32 +22,49 @@ class Block * @var string */ public $type; + /** - * @var \Leafo\ScssPhp\Block + * @var \ScssPhp\ScssPhp\Block */ public $parent; + + /** + * @var string + */ + public $sourceName; + /** * @var integer */ public $sourceIndex; + /** * @var integer */ public $sourceLine; + /** * @var integer */ public $sourceColumn; + /** * @var array */ public $selectors; + /** * @var array */ public $comments; + /** * @var array */ public $children; + + /** + * @var \ScssPhp\ScssPhp\Block + */ + public $selfParent; } diff --git a/lib/scssphp/src/Colors.php b/lib/scssphp/src/Colors.php index 9d4531c7c..ad459246a 100644 --- a/lib/scssphp/src/Colors.php +++ b/lib/scssphp/src/Colors.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp; + +namespace ScssPhp\ScssPhp; /** * CSS Colors @@ -24,5 +25,155 @@ class Colors * * @var array */ - public static $cssColors = array('aliceblue' => '240,248,255', 'antiquewhite' => '250,235,215', 'aqua' => '0,255,255', 'aquamarine' => '127,255,212', 'azure' => '240,255,255', 'beige' => '245,245,220', 'bisque' => '255,228,196', 'black' => '0,0,0', 'blanchedalmond' => '255,235,205', 'blue' => '0,0,255', 'blueviolet' => '138,43,226', 'brown' => '165,42,42', 'burlywood' => '222,184,135', 'cadetblue' => '95,158,160', 'chartreuse' => '127,255,0', 'chocolate' => '210,105,30', 'coral' => '255,127,80', 'cornflowerblue' => '100,149,237', 'cornsilk' => '255,248,220', 'crimson' => '220,20,60', 'cyan' => '0,255,255', 'darkblue' => '0,0,139', 'darkcyan' => '0,139,139', 'darkgoldenrod' => '184,134,11', 'darkgray' => '169,169,169', 'darkgreen' => '0,100,0', 'darkgrey' => '169,169,169', 'darkkhaki' => '189,183,107', 'darkmagenta' => '139,0,139', 'darkolivegreen' => '85,107,47', 'darkorange' => '255,140,0', 'darkorchid' => '153,50,204', 'darkred' => '139,0,0', 'darksalmon' => '233,150,122', 'darkseagreen' => '143,188,143', 'darkslateblue' => '72,61,139', 'darkslategray' => '47,79,79', 'darkslategrey' => '47,79,79', 'darkturquoise' => '0,206,209', 'darkviolet' => '148,0,211', 'deeppink' => '255,20,147', 'deepskyblue' => '0,191,255', 'dimgray' => '105,105,105', 'dimgrey' => '105,105,105', 'dodgerblue' => '30,144,255', 'firebrick' => '178,34,34', 'floralwhite' => '255,250,240', 'forestgreen' => '34,139,34', 'fuchsia' => '255,0,255', 'gainsboro' => '220,220,220', 'ghostwhite' => '248,248,255', 'gold' => '255,215,0', 'goldenrod' => '218,165,32', 'gray' => '128,128,128', 'green' => '0,128,0', 'greenyellow' => '173,255,47', 'grey' => '128,128,128', 'honeydew' => '240,255,240', 'hotpink' => '255,105,180', 'indianred' => '205,92,92', 'indigo' => '75,0,130', 'ivory' => '255,255,240', 'khaki' => '240,230,140', 'lavender' => '230,230,250', 'lavenderblush' => '255,240,245', 'lawngreen' => '124,252,0', 'lemonchiffon' => '255,250,205', 'lightblue' => '173,216,230', 'lightcoral' => '240,128,128', 'lightcyan' => '224,255,255', 'lightgoldenrodyellow' => '250,250,210', 'lightgray' => '211,211,211', 'lightgreen' => '144,238,144', 'lightgrey' => '211,211,211', 'lightpink' => '255,182,193', 'lightsalmon' => '255,160,122', 'lightseagreen' => '32,178,170', 'lightskyblue' => '135,206,250', 'lightslategray' => '119,136,153', 'lightslategrey' => '119,136,153', 'lightsteelblue' => '176,196,222', 'lightyellow' => '255,255,224', 'lime' => '0,255,0', 'limegreen' => '50,205,50', 'linen' => '250,240,230', 'magenta' => '255,0,255', 'maroon' => '128,0,0', 'mediumaquamarine' => '102,205,170', 'mediumblue' => '0,0,205', 'mediumorchid' => '186,85,211', 'mediumpurple' => '147,112,219', 'mediumseagreen' => '60,179,113', 'mediumslateblue' => '123,104,238', 'mediumspringgreen' => '0,250,154', 'mediumturquoise' => '72,209,204', 'mediumvioletred' => '199,21,133', 'midnightblue' => '25,25,112', 'mintcream' => '245,255,250', 'mistyrose' => '255,228,225', 'moccasin' => '255,228,181', 'navajowhite' => '255,222,173', 'navy' => '0,0,128', 'oldlace' => '253,245,230', 'olive' => '128,128,0', 'olivedrab' => '107,142,35', 'orange' => '255,165,0', 'orangered' => '255,69,0', 'orchid' => '218,112,214', 'palegoldenrod' => '238,232,170', 'palegreen' => '152,251,152', 'paleturquoise' => '175,238,238', 'palevioletred' => '219,112,147', 'papayawhip' => '255,239,213', 'peachpuff' => '255,218,185', 'peru' => '205,133,63', 'pink' => '255,192,203', 'plum' => '221,160,221', 'powderblue' => '176,224,230', 'purple' => '128,0,128', 'rebeccapurple' => '102,51,153', 'red' => '255,0,0', 'rosybrown' => '188,143,143', 'royalblue' => '65,105,225', 'saddlebrown' => '139,69,19', 'salmon' => '250,128,114', 'sandybrown' => '244,164,96', 'seagreen' => '46,139,87', 'seashell' => '255,245,238', 'sienna' => '160,82,45', 'silver' => '192,192,192', 'skyblue' => '135,206,235', 'slateblue' => '106,90,205', 'slategray' => '112,128,144', 'slategrey' => '112,128,144', 'snow' => '255,250,250', 'springgreen' => '0,255,127', 'steelblue' => '70,130,180', 'tan' => '210,180,140', 'teal' => '0,128,128', 'thistle' => '216,191,216', 'tomato' => '255,99,71', 'transparent' => '0,0,0,0', 'turquoise' => '64,224,208', 'violet' => '238,130,238', 'wheat' => '245,222,179', 'white' => '255,255,255', 'whitesmoke' => '245,245,245', 'yellow' => '255,255,0', 'yellowgreen' => '154,205,50'); + public static $cssColors = [ + 'aliceblue' => '240,248,255', + 'antiquewhite' => '250,235,215', + 'aqua' => '0,255,255', + 'aquamarine' => '127,255,212', + 'azure' => '240,255,255', + 'beige' => '245,245,220', + 'bisque' => '255,228,196', + 'black' => '0,0,0', + 'blanchedalmond' => '255,235,205', + 'blue' => '0,0,255', + 'blueviolet' => '138,43,226', + 'brown' => '165,42,42', + 'burlywood' => '222,184,135', + 'cadetblue' => '95,158,160', + 'chartreuse' => '127,255,0', + 'chocolate' => '210,105,30', + 'coral' => '255,127,80', + 'cornflowerblue' => '100,149,237', + 'cornsilk' => '255,248,220', + 'crimson' => '220,20,60', + 'cyan' => '0,255,255', + 'darkblue' => '0,0,139', + 'darkcyan' => '0,139,139', + 'darkgoldenrod' => '184,134,11', + 'darkgray' => '169,169,169', + 'darkgreen' => '0,100,0', + 'darkgrey' => '169,169,169', + 'darkkhaki' => '189,183,107', + 'darkmagenta' => '139,0,139', + 'darkolivegreen' => '85,107,47', + 'darkorange' => '255,140,0', + 'darkorchid' => '153,50,204', + 'darkred' => '139,0,0', + 'darksalmon' => '233,150,122', + 'darkseagreen' => '143,188,143', + 'darkslateblue' => '72,61,139', + 'darkslategray' => '47,79,79', + 'darkslategrey' => '47,79,79', + 'darkturquoise' => '0,206,209', + 'darkviolet' => '148,0,211', + 'deeppink' => '255,20,147', + 'deepskyblue' => '0,191,255', + 'dimgray' => '105,105,105', + 'dimgrey' => '105,105,105', + 'dodgerblue' => '30,144,255', + 'firebrick' => '178,34,34', + 'floralwhite' => '255,250,240', + 'forestgreen' => '34,139,34', + 'fuchsia' => '255,0,255', + 'gainsboro' => '220,220,220', + 'ghostwhite' => '248,248,255', + 'gold' => '255,215,0', + 'goldenrod' => '218,165,32', + 'gray' => '128,128,128', + 'green' => '0,128,0', + 'greenyellow' => '173,255,47', + 'grey' => '128,128,128', + 'honeydew' => '240,255,240', + 'hotpink' => '255,105,180', + 'indianred' => '205,92,92', + 'indigo' => '75,0,130', + 'ivory' => '255,255,240', + 'khaki' => '240,230,140', + 'lavender' => '230,230,250', + 'lavenderblush' => '255,240,245', + 'lawngreen' => '124,252,0', + 'lemonchiffon' => '255,250,205', + 'lightblue' => '173,216,230', + 'lightcoral' => '240,128,128', + 'lightcyan' => '224,255,255', + 'lightgoldenrodyellow' => '250,250,210', + 'lightgray' => '211,211,211', + 'lightgreen' => '144,238,144', + 'lightgrey' => '211,211,211', + 'lightpink' => '255,182,193', + 'lightsalmon' => '255,160,122', + 'lightseagreen' => '32,178,170', + 'lightskyblue' => '135,206,250', + 'lightslategray' => '119,136,153', + 'lightslategrey' => '119,136,153', + 'lightsteelblue' => '176,196,222', + 'lightyellow' => '255,255,224', + 'lime' => '0,255,0', + 'limegreen' => '50,205,50', + 'linen' => '250,240,230', + 'magenta' => '255,0,255', + 'maroon' => '128,0,0', + 'mediumaquamarine' => '102,205,170', + 'mediumblue' => '0,0,205', + 'mediumorchid' => '186,85,211', + 'mediumpurple' => '147,112,219', + 'mediumseagreen' => '60,179,113', + 'mediumslateblue' => '123,104,238', + 'mediumspringgreen' => '0,250,154', + 'mediumturquoise' => '72,209,204', + 'mediumvioletred' => '199,21,133', + 'midnightblue' => '25,25,112', + 'mintcream' => '245,255,250', + 'mistyrose' => '255,228,225', + 'moccasin' => '255,228,181', + 'navajowhite' => '255,222,173', + 'navy' => '0,0,128', + 'oldlace' => '253,245,230', + 'olive' => '128,128,0', + 'olivedrab' => '107,142,35', + 'orange' => '255,165,0', + 'orangered' => '255,69,0', + 'orchid' => '218,112,214', + 'palegoldenrod' => '238,232,170', + 'palegreen' => '152,251,152', + 'paleturquoise' => '175,238,238', + 'palevioletred' => '219,112,147', + 'papayawhip' => '255,239,213', + 'peachpuff' => '255,218,185', + 'peru' => '205,133,63', + 'pink' => '255,192,203', + 'plum' => '221,160,221', + 'powderblue' => '176,224,230', + 'purple' => '128,0,128', + 'rebeccapurple' => '102,51,153', + 'red' => '255,0,0', + 'rosybrown' => '188,143,143', + 'royalblue' => '65,105,225', + 'saddlebrown' => '139,69,19', + 'salmon' => '250,128,114', + 'sandybrown' => '244,164,96', + 'seagreen' => '46,139,87', + 'seashell' => '255,245,238', + 'sienna' => '160,82,45', + 'silver' => '192,192,192', + 'skyblue' => '135,206,235', + 'slateblue' => '106,90,205', + 'slategray' => '112,128,144', + 'slategrey' => '112,128,144', + 'snow' => '255,250,250', + 'springgreen' => '0,255,127', + 'steelblue' => '70,130,180', + 'tan' => '210,180,140', + 'teal' => '0,128,128', + 'thistle' => '216,191,216', + 'tomato' => '255,99,71', + 'transparent' => '0,0,0,0', + 'turquoise' => '64,224,208', + 'violet' => '238,130,238', + 'wheat' => '245,222,179', + 'white' => '255,255,255', + 'whitesmoke' => '245,245,245', + 'yellow' => '255,255,0', + 'yellowgreen' => '154,205,50', + ]; } diff --git a/lib/scssphp/src/Compiler.php b/lib/scssphp/src/Compiler.php index cd0a33ecd..3446aeab9 100644 --- a/lib/scssphp/src/Compiler.php +++ b/lib/scssphp/src/Compiler.php @@ -2,24 +2,28 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp; -use Leafo\ScssPhp\Base\Range; -use Leafo\ScssPhp\Block; -use Leafo\ScssPhp\Colors; -use Leafo\ScssPhp\Compiler\Environment; -use Leafo\ScssPhp\Exception\CompilerException; -use Leafo\ScssPhp\Formatter\OutputBlock; -use Leafo\ScssPhp\Node; -use Leafo\ScssPhp\Type; -use Leafo\ScssPhp\Parser; -use Leafo\ScssPhp\Util; +namespace ScssPhp\ScssPhp; + +use ScssPhp\ScssPhp\Base\Range; +use ScssPhp\ScssPhp\Block; +use ScssPhp\ScssPhp\Cache; +use ScssPhp\ScssPhp\Colors; +use ScssPhp\ScssPhp\Compiler\Environment; +use ScssPhp\ScssPhp\Exception\CompilerException; +use ScssPhp\ScssPhp\Formatter\OutputBlock; +use ScssPhp\ScssPhp\Node; +use ScssPhp\ScssPhp\SourceMap\SourceMapGenerator; +use ScssPhp\ScssPhp\Type; +use ScssPhp\ScssPhp\Parser; +use ScssPhp\ScssPhp\Util; + /** * The scss compiler and parser. * @@ -46,6 +50,7 @@ use Leafo\ScssPhp\Util; * The `Formatter` takes a CSS tree, and dumps it to a formatted string, * handling things like indentation. */ + /** * SCSS compiler * @@ -54,66 +59,137 @@ use Leafo\ScssPhp\Util; class Compiler { const LINE_COMMENTS = 1; - const DEBUG_INFO = 2; - const WITH_RULE = 1; - const WITH_MEDIA = 2; + const DEBUG_INFO = 2; + + const WITH_RULE = 1; + const WITH_MEDIA = 2; const WITH_SUPPORTS = 4; - const WITH_ALL = 7; + const WITH_ALL = 7; + + const SOURCE_MAP_NONE = 0; + const SOURCE_MAP_INLINE = 1; + const SOURCE_MAP_FILE = 2; + /** * @var array */ - protected static $operatorNames = array('+' => 'add', '-' => 'sub', '*' => 'mul', '/' => 'div', '%' => 'mod', '==' => 'eq', '!=' => 'neq', '<' => 'lt', '>' => 'gt', '<=' => 'lte', '>=' => 'gte', '<=>' => 'cmp'); + static protected $operatorNames = [ + '+' => 'add', + '-' => 'sub', + '*' => 'mul', + '/' => 'div', + '%' => 'mod', + + '==' => 'eq', + '!=' => 'neq', + '<' => 'lt', + '>' => 'gt', + + '<=' => 'lte', + '>=' => 'gte', + '<=>' => 'cmp', + ]; + /** * @var array */ - protected static $namespaces = array('special' => '%', 'mixin' => '@', 'function' => '^'); - public static $true = array(Type::T_KEYWORD, 'true'); - public static $false = array(Type::T_KEYWORD, 'false'); - public static $null = array(Type::T_NULL); - public static $nullString = array(Type::T_STRING, '', array()); - public static $defaultValue = array(Type::T_KEYWORD, ''); - public static $selfSelector = array(Type::T_SELF); - public static $emptyList = array(Type::T_LIST, '', array()); - public static $emptyMap = array(Type::T_MAP, array(), array()); - public static $emptyString = array(Type::T_STRING, '"', array()); - public static $with = array(Type::T_KEYWORD, 'with'); - public static $without = array(Type::T_KEYWORD, 'without'); - protected $importPaths = array(''); - protected $importCache = array(); - protected $importedFiles = array(); - protected $userFunctions = array(); - protected $registeredVars = array(); - protected $registeredFeatures = array('extend-selector-pseudoclass' => false, 'at-error' => true, 'units-level-3' => false, 'global-variable-shadowing' => false); + static protected $namespaces = [ + 'special' => '%', + 'mixin' => '@', + 'function' => '^', + ]; + + static public $true = [Type::T_KEYWORD, 'true']; + static public $false = [Type::T_KEYWORD, 'false']; + static public $null = [Type::T_NULL]; + static public $nullString = [Type::T_STRING, '', []]; + static public $defaultValue = [Type::T_KEYWORD, '']; + static public $selfSelector = [Type::T_SELF]; + static public $emptyList = [Type::T_LIST, '', []]; + static public $emptyMap = [Type::T_MAP, [], []]; + static public $emptyString = [Type::T_STRING, '"', []]; + static public $with = [Type::T_KEYWORD, 'with']; + static public $without = [Type::T_KEYWORD, 'without']; + + protected $importPaths = ['']; + protected $importCache = []; + protected $importedFiles = []; + protected $userFunctions = []; + protected $registeredVars = []; + protected $registeredFeatures = [ + 'extend-selector-pseudoclass' => false, + 'at-error' => true, + 'units-level-3' => false, + 'global-variable-shadowing' => false, + ]; + protected $encoding = null; protected $lineNumberStyle = null; - protected $formatter = 'Leafo\\ScssPhp\\Formatter\\Nested'; + + protected $sourceMap = self::SOURCE_MAP_NONE; + protected $sourceMapOptions = []; + + /** + * @var string|\ScssPhp\ScssPhp\Formatter + */ + protected $formatter = 'ScssPhp\ScssPhp\Formatter\Nested'; + protected $rootEnv; protected $rootBlock; + + /** + * @var \ScssPhp\ScssPhp\Compiler\Environment + */ protected $env; protected $scope; protected $storeEnv; protected $charsetSeen; protected $sourceNames; - private $indentLevel; - private $commentsSeen; - private $extends; - private $extendsMap; - private $parsedFiles; - private $parser; - private $sourceIndex; - private $sourceLine; - private $sourceColumn; - private $stderr; - private $shouldEvaluate; - private $ignoreErrors; + + protected $cache; + + protected $indentLevel; + protected $extends; + protected $extendsMap; + protected $parsedFiles; + protected $parser; + protected $sourceIndex; + protected $sourceLine; + protected $sourceColumn; + protected $stderr; + protected $shouldEvaluate; + protected $ignoreErrors; + + protected $callStack = []; + /** * Constructor */ - public function __construct() + public function __construct($cacheOptions = null) { - $this->parsedFiles = array(); - $this->sourceNames = array(); + $this->parsedFiles = []; + $this->sourceNames = []; + + if ($cacheOptions) { + $this->cache = new Cache($cacheOptions); + } } + + public function getCompileOptions() + { + $options = [ + 'importPaths' => $this->importPaths, + 'registeredVars' => $this->registeredVars, + 'registeredFeatures' => $this->registeredFeatures, + 'encoding' => $this->encoding, + 'sourceMap' => serialize($this->sourceMap), + 'sourceMapOptions' => $this->sourceMapOptions, + 'formatter' => $this->formatter, + ]; + + return $options; + } + /** * Compile scss * @@ -126,48 +202,116 @@ class Compiler */ public function compile($code, $path = null) { - $locale = setlocale(LC_NUMERIC, 0); - setlocale(LC_NUMERIC, 'C'); - $this->indentLevel = -1; - $this->commentsSeen = array(); - $this->extends = array(); - $this->extendsMap = array(); - $this->sourceIndex = null; - $this->sourceLine = null; - $this->sourceColumn = null; - $this->env = null; - $this->scope = null; - $this->storeEnv = null; - $this->charsetSeen = null; + if ($this->cache) { + $cacheKey = ($path ? $path : "(stdin)") . ":" . md5($code); + $compileOptions = $this->getCompileOptions(); + $cache = $this->cache->getCache("compile", $cacheKey, $compileOptions); + + if (is_array($cache) + && isset($cache['dependencies']) + && isset($cache['out']) + ) { + // check if any dependency file changed before accepting the cache + foreach ($cache['dependencies'] as $file => $mtime) { + if (! file_exists($file) + || filemtime($file) !== $mtime + ) { + unset($cache); + break; + } + } + + if (isset($cache)) { + return $cache['out']; + } + } + } + + + $this->indentLevel = -1; + $this->extends = []; + $this->extendsMap = []; + $this->sourceIndex = null; + $this->sourceLine = null; + $this->sourceColumn = null; + $this->env = null; + $this->scope = null; + $this->storeEnv = null; + $this->charsetSeen = null; $this->shouldEvaluate = null; - $this->stderr = fopen('php://stderr', 'w'); + $this->stderr = fopen('php://stderr', 'w'); + $this->parser = $this->parserFactory($path); $tree = $this->parser->parse($code); $this->parser = null; + $this->formatter = new $this->formatter(); $this->rootBlock = null; - $this->rootEnv = $this->pushEnv($tree); + $this->rootEnv = $this->pushEnv($tree); + $this->injectVariables($this->registeredVars); $this->compileRoot($tree); $this->popEnv(); - $out = $this->formatter->format($this->scope); - setlocale(LC_NUMERIC, $locale); + + $sourceMapGenerator = null; + + if ($this->sourceMap) { + if (is_object($this->sourceMap) && $this->sourceMap instanceof SourceMapGenerator) { + $sourceMapGenerator = $this->sourceMap; + $this->sourceMap = self::SOURCE_MAP_FILE; + } elseif ($this->sourceMap !== self::SOURCE_MAP_NONE) { + $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions); + } + } + + $out = $this->formatter->format($this->scope, $sourceMapGenerator); + + if (! empty($out) && $this->sourceMap && $this->sourceMap !== self::SOURCE_MAP_NONE) { + $sourceMap = $sourceMapGenerator->generateJson(); + $sourceMapUrl = null; + + switch ($this->sourceMap) { + case self::SOURCE_MAP_INLINE: + $sourceMapUrl = sprintf('data:application/json,%s', Util::encodeURIComponent($sourceMap)); + break; + + case self::SOURCE_MAP_FILE: + $sourceMapUrl = $sourceMapGenerator->saveMap($sourceMap); + break; + } + + $out .= sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl); + } + + if ($this->cache && isset($cacheKey) && isset($compileOptions)) { + $v = [ + 'dependencies' => $this->getParsedFiles(), + 'out' => &$out, + ]; + + $this->cache->setCache("compile", $cacheKey, $v, $compileOptions); + } + return $out; } + /** * Instantiate parser * * @param string $path * - * @return \Leafo\ScssPhp\Parser + * @return \ScssPhp\ScssPhp\Parser */ protected function parserFactory($path) { - $parser = new Parser($path, count($this->sourceNames), $this->encoding); + $parser = new Parser($path, count($this->sourceNames), $this->encoding, $this->cache); + $this->sourceNames[] = $path; $this->addParsedFile($path); + return $parser; } + /** * Is self extend? * @@ -183,8 +327,10 @@ class Compiler return true; } } + return false; } + /** * Push extends * @@ -197,47 +343,64 @@ class Compiler if ($this->isSelfExtend($target, $origin)) { return; } + $i = count($this->extends); - $this->extends[] = array($target, $origin, $block); + $this->extends[] = [$target, $origin, $block]; + foreach ($target as $part) { if (isset($this->extendsMap[$part])) { $this->extendsMap[$part][] = $i; } else { - $this->extendsMap[$part] = array($i); + $this->extendsMap[$part] = [$i]; } } } + /** * Make output block * * @param string $type * @param array $selectors * - * @return \Leafo\ScssPhp\Formatter\OutputBlock + * @return \ScssPhp\ScssPhp\Formatter\OutputBlock */ protected function makeOutputBlock($type, $selectors = null) { - $out = new OutputBlock(); - $out->type = $type; - $out->lines = array(); - $out->children = array(); - $out->parent = $this->scope; - $out->selectors = $selectors; - $out->depth = $this->env->depth; + $out = new OutputBlock; + $out->type = $type; + $out->lines = []; + $out->children = []; + $out->parent = $this->scope; + $out->selectors = $selectors; + $out->depth = $this->env->depth; + + if ($this->env->block instanceof Block) { + $out->sourceName = $this->env->block->sourceName; + $out->sourceLine = $this->env->block->sourceLine; + $out->sourceColumn = $this->env->block->sourceColumn; + } else { + $out->sourceName = null; + $out->sourceLine = null; + $out->sourceColumn = null; + } + return $out; } + /** * Compile root * - * @param \Leafo\ScssPhp\Block $rootBlock + * @param \ScssPhp\ScssPhp\Block $rootBlock */ protected function compileRoot(Block $rootBlock) { $this->rootBlock = $this->scope = $this->makeOutputBlock(Type::T_ROOT); + $this->compileChildrenNoReturn($rootBlock->children, $this->scope); $this->flattenSelectors($this->scope); $this->missingSelectors(); } + /** * Report missing selectors */ @@ -247,63 +410,112 @@ class Compiler if (isset($extend[3])) { continue; } + list($target, $origin, $block) = $extend; + // ignore if !optional if ($block[2]) { continue; } + $target = implode(' ', $target); $origin = $this->collapseSelectors($origin); + $this->sourceLine = $block[Parser::SOURCE_LINE]; - $this->throwError("\"{$origin}\" failed to @extend \"{$target}\". The selector \"{$target}\" was not found."); + $this->throwError("\"$origin\" failed to @extend \"$target\". The selector \"$target\" was not found."); } } + /** * Flatten selectors * - * @param \Leafo\ScssPhp\Formatter\OutputBlock $block - * @param string $parentKey + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block + * @param string $parentKey */ protected function flattenSelectors(OutputBlock $block, $parentKey = null) { if ($block->selectors) { - $selectors = array(); + $selectors = []; + foreach ($block->selectors as $s) { $selectors[] = $s; - if (!is_array($s)) { + + if (! is_array($s)) { continue; } + // check extends - if (!empty($this->extendsMap)) { + if (! empty($this->extendsMap)) { $this->matchExtends($s, $selectors); + // remove duplicates array_walk($selectors, function (&$value) { $value = serialize($value); }); + $selectors = array_unique($selectors); + array_walk($selectors, function (&$value) { $value = unserialize($value); }); } } - $block->selectors = array(); + + $block->selectors = []; $placeholderSelector = false; + foreach ($selectors as $selector) { if ($this->hasSelectorPlaceholder($selector)) { $placeholderSelector = true; continue; } + $block->selectors[] = $this->compileSelector($selector); } + if ($placeholderSelector && 0 === count($block->selectors) && null !== $parentKey) { unset($block->parent->children[$parentKey]); + return; } } + foreach ($block->children as $key => $child) { $this->flattenSelectors($child, $key); } } + + /** + * Glue parts of :not( or :nth-child( ... that are in general splitted in selectors parts + * + * @param array $parts + * + * @return array + */ + protected function glueFunctionSelectors($parts) + { + $new = []; + + foreach ($parts as $part) { + if (is_array($part)) { + $part = $this->glueFunctionSelectors($part); + $new[] = $part; + } else { + // a selector part finishing with a ) is the last part of a :not( or :nth-child( + // and need to be joined to this + if (count($new) && is_string($new[count($new) - 1]) + && strlen($part) && substr($part, -1) === ')' && strpos($part, '(') === false + ) { + $new[count($new) - 1] .= $part; + } else { + $new[] = $part; + } + } + } + + return $new; + } + /** * Match extends * @@ -314,38 +526,109 @@ class Compiler */ protected function matchExtends($selector, &$out, $from = 0, $initial = true) { + static $partsPile = []; + + $selector = $this->glueFunctionSelectors($selector); + foreach ($selector as $i => $part) { if ($i < $from) { continue; } - if ($this->matchExtendsSingle($part, $origin)) { - $before = array_slice($selector, 0, $i); - $after = array_slice($selector, $i + 1); - $s = count($before); - foreach ($origin as $new) { - $k = 0; - // remove shared parts - if ($initial) { - while ($k < $s && isset($new[$k]) && $before[$k] === $new[$k]) { - $k++; - } - } - $result = array_merge($before, $k > 0 ? array_slice($new, $k) : $new, $after); - if ($result === $selector) { - continue; - } - $out[] = $result; - // recursively check for more matches - $this->matchExtends($result, $out, $i, false); - // selector sequence merging - if (!empty($before) && count($new) > 1) { - $result2 = array_merge(array_slice($new, 0, -1), $k > 0 ? array_slice($before, $k) : $before, array_slice($new, -1), $after); - $out[] = $result2; + + // check that we are not building an infinite loop of extensions + // if the new part is just including a previous part don't try to extend anymore + if (count($part) > 1) { + foreach ($partsPile as $previousPart) { + if (! count(array_diff($previousPart, $part))) { + continue 2; } } } + + if ($this->matchExtendsSingle($part, $origin)) { + $partsPile[] = $part; + $after = array_slice($selector, $i + 1); + $before = array_slice($selector, 0, $i); + + list($before, $nonBreakableBefore) = $this->extractRelationshipFromFragment($before); + + foreach ($origin as $new) { + $k = 0; + + // remove shared parts + if (count($new) > 1) { + while ($k < $i && isset($new[$k]) && $selector[$k] === $new[$k]) { + $k++; + } + } + + $replacement = []; + $tempReplacement = $k > 0 ? array_slice($new, $k) : $new; + + for ($l = count($tempReplacement) - 1; $l >= 0; $l--) { + $slice = []; + + foreach ($tempReplacement[$l] as $chunk) { + if (! in_array($chunk, $slice)) { + $slice[] = $chunk; + } + } + + array_unshift($replacement, $slice); + + if (! $this->isImmediateRelationshipCombinator(end($slice))) { + break; + } + } + + $afterBefore = $l != 0 ? array_slice($tempReplacement, 0, $l) : []; + + // Merge shared direct relationships. + $mergedBefore = $this->mergeDirectRelationships($afterBefore, $nonBreakableBefore); + + $result = array_merge( + $before, + $mergedBefore, + $replacement, + $after + ); + + if ($result === $selector) { + continue; + } + + $out[] = $result; + + // recursively check for more matches + $startRecurseFrom = count($before) + min(count($nonBreakableBefore), count($mergedBefore)); + $this->matchExtends($result, $out, $startRecurseFrom, false); + + // selector sequence merging + if (! empty($before) && count($new) > 1) { + $preSharedParts = $k > 0 ? array_slice($before, 0, $k) : []; + $postSharedParts = $k > 0 ? array_slice($before, $k) : $before; + + list($betweenSharedParts, $nonBreakable2) = $this->extractRelationshipFromFragment($afterBefore); + + $result2 = array_merge( + $preSharedParts, + $betweenSharedParts, + $postSharedParts, + $nonBreakable2, + $nonBreakableBefore, + $replacement, + $after + ); + + $out[] = $result2; + } + } + + array_pop($partsPile); + } } } + /** * Match extends single * @@ -356,19 +639,34 @@ class Compiler */ protected function matchExtendsSingle($rawSingle, &$outOrigin) { - $counts = array(); - $single = array(); + $counts = []; + $single = []; + + // simple usual cases, no need to do the whole trick + if (in_array($rawSingle, [['>'],['+'],['~']])) { + return false; + } + foreach ($rawSingle as $part) { // matches Number - if (!is_string($part)) { + if (! is_string($part)) { return false; } - if (!preg_match('/^[\\[.:#%]/', $part) && count($single)) { + + if (! preg_match('/^[\[.:#%]/', $part) && count($single)) { $single[count($single) - 1] .= $part; } else { $single[] = $part; } } + + $extendingDecoratedTag = false; + + if (count($single) > 1) { + $matches = null; + $extendingDecoratedTag = preg_match('/^[a-z0-9]+$/i', $single[0], $matches) ? $matches[0] : false; + } + foreach ($single as $part) { if (isset($this->extendsMap[$part])) { foreach ($this->extendsMap[$part] as $idx) { @@ -376,31 +674,88 @@ class Compiler } } } - $outOrigin = array(); + + $outOrigin = []; $found = false; + foreach ($counts as $idx => $count) { - list($target, $origin, ) = $this->extends[$idx]; + list($target, $origin, /* $block */) = $this->extends[$idx]; + + $origin = $this->glueFunctionSelectors($origin); + // check count if ($count !== count($target)) { continue; } + $this->extends[$idx][3] = true; + $rem = array_diff($single, $target); + foreach ($origin as $j => $new) { // prevent infinite loop when target extends itself if ($this->isSelfExtend($single, $origin)) { return false; } - $combined = $this->combineSelectorSingle(end($new), $rem); + + $replacement = end($new); + + // Extending a decorated tag with another tag is not possible. + if ($extendingDecoratedTag && $replacement[0] != $extendingDecoratedTag && + preg_match('/^[a-z0-9]+$/i', $replacement[0]) + ) { + unset($origin[$j]); + continue; + } + + $combined = $this->combineSelectorSingle($replacement, $rem); + if (count(array_diff($combined, $origin[$j][count($origin[$j]) - 1]))) { $origin[$j][count($origin[$j]) - 1] = $combined; } } + $outOrigin = array_merge($outOrigin, $origin); + $found = true; } + return $found; } + + /** + * Extract a relationship from the fragment. + * + * When extracting the last portion of a selector we will be left with a + * fragment which may end with a direction relationship combinator. This + * method will extract the relationship fragment and return it along side + * the rest. + * + * @param array $fragment The selector fragment maybe ending with a direction relationship combinator. + * + * @return array The selector without the relationship fragment if any, the relationship fragment. + */ + protected function extractRelationshipFromFragment(array $fragment) + { + $parents = []; + $children = []; + $j = $i = count($fragment); + + for (;;) { + $children = $j != $i ? array_slice($fragment, $j, $i - $j) : []; + $parents = array_slice($fragment, 0, $j); + $slice = end($parents); + + if (empty($slice) || ! $this->isImmediateRelationshipCombinator($slice[0])) { + break; + } + + $j -= 2; + } + + return [$parents, $children]; + } + /** * Combine selector single * @@ -411,12 +766,13 @@ class Compiler */ protected function combineSelectorSingle($base, $other) { - $tag = array(); - $out = array(); + $tag = []; + $out = []; $wasTag = true; - foreach (array($base, $other) as $single) { + + foreach ([$base, $other] as $single) { foreach ($single as $part) { - if (preg_match('/^[\\[.:#]/', $part)) { + if (preg_match('/^[\[.:#]/', $part)) { $out[] = $part; $wasTag = false; } elseif (preg_match('/^[^_-]/', $part)) { @@ -429,175 +785,304 @@ class Compiler } } } + if (count($tag)) { array_unshift($out, $tag[0]); } + return $out; } + /** * Compile media * - * @param \Leafo\ScssPhp\Block $media + * @param \ScssPhp\ScssPhp\Block $media */ protected function compileMedia(Block $media) { $this->pushEnv($media); - $mediaQuery = $this->compileMediaQuery($this->multiplyMedia($this->env)); - if (!empty($mediaQuery)) { - $this->scope = $this->makeOutputBlock(Type::T_MEDIA, array($mediaQuery)); + + $mediaQueries = $this->compileMediaQuery($this->multiplyMedia($this->env)); + + if (! empty($mediaQueries) && $mediaQueries) { + $previousScope = $this->scope; $parentScope = $this->mediaParent($this->scope); - $parentScope->children[] = $this->scope; + + foreach ($mediaQueries as $mediaQuery) { + $this->scope = $this->makeOutputBlock(Type::T_MEDIA, [$mediaQuery]); + + $parentScope->children[] = $this->scope; + $parentScope = $this->scope; + } + // top level properties in a media cause it to be wrapped $needsWrap = false; + foreach ($media->children as $child) { $type = $child[0]; - if ($type !== Type::T_BLOCK && $type !== Type::T_MEDIA && $type !== Type::T_DIRECTIVE && $type !== Type::T_IMPORT) { + + if ($type !== Type::T_BLOCK && + $type !== Type::T_MEDIA && + $type !== Type::T_DIRECTIVE && + $type !== Type::T_IMPORT + ) { $needsWrap = true; break; } } + if ($needsWrap) { - $wrapped = new Block(); + $wrapped = new Block; + $wrapped->sourceName = $media->sourceName; $wrapped->sourceIndex = $media->sourceIndex; $wrapped->sourceLine = $media->sourceLine; $wrapped->sourceColumn = $media->sourceColumn; - $wrapped->selectors = array(); - $wrapped->comments = array(); + $wrapped->selectors = []; + $wrapped->comments = []; $wrapped->parent = $media; $wrapped->children = $media->children; - $media->children = array(array(Type::T_BLOCK, $wrapped)); + + $media->children = [[Type::T_BLOCK, $wrapped]]; + if (isset($this->lineNumberStyle)) { + $annotation = $this->makeOutputBlock(Type::T_COMMENT); + $annotation->depth = 0; + + $file = $this->sourceNames[$media->sourceIndex]; + $line = $media->sourceLine; + + switch ($this->lineNumberStyle) { + case static::LINE_COMMENTS: + $annotation->lines[] = '/* line ' . $line + . ($file ? ', ' . $file : '') + . ' */'; + break; + + case static::DEBUG_INFO: + $annotation->lines[] = '@media -sass-debug-info{' + . ($file ? 'filename{font-family:"' . $file . '"}' : '') + . 'line{font-family:' . $line . '}}'; + break; + } + + $this->scope->children[] = $annotation; + } } + $this->compileChildrenNoReturn($media->children, $this->scope); - $this->scope = $this->scope->parent; + + $this->scope = $previousScope; } + $this->popEnv(); } + /** * Media parent * - * @param \Leafo\ScssPhp\Formatter\OutputBlock $scope + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $scope * - * @return \Leafo\ScssPhp\Formatter\OutputBlock + * @return \ScssPhp\ScssPhp\Formatter\OutputBlock */ protected function mediaParent(OutputBlock $scope) { - while (!empty($scope->parent)) { - if (!empty($scope->type) && $scope->type !== Type::T_MEDIA) { + while (! empty($scope->parent)) { + if (! empty($scope->type) && $scope->type !== Type::T_MEDIA) { break; } + $scope = $scope->parent; } + return $scope; } + /** * Compile directive * - * @param \Leafo\ScssPhp\Block $block + * @param \ScssPhp\ScssPhp\Block $block */ protected function compileDirective(Block $block) { $s = '@' . $block->name; - if (!empty($block->value)) { + + if (! empty($block->value)) { $s .= ' ' . $this->compileValue($block->value); } + if ($block->name === 'keyframes' || substr($block->name, -10) === '-keyframes') { - $this->compileKeyframeBlock($block, array($s)); + $this->compileKeyframeBlock($block, [$s]); } else { - $this->compileNestedBlock($block, array($s)); + $this->compileNestedBlock($block, [$s]); } } + /** * Compile at-root * - * @param \Leafo\ScssPhp\Block $block + * @param \ScssPhp\ScssPhp\Block $block */ protected function compileAtRoot(Block $block) { - $env = $this->pushEnv($block); - $envs = $this->compactEnv($env); - $without = isset($block->with) ? $this->compileWith($block->with) : self::WITH_RULE; + $env = $this->pushEnv($block); + $envs = $this->compactEnv($env); + $without = isset($block->with) ? $this->compileWith($block->with) : static::WITH_RULE; + // wrap inline selector if ($block->selector) { - $wrapped = new Block(); - $wrapped->sourceIndex = $block->sourceIndex; - $wrapped->sourceLine = $block->sourceLine; + $wrapped = new Block; + $wrapped->sourceName = $block->sourceName; + $wrapped->sourceIndex = $block->sourceIndex; + $wrapped->sourceLine = $block->sourceLine; $wrapped->sourceColumn = $block->sourceColumn; - $wrapped->selectors = $block->selector; - $wrapped->comments = array(); - $wrapped->parent = $block; - $wrapped->children = $block->children; - $block->children = array(array(Type::T_BLOCK, $wrapped)); + $wrapped->selectors = $block->selector; + $wrapped->comments = []; + $wrapped->parent = $block; + $wrapped->children = $block->children; + $wrapped->selfParent = $block->selfParent; + + $block->children = [[Type::T_BLOCK, $wrapped]]; + $block->selector = null; } + + $selfParent = $block->selfParent; + + if (! $block->selfParent->selectors && isset($block->parent) && $block->parent && + isset($block->parent->selectors) && $block->parent->selectors + ) { + $selfParent = $block->parent; + } + $this->env = $this->filterWithout($envs, $without); - $newBlock = $this->spliceTree($envs, $block, $without); - $saveScope = $this->scope; - $this->scope = $this->rootBlock; - $this->compileChild($newBlock, $this->scope); + + $saveScope = $this->scope; + $this->scope = $this->filterScopeWithout($saveScope, $without); + + // propagate selfParent to the children where they still can be useful + $this->compileChildrenNoReturn($block->children, $this->scope, $selfParent); + + $this->scope = $this->completeScope($this->scope, $saveScope); $this->scope = $saveScope; - $this->env = $this->extractEnv($envs); + $this->env = $this->extractEnv($envs); + $this->popEnv(); } + /** - * Splice parse tree + * Filter at-root scope depending of with/without option * - * @param array $envs - * @param \Leafo\ScssPhp\Block $block - * @param integer $without + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $scope + * @param mixed $without + * + * @return mixed + */ + protected function filterScopeWithout($scope, $without) + { + $filteredScopes = []; + + if ($scope->type === TYPE::T_ROOT) { + return $scope; + } + + // start from the root + while ($scope->parent && $scope->parent->type !== TYPE::T_ROOT) { + $scope = $scope->parent; + } + + for (;;) { + if (! $scope) { + break; + } + + if (! $this->isWithout($without, $scope)) { + $s = clone $scope; + $s->children = []; + $s->lines = []; + $s->parent = null; + + if ($s->type !== Type::T_MEDIA && $s->type !== Type::T_DIRECTIVE) { + $s->selectors = []; + } + + $filteredScopes[] = $s; + } + + if ($scope->children) { + $scope = end($scope->children); + } else { + $scope = null; + } + } + + if (! count($filteredScopes)) { + return $this->rootBlock; + } + + $newScope = array_shift($filteredScopes); + $newScope->parent = $this->rootBlock; + + $this->rootBlock->children[] = $newScope; + + $p = &$newScope; + + while (count($filteredScopes)) { + $s = array_shift($filteredScopes); + $s->parent = $p; + $p->children[] = &$s; + $p = $s; + } + + return $newScope; + } + + /** + * found missing selector from a at-root compilation in the previous scope + * (if at-root is just enclosing a property, the selector is in the parent tree) + * + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $scope + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $previousScope + * + * @return mixed + */ + protected function completeScope($scope, $previousScope) + { + if (! $scope->type && (! $scope->selectors || ! count($scope->selectors)) && count($scope->lines)) { + $scope->selectors = $this->findScopeSelectors($previousScope, $scope->depth); + } + + if ($scope->children) { + foreach ($scope->children as $k => $c) { + $scope->children[$k] = $this->completeScope($c, $previousScope); + } + } + + return $scope; + } + + /** + * Find a selector by the depth node in the scope + * + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $scope + * @param integer $depth * * @return array */ - private function spliceTree($envs, Block $block, $without) + protected function findScopeSelectors($scope, $depth) { - $newBlock = null; - foreach ($envs as $e) { - if (!isset($e->block)) { - continue; - } - if ($e->block === $block) { - continue; - } - if (isset($e->block->type) && $e->block->type === Type::T_AT_ROOT) { - continue; - } - if ($e->block && $this->isWithout($without, $e->block)) { - continue; - } - $b = new Block(); - $b->sourceIndex = $e->block->sourceIndex; - $b->sourceLine = $e->block->sourceLine; - $b->sourceColumn = $e->block->sourceColumn; - $b->selectors = array(); - $b->comments = $e->block->comments; - $b->parent = null; - if ($newBlock) { - $type = isset($newBlock->type) ? $newBlock->type : Type::T_BLOCK; - $b->children = array(array($type, $newBlock)); - $newBlock->parent = $b; - } elseif (count($block->children)) { - foreach ($block->children as $child) { - if ($child[0] === Type::T_BLOCK) { - $child[1]->parent = $b; - } - } - $b->children = $block->children; - } - if (isset($e->block->type)) { - $b->type = $e->block->type; - } - if (isset($e->block->name)) { - $b->name = $e->block->name; - } - if (isset($e->block->queryList)) { - $b->queryList = $e->block->queryList; - } - if (isset($e->block->value)) { - $b->value = $e->block->value; - } - $newBlock = $b; + if ($scope->depth === $depth && $scope->selectors) { + return $scope->selectors; } - $type = isset($newBlock->type) ? $newBlock->type : Type::T_BLOCK; - return array($type, $newBlock); + + if ($scope->children) { + foreach (array_reverse($scope->children) as $c) { + if ($s = $this->findScopeSelectors($c, $depth)) { + return $s; + } + } + } + + return []; } + /** * Compile @at-root's with: inclusion / without: exclusion into filter flags * @@ -605,103 +1090,185 @@ class Compiler * * @return integer */ - private function compileWith($with) + protected function compileWith($with) { - static $mapping = array('rule' => self::WITH_RULE, 'media' => self::WITH_MEDIA, 'supports' => self::WITH_SUPPORTS, 'all' => self::WITH_ALL); + static $mapping = [ + 'rule' => self::WITH_RULE, + 'media' => self::WITH_MEDIA, + 'supports' => self::WITH_SUPPORTS, + 'all' => self::WITH_ALL, + ]; + // exclude selectors by default - $without = self::WITH_RULE; - if ($this->libMapHasKey(array($with, self::$with))) { - $without = self::WITH_ALL; - $list = $this->coerceList($this->libMapGet(array($with, self::$with))); + $without = static::WITH_RULE; + + if ($this->libMapHasKey([$with, static::$with])) { + $without = static::WITH_ALL; + + $list = $this->coerceList($this->libMapGet([$with, static::$with])); + foreach ($list[2] as $item) { $keyword = $this->compileStringContent($this->coerceString($item)); + if (array_key_exists($keyword, $mapping)) { - $without &= ~$mapping[$keyword]; + $without &= ~($mapping[$keyword]); } } } - if ($this->libMapHasKey(array($with, self::$without))) { + + if ($this->libMapHasKey([$with, static::$without])) { $without = 0; - $list = $this->coerceList($this->libMapGet(array($with, self::$without))); + + $list = $this->coerceList($this->libMapGet([$with, static::$without])); + foreach ($list[2] as $item) { $keyword = $this->compileStringContent($this->coerceString($item)); + if (array_key_exists($keyword, $mapping)) { $without |= $mapping[$keyword]; } } } + return $without; } + /** * Filter env stack * * @param array $envs * @param integer $without * - * @return \Leafo\ScssPhp\Compiler\Environment + * @return \ScssPhp\ScssPhp\Compiler\Environment */ - private function filterWithout($envs, $without) + protected function filterWithout($envs, $without) { - $filtered = array(); + $filtered = []; + foreach ($envs as $e) { if ($e->block && $this->isWithout($without, $e->block)) { - continue; + $ec = clone $e; + $ec->block = null; + $ec->selectors = []; + $filtered[] = $ec; + } else { + $filtered[] = $e; } - $filtered[] = $e; } + return $this->extractEnv($filtered); } + /** * Filter WITH rules * - * @param integer $without - * @param \Leafo\ScssPhp\Block $block + * @param integer $without + * @param \ScssPhp\ScssPhp\Block|\ScssPhp\ScssPhp\Formatter\OutputBlock $block * * @return boolean */ - private function isWithout($without, Block $block) + protected function isWithout($without, $block) { - if ($without & self::WITH_RULE && isset($block->selectors) || $without & self::WITH_MEDIA && isset($block->type) && $block->type === Type::T_MEDIA || $without & self::WITH_SUPPORTS && isset($block->type) && $block->type === Type::T_DIRECTIVE && isset($block->name) && $block->name === 'supports') { + if (isset($block->type)) { + if ($block->type === Type::T_MEDIA) { + return ($without & static::WITH_MEDIA) ? true : false; + } + + if ($block->type === Type::T_DIRECTIVE) { + if (isset($block->name) && $block->name === 'supports') { + return ($without & static::WITH_SUPPORTS) ? true : false; + } + + if (isset($block->selectors) && strpos(serialize($block->selectors), '@supports') !== false) { + return ($without & static::WITH_SUPPORTS) ? true : false; + } + } + } + + if ((($without & static::WITH_RULE) && isset($block->selectors))) { return true; } + return false; } + /** * Compile keyframe block * - * @param \Leafo\ScssPhp\Block $block - * @param array $selectors + * @param \ScssPhp\ScssPhp\Block $block + * @param array $selectors */ protected function compileKeyframeBlock(Block $block, $selectors) { $env = $this->pushEnv($block); + $envs = $this->compactEnv($env); + $this->env = $this->extractEnv(array_filter($envs, function (Environment $e) { - return !isset($e->block->selectors); + return ! isset($e->block->selectors); })); + $this->scope = $this->makeOutputBlock($block->type, $selectors); $this->scope->depth = 1; $this->scope->parent->children[] = $this->scope; + $this->compileChildrenNoReturn($block->children, $this->scope); + $this->scope = $this->scope->parent; - $this->env = $this->extractEnv($envs); + $this->env = $this->extractEnv($envs); + $this->popEnv(); } + /** * Compile nested block * - * @param \Leafo\ScssPhp\Block $block - * @param array $selectors + * @param \ScssPhp\ScssPhp\Block $block + * @param array $selectors */ protected function compileNestedBlock(Block $block, $selectors) { $this->pushEnv($block); + $this->scope = $this->makeOutputBlock($block->type, $selectors); $this->scope->parent->children[] = $this->scope; + + // wrap assign children in a block + // except for @font-face + if ($block->type !== Type::T_DIRECTIVE || $block->name !== "font-face") { + // need wrapping? + $needWrapping = false; + + foreach ($block->children as $child) { + if ($child[0] === Type::T_ASSIGN) { + $needWrapping = true; + break; + } + } + + if ($needWrapping) { + $wrapped = new Block; + $wrapped->sourceName = $block->sourceName; + $wrapped->sourceIndex = $block->sourceIndex; + $wrapped->sourceLine = $block->sourceLine; + $wrapped->sourceColumn = $block->sourceColumn; + $wrapped->selectors = []; + $wrapped->comments = []; + $wrapped->parent = $block; + $wrapped->children = $block->children; + $wrapped->selfParent = $block->selfParent; + + $block->children = [[Type::T_BLOCK, $wrapped]]; + } + } + $this->compileChildrenNoReturn($block->children, $this->scope); + $this->scope = $this->scope->parent; + $this->popEnv(); } + /** * Recursively compiles a block. * @@ -718,36 +1285,65 @@ class Compiler * * @see Compiler::compileChild() * - * @param \Leafo\ScssPhp\Block $block + * @param \ScssPhp\ScssPhp\Block $block */ protected function compileBlock(Block $block) { $env = $this->pushEnv($block); $env->selectors = $this->evalSelectors($block->selectors); + $out = $this->makeOutputBlock(null); + if (isset($this->lineNumberStyle) && count($env->selectors) && count($block->children)) { $annotation = $this->makeOutputBlock(Type::T_COMMENT); $annotation->depth = 0; + $file = $this->sourceNames[$block->sourceIndex]; $line = $block->sourceLine; + switch ($this->lineNumberStyle) { - case self::LINE_COMMENTS: - $annotation->lines[] = '/* line ' . $line . ', ' . $file . ' */'; + case static::LINE_COMMENTS: + $annotation->lines[] = '/* line ' . $line + . ($file ? ', ' . $file : '') + . ' */'; break; - case self::DEBUG_INFO: - $annotation->lines[] = '@media -sass-debug-info{filename{font-family:"' . $file . '"}line{font-family:' . $line . '}}'; + + case static::DEBUG_INFO: + $annotation->lines[] = '@media -sass-debug-info{' + . ($file ? 'filename{font-family:"' . $file . '"}' : '') + . 'line{font-family:' . $line . '}}'; break; } + $this->scope->children[] = $annotation; } + $this->scope->children[] = $out; + if (count($block->children)) { - $out->selectors = $this->multiplySelectors($env); - $this->compileChildrenNoReturn($block->children, $out); + $out->selectors = $this->multiplySelectors($env, $block->selfParent); + + // propagate selfParent to the children where they still can be useful + $selfParentSelectors = null; + + if (isset($block->selfParent->selectors)) { + $selfParentSelectors = $block->selfParent->selectors; + $block->selfParent->selectors = $out->selectors; + } + + $this->compileChildrenNoReturn($block->children, $out, $block->selfParent); + + // and revert for the following childs of the same block + if ($selfParentSelectors) { + $block->selfParent->selectors = $selfParentSelectors; + } } + $this->formatter->stripSemicolon($out->lines); + $this->popEnv(); } + /** * Compile root level comment * @@ -756,9 +1352,11 @@ class Compiler protected function compileComment($block) { $out = $this->makeOutputBlock(Type::T_COMMENT); - $out->lines[] = $block[1]; + $out->lines[] = is_string($block[1]) ? $block[1] : $this->compileValue($block[1]); + $this->scope->children[] = $out; } + /** * Evaluate selectors * @@ -769,17 +1367,23 @@ class Compiler protected function evalSelectors($selectors) { $this->shouldEvaluate = false; - $selectors = array_map(array($this, 'evalSelector'), $selectors); + + $selectors = array_map([$this, 'evalSelector'], $selectors); + // after evaluating interpolates, we might need a second pass if ($this->shouldEvaluate) { + $selectors = $this->revertSelfSelector($selectors); $buffer = $this->collapseSelectors($selectors); $parser = $this->parserFactory(__METHOD__); + if ($parser->parseSelector($buffer, $newSelectors)) { - $selectors = array_map(array($this, 'evalSelector'), $newSelectors); + $selectors = array_map([$this, 'evalSelector'], $newSelectors); } } + return $selectors; } + /** * Evaluate selector * @@ -789,8 +1393,9 @@ class Compiler */ protected function evalSelector($selector) { - return array_map(array($this, 'evalSelectorPart'), $selector); + return array_map([$this, 'evalSelectorPart'], $selector); } + /** * Evaluate selector part; replaces all the interpolates, stripping quotes * @@ -803,35 +1408,108 @@ class Compiler foreach ($part as &$p) { if (is_array($p) && ($p[0] === Type::T_INTERPOLATE || $p[0] === Type::T_STRING)) { $p = $this->compileValue($p); + // force re-evaluation if (strpos($p, '&') !== false || strpos($p, ',') !== false) { $this->shouldEvaluate = true; } - } elseif (is_string($p) && strlen($p) >= 2 && ($first = $p[0]) && ($first === '"' || $first === '\'') && substr($p, -1) === $first) { + } elseif (is_string($p) && strlen($p) >= 2 && + ($first = $p[0]) && ($first === '"' || $first === "'") && + substr($p, -1) === $first + ) { $p = substr($p, 1, -1); } } + return $this->flattenSelectorSingle($part); } + /** * Collapse selectors * - * @param array $selectors + * @param array $selectors + * @param boolean $selectorFormat + * if false return a collapsed string + * if true return an array description of a structured selector * * @return string */ - protected function collapseSelectors($selectors) + protected function collapseSelectors($selectors, $selectorFormat = false) { - $parts = array(); + $parts = []; + foreach ($selectors as $selector) { - $output = ''; - array_walk_recursive($selector, function ($value, $key) use(&$output) { - $output .= $value; - }); + $output = []; + $glueNext = false; + + foreach ($selector as $node) { + $compound = ''; + + array_walk_recursive( + $node, + function ($value, $key) use (&$compound) { + $compound .= $value; + } + ); + + if ($selectorFormat && $this->isImmediateRelationshipCombinator($compound)) { + if (count($output)) { + $output[count($output) - 1] .= ' ' . $compound; + } else { + $output[] = $compound; + } + $glueNext = true; + } elseif ($glueNext) { + $output[count($output) - 1] .= ' ' . $compound; + $glueNext = false; + } else { + $output[] = $compound; + } + } + + if ($selectorFormat) { + foreach ($output as &$o) { + $o = [Type::T_STRING, '', [$o]]; + } + $output = [Type::T_LIST, ' ', $output]; + } else { + $output = implode(' ', $output); + } + $parts[] = $output; } - return implode(', ', $parts); + + if ($selectorFormat) { + $parts = [Type::T_LIST, ',', $parts]; + } else { + $parts = implode(', ', $parts); + } + + return $parts; } + + /** + * Parse down the selector and revert [self] to "&" before a reparsing + * + * @param array $selectors + * + * @return array + */ + protected function revertSelfSelector($selectors) + { + foreach ($selectors as &$part) { + if (is_array($part)) { + if ($part === [Type::T_SELF]) { + $part = '&'; + } else { + $part = $this->revertSelfSelector($part); + } + } + } + + return $selectors; + } + /** * Flatten selector single; joins together .classes and #ids * @@ -841,58 +1519,77 @@ class Compiler */ protected function flattenSelectorSingle($single) { - $joined = array(); + $joined = []; + foreach ($single as $part) { - if (empty($joined) || !is_string($part) || preg_match('/[\\[.:#%]/', $part)) { + if (empty($joined) || + ! is_string($part) || + preg_match('/[\[.:#%]/', $part) + ) { $joined[] = $part; continue; } + if (is_array(end($joined))) { $joined[] = $part; } else { $joined[count($joined) - 1] .= $part; } } + return $joined; } + /** * Compile selector to string; self(&) should have been replaced by now * - * @param array $selector + * @param string|array $selector * * @return string */ protected function compileSelector($selector) { - if (!is_array($selector)) { - return $selector; + if (! is_array($selector)) { + return $selector; // media and the like } - return implode(' ', array_map(array($this, 'compileSelectorPart'), $selector)); + + return implode( + ' ', + array_map( + [$this, 'compileSelectorPart'], + $selector + ) + ); } + /** * Compile selector part * - * @param arary $piece + * @param array $piece * * @return string */ protected function compileSelectorPart($piece) { foreach ($piece as &$p) { - if (!is_array($p)) { + if (! is_array($p)) { continue; } + switch ($p[0]) { case Type::T_SELF: $p = '&'; break; + default: $p = $this->compileValue($p); break; } } + return implode($piece); } + /** * Has selector placeholder? * @@ -902,9 +1599,10 @@ class Compiler */ protected function hasSelectorPlaceholder($selector) { - if (!is_array($selector)) { + if (! is_array($selector)) { return false; } + foreach ($selector as $parts) { foreach ($parts as $part) { if (strlen($part) && '%' === $part[0]) { @@ -912,97 +1610,320 @@ class Compiler } } } + return false; } + + protected function pushCallStack($name = '') + { + $this->callStack[] = [ + 'n' => $name, + Parser::SOURCE_INDEX => $this->sourceIndex, + Parser::SOURCE_LINE => $this->sourceLine, + Parser::SOURCE_COLUMN => $this->sourceColumn + ]; + + // infinite calling loop + if (count($this->callStack) > 25000) { + // not displayed but you can var_dump it to deep debug + $msg = $this->callStackMessage(true, 100); + $msg = "Infinite calling loop"; + $this->throwError($msg); + } + } + + protected function popCallStack() + { + array_pop($this->callStack); + } + /** * Compile children and return result * - * @param array $stms - * @param \Leafo\ScssPhp\Formatter\OutputBlock $out + * @param array $stms + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out + * @param string $traceName * - * @return array + * @return array|null */ - protected function compileChildren($stms, OutputBlock $out) + protected function compileChildren($stms, OutputBlock $out, $traceName = '') { + $this->pushCallStack($traceName); + foreach ($stms as $stm) { $ret = $this->compileChild($stm, $out); + if (isset($ret)) { return $ret; } } + + $this->popCallStack(); + + return null; } + /** * Compile children and throw exception if unexpected @return * - * @param array $stms - * @param \Leafo\ScssPhp\Formatter\OutputBlock $out + * @param array $stms + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out + * @param \ScssPhp\ScssPhp\Block $selfParent + * @param string $traceName * * @throws \Exception */ - protected function compileChildrenNoReturn($stms, OutputBlock $out) + protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null, $traceName = '') { + $this->pushCallStack($traceName); + foreach ($stms as $stm) { - $ret = $this->compileChild($stm, $out); + if ($selfParent && isset($stm[1]) && is_object($stm[1]) && $stm[1] instanceof Block) { + $stm[1]->selfParent = $selfParent; + $ret = $this->compileChild($stm, $out); + $stm[1]->selfParent = null; + } elseif ($selfParent && $stm[0] === TYPE::T_INCLUDE) { + $stm['selfParent'] = $selfParent; + $ret = $this->compileChild($stm, $out); + unset($stm['selfParent']); + } else { + $ret = $this->compileChild($stm, $out); + } + if (isset($ret)) { $this->throwError('@return may only be used within a function'); + return; } } + + $this->popCallStack(); } + + + /** + * evaluate media query : compile internal value keeping the structure inchanged + * + * @param array $queryList + * + * @return array + */ + protected function evaluateMediaQuery($queryList) + { + foreach ($queryList as $kql => $query) { + foreach ($query as $kq => $q) { + for ($i = 1; $i < count($q); $i++) { + $value = $this->compileValue($q[$i]); + + // the parser had no mean to know if media type or expression if it was an interpolation + if ($q[0] == Type::T_MEDIA_TYPE && + (strpos($value, '(') !== false || + strpos($value, ')') !== false || + strpos($value, ':') !== false) + ) { + $queryList[$kql][$kq][0] = Type::T_MEDIA_EXPRESSION; + + if (strpos($value, 'and') !== false) { + $values = explode('and', $value); + $value = trim(array_pop($values)); + + while ($v = trim(array_pop($values))) { + $type = Type::T_MEDIA_EXPRESSION; + + if (strpos($v, '(') === false && + strpos($v, ')') === false && + strpos($v, ':') === false + ) { + $type = Type::T_MEDIA_TYPE; + } + + if (substr($v, 0, 1) === '(' && substr($v, -1) === ')') { + $v = substr($v, 1, -1); + } + + $queryList[$kql][] = [$type,[Type::T_KEYWORD, $v]]; + } + } + + if (substr($value, 0, 1) === '(' && substr($value, -1) === ')') { + $value = substr($value, 1, -1); + } + } + + $queryList[$kql][$kq][$i] = [Type::T_KEYWORD, $value]; + } + } + } + + return $queryList; + } + /** * Compile media query * * @param array $queryList * - * @return string + * @return array */ protected function compileMediaQuery($queryList) { - $out = '@media'; - $first = true; + $start = '@media '; + $default = trim($start); + $out = []; + $current = ""; + foreach ($queryList as $query) { $type = null; - $parts = array(); + $parts = []; + + $mediaTypeOnly = true; + + foreach ($query as $q) { + if ($q[0] !== Type::T_MEDIA_TYPE) { + $mediaTypeOnly = false; + break; + } + } + foreach ($query as $q) { switch ($q[0]) { case Type::T_MEDIA_TYPE: - if ($type) { - $type = $this->mergeMediaTypes($type, array_map(array($this, 'compileValue'), array_slice($q, 1))); - if (empty($type)) { - // merge failed - return null; + $newType = array_map([$this, 'compileValue'], array_slice($q, 1)); + // combining not and anything else than media type is too risky and should be avoided + if (! $mediaTypeOnly) { + if (in_array(Type::T_NOT, $newType) || ($type && in_array(Type::T_NOT, $type) )) { + if ($type) { + array_unshift($parts, implode(' ', array_filter($type))); + } + + if (! empty($parts)) { + if (strlen($current)) { + $current .= $this->formatter->tagSeparator; + } + + $current .= implode(' and ', $parts); + } + + if ($current) { + $out[] = $start . $current; + } + + $current = ""; + $type = null; + $parts = []; + } + } + + if ($newType === ['all'] && $default) { + $default = $start . 'all'; + } + + // all can be safely ignored and mixed with whatever else + if ($newType !== ['all']) { + if ($type) { + $type = $this->mergeMediaTypes($type, $newType); + + if (empty($type)) { + // merge failed : ignore this query that is not valid, skip to the next one + $parts = []; + $default = ''; // if everything fail, no @media at all + continue 3; + } + } else { + $type = $newType; } - } else { - $type = array_map(array($this, 'compileValue'), array_slice($q, 1)); } break; + case Type::T_MEDIA_EXPRESSION: if (isset($q[2])) { - $parts[] = '(' . $this->compileValue($q[1]) . $this->formatter->assignSeparator . $this->compileValue($q[2]) . ')'; + $parts[] = '(' + . $this->compileValue($q[1]) + . $this->formatter->assignSeparator + . $this->compileValue($q[2]) + . ')'; } else { - $parts[] = '(' . $this->compileValue($q[1]) . ')'; + $parts[] = '(' + . $this->compileValue($q[1]) + . ')'; } break; + case Type::T_MEDIA_VALUE: $parts[] = $this->compileValue($q[1]); break; } } + if ($type) { array_unshift($parts, implode(' ', array_filter($type))); } - if (!empty($parts)) { - if ($first) { - $first = false; - $out .= ' '; - } else { - $out .= $this->formatter->tagSeparator; + + if (! empty($parts)) { + if (strlen($current)) { + $current .= $this->formatter->tagSeparator; } - $out .= implode(' and ', $parts); + + $current .= implode(' and ', $parts); } } + + if ($current) { + $out[] = $start . $current; + } + + // no @media type except all, and no conflict? + if (! $out && $default) { + $out[] = $default; + } + return $out; } + + /** + * Merge direct relationships between selectors + * + * @param array $selectors1 + * @param array $selectors2 + * + * @return array + */ + protected function mergeDirectRelationships($selectors1, $selectors2) + { + if (empty($selectors1) || empty($selectors2)) { + return array_merge($selectors1, $selectors2); + } + + $part1 = end($selectors1); + $part2 = end($selectors2); + + if (! $this->isImmediateRelationshipCombinator($part1[0]) && $part1 !== $part2) { + return array_merge($selectors1, $selectors2); + } + + $merged = []; + + do { + $part1 = array_pop($selectors1); + $part2 = array_pop($selectors2); + + if (! $this->isImmediateRelationshipCombinator($part1[0]) && $part1 !== $part2) { + if ($this->isImmediateRelationshipCombinator(reset($merged)[0])) { + array_unshift($merged, [$part1[0] . $part2[0]]); + $merged = array_merge($selectors1, $selectors2, $merged); + } else { + $merged = array_merge($selectors1, [$part1], $selectors2, [$part2], $merged); + } + + break; + } + + array_unshift($merged, $part1); + } while (! empty($selectors1) && ! empty($selectors2)); + + return $merged; + } + /** * Merge media types * @@ -1016,349 +1937,535 @@ class Compiler if (empty($type1)) { return $type2; } + if (empty($type2)) { return $type1; } + $m1 = ''; $t1 = ''; + if (count($type1) > 1) { - $m1 = strtolower($type1[0]); - $t1 = strtolower($type1[1]); + $m1= strtolower($type1[0]); + $t1= strtolower($type1[1]); } else { $t1 = strtolower($type1[0]); } + $m2 = ''; $t2 = ''; + if (count($type2) > 1) { $m2 = strtolower($type2[0]); $t2 = strtolower($type2[1]); } else { $t2 = strtolower($type2[0]); } - if ($m1 === Type::T_NOT ^ $m2 === Type::T_NOT) { + + if (($m1 === Type::T_NOT) ^ ($m2 === Type::T_NOT)) { if ($t1 === $t2) { return null; } - return array($m1 === Type::T_NOT ? $m2 : $m1, $m1 === Type::T_NOT ? $t2 : $t1); + + return [ + $m1 === Type::T_NOT ? $m2 : $m1, + $m1 === Type::T_NOT ? $t2 : $t1, + ]; } + if ($m1 === Type::T_NOT && $m2 === Type::T_NOT) { // CSS has no way of representing "neither screen nor print" if ($t1 !== $t2) { return null; } - return array(Type::T_NOT, $t1); + + return [Type::T_NOT, $t1]; } + if ($t1 !== $t2) { return null; } + // t1 == t2, neither m1 nor m2 are "not" - return array(empty($m1) ? $m2 : $m1, $t1); + return [empty($m1)? $m2 : $m1, $t1]; } + /** * Compile import; returns true if the value was something that could be imported * - * @param array $rawPath - * @param array $out - * @param boolean $once + * @param array $rawPath + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out + * @param boolean $once * * @return boolean */ - protected function compileImport($rawPath, $out, $once = false) + protected function compileImport($rawPath, OutputBlock $out, $once = false) { if ($rawPath[0] === Type::T_STRING) { $path = $this->compileStringContent($rawPath); + if ($path = $this->findImport($path)) { - if (!$once || !in_array($path, $this->importedFiles)) { + if (! $once || ! in_array($path, $this->importedFiles)) { $this->importFile($path, $out); $this->importedFiles[] = $path; } + return true; } + return false; } + if ($rawPath[0] === Type::T_LIST) { // handle a list of strings if (count($rawPath[2]) === 0) { return false; } + foreach ($rawPath[2] as $path) { if ($path[0] !== Type::T_STRING) { return false; } } + foreach ($rawPath[2] as $path) { $this->compileImport($path, $out); } + return true; } + return false; } + /** * Compile child; returns a value to halt execution * - * @param array $child - * @param \Leafo\ScssPhp\Formatter\OutputBlock $out + * @param array $child + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out * * @return array */ protected function compileChild($child, OutputBlock $out) { - $this->sourceIndex = isset($child[Parser::SOURCE_INDEX]) ? $child[Parser::SOURCE_INDEX] : null; - $this->sourceLine = isset($child[Parser::SOURCE_LINE]) ? $child[Parser::SOURCE_LINE] : -1; - $this->sourceColumn = isset($child[Parser::SOURCE_COLUMN]) ? $child[Parser::SOURCE_COLUMN] : -1; + if (isset($child[Parser::SOURCE_LINE])) { + $this->sourceIndex = isset($child[Parser::SOURCE_INDEX]) ? $child[Parser::SOURCE_INDEX] : null; + $this->sourceLine = isset($child[Parser::SOURCE_LINE]) ? $child[Parser::SOURCE_LINE] : -1; + $this->sourceColumn = isset($child[Parser::SOURCE_COLUMN]) ? $child[Parser::SOURCE_COLUMN] : -1; + } elseif (is_array($child) && isset($child[1]->sourceLine)) { + $this->sourceIndex = $child[1]->sourceIndex; + $this->sourceLine = $child[1]->sourceLine; + $this->sourceColumn = $child[1]->sourceColumn; + } elseif (! empty($out->sourceLine) && ! empty($out->sourceName)) { + $this->sourceLine = $out->sourceLine; + $this->sourceIndex = array_search($out->sourceName, $this->sourceNames); + + if ($this->sourceIndex === false) { + $this->sourceIndex = null; + } + } + switch ($child[0]) { case Type::T_SCSSPHP_IMPORT_ONCE: - list(, $rawPath) = $child; - $rawPath = $this->reduce($rawPath); - if (!$this->compileImport($rawPath, $out, true)) { + $rawPath = $this->reduce($child[1]); + + if (! $this->compileImport($rawPath, $out, true)) { $out->lines[] = '@import ' . $this->compileValue($rawPath) . ';'; } break; + case Type::T_IMPORT: - list(, $rawPath) = $child; - $rawPath = $this->reduce($rawPath); - if (!$this->compileImport($rawPath, $out)) { + $rawPath = $this->reduce($child[1]); + + if (! $this->compileImport($rawPath, $out)) { $out->lines[] = '@import ' . $this->compileValue($rawPath) . ';'; } break; + case Type::T_DIRECTIVE: $this->compileDirective($child[1]); break; + case Type::T_AT_ROOT: $this->compileAtRoot($child[1]); break; + case Type::T_MEDIA: $this->compileMedia($child[1]); break; + case Type::T_BLOCK: $this->compileBlock($child[1]); break; + case Type::T_CHARSET: - if (!$this->charsetSeen) { + if (! $this->charsetSeen) { $this->charsetSeen = true; + $out->lines[] = '@charset ' . $this->compileValue($child[1]) . ';'; } break; + case Type::T_ASSIGN: list(, $name, $value) = $child; + if ($name[0] === Type::T_VARIABLE) { - $flags = isset($child[3]) ? $child[3] : array(); + $flags = isset($child[3]) ? $child[3] : []; $isDefault = in_array('!default', $flags); $isGlobal = in_array('!global', $flags); + if ($isGlobal) { - $this->set($name[1], $this->reduce($value), false, $this->rootEnv); + $this->set($name[1], $this->reduce($value), false, $this->rootEnv, $value); break; } - $shouldSet = $isDefault && (($result = $this->get($name[1], false)) === null || $result === self::$null); - if (!$isDefault || $shouldSet) { - $this->set($name[1], $this->reduce($value)); + + $shouldSet = $isDefault && + (($result = $this->get($name[1], false)) === null + || $result === static::$null); + + if (! $isDefault || $shouldSet) { + $this->set($name[1], $this->reduce($value), true, null, $value); } break; } + $compiledName = $this->compileValue($name); + // handle shorthand syntax: size / line-height - if ($compiledName === 'font') { - if ($value[0] === Type::T_EXPRESSION && $value[1] === '/') { - $value = $this->expToString($value); - } elseif ($value[0] === Type::T_LIST) { - foreach ($value[2] as &$item) { + if ($compiledName === 'font' || $compiledName === 'grid-row' || $compiledName === 'grid-column') { + if ($value[0] === Type::T_VARIABLE) { + // if the font value comes from variable, the content is already reduced + // (i.e., formulas were already calculated), so we need the original unreduced value + $value = $this->get($value[1], true, null, true); + } + + $fontValue=&$value; + + if ($value[0] === Type::T_LIST && $value[1]==',') { + // this is the case if more than one font is given: example: "font: 400 1em/1.3 arial,helvetica" + // we need to handle the first list element + $fontValue=&$value[2][0]; + } + + if ($fontValue[0] === Type::T_EXPRESSION && $fontValue[1] === '/') { + $fontValue = $this->expToString($fontValue); + } elseif ($fontValue[0] === Type::T_LIST) { + foreach ($fontValue[2] as &$item) { if ($item[0] === Type::T_EXPRESSION && $item[1] === '/') { $item = $this->expToString($item); } } } } + // if the value reduces to null from something else then // the property should be discarded if ($value[0] !== Type::T_NULL) { $value = $this->reduce($value); - if ($value[0] === Type::T_NULL || $value === self::$nullString) { + + if ($value[0] === Type::T_NULL || $value === static::$nullString) { break; } } + $compiledValue = $this->compileValue($value); - $out->lines[] = $this->formatter->property($compiledName, $compiledValue); + + $out->lines[] = $this->formatter->property( + $compiledName, + $compiledValue + ); break; + case Type::T_COMMENT: if ($out->type === Type::T_ROOT) { $this->compileComment($child); break; } + $out->lines[] = $child[1]; break; + case Type::T_MIXIN: case Type::T_FUNCTION: list(, $block) = $child; - $this->set(self::$namespaces[$block->type] . $block->name, $block); + + $this->set(static::$namespaces[$block->type] . $block->name, $block); break; + case Type::T_EXTEND: - list(, $selectors) = $child; - foreach ($selectors as $sel) { - $results = $this->evalSelectors(array($sel)); + foreach ($child[1] as $sel) { + $results = $this->evalSelectors([$sel]); + foreach ($results as $result) { // only use the first one $result = current($result); + $this->pushExtends($result, $out->selectors, $child); } } break; + case Type::T_IF: list(, $if) = $child; + if ($this->isTruthy($this->reduce($if->cond, true))) { return $this->compileChildren($if->children, $out); } + foreach ($if->cases as $case) { - if ($case->type === Type::T_ELSE || $case->type === Type::T_ELSEIF && $this->isTruthy($this->reduce($case->cond))) { + if ($case->type === Type::T_ELSE || + $case->type === Type::T_ELSEIF && $this->isTruthy($this->reduce($case->cond)) + ) { return $this->compileChildren($case->children, $out); } } break; + case Type::T_EACH: list(, $each) = $child; + $list = $this->coerceList($this->reduce($each->list)); + $this->pushEnv(); + foreach ($list[2] as $item) { if (count($each->vars) === 1) { $this->set($each->vars[0], $item, true); } else { - list(, , $values) = $this->coerceList($item); + list(,, $values) = $this->coerceList($item); + foreach ($each->vars as $i => $var) { - $this->set($var, isset($values[$i]) ? $values[$i] : self::$null, true); + $this->set($var, isset($values[$i]) ? $values[$i] : static::$null, true); } } + $ret = $this->compileChildren($each->children, $out); + if ($ret) { if ($ret[0] !== Type::T_CONTROL) { $this->popEnv(); + return $ret; } + if ($ret[1]) { break; } } } + $this->popEnv(); break; + case Type::T_WHILE: list(, $while) = $child; + while ($this->isTruthy($this->reduce($while->cond, true))) { $ret = $this->compileChildren($while->children, $out); + if ($ret) { if ($ret[0] !== Type::T_CONTROL) { return $ret; } + if ($ret[1]) { break; } } } break; + case Type::T_FOR: list(, $for) = $child; + $start = $this->reduce($for->start, true); + $end = $this->reduce($for->end, true); + + if (! ($start[2] == $end[2] || $end->unitless())) { + $this->throwError('Incompatible units: "%s" and "%s".', $start->unitStr(), $end->unitStr()); + + break; + } + + $unit = $start[2]; $start = $start[1]; - $end = $this->reduce($for->end, true); - $end = $end[1]; + $end = $end[1]; + $d = $start < $end ? 1 : -1; - while (true) { - if (!$for->until && $start - $d == $end || $for->until && $start == $end) { + + for (;;) { + if ((! $for->until && $start - $d == $end) || + ($for->until && $start == $end) + ) { break; } - $this->set($for->var, new Node\Number($start, '')); + + $this->set($for->var, new Node\Number($start, $unit)); $start += $d; + $ret = $this->compileChildren($for->children, $out); + if ($ret) { if ($ret[0] !== Type::T_CONTROL) { return $ret; } + if ($ret[1]) { break; } } } break; + case Type::T_BREAK: - return array(Type::T_CONTROL, true); + return [Type::T_CONTROL, true]; + case Type::T_CONTINUE: - return array(Type::T_CONTROL, false); + return [Type::T_CONTROL, false]; + case Type::T_RETURN: return $this->reduce($child[1], true); + case Type::T_NESTED_PROPERTY: list(, $prop) = $child; - $prefixed = array(); + + $prefixed = []; $prefix = $this->compileValue($prop->prefix) . '-'; + foreach ($prop->children as $child) { switch ($child[0]) { case Type::T_ASSIGN: array_unshift($child[1][2], $prefix); break; + case Type::T_NESTED_PROPERTY: array_unshift($child[1]->prefix[2], $prefix); break; } + $prefixed[] = $child; } + $this->compileChildrenNoReturn($prefixed, $out); break; + case Type::T_INCLUDE: // including a mixin list(, $name, $argValues, $content) = $child; - $mixin = $this->get(self::$namespaces['mixin'] . $name, false); - if (!$mixin) { - $this->throwError("Undefined mixin {$name}"); + + $mixin = $this->get(static::$namespaces['mixin'] . $name, false); + + if (! $mixin) { + $this->throwError("Undefined mixin $name"); break; } + $callingScope = $this->getStoreEnv(); + // push scope, apply args $this->pushEnv(); $this->env->depth--; - if (isset($content)) { - $content->scope = $callingScope; - $this->setRaw(self::$namespaces['special'] . 'content', $content, $this->env); + + $storeEnv = $this->storeEnv; + $this->storeEnv = $this->env; + + // Find the parent selectors in the env to be able to know what '&' refers to in the mixin + // and assign this fake parent to childs + $selfParent = null; + + if (isset($child['selfParent']) && isset($child['selfParent']->selectors)) { + $selfParent = $child['selfParent']; + } else { + $parentSelectors = $this->multiplySelectors($this->env); + + if ($parentSelectors) { + $parent = new Block(); + $parent->selectors = $parentSelectors; + + foreach ($mixin->children as $k => $child) { + if (isset($child[1]) && is_object($child[1]) && $child[1] instanceof Block) { + $mixin->children[$k][1]->parent = $parent; + } + } + } } + + // clone the stored content to not have its scope spoiled by a further call to the same mixin + // i.e., recursive @include of the same mixin + if (isset($content)) { + $copyContent = clone $content; + $copyContent->scope = $callingScope; + + $this->setRaw(static::$namespaces['special'] . 'content', $copyContent, $this->env); + } + if (isset($mixin->args)) { $this->applyArguments($mixin->args, $argValues); } + $this->env->marker = 'mixin'; - $this->compileChildrenNoReturn($mixin->children, $out); + + $this->compileChildrenNoReturn($mixin->children, $out, $selfParent, $this->env->marker . " " . $name); + + $this->storeEnv = $storeEnv; + $this->popEnv(); break; + case Type::T_MIXIN_CONTENT: - $content = $this->get(self::$namespaces['special'] . 'content', false, $this->getStoreEnv()) ?: $this->get(self::$namespaces['special'] . 'content', false, $this->env); - if (!$content) { - $this->throwError('Expected @content inside of mixin'); + $env = isset($this->storeEnv) ? $this->storeEnv : $this->env; + $content = $this->get(static::$namespaces['special'] . 'content', false, $env); + + if (! $content) { + $content = new \stdClass(); + $content->scope = new \stdClass(); + $content->children = $this->storeEnv->parent->block->children; break; } + $storeEnv = $this->storeEnv; $this->storeEnv = $content->scope; $this->compileChildrenNoReturn($content->children, $out); + $this->storeEnv = $storeEnv; break; + case Type::T_DEBUG: list(, $value) = $child; + + $fname = $this->sourceNames[$this->sourceIndex]; $line = $this->sourceLine; $value = $this->compileValue($this->reduce($value, true)); - fwrite($this->stderr, "Line {$line} DEBUG: {$value}\n"); + fwrite($this->stderr, "File $fname on line $line DEBUG: $value\n"); break; + case Type::T_WARN: list(, $value) = $child; + + $fname = $this->sourceNames[$this->sourceIndex]; $line = $this->sourceLine; $value = $this->compileValue($this->reduce($value, true)); - fwrite($this->stderr, "Line {$line} WARN: {$value}\n"); + fwrite($this->stderr, "File $fname on line $line WARN: $value\n"); break; + case Type::T_ERROR: list(, $value) = $child; + + $fname = $this->sourceNames[$this->sourceIndex]; $line = $this->sourceLine; $value = $this->compileValue($this->reduce($value, true)); - $this->throwError("Line {$line} ERROR: {$value}\n"); + $this->throwError("File $fname on line $line ERROR: $value\n"); break; + case Type::T_CONTROL: $this->throwError('@break/@continue not permitted in this scope'); break; + default: - $this->throwError("unknown child type: {$child['0']}"); + $this->throwError("unknown child type: $child[0]"); } } + /** * Reduce expression to string * @@ -1368,29 +2475,49 @@ class Compiler */ protected function expToString($exp) { - list(, $op, $left, $right, , $whiteLeft, $whiteRight) = $exp; - $content = array($this->reduce($left)); + list(, $op, $left, $right, /* $inParens */, $whiteLeft, $whiteRight) = $exp; + + $content = [$this->reduce($left)]; + if ($whiteLeft) { $content[] = ' '; } + $content[] = $op; + if ($whiteRight) { $content[] = ' '; } + $content[] = $this->reduce($right); - return array(Type::T_STRING, '', $content); + + return [Type::T_STRING, '', $content]; } + /** * Is truthy? * * @param array $value * - * @return array + * @return boolean */ protected function isTruthy($value) { - return $value !== self::$false && $value !== self::$null; + return $value !== static::$false && $value !== static::$null; } + + /** + * Is the value a direct relationship combinator? + * + * @param string $value + * + * @return boolean + */ + protected function isImmediateRelationshipCombinator($value) + { + return $value === '>' || $value === '+' || $value === '~'; + } + /** * Should $value cause its operand to eval * @@ -1403,148 +2530,212 @@ class Compiler switch ($value[0]) { case Type::T_EXPRESSION: if ($value[1] === '/') { - return $this->shouldEval($value[2], $value[3]); + return $this->shouldEval($value[2]) || $this->shouldEval($value[3]); } - // fall-thru + + // fall-thru case Type::T_VARIABLE: case Type::T_FUNCTION_CALL: return true; } + return false; } + /** * Reduce value * * @param array $value * @param boolean $inExp * - * @return array + * @return array|\ScssPhp\ScssPhp\Node\Number */ protected function reduce($value, $inExp = false) { - list($type) = $value; - switch ($type) { + + switch ($value[0]) { case Type::T_EXPRESSION: list(, $op, $left, $right, $inParens) = $value; - $opName = isset(self::$operatorNames[$op]) ? self::$operatorNames[$op] : $op; + + $opName = isset(static::$operatorNames[$op]) ? static::$operatorNames[$op] : $op; $inExp = $inExp || $this->shouldEval($left) || $this->shouldEval($right); + $left = $this->reduce($left, true); + if ($op !== 'and' && $op !== 'or') { $right = $this->reduce($right, true); } + // special case: looks like css shorthand - if ($opName == 'div' && !$inParens && !$inExp && isset($right[2]) && ($right[0] !== Type::T_NUMBER && $right[2] != '' || $right[0] === Type::T_NUMBER && !$right->unitless())) { + if ($opName == 'div' && ! $inParens && ! $inExp && isset($right[2]) + && (($right[0] !== Type::T_NUMBER && $right[2] != '') + || ($right[0] === Type::T_NUMBER && ! $right->unitless())) + ) { return $this->expToString($value); } + $left = $this->coerceForExpression($left); $right = $this->coerceForExpression($right); + $ltype = $left[0]; $rtype = $right[0]; + $ucOpName = ucfirst($opName); - $ucLType = ucfirst($ltype); - $ucRType = ucfirst($rtype); + $ucLType = ucfirst($ltype); + $ucRType = ucfirst($rtype); + // this tries: // 1. op[op name][left type][right type] // 2. op[left type][right type] (passing the op as first arg // 3. op[op name] - $fn = "op{$ucOpName}{$ucLType}{$ucRType}"; - if (is_callable(array($this, $fn)) || ($fn = "op{$ucLType}{$ucRType}") && is_callable(array($this, $fn)) && ($passOp = true) || ($fn = "op{$ucOpName}") && is_callable(array($this, $fn)) && ($genOp = true)) { + $fn = "op${ucOpName}${ucLType}${ucRType}"; + + if (is_callable([$this, $fn]) || + (($fn = "op${ucLType}${ucRType}") && + is_callable([$this, $fn]) && + $passOp = true) || + (($fn = "op${ucOpName}") && + is_callable([$this, $fn]) && + $genOp = true) + ) { $coerceUnit = false; - if (!isset($genOp) && $left[0] === Type::T_NUMBER && $right[0] === Type::T_NUMBER) { + + if (! isset($genOp) && + $left[0] === Type::T_NUMBER && $right[0] === Type::T_NUMBER + ) { $coerceUnit = true; + switch ($opName) { case 'mul': $targetUnit = $left[2]; + foreach ($right[2] as $unit => $exp) { $targetUnit[$unit] = (isset($targetUnit[$unit]) ? $targetUnit[$unit] : 0) + $exp; } break; + case 'div': $targetUnit = $left[2]; + foreach ($right[2] as $unit => $exp) { $targetUnit[$unit] = (isset($targetUnit[$unit]) ? $targetUnit[$unit] : 0) - $exp; } break; + case 'mod': $targetUnit = $left[2]; break; + default: $targetUnit = $left->unitless() ? $right[2] : $left[2]; } - if (!$left->unitless() && !$right->unitless()) { + + if (! $left->unitless() && ! $right->unitless()) { $left = $left->normalize(); $right = $right->normalize(); } } + $shouldEval = $inParens || $inExp; + if (isset($passOp)) { - $out = $this->{$fn}($op, $left, $right, $shouldEval); + $out = $this->$fn($op, $left, $right, $shouldEval); } else { - $out = $this->{$fn}($left, $right, $shouldEval); + $out = $this->$fn($left, $right, $shouldEval); } + if (isset($out)) { if ($coerceUnit && $out[0] === Type::T_NUMBER) { $out = $out->coerce($targetUnit); } + return $out; } } + return $this->expToString($value); + case Type::T_UNARY: list(, $op, $exp, $inParens) = $value; + $inExp = $inExp || $this->shouldEval($exp); $exp = $this->reduce($exp); + if ($exp[0] === Type::T_NUMBER) { switch ($op) { case '+': return new Node\Number($exp[1], $exp[2]); + case '-': return new Node\Number(-$exp[1], $exp[2]); } } + if ($op === 'not') { if ($inExp || $inParens) { - if ($exp === self::$false || $exp === self::$null) { - return self::$true; + if ($exp === static::$false || $exp === static::$null) { + return static::$true; } - return self::$false; + + return static::$false; } + $op = $op . ' '; } - return array(Type::T_STRING, '', array($op, $exp)); + + return [Type::T_STRING, '', [$op, $exp]]; + case Type::T_VARIABLE: - list(, $name) = $value; - return $this->reduce($this->get($name)); + return $this->reduce($this->get($value[1])); + case Type::T_LIST: foreach ($value[2] as &$item) { $item = $this->reduce($item); } + return $value; + case Type::T_MAP: foreach ($value[1] as &$item) { $item = $this->reduce($item); } + foreach ($value[2] as &$item) { $item = $this->reduce($item); } + return $value; + case Type::T_STRING: foreach ($value[2] as &$item) { if (is_array($item) || $item instanceof \ArrayAccess) { $item = $this->reduce($item); } } + return $value; + case Type::T_INTERPOLATE: $value[1] = $this->reduce($value[1]); + if ($inExp) { + return $value[1]; + } + return $value; + case Type::T_FUNCTION_CALL: - list(, $name, $argValues) = $value; - return $this->fncall($name, $argValues); + return $this->fncall($value[1], $value[2]); + + case Type::T_SELF: + $selfSelector = $this->multiplySelectors($this->env); + $selfSelector = $this->collapseSelectors($selfSelector, true); + return $selfSelector; + default: return $value; } } + /** * Function caller * @@ -1553,25 +2744,30 @@ class Compiler * * @return array|null */ - private function fncall($name, $argValues) + protected function fncall($name, $argValues) { // SCSS @function if ($this->callScssFunction($name, $argValues, $returnValue)) { return $returnValue; } + // native PHP functions if ($this->callNativeFunction($name, $argValues, $returnValue)) { return $returnValue; } + // for CSS functions, simply flatten the arguments into a list - $listArgs = array(); + $listArgs = []; + foreach ((array) $argValues as $arg) { if (empty($arg[0])) { $listArgs[] = $this->reduce($arg[1]); } } - return array(Type::T_FUNCTION, $name, array(Type::T_LIST, ',', $listArgs)); + + return [Type::T_FUNCTION, $name, [Type::T_LIST, ',', $listArgs]]; } + /** * Normalize name * @@ -1583,6 +2779,7 @@ class Compiler { return str_replace('-', '_', $name); } + /** * Normalize value * @@ -1593,97 +2790,111 @@ class Compiler public function normalizeValue($value) { $value = $this->coerceForExpression($this->reduce($value)); - list($type) = $value; - switch ($type) { + + switch ($value[0]) { case Type::T_LIST: $value = $this->extractInterpolation($value); + if ($value[0] !== Type::T_LIST) { - return array(Type::T_KEYWORD, $this->compileValue($value)); + return [Type::T_KEYWORD, $this->compileValue($value)]; } + foreach ($value[2] as $key => $item) { $value[2][$key] = $this->normalizeValue($item); } + return $value; + case Type::T_STRING: - return array($type, '"', array($this->compileStringContent($value))); + return [$value[0], '"', [$this->compileStringContent($value)]]; + case Type::T_NUMBER: return $value->normalize(); + case Type::T_INTERPOLATE: - return array(Type::T_KEYWORD, $this->compileValue($value)); + return [Type::T_KEYWORD, $this->compileValue($value)]; + default: return $value; } } + /** * Add numbers * * @param array $left * @param array $right * - * @return array + * @return \ScssPhp\ScssPhp\Node\Number */ protected function opAddNumberNumber($left, $right) { return new Node\Number($left[1] + $right[1], $left[2]); } + /** * Multiply numbers * * @param array $left * @param array $right * - * @return array + * @return \ScssPhp\ScssPhp\Node\Number */ protected function opMulNumberNumber($left, $right) { return new Node\Number($left[1] * $right[1], $left[2]); } + /** * Subtract numbers * * @param array $left * @param array $right * - * @return array + * @return \ScssPhp\ScssPhp\Node\Number */ protected function opSubNumberNumber($left, $right) { return new Node\Number($left[1] - $right[1], $left[2]); } + /** * Divide numbers * * @param array $left * @param array $right * - * @return array + * @return array|\ScssPhp\ScssPhp\Node\Number */ protected function opDivNumberNumber($left, $right) { if ($right[1] == 0) { - return array(Type::T_STRING, '', array($left[1] . $left[2] . '/' . $right[1] . $right[2])); + return [Type::T_STRING, '', [$left[1] . $left[2] . '/' . $right[1] . $right[2]]]; } + return new Node\Number($left[1] / $right[1], $left[2]); } + /** * Mod numbers * * @param array $left * @param array $right * - * @return array + * @return \ScssPhp\ScssPhp\Node\Number */ protected function opModNumberNumber($left, $right) { return new Node\Number($left[1] % $right[1], $left[2]); } + /** * Add strings * * @param array $left * @param array $right * - * @return array + * @return array|null */ protected function opAdd($left, $right) { @@ -1691,17 +2902,25 @@ class Compiler if ($right[0] === Type::T_STRING) { $right[1] = ''; } + $strLeft[2][] = $right; + return $strLeft; } + if ($strRight = $this->coerceString($right)) { if ($left[0] === Type::T_STRING) { $left[1] = ''; } + array_unshift($strRight[2], $left); + return $strRight; } + + return null; } + /** * Boolean and * @@ -1709,18 +2928,27 @@ class Compiler * @param array $right * @param boolean $shouldEval * - * @return array + * @return array|null */ protected function opAnd($left, $right, $shouldEval) { - if (!$shouldEval) { - return; + $truthy = ($left === static::$null || $right === static::$null) || + ($left === static::$false || $left === static::$true) && + ($right === static::$false || $right === static::$true); + + if (! $shouldEval) { + if (! $truthy) { + return null; + } } - if ($left !== self::$false and $left !== self::$null) { + + if ($left !== static::$false && $left !== static::$null) { return $this->reduce($right, true); } + return $left; } + /** * Boolean or * @@ -1728,18 +2956,27 @@ class Compiler * @param array $right * @param boolean $shouldEval * - * @return array + * @return array|null */ protected function opOr($left, $right, $shouldEval) { - if (!$shouldEval) { - return; + $truthy = ($left === static::$null || $right === static::$null) || + ($left === static::$false || $left === static::$true) && + ($right === static::$false || $right === static::$true); + + if (! $shouldEval) { + if (! $truthy) { + return null; + } } - if ($left !== self::$false and $left !== self::$null) { + + if ($left !== static::$false && $left !== static::$null) { return $left; } + return $this->reduce($right, true); } + /** * Compare colors * @@ -1751,46 +2988,59 @@ class Compiler */ protected function opColorColor($op, $left, $right) { - $out = array(Type::T_COLOR); - foreach (array(1, 2, 3) as $i) { + $out = [Type::T_COLOR]; + + foreach ([1, 2, 3] as $i) { $lval = isset($left[$i]) ? $left[$i] : 0; $rval = isset($right[$i]) ? $right[$i] : 0; + switch ($op) { case '+': $out[] = $lval + $rval; break; + case '-': $out[] = $lval - $rval; break; + case '*': $out[] = $lval * $rval; break; + case '%': $out[] = $lval % $rval; break; + case '/': if ($rval == 0) { - $this->throwError('color: Can\'t divide by zero'); + $this->throwError("color: Can't divide by zero"); break 2; } + $out[] = (int) ($lval / $rval); break; + case '==': return $this->opEq($left, $right); + case '!=': return $this->opNeq($left, $right); + default: - $this->throwError("color: unknown op {$op}"); + $this->throwError("color: unknown op $op"); break 2; } } + if (isset($left[4])) { $out[4] = $left[4]; } elseif (isset($right[4])) { $out[4] = $right[4]; } + return $this->fixColor($out); } + /** * Compare color and number * @@ -1803,8 +3053,14 @@ class Compiler protected function opColorNumber($op, $left, $right) { $value = $right[1]; - return $this->opColorColor($op, $left, array(Type::T_COLOR, $value, $value, $value)); + + return $this->opColorColor( + $op, + $left, + [Type::T_COLOR, $value, $value, $value] + ); } + /** * Compare number and color * @@ -1817,8 +3073,14 @@ class Compiler protected function opNumberColor($op, $left, $right) { $value = $left[1]; - return $this->opColorColor($op, array(Type::T_COLOR, $value, $value, $value), $right); + + return $this->opColorColor( + $op, + [Type::T_COLOR, $value, $value, $value], + $right + ); } + /** * Compare number1 == number2 * @@ -1832,11 +3094,14 @@ class Compiler if (($lStr = $this->coerceString($left)) && ($rStr = $this->coerceString($right))) { $lStr[1] = ''; $rStr[1] = ''; + $left = $this->compileValue($lStr); $right = $this->compileValue($rStr); } + return $this->toBool($left === $right); } + /** * Compare number1 != number2 * @@ -1850,11 +3115,14 @@ class Compiler if (($lStr = $this->coerceString($left)) && ($rStr = $this->coerceString($right))) { $lStr[1] = ''; $rStr[1] = ''; + $left = $this->compileValue($lStr); $right = $this->compileValue($rStr); } + return $this->toBool($left !== $right); } + /** * Compare number1 >= number2 * @@ -1867,6 +3135,7 @@ class Compiler { return $this->toBool($left[1] >= $right[1]); } + /** * Compare number1 > number2 * @@ -1879,6 +3148,7 @@ class Compiler { return $this->toBool($left[1] > $right[1]); } + /** * Compare number1 <= number2 * @@ -1891,6 +3161,7 @@ class Compiler { return $this->toBool($left[1] <= $right[1]); } + /** * Compare number1 < number2 * @@ -1903,19 +3174,22 @@ class Compiler { return $this->toBool($left[1] < $right[1]); } + /** * Three-way comparison, aka spaceship operator * * @param array $left * @param array $right * - * @return array + * @return \ScssPhp\ScssPhp\Node\Number */ protected function opCmpNumberNumber($left, $right) { $n = $left[1] - $right[1]; + return new Node\Number($n ? $n / abs($n) : 0, ''); } + /** * Cast to boolean * @@ -1927,8 +3201,9 @@ class Compiler */ public function toBool($thing) { - return $thing ? self::$true : self::$false; + return $thing ? static::$true : static::$false; } + /** * Compiles a primitive value into a CSS property value. * @@ -1949,90 +3224,157 @@ class Compiler public function compileValue($value) { $value = $this->reduce($value); - list($type) = $value; - switch ($type) { + + switch ($value[0]) { case Type::T_KEYWORD: return $value[1]; + case Type::T_COLOR: // [1] - red component (either number for a %) // [2] - green component // [3] - blue component // [4] - optional alpha component list(, $r, $g, $b) = $value; + $r = round($r); $g = round($g); $b = round($b); - if (count($value) === 5 && $value[4] !== 1) { - // rgba - return 'rgba(' . $r . ', ' . $g . ', ' . $b . ', ' . $value[4] . ')'; + + if (count($value) === 5 && $value[4] !== 1) { // rgba + $a = new Node\Number($value[4], ''); + + return 'rgba(' . $r . ', ' . $g . ', ' . $b . ', ' . $a . ')'; } + $h = sprintf('#%02x%02x%02x', $r, $g, $b); + // Converting hex color to short notation (e.g. #003399 to #039) if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) { $h = '#' . $h[1] . $h[3] . $h[5]; } + return $h; + case Type::T_NUMBER: return $value->output($this); + case Type::T_STRING: return $value[1] . $this->compileStringContent($value) . $value[1]; + case Type::T_FUNCTION: - $args = !empty($value[2]) ? $this->compileValue($value[2]) : ''; - return "{$value['1']}({$args})"; + $args = ! empty($value[2]) ? $this->compileValue($value[2]) : ''; + + return "$value[1]($args)"; + case Type::T_LIST: $value = $this->extractInterpolation($value); + if ($value[0] !== Type::T_LIST) { return $this->compileValue($value); } + list(, $delim, $items) = $value; + if ($delim !== ' ') { $delim .= ' '; } - $filtered = array(); + + $filtered = []; + foreach ($items as $item) { if ($item[0] === Type::T_NULL) { continue; } + $filtered[] = $this->compileValue($item); } - return implode("{$delim}", $filtered); + + return implode("$delim", $filtered); + case Type::T_MAP: $keys = $value[1]; $values = $value[2]; - $filtered = array(); + $filtered = []; + for ($i = 0, $s = count($keys); $i < $s; $i++) { $filtered[$this->compileValue($keys[$i])] = $this->compileValue($values[$i]); } + array_walk($filtered, function (&$value, $key) { $value = $key . ': ' . $value; }); + return '(' . implode(', ', $filtered) . ')'; + case Type::T_INTERPOLATED: // node created by extractInterpolation list(, $interpolate, $left, $right) = $value; - list(, , $whiteLeft, $whiteRight) = $interpolate; - $left = count($left[2]) > 0 ? $this->compileValue($left) . $whiteLeft : ''; - $right = count($right[2]) > 0 ? $whiteRight . $this->compileValue($right) : ''; + list(,, $whiteLeft, $whiteRight) = $interpolate; + + $left = count($left[2]) > 0 ? + $this->compileValue($left) . $whiteLeft : ''; + + $right = count($right[2]) > 0 ? + $whiteRight . $this->compileValue($right) : ''; + return $left . $this->compileValue($interpolate) . $right; + case Type::T_INTERPOLATE: - // raw parse node - list(, $exp) = $value; // strip quotes if it's a string - $reduced = $this->reduce($exp); + $reduced = $this->reduce($value[1]); + switch ($reduced[0]) { - case Type::T_STRING: - $reduced = array(Type::T_KEYWORD, $this->compileStringContent($reduced)); + case Type::T_LIST: + $reduced = $this->extractInterpolation($reduced); + + if ($reduced[0] !== Type::T_LIST) { + break; + } + + list(, $delim, $items) = $reduced; + + if ($delim !== ' ') { + $delim .= ' '; + } + + $filtered = []; + + foreach ($items as $item) { + if ($item[0] === Type::T_NULL) { + continue; + } + + $temp = $this->compileValue([Type::T_KEYWORD, $item]); + if ($temp[0] === Type::T_STRING) { + $filtered[] = $this->compileStringContent($temp); + } elseif ($temp[0] === Type::T_KEYWORD) { + $filtered[] = $temp[1]; + } else { + $filtered[] = $this->compileValue($temp); + } + } + + $reduced = [Type::T_KEYWORD, implode("$delim", $filtered)]; break; + + case Type::T_STRING: + $reduced = [Type::T_KEYWORD, $this->compileStringContent($reduced)]; + break; + case Type::T_NULL: - $reduced = array(Type::T_KEYWORD, ''); + $reduced = [Type::T_KEYWORD, '']; } + return $this->compileValue($reduced); + case Type::T_NULL: return 'null'; + default: - $this->throwError("unknown value type: {$type}"); + $this->throwError("unknown value type: $value[0]"); } } + /** * Flatten list * @@ -2044,6 +3386,7 @@ class Compiler { return $this->compileValue($list); } + /** * Compile string content * @@ -2053,7 +3396,8 @@ class Compiler */ protected function compileStringContent($string) { - $parts = array(); + $parts = []; + foreach ($string[2] as $part) { if (is_array($part) || $part instanceof \ArrayAccess) { $parts[] = $this->compileValue($part); @@ -2061,8 +3405,10 @@ class Compiler $parts[] = $part; } } + return implode($parts); } + /** * Extract interpolation; it doesn't need to be recursive, compileValue will handle that * @@ -2073,64 +3419,121 @@ class Compiler protected function extractInterpolation($list) { $items = $list[2]; + foreach ($items as $i => $item) { if ($item[0] === Type::T_INTERPOLATE) { - $before = array(Type::T_LIST, $list[1], array_slice($items, 0, $i)); - $after = array(Type::T_LIST, $list[1], array_slice($items, $i + 1)); - return array(Type::T_INTERPOLATED, $item, $before, $after); + $before = [Type::T_LIST, $list[1], array_slice($items, 0, $i)]; + $after = [Type::T_LIST, $list[1], array_slice($items, $i + 1)]; + + return [Type::T_INTERPOLATED, $item, $before, $after]; } } + return $list; } + /** * Find the final set of selectors * - * @param \Leafo\ScssPhp\Compiler\Environment $env + * @param \ScssPhp\ScssPhp\Compiler\Environment $env + * @param \ScssPhp\ScssPhp\Block $selfParent * * @return array */ - protected function multiplySelectors(Environment $env) + protected function multiplySelectors(Environment $env, $selfParent = null) { - $envs = $this->compactEnv($env); - $selectors = array(); - $parentSelectors = array(array()); + $envs = $this->compactEnv($env); + $selectors = []; + $parentSelectors = [[]]; + + $selfParentSelectors = null; + + if (! is_null($selfParent) && $selfParent->selectors) { + $selfParentSelectors = $this->evalSelectors($selfParent->selectors); + } + while ($env = array_pop($envs)) { if (empty($env->selectors)) { continue; } - $selectors = array(); - foreach ($env->selectors as $selector) { - foreach ($parentSelectors as $parent) { - $selectors[] = $this->joinSelectors($parent, $selector); + + $selectors = $env->selectors; + + do { + $stillHasSelf = false; + $prevSelectors = $selectors; + $selectors = []; + + foreach ($prevSelectors as $selector) { + foreach ($parentSelectors as $parent) { + if ($selfParentSelectors) { + foreach ($selfParentSelectors as $selfParent) { + // if no '&' in the selector, each call will give same result, only add once + $s = $this->joinSelectors($parent, $selector, $stillHasSelf, $selfParent); + $selectors[serialize($s)] = $s; + } + } else { + $s = $this->joinSelectors($parent, $selector, $stillHasSelf); + $selectors[serialize($s)] = $s; + } + } } - } + } while ($stillHasSelf); + $parentSelectors = $selectors; } + + $selectors = array_values($selectors); + return $selectors; } + /** * Join selectors; looks for & to replace, or append parent before child * - * @param array $parent - * @param array $child - * + * @param array $parent + * @param array $child + * @param boolean &$stillHasSelf + * @param array $selfParentSelectors + * @return array */ - protected function joinSelectors($parent, $child) + protected function joinSelectors($parent, $child, &$stillHasSelf, $selfParentSelectors = null) { $setSelf = false; - $out = array(); + $out = []; + foreach ($child as $part) { - $newPart = array(); + $newPart = []; + foreach ($part as $p) { - if ($p === self::$selfSelector) { + // only replace & once and should be recalled to be able to make combinations + if ($p === static::$selfSelector && $setSelf) { + $stillHasSelf = true; + } + + if ($p === static::$selfSelector && ! $setSelf) { $setSelf = true; - foreach ($parent as $i => $parentPart) { + + if (is_null($selfParentSelectors)) { + $selfParentSelectors = $parent; + } + + foreach ($selfParentSelectors as $i => $parentPart) { if ($i > 0) { $out[] = $newPart; - $newPart = array(); + $newPart = []; } + foreach ($parentPart as $pp) { + if (is_array($pp)) { + $flatten = []; + array_walk_recursive($pp, function ($a) use (&$flatten) { + $flatten[] = $a; + }); + $pp = implode($flatten); + } + $newPart[] = $pp; } } @@ -2138,87 +3541,117 @@ class Compiler $newPart[] = $p; } } + $out[] = $newPart; } + return $setSelf ? $out : array_merge($parent, $child); } + /** * Multiply media * - * @param \Leafo\ScssPhp\Compiler\Environment $env - * @param array $childQueries + * @param \ScssPhp\ScssPhp\Compiler\Environment $env + * @param array $childQueries * * @return array */ protected function multiplyMedia(Environment $env = null, $childQueries = null) { - if (!isset($env) || !empty($env->block->type) && $env->block->type !== Type::T_MEDIA) { + if (! isset($env) || + ! empty($env->block->type) && $env->block->type !== Type::T_MEDIA + ) { return $childQueries; } + // plain old block, skip if (empty($env->block->type)) { return $this->multiplyMedia($env->parent, $childQueries); } - $parentQueries = isset($env->block->queryList) ? $env->block->queryList : array(array(array(Type::T_MEDIA_VALUE, $env->block->value))); + + $parentQueries = isset($env->block->queryList) + ? $env->block->queryList + : [[[Type::T_MEDIA_VALUE, $env->block->value]]]; + + $store = [$this->env, $this->storeEnv]; + $this->env = $env; + $this->storeEnv = null; + $parentQueries = $this->evaluateMediaQuery($parentQueries); + list($this->env, $this->storeEnv) = $store; + if ($childQueries === null) { $childQueries = $parentQueries; } else { $originalQueries = $childQueries; - $childQueries = array(); + $childQueries = []; + foreach ($parentQueries as $parentQuery) { foreach ($originalQueries as $childQuery) { - $childQueries[] = array_merge($parentQuery, $childQuery); + $childQueries[] = array_merge( + $parentQuery, + [[Type::T_MEDIA_TYPE, [Type::T_KEYWORD, 'all']]], + $childQuery + ); } } } + return $this->multiplyMedia($env->parent, $childQueries); } + /** * Convert env linked list to stack * - * @param \Leafo\ScssPhp\Compiler\Environment $env + * @param \ScssPhp\ScssPhp\Compiler\Environment $env * * @return array */ - private function compactEnv(Environment $env) + protected function compactEnv(Environment $env) { - for ($envs = array(); $env; $env = $env->parent) { + for ($envs = []; $env; $env = $env->parent) { $envs[] = $env; } + return $envs; } + /** * Convert env stack to singly linked list * * @param array $envs * - * @return \Leafo\ScssPhp\Compiler\Environment + * @return \ScssPhp\ScssPhp\Compiler\Environment */ - private function extractEnv($envs) + protected function extractEnv($envs) { for ($env = null; $e = array_pop($envs);) { $e->parent = $env; $env = $e; } + return $env; } + /** * Push environment * - * @param \Leafo\ScssPhp\Block $block + * @param \ScssPhp\ScssPhp\Block $block * - * @return \Leafo\ScssPhp\Compiler\Environment + * @return \ScssPhp\ScssPhp\Compiler\Environment */ protected function pushEnv(Block $block = null) { - $env = new Environment(); + $env = new Environment; $env->parent = $this->env; - $env->store = array(); - $env->block = $block; - $env->depth = isset($this->env->depth) ? $this->env->depth + 1 : 0; + $env->store = []; + $env->block = $block; + $env->depth = isset($this->env->depth) ? $this->env->depth + 1 : 0; + $this->env = $env; + return $env; } + /** * Pop environment */ @@ -2226,113 +3659,166 @@ class Compiler { $this->env = $this->env->parent; } + /** * Get store environment * - * @return \Leafo\ScssPhp\Compiler\Environment + * @return \ScssPhp\ScssPhp\Compiler\Environment */ protected function getStoreEnv() { return isset($this->storeEnv) ? $this->storeEnv : $this->env; } + /** * Set variable * - * @param string $name - * @param mixed $value - * @param boolean $shadow - * @param \Leafo\ScssPhp\Compiler\Environment $env + * @param string $name + * @param mixed $value + * @param boolean $shadow + * @param \ScssPhp\ScssPhp\Compiler\Environment $env + * @param mixed $valueUnreduced */ - protected function set($name, $value, $shadow = false, Environment $env = null) + protected function set($name, $value, $shadow = false, Environment $env = null, $valueUnreduced = null) { $name = $this->normalizeName($name); - if (!isset($env)) { + + if (! isset($env)) { $env = $this->getStoreEnv(); } + if ($shadow) { - $this->setRaw($name, $value, $env); + $this->setRaw($name, $value, $env, $valueUnreduced); } else { - $this->setExisting($name, $value, $env); + $this->setExisting($name, $value, $env, $valueUnreduced); } } + /** * Set existing variable * - * @param string $name - * @param mixed $value - * @param \Leafo\ScssPhp\Compiler\Environment $env + * @param string $name + * @param mixed $value + * @param \ScssPhp\ScssPhp\Compiler\Environment $env + * @param mixed $valueUnreduced */ - protected function setExisting($name, $value, Environment $env) + protected function setExisting($name, $value, Environment $env, $valueUnreduced = null) { $storeEnv = $env; + $hasNamespace = $name[0] === '^' || $name[0] === '@' || $name[0] === '%'; + for (;;) { if (array_key_exists($name, $env->store)) { break; } - if (!$hasNamespace && isset($env->marker)) { + + if (! $hasNamespace && isset($env->marker)) { $env = $storeEnv; break; } - if (!isset($env->parent)) { + + if (! isset($env->parent)) { $env = $storeEnv; break; } + $env = $env->parent; } + $env->store[$name] = $value; + + if ($valueUnreduced) { + $env->storeUnreduced[$name] = $valueUnreduced; + } } + /** * Set raw variable * - * @param string $name - * @param mixed $value - * @param \Leafo\ScssPhp\Compiler\Environment $env + * @param string $name + * @param mixed $value + * @param \ScssPhp\ScssPhp\Compiler\Environment $env + * @param mixed $valueUnreduced */ - protected function setRaw($name, $value, Environment $env) + protected function setRaw($name, $value, Environment $env, $valueUnreduced = null) { $env->store[$name] = $value; + + if ($valueUnreduced) { + $env->storeUnreduced[$name] = $valueUnreduced; + } } + /** * Get variable * * @api * - * @param string $name - * @param boolean $shouldThrow - * @param \Leafo\ScssPhp\Compiler\Environment $env + * @param string $name + * @param boolean $shouldThrow + * @param \ScssPhp\ScssPhp\Compiler\Environment $env + * @param boolean $unreduced * - * @return mixed + * @return mixed|null */ - public function get($name, $shouldThrow = true, Environment $env = null) + public function get($name, $shouldThrow = true, Environment $env = null, $unreduced = false) { - $name = $this->normalizeName($name); - if (!isset($env)) { + $normalizedName = $this->normalizeName($name); + $specialContentKey = static::$namespaces['special'] . 'content'; + + if (! isset($env)) { $env = $this->getStoreEnv(); } - $hasNamespace = $name[0] === '^' || $name[0] === '@' || $name[0] === '%'; + + $nextIsRoot = false; + $hasNamespace = $normalizedName[0] === '^' || $normalizedName[0] === '@' || $normalizedName[0] === '%'; + + $maxDepth = 10000; + for (;;) { - if (array_key_exists($name, $env->store)) { - return $env->store[$name]; + if ($maxDepth-- <= 0) { + break; } - if (!$hasNamespace && isset($env->marker)) { + + if (array_key_exists($normalizedName, $env->store)) { + if ($unreduced && isset($env->storeUnreduced[$normalizedName])) { + return $env->storeUnreduced[$normalizedName]; + } + + return $env->store[$normalizedName]; + } + + if (! $hasNamespace && isset($env->marker)) { + if (! $nextIsRoot && ! empty($env->store[$specialContentKey])) { + $env = $env->store[$specialContentKey]->scope; + continue; + } + $env = $this->rootEnv; continue; } - if (!isset($env->parent)) { + + if (! isset($env->parent)) { break; } + $env = $env->parent; } + if ($shouldThrow) { - $this->throwError("Undefined variable \${$name}"); + $this->throwError("Undefined variable \$$name" . ($maxDepth<=0 ? " (infinite recursion)" : "")); } + + // found nothing + return null; } + /** * Has variable? * - * @param string $name - * @param \Leafo\ScssPhp\Compiler\Environment $env + * @param string $name + * @param \ScssPhp\ScssPhp\Compiler\Environment $env * * @return boolean */ @@ -2340,6 +3826,7 @@ class Compiler { return $this->get($name, false, $env) !== null; } + /** * Inject variables * @@ -2350,17 +3837,22 @@ class Compiler if (empty($args)) { return; } + $parser = $this->parserFactory(__METHOD__); + foreach ($args as $name => $strValue) { if ($name[0] === '$') { $name = substr($name, 1); } - if (!$parser->parseValue($strValue, $value)) { + + if (! $parser->parseValue($strValue, $value)) { $value = $this->coerceValue($strValue); } + $this->set($name, $value); } } + /** * Set variables * @@ -2372,6 +3864,7 @@ class Compiler { $this->registeredVars = array_merge($this->registeredVars, $variables); } + /** * Unset variable * @@ -2383,6 +3876,7 @@ class Compiler { unset($this->registeredVars[$name]); } + /** * Returns list of variables * @@ -2394,6 +3888,7 @@ class Compiler { return $this->registeredVars; } + /** * Adds to list of parsed files * @@ -2407,6 +3902,7 @@ class Compiler $this->parsedFiles[realpath($path)] = filemtime($path); } } + /** * Returns list of parsed files * @@ -2418,19 +3914,21 @@ class Compiler { return $this->parsedFiles; } + /** * Add import path * * @api * - * @param string $path + * @param string|callable $path */ public function addImportPath($path) { - if (!in_array($path, $this->importPaths)) { + if (! in_array($path, $this->importPaths)) { $this->importPaths[] = $path; } } + /** * Set import paths * @@ -2442,6 +3940,7 @@ class Compiler { $this->importPaths = (array) $path; } + /** * Set number precision * @@ -2453,6 +3952,7 @@ class Compiler { Node\Number::$precision = $numberPrecision; } + /** * Set formatter * @@ -2464,6 +3964,7 @@ class Compiler { $this->formatter = $formatterName; } + /** * Set line number style * @@ -2475,6 +3976,31 @@ class Compiler { $this->lineNumberStyle = $lineNumberStyle; } + + /** + * Enable/disable source maps + * + * @api + * + * @param integer $sourceMap + */ + public function setSourceMap($sourceMap) + { + $this->sourceMap = $sourceMap; + } + + /** + * Set source map options + * + * @api + * + * @param array $sourceMapOptions + */ + public function setSourceMapOptions($sourceMapOptions) + { + $this->sourceMapOptions = $sourceMapOptions; + } + /** * Register function * @@ -2486,8 +4012,9 @@ class Compiler */ public function registerFunction($name, $func, $prototype = null) { - $this->userFunctions[$this->normalizeName($name)] = array($func, $prototype); + $this->userFunctions[$this->normalizeName($name)] = [$func, $prototype]; } + /** * Unregister function * @@ -2499,6 +4026,7 @@ class Compiler { unset($this->userFunctions[$this->normalizeName($name)]); } + /** * Add feature * @@ -2510,30 +4038,36 @@ class Compiler { $this->registeredFeatures[$name] = true; } + /** * Import file * - * @param string $path - * @param array $out + * @param string $path + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out */ - protected function importFile($path, $out) + protected function importFile($path, OutputBlock $out) { // see if tree is cached $realPath = realpath($path); + if (isset($this->importCache[$realPath])) { $this->handleImportLoop($realPath); + $tree = $this->importCache[$realPath]; } else { - $code = file_get_contents($path); + $code = file_get_contents($path); $parser = $this->parserFactory($path); - $tree = $parser->parse($code); + $tree = $parser->parse($code); + $this->importCache[$realPath] = $tree; } + $pi = pathinfo($path); array_unshift($this->importPaths, $pi['dirname']); $this->compileChildrenNoReturn($tree->children, $out); array_shift($this->importPaths); } + /** * Return the file path for an import url if it exists * @@ -2545,31 +4079,46 @@ class Compiler */ public function findImport($url) { - $urls = array(); + $urls = []; + // for "normal" scss imports (ignore vanilla css and external requests) - if (!preg_match('/\\.css$|^https?:\\/\\//', $url)) { + if (! preg_match('/\.css$|^https?:\/\//', $url)) { // try both normal and the _partial filename - $urls = array($url, preg_replace('/[^\\/]+$/', '_\\0', $url)); + $urls = [$url, preg_replace('/[^\/]+$/', '_\0', $url)]; } + + $hasExtension = preg_match('/[.]s?css$/', $url); + foreach ($this->importPaths as $dir) { if (is_string($dir)) { // check urls for normal import paths foreach ($urls as $full) { - $full = $dir . (!empty($dir) && substr($dir, -1) !== '/' ? '/' : '') . $full; - if ($this->fileExists($file = $full . '.scss') || $this->fileExists($file = $full)) { + $separator = ( + ! empty($dir) && + substr($dir, -1) !== '/' && + substr($full, 0, 1) !== '/' + ) ? '/' : ''; + $full = $dir . $separator . $full; + + if ($this->fileExists($file = $full . '.scss') || + ($hasExtension && $this->fileExists($file = $full)) + ) { return $file; } } } elseif (is_callable($dir)) { // check custom callback for import path $file = call_user_func($dir, $url); + if ($file !== null) { return $file; } } } + return null; } + /** * Set encoding * @@ -2581,6 +4130,7 @@ class Compiler { $this->encoding = $encoding; } + /** * Ignore errors? * @@ -2588,12 +4138,15 @@ class Compiler * * @param boolean $ignoreErrors * - * @return \Leafo\ScssPhp\Compiler + * @return \ScssPhp\ScssPhp\Compiler */ public function setIgnoreErrors($ignoreErrors) { $this->ignoreErrors = $ignoreErrors; + + return $this; } + /** * Throw error (exception) * @@ -2601,20 +4154,69 @@ class Compiler * * @param string $msg Message with optional sprintf()-style vararg parameters * - * @throws \Leafo\ScssPhp\Exception\CompilerException + * @throws \ScssPhp\ScssPhp\Exception\CompilerException */ public function throwError($msg) { if ($this->ignoreErrors) { return; } + + $line = $this->sourceLine; + $column = $this->sourceColumn; + + $loc = isset($this->sourceNames[$this->sourceIndex]) + ? $this->sourceNames[$this->sourceIndex] . " on line $line, at column $column" + : "line: $line, column: $column"; + if (func_num_args() > 1) { $msg = call_user_func_array('sprintf', func_get_args()); } - $line = $this->sourceLine; - $msg = "{$msg}: line: {$line}"; + + $msg = "$msg: $loc"; + + $callStackMsg = $this->callStackMessage(); + + if ($callStackMsg) { + $msg .= "\nCall Stack:\n" . $callStackMsg; + } + throw new CompilerException($msg); } + + /** + * Beautify call stack for output + * + * @param boolean $all + * @param null $limit + * + * @return string + */ + protected function callStackMessage($all = false, $limit = null) + { + $callStackMsg = []; + $ncall = 0; + + if ($this->callStack) { + foreach (array_reverse($this->callStack) as $call) { + if ($all || (isset($call['n']) && $call['n'])) { + $msg = "#" . $ncall++ . " " . $call['n'] . " "; + $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]]) + ? $this->sourceNames[$call[Parser::SOURCE_INDEX]] + : '(unknown file)'); + $msg .= " on line " . $call[Parser::SOURCE_LINE]; + $callStackMsg[] = $msg; + + if (! is_null($limit) && $ncall>$limit) { + break; + } + } + } + } + + return implode("\n", $callStackMsg); + } + /** * Handle import loop * @@ -2626,12 +4228,14 @@ class Compiler { for ($env = $this->env; $env; $env = $env->parent) { $file = $this->sourceNames[$env->block->sourceIndex]; + if (realpath($file) === $name) { $this->throwError('An @import loop has been found: %s imports %s', $file, basename($file)); break; } } } + /** * Does file exist? * @@ -2641,38 +4245,54 @@ class Compiler */ protected function fileExists($name) { - return is_file($name); + return file_exists($name) && is_file($name); } + /** * Call SCSS @function * * @param string $name - * @param array $args + * @param array $argValues * @param array $returnValue * * @return boolean Returns true if returnValue is set; otherwise, false */ protected function callScssFunction($name, $argValues, &$returnValue) { - $func = $this->get(self::$namespaces['function'] . $name, false); - if (!$func) { + $func = $this->get(static::$namespaces['function'] . $name, false); + + if (! $func) { return false; } + $this->pushEnv(); + + $storeEnv = $this->storeEnv; + $this->storeEnv = $this->env; + // set the args if (isset($func->args)) { $this->applyArguments($func->args, $argValues); } + // throw away lines and children - $tmp = new OutputBlock(); - $tmp->lines = array(); - $tmp->children = array(); + $tmp = new OutputBlock; + $tmp->lines = []; + $tmp->children = []; + $this->env->marker = 'function'; - $ret = $this->compileChildren($func->children, $tmp); + + $ret = $this->compileChildren($func->children, $tmp, $this->env->marker . " " . $name); + + $this->storeEnv = $storeEnv; + $this->popEnv(); - $returnValue = !isset($ret) ? self::$defaultValue : $ret; + + $returnValue = ! isset($ret) ? static::$defaultValue : $ret; + return true; } + /** * Call built-in and registered (PHP) functions * @@ -2686,28 +4306,36 @@ class Compiler { // try a lib function $name = $this->normalizeName($name); + if (isset($this->userFunctions[$name])) { // see if we can find a user function list($f, $prototype) = $this->userFunctions[$name]; } elseif (($f = $this->getBuiltinFunction($name)) && is_callable($f)) { - $libName = $f[1]; - $prototype = isset(self::${$libName}) ? self::${$libName} : null; + $libName = $f[1]; + $prototype = isset(static::$$libName) ? static::$$libName : null; } else { return false; } - list($sorted, $kwargs) = $this->sortArgs($prototype, $args); + + @list($sorted, $kwargs) = $this->sortArgs($prototype, $args); + if ($name !== 'if' && $name !== 'call') { foreach ($sorted as &$val) { $val = $this->reduce($val, true); } } + $returnValue = call_user_func($f, $sorted, $kwargs); - if (!isset($returnValue)) { + + if (! isset($returnValue)) { return false; } + $returnValue = $this->coerceValue($returnValue); + return true; } + /** * Get built-in function * @@ -2717,11 +4345,17 @@ class Compiler */ protected function getBuiltinFunction($name) { - $libName = 'lib' . preg_replace_callback('/_(.)/', function ($m) { - return ucfirst($m[1]); - }, ucfirst($name)); - return array($this, $libName); + $libName = 'lib' . preg_replace_callback( + '/_(.)/', + function ($m) { + return ucfirst($m[1]); + }, + ucfirst($name) + ); + + return [$this, $libName]; } + /** * Sorts keyword arguments * @@ -2732,23 +4366,29 @@ class Compiler */ protected function sortArgs($prototype, $args) { - $keyArgs = array(); - $posArgs = array(); + $keyArgs = []; + $posArgs = []; + // separate positional and keyword arguments foreach ($args as $arg) { list($key, $value) = $arg; + $key = $key[1]; + if (empty($key)) { - $posArgs[] = $value; + $posArgs[] = empty($arg[2]) ? $value : $arg; } else { $keyArgs[$key] = $value; } } - if (!isset($prototype)) { - return array($posArgs, $keyArgs); + + if (! isset($prototype)) { + return [$posArgs, $keyArgs]; } + // copy positional args $finalArgs = array_pad($posArgs, count($prototype), null); + // overwrite positional args with keyword args foreach ($prototype as $i => $names) { foreach ((array) $names as $name) { @@ -2757,8 +4397,10 @@ class Compiler } } } - return array($finalArgs, $keyArgs); + + return [$finalArgs, $keyArgs]; } + /** * Apply argument values per definition * @@ -2770,30 +4412,36 @@ class Compiler protected function applyArguments($argDef, $argValues) { $storeEnv = $this->getStoreEnv(); - $env = new Environment(); + + $env = new Environment; $env->store = $storeEnv->store; + $hasVariable = false; - $args = array(); + $args = []; + foreach ($argDef as $i => $arg) { list($name, $default, $isVariable) = $argDef[$i]; - $args[$name] = array($i, $name, $default, $isVariable); + + $args[$name] = [$i, $name, $default, $isVariable]; $hasVariable |= $isVariable; } - $keywordArgs = array(); - $deferredKeywordArgs = array(); - $remaining = array(); + + $keywordArgs = []; + $deferredKeywordArgs = []; + $remaining = []; + // assign the keyword args foreach ((array) $argValues as $arg) { - if (!empty($arg[0])) { - if (!isset($args[$arg[0][1]])) { + if (! empty($arg[0])) { + if (! isset($args[$arg[0][1]])) { if ($hasVariable) { $deferredKeywordArgs[$arg[0][1]] = $arg[1]; } else { - $this->throwError('Mixin or function doesn\'t have an argument named $%s.', $arg[0][1]); + $this->throwError("Mixin or function doesn't have an argument named $%s.", $arg[0][1]); break; } } elseif ($args[$arg[0][1]][0] < count($remaining)) { - $this->throwError('The argument $%s was passed both by position and by name.', $arg[0][1]); + $this->throwError("The argument $%s was passed both by position and by name.", $arg[0][1]); break; } else { $keywordArgs[$arg[0][1]] = $arg[1]; @@ -2803,9 +4451,10 @@ class Compiler break; } elseif ($arg[2] === true) { $val = $this->reduce($arg[1], true); + if ($val[0] === Type::T_LIST) { foreach ($val[2] as $name => $item) { - if (!is_numeric($name)) { + if (! is_numeric($name)) { $keywordArgs[$name] = $item; } else { $remaining[] = $item; @@ -2815,7 +4464,8 @@ class Compiler foreach ($val[1] as $i => $name) { $name = $this->compileStringContent($this->coerceString($name)); $item = $val[2][$i]; - if (!is_numeric($name)) { + + if (! is_numeric($name)) { $keywordArgs[$name] = $item; } else { $remaining[] = $item; @@ -2828,13 +4478,17 @@ class Compiler $remaining[] = $arg[1]; } } + foreach ($args as $arg) { list($i, $name, $default, $isVariable) = $arg; + if ($isVariable) { - $val = array(Type::T_LIST, ',', array(), $isVariable); + $val = [Type::T_LIST, ',', [], $isVariable]; + for ($count = count($remaining); $i < $count; $i++) { $val[2][] = $remaining[$i]; } + foreach ($deferredKeywordArgs as $itemName => $item) { $val[2][$itemName] = $item; } @@ -2842,49 +4496,84 @@ class Compiler $val = $remaining[$i]; } elseif (isset($keywordArgs[$name])) { $val = $keywordArgs[$name]; - } elseif (!empty($default)) { + } elseif (! empty($default)) { continue; } else { - $this->throwError("Missing argument {$name}"); + $this->throwError("Missing argument $name"); break; } + $this->set($name, $this->reduce($val, true), true, $env); } + $storeEnv->store = $env->store; + foreach ($args as $arg) { list($i, $name, $default, $isVariable) = $arg; + if ($isVariable || isset($remaining[$i]) || isset($keywordArgs[$name]) || empty($default)) { continue; } + $this->set($name, $this->reduce($default, true), true); } } + /** * Coerce a php value into a scss one * * @param mixed $value * - * @return array + * @return array|\ScssPhp\ScssPhp\Node\Number */ - private function coerceValue($value) + protected function coerceValue($value) { if (is_array($value) || $value instanceof \ArrayAccess) { return $value; } + if (is_bool($value)) { return $this->toBool($value); } + if ($value === null) { - $value = self::$null; + return static::$null; } + if (is_numeric($value)) { return new Node\Number($value, ''); } + if ($value === '') { - return self::$emptyString; + return static::$emptyString; } - return array(Type::T_KEYWORD, $value); + + if (preg_match('/^(#([0-9a-f]{6})|#([0-9a-f]{3}))$/i', $value, $m)) { + $color = [Type::T_COLOR]; + + if (isset($m[3])) { + $num = hexdec($m[3]); + + foreach ([3, 2, 1] as $i) { + $t = $num & 0xf; + $color[$i] = $t << 4 | $t; + $num >>= 4; + } + } else { + $num = hexdec($m[2]); + + foreach ([3, 2, 1] as $i) { + $color[$i] = $num & 0xff; + $num >>= 8; + } + } + + return $color; + } + + return [Type::T_KEYWORD, $value]; } + /** * Coerce something to map * @@ -2897,15 +4586,19 @@ class Compiler if ($item[0] === Type::T_MAP) { return $item; } - if ($item === self::$emptyList) { - return self::$emptyMap; + + if ($item === static::$emptyList) { + return static::$emptyMap; } - return array(Type::T_MAP, array($item), array(self::$null)); + + return [Type::T_MAP, [$item], [static::$null]]; } + /** * Coerce something to list * - * @param array $item + * @param array $item + * @param string $delim * * @return array */ @@ -2914,19 +4607,29 @@ class Compiler if (isset($item) && $item[0] === Type::T_LIST) { return $item; } + if (isset($item) && $item[0] === Type::T_MAP) { $keys = $item[1]; $values = $item[2]; - $list = array(); + $list = []; + for ($i = 0, $s = count($keys); $i < $s; $i++) { $key = $keys[$i]; $value = $values[$i]; - $list[] = array(Type::T_LIST, '', array(array(Type::T_KEYWORD, $this->compileStringContent($this->coerceString($key))), $value)); + + $list[] = [ + Type::T_LIST, + '', + [[Type::T_KEYWORD, $this->compileStringContent($this->coerceString($key))], $value] + ]; } - return array(Type::T_LIST, ',', $list); + + return [Type::T_LIST, ',', $list]; } - return array(Type::T_LIST, $delim, !isset($item) ? array() : array($item)); + + return [Type::T_LIST, $delim, ! isset($item) ? []: [$item]]; } + /** * Coerce color for expression * @@ -2939,8 +4642,10 @@ class Compiler if ($color = $this->coerceColor($value)) { return $color; } + return $value; } + /** * Coerce value to color * @@ -2953,16 +4658,24 @@ class Compiler switch ($value[0]) { case Type::T_COLOR: return $value; + case Type::T_KEYWORD: $name = strtolower($value[1]); + if (isset(Colors::$cssColors[$name])) { $rgba = explode(',', Colors::$cssColors[$name]); - return isset($rgba[3]) ? array(Type::T_COLOR, (int) $rgba[0], (int) $rgba[1], (int) $rgba[2], (int) $rgba[3]) : array(Type::T_COLOR, (int) $rgba[0], (int) $rgba[1], (int) $rgba[2]); + + return isset($rgba[3]) + ? [Type::T_COLOR, (int) $rgba[0], (int) $rgba[1], (int) $rgba[2], (int) $rgba[3]] + : [Type::T_COLOR, (int) $rgba[0], (int) $rgba[1], (int) $rgba[2]]; } + return null; } + return null; } + /** * Coerce value to string * @@ -2975,8 +4688,10 @@ class Compiler if ($value[0] === Type::T_STRING) { return $value; } - return array(Type::T_STRING, '', array($this->compileValue($value))); + + return [Type::T_STRING, '', [$this->compileValue($value)]]; } + /** * Coerce value to a percentage * @@ -2987,13 +4702,16 @@ class Compiler protected function coercePercent($value) { if ($value[0] === Type::T_NUMBER) { - if (!empty($value[2]['%'])) { + if (! empty($value[2]['%'])) { return $value[1] / 100; } + return $value[1]; } + return 0; } + /** * Assert value is a map * @@ -3008,11 +4726,14 @@ class Compiler public function assertMap($value) { $value = $this->coerceMap($value); + if ($value[0] !== Type::T_MAP) { - $this->throwError('expecting map'); + $this->throwError('expecting map, %s received', $value[0]); } + return $value; } + /** * Assert value is a list * @@ -3027,10 +4748,12 @@ class Compiler public function assertList($value) { if ($value[0] !== Type::T_LIST) { - $this->throwError('expecting list'); + $this->throwError('expecting list, %s received', $value[0]); } + return $value; } + /** * Assert value is a color * @@ -3047,8 +4770,10 @@ class Compiler if ($color = $this->coerceColor($value)) { return $color; } - $this->throwError('expecting color'); + + $this->throwError('expecting color, %s received', $value[0]); } + /** * Assert value is a number * @@ -3063,10 +4788,12 @@ class Compiler public function assertNumber($value) { if ($value[0] !== Type::T_NUMBER) { - $this->throwError('expecting number'); + $this->throwError('expecting number, %s received', $value[0]); } + return $value[1]; } + /** * Make sure a color's components don't go out of bounds * @@ -3076,16 +4803,19 @@ class Compiler */ protected function fixColor($c) { - foreach (array(1, 2, 3) as $i) { + foreach ([1, 2, 3] as $i) { if ($c[$i] < 0) { $c[$i] = 0; } + if ($c[$i] > 255) { $c[$i] = 255; } } + return $c; } + /** * Convert RGB to HSL * @@ -3101,8 +4831,10 @@ class Compiler { $min = min($red, $green, $blue); $max = max($red, $green, $blue); + $l = $min + $max; $d = $max - $min; + if ((int) $d === 0) { $h = $s = 0; } else { @@ -3111,6 +4843,7 @@ class Compiler } else { $s = $d / (510 - $l); } + if ($red == $max) { $h = 60 * ($green - $blue) / $d; } elseif ($green == $max) { @@ -3119,8 +4852,10 @@ class Compiler $h = 60 * ($red - $green) / $d + 240; } } - return array(Type::T_HSL, fmod($h, 360), $s * 100, $l / 5.1); + + return [Type::T_HSL, fmod($h, 360), $s * 100, $l / 5.1]; } + /** * Hue to RGB helper * @@ -3130,24 +4865,29 @@ class Compiler * * @return float */ - private function hueToRGB($m1, $m2, $h) + protected function hueToRGB($m1, $m2, $h) { if ($h < 0) { $h += 1; } elseif ($h > 1) { $h -= 1; } + if ($h * 6 < 1) { return $m1 + ($m2 - $m1) * $h * 6; } + if ($h * 2 < 1) { return $m2; } + if ($h * 3 < 2) { - return $m1 + ($m2 - $m1) * (2 / 3 - $h) * 6; + return $m1 + ($m2 - $m1) * (2/3 - $h) * 6; } + return $m1; } + /** * Convert HSL to RGB * @@ -3164,122 +4904,195 @@ class Compiler if ($hue < 0) { $hue += 360; } + $h = $hue / 360; $s = min(100, max(0, $saturation)) / 100; $l = min(100, max(0, $lightness)) / 100; + $m2 = $l <= 0.5 ? $l * ($s + 1) : $l + $s - $l * $s; $m1 = $l * 2 - $m2; - $r = $this->hueToRGB($m1, $m2, $h + 1 / 3) * 255; + + $r = $this->hueToRGB($m1, $m2, $h + 1/3) * 255; $g = $this->hueToRGB($m1, $m2, $h) * 255; - $b = $this->hueToRGB($m1, $m2, $h - 1 / 3) * 255; - $out = array(Type::T_COLOR, $r, $g, $b); + $b = $this->hueToRGB($m1, $m2, $h - 1/3) * 255; + + $out = [Type::T_COLOR, $r, $g, $b]; + return $out; } + // Built in functions + //protected static $libCall = ['name', 'args...']; protected function libCall($args, $kwargs) { $name = $this->compileStringContent($this->coerceString($this->reduce(array_shift($args), true))); - $args = array_map(function ($a) { - return array(null, $a, false); - }, $args); + + $posArgs = []; + + foreach ($args as $arg) { + if (empty($arg[0])) { + if ($arg[2] === true) { + $tmp = $this->reduce($arg[1]); + + if ($tmp[0] === Type::T_LIST) { + foreach ($tmp[2] as $item) { + $posArgs[] = [null, $item, false]; + } + } else { + $posArgs[] = [null, $tmp, true]; + } + + continue; + } + + $posArgs[] = [null, $this->reduce($arg), false]; + continue; + } + + $posArgs[] = [null, $arg, false]; + } + if (count($kwargs)) { foreach ($kwargs as $key => $value) { - $args[] = array(array(Type::T_VARIABLE, $key), $value, false); + $posArgs[] = [[Type::T_VARIABLE, $key], $value, false]; } } - return $this->reduce(array(Type::T_FUNCTION_CALL, $name, $args)); + + return $this->reduce([Type::T_FUNCTION_CALL, $name, $posArgs]); } - protected static $libIf = array('condition', 'if-true', 'if-false'); + + protected static $libIf = ['condition', 'if-true', 'if-false']; protected function libIf($args) { list($cond, $t, $f) = $args; - if (!$this->isTruthy($this->reduce($cond, true))) { + + if (! $this->isTruthy($this->reduce($cond, true))) { return $this->reduce($f, true); } + return $this->reduce($t, true); } - protected static $libIndex = array('list', 'value'); + + protected static $libIndex = ['list', 'value']; protected function libIndex($args) { list($list, $value) = $args; + if ($value[0] === Type::T_MAP) { - return self::$null; + return static::$null; } - if ($list[0] === Type::T_MAP || $list[0] === Type::T_STRING || $list[0] === Type::T_KEYWORD || $list[0] === Type::T_INTERPOLATE) { + + if ($list[0] === Type::T_MAP || + $list[0] === Type::T_STRING || + $list[0] === Type::T_KEYWORD || + $list[0] === Type::T_INTERPOLATE + ) { $list = $this->coerceList($list, ' '); } + if ($list[0] !== Type::T_LIST) { - return self::$null; + return static::$null; } - $values = array(); + + $values = []; + foreach ($list[2] as $item) { $values[] = $this->normalizeValue($item); } + $key = array_search($this->normalizeValue($value), $values); - return false === $key ? self::$null : $key + 1; + + return false === $key ? static::$null : $key + 1; } - protected static $libRgb = array('red', 'green', 'blue'); + + protected static $libRgb = ['red', 'green', 'blue']; protected function libRgb($args) { list($r, $g, $b) = $args; - return array(Type::T_COLOR, $r[1], $g[1], $b[1]); + + return [Type::T_COLOR, $r[1], $g[1], $b[1]]; } - protected static $libRgba = array(array('red', 'color'), 'green', 'blue', 'alpha'); + + protected static $libRgba = [ + ['red', 'color'], + 'green', 'blue', 'alpha']; protected function libRgba($args) { if ($color = $this->coerceColor($args[0])) { - $num = !isset($args[1]) ? $args[3] : $args[1]; + $num = isset($args[3]) ? $args[3] : $args[1]; $alpha = $this->assertNumber($num); $color[4] = $alpha; + return $color; } + list($r, $g, $b, $a) = $args; - return array(Type::T_COLOR, $r[1], $g[1], $b[1], $a[1]); + + return [Type::T_COLOR, $r[1], $g[1], $b[1], $a[1]]; } + // helper function for adjust_color, change_color, and scale_color protected function alterColor($args, $fn) { $color = $this->assertColor($args[0]); - foreach (array(1, 2, 3, 7) as $i) { + + foreach ([1, 2, 3, 7] as $i) { if (isset($args[$i])) { $val = $this->assertNumber($args[$i]); - $ii = $i === 7 ? 4 : $i; - // alpha + $ii = $i === 7 ? 4 : $i; // alpha $color[$ii] = call_user_func($fn, isset($color[$ii]) ? $color[$ii] : 0, $val, $i); } } + if (isset($args[4]) || isset($args[5]) || isset($args[6])) { $hsl = $this->toHSL($color[1], $color[2], $color[3]); - foreach (array(4, 5, 6) as $i) { + + foreach ([4, 5, 6] as $i) { if (isset($args[$i])) { $val = $this->assertNumber($args[$i]); $hsl[$i - 3] = call_user_func($fn, $hsl[$i - 3], $val, $i); } } + $rgb = $this->toRGB($hsl[1], $hsl[2], $hsl[3]); + if (isset($color[4])) { $rgb[4] = $color[4]; } + $color = $rgb; } + return $color; } - protected static $libAdjustColor = array('color', 'red', 'green', 'blue', 'hue', 'saturation', 'lightness', 'alpha'); + + protected static $libAdjustColor = [ + 'color', 'red', 'green', 'blue', + 'hue', 'saturation', 'lightness', 'alpha' + ]; protected function libAdjustColor($args) { return $this->alterColor($args, function ($base, $alter, $i) { return $base + $alter; }); } - protected static $libChangeColor = array('color', 'red', 'green', 'blue', 'hue', 'saturation', 'lightness', 'alpha'); + + protected static $libChangeColor = [ + 'color', 'red', 'green', 'blue', + 'hue', 'saturation', 'lightness', 'alpha' + ]; protected function libChangeColor($args) { return $this->alterColor($args, function ($base, $alter, $i) { return $alter; }); } - protected static $libScaleColor = array('color', 'red', 'green', 'blue', 'hue', 'saturation', 'lightness', 'alpha'); + + protected static $libScaleColor = [ + 'color', 'red', 'green', 'blue', + 'hue', 'saturation', 'lightness', 'alpha' + ]; protected function libScaleColor($args) { return $this->alterColor($args, function ($base, $scale, $i) { @@ -3292,303 +5105,395 @@ class Compiler case 3: $max = 255; break; + case 4: $max = 360; break; + case 7: $max = 1; break; + default: $max = 100; } + $scale = $scale / 100; + if ($scale < 0) { return $base * $scale + $base; } + return ($max - $base) * $scale + $base; }); } - protected static $libIeHexStr = array('color'); + + protected static $libIeHexStr = ['color']; protected function libIeHexStr($args) { $color = $this->coerceColor($args[0]); $color[4] = isset($color[4]) ? round(255 * $color[4]) : 255; + return sprintf('#%02X%02X%02X%02X', $color[4], $color[1], $color[2], $color[3]); } - protected static $libRed = array('color'); + + protected static $libRed = ['color']; protected function libRed($args) { $color = $this->coerceColor($args[0]); + return $color[1]; } - protected static $libGreen = array('color'); + + protected static $libGreen = ['color']; protected function libGreen($args) { $color = $this->coerceColor($args[0]); + return $color[2]; } - protected static $libBlue = array('color'); + + protected static $libBlue = ['color']; protected function libBlue($args) { $color = $this->coerceColor($args[0]); + return $color[3]; } - protected static $libAlpha = array('color'); + + protected static $libAlpha = ['color']; protected function libAlpha($args) { if ($color = $this->coerceColor($args[0])) { return isset($color[4]) ? $color[4] : 1; } + // this might be the IE function, so return value unchanged return null; } - protected static $libOpacity = array('color'); + + protected static $libOpacity = ['color']; protected function libOpacity($args) { $value = $args[0]; + if ($value[0] === Type::T_NUMBER) { return null; } + return $this->libAlpha($args); } + // mix two colors - protected static $libMix = array('color-1', 'color-2', 'weight'); + protected static $libMix = ['color-1', 'color-2', 'weight']; protected function libMix($args) { list($first, $second, $weight) = $args; + $first = $this->assertColor($first); $second = $this->assertColor($second); - if (!isset($weight)) { + + if (! isset($weight)) { $weight = 0.5; } else { $weight = $this->coercePercent($weight); } + $firstAlpha = isset($first[4]) ? $first[4] : 1; $secondAlpha = isset($second[4]) ? $second[4] : 1; + $w = $weight * 2 - 1; $a = $firstAlpha - $secondAlpha; + $w1 = (($w * $a === -1 ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2.0; $w2 = 1.0 - $w1; - $new = array(Type::T_COLOR, $w1 * $first[1] + $w2 * $second[1], $w1 * $first[2] + $w2 * $second[2], $w1 * $first[3] + $w2 * $second[3]); + + $new = [Type::T_COLOR, + $w1 * $first[1] + $w2 * $second[1], + $w1 * $first[2] + $w2 * $second[2], + $w1 * $first[3] + $w2 * $second[3], + ]; + if ($firstAlpha != 1.0 || $secondAlpha != 1.0) { - $new[] = $firstAlpha * $weight + $secondAlpha * ($weight - 1); + $new[] = $firstAlpha * $weight + $secondAlpha * (1 - $weight); } + return $this->fixColor($new); } - protected static $libHsl = array('hue', 'saturation', 'lightness'); + + protected static $libHsl = ['hue', 'saturation', 'lightness']; protected function libHsl($args) { list($h, $s, $l) = $args; + return $this->toRGB($h[1], $s[1], $l[1]); } - protected static $libHsla = array('hue', 'saturation', 'lightness', 'alpha'); + + protected static $libHsla = ['hue', 'saturation', 'lightness', 'alpha']; protected function libHsla($args) { list($h, $s, $l, $a) = $args; + $color = $this->toRGB($h[1], $s[1], $l[1]); $color[4] = $a[1]; + return $color; } - protected static $libHue = array('color'); + + protected static $libHue = ['color']; protected function libHue($args) { $color = $this->assertColor($args[0]); $hsl = $this->toHSL($color[1], $color[2], $color[3]); + return new Node\Number($hsl[1], 'deg'); } - protected static $libSaturation = array('color'); + + protected static $libSaturation = ['color']; protected function libSaturation($args) { $color = $this->assertColor($args[0]); $hsl = $this->toHSL($color[1], $color[2], $color[3]); + return new Node\Number($hsl[2], '%'); } - protected static $libLightness = array('color'); + + protected static $libLightness = ['color']; protected function libLightness($args) { $color = $this->assertColor($args[0]); $hsl = $this->toHSL($color[1], $color[2], $color[3]); + return new Node\Number($hsl[3], '%'); } + protected function adjustHsl($color, $idx, $amount) { $hsl = $this->toHSL($color[1], $color[2], $color[3]); $hsl[$idx] += $amount; $out = $this->toRGB($hsl[1], $hsl[2], $hsl[3]); + if (isset($color[4])) { $out[4] = $color[4]; } + return $out; } - protected static $libAdjustHue = array('color', 'degrees'); + + protected static $libAdjustHue = ['color', 'degrees']; protected function libAdjustHue($args) { $color = $this->assertColor($args[0]); $degrees = $this->assertNumber($args[1]); + return $this->adjustHsl($color, 1, $degrees); } - protected static $libLighten = array('color', 'amount'); + + protected static $libLighten = ['color', 'amount']; protected function libLighten($args) { $color = $this->assertColor($args[0]); $amount = Util::checkRange('amount', new Range(0, 100), $args[1], '%'); + return $this->adjustHsl($color, 3, $amount); } - protected static $libDarken = array('color', 'amount'); + + protected static $libDarken = ['color', 'amount']; protected function libDarken($args) { $color = $this->assertColor($args[0]); $amount = Util::checkRange('amount', new Range(0, 100), $args[1], '%'); + return $this->adjustHsl($color, 3, -$amount); } - protected static $libSaturate = array('color', 'amount'); + + protected static $libSaturate = ['color', 'amount']; protected function libSaturate($args) { $value = $args[0]; + if ($value[0] === Type::T_NUMBER) { return null; } + $color = $this->assertColor($value); $amount = 100 * $this->coercePercent($args[1]); + return $this->adjustHsl($color, 2, $amount); } - protected static $libDesaturate = array('color', 'amount'); + + protected static $libDesaturate = ['color', 'amount']; protected function libDesaturate($args) { $color = $this->assertColor($args[0]); $amount = 100 * $this->coercePercent($args[1]); + return $this->adjustHsl($color, 2, -$amount); } - protected static $libGrayscale = array('color'); + + protected static $libGrayscale = ['color']; protected function libGrayscale($args) { $value = $args[0]; + if ($value[0] === Type::T_NUMBER) { return null; } + return $this->adjustHsl($this->assertColor($value), 2, -100); } - protected static $libComplement = array('color'); + + protected static $libComplement = ['color']; protected function libComplement($args) { return $this->adjustHsl($this->assertColor($args[0]), 1, 180); } - protected static $libInvert = array('color'); + + protected static $libInvert = ['color']; protected function libInvert($args) { $value = $args[0]; + if ($value[0] === Type::T_NUMBER) { return null; } + $color = $this->assertColor($value); $color[1] = 255 - $color[1]; $color[2] = 255 - $color[2]; $color[3] = 255 - $color[3]; + return $color; } + // increases opacity by amount - protected static $libOpacify = array('color', 'amount'); + protected static $libOpacify = ['color', 'amount']; protected function libOpacify($args) { $color = $this->assertColor($args[0]); $amount = $this->coercePercent($args[1]); + $color[4] = (isset($color[4]) ? $color[4] : 1) + $amount; $color[4] = min(1, max(0, $color[4])); + return $color; } - protected static $libFadeIn = array('color', 'amount'); + + protected static $libFadeIn = ['color', 'amount']; protected function libFadeIn($args) { return $this->libOpacify($args); } + // decreases opacity by amount - protected static $libTransparentize = array('color', 'amount'); + protected static $libTransparentize = ['color', 'amount']; protected function libTransparentize($args) { $color = $this->assertColor($args[0]); $amount = $this->coercePercent($args[1]); + $color[4] = (isset($color[4]) ? $color[4] : 1) - $amount; $color[4] = min(1, max(0, $color[4])); + return $color; } - protected static $libFadeOut = array('color', 'amount'); + + protected static $libFadeOut = ['color', 'amount']; protected function libFadeOut($args) { return $this->libTransparentize($args); } - protected static $libUnquote = array('string'); + + protected static $libUnquote = ['string']; protected function libUnquote($args) { $str = $args[0]; + if ($str[0] === Type::T_STRING) { $str[1] = ''; } + return $str; } - protected static $libQuote = array('string'); + + protected static $libQuote = ['string']; protected function libQuote($args) { $value = $args[0]; - if ($value[0] === Type::T_STRING && !empty($value[1])) { + + if ($value[0] === Type::T_STRING && ! empty($value[1])) { return $value; } - return array(Type::T_STRING, '"', array($value)); + + return [Type::T_STRING, '"', [$value]]; } - protected static $libPercentage = array('value'); + + protected static $libPercentage = ['value']; protected function libPercentage($args) { return new Node\Number($this->coercePercent($args[0]) * 100, '%'); } - protected static $libRound = array('value'); + + protected static $libRound = ['value']; protected function libRound($args) { $num = $args[0]; - $num[1] = round($num[1]); - return $num; + + return new Node\Number(round($num[1]), $num[2]); } - protected static $libFloor = array('value'); + + protected static $libFloor = ['value']; protected function libFloor($args) { $num = $args[0]; - $num[1] = floor($num[1]); - return $num; + + return new Node\Number(floor($num[1]), $num[2]); } - protected static $libCeil = array('value'); + + protected static $libCeil = ['value']; protected function libCeil($args) { $num = $args[0]; - $num[1] = ceil($num[1]); - return $num; + + return new Node\Number(ceil($num[1]), $num[2]); } - protected static $libAbs = array('value'); + + protected static $libAbs = ['value']; protected function libAbs($args) { $num = $args[0]; - $num[1] = abs($num[1]); - return $num; + + return new Node\Number(abs($num[1]), $num[2]); } + protected function libMin($args) { $numbers = $this->getNormalizedNumbers($args); $min = null; + foreach ($numbers as $key => $number) { if (null === $min || $number[1] <= $min[1]) { - $min = array($key, $number[1]); + $min = [$key, $number[1]]; } } + return $args[$min[0]]; } + protected function libMax($args) { $numbers = $this->getNormalizedNumbers($args); $max = null; + foreach ($numbers as $key => $number) { if (null === $max || $number[1] >= $max[1]) { - $max = array($key, $number[1]); + $max = [$key, $number[1]]; } } + return $args[$max[0]]; } + /** * Helper to normalize args containing numbers * @@ -3600,184 +5505,252 @@ class Compiler { $unit = null; $originalUnit = null; - $numbers = array(); + $numbers = []; + foreach ($args as $key => $item) { if ($item[0] !== Type::T_NUMBER) { $this->throwError('%s is not a number', $item[0]); break; } + $number = $item->normalize(); + if (null === $unit) { $unit = $number[2]; $originalUnit = $item->unitStr(); - } elseif ($unit !== $number[2]) { + } elseif ($number[1] && $unit !== $number[2]) { $this->throwError('Incompatible units: "%s" and "%s".', $originalUnit, $item->unitStr()); break; } + $numbers[$key] = $number; } + return $numbers; } - protected static $libLength = array('list'); + + protected static $libLength = ['list']; protected function libLength($args) { $list = $this->coerceList($args[0]); + return count($list[2]); } + //protected static $libListSeparator = ['list...']; protected function libListSeparator($args) { if (count($args) > 1) { return 'comma'; } + $list = $this->coerceList($args[0]); + if (count($list[2]) <= 1) { return 'space'; } + if ($list[1] === ',') { return 'comma'; } + return 'space'; } - protected static $libNth = array('list', 'n'); + + protected static $libNth = ['list', 'n']; protected function libNth($args) { $list = $this->coerceList($args[0]); $n = $this->assertNumber($args[1]); + if ($n > 0) { $n--; } elseif ($n < 0) { $n += count($list[2]); } - return isset($list[2][$n]) ? $list[2][$n] : self::$defaultValue; + + return isset($list[2][$n]) ? $list[2][$n] : static::$defaultValue; } - protected static $libSetNth = array('list', 'n', 'value'); + + protected static $libSetNth = ['list', 'n', 'value']; protected function libSetNth($args) { $list = $this->coerceList($args[0]); $n = $this->assertNumber($args[1]); + if ($n > 0) { $n--; } elseif ($n < 0) { $n += count($list[2]); } - if (!isset($list[2][$n])) { + + if (! isset($list[2][$n])) { $this->throwError('Invalid argument for "n"'); - return; + + return null; } + $list[2][$n] = $args[2]; + return $list; } - protected static $libMapGet = array('map', 'key'); + + protected static $libMapGet = ['map', 'key']; protected function libMapGet($args) { $map = $this->assertMap($args[0]); $key = $this->compileStringContent($this->coerceString($args[1])); + for ($i = count($map[1]) - 1; $i >= 0; $i--) { if ($key === $this->compileStringContent($this->coerceString($map[1][$i]))) { return $map[2][$i]; } } - return self::$null; + + return static::$null; } - protected static $libMapKeys = array('map'); + + protected static $libMapKeys = ['map']; protected function libMapKeys($args) { $map = $this->assertMap($args[0]); $keys = $map[1]; - return array(Type::T_LIST, ',', $keys); + + return [Type::T_LIST, ',', $keys]; } - protected static $libMapValues = array('map'); + + protected static $libMapValues = ['map']; protected function libMapValues($args) { $map = $this->assertMap($args[0]); $values = $map[2]; - return array(Type::T_LIST, ',', $values); + + return [Type::T_LIST, ',', $values]; } - protected static $libMapRemove = array('map', 'key'); + + protected static $libMapRemove = ['map', 'key']; protected function libMapRemove($args) { $map = $this->assertMap($args[0]); $key = $this->compileStringContent($this->coerceString($args[1])); + for ($i = count($map[1]) - 1; $i >= 0; $i--) { if ($key === $this->compileStringContent($this->coerceString($map[1][$i]))) { array_splice($map[1], $i, 1); array_splice($map[2], $i, 1); } } + return $map; } - protected static $libMapHasKey = array('map', 'key'); + + protected static $libMapHasKey = ['map', 'key']; protected function libMapHasKey($args) { $map = $this->assertMap($args[0]); $key = $this->compileStringContent($this->coerceString($args[1])); + for ($i = count($map[1]) - 1; $i >= 0; $i--) { if ($key === $this->compileStringContent($this->coerceString($map[1][$i]))) { return true; } } + return false; } - protected static $libMapMerge = array('map-1', 'map-2'); + + protected static $libMapMerge = ['map-1', 'map-2']; protected function libMapMerge($args) { $map1 = $this->assertMap($args[0]); $map2 = $this->assertMap($args[1]); - return array(Type::T_MAP, array_merge($map1[1], $map2[1]), array_merge($map1[2], $map2[2])); + + foreach ($map2[1] as $i2 => $key2) { + $key = $this->compileStringContent($this->coerceString($key2)); + + foreach ($map1[1] as $i1 => $key1) { + if ($key === $this->compileStringContent($this->coerceString($key1))) { + $map1[2][$i1] = $map2[2][$i2]; + continue 2; + } + } + + $map1[1][] = $map2[1][$i2]; + $map1[2][] = $map2[2][$i2]; + } + + return $map1; } - protected static $libKeywords = array('args'); + + protected static $libKeywords = ['args']; protected function libKeywords($args) { $this->assertList($args[0]); - $keys = array(); - $values = array(); + + $keys = []; + $values = []; + foreach ($args[0][2] as $name => $arg) { - $keys[] = array(Type::T_KEYWORD, $name); + $keys[] = [Type::T_KEYWORD, $name]; $values[] = $arg; } - return array(Type::T_MAP, $keys, $values); + + return [Type::T_MAP, $keys, $values]; } + protected function listSeparatorForJoin($list1, $sep) { - if (!isset($sep)) { + if (! isset($sep)) { return $list1[1]; } + switch ($this->compileValue($sep)) { case 'comma': return ','; + case 'space': return ''; + default: return $list1[1]; } } - protected static $libJoin = array('list1', 'list2', 'separator'); + + protected static $libJoin = ['list1', 'list2', 'separator']; protected function libJoin($args) { list($list1, $list2, $sep) = $args; + $list1 = $this->coerceList($list1, ' '); $list2 = $this->coerceList($list2, ' '); $sep = $this->listSeparatorForJoin($list1, $sep); - return array(Type::T_LIST, $sep, array_merge($list1[2], $list2[2])); + + return [Type::T_LIST, $sep, array_merge($list1[2], $list2[2])]; } - protected static $libAppend = array('list', 'val', 'separator'); + + protected static $libAppend = ['list', 'val', 'separator']; protected function libAppend($args) { list($list1, $value, $sep) = $args; + $list1 = $this->coerceList($list1, ' '); $sep = $this->listSeparatorForJoin($list1, $sep); - return array(Type::T_LIST, $sep, array_merge($list1[2], array($value))); + + return [Type::T_LIST, $sep, array_merge($list1[2], [$value])]; } + protected function libZip($args) { foreach ($args as $arg) { $this->assertList($arg); } - $lists = array(); + + $lists = []; $firstList = array_shift($args); + foreach ($firstList[2] as $key => $item) { - $list = array(Type::T_LIST, '', array($item)); + $list = [Type::T_LIST, '', [$item]]; + foreach ($args as $arg) { if (isset($arg[2][$key])) { $list[2][] = $arg[2][$key]; @@ -3785,205 +5758,902 @@ class Compiler break 2; } } + $lists[] = $list; } - return array(Type::T_LIST, ',', $lists); + + return [Type::T_LIST, ',', $lists]; } - protected static $libTypeOf = array('value'); + + protected static $libTypeOf = ['value']; protected function libTypeOf($args) { $value = $args[0]; + switch ($value[0]) { case Type::T_KEYWORD: - if ($value === self::$true || $value === self::$false) { + if ($value === static::$true || $value === static::$false) { return 'bool'; } + if ($this->coerceColor($value)) { return 'color'; } - // fall-thru + + // fall-thru case Type::T_FUNCTION: return 'string'; + case Type::T_LIST: if (isset($value[3]) && $value[3]) { return 'arglist'; } - // fall-thru + + // fall-thru default: return $value[0]; } } - protected static $libUnit = array('number'); + + protected static $libUnit = ['number']; protected function libUnit($args) { $num = $args[0]; + if ($num[0] === Type::T_NUMBER) { - return array(Type::T_STRING, '"', array($num->unitStr())); + return [Type::T_STRING, '"', [$num->unitStr()]]; } + return ''; } - protected static $libUnitless = array('number'); + + protected static $libUnitless = ['number']; protected function libUnitless($args) { $value = $args[0]; + return $value[0] === Type::T_NUMBER && $value->unitless(); } - protected static $libComparable = array('number-1', 'number-2'); + + protected static $libComparable = ['number-1', 'number-2']; protected function libComparable($args) { list($number1, $number2) = $args; - if (!isset($number1[0]) || $number1[0] !== Type::T_NUMBER || !isset($number2[0]) || $number2[0] !== Type::T_NUMBER) { + + if (! isset($number1[0]) || $number1[0] !== Type::T_NUMBER || + ! isset($number2[0]) || $number2[0] !== Type::T_NUMBER + ) { $this->throwError('Invalid argument(s) for "comparable"'); - return; + + return null; } + $number1 = $number1->normalize(); $number2 = $number2->normalize(); + return $number1[2] === $number2[2] || $number1->unitless() || $number2->unitless(); } - protected static $libStrIndex = array('string', 'substring'); + + protected static $libStrIndex = ['string', 'substring']; protected function libStrIndex($args) { $string = $this->coerceString($args[0]); $stringContent = $this->compileStringContent($string); + $substring = $this->coerceString($args[1]); $substringContent = $this->compileStringContent($substring); + $result = strpos($stringContent, $substringContent); - return $result === false ? self::$null : new Node\Number($result + 1, ''); + + return $result === false ? static::$null : new Node\Number($result + 1, ''); } - protected static $libStrInsert = array('string', 'insert', 'index'); + + protected static $libStrInsert = ['string', 'insert', 'index']; protected function libStrInsert($args) { $string = $this->coerceString($args[0]); $stringContent = $this->compileStringContent($string); + $insert = $this->coerceString($args[1]); $insertContent = $this->compileStringContent($insert); + list(, $index) = $args[2]; - $string[2] = array(substr_replace($stringContent, $insertContent, $index - 1, 0)); + + $string[2] = [substr_replace($stringContent, $insertContent, $index - 1, 0)]; + return $string; } - protected static $libStrLength = array('string'); + + protected static $libStrLength = ['string']; protected function libStrLength($args) { $string = $this->coerceString($args[0]); $stringContent = $this->compileStringContent($string); + return new Node\Number(strlen($stringContent), ''); } - protected static $libStrSlice = array('string', 'start-at', 'end-at'); + + protected static $libStrSlice = ['string', 'start-at', 'end-at']; protected function libStrSlice($args) { if (isset($args[2]) && $args[2][1] == 0) { - return self::$nullString; + return static::$nullString; } + $string = $this->coerceString($args[0]); $stringContent = $this->compileStringContent($string); + $start = (int) $args[1][1]; + if ($start > 0) { $start--; } - $end = (int) $args[2][1]; + + $end = (int) $args[2][1]; $length = $end < 0 ? $end + 1 : ($end > 0 ? $end - $start : $end); - $string[2] = $length ? array(substr($stringContent, $start, $length)) : array(substr($stringContent, $start)); + + $string[2] = $length + ? [substr($stringContent, $start, $length)] + : [substr($stringContent, $start)]; + return $string; } - protected static $libToLowerCase = array('string'); + + protected static $libToLowerCase = ['string']; protected function libToLowerCase($args) { $string = $this->coerceString($args[0]); $stringContent = $this->compileStringContent($string); - $string[2] = array(mb_strtolower($stringContent)); + + $string[2] = [function_exists('mb_strtolower') ? mb_strtolower($stringContent) : strtolower($stringContent)]; + return $string; } - protected static $libToUpperCase = array('string'); + + protected static $libToUpperCase = ['string']; protected function libToUpperCase($args) { $string = $this->coerceString($args[0]); $stringContent = $this->compileStringContent($string); - $string[2] = array(mb_strtoupper($stringContent)); + + $string[2] = [function_exists('mb_strtoupper') ? mb_strtoupper($stringContent) : strtoupper($stringContent)]; + return $string; } - protected static $libFeatureExists = array('feature'); + + protected static $libFeatureExists = ['feature']; protected function libFeatureExists($args) { $string = $this->coerceString($args[0]); $name = $this->compileStringContent($string); - return $this->toBool(array_key_exists($name, $this->registeredFeatures) ? $this->registeredFeatures[$name] : false); + + return $this->toBool( + array_key_exists($name, $this->registeredFeatures) ? $this->registeredFeatures[$name] : false + ); } - protected static $libFunctionExists = array('name'); + + protected static $libFunctionExists = ['name']; protected function libFunctionExists($args) { $string = $this->coerceString($args[0]); $name = $this->compileStringContent($string); + // user defined functions - if ($this->has(self::$namespaces['function'] . $name)) { + if ($this->has(static::$namespaces['function'] . $name)) { return true; } + $name = $this->normalizeName($name); + if (isset($this->userFunctions[$name])) { return true; } + // built-in functions $f = $this->getBuiltinFunction($name); + return $this->toBool(is_callable($f)); } - protected static $libGlobalVariableExists = array('name'); + + protected static $libGlobalVariableExists = ['name']; protected function libGlobalVariableExists($args) { $string = $this->coerceString($args[0]); $name = $this->compileStringContent($string); + return $this->has($name, $this->rootEnv); } - protected static $libMixinExists = array('name'); + + protected static $libMixinExists = ['name']; protected function libMixinExists($args) { $string = $this->coerceString($args[0]); $name = $this->compileStringContent($string); - return $this->has(self::$namespaces['mixin'] . $name); + + return $this->has(static::$namespaces['mixin'] . $name); } - protected static $libVariableExists = array('name'); + + protected static $libVariableExists = ['name']; protected function libVariableExists($args) { $string = $this->coerceString($args[0]); $name = $this->compileStringContent($string); + return $this->has($name); } + /** * Workaround IE7's content counter bug. * * @param array $args + * + * @return array */ protected function libCounter($args) { - $list = array_map(array($this, 'compileValue'), $args); - return array(Type::T_STRING, '', array('counter(' . implode(',', $list) . ')')); + $list = array_map([$this, 'compileValue'], $args); + + return [Type::T_STRING, '', ['counter(' . implode(',', $list) . ')']]; } - protected static $libRandom = array('limit'); + + protected static $libRandom = ['limit']; protected function libRandom($args) { if (isset($args[0])) { $n = $this->assertNumber($args[0]); + if ($n < 1) { - $this->throwError('limit must be greater than or equal to 1'); - return; + $this->throwError("limit must be greater than or equal to 1"); + + return null; } + return new Node\Number(mt_rand(1, $n), ''); } + return new Node\Number(mt_rand(1, mt_getrandmax()), ''); } + protected function libUniqueId() { static $id; - if (!isset($id)) { + + if (! isset($id)) { $id = mt_rand(0, pow(36, 8)); } + $id += mt_rand(0, 10) + 1; - return array(Type::T_STRING, '', array('u' . str_pad(base_convert($id, 10, 36), 8, '0', STR_PAD_LEFT))); + + return [Type::T_STRING, '', ['u' . str_pad(base_convert($id, 10, 36), 8, '0', STR_PAD_LEFT)]]; } - protected static $libInspect = array('value'); + + protected static $libInspect = ['value']; protected function libInspect($args) { - if ($args[0] === self::$null) { - return array(Type::T_KEYWORD, 'null'); + if ($args[0] === static::$null) { + return [Type::T_KEYWORD, 'null']; } + return $args[0]; } + + /** + * Preprocess selector args + * + * @param array $arg + * + * @return array|boolean + */ + protected function getSelectorArg($arg) + { + static $parser = null; + + if (is_null($parser)) { + $parser = $this->parserFactory(__METHOD__); + } + + $arg = $this->libUnquote([$arg]); + $arg = $this->compileValue($arg); + + $parsedSelector = []; + + if ($parser->parseSelector($arg, $parsedSelector)) { + $selector = $this->evalSelectors($parsedSelector); + $gluedSelector = $this->glueFunctionSelectors($selector); + + return $gluedSelector; + } + + return false; + } + + /** + * Postprocess selector to output in right format + * + * @param array $selectors + * + * @return string + */ + protected function formatOutputSelector($selectors) + { + $selectors = $this->collapseSelectors($selectors, true); + + return $selectors; + } + + protected static $libIsSuperselector = ['super', 'sub']; + protected function libIsSuperselector($args) + { + list($super, $sub) = $args; + + $super = $this->getSelectorArg($super); + $sub = $this->getSelectorArg($sub); + + return $this->isSuperSelector($super, $sub); + } + + /** + * Test a $super selector again $sub + * + * @param array $super + * @param array $sub + * + * @return boolean + */ + protected function isSuperSelector($super, $sub) + { + // one and only one selector for each arg + if (! $super || count($super) !== 1) { + $this->throwError("Invalid super selector for isSuperSelector()"); + } + + if (! $sub || count($sub) !== 1) { + $this->throwError("Invalid sub selector for isSuperSelector()"); + } + + $super = reset($super); + $sub = reset($sub); + + $i = 0; + $nextMustMatch = false; + + foreach ($super as $node) { + $compound = ''; + + array_walk_recursive( + $node, + function ($value, $key) use (&$compound) { + $compound .= $value; + } + ); + + if ($this->isImmediateRelationshipCombinator($compound)) { + if ($node !== $sub[$i]) { + return false; + } + + $nextMustMatch = true; + $i++; + } else { + while ($i < count($sub) && ! $this->isSuperPart($node, $sub[$i])) { + if ($nextMustMatch) { + return false; + } + + $i++; + } + + if ($i >= count($sub)) { + return false; + } + + $nextMustMatch = false; + $i++; + } + } + + return true; + } + + /** + * Test a part of super selector again a part of sub selector + * + * @param array $superParts + * @param array $subParts + * + * @return boolean + */ + protected function isSuperPart($superParts, $subParts) + { + $i = 0; + + foreach ($superParts as $superPart) { + while ($i < count($subParts) && $subParts[$i] !== $superPart) { + $i++; + } + + if ($i >= count($subParts)) { + return false; + } + + $i++; + } + + return true; + } + + //protected static $libSelectorAppend = ['selector...']; + protected function libSelectorAppend($args) + { + if (count($args) < 1) { + $this->throwError("selector-append() needs at least 1 argument"); + } + + $selectors = array_map([$this, 'getSelectorArg'], $args); + + return $this->formatOutputSelector($this->selectorAppend($selectors)); + } + + /** + * Append parts of the last selector in the list to the previous, recursively + * + * @param array $selectors + * + * @return array + * + * @throws \ScssPhp\ScssPhp\Exception\CompilerException + */ + protected function selectorAppend($selectors) + { + $lastSelectors = array_pop($selectors); + + if (! $lastSelectors) { + $this->throwError("Invalid selector list in selector-append()"); + } + + while (count($selectors)) { + $previousSelectors = array_pop($selectors); + + if (! $previousSelectors) { + $this->throwError("Invalid selector list in selector-append()"); + } + + // do the trick, happening $lastSelector to $previousSelector + $appended = []; + + foreach ($lastSelectors as $lastSelector) { + $previous = $previousSelectors; + + foreach ($lastSelector as $lastSelectorParts) { + foreach ($lastSelectorParts as $lastSelectorPart) { + foreach ($previous as $i => $previousSelector) { + foreach ($previousSelector as $j => $previousSelectorParts) { + $previous[$i][$j][] = $lastSelectorPart; + } + } + } + } + + foreach ($previous as $ps) { + $appended[] = $ps; + } + } + + $lastSelectors = $appended; + } + + return $lastSelectors; + } + + protected static $libSelectorExtend = ['selectors', 'extendee', 'extender']; + protected function libSelectorExtend($args) + { + list($selectors, $extendee, $extender) = $args; + + $selectors = $this->getSelectorArg($selectors); + $extendee = $this->getSelectorArg($extendee); + $extender = $this->getSelectorArg($extender); + + if (! $selectors || ! $extendee || ! $extender) { + $this->throwError("selector-extend() invalid arguments"); + } + + $extended = $this->extendOrReplaceSelectors($selectors, $extendee, $extender); + + return $this->formatOutputSelector($extended); + } + + protected static $libSelectorReplace = ['selectors', 'original', 'replacement']; + protected function libSelectorReplace($args) + { + list($selectors, $original, $replacement) = $args; + + $selectors = $this->getSelectorArg($selectors); + $original = $this->getSelectorArg($original); + $replacement = $this->getSelectorArg($replacement); + + if (! $selectors || ! $original || ! $replacement) { + $this->throwError("selector-replace() invalid arguments"); + } + + $replaced = $this->extendOrReplaceSelectors($selectors, $original, $replacement, true); + + return $this->formatOutputSelector($replaced); + } + + /** + * Extend/replace in selectors + * used by selector-extend and selector-replace that use the same logic + * + * @param array $selectors + * @param array $extendee + * @param array $extender + * @param boolean $replace + * + * @return array + */ + protected function extendOrReplaceSelectors($selectors, $extendee, $extender, $replace = false) + { + $saveExtends = $this->extends; + $saveExtendsMap = $this->extendsMap; + + $this->extends = []; + $this->extendsMap = []; + + foreach ($extendee as $es) { + // only use the first one + $this->pushExtends(reset($es), $extender, null); + } + + $extended = []; + + foreach ($selectors as $selector) { + if (! $replace) { + $extended[] = $selector; + } + + $n = count($extended); + + $this->matchExtends($selector, $extended); + + // if didnt match, keep the original selector if we are in a replace operation + if ($replace and count($extended) === $n) { + $extended[] = $selector; + } + } + + $this->extends = $saveExtends; + $this->extendsMap = $saveExtendsMap; + + return $extended; + } + + //protected static $libSelectorNest = ['selector...']; + protected function libSelectorNest($args) + { + if (count($args) < 1) { + $this->throwError("selector-nest() needs at least 1 argument"); + } + + $selectorsMap = array_map([$this, 'getSelectorArg'], $args); + + $envs = []; + foreach ($selectorsMap as $selectors) { + $env = new Environment(); + $env->selectors = $selectors; + + $envs[] = $env; + } + + $envs = array_reverse($envs); + $env = $this->extractEnv($envs); + $outputSelectors = $this->multiplySelectors($env); + + return $this->formatOutputSelector($outputSelectors); + } + + protected static $libSelectorParse = ['selectors']; + protected function libSelectorParse($args) + { + $selectors = reset($args); + $selectors = $this->getSelectorArg($selectors); + + return $this->formatOutputSelector($selectors); + } + + protected static $libSelectorUnify = ['selectors1', 'selectors2']; + protected function libSelectorUnify($args) + { + list($selectors1, $selectors2) = $args; + + $selectors1 = $this->getSelectorArg($selectors1); + $selectors2 = $this->getSelectorArg($selectors2); + + if (! $selectors1 || ! $selectors2) { + $this->throwError("selector-unify() invalid arguments"); + } + + // only consider the first compound of each + $compound1 = reset($selectors1); + $compound2 = reset($selectors2); + + // unify them and that's it + $unified = $this->unifyCompoundSelectors($compound1, $compound2); + + return $this->formatOutputSelector($unified); + } + + /** + * The selector-unify magic as its best + * (at least works as expected on test cases) + * + * @param array $compound1 + * @param array $compound2 + * @return array|mixed + */ + protected function unifyCompoundSelectors($compound1, $compound2) + { + if (! count($compound1)) { + return $compound2; + } + + if (! count($compound2)) { + return $compound1; + } + + // check that last part are compatible + $lastPart1 = array_pop($compound1); + $lastPart2 = array_pop($compound2); + $last = $this->mergeParts($lastPart1, $lastPart2); + + if (! $last) { + return [[]]; + } + + $unifiedCompound = [$last]; + $unifiedSelectors = [$unifiedCompound]; + + // do the rest + while (count($compound1) || count($compound2)) { + $part1 = end($compound1); + $part2 = end($compound2); + + if ($part1 && ($match2 = $this->matchPartInCompound($part1, $compound2))) { + list($compound2, $part2, $after2) = $match2; + + if ($after2) { + $unifiedSelectors = $this->prependSelectors($unifiedSelectors, $after2); + } + + $c = $this->mergeParts($part1, $part2); + $unifiedSelectors = $this->prependSelectors($unifiedSelectors, [$c]); + $part1 = $part2 = null; + + array_pop($compound1); + } + + if ($part2 && ($match1 = $this->matchPartInCompound($part2, $compound1))) { + list($compound1, $part1, $after1) = $match1; + + if ($after1) { + $unifiedSelectors = $this->prependSelectors($unifiedSelectors, $after1); + } + + $c = $this->mergeParts($part2, $part1); + $unifiedSelectors = $this->prependSelectors($unifiedSelectors, [$c]); + $part1 = $part2 = null; + + array_pop($compound2); + } + + $new = []; + + if ($part1 && $part2) { + array_pop($compound1); + array_pop($compound2); + + $s = $this->prependSelectors($unifiedSelectors, [$part2]); + $new = array_merge($new, $this->prependSelectors($s, [$part1])); + $s = $this->prependSelectors($unifiedSelectors, [$part1]); + $new = array_merge($new, $this->prependSelectors($s, [$part2])); + } elseif ($part1) { + array_pop($compound1); + + $new = array_merge($new, $this->prependSelectors($unifiedSelectors, [$part1])); + } elseif ($part2) { + array_pop($compound2); + + $new = array_merge($new, $this->prependSelectors($unifiedSelectors, [$part2])); + } + + if ($new) { + $unifiedSelectors = $new; + } + } + + return $unifiedSelectors; + } + + /** + * Prepend each selector from $selectors with $parts + * + * @param array $selectors + * @param array $parts + * + * @return array + */ + protected function prependSelectors($selectors, $parts) + { + $new = []; + + foreach ($selectors as $compoundSelector) { + array_unshift($compoundSelector, $parts); + + $new[] = $compoundSelector; + } + + return $new; + } + + /** + * Try to find a matching part in a compound: + * - with same html tag name + * - with some class or id or something in common + * + * @param array $part + * @param array $compound + * + * @return array|boolean + */ + protected function matchPartInCompound($part, $compound) + { + $partTag = $this->findTagName($part); + $before = $compound; + $after = []; + + // try to find a match by tag name first + while (count($before)) { + $p = array_pop($before); + + if ($partTag && $partTag !== '*' && $partTag == $this->findTagName($p)) { + return [$before, $p, $after]; + } + + $after[] = $p; + } + + // try again matching a non empty intersection and a compatible tagname + $before = $compound; + $after = []; + + while (count($before)) { + $p = array_pop($before); + + if ($this->checkCompatibleTags($partTag, $this->findTagName($p))) { + if (count(array_intersect($part, $p))) { + return [$before, $p, $after]; + } + } + + $after[] = $p; + } + + return false; + } + + /** + * Merge two part list taking care that + * - the html tag is coming first - if any + * - the :something are coming last + * + * @param array $parts1 + * @param array $parts2 + * + * @return array + */ + protected function mergeParts($parts1, $parts2) + { + $tag1 = $this->findTagName($parts1); + $tag2 = $this->findTagName($parts2); + $tag = $this->checkCompatibleTags($tag1, $tag2); + + // not compatible tags + if ($tag === false) { + return []; + } + + if ($tag) { + if ($tag1) { + $parts1 = array_diff($parts1, [$tag1]); + } + + if ($tag2) { + $parts2 = array_diff($parts2, [$tag2]); + } + } + + $mergedParts = array_merge($parts1, $parts2); + $mergedOrderedParts = []; + + foreach ($mergedParts as $part) { + if (strpos($part, ':') === 0) { + $mergedOrderedParts[] = $part; + } + } + + $mergedParts = array_diff($mergedParts, $mergedOrderedParts); + $mergedParts = array_merge($mergedParts, $mergedOrderedParts); + + if ($tag) { + array_unshift($mergedParts, $tag); + } + + return $mergedParts; + } + + /** + * Check the compatibility between two tag names: + * if both are defined they should be identical or one has to be '*' + * + * @param string $tag1 + * @param string $tag2 + * + * @return array|boolean + */ + protected function checkCompatibleTags($tag1, $tag2) + { + $tags = [$tag1, $tag2]; + $tags = array_unique($tags); + $tags = array_filter($tags); + + if (count($tags)>1) { + $tags = array_diff($tags, ['*']); + } + + // not compatible nodes + if (count($tags)>1) { + return false; + } + + return $tags; + } + + /** + * Find the html tag name in a selector parts list + * + * @param array $parts + * + * @return mixed|string + */ + protected function findTagName($parts) + { + foreach ($parts as $part) { + if (! preg_match('/^[\[.:#%_-]/', $part)) { + return $part; + } + } + + return ''; + } + + protected static $libSimpleSelectors = ['selector']; + protected function libSimpleSelectors($args) + { + $selector = reset($args); + $selector = $this->getSelectorArg($selector); + + // remove selectors list layer, keeping the first one + $selector = reset($selector); + + // remove parts list layer, keeping the first part + $part = reset($selector); + + $listParts = []; + + foreach ($part as $p) { + $listParts[] = [Type::T_STRING, '', [$p]]; + } + + return [Type::T_LIST, ',', $listParts]; + } } diff --git a/lib/scssphp/src/Compiler/Environment.php b/lib/scssphp/src/Compiler/Environment.php index 45da6aae2..03eb86a5d 100644 --- a/lib/scssphp/src/Compiler/Environment.php +++ b/lib/scssphp/src/Compiler/Environment.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Compiler; + +namespace ScssPhp\ScssPhp\Compiler; /** * Compiler environment @@ -18,17 +19,25 @@ namespace Leafo\ScssPhp\Compiler; class Environment { /** - * @var \Leafo\ScssPhp\Block + * @var \ScssPhp\ScssPhp\Block */ public $block; + /** - * @var \Leafo\ScssPhp\Compiler\Environment + * @var \ScssPhp\ScssPhp\Compiler\Environment */ public $parent; + /** * @var array */ public $store; + + /** + * @var array + */ + public $storeUnreduced; + /** * @var integer */ diff --git a/lib/scssphp/src/Exception/CompilerException.php b/lib/scssphp/src/Exception/CompilerException.php index 6ffb0416e..a9d134fca 100644 --- a/lib/scssphp/src/Exception/CompilerException.php +++ b/lib/scssphp/src/Exception/CompilerException.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Exception; + +namespace ScssPhp\ScssPhp\Exception; /** * Compiler exception diff --git a/lib/scssphp/src/Exception/ParserException.php b/lib/scssphp/src/Exception/ParserException.php index b7470152a..2fa12dd7a 100644 --- a/lib/scssphp/src/Exception/ParserException.php +++ b/lib/scssphp/src/Exception/ParserException.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Exception; + +namespace ScssPhp\ScssPhp\Exception; /** * Parser Exception diff --git a/lib/scssphp/src/Exception/ServerException.php b/lib/scssphp/src/Exception/ServerException.php index bffa8c54c..d4a207aff 100644 --- a/lib/scssphp/src/Exception/ServerException.php +++ b/lib/scssphp/src/Exception/ServerException.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Exception; + +namespace ScssPhp\ScssPhp\Exception; /** * Server Exception diff --git a/lib/scssphp/src/Formatter.php b/lib/scssphp/src/Formatter.php index e6aa405ee..b2efc2dcb 100644 --- a/lib/scssphp/src/Formatter.php +++ b/lib/scssphp/src/Formatter.php @@ -2,15 +2,18 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp; -use Leafo\ScssPhp\Formatter\OutputBlock; +namespace ScssPhp\ScssPhp; + +use ScssPhp\ScssPhp\Formatter\OutputBlock; +use ScssPhp\ScssPhp\SourceMap\SourceMapGenerator; + /** * Base formatter * @@ -22,40 +25,69 @@ abstract class Formatter * @var integer */ public $indentLevel; + /** * @var string */ public $indentChar; + /** * @var string */ public $break; + /** * @var string */ public $open; + /** * @var string */ public $close; + /** * @var string */ public $tagSeparator; + /** * @var string */ public $assignSeparator; + /** - * @var boolea + * @var boolean */ public $keepSemicolons; + + /** + * @var \ScssPhp\ScssPhp\Formatter\OutputBlock + */ + protected $currentBlock; + + /** + * @var integer + */ + protected $currentLine; + + /** + * @var integer + */ + protected $currentColumn; + + /** + * @var \ScssPhp\ScssPhp\SourceMap\SourceMapGenerator + */ + protected $sourceMapGenerator; + /** * Initialize formatter * * @api */ - public abstract function __construct(); + abstract public function __construct(); + /** * Return indentation (whitespace) * @@ -65,6 +97,7 @@ abstract class Formatter { return ''; } + /** * Return property assignment * @@ -79,6 +112,7 @@ abstract class Formatter { return rtrim($name) . $this->assignSeparator . $value . ';'; } + /** * Strip semi-colon appended by property(); it's a separator, not a terminator * @@ -91,38 +125,50 @@ abstract class Formatter if ($this->keepSemicolons) { return; } - if (($count = count($lines)) && substr($lines[$count - 1], -1) === ';') { + + if (($count = count($lines)) + && substr($lines[$count - 1], -1) === ';' + ) { $lines[$count - 1] = substr($lines[$count - 1], 0, -1); } } + /** * Output lines inside a block * - * @param \Leafo\ScssPhp\Formatter\OutputBlock $block + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block */ protected function blockLines(OutputBlock $block) { $inner = $this->indentStr(); + $glue = $this->break . $inner; - echo $inner . implode($glue, $block->lines); - if (!empty($block->children)) { - echo $this->break; + + $this->write($inner . implode($glue, $block->lines)); + + if (! empty($block->children)) { + $this->write($this->break); } } + /** * Output block selectors * - * @param \Leafo\ScssPhp\Formatter\OutputBlock $block + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block */ protected function blockSelectors(OutputBlock $block) { $inner = $this->indentStr(); - echo $inner . implode($this->tagSeparator, $block->selectors) . $this->open . $this->break; + + $this->write($inner + . implode($this->tagSeparator, $block->selectors) + . $this->open . $this->break); } + /** * Output block children * - * @param \Leafo\ScssPhp\Formatter\OutputBlock $block + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block */ protected function blockChildren(OutputBlock $block) { @@ -130,49 +176,100 @@ abstract class Formatter $this->block($child); } } + /** * Output non-empty block * - * @param \Leafo\ScssPhp\Formatter\OutputBlock $block + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block */ protected function block(OutputBlock $block) { if (empty($block->lines) && empty($block->children)) { return; } + + $this->currentBlock = $block; + $pre = $this->indentStr(); - if (!empty($block->selectors)) { + + if (! empty($block->selectors)) { $this->blockSelectors($block); + $this->indentLevel++; } - if (!empty($block->lines)) { + + if (! empty($block->lines)) { $this->blockLines($block); } - if (!empty($block->children)) { + + if (! empty($block->children)) { $this->blockChildren($block); } - if (!empty($block->selectors)) { + + if (! empty($block->selectors)) { $this->indentLevel--; + if (empty($block->children)) { - echo $this->break; + $this->write($this->break); } - echo $pre . $this->close . $this->break; + + $this->write($pre . $this->close . $this->break); } } + /** * Entry point to formatting a block * * @api * - * @param \Leafo\ScssPhp\Formatter\OutputBlock $block An abstract syntax tree + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block An abstract syntax tree + * @param \ScssPhp\ScssPhp\SourceMap\SourceMapGenerator|null $sourceMapGenerator Optional source map generator * * @return string */ - public function format(OutputBlock $block) + public function format(OutputBlock $block, SourceMapGenerator $sourceMapGenerator = null) { + $this->sourceMapGenerator = null; + + if ($sourceMapGenerator) { + $this->currentLine = 1; + $this->currentColumn = 0; + $this->sourceMapGenerator = $sourceMapGenerator; + } + ob_start(); + $this->block($block); + $out = ob_get_clean(); + return $out; } + + /** + * @param string $str + */ + protected function write($str) + { + if ($this->sourceMapGenerator) { + $this->sourceMapGenerator->addMapping( + $this->currentLine, + $this->currentColumn, + $this->currentBlock->sourceLine, + //columns from parser are off by one + $this->currentBlock->sourceColumn > 0 ? $this->currentBlock->sourceColumn - 1 : 0, + $this->currentBlock->sourceName + ); + + $lines = explode("\n", $str); + $lineCount = count($lines); + $this->currentLine += $lineCount-1; + + $lastLine = array_pop($lines); + + $this->currentColumn = ($lineCount === 1 ? $this->currentColumn : 0) + strlen($lastLine); + } + + echo $str; + } } diff --git a/lib/scssphp/src/Formatter/Compact.php b/lib/scssphp/src/Formatter/Compact.php index d720ff52d..591f0c92e 100644 --- a/lib/scssphp/src/Formatter/Compact.php +++ b/lib/scssphp/src/Formatter/Compact.php @@ -2,15 +2,17 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter; +namespace ScssPhp\ScssPhp\Formatter; + +use ScssPhp\ScssPhp\Formatter; + /** * Compact formatter * @@ -27,13 +29,12 @@ class Compact extends Formatter $this->indentChar = ''; $this->break = ''; $this->open = ' {'; - $this->close = '} - -'; + $this->close = "}\n\n"; $this->tagSeparator = ','; $this->assignSeparator = ':'; $this->keepSemicolons = true; } + /** * {@inheritdoc} */ diff --git a/lib/scssphp/src/Formatter/Compressed.php b/lib/scssphp/src/Formatter/Compressed.php index 6c5479fbf..ec4722eaf 100644 --- a/lib/scssphp/src/Formatter/Compressed.php +++ b/lib/scssphp/src/Formatter/Compressed.php @@ -2,16 +2,18 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter\OutputBlock; +namespace ScssPhp\ScssPhp\Formatter; + +use ScssPhp\ScssPhp\Formatter; +use ScssPhp\ScssPhp\Formatter\OutputBlock; + /** * Compressed formatter * @@ -33,13 +35,16 @@ class Compressed extends Formatter $this->assignSeparator = ':'; $this->keepSemicolons = false; } + /** * {@inheritdoc} */ public function blockLines(OutputBlock $block) { $inner = $this->indentStr(); + $glue = $this->break . $inner; + foreach ($block->lines as $index => $line) { if (substr($line, 0, 2) === '/*' && substr($line, 2, 1) !== '!') { unset($block->lines[$index]); @@ -47,9 +52,30 @@ class Compressed extends Formatter $block->lines[$index] = '/*' . substr($line, 3); } } - echo $inner . implode($glue, $block->lines); - if (!empty($block->children)) { - echo $this->break; + + $this->write($inner . implode($glue, $block->lines)); + + if (! empty($block->children)) { + $this->write($this->break); } } + + /** + * Output block selectors + * + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block + */ + protected function blockSelectors(OutputBlock $block) + { + $inner = $this->indentStr(); + + $this->write( + $inner + . implode( + $this->tagSeparator, + str_replace([' > ', ' + ', ' ~ '], ['>', '+', '~'], $block->selectors) + ) + . $this->open . $this->break + ); + } } diff --git a/lib/scssphp/src/Formatter/Crunched.php b/lib/scssphp/src/Formatter/Crunched.php index ace6a67e5..51ccb516d 100644 --- a/lib/scssphp/src/Formatter/Crunched.php +++ b/lib/scssphp/src/Formatter/Crunched.php @@ -2,16 +2,18 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter\OutputBlock; +namespace ScssPhp\ScssPhp\Formatter; + +use ScssPhp\ScssPhp\Formatter; +use ScssPhp\ScssPhp\Formatter\OutputBlock; + /** * Crunched formatter * @@ -33,21 +35,45 @@ class Crunched extends Formatter $this->assignSeparator = ':'; $this->keepSemicolons = false; } + /** * {@inheritdoc} */ public function blockLines(OutputBlock $block) { $inner = $this->indentStr(); + $glue = $this->break . $inner; + foreach ($block->lines as $index => $line) { if (substr($line, 0, 2) === '/*') { unset($block->lines[$index]); } } - echo $inner . implode($glue, $block->lines); - if (!empty($block->children)) { - echo $this->break; + + $this->write($inner . implode($glue, $block->lines)); + + if (! empty($block->children)) { + $this->write($this->break); } } + + /** + * Output block selectors + * + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block + */ + protected function blockSelectors(OutputBlock $block) + { + $inner = $this->indentStr(); + + $this->write( + $inner + . implode( + $this->tagSeparator, + str_replace([' > ', ' + ', ' ~ '], ['>', '+', '~'], $block->selectors) + ) + . $this->open . $this->break + ); + } } diff --git a/lib/scssphp/src/Formatter/Debug.php b/lib/scssphp/src/Formatter/Debug.php index a698f58c7..94e70c815 100644 --- a/lib/scssphp/src/Formatter/Debug.php +++ b/lib/scssphp/src/Formatter/Debug.php @@ -2,16 +2,18 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter\OutputBlock; +namespace ScssPhp\ScssPhp\Formatter; + +use ScssPhp\ScssPhp\Formatter; +use ScssPhp\ScssPhp\Formatter\OutputBlock; + /** * Debug formatter * @@ -26,14 +28,14 @@ class Debug extends Formatter { $this->indentLevel = 0; $this->indentChar = ''; - $this->break = ' -'; + $this->break = "\n"; $this->open = ' {'; $this->close = ' }'; $this->tagSeparator = ', '; $this->assignSeparator = ': '; $this->keepSemicolons = true; } + /** * {@inheritdoc} */ @@ -41,57 +43,77 @@ class Debug extends Formatter { return str_repeat(' ', $this->indentLevel); } + /** * {@inheritdoc} */ protected function blockLines(OutputBlock $block) { $indent = $this->indentStr(); + if (empty($block->lines)) { - echo "{$indent}block->lines: []\n"; + $this->write("{$indent}block->lines: []\n"); + return; } + foreach ($block->lines as $index => $line) { - echo "{$indent}block->lines[{$index}]: {$line}\n"; + $this->write("{$indent}block->lines[{$index}]: $line\n"); } } + /** * {@inheritdoc} */ protected function blockSelectors(OutputBlock $block) { $indent = $this->indentStr(); + if (empty($block->selectors)) { - echo "{$indent}block->selectors: []\n"; + $this->write("{$indent}block->selectors: []\n"); + return; } + foreach ($block->selectors as $index => $selector) { - echo "{$indent}block->selectors[{$index}]: {$selector}\n"; + $this->write("{$indent}block->selectors[{$index}]: $selector\n"); } } + /** * {@inheritdoc} */ protected function blockChildren(OutputBlock $block) { $indent = $this->indentStr(); + if (empty($block->children)) { - echo "{$indent}block->children: []\n"; + $this->write("{$indent}block->children: []\n"); + return; } + $this->indentLevel++; + foreach ($block->children as $i => $child) { $this->block($child); } + $this->indentLevel--; } + /** * {@inheritdoc} */ protected function block(OutputBlock $block) { $indent = $this->indentStr(); - echo "{$indent}block->type: {$block->type}\n" . "{$indent}block->depth: {$block->depth}\n"; + + $this->write("{$indent}block->type: {$block->type}\n" . + "{$indent}block->depth: {$block->depth}\n"); + + $this->currentBlock = $block; + $this->blockSelectors($block); $this->blockLines($block); $this->blockChildren($block); diff --git a/lib/scssphp/src/Formatter/Expanded.php b/lib/scssphp/src/Formatter/Expanded.php index 3fb066bb8..8eec47587 100644 --- a/lib/scssphp/src/Formatter/Expanded.php +++ b/lib/scssphp/src/Formatter/Expanded.php @@ -2,16 +2,18 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter\OutputBlock; +namespace ScssPhp\ScssPhp\Formatter; + +use ScssPhp\ScssPhp\Formatter; +use ScssPhp\ScssPhp\Formatter\OutputBlock; + /** * Expanded formatter * @@ -26,14 +28,14 @@ class Expanded extends Formatter { $this->indentLevel = 0; $this->indentChar = ' '; - $this->break = ' -'; + $this->break = "\n"; $this->open = ' {'; $this->close = '}'; $this->tagSeparator = ', '; $this->assignSeparator = ': '; $this->keepSemicolons = true; } + /** * {@inheritdoc} */ @@ -41,21 +43,26 @@ class Expanded extends Formatter { return str_repeat($this->indentChar, $this->indentLevel); } + /** * {@inheritdoc} */ protected function blockLines(OutputBlock $block) { $inner = $this->indentStr(); + $glue = $this->break . $inner; + foreach ($block->lines as $index => $line) { if (substr($line, 0, 2) === '/*') { - $block->lines[$index] = preg_replace('/(\\r|\\n)+/', $glue, $line); + $block->lines[$index] = preg_replace('/(\r|\n)+/', $glue, $line); } } - echo $inner . implode($glue, $block->lines); - if (empty($block->selectors) || !empty($block->children)) { - echo $this->break; + + $this->write($inner . implode($glue, $block->lines)); + + if (empty($block->selectors) || ! empty($block->children)) { + $this->write($this->break); } } } diff --git a/lib/scssphp/src/Formatter/Nested.php b/lib/scssphp/src/Formatter/Nested.php index 34ed508ab..260ae8e7a 100644 --- a/lib/scssphp/src/Formatter/Nested.php +++ b/lib/scssphp/src/Formatter/Nested.php @@ -2,16 +2,18 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter; -use Leafo\ScssPhp\Formatter\OutputBlock; +namespace ScssPhp\ScssPhp\Formatter; + +use ScssPhp\ScssPhp\Formatter; +use ScssPhp\ScssPhp\Formatter\OutputBlock; + /** * Nested formatter * @@ -23,6 +25,7 @@ class Nested extends Formatter * @var integer */ private $depth; + /** * {@inheritdoc} */ @@ -30,47 +33,58 @@ class Nested extends Formatter { $this->indentLevel = 0; $this->indentChar = ' '; - $this->break = ' -'; + $this->break = "\n"; $this->open = ' {'; $this->close = ' }'; $this->tagSeparator = ', '; $this->assignSeparator = ': '; $this->keepSemicolons = true; } + /** * {@inheritdoc} */ protected function indentStr() { $n = $this->depth - 1; + return str_repeat($this->indentChar, max($this->indentLevel + $n, 0)); } + /** * {@inheritdoc} */ protected function blockLines(OutputBlock $block) { $inner = $this->indentStr(); + $glue = $this->break . $inner; + foreach ($block->lines as $index => $line) { if (substr($line, 0, 2) === '/*') { - $block->lines[$index] = preg_replace('/(\\r|\\n)+/', $glue, $line); + $block->lines[$index] = preg_replace('/(\r|\n)+/', $glue, $line); } } - echo $inner . implode($glue, $block->lines); - if (!empty($block->children)) { - echo $this->break; + + $this->write($inner . implode($glue, $block->lines)); + + if (! empty($block->children)) { + $this->write($this->break); } } + /** * {@inheritdoc} */ protected function blockSelectors(OutputBlock $block) { $inner = $this->indentStr(); - echo $inner . implode($this->tagSeparator, $block->selectors) . $this->open . $this->break; + + $this->write($inner + . implode($this->tagSeparator, $block->selectors) + . $this->open . $this->break); } + /** * {@inheritdoc} */ @@ -78,17 +92,21 @@ class Nested extends Formatter { foreach ($block->children as $i => $child) { $this->block($child); + if ($i < count($block->children) - 1) { - echo $this->break; + $this->write($this->break); + if (isset($block->children[$i + 1])) { $next = $block->children[$i + 1]; + if ($next->depth === max($block->depth, 1) && $child->depth >= $next->depth) { - echo $this->break; + $this->write($this->break); } } } } } + /** * {@inheritdoc} */ @@ -97,52 +115,72 @@ class Nested extends Formatter if ($block->type === 'root') { $this->adjustAllChildren($block); } + if (empty($block->lines) && empty($block->children)) { return; } + + $this->currentBlock = $block; + + $this->depth = $block->depth; - if (!empty($block->selectors)) { + + if (! empty($block->selectors)) { $this->blockSelectors($block); + $this->indentLevel++; } - if (!empty($block->lines)) { + + if (! empty($block->lines)) { $this->blockLines($block); } - if (!empty($block->children)) { + + if (! empty($block->children)) { $this->blockChildren($block); } - if (!empty($block->selectors)) { + + if (! empty($block->selectors)) { $this->indentLevel--; - echo $this->close; + + $this->write($this->close); } + if ($block->type === 'root') { - echo $this->break; + $this->write($this->break); } } + /** * Adjust the depths of all children, depth first * - * @param \Leafo\ScssPhp\Formatter\OutputBlock $block + * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block */ private function adjustAllChildren(OutputBlock $block) { // flatten empty nested blocks - $children = array(); + $children = []; + foreach ($block->children as $i => $child) { if (empty($child->lines) && empty($child->children)) { if (isset($block->children[$i + 1])) { $block->children[$i + 1]->depth = $child->depth; } + continue; } + $children[] = $child; } + $count = count($children); + for ($i = 0; $i < $count; $i++) { $depth = $children[$i]->depth; $j = $i + 1; + if (isset($children[$j]) && $depth < $children[$j]->depth) { $childDepth = $children[$j]->depth; + for (; $j < $count; $j++) { if ($depth < $children[$j]->depth && $childDepth >= $children[$j]->depth) { $children[$j]->depth = $depth + 1; @@ -150,10 +188,13 @@ class Nested extends Formatter } } } + $block->children = $children; + // make relative to parent foreach ($block->children as $child) { $this->adjustAllChildren($child); + $child->depth = $child->depth - $block->depth; } } diff --git a/lib/scssphp/src/Formatter/OutputBlock.php b/lib/scssphp/src/Formatter/OutputBlock.php index bda7c6d9b..3e6fd9289 100644 --- a/lib/scssphp/src/Formatter/OutputBlock.php +++ b/lib/scssphp/src/Formatter/OutputBlock.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Formatter; + +namespace ScssPhp\ScssPhp\Formatter; /** * Output block @@ -21,24 +22,44 @@ class OutputBlock * @var string */ public $type; + /** * @var integer */ public $depth; + /** * @var array */ public $selectors; + /** * @var array */ public $lines; + /** * @var array */ public $children; + /** - * @var \Leafo\ScssPhp\Formatter\OutputBlock + * @var \ScssPhp\ScssPhp\Formatter\OutputBlock */ public $parent; + + /** + * @var string + */ + public $sourceName; + + /** + * @var integer + */ + public $sourceLine; + + /** + * @var integer + */ + public $sourceColumn; } diff --git a/lib/scssphp/src/Node.php b/lib/scssphp/src/Node.php index 5efc79691..dab565a63 100644 --- a/lib/scssphp/src/Node.php +++ b/lib/scssphp/src/Node.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp; + +namespace ScssPhp\ScssPhp; /** * Base node @@ -21,14 +22,17 @@ abstract class Node * @var string */ public $type; + /** * @var integer */ public $sourceIndex; + /** * @var integer */ public $sourceLine; + /** * @var integer */ diff --git a/lib/scssphp/src/Node/Number.php b/lib/scssphp/src/Node/Number.php index f94c4cc18..e184ca193 100644 --- a/lib/scssphp/src/Node/Number.php +++ b/lib/scssphp/src/Node/Number.php @@ -2,17 +2,19 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp\Node; -use Leafo\ScssPhp\Compiler; -use Leafo\ScssPhp\Node; -use Leafo\ScssPhp\Type; +namespace ScssPhp\ScssPhp\Node; + +use ScssPhp\ScssPhp\Compiler; +use ScssPhp\ScssPhp\Node; +use ScssPhp\ScssPhp\Type; + /** * Dimension + optional units * @@ -29,21 +31,54 @@ class Number extends Node implements \ArrayAccess /** * @var integer */ - public static $precision = 5; + static public $precision = 10; + /** * @see http://www.w3.org/TR/2012/WD-css3-values-20120308/ * * @var array */ - protected static $unitTable = array('in' => array('in' => 1, 'pc' => 6, 'pt' => 72, 'px' => 96, 'cm' => 2.54, 'mm' => 25.4, 'q' => 101.6), 'turn' => array('deg' => 360, 'grad' => 400, 'rad' => 6.283185307179586, 'turn' => 1), 's' => array('s' => 1, 'ms' => 1000), 'Hz' => array('Hz' => 1, 'kHz' => 0.001), 'dpi' => array('dpi' => 1, 'dpcm' => 2.54, 'dppx' => 96)); + static protected $unitTable = [ + 'in' => [ + 'in' => 1, + 'pc' => 6, + 'pt' => 72, + 'px' => 96, + 'cm' => 2.54, + 'mm' => 25.4, + 'q' => 101.6, + ], + 'turn' => [ + 'deg' => 360, + 'grad' => 400, + 'rad' => 6.28318530717958647692528676, // 2 * M_PI + 'turn' => 1, + ], + 's' => [ + 's' => 1, + 'ms' => 1000, + ], + 'Hz' => [ + 'Hz' => 1, + 'kHz' => 0.001, + ], + 'dpi' => [ + 'dpi' => 1, + 'dpcm' => 2.54, + 'dppx' => 96, + ], + ]; + /** * @var integer|float */ public $dimension; + /** * @var array */ public $units; + /** * Initialize number * @@ -52,43 +87,54 @@ class Number extends Node implements \ArrayAccess */ public function __construct($dimension, $initialUnit) { - $this->type = Type::T_NUMBER; + $this->type = Type::T_NUMBER; $this->dimension = $dimension; - $this->units = is_array($initialUnit) ? $initialUnit : ($initialUnit ? array($initialUnit => 1) : array()); + $this->units = is_array($initialUnit) + ? $initialUnit + : ($initialUnit ? [$initialUnit => 1] + : []); } + /** * Coerce number to target units * * @param array $units * - * @return \Leafo\ScssPhp\Node\Number + * @return \ScssPhp\ScssPhp\Node\Number */ public function coerce($units) { if ($this->unitless()) { return new Number($this->dimension, $units); } + $dimension = $this->dimension; - foreach (self::$unitTable['in'] as $unit => $conv) { - $from = isset($this->units[$unit]) ? $this->units[$unit] : 0; - $to = isset($units[$unit]) ? $units[$unit] : 0; - $factor = pow($conv, $from - $to); + + foreach (static::$unitTable['in'] as $unit => $conv) { + $from = isset($this->units[$unit]) ? $this->units[$unit] : 0; + $to = isset($units[$unit]) ? $units[$unit] : 0; + $factor = pow($conv, $from - $to); $dimension /= $factor; } + return new Number($dimension, $units); } + /** * Normalize number * - * @return \Leafo\ScssPhp\Node\Number + * @return \ScssPhp\ScssPhp\Node\Number */ public function normalize() { $dimension = $this->dimension; - $units = array(); + $units = []; + $this->normalizeUnits($dimension, $units, 'in'); + return new Number($dimension, $units); } + /** * {@inheritdoc} */ @@ -97,14 +143,22 @@ class Number extends Node implements \ArrayAccess if ($offset === -3) { return $this->sourceColumn !== null; } + if ($offset === -2) { return $this->sourceLine !== null; } - if ($offset === -1 || $offset === 0 || $offset === 1 || $offset === 2) { + + if ($offset === -1 + || $offset === 0 + || $offset === 1 + || $offset === 2 + ) { return true; } + return false; } + /** * {@inheritdoc} */ @@ -113,18 +167,24 @@ class Number extends Node implements \ArrayAccess switch ($offset) { case -3: return $this->sourceColumn; + case -2: return $this->sourceLine; + case -1: return $this->sourceIndex; + case 0: return $this->type; + case 1: return $this->dimension; + case 2: return $this->units; } } + /** * {@inheritdoc} */ @@ -142,6 +202,7 @@ class Number extends Node implements \ArrayAccess $this->sourceColumn = $value; } } + /** * {@inheritdoc} */ @@ -159,6 +220,7 @@ class Number extends Node implements \ArrayAccess $this->sourceColumn = null; } } + /** * Returns true if the number is unitless * @@ -166,8 +228,9 @@ class Number extends Node implements \ArrayAccess */ public function unitless() { - return !array_sum($this->units); + return ! array_sum($this->units); } + /** * Returns unit(s) as the product of numerator units divided by the product of denominator units * @@ -175,50 +238,64 @@ class Number extends Node implements \ArrayAccess */ public function unitStr() { - $numerators = array(); - $denominators = array(); + $numerators = []; + $denominators = []; + foreach ($this->units as $unit => $unitSize) { if ($unitSize > 0) { $numerators = array_pad($numerators, count($numerators) + $unitSize, $unit); continue; } + if ($unitSize < 0) { $denominators = array_pad($denominators, count($denominators) + $unitSize, $unit); continue; } } + return implode('*', $numerators) . (count($denominators) ? '/' . implode('*', $denominators) : ''); } + /** * Output number * - * @param \Leafo\ScssPhp\Compiler $compiler + * @param \ScssPhp\ScssPhp\Compiler $compiler * * @return string */ public function output(Compiler $compiler = null) { - $dimension = round($this->dimension, self::$precision); + $dimension = round($this->dimension, static::$precision); + $units = array_filter($this->units, function ($unitSize) { return $unitSize; }); + if (count($units) > 1 && array_sum($units) === 0) { $dimension = $this->dimension; - $units = array(); + $units = []; + $this->normalizeUnits($dimension, $units, 'in'); - $dimension = round($dimension, self::$precision); - $units = array_filter($units, function ($unitSize) { + + $dimension = round($dimension, static::$precision); + $units = array_filter($units, function ($unitSize) { return $unitSize; }); } + $unitSize = array_sum($units); + if ($compiler && ($unitSize > 1 || $unitSize < 0 || count($units) > 1)) { - $compiler->throwError((string) $dimension . $this->unitStr() . ' isn\'t a valid CSS value.'); + $compiler->throwError((string) $dimension . $this->unitStr() . " isn't a valid CSS value."); } + reset($units); - list($unit, ) = each($units); - return (string) $dimension . $unit; + $unit = key($units); + $dimension = number_format($dimension, static::$precision, '.', ''); + + return (static::$precision ? rtrim(rtrim($dimension, '0'), '.') : $dimension) . $unit; } + /** * {@inheritdoc} */ @@ -226,6 +303,7 @@ class Number extends Node implements \ArrayAccess { return $this->output(); } + /** * Normalize units * @@ -236,13 +314,16 @@ class Number extends Node implements \ArrayAccess private function normalizeUnits(&$dimension, &$units, $baseUnit = 'in') { $dimension = $this->dimension; - $units = array(); + $units = []; + foreach ($this->units as $unit => $exp) { - if (isset(self::$unitTable[$baseUnit][$unit])) { - $factor = pow(self::$unitTable[$baseUnit][$unit], $exp); + if (isset(static::$unitTable[$baseUnit][$unit])) { + $factor = pow(static::$unitTable[$baseUnit][$unit], $exp); + $unit = $baseUnit; $dimension /= $factor; } + $units[$unit] = $exp + (isset($units[$unit]) ? $units[$unit] : 0); } } diff --git a/lib/scssphp/src/Parser.php b/lib/scssphp/src/Parser.php index 721ddcf18f62deceabdb526a1a1a1400f32c22ee..b8091313b4c27a4f16c6d7fa46d591a50a09edf9 100644 GIT binary patch literal 71077 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 I{PxNJ1>-Bbs{jB1 delta 12115 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 tmcjL}KbUAh1O diff --git a/lib/scssphp/src/Server.php b/lib/scssphp/src/Server.php deleted file mode 100644 index 115785585..000000000 --- a/lib/scssphp/src/Server.php +++ /dev/null @@ -1,364 +0,0 @@ - - */ -class Server -{ - /** - * @var boolean - */ - private $showErrorsAsCSS; - /** - * @var string - */ - private $dir; - /** - * @var string - */ - private $cacheDir; - /** - * @var \Leafo\ScssPhp\Compiler - */ - private $scss; - /** - * Join path components - * - * @param string $left Path component, left of the directory separator - * @param string $right Path component, right of the directory separator - * - * @return string - */ - protected function join($left, $right) - { - return rtrim($left, '/\\') . DIRECTORY_SEPARATOR . ltrim($right, '/\\'); - } - /** - * Get name of requested .scss file - * - * @return string|null - */ - protected function inputName() - { - switch (true) { - case isset($_GET['p']): - return $_GET['p']; - case isset($_SERVER['PATH_INFO']): - return $_SERVER['PATH_INFO']; - case isset($_SERVER['DOCUMENT_URI']): - return substr($_SERVER['DOCUMENT_URI'], strlen($_SERVER['SCRIPT_NAME'])); - } - } - /** - * Get path to requested .scss file - * - * @return string - */ - protected function findInput() - { - if (($input = $this->inputName()) && strpos($input, '..') === false && substr($input, -5) === '.scss') { - $name = $this->join($this->dir, $input); - if (is_file($name) && is_readable($name)) { - return $name; - } - } - return false; - } - /** - * Get path to cached .css file - * - * @return string - */ - protected function cacheName($fname) - { - return $this->join($this->cacheDir, md5($fname) . '.css'); - } - /** - * Get path to meta data - * - * @return string - */ - protected function metadataName($out) - { - return $out . '.meta'; - } - /** - * Determine whether .scss file needs to be re-compiled. - * - * @param string $out Output path - * @param string $etag ETag - * - * @return boolean True if compile required. - */ - protected function needsCompile($out, &$etag) - { - if (!is_file($out)) { - return true; - } - $mtime = filemtime($out); - $metadataName = $this->metadataName($out); - if (is_readable($metadataName)) { - $metadata = unserialize(file_get_contents($metadataName)); - foreach ($metadata['imports'] as $import => $originalMtime) { - $currentMtime = filemtime($import); - if ($currentMtime !== $originalMtime || $currentMtime > $mtime) { - return true; - } - } - $metaVars = crc32(serialize($this->scss->getVariables())); - if ($metaVars !== $metadata['vars']) { - return true; - } - $etag = $metadata['etag']; - return false; - } - return true; - } - /** - * Get If-Modified-Since header from client request - * - * @return string|null - */ - protected function getIfModifiedSinceHeader() - { - $modifiedSince = null; - if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { - $modifiedSince = $_SERVER['HTTP_IF_MODIFIED_SINCE']; - if (false !== ($semicolonPos = strpos($modifiedSince, ';'))) { - $modifiedSince = substr($modifiedSince, 0, $semicolonPos); - } - } - return $modifiedSince; - } - /** - * Get If-None-Match header from client request - * - * @return string|null - */ - protected function getIfNoneMatchHeader() - { - $noneMatch = null; - if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) { - $noneMatch = $_SERVER['HTTP_IF_NONE_MATCH']; - } - return $noneMatch; - } - /** - * Compile .scss file - * - * @param string $in Input path (.scss) - * @param string $out Output path (.css) - * - * @return array - */ - protected function compile($in, $out) - { - $start = microtime(true); - $css = $this->scss->compile(file_get_contents($in), $in); - $elapsed = round(microtime(true) - $start, 4); - $v = Version::VERSION; - $t = date('r'); - $css = "/* compiled by scssphp {$v} on {$t} ({$elapsed}s) */\n\n" . $css; - $etag = md5($css); - file_put_contents($out, $css); - file_put_contents($this->metadataName($out), serialize(array('etag' => $etag, 'imports' => $this->scss->getParsedFiles(), 'vars' => crc32(serialize($this->scss->getVariables()))))); - return array($css, $etag); - } - /** - * Format error as a pseudo-element in CSS - * - * @param \Exception $error - * - * @return string - */ - protected function createErrorCSS(\Exception $error) - { - $message = str_replace(array('\'', ' -'), array('\\\'', '\\A'), $error->getfile() . ': - -' . $error->getMessage()); - return "body { display: none !important; }\n html:after {\n background: white;\n color: black;\n content: '{$message}';\n display: block !important;\n font-family: mono;\n padding: 1em;\n white-space: pre;\n }"; - } - /** - * Render errors as a pseudo-element within valid CSS, displaying the errors on any - * page that includes this CSS. - * - * @param boolean $show - */ - public function showErrorsAsCSS($show = true) - { - $this->showErrorsAsCSS = $show; - } - /** - * Compile .scss file - * - * @param string $in Input file (.scss) - * @param string $out Output file (.css) optional - * - * @return string|bool - * - * @throws \Leafo\ScssPhp\Exception\ServerException - */ - public function compileFile($in, $out = null) - { - if (!is_readable($in)) { - throw new ServerException('load error: failed to find ' . $in); - } - $pi = pathinfo($in); - $this->scss->addImportPath($pi['dirname'] . '/'); - $compiled = $this->scss->compile(file_get_contents($in), $in); - if ($out !== null) { - return file_put_contents($out, $compiled); - } - return $compiled; - } - /** - * Check if file need compiling - * - * @param string $in Input file (.scss) - * @param string $out Output file (.css) - * - * @return bool - */ - public function checkedCompile($in, $out) - { - if (!is_file($out) || filemtime($in) > filemtime($out)) { - $this->compileFile($in, $out); - return true; - } - return false; - } - /** - * Compile requested scss and serve css. Outputs HTTP response. - * - * @param string $salt Prefix a string to the filename for creating the cache name hash - */ - public function serve($salt = '') - { - $protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0'; - if ($input = $this->findInput()) { - $output = $this->cacheName($salt . $input); - $etag = $noneMatch = trim($this->getIfNoneMatchHeader(), '"'); - if ($this->needsCompile($output, $etag)) { - try { - list($css, $etag) = $this->compile($input, $output); - $lastModified = gmdate('D, d M Y H:i:s', filemtime($output)) . ' GMT'; - header('Last-Modified: ' . $lastModified); - header('Content-type: text/css'); - header('ETag: "' . $etag . '"'); - echo $css; - } catch (\Exception $e) { - if ($this->showErrorsAsCSS) { - header('Content-type: text/css'); - echo $this->createErrorCSS($e); - } else { - header($protocol . ' 500 Internal Server Error'); - header('Content-type: text/plain'); - echo 'Parse error: ' . $e->getMessage() . ' -'; - } - } - return; - } - header('X-SCSS-Cache: true'); - header('Content-type: text/css'); - header('ETag: "' . $etag . '"'); - if ($etag === $noneMatch) { - header($protocol . ' 304 Not Modified'); - return; - } - $modifiedSince = $this->getIfModifiedSinceHeader(); - $mtime = filemtime($output); - if (strtotime($modifiedSince) === $mtime) { - header($protocol . ' 304 Not Modified'); - return; - } - $lastModified = gmdate('D, d M Y H:i:s', $mtime) . ' GMT'; - header('Last-Modified: ' . $lastModified); - echo file_get_contents($output); - return; - } - header($protocol . ' 404 Not Found'); - header('Content-type: text/plain'); - $v = Version::VERSION; - echo "/* INPUT NOT FOUND scss {$v} */\n"; - } - /** - * Based on explicit input/output files does a full change check on cache before compiling. - * - * @param string $in - * @param string $out - * @param boolean $force - * - * @return string Compiled CSS results - * - * @throws \Leafo\ScssPhp\Exception\ServerException - */ - public function checkedCachedCompile($in, $out, $force = false) - { - if (!is_file($in) || !is_readable($in)) { - throw new ServerException('Invalid or unreadable input file specified.'); - } - if (is_dir($out) || !is_writable(file_exists($out) ? $out : dirname($out))) { - throw new ServerException('Invalid or unwritable output file specified.'); - } - if ($force || $this->needsCompile($out, $etag)) { - list($css, $etag) = $this->compile($in, $out); - } else { - $css = file_get_contents($out); - } - return $css; - } - /** - * Constructor - * - * @param string $dir Root directory to .scss files - * @param string $cacheDir Cache directory - * @param \Leafo\ScssPhp\Compiler|null $scss SCSS compiler instance - */ - public function __construct($dir, $cacheDir = null, $scss = null) - { - $this->dir = $dir; - if (!isset($cacheDir)) { - $cacheDir = $this->join($dir, 'scss_cache'); - } - $this->cacheDir = $cacheDir; - if (!is_dir($this->cacheDir)) { - mkdir($this->cacheDir, 493, true); - } - if (!isset($scss)) { - $scss = new Compiler(); - $scss->setImportPaths($this->dir); - } - $this->scss = $scss; - $this->showErrorsAsCSS = false; - if (!ini_get('date.timezone')) { - date_default_timezone_set('UTC'); - } - } - /** - * Helper method to serve compiled scss - * - * @param string $path Root path - */ - public static function serveFrom($path) - { - $server = new self($path); - $server->serve(); - } -} diff --git a/lib/scssphp/src/Type.php b/lib/scssphp/src/Type.php index e57dcd4ad..a12da72f2 100644 --- a/lib/scssphp/src/Type.php +++ b/lib/scssphp/src/Type.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp; + +namespace ScssPhp\ScssPhp; /** * Block/node types diff --git a/lib/scssphp/src/Util.php b/lib/scssphp/src/Util.php index 3ff6cf9c5..b0b76fdb4 100644 --- a/lib/scssphp/src/Util.php +++ b/lib/scssphp/src/Util.php @@ -2,17 +2,20 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp; -use Leafo\ScssPhp\Base\Range; +namespace ScssPhp\ScssPhp; + +use ScssPhp\ScssPhp\Base\Range; +use ScssPhp\ScssPhp\Exception\RangeException; + /** - * Utilties + * Utilty functions * * @author Anthon Pang */ @@ -22,28 +25,46 @@ class Util * Asserts that `value` falls within `range` (inclusive), leaving * room for slight floating-point errors. * - * @param string $name The name of the value. Used in the error message. - * @param Range $range Range of values. - * @param array $value The value to check. - * @param string $unit The unit of the value. Used in error reporting. + * @param string $name The name of the value. Used in the error message. + * @param \ScssPhp\ScssPhp\Base\Range $range Range of values. + * @param array $value The value to check. + * @param string $unit The unit of the value. Used in error reporting. * * @return mixed `value` adjusted to fall within range, if it was outside by a floating-point margin. * - * @throws \Exception + * @throws \ScssPhp\ScssPhp\Exception\RangeException */ public static function checkRange($name, Range $range, $value, $unit = '') { $val = $value[1]; - $grace = new Range(-1.0E-5, 1.0E-5); + $grace = new Range(-0.00001, 0.00001); + if ($range->includes($val)) { return $val; } + if ($grace->includes($val - $range->first)) { return $range->first; } + if ($grace->includes($val - $range->last)) { return $range->last; } - throw new \Exception("{$name} {$val} must be between {$range->first} and {$range->last}{$unit}"); + + throw new RangeException("$name {$val} must be between {$range->first} and {$range->last}$unit"); + } + + /** + * Encode URI component + * + * @param string $string + * + * @return string + */ + public static function encodeURIComponent($string) + { + $revert = ['%21' => '!', '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')']; + + return strtr(rawurlencode($string), $revert); } } diff --git a/lib/scssphp/src/Version.php b/lib/scssphp/src/Version.php index 5718fa59f..56c7165ef 100644 --- a/lib/scssphp/src/Version.php +++ b/lib/scssphp/src/Version.php @@ -2,13 +2,14 @@ /** * SCSSPHP * - * @copyright 2012-2015 Leaf Corcoran + * @copyright 2012-2019 Leaf Corcoran * * @license http://opensource.org/licenses/MIT MIT * - * @link http://leafo.github.io/scssphp + * @link http://scssphp.github.io/scssphp */ -namespace Leafo\ScssPhp; + +namespace ScssPhp\ScssPhp; /** * SCSSPHP version @@ -17,5 +18,5 @@ namespace Leafo\ScssPhp; */ class Version { - const VERSION = 'v0.6.3'; + const VERSION = 'v1.0.0'; } diff --git a/setup/licenses/community-licences.xml b/setup/licenses/community-licences.xml index 07a396d5e..fd5939cee 100644 --- a/setup/licenses/community-licences.xml +++ b/setup/licenses/community-licences.xml @@ -2425,7 +2425,7 @@ END OF TERMS AND CONDITIONS scssphp Leaf Corcoran MIT - Copyright (c) 2015 Leaf Corcoran, http://leafo.github.io/scssphp + Copyright (c) 2015 Leaf Corcoran, http://scssphp.github.io/scssphp Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -2558,4 +2558,4 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION END OF TERMS AND CONDITIONS ]]> - \ No newline at end of file +