sass 1.22.7 → 1.22.9

package/package.json

@@ -1 +1 @@
-{"name":"sass","description":"A pure JavaScript implementation of Sass.","license":"MIT","bugs":"https://github.com/sass/dart-sass/issues","homepage":"https://github.com/sass/dart-sass","repository":{"type":"git","url":"https://github.com/sass/dart-sass"},"author":{"name":"Natalie Weizenbaum","email":"nweiz@google.com","url":"https://github.com/nex3"},"engines":{"node":">=0.11.8"},"dependencies":{"chokidar":">=2.0.0 <4.0.0"},"main":"sass.dart.js","bin":"sass.js","keywords":["style","scss","sass","preprocessor","css"],"version":"1.22.7"}
+{"name":"sass","description":"A pure JavaScript implementation of Sass.","license":"MIT","bugs":"https://github.com/sass/dart-sass/issues","homepage":"https://github.com/sass/dart-sass","repository":{"type":"git","url":"https://github.com/sass/dart-sass"},"author":{"name":"Natalie Weizenbaum","email":"nweiz@google.com","url":"https://github.com/nex3"},"engines":{"node":">=8.9.0"},"dependencies":{"chokidar":">=2.0.0 <4.0.0"},"main":"sass.dart.js","bin":"sass.js","keywords":["style","scss","sass","preprocessor","css"],"version":"1.22.9"}

package/sass.dart.js

@@ -1,34 +1,54 @@
 // make sure to keep this as 'var'
 // we don't want block scoping
-var self = Object.create(global);
+
+var url = require("url");
+var dartNodePreambleSelf = typeof global !== "undefined" ? global : window;
+
+var self = Object.create(dartNodePreambleSelf);
 
 self.scheduleImmediate = self.setImmediate
     ? function (cb) {
-        global.setImmediate(cb);
+        dartNodePreambleSelf.setImmediate(cb);
       }
     : function(cb) {
         setTimeout(cb, 0);
       };
 
+// CommonJS globals.
 self.exports = exports;
-self.process = process;
 
-self.__dirname = __dirname;
-self.__filename = __filename;
+// Node.js specific exports, check to see if they exist & or polyfilled
+
+if (typeof process !== "undefined") {
+  self.process = process;
+}
+
+if (typeof __dirname !== "undefined") {
+  self.__dirname = __dirname;
+}
+
+if (typeof __filename !== "undefined") {
+  self.__filename = __filename;
+}
 
 // if we're running in a browser, Dart supports most of this out of box
 // make sure we only run these in Node.js environment
-if (!global.window) {
-  // TODO: This isn't really a correct transformation. For example, it will fail
-  // for paths that contain characters that need to be escaped in URLs. Once
-  // dart-lang/sdk#27979 is fixed, it should be possible to make it better.
+if (!dartNodePreambleSelf.window) {
   self.location = {
     get href() {
-      return "file://" + (function() {
-        var cwd = process.cwd();
-        if (process.platform != "win32") return cwd;
-        return "/" + cwd.replace(/\\/g, "/");
-      })() + "/";
+      if (url.pathToFileURL) {
+        return url.pathToFileURL(process.cwd()).href + "/";
+      } else {
+        // This isn't really a correct transformation, but it's the best we have
+        // for versions of Node <10.12.0 which introduced `url.pathToFileURL()`.
+        // For example, it will fail for paths that contain characters that need
+        // to be escaped in URLs.
+        return "file://" + (function() {
+          var cwd = process.cwd();
+          if (process.platform != "win32") return cwd;
+          return "/" + cwd.replace(/\\/g, "/");
+        })() + "/"
+      }
     }
   };
 
@@ -68,6 +88,7 @@ if (!global.window) {
     }
   };
 }
+
 self.fs = require("fs");
 self.chokidar = require("chokidar");
 self.readline = require("readline");
@@ -8135,7 +8156,7 @@ self.readline = require("readline");
           switch ($async$goto) {
             case 0:
               // Function start
-              $async$returnValue = "1.22.7 compiled with dart2js 2.4.0";
+              $async$returnValue = "1.22.9 compiled with dart2js 2.4.0";
               // goto return
               $async$goto = 1;
               break;
@@ -10364,7 +10385,7 @@ self.readline = require("readline");
       J.set$run_$x(self.exports, P.allowInterop(new B.main_closure()));
       J.set$render$x(self.exports, P.allowInterop(B.node___render$closure()));
       J.set$renderSync$x(self.exports, P.allowInterop(B.node___renderSync$closure()));
-      J.set$info$x(self.exports, "dart-sass\t1.22.7\t(Sass Compiler)\t[Dart]\ndart2js\t2.4.0\t(Dart Compiler)\t[Dart]");
+      J.set$info$x(self.exports, "dart-sass\t1.22.9\t(Sass Compiler)\t[Dart]\ndart2js\t2.4.0\t(Dart Compiler)\t[Dart]");
       J.set$types$x(self.exports, {Boolean: $.$get$booleanConstructor(), Color: $.$get$colorConstructor(), List: $.$get$listConstructor(), Map: $.$get$mapConstructor(), Null: $.$get$nullConstructor(), Number: $.$get$numberConstructor(), String: $.$get$stringConstructor(), Error: self.Error});
     },
     _render: function(options, callback) {
@@ -14124,8 +14145,18 @@ self.readline = require("readline");
     SourceLocationMixin: function SourceLocationMixin() {
     },
     current: function() {
-      var path, lastIndex,
+      var exception, t1, path, lastIndex, uri = null;
+      try {
         uri = P.Uri_base();
+      } catch (exception) {
+        if (!!J.getInterceptor$(H.unwrapException(exception)).$isException) {
+          t1 = $._current;
+          if (t1 != null)
+            return t1;
+          throw exception;
+        } else
+          throw exception;
+      }
       if (J.$eq$(uri, $._currentUriBase))
         return $._current;
       $._currentUriBase = uri;
@@ -21917,6 +21948,7 @@ self.readline = require("readline");
     toString$0: function(_) {
       return "Exception: " + this.message;
     },
+    $isException: 1,
     get$message: function(receiver) {
       return this.message;
     }
@@ -21990,6 +22022,7 @@ self.readline = require("readline");
       } else
         return offset != null ? report + (" (at offset " + H.S(offset) + ")") : report;
     },
+    $isException: 1,
     get$message: function(receiver) {
       return this.message;
     },
@@ -24304,7 +24337,7 @@ self.readline = require("readline");
           isAbsoluteAndNotRootRelative = !t3.isRootRelative$1(t5);
           t4 = H.S(t5);
         } else {
-          if (!(t5.length > 0 && t3.containsSeparator$1(t5[0])))
+          if (!(t5.length !== 0 && t3.containsSeparator$1(t5[0])))
             if (needsSeparator)
               t4 += t3.get$separator();
           t4 += H.S(t5);
@@ -24408,7 +24441,7 @@ self.readline = require("readline");
       pathParsed = X.ParsedPath_ParsedPath$parse(path, t1);
       pathParsed.normalize$0();
       t2 = fromParsed.parts;
-      if (t2.length > 0 && J.$eq$(t2[0], "."))
+      if (t2.length !== 0 && J.$eq$(t2[0], "."))
         return pathParsed.toString$0(0);
       t2 = fromParsed.root;
       t3 = pathParsed.root;
@@ -24420,9 +24453,9 @@ self.readline = require("readline");
         return pathParsed.toString$0(0);
       while (true) {
         t2 = fromParsed.parts;
-        if (t2.length > 0) {
+        if (t2.length !== 0) {
           t3 = pathParsed.parts;
-          t2 = t3.length > 0 && t1.pathsEqual$2(t2[0], t3[0]);
+          t2 = t3.length !== 0 && t1.pathsEqual$2(t2[0], t3[0]);
         } else
           t2 = false;
         if (!t2)
@@ -24433,7 +24466,7 @@ self.readline = require("readline");
         C.JSArray_methods.removeAt$1(pathParsed.separators, 1);
       }
       t2 = fromParsed.parts;
-      if (t2.length > 0 && J.$eq$(t2[0], ".."))
+      if (t2.length !== 0 && J.$eq$(t2[0], ".."))
         throw H.wrapException(X.PathException$(_s26_ + H.S(path) + '" from "' + H.S(from) + '".'));
       t2 = P.String;
       C.JSArray_methods.insertAll$2(pathParsed.parts, 0, P.List_List$filled(fromParsed.parts.length, "..", t2));
@@ -24796,7 +24829,7 @@ self.readline = require("readline");
       }
       t1 = _this.separators;
       t2 = t1.length;
-      if (t2 > 0)
+      if (t2 !== 0)
         t1[t2 - 1] = "";
     },
     normalize$1$canonicalize: function(canonicalize) {
@@ -24808,7 +24841,7 @@ self.readline = require("readline");
         t5 = J.getInterceptor$(part);
         if (!(t5.$eq(part, ".") || t5.$eq(part, "")))
           if (t5.$eq(part, ".."))
-            if (newParts.length > 0)
+            if (newParts.length !== 0)
               newParts.pop();
             else
               ++leadingDoubles;
@@ -24821,7 +24854,7 @@ self.readline = require("readline");
         newParts.push(".");
       newSeparators = P.List_List$generate(newParts.length, new X.ParsedPath_normalize_closure(_this), true, t1);
       t1 = _this.root;
-      C.JSArray_methods.insert$2(newSeparators, 0, t1 != null && newParts.length > 0 && t4.needsSeparator$1(t1) ? t4.get$separator() : "");
+      C.JSArray_methods.insert$2(newSeparators, 0, t1 != null && newParts.length !== 0 && t4.needsSeparator$1(t1) ? t4.get$separator() : "");
       _this.parts = newParts;
       _this.separators = newSeparators;
       t1 = _this.root;
@@ -24878,6 +24911,7 @@ self.readline = require("readline");
     toString$0: function(_) {
       return "PathException: " + this.message;
     },
+    $isException: 1,
     get$message: function(receiver) {
       return this.message;
     }
@@ -25553,8 +25587,10 @@ self.readline = require("readline");
       }
       if (_this.restArgument != null)
         return;
-      if (positional > t2)
-        throw H.wrapException(E.SassScriptException$("Only " + t2 + " " + B.pluralize(_s8_, t2, null) + " allowed, but " + positional + " " + B.pluralize("was", positional, "were") + " passed."));
+      if (positional > t2) {
+        t1 = "Only " + t2 + " ";
+        throw H.wrapException(E.SassScriptException$(t1 + (names.get$isEmpty(names) ? "" : "positional ") + B.pluralize(_s8_, t2, null) + " allowed, but " + positional + " " + B.pluralize("was", positional, "were") + " passed."));
+      }
       if (namedUsed < t3.get$length(t3)) {
         unknownNames = P.LinkedHashSet_LinkedHashSet$of(names, P.String);
         t2 = P.Object;
@@ -29424,7 +29460,7 @@ self.readline = require("readline");
       return destination != null;
     }
   };
-  B.UsageException.prototype = {
+  B.UsageException.prototype = {$isException: 1,
     get$message: function(receiver) {
       return this.message;
     }
@@ -39445,7 +39481,7 @@ self.readline = require("readline");
         t1 = H.unwrapException(exception);
         if (t1 instanceof E.SassFormatException) {
           error = t1;
-          throw H.wrapException(this._value$_exception$1(J.toString$0$(error)));
+          throw H.wrapException(this._value$_exception$2(C.JSString_methods.replaceFirst$2(J.toString$0$(error), "Error: ", ""), $name));
         } else
           throw exception;
       }
@@ -39471,7 +39507,7 @@ self.readline = require("readline");
         t1 = H.unwrapException(exception);
         if (t1 instanceof E.SassFormatException) {
           error = t1;
-          throw H.wrapException(this._value$_exception$1(J.toString$0$(error)));
+          throw H.wrapException(this._value$_exception$2(C.JSString_methods.replaceFirst$2(J.toString$0$(error), "Error: ", ""), $name));
         } else
           throw exception;
       }
@@ -39582,9 +39618,6 @@ self.readline = require("readline");
     },
     _value$_exception$2: function(message, $name) {
       return new E.SassScriptException($name == null ? message : "$" + $name + ": " + message);
-    },
-    _value$_exception$1: function(message) {
-      return this._value$_exception$2(message, null);
     }
   };
   D.SassArgumentList.prototype = {};
@@ -39968,7 +40001,7 @@ self.readline = require("readline");
         result = T.fuzzyCheckRange(_this.value, min, max);
       if (result != null)
         return result;
-      throw H.wrapException(_this._number0$_exception$1("Expected " + _this.toString$0(0) + " to be within " + min + _this.get$unitString() + " and " + max + _this.get$unitString() + "."));
+      throw H.wrapException(_this._number0$_exception$2("Expected " + _this.toString$0(0) + " to be within " + min + _this.get$unitString() + " and " + max + _this.get$unitString() + ".", $name));
     },
     hasUnit$1: function(unit) {
       var t1 = this.numeratorUnits;
@@ -40199,9 +40232,6 @@ self.readline = require("readline");
     },
     _number0$_exception$2: function(message, $name) {
       return new E.SassScriptException($name == null ? message : "$" + $name + ": " + message);
-    },
-    _number0$_exception$1: function(message) {
-      return this._number0$_exception$2(message, null);
     }
   };
   T.SassNumber_valueInUnits_closure.prototype = {
@@ -49959,7 +49989,7 @@ self.readline = require("readline");
         _this._buffer.writeCharCode$1(91);
       else if (value._list$_contents.length === 0) {
         if (!_this._inspect)
-          throw H.wrapException(E.SassScriptException$("() isn't a valid CSS value"));
+          throw H.wrapException(E.SassScriptException$("() isn't a valid CSS value."));
         _this._buffer.write$1(0, "()");
         return;
       }
@@ -51317,7 +51347,8 @@ self.readline = require("readline");
     },
     toString$0: function($receiver) {
       return this.toString$1$color($receiver, null);
-    }
+    },
+    $isException: 1
   };
   G.SourceSpanFormatException.prototype = {
     get$source: function() {